~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -37,7 +37,6 @@
37	37	static boolean[] selectedstack = new boolean[65536];
38	38	static int materialdepth = 0;
39	39
40		- static boolean DEBUG = false;
41	40	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	41
43	42	// camera change fix
..	..	@@ -56,14 +55,12 @@
56	55	static int CURRENTANTIALIAS = 0; // 1;
57	56	/static/ boolean RENDERSHADOW = true;
58	57	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	58
62	59	boolean DISPLAYTEXT = false;
63	60	//boolean REDUCETEXTURE = true;
64	61	boolean CACHETEXTURE = true;
65	62	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	63	+ boolean MIPMAP = true; // false; // true;
67	64	boolean COMPRESSTEXTURE = false;
68	65	boolean KOMPACTTEXTURE = false; // true;
69	66	boolean RESIZETEXTURE = false;
..	..	@@ -86,7 +83,7 @@
86	83	static boolean FULLSCREEN = false;
87	84	static boolean SUPPORT = true;
88	85	static boolean INERTIA = true;
89		-static boolean FAST = true; // false;
	86	+static boolean FAST = false;
90	87	static boolean SLOWPOSE = false;
91	88	static boolean FOOTCONTACT = true;
92	89
..	..	@@ -108,7 +105,7 @@
108	105	static boolean OEIL = true;
109	106	static boolean OEILONCE = false; // do oeilon then oeiloff
110	107	static boolean LOOKAT = true;
111		-static boolean RANDOM = true; // false;
	108	+static boolean SWITCH = true; // false;
112	109	static boolean HANDLES = false; // selection doesn't work!!
113	110	static boolean PAINTMODE = false;
114	111
..	..	@@ -151,6 +148,8 @@
151	148	defaultcaps.setAccumBlueBits(16);
152	149	defaultcaps.setAccumAlphaBits(16);
153	150	}
	151	+
	152	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
154	153
155	154	void SetAsGLRenderer(boolean b)
156	155	{
..	..	@@ -327,7 +326,7 @@
327	326	cStatic.objectstack[materialdepth++] = obj;
328	327	//System.out.println("material " + material);
329	328	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	329	+ //display.vector2buffer = obj.projectedVertices;
331	330	if (obj instanceof Camera)
332	331	{
333	332	display.options1[0] = material.shift;
..	..	@@ -336,14 +335,28 @@
336	335	display.options1[2] = material.shadowbias;
337	336	display.options1[3] = material.aniso;
338	337	display.options1[4] = material.anisoV;
	338	+// System.out.println("display.options1[0] " + display.options1[0]);
	339	+// System.out.println("display.options1[1] " + display.options1[1]);
	340	+// System.out.println("display.options1[2] " + display.options1[2]);
	341	+// System.out.println("display.options1[3] " + display.options1[3]);
	342	+// System.out.println("display.options1[4] " + display.options1[4]);
339	343	display.options2[0] = material.opacity;
340	344	display.options2[1] = material.diffuse;
341	345	display.options2[2] = material.factor;
	346	+// System.out.println("display.options2[0] " + display.options2[0]);
	347	+// System.out.println("display.options2[1] " + display.options2[1]);
	348	+// System.out.println("display.options2[2] " + display.options2[2]);
342	349
343	350	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	351	+// System.out.println("display.options3[0] " + display.options3[0]);
	352	+// System.out.println("display.options3[1] " + display.options3[1]);
	353	+// System.out.println("display.options3[2] " + display.options3[2]);
344	354	display.options4[0] = material.cameralight/0.2f;
345	355	display.options4[1] = material.subsurface;
346	356	display.options4[2] = material.sheen;
	357	+// System.out.println("display.options4[0] " + display.options4[0]);
	358	+// System.out.println("display.options4[1] " + display.options4[1]);
	359	+// System.out.println("display.options4[2] " + display.options4[2]);
347	360
348	361	// if (display.CURRENTANTIALIAS > 0)
349	362	// display.options3[3] /= 4;
..	..	@@ -359,7 +372,7 @@
359	372	/**/
360	373	} else
361	374	{
362		- DrawMaterial(material, selected);
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
363	376	}
364	377	} else
365	378	{
..	..	@@ -383,8 +396,8 @@
383	396	cStatic.objectstack[materialdepth++] = obj;
384	397	//System.out.println("material " + material);
385	398	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	401	}
389	402	}
390	403
..	..	@@ -401,8 +414,8 @@
401	414	materialdepth -= 1;
402	415	if (materialdepth > 0)
403	416	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	417	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	418	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	419	}
407	420	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	421	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +435,8 @@
422	435	materialdepth -= 1;
423	436	if (materialdepth > 0)
424	437	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	438	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	439	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	440	}
428	441	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	442	//else
..	..	@@ -464,10 +477,12 @@
464	477	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	478	{
466	479	//gl.glBegin(gl.GL_TRIANGLES);
467		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	480	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	481	+ // TEST LIVE NORMALS && !obj.dontselect
	482	+ ;
468	483	if (!hasnorm)
469	484	{
470		- // System.out.println("FUCK!!");
	485	+ // System.out.println("Mesh normal");
471	486	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	487	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	488	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1192,10 +1207,12 @@
1192	1207	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1208	}
1194	1209	}
	1210	+
1195	1211	if (flipV)
1196	1212	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1213	else
1198	1214	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1215	+
1199	1216	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1217	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1218
..	..	@@ -1215,10 +1232,12 @@
1215	1232	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1233	}
1217	1234	}
	1235	+
1218	1236	if (flipV)
1219	1237	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1238	else
1221	1239	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1240	+
1222	1241	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1242	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1243
..	..	@@ -1246,8 +1265,10 @@
1246	1265	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1266	else
1248	1267	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
1249	1269	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1270	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1271	+
1251	1272	count2 += 2;
1252	1273	count3 += 3;
1253	1274	}
..	..	@@ -1603,7 +1624,7 @@
1603	1624	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1625	}
1605	1626
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1628	{
1608	1629	CameraPane display = this;
1609	1630	//new Exception().printStackTrace();
..	..	@@ -1630,7 +1651,7 @@
1630	1651
1631	1652	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1632	1653
1633		- float[] colorV = GrafreeD.colorV;
	1654	+ float[] colorV = Grafreed.colorV;
1634	1655
1635	1656	/**/
1636	1657	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1638,7 +1659,7 @@
1638	1659	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1660	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1661	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1662	+ colorV[3] = 1; // material.opacity;
1642	1663
1643	1664	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1665	//System.out.println("Opacity = " + opacity);
..	..	@@ -1746,9 +1767,9 @@
1746	1767	display.modelParams7[2] = 0;
1747	1768	display.modelParams7[3] = 0;
1748	1769
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1771
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1773	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1774	{
1754	1775	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1890,7 +1911,7 @@
1890	1911	void PushMatrix(double[][] matrix)
1891	1912	{
1892	1913	// GrafreeD.tracein(matrix);
1893		- PushMatrix(matrix,1);
	1914	+ PushMatrix(matrix, 1);
1894	1915	}
1895	1916
1896	1917	void PushMatrix()
..	..	@@ -2044,7 +2065,7 @@
2044	2065	//System.err.println("Oeil on");
2045	2066	OEIL = true;
2046	2067	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2068	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2048	2069	//pingthread.StepToTarget(true);
2049	2070	}
2050	2071
..	..	@@ -2142,7 +2163,7 @@
2142	2163	System.err.println("LIVE = " + Globals.isLIVE());
2143	2164
2144	2165	if (!Globals.isLIVE()) // save sound
2145		- GrafreeD.savesound = true; // wav.save();
	2166	+ Grafreed.savesound = true; // wav.save();
2146	2167	// else
2147	2168	repaint(); // start loop // may 2013
2148	2169	}
..	..	@@ -2259,7 +2280,7 @@
2259	2280
2260	2281	void ToggleDebug()
2261	2282	{
2262		- DEBUG ^= true;
	2283	+ Globals.DEBUG ^= true;
2263	2284	}
2264	2285
2265	2286	void ToggleLookAt()
..	..	@@ -2267,9 +2288,9 @@
2267	2288	LOOKAT ^= true;
2268	2289	}
2269	2290
2270		- void ToggleRandom()
	2291	+ void ToggleSwitch()
2271	2292	{
2272		- RANDOM ^= true;
	2293	+ SWITCH ^= true;
2273	2294	}
2274	2295
2275	2296	void ToggleHandles()
..	..	@@ -2277,10 +2298,17 @@
2277	2298	HANDLES ^= true;
2278	2299	}
2279	2300
	2301	+ Object3D paintFolder;
	2302	+
2280	2303	void TogglePaint()
2281	2304	{
2282	2305	PAINTMODE ^= true;
2283	2306	paintcount = 0;
	2307	+
	2308	+ if (PAINTMODE)
	2309	+ {
	2310	+ paintFolder = GetFolder();
	2311	+ }
2284	2312	}
2285	2313
2286	2314	void SwapCamera(int a, int b)
..	..	@@ -2376,7 +2404,46 @@
2376	2404	{
2377	2405	return currentGL;
2378	2406	}
2379		-
	2407	+
	2408	+ private BufferedImage CreateBim(TextureData texturedata)
	2409	+ {
	2410	+ // cache to disk
	2411	+ Buffer buffer = texturedata.getBuffer(); // getMipmapData();
	2412	+ //buffers[0].
	2413	+ ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
	2414	+ int[] pixels = new int[bytebuf.capacity()/3];
	2415	+ int width = texturedata.getWidth(); //(int)Math.sqrt(pixels.length); // squared
	2416	+ int height = width;
	2417	+ for (int i=pixels.length; --i>=0;)
	2418	+ {
	2419	+ int i3 = i*3;
	2420	+ pixels[i] = 0xFF;
	2421	+ pixels[i] <<= 8;
	2422	+ pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
	2423	+ pixels[i] <<= 8;
	2424	+ pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
	2425	+ pixels[i] <<= 8;
	2426	+ pixels[i] \|= bytebuf.get(i3) & 0xFF;
	2427	+ }
	2428	+ /*
	2429	+ int r=0,g=0,b=0,a=0;
	2430	+ for (int i=0; i<width; i++)
	2431	+ for (int j=0; j<height; j++)
	2432	+ {
	2433	+ int index = j*width+i;
	2434	+ int p = pixels[index];
	2435	+ a = ((p>>24) & 0xFF);
	2436	+ r = ((p>>16) & 0xFF);
	2437	+ g = ((p>>8) & 0xFF);
	2438	+ b = (p & 0xFF);
	2439	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	2440	+ }
	2441	+ /**/
	2442	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	2443	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	2444	+ return rendImage;
	2445	+ }
	2446	+
2380	2447	/**/
2381	2448	class CacheTexture
2382	2449	{
..	..	@@ -2394,9 +2461,10 @@
2394	2461	/**/
2395	2462
2396	2463	// 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>();
	2464	+ static public java.util.Hashtable<String, CacheTexture> textures = new java.util.Hashtable<String, CacheTexture>();
	2465	+ static public java.util.Hashtable<BufferedImage, CacheTexture> bimtextures = new java.util.Hashtable<BufferedImage, CacheTexture>();
	2466	+ static public java.util.HashSet<String> usedtextures = new java.util.HashSet<String>();
	2467	+
2400	2468	int pigmentdepth = 0;
2401	2469	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2470	int bumpdepth = 0;
..	..	@@ -2418,6 +2486,33 @@
2418	2486	true,
2419	2487	com.sun.opengl.util.texture.TextureIO.PNG);
2420	2488	} catch (java.io.IOException e)
	2489	+ {
	2490	+ throw new javax.media.opengl.GLException(e);
	2491	+ }
	2492	+
	2493	+ if (bump)
	2494	+ texturedata = ConvertBump(texturedata, false);
	2495	+
	2496	+ com.sun.opengl.util.texture.Texture texture =
	2497	+ com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2498	+
	2499	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2500	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2501	+
	2502	+ return texture;
	2503	+ }
	2504	+
	2505	+ com.sun.opengl.util.texture.Texture GetBimTexture(BufferedImage name, boolean bump)
	2506	+ {
	2507	+ TextureData texturedata = null;
	2508	+
	2509	+ try
	2510	+ {
	2511	+ texturedata =
	2512	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2513	+ name,
	2514	+ true);
	2515	+ } catch (Exception e)
2421	2516	{
2422	2517	throw new javax.media.opengl.GLException(e);
2423	2518	}
..	..	@@ -3504,6 +3599,8 @@
3504	3599
3505	3600	System.out.println("LOADING TEXTURE : " + name);
3506	3601
	3602	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3603	+
3507	3604	//
3508	3605	if (false) // compressbit > 0)
3509	3606	{
..	..	@@ -4208,6 +4305,7 @@
4208	4305
4209	4306	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4210	4307	{
	4308	+ new Exception().printStackTrace();
4211	4309	System.exit(0);
4212	4310	com.sun.opengl.util.texture.Texture texture = null;
4213	4311
..	..	@@ -7901,7 +7999,7 @@
7901	7999	String pigment = Object3D.GetPigment(tex);
7902	8000	String bump = Object3D.GetBump(tex);
7903	8001
7904		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8002	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7905	8003	{
7906	8004	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7907	8005	// System.out.println("; bump = " + bump);
..	..	@@ -7918,6 +8016,64 @@
7918	8016
7919	8017	ReleaseTexture(bump, true);
7920	8018	ReleaseTexture(pigment, false);
	8019	+ }
	8020	+
	8021	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8022	+ {
	8023	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8024	+ {
	8025	+ return;
	8026	+ }
	8027	+
	8028	+ if (tex == null)
	8029	+ {
	8030	+ ReleaseTexture(null, false);
	8031	+ return;
	8032	+ }
	8033	+
	8034	+ String pigment = Object3D.GetPigment(tex);
	8035	+
	8036	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8037	+ {
	8038	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8039	+ // System.out.println("; bump = " + bump);
	8040	+ }
	8041	+
	8042	+ if (pigment.equals(""))
	8043	+ {
	8044	+ pigment = null;
	8045	+ }
	8046	+
	8047	+ ReleaseTexture(pigment, false);
	8048	+ }
	8049	+
	8050	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8051	+ {
	8052	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8053	+ {
	8054	+ return;
	8055	+ }
	8056	+
	8057	+ if (tex == null)
	8058	+ {
	8059	+ ReleaseTexture(null, true);
	8060	+ return;
	8061	+ }
	8062	+
	8063	+ String bump = Object3D.GetBump(tex);
	8064	+
	8065	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8066	+ {
	8067	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8068	+ // System.out.println("; bump = " + bump);
	8069	+ }
	8070	+
	8071	+ if (bump.equals(""))
	8072	+ {
	8073	+ bump = null;
	8074	+ }
	8075	+
	8076	+ ReleaseTexture(bump, true);
7921	8077	}
7922	8078
7923	8079	void ReleaseTexture(String tex, boolean bump)
..	..	@@ -8023,7 +8179,55 @@
8023	8179	}
8024	8180	}
8025	8181
8026		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8182	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8183	+ {
	8184	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8185	+// ambientOcclusion ) // \|\| !textureon)
	8186	+// {
	8187	+// return; // false;
	8188	+// }
	8189	+//
	8190	+// if (tex == null)
	8191	+// {
	8192	+// BindTexture(null,false,resolution);
	8193	+// BindTexture(null,true,resolution);
	8194	+// return;
	8195	+// }
	8196	+//
	8197	+// String pigment = Object3D.GetPigment(tex);
	8198	+// String bump = Object3D.GetBump(tex);
	8199	+//
	8200	+// usedtextures.add(pigment);
	8201	+// usedtextures.add(bump);
	8202	+//
	8203	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8204	+// {
	8205	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8206	+// // System.out.println("; bump = " + bump);
	8207	+// }
	8208	+//
	8209	+// if (bump.equals(""))
	8210	+// {
	8211	+// bump = null;
	8212	+// }
	8213	+// if (pigment.equals(""))
	8214	+// {
	8215	+// pigment = null;
	8216	+// }
	8217	+//
	8218	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8219	+// BindTexture(pigment, false, resolution);
	8220	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8221	+// BindTexture(bump, true, resolution);
	8222	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8223	+//
	8224	+// return; // true;
	8225	+
	8226	+ BindPigmentTexture(tex, resolution);
	8227	+ BindBumpTexture(tex, resolution);
	8228	+ }
	8229	+
	8230	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8027	8231	{
8028	8232	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8029	8233	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8033,18 +8237,48 @@
8033	8237
8034	8238	if (tex == null)
8035	8239	{
8036		- BindTexture(null,false,resolution);
8037		- BindTexture(null,true,resolution);
	8240	+ BindTexture(null, null,false,resolution);
8038	8241	return;
8039	8242	}
8040	8243
8041	8244	String pigment = Object3D.GetPigment(tex);
	8245	+
	8246	+ usedtextures.add(pigment);
	8247	+
	8248	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8249	+ {
	8250	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8251	+ // System.out.println("; bump = " + bump);
	8252	+ }
	8253	+
	8254	+ if (pigment.equals(""))
	8255	+ {
	8256	+ pigment = null;
	8257	+ }
	8258	+
	8259	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8260	+ BindTexture(tex.pigmenttexture, pigment, false, resolution);
	8261	+ }
	8262	+
	8263	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8264	+ {
	8265	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8266	+ ambientOcclusion ) // \|\| !textureon)
	8267	+ {
	8268	+ return; // false;
	8269	+ }
	8270	+
	8271	+ if (tex == null)
	8272	+ {
	8273	+ BindTexture(null, null,true,resolution);
	8274	+ return;
	8275	+ }
	8276	+
8042	8277	String bump = Object3D.GetBump(tex);
8043	8278
8044		- usedtextures.put(pigment, pigment);
8045		- usedtextures.put(bump, bump);
	8279	+ usedtextures.add(bump);
8046	8280
8047		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8281	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8048	8282	{
8049	8283	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8050	8284	// System.out.println("; bump = " + bump);
..	..	@@ -8054,42 +8288,70 @@
8054	8288	{
8055	8289	bump = null;
8056	8290	}
8057		- if (pigment.equals(""))
8058		- {
8059		- pigment = null;
8060		- }
8061	8291
8062		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8063		- BindTexture(pigment, false, resolution);
8064	8292	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8065		- BindTexture(bump, true, resolution);
	8293	+ BindTexture(tex.bumptexture, bump, true, resolution);
8066	8294	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8067		-
8068		- return; // true;
8069	8295	}
8070	8296
8071		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8297	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8298	+
	8299	+ private boolean FileExists(String tex)
8072	8300	{
8073		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8301	+ if (missingTextures.contains(tex))
	8302	+ {
	8303	+ return false;
	8304	+ }
	8305	+
	8306	+ boolean fileExists = new File(tex).exists();
	8307	+
	8308	+ if (!fileExists)
	8309	+ {
	8310	+ // If file exists, the "new File()" is not executed sgain
	8311	+ missingTextures.add(tex);
	8312	+ }
	8313	+
	8314	+ return fileExists;
	8315	+ }
	8316	+
	8317	+ CacheTexture GetCacheTexture(java.awt.image.BufferedImage bim, String tex, boolean bump, int resolution) throws Exception
	8318	+ {
	8319	+ CacheTexture texturecache = null;
8074	8320
8075	8321	if (tex != null)
8076	8322	{
8077	8323	String texname = tex;
8078	8324
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;
	8325	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8326	+
	8327	+// String[] split = tex.split("Textures");
	8328	+// if (split.length > 1)
	8329	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8330	+// else
	8331	+// if (!texname.startsWith("/"))
	8332	+// texname = "/Users/nbriere/Textures/" + texname;
	8333	+ if (!FileExists(tex))
	8334	+ {
	8335	+ texname = fallbackTextureName;
	8336	+ }
8085	8337
8086	8338	if (CACHETEXTURE)
8087		- texture = textures.get(texname); // TEXTURE CACHE
8088		-
8089		- TextureData texturedata = null;
8090		-
8091		- if (texture == null \|\| texture.resolution < resolution)
8092	8339	{
	8340	+ if (bim == null)
	8341	+ texturecache = textures.get(texname); // TEXTURE CACHE
	8342	+ else
	8343	+ texturecache = bimtextures.get(bim); // TEXTURE CACHE
	8344	+ }
	8345	+
	8346	+ if (texturecache == null \|\| texturecache.resolution < resolution)
	8347	+ {
	8348	+ TextureData texturedata = null;
	8349	+
	8350	+ if (bim != null)
	8351	+ {
	8352	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8353	+ }
	8354	+ else
8093	8355	if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8094	8356	{
8095	8357	assert(!bump);
..	..	@@ -8101,19 +8363,23 @@
8101	8363	// }
8102	8364	// else
8103	8365	// {
8104		- texture = textures.get(tex);
8105		- if (texture == null)
	8366	+ texturecache = textures.get(tex);
	8367	+ if (texturecache == null)
8106	8368	{
8107		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8369	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8108	8370	}
	8371	+ else
	8372	+ new Exception().printStackTrace();
8109	8373	// }
8110	8374	} else
8111	8375	if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8112	8376	{
8113	8377	assert(bump);
8114		- texture = textures.get(tex);
8115		- if (texture == null)
8116		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8378	+ texturecache = textures.get(tex);
	8379	+ if (texturecache == null)
	8380	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8381	+ else
	8382	+ new Exception().printStackTrace();
8117	8383	} else
8118	8384	{
8119	8385	//if (tex.equals("IMMORTAL"))
..	..	@@ -8123,9 +8389,11 @@
8123	8389	//{
8124	8390	if (tex.equals("WHITE_NOISE"))
8125	8391	{
8126		- texture = textures.get(tex);
8127		- if (texture == null)
8128		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8392	+ texturecache = textures.get(tex);
	8393	+ if (texturecache == null)
	8394	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8395	+ else
	8396	+ new Exception().printStackTrace();
8129	8397	} else
8130	8398	{
8131	8399	if (textureon)
..	..	@@ -8150,7 +8418,7 @@
8150	8418	}
8151	8419
8152	8420	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8153		- if (!new File(cachename).exists())
	8421	+ if (!FileExists(cachename))
8154	8422	cachename = texname;
8155	8423	else
8156	8424	processbump = false; // don't process bump map again
..	..	@@ -8172,7 +8440,7 @@
8172	8440	}
8173	8441
8174	8442	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8175		- if (!new File(cachename).exists())
	8443	+ if (!FileExists(cachename))
8176	8444	cachename = texname;
8177	8445	else
8178	8446	processbump = false; // don't process bump map again
..	..	@@ -8181,20 +8449,23 @@
8181	8449	texturedata = GetFileTexture(cachename, processbump, resolution);
8182	8450
8183	8451
8184		- if (texturedata != null)
8185		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8452	+ if (texturedata == null)
	8453	+ throw new Exception();
	8454	+
	8455	+ texturecache = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8186	8456	//texture = GetTexture(tex, bump);
8187	8457	}
8188	8458	}
8189	8459	//}
8190	8460	}
8191	8461
8192		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8462	+ if (/CACHETEXTURE &&/ texturecache != null && textureon)
8193	8463	{
8194	8464	//return false;
	8465	+ assert(bim == null);
8195	8466
8196	8467	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8197		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8468	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8198	8469	{
8199	8470	// String ext = "_highres";
8200	8471	// if (REDUCETEXTURE)
..	..	@@ -8211,52 +8482,17 @@
8211	8482	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8212	8483	if (!cachefile.exists())
8213	8484	{
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))
	8485	+ //if (texturedata.getWidth() == texturedata.getHeight())
8223	8486	{
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);
	8487	+ BufferedImage rendImage = CreateBim(texturedata);
	8488	+
8254	8489	ImageWriter writer = null;
8255	8490	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8256	8491	if (iter.hasNext()) {
8257	8492	writer = (ImageWriter)iter.next();
8258	8493	}
8259		- float compressionQuality = 0.9f;
	8494	+
	8495	+ float compressionQuality = 0.85f;
8260	8496	try
8261	8497	{
8262	8498	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8283,8 +8519,8 @@
8283	8519	textures.remove(texname);
8284	8520	}
8285	8521
8286		- texture.texturedata = texturedata;
8287		- textures.put(texname, texture);
	8522	+ //texture.texturedata = texturedata;
	8523	+ textures.put(texname, texturecache);
8288	8524
8289	8525	// newtex = true;
8290	8526	}
..	..	@@ -8300,12 +8536,17 @@
8300	8536	}
8301	8537	}
8302	8538
8303		- return texture;
	8539	+ return texturecache;
8304	8540	}
8305	8541
8306		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8542	+ static void EmbedTextures(cTexture tex)
8307	8543	{
8308		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8544	+
	8545	+ }
	8546	+
	8547	+ com.sun.opengl.util.texture.Texture GetTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
	8548	+ {
	8549	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
8309	8550
8310	8551	if (bump)
8311	8552	{
..	..	@@ -8321,23 +8562,23 @@
8321	8562	return texture!=null?texture.texture:null;
8322	8563	}
8323	8564
8324		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8565	+ public com.sun.opengl.util.texture.TextureData GetTextureData(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
8325	8566	{
8326		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8567	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
8327	8568
8328	8569	return texture!=null?texture.texturedata:null;
8329	8570	}
8330	8571
8331		- boolean BindTexture(String tex, boolean bump, int resolution)
	8572	+ boolean BindTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
8332	8573	{
8333	8574	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8334	8575	{
8335	8576	return false;
8336	8577	}
8337	8578
8338		- boolean newtex = false;
	8579	+ //boolean newtex = false;
8339	8580
8340		- com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
	8581	+ com.sun.opengl.util.texture.Texture texture = GetTexture(stream, tex, bump, resolution);
8341	8582
8342	8583	if (texture == null)
8343	8584	return false;
..	..	@@ -8367,7 +8608,7 @@
8367	8608	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8368	8609	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8369	8610
8370		- return newtex;
	8611	+ return true; // Warning: not used.
8371	8612	}
8372	8613
8373	8614	ShadowBuffer shadowPBuf;
..	..	@@ -9205,11 +9446,35 @@
9205	9446	jy8[3] = 0.5f;
9206	9447	}
9207	9448
9208		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9449	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9209	9450	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9210	9451	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9211	9452	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9212	9453
	9454	+ void ResetOptions()
	9455	+ {
	9456	+ options1[0] = 100;
	9457	+ options1[1] = 0.025f;
	9458	+ options1[2] = 0.01f;
	9459	+ options1[3] = 0;
	9460	+ options1[4] = 0;
	9461	+
	9462	+ options2[0] = 0;
	9463	+ options2[1] = 0.75f;
	9464	+ options2[2] = 0;
	9465	+ options2[3] = 0;
	9466	+
	9467	+ options3[0] = 1;
	9468	+ options3[1] = 1;
	9469	+ options3[2] = 1;
	9470	+ options3[3] = 0;
	9471	+
	9472	+ options4[0] = 1;
	9473	+ options4[1] = 0;
	9474	+ options4[2] = 1;
	9475	+ options4[3] = 0;
	9476	+ }
	9477	+
9213	9478	static int imagecount = 0; // movie generation
9214	9479
9215	9480	static int jitter = 0;
..	..	@@ -9305,8 +9570,8 @@
9305	9570	assert (parentcam != renderCamera);
9306	9571
9307	9572	if (renderCamera != lightCamera)
9308		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9309		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9573	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9574	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9310	9575
9311	9576	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9312	9577
..	..	@@ -9321,8 +9586,8 @@
9321	9586	LA.matCopy(renderCamera.fromScreen, matrix);
9322	9587
9323	9588	if (renderCamera != lightCamera)
9324		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9325		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9589	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9590	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9326	9591
9327	9592	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9328	9593
..	..	@@ -9394,7 +9659,7 @@
9394	9659	//gl.glFlush();
9395	9660	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9396	9661
9397		- if (ANIMATION && ABORTED)
	9662	+ if (Globals.ANIMATION && ABORTED)
9398	9663	{
9399	9664	System.err.println(" ABORTED FRAME");
9400	9665	break;
..	..	@@ -9424,7 +9689,7 @@
9424	9689	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9425	9690
9426	9691	// save image
9427		- if (ANIMATION && !ABORTED)
	9692	+ if (Globals.ANIMATION && !ABORTED)
9428	9693	{
9429	9694	VPwidth = viewport[2];
9430	9695	VPheight = viewport[3];
..	..	@@ -9535,11 +9800,11 @@
9535	9800
9536	9801	// imagecount++;
9537	9802
9538		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9803	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9539	9804
9540	9805	if (!BOXMODE)
9541	9806	{
9542		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9807	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9543	9808	}
9544	9809
9545	9810	if (!BOXMODE)
..	..	@@ -9577,7 +9842,7 @@
9577	9842	ABORTED = false;
9578	9843	}
9579	9844	else
9580		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9845	+ Grafreed.wav.cursor += 735 * ACSIZE;
9581	9846
9582	9847	if (false)
9583	9848	{
..	..	@@ -10240,11 +10505,11 @@
10240	10505
10241	10506	public void display(GLAutoDrawable drawable)
10242	10507	{
10243		- if (GrafreeD.savesound && GrafreeD.hassound)
	10508	+ if (Grafreed.savesound && Grafreed.hassound)
10244	10509	{
10245		- GrafreeD.wav.save();
10246		- GrafreeD.savesound = false;
10247		- GrafreeD.hassound = false;
	10510	+ Grafreed.wav.save();
	10511	+ Grafreed.savesound = false;
	10512	+ Grafreed.hassound = false;
10248	10513	}
10249	10514	// if (DEBUG_SELECTION)
10250	10515	// {
..	..	@@ -10320,6 +10585,7 @@
10320	10585	ANTIALIAS = 0;
10321	10586	//System.out.println("RESTART");
10322	10587	AAtimer.restart();
	10588	+ Globals.TIMERRUNNING = true;
10323	10589	}
10324	10590	}
10325	10591	}
..	..	@@ -10374,7 +10640,7 @@
10374	10640	Object3D theobject = object;
10375	10641	Object3D theparent = object.parent;
10376	10642	object.parent = null;
10377		- object = (Object3D)GrafreeD.clone(object);
	10643	+ object = (Object3D)Grafreed.clone(object);
10378	10644	object.Stripify();
10379	10645	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10380	10646	theobject.PreprocessOcclusion(this);
..	..	@@ -10387,13 +10653,14 @@
10387	10653	ambientOcclusion = false;
10388	10654	}
10389	10655
10390		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10656	+ if (//Globals.lighttouched &&
	10657	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10391	10658	{
10392	10659	//if (RENDERSHADOW) // ?
10393	10660	if (!IsFrozen())
10394	10661	{
10395	10662	// dec 2012
10396		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10663	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10397	10664	{
10398	10665	Globals.framecount++;
10399	10666	shadowbuffer.display();
..	..	@@ -10520,8 +10787,8 @@
10520	10787
10521	10788	// if (parentcam != renderCamera) // not a light
10522	10789	if (cam != lightCamera)
10523		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10524		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10790	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10791	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10525	10792
10526	10793	for (int j = 0; j < 4; j++)
10527	10794	{
..	..	@@ -10535,8 +10802,8 @@
10535	10802
10536	10803	// if (parentcam != renderCamera) // not a light
10537	10804	if (cam != lightCamera)
10538		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10539		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10805	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10806	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10540	10807
10541	10808	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10542	10809
..	..	@@ -10795,7 +11062,16 @@
10795	11062	// Bump noise
10796	11063	gl.glActiveTexture(GL.GL_TEXTURE6);
10797	11064	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10798		- BindTexture(NOISE_TEXTURE, false, 2);
	11065	+
	11066	+ try
	11067	+ {
	11068	+ BindTexture(null, NOISE_TEXTURE, false, 2);
	11069	+ }
	11070	+ catch (Exception e)
	11071	+ {
	11072	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11073	+ }
	11074	+
10799	11075
10800	11076	gl.glActiveTexture(GL.GL_TEXTURE0);
10801	11077	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10818,9 +11094,9 @@
10818	11094
10819	11095	gl.glMatrixMode(GL.GL_MODELVIEW);
10820	11096
10821		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10822		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10823		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11097	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11098	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11099	+gl.glEnable(gl.GL_MULTISAMPLE);
10824	11100	} else
10825	11101	{
10826	11102	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10831,7 +11107,7 @@
10831	11107	//System.out.println("BLENDING ON");
10832	11108	gl.glEnable(GL.GL_BLEND);
10833	11109	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10834		-
	11110	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10835	11111	gl.glMatrixMode(gl.GL_PROJECTION);
10836	11112	gl.glLoadIdentity();
10837	11113
..	..	@@ -10920,8 +11196,8 @@
10920	11196	System.err.println("parentcam != renderCamera");
10921	11197
10922	11198	// if (cam != lightCamera)
10923		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10924		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11199	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11200	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10925	11201	}
10926	11202
10927	11203	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10942,8 +11218,8 @@
10942	11218	if (true) // TODO
10943	11219	{
10944	11220	if (cam != lightCamera)
10945		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10946		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11221	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11222	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10947	11223	}
10948	11224
10949	11225	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11259,8 +11535,14 @@
11259	11535	{
11260	11536	renderpass++;
11261	11537	// System.out.println("Draw object... ");
	11538	+ STEP = 1;
11262	11539	if (FAST) // in case there is no script
11263		- STEP = 16;
	11540	+ STEP = 8;
	11541	+
	11542	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11543	+ {
	11544	+ STEP *= 4;
	11545	+ }
11264	11546
11265	11547	//object.FullInvariants();
11266	11548
..	..	@@ -11274,23 +11556,44 @@
11274	11556	e.printStackTrace();
11275	11557	}
11276	11558
11277		- if (GrafreeD.RENDERME > 0)
11278		- GrafreeD.RENDERME--; // mechante magouille
	11559	+ if (Grafreed.RENDERME > 0)
	11560	+ Grafreed.RENDERME--; // mechante magouille
11279	11561
11280	11562	Globals.ONESTEP = false;
11281	11563	}
11282	11564
11283	11565	static boolean zoomonce = false;
11284	11566
	11567	+ static void CreateSelectedPoint()
	11568	+ {
	11569	+ if (selectedpoint == null)
	11570	+ {
	11571	+ debugpointG = new Sphere();
	11572	+ debugpointP = new Sphere();
	11573	+ debugpointC = new Sphere();
	11574	+ debugpointR = new Sphere();
	11575	+
	11576	+ selectedpoint = new Superellipsoid();
	11577	+
	11578	+ for (int i=0; i<8; i++)
	11579	+ {
	11580	+ debugpoints[i] = new Sphere();
	11581	+ }
	11582	+ }
	11583	+ }
	11584	+
11285	11585	void DrawObject(GL gl, boolean draw)
11286	11586	{
	11587	+ // To clear camera values
	11588	+ ResetOptions();
	11589	+
11287	11590	//System.out.println("DRAW OBJECT " + mouseDown);
11288	11591	// DrawMode() = SELECTION;
11289	11592	//GL gl = getGL();
11290	11593	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11291	11594	{
11292	11595	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11293		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11596	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11294	11597	pingthread.StepToTarget(true); // true);
11295	11598	// zoomonce = false;
11296	11599	}
..	..	@@ -11345,7 +11648,14 @@
11345	11648
11346	11649	usedtextures.clear();
11347	11650
11348		- BindTextures(DEFAULT_TEXTURES, 2);
	11651	+ try
	11652	+ {
	11653	+ BindTextures(DEFAULT_TEXTURES, 2);
	11654	+ }
	11655	+ catch (Exception e)
	11656	+ {
	11657	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11658	+ }
11349	11659	}
11350	11660	//System.out.println("--> " + stackdepth);
11351	11661	// GrafreeD.traceon();
..	..	@@ -11355,8 +11665,9 @@
11355	11665
11356	11666	if (DrawMode() == DEFAULT)
11357	11667	{
11358		- if (DEBUG)
	11668	+ if (Globals.DEBUG)
11359	11669	{
	11670	+ CreateSelectedPoint();
11360	11671	float radius = 0.05f;
11361	11672	if (selectedpoint.radius != radius)
11362	11673	{
..	..	@@ -11419,7 +11730,7 @@
11419	11730	if (tex.equals("WHITE_NOISE"))
11420	11731	continue;
11421	11732
11422		- if (!usedtextures.containsKey(tex))
	11733	+ if (!usedtextures.contains(tex))
11423	11734	{
11424	11735	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11425	11736	textures.get(tex).texture.dispose();
..	..	@@ -11436,7 +11747,14 @@
11436	11747	if (checker != null && DrawMode() == DEFAULT)
11437	11748	{
11438	11749	//BindTexture(IMMORTAL_TEXTURE);
11439		- BindTextures(checker.GetTextures(), checker.texres);
	11750	+ try
	11751	+ {
	11752	+ BindTextures(checker.GetTextures(), checker.texres);
	11753	+ }
	11754	+ catch (Exception e)
	11755	+ {
	11756	+ System.err.println("FAILED: " + checker.GetTextures());
	11757	+ }
11440	11758	// NEAREST
11441	11759	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11442	11760	DrawChecker(gl);
..	..	@@ -11518,7 +11836,7 @@
11518	11836	return;
11519	11837	}
11520	11838
11521		- String string = obj.GetToolTip();
	11839	+ String string = obj.toString(); //.GetToolTip();
11522	11840
11523	11841	GL gl = GetGL();
11524	11842
..	..	@@ -11835,8 +12153,8 @@
11835	12153	//obj.TransformToWorld(light, light);
11836	12154	for (int i = tp.size(); --i >= 0;)
11837	12155	{
11838		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11839		- LA.xformPos(light, tp.get(i).toParent, light);
	12156	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12157	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11840	12158	}
11841	12159
11842	12160
..	..	@@ -11853,8 +12171,8 @@
11853	12171	parentcam = cameras[0];
11854	12172	}
11855	12173
11856		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11857		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12174	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12175	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11858	12176
11859	12177	LA.xformPos(light, renderCamera.toScreen, light);
11860	12178
..	..	@@ -12468,8 +12786,8 @@
12468	12786
12469	12787	// display shadow only (bump == 0)
12470	12788	"SUB temp.x, half.x, shadow.x;" +
12471		- "MOV temp.y, -params6.x;" +
12472		- "SLT temp.z, temp.y, zero.x;" +
	12789	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12790	+ "SLT temp.z, temp.y, -one2048th.x;" +
12473	12791	"SUB temp.y, one.x, temp.z;" +
12474	12792	"MUL temp.x, temp.x, temp.y;" +
12475	12793	"KIL temp.x;" +
..	..	@@ -12598,8 +12916,10 @@
12598	12916	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12599	12917
12600	12918	"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
	12919	+ // Tuning for default skin
	12920	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12921	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12922	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12603	12923	"MUL temp.x, temp.x, temp.y;" +
12604	12924
12605	12925	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12798,7 +13118,7 @@
12798	13118	//once = true;
12799	13119	}
12800	13120
12801		- System.out.print("Program #" + mode + "; length = " + program.length());
	13121	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12802	13122	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12803	13123	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12804	13124
..	..	@@ -12931,12 +13251,16 @@
12931	13251
12932	13252	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12933	13253	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13254	+
	13255	+ // Compare fragment depth in light space with shadowmap.
12934	13256	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12935	13257	"SGE temp.y, temp.x, zero.x;" +
12936		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13258	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13259	+
	13260	+ // Reverse comparison
12937	13261	"SUB temp.x, one.x, temp.x;" +
12938	13262	"MUL " + shadow + ".x, temp.x, temp.y;" +
12939		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13263	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12940	13264	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12941	13265
12942	13266	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12950,6 +13274,10 @@
12950	13274	// No shadow for backface
12951	13275	"DP3 temp.x, normal, lightd;" +
12952	13276	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13277	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13278	+
	13279	+ // No shadow when out of frustrum
	13280	+ "SGE temp.x, " + depth + ".z, one.z;" +
12953	13281	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12954	13282	"";
12955	13283	}
..	..	@@ -13096,7 +13424,8 @@
13096	13424	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13097	13425	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13098	13426	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13099		- Object3D.cVector2[] vector2buffer;
	13427	+
	13428	+ //Object3D.cVector2[] vector2buffer;
13100	13429
13101	13430	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13102	13431	// OUT : diff, spec
..	..	@@ -13112,9 +13441,10 @@
13112	13441	"DP3 " + dest + ".z," + "normals," + "eye;" +
13113	13442	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13114	13443	//"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;" +
	13444	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13445	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13446	+
	13447	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13118	13448	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13119	13449	"RCP " + dest + ".w," + dest + ".w;" +
13120	13450	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13508,7 +13838,7 @@
13508	13838	public void mousePressed(MouseEvent e)
13509	13839	{
13510	13840	//System.out.println("mousePressed: " + e);
13511		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13841	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13512	13842	}
13513	13843
13514	13844	static long prevtime = 0;
..	..	@@ -13584,8 +13914,8 @@
13584	13914	// mode \|= META;
13585	13915	//}
13586	13916
13587		- SetMouseMode(WHEEL \| e.getModifiersEx());
13588		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13917	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13918	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13589	13919	anchorX = ax;
13590	13920	anchorY = ay;
13591	13921	prevX = px;
..	..	@@ -13619,6 +13949,7 @@
13619	13949	else
13620	13950	if (evt.getSource() == AAtimer)
13621	13951	{
	13952	+ Globals.TIMERRUNNING = false;
13622	13953	if (mouseDown)
13623	13954	{
13624	13955	//new Exception().printStackTrace();
..	..	@@ -13644,6 +13975,10 @@
13644	13975	// LIVE = waslive;
13645	13976	// wasliveok = true;
13646	13977	// waslive = false;
	13978	+
	13979	+ // May 2019 Forget it:
	13980	+ if (true)
	13981	+ return;
13647	13982
13648	13983	// source == timer
13649	13984	if (mouseDown)
..	..	@@ -13674,7 +14009,7 @@
13674	14009
13675	14010	// fev 2014???
13676	14011	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13677		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14012	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13678	14013	pingthread.StepToTarget(true); // true);
13679	14014	}
13680	14015	// if (!LIVE)
..	..	@@ -13683,12 +14018,13 @@
13683	14018
13684	14019	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13685	14020
13686		- void clickStart(int x, int y, int modifiers)
	14021	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13687	14022	{
13688	14023	if (!wasliveok)
13689	14024	return;
13690	14025
13691	14026	AAtimer.restart(); //
	14027	+ Globals.TIMERRUNNING = true;
13692	14028
13693	14029	// waslive = LIVE;
13694	14030	// LIVE = false;
..	..	@@ -13700,7 +14036,7 @@
13700	14036	// touched = true; // main DL
13701	14037	if (isRenderer)
13702	14038	{
13703		- SetMouseMode(modifiers);
	14039	+ SetMouseMode(modifiers, modifiersex);
13704	14040	}
13705	14041
13706	14042	selectX = anchorX = x;
..	..	@@ -13713,7 +14049,7 @@
13713	14049	clicked = true;
13714	14050	hold = false;
13715	14051
13716		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14052	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13717	14053	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13718	14054	{
13719	14055	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13744,7 +14080,7 @@
13744	14080	info.camera = renderCamera;
13745	14081	info.x = x;
13746	14082	info.y = y;
13747		- info.modifiers = modifiers;
	14083	+ info.modifiers = modifiersex;
13748	14084	editObj = object.doEditClick(info, 0);
13749	14085	if (!editObj)
13750	14086	{
..	..	@@ -13761,9 +14097,12 @@
13761	14097
13762	14098	public void mouseDragged(MouseEvent e)
13763	14099	{
	14100	+ Globals.MOUSEDRAGGED = true;
	14101	+
13764	14102	//System.out.println("mouseDragged: " + e);
13765	14103	if (isRenderer)
13766	14104	movingcamera = true;
	14105	+
13767	14106	//if (drawing)
13768	14107	//return;
13769	14108	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13773,7 +14112,7 @@
13773	14112	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13774	14113	}
13775	14114	else
13776		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14115	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13777	14116
13778	14117	//try { Thread.sleep(1); } catch (Exception ex) {}
13779	14118	}
..	..	@@ -13946,6 +14285,7 @@
13946	14285
13947	14286	public void run()
13948	14287	{
	14288	+ new Exception().printStackTrace();
13949	14289	System.exit(0);
13950	14290	for (;;)
13951	14291	{
..	..	@@ -14009,7 +14349,7 @@
14009	14349	{
14010	14350	Globals.lighttouched = true;
14011	14351	}
14012		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14352	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14013	14353	}
14014	14354	//else
14015	14355	}
..	..	@@ -14023,12 +14363,12 @@
14023	14363	void GoDown(int mod)
14024	14364	{
14025	14365	MODIFIERS \|= COMMAND;
14026		- /*
	14366	+ /**/
14027	14367	if((mod&SHIFT) == SHIFT)
14028	14368	manipCamera.RotatePosition(0, -speed);
14029	14369	else
14030		- manipCamera.BackForth(0, -speed*delta, getWidth());
14031		- */
	14370	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14371	+ /**/
14032	14372	if ((mod & SHIFT) == SHIFT)
14033	14373	{
14034	14374	mouseMode = mouseMode; // VR??
..	..	@@ -14044,12 +14384,12 @@
14044	14384	void GoUp(int mod)
14045	14385	{
14046	14386	MODIFIERS \|= COMMAND;
14047		- /*
	14387	+ /**/
14048	14388	if((mod&SHIFT) == SHIFT)
14049	14389	manipCamera.RotatePosition(0, speed);
14050	14390	else
14051		- manipCamera.BackForth(0, speed*delta, getWidth());
14052		- */
	14391	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14392	+ /**/
14053	14393	if ((mod & SHIFT) == SHIFT)
14054	14394	{
14055	14395	mouseMode = mouseMode;
..	..	@@ -14065,12 +14405,12 @@
14065	14405	void GoLeft(int mod)
14066	14406	{
14067	14407	MODIFIERS \|= COMMAND;
14068		- /*
	14408	+ /**/
14069	14409	if((mod&SHIFT) == SHIFT)
14070		- manipCamera.RotatePosition(speed, 0);
14071		- else
14072	14410	manipCamera.Translate(speed*delta, 0, getWidth());
14073		- */
	14411	+ else
	14412	+ manipCamera.RotatePosition(speed, 0);
	14413	+ /**/
14074	14414	if ((mod & SHIFT) == SHIFT)
14075	14415	{
14076	14416	mouseMode = mouseMode;
..	..	@@ -14086,12 +14426,12 @@
14086	14426	void GoRight(int mod)
14087	14427	{
14088	14428	MODIFIERS \|= COMMAND;
14089		- /*
	14429	+ /**/
14090	14430	if((mod&SHIFT) == SHIFT)
14091		- manipCamera.RotatePosition(-speed, 0);
14092		- else
14093	14431	manipCamera.Translate(-speed*delta, 0, getWidth());
14094		- */
	14432	+ else
	14433	+ manipCamera.RotatePosition(-speed, 0);
	14434	+ /**/
14095	14435	if ((mod & SHIFT) == SHIFT)
14096	14436	{
14097	14437	mouseMode = mouseMode;
..	..	@@ -14109,7 +14449,7 @@
14109	14449	int X, Y;
14110	14450	boolean SX, SY;
14111	14451
14112		- void drag(int x, int y, int modifiers)
	14452	+ void drag(int x, int y, int modifiers, int modifiersex)
14113	14453	{
14114	14454	if (IsFrozen())
14115	14455	{
..	..	@@ -14118,17 +14458,17 @@
14118	14458
14119	14459	drag = true; // NEW
14120	14460
14121		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14461	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14122	14462
14123	14463	X = x;
14124	14464	Y = y;
14125	14465	// floating state for animation
14126		- MODIFIERS = modifiers;
14127		- modifiers &= ~1024;
	14466	+ MODIFIERS = modifiersex;
	14467	+ modifiersex &= ~1024;
14128	14468	if (false) // modifiers != 0)
14129	14469	{
14130	14470	//new Exception().printStackTrace();
14131		- System.out.println("mouseDragged: " + modifiers);
	14471	+ System.out.println("mouseDragged: " + modifiersex);
14132	14472	System.out.println("SHIFT = " + SHIFT);
14133	14473	System.out.println("CONTROL = " + COMMAND);
14134	14474	System.out.println("META = " + META);
..	..	@@ -14148,7 +14488,8 @@
14148	14488	info.camera = renderCamera;
14149	14489	info.x = x;
14150	14490	info.y = y;
14151		- object.editWindow.copy.doEditDrag(info);
	14491	+ object.GetWindow().copy
	14492	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14152	14493	} else
14153	14494	{
14154	14495	if (x < startX)
..	..	@@ -14312,7 +14653,9 @@
14312	14653	ci.camera = renderCamera;
14313	14654	if (!isRenderer)
14314	14655	{
14315		- if (object.editWindow.copy.doEditClick(ci, 0))
	14656	+ //ObjEditor editWindow = object.editWindow;
	14657	+ //Object3D copy = editWindow.copy;
	14658	+ if (object.doEditClick(ci, 0))
14316	14659	{
14317	14660	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14318	14661	} else
..	..	@@ -14324,7 +14667,11 @@
14324	14667
14325	14668	public void mouseReleased(MouseEvent e)
14326	14669	{
	14670	+ Globals.MOUSEDRAGGED = false;
	14671	+
14327	14672	movingcamera = false;
	14673	+ X = 0; // getBounds().width/2;
	14674	+ Y = 0; // getBounds().height/2;
14328	14675	//System.out.println("mouseReleased: " + e);
14329	14676	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14330	14677	}
..	..	@@ -14347,9 +14694,9 @@
14347	14694	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14348	14695	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14349	14696
14350		- if (control \|\| command \|\| IsFrozen())
	14697	+// No delay if (control \|\| command \|\| IsFrozen())
14351	14698	timeout = true;
14352		- else
	14699	+// ?? May 2019 else
14353	14700	// timer.setDelay((modifiers & 128) != 0?0:350);
14354	14701	mouseDown = false;
14355	14702	if (!control && !command) // june 2013
..	..	@@ -14459,7 +14806,7 @@
14459	14806	System.out.println("keyReleased: " + e);
14460	14807	}
14461	14808
14462		- void SetMouseMode(int modifiers)
	14809	+ void SetMouseMode(int modifiers, int modifiersex)
14463	14810	{
14464	14811	//System.out.println("SetMouseMode = " + modifiers);
14465	14812	//modifiers &= ~1024;
..	..	@@ -14471,25 +14818,25 @@
14471	14818	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14472	14819	// return;
14473	14820	//System.out.println("SetMode = " + modifiers);
14474		- if ((modifiers & WHEEL) == WHEEL)
	14821	+ if ((modifiersex & WHEEL) == WHEEL)
14475	14822	{
14476	14823	mouseMode \|= ZOOM;
14477	14824	}
14478	14825
14479	14826	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14480		- if (capsLocked \|\| (modifiers & META) == META)
	14827	+ if (capsLocked) // \|\| (modifiers & META) == META)
14481	14828	{
14482	14829	mouseMode \|= VR; // BACKFORTH;
14483	14830	}
14484		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14831	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14485	14832	{
14486	14833	mouseMode \|= SELECT;
14487	14834	}
14488		- if ((modifiers & COMMAND) == COMMAND)
	14835	+ if ((modifiersex & COMMAND) == COMMAND)
14489	14836	{
14490	14837	mouseMode \|= SELECT;
14491	14838	}
14492		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14839	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14493	14840	{
14494	14841	mouseMode &= ~VR;
14495	14842	mouseMode \|= TRANSLATE;
..	..	@@ -14518,7 +14865,7 @@
14518	14865
14519	14866	if (isRenderer) //
14520	14867	{
14521		- SetMouseMode(modifiers);
	14868	+ SetMouseMode(0, modifiers);
14522	14869	}
14523	14870
14524	14871	Globals.theRenderer.keyPressed(key);
..	..	@@ -14665,7 +15012,9 @@
14665	15012	case 'E' : COMPACT ^= true;
14666	15013	repaint();
14667	15014	break;
14668		- case 'W' : DEBUGHSB ^= true;
	15015	+ case 'W' : // Wide Window (fullscreen)
	15016	+ //DEBUGHSB ^= true;
	15017	+ ObjEditor.theFrame.ToggleFullScreen();
14669	15018	repaint();
14670	15019	break;
14671	15020	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14690,8 +15039,8 @@
14690	15039	RevertCamera();
14691	15040	repaint();
14692	15041	break;
14693		- case 'L':
14694	15042	case 'l':
	15043	+ //case 'L':
14695	15044	if (lightMode)
14696	15045	{
14697	15046	lightMode = false;
..	..	@@ -14834,9 +15183,9 @@
14834	15183	case '_':
14835	15184	kompactbit = 5;
14836	15185	break;
14837		- case '+':
14838		- kompactbit = 6;
14839		- break;
	15186	+// case '+':
	15187	+// kompactbit = 6;
	15188	+// break;
14840	15189	case ' ':
14841	15190	lightMode ^= true;
14842	15191	Globals.lighttouched = true;
..	..	@@ -14848,13 +15197,14 @@
14848	15197	case ESC:
14849	15198	RENDERPROGRAM += 1;
14850	15199	RENDERPROGRAM %= 3;
	15200	+
14851	15201	repaint();
14852	15202	break;
14853	15203	case 'Z':
14854	15204	//RESIZETEXTURE ^= true;
14855	15205	//break;
14856	15206	case 'z':
14857		- RENDERSHADOW ^= true;
	15207	+ Globals.RENDERSHADOW ^= true;
14858	15208	Globals.lighttouched = true;
14859	15209	repaint();
14860	15210	break;
..	..	@@ -14887,8 +15237,9 @@
14887	15237	case DELETE:
14888	15238	ClearSelection();
14889	15239	break;
14890		- /*
14891	15240	case '+':
	15241	+
	15242	+ /*
14892	15243	//fontsize += 1;
14893	15244	bbzoom *= 2;
14894	15245	repaint();
..	..	@@ -14905,17 +15256,17 @@
14905	15256	case '=':
14906	15257	IncDepth();
14907	15258	//fontsize += 1;
14908		- object.editWindow.refreshContents(true);
	15259	+ object.GetWindow().refreshContents(true);
14909	15260	maskbit = 6;
14910	15261	break;
14911	15262	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14912	15263	DecDepth();
14913	15264	maskbit = 5;
14914	15265	//if(fontsize > 1) fontsize -= 1;
14915		- if (object.editWindow == null)
14916		- new Exception().printStackTrace();
14917		- else
14918		- object.editWindow.refreshContents(true);
	15266	+// if (object.editWindow == null)
	15267	+// new Exception().printStackTrace();
	15268	+// else
	15269	+ object.GetWindow().refreshContents(true);
14919	15270	break;
14920	15271	case '{':
14921	15272	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14978,7 +15329,7 @@
14978	15329	//mode = ROTATE;
14979	15330	if ((MODIFIERS & COMMAND) == 0) // VR??
14980	15331	{
14981		- SetMouseMode(modifiers);
	15332	+ SetMouseMode(0, modifiers);
14982	15333	}
14983	15334	}
14984	15335
..	..	@@ -15114,7 +15465,7 @@
15114	15465	{
15115	15466	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15116	15467	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15117		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15468	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15118	15469	{
15119	15470	mouseMoved(e);
15120	15471	} else
..	..	@@ -15139,11 +15490,12 @@
15139	15490	}
15140	15491	*/
15141	15492
15142		- object.editWindow.EditSelection();
	15493	+ object.GetWindow().EditSelection(false);
15143	15494	}
15144	15495
15145	15496	void SelectParent()
15146	15497	{
	15498	+ new Exception().printStackTrace();
15147	15499	System.exit(0);
15148	15500	Composite group = (Composite) object;
15149	15501	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15155,10 +15507,10 @@
15155	15507	{
15156	15508	//selectees.remove(i);
15157	15509	System.out.println("select parent of " + elem);
15158		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15510	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15159	15511	} else
15160	15512	{
15161		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15513	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15162	15514	}
15163	15515
15164	15516	first = false;
..	..	@@ -15167,6 +15519,7 @@
15167	15519
15168	15520	void SelectChildren()
15169	15521	{
	15522	+ new Exception().printStackTrace();
15170	15523	System.exit(0);
15171	15524	/*
15172	15525	Composite group = (Composite) object;
..	..	@@ -15199,12 +15552,12 @@
15199	15552	for (int j = 0; j < group.children.size(); j++)
15200	15553	{
15201	15554	elem = (Object3D) group.children.elementAt(j);
15202		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15555	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15203	15556	first = false;
15204	15557	}
15205	15558	} else
15206	15559	{
15207		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15560	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15208	15561	}
15209	15562
15210	15563	first = false;
..	..	@@ -15215,21 +15568,21 @@
15215	15568	{
15216	15569	//Composite group = (Composite) object;
15217	15570	Object3D group = object;
15218		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15571	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15219	15572	}
15220	15573
15221	15574	void ResetTransform(int mask)
15222	15575	{
15223	15576	//Composite group = (Composite) object;
15224	15577	Object3D group = object;
15225		- group.editWindow.ResetTransform(mask);
	15578	+ group.GetWindow().ResetTransform(mask);
15226	15579	}
15227	15580
15228	15581	void FlipTransform()
15229	15582	{
15230	15583	//Composite group = (Composite) object;
15231	15584	Object3D group = object;
15232		- group.editWindow.FlipTransform();
	15585	+ group.GetWindow().FlipTransform();
15233	15586	// group.editWindow.ReduceMesh(true);
15234	15587	}
15235	15588
..	..	@@ -15237,7 +15590,7 @@
15237	15590	{
15238	15591	//Composite group = (Composite) object;
15239	15592	Object3D group = object;
15240		- group.editWindow.PrintMemory();
	15593	+ group.GetWindow().PrintMemory();
15241	15594	// group.editWindow.ReduceMesh(true);
15242	15595	}
15243	15596
..	..	@@ -15245,7 +15598,7 @@
15245	15598	{
15246	15599	//Composite group = (Composite) object;
15247	15600	Object3D group = object;
15248		- group.editWindow.ResetCentroid();
	15601	+ group.GetWindow().ResetCentroid();
15249	15602	}
15250	15603
15251	15604	void IncDepth()
..	..	@@ -15331,7 +15684,9 @@
15331	15684	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15332	15685	//Image img = CreateImage(width, height);
15333	15686	//System.out.println("width = " + width + "; height = " + height + "\n");
	15687	+
15334	15688	Graphics gr = g; // img.getGraphics();
	15689	+
15335	15690	if (!hasMarquee)
15336	15691	{
15337	15692	if (Xmin < Xmax) // !locked)
..	..	@@ -15419,6 +15774,7 @@
15419	15774	info.bounds.y += (height - desired) / 2;
15420	15775	}
15421	15776	}
	15777	+
15422	15778	info.g = gr;
15423	15779	info.camera = renderCamera;
15424	15780	/*
..	..	@@ -15428,15 +15784,55 @@
15428	15784	*/
15429	15785	if (!isRenderer)
15430	15786	{
15431		- object.drawEditHandles(info, 0);
	15787	+ Grafreed.Assert(object != null);
	15788	+ Grafreed.Assert(object.selection != null);
	15789	+ if (object.selection.Size() > 0)
	15790	+ {
	15791	+ int hitSomething = object.selection.get(0).hitSomething;
	15792	+
	15793	+ info.DX = 0;
	15794	+ info.DY = 0;
	15795	+ info.W = 1;
	15796	+ if (hitSomething == Object3D.hitCenter)
	15797	+ {
	15798	+ info.DX = X;
	15799	+ if (X != 0)
	15800	+ info.DX -= info.bounds.width/2;
	15801	+
	15802	+ info.DY = Y;
	15803	+ if (Y != 0)
	15804	+ info.DY -= info.bounds.height/2;
	15805	+ }
	15806	+
	15807	+ object.drawEditHandles(info, 0);
	15808	+
	15809	+ if (drag && (X != 0 \|\| Y != 0))
	15810	+ {
	15811	+ switch (hitSomething)
	15812	+ {
	15813	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15814	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15815	+ break;
	15816	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15817	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15818	+ break;
	15819	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15820	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15821	+ break;
	15822	+ }
	15823	+
	15824	+ }
	15825	+ }
15432	15826	}
15433	15827	}
	15828	+
15434	15829	if (isRenderer)
15435	15830	{
15436	15831	//gr.setColor(Color.black);
15437	15832	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15438	15833	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15439	15834	}
	15835	+
15440	15836	if (hasMarquee)
15441	15837	{
15442	15838	gr.setXORMode(Color.white);
..	..	@@ -15549,6 +15945,7 @@
15549	15945	public boolean mouseDown(Event evt, int x, int y)
15550	15946	{
15551	15947	System.out.println("mouseDown: " + evt);
	15948	+ System.exit(0);
15552	15949	/*
15553	15950	locked = true;
15554	15951	drag = false;
..	..	@@ -15592,7 +15989,7 @@
15592	15989	{
15593	15990	keyPressed(0, modifiers);
15594	15991	}
15595		- clickStart(x, y, modifiers);
	15992	+ // clickStart(x, y, modifiers);
15596	15993	return true;
15597	15994	}
15598	15995
..	..	@@ -15710,7 +16107,7 @@
15710	16107	{
15711	16108	keyReleased(0, 0);
15712	16109	}
15713		- drag(x, y, modifiers);
	16110	+ drag(x, y, 0, modifiers);
15714	16111	return true;
15715	16112	}
15716	16113
..	..	@@ -15842,7 +16239,7 @@
15842	16239	Object3D object;
15843	16240	static Object3D trackedobject;
15844	16241	Camera renderCamera; // Light or Eye (or Occlusion)
15845		- /static/ Camera manipCamera; // Light or Eye
	16242	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15846	16243	/static/ Camera eyeCamera;
15847	16244	/static/ Camera lightCamera;
15848	16245	int cameracount;
..	..	@@ -16127,16 +16524,16 @@
16127	16524	cStatic.objectstack[materialdepth++] = checker;
16128	16525	//System.out.println("material " + material);
16129	16526	//Applet3D.tracein(this, selected);
16130		- vector2buffer = checker.projectedVertices;
	16527	+ //vector2buffer = checker.projectedVertices;
16131	16528
16132	16529	//checker.GetMaterial().Draw(this, false); // true);
16133		- DrawMaterial(checker.GetMaterial(), false); // true);
	16530	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16134	16531
16135	16532	materialdepth -= 1;
16136	16533	if (materialdepth > 0)
16137	16534	{
16138		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16139		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16535	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16536	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16140	16537	}
16141	16538	//checker.GetMaterial().opacity = 1f;
16142	16539	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16222,6 +16619,14 @@
16222	16619	}
16223	16620	}
16224	16621
	16622	+ private Object3D GetFolder()
	16623	+ {
	16624	+ Object3D folder = object.GetWindow().copy;
	16625	+ if (object.GetWindow().copy.selection.Size() > 0)
	16626	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16627	+ return folder;
	16628	+ }
	16629	+
16225	16630	class SelectBuffer implements GLEventListener
16226	16631	{
16227	16632
..	..	@@ -16280,6 +16685,7 @@
16280	16685	{
16281	16686	if (!selection)
16282	16687	{
	16688	+ new Exception().printStackTrace();
16283	16689	System.exit(0);
16284	16690	return;
16285	16691	}
..	..	@@ -16300,6 +16706,17 @@
16300	16706
16301	16707	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16302	16708
	16709	+ if (PAINTMODE)
	16710	+ {
	16711	+ if (object.GetWindow().copy.selection.Size() > 0)
	16712	+ {
	16713	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16714	+
	16715	+ // Make what you paint not selectable.
	16716	+ paintobj.ResetSelectable();
	16717	+ }
	16718	+ }
	16719	+
16303	16720	//int tmp = selection_view;
16304	16721	//selection_view = -1;
16305	16722	int temp = DrawMode();
..	..	@@ -16311,6 +16728,17 @@
16311	16728	// temp = DEFAULT; // patch for selection debug
16312	16729	Globals.drawMode = temp; // WARNING
16313	16730
	16731	+ if (PAINTMODE)
	16732	+ {
	16733	+ if (object.GetWindow().copy.selection.Size() > 0)
	16734	+ {
	16735	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16736	+
	16737	+ // Revert.
	16738	+ paintobj.RestoreSelectable();
	16739	+ }
	16740	+ }
	16741	+
16314	16742	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16315	16743
16316	16744	// trying different ways of getting the depth info over
..	..	@@ -16358,6 +16786,8 @@
16358	16786	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16359	16787	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16360	16788	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16789	+
	16790	+ CreateSelectedPoint();
16361	16791
16362	16792	// Will fit the mesh !!!
16363	16793	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16407,34 +16837,36 @@
16407	16837	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	16838	}
16409	16839
16410		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16840	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16411	16841	}
16412	16842	}
16413	16843
16414	16844	if (!movingcamera && !PAINTMODE)
16415		- object.editWindow.ScreenFitPoint(); // fev 2014
	16845	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16416	16846
16417		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16847	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16418	16848	{
16419		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16849	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16420	16850
16421		- Object3D group = new Object3D("inst" + paintcount++);
	16851	+ if (object.GetWindow().copy.selection.Size() > 0)
	16852	+ {
	16853	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16422	16854
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();
	16855	+ Object3D inst = new Object3D("inst" + paintcount++);
	16856	+
	16857	+ inst.CreateMaterial(); // use a void leaf to select instances
	16858	+
	16859	+ inst.add(paintobj); // link
	16860	+
	16861	+ object.GetWindow().SnapObject(inst);
	16862	+
	16863	+ Object3D folder = paintFolder; // GetFolder();
	16864	+
	16865	+ folder.add(inst);
	16866	+
	16867	+ object.GetWindow().ResetModel();
	16868	+ object.GetWindow().refreshContents();
	16869	+ }
16438	16870	}
16439	16871	else
16440	16872	paintcount = 0;
..	..	@@ -16473,6 +16905,11 @@
16473	16905	//System.out.println("objects[color] = " + objects[color]);
16474	16906	//objects[color].Select();
16475	16907	indexcount = 0;
	16908	+ ObjEditor window = object.GetWindow();
	16909	+ if (window != null && deselect)
	16910	+ {
	16911	+ window.Select(null, deselect, true);
	16912	+ }
16476	16913	object.Select(color, deselect);
16477	16914	}
16478	16915
..	..	@@ -16572,7 +17009,7 @@
16572	17009	gl.glDisable(gl.GL_CULL_FACE);
16573	17010	}
16574	17011
16575		- if (!RENDERSHADOW)
	17012	+ if (!Globals.RENDERSHADOW)
16576	17013	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16577	17014
16578	17015	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16582,7 +17019,7 @@
16582	17019	//gl.glColorMask(false, false, false, false);
16583	17020
16584	17021	//render_scene_from_light_view(gl, drawable, 0, 0);
16585		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17022	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16586	17023	{
16587	17024	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16588	17025
..	..	@@ -16998,23 +17435,15 @@
16998	17435	int AAbuffersize = 0;
16999	17436
17000	17437	//double[] selectedpoint = new double[3];
17001		- static Superellipsoid selectedpoint = new Superellipsoid();
	17438	+ static Superellipsoid selectedpoint;
17002	17439	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();
	17440	+ static Sphere debugpointG;
	17441	+ static Sphere debugpointP;
	17442	+ static Sphere debugpointC;
	17443	+ static Sphere debugpointR;
17007	17444
17008	17445	static Sphere debugpoints[] = new Sphere[8];
17009	17446
17010		- static
17011		- {
17012		- for (int i=0; i<8; i++)
17013		- {
17014		- debugpoints[i] = new Sphere();
17015		- }
17016		- }
17017		-
17018	17447	static void InitPoints(float radius)
17019	17448	{
17020	17449	for (int i=0; i<8; i++)