~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
..	..	@@ -61,7 +60,7 @@
61	60	//boolean REDUCETEXTURE = true;
62	61	boolean CACHETEXTURE = true;
63	62	boolean CLEANCACHE = false; // true;
64		- boolean MIPMAP = false; // true;
	63	+ boolean MIPMAP = true; // false; // true;
65	64	boolean COMPRESSTEXTURE = false;
66	65	boolean KOMPACTTEXTURE = false; // true;
67	66	boolean RESIZETEXTURE = false;
..	..	@@ -106,7 +105,7 @@
106	105	static boolean OEIL = true;
107	106	static boolean OEILONCE = false; // do oeilon then oeiloff
108	107	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	108	+static boolean SWITCH = true; // false;
110	109	static boolean HANDLES = false; // selection doesn't work!!
111	110	static boolean PAINTMODE = false;
112	111
..	..	@@ -149,6 +148,8 @@
149	148	defaultcaps.setAccumBlueBits(16);
150	149	defaultcaps.setAccumAlphaBits(16);
151	150	}
	151	+
	152	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
152	153
153	154	void SetAsGLRenderer(boolean b)
154	155	{
..	..	@@ -325,7 +326,7 @@
325	326	cStatic.objectstack[materialdepth++] = obj;
326	327	//System.out.println("material " + material);
327	328	//Applet3D.tracein(this, selected);
328		- display.vector2buffer = obj.projectedVertices;
	329	+ //display.vector2buffer = obj.projectedVertices;
329	330	if (obj instanceof Camera)
330	331	{
331	332	display.options1[0] = material.shift;
..	..	@@ -334,14 +335,28 @@
334	335	display.options1[2] = material.shadowbias;
335	336	display.options1[3] = material.aniso;
336	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]);
337	343	display.options2[0] = material.opacity;
338	344	display.options2[1] = material.diffuse;
339	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]);
340	349
341	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]);
342	354	display.options4[0] = material.cameralight/0.2f;
343	355	display.options4[1] = material.subsurface;
344	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]);
345	360
346	361	// if (display.CURRENTANTIALIAS > 0)
347	362	// display.options3[3] /= 4;
..	..	@@ -357,7 +372,7 @@
357	372	/**/
358	373	} else
359	374	{
360		- DrawMaterial(material, selected);
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
361	376	}
362	377	} else
363	378	{
..	..	@@ -381,8 +396,8 @@
381	396	cStatic.objectstack[materialdepth++] = obj;
382	397	//System.out.println("material " + material);
383	398	//Applet3D.tracein("selected ", selected);
384		- display.vector2buffer = obj.projectedVertices;
385		- display.DrawMaterial(material, selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
386	401	}
387	402	}
388	403
..	..	@@ -399,8 +414,8 @@
399	414	materialdepth -= 1;
400	415	if (materialdepth > 0)
401	416	{
402		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
403		- 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);
404	419	}
405	420	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
406	421	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -420,8 +435,8 @@
420	435	materialdepth -= 1;
421	436	if (materialdepth > 0)
422	437	{
423		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
424		- 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);
425	440	}
426	441	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
427	442	//else
..	..	@@ -462,10 +477,12 @@
462	477	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463	478	{
464	479	//gl.glBegin(gl.GL_TRIANGLES);
465		- 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	+ ;
466	483	if (!hasnorm)
467	484	{
468		- // System.out.println("FUCK!!");
	485	+ // System.out.println("Mesh normal");
469	486	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
470	487	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
471	488	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1190,10 +1207,12 @@
1190	1207	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1191	1208	}
1192	1209	}
	1210	+
1193	1211	if (flipV)
1194	1212	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1195	1213	else
1196	1214	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1215	+
1197	1216	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1198	1217	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1199	1218
..	..	@@ -1213,10 +1232,12 @@
1213	1232	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1214	1233	}
1215	1234	}
	1235	+
1216	1236	if (flipV)
1217	1237	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1218	1238	else
1219	1239	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1240	+
1220	1241	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1221	1242	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1222	1243
..	..	@@ -1244,8 +1265,10 @@
1244	1265	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1245	1266	else
1246	1267	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
1247	1269	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1248	1270	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1271	+
1249	1272	count2 += 2;
1250	1273	count3 += 3;
1251	1274	}
..	..	@@ -1601,7 +1624,7 @@
1601	1624	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1602	1625	}
1603	1626
1604		- void DrawMaterial(cMaterial material, boolean selected)
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1605	1628	{
1606	1629	CameraPane display = this;
1607	1630	//new Exception().printStackTrace();
..	..	@@ -1628,7 +1651,7 @@
1628	1651
1629	1652	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1630	1653
1631		- float[] colorV = GrafreeD.colorV;
	1654	+ float[] colorV = Grafreed.colorV;
1632	1655
1633	1656	/**/
1634	1657	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1636,7 +1659,7 @@
1636	1659	colorV[0] = display.modelParams0[0] * material.diffuse;
1637	1660	colorV[1] = display.modelParams0[1] * material.diffuse;
1638	1661	colorV[2] = display.modelParams0[2] * material.diffuse;
1639		- colorV[3] = material.opacity;
	1662	+ colorV[3] = 1; // material.opacity;
1640	1663
1641	1664	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1642	1665	//System.out.println("Opacity = " + opacity);
..	..	@@ -1744,9 +1767,9 @@
1744	1767	display.modelParams7[2] = 0;
1745	1768	display.modelParams7[3] = 0;
1746	1769
1747		- display.modelParams6[0] = 100; // criss de bug de bump
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
1748	1771
1749		- Object3D.cVector2[] extparams = display.vector2buffer;
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1750	1773	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1751	1774	{
1752	1775	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1888,7 +1911,7 @@
1888	1911	void PushMatrix(double[][] matrix)
1889	1912	{
1890	1913	// GrafreeD.tracein(matrix);
1891		- PushMatrix(matrix,1);
	1914	+ PushMatrix(matrix, 1);
1892	1915	}
1893	1916
1894	1917	void PushMatrix()
..	..	@@ -2042,7 +2065,7 @@
2042	2065	//System.err.println("Oeil on");
2043	2066	OEIL = true;
2044	2067	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2045		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2068	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2046	2069	//pingthread.StepToTarget(true);
2047	2070	}
2048	2071
..	..	@@ -2140,7 +2163,7 @@
2140	2163	System.err.println("LIVE = " + Globals.isLIVE());
2141	2164
2142	2165	if (!Globals.isLIVE()) // save sound
2143		- GrafreeD.savesound = true; // wav.save();
	2166	+ Grafreed.savesound = true; // wav.save();
2144	2167	// else
2145	2168	repaint(); // start loop // may 2013
2146	2169	}
..	..	@@ -2257,7 +2280,7 @@
2257	2280
2258	2281	void ToggleDebug()
2259	2282	{
2260		- DEBUG ^= true;
	2283	+ Globals.DEBUG ^= true;
2261	2284	}
2262	2285
2263	2286	void ToggleLookAt()
..	..	@@ -2265,9 +2288,9 @@
2265	2288	LOOKAT ^= true;
2266	2289	}
2267	2290
2268		- void ToggleRandom()
	2291	+ void ToggleSwitch()
2269	2292	{
2270		- RANDOM ^= true;
	2293	+ SWITCH ^= true;
2271	2294	}
2272	2295
2273	2296	void ToggleHandles()
..	..	@@ -2275,10 +2298,17 @@
2275	2298	HANDLES ^= true;
2276	2299	}
2277	2300
	2301	+ Object3D paintFolder;
	2302	+
2278	2303	void TogglePaint()
2279	2304	{
2280	2305	PAINTMODE ^= true;
2281	2306	paintcount = 0;
	2307	+
	2308	+ if (PAINTMODE)
	2309	+ {
	2310	+ paintFolder = GetFolder();
	2311	+ }
2282	2312	}
2283	2313
2284	2314	void SwapCamera(int a, int b)
..	..	@@ -2374,7 +2404,7 @@
2374	2404	{
2375	2405	return currentGL;
2376	2406	}
2377		-
	2407	+
2378	2408	/**/
2379	2409	class CacheTexture
2380	2410	{
..	..	@@ -2392,9 +2422,10 @@
2392	2422	/**/
2393	2423
2394	2424	// TEXTURE static Texture texture;
2395		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2396		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2397		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2425	+ static public java.util.Hashtable<String, CacheTexture> textures = new java.util.Hashtable<String, CacheTexture>();
	2426	+ static public java.util.Hashtable<BufferedImage, CacheTexture> bimtextures = new java.util.Hashtable<BufferedImage, CacheTexture>();
	2427	+ static public java.util.HashSet<String> usedtextures = new java.util.HashSet<String>();
	2428	+
2398	2429	int pigmentdepth = 0;
2399	2430	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2400	2431	int bumpdepth = 0;
..	..	@@ -2416,6 +2447,33 @@
2416	2447	true,
2417	2448	com.sun.opengl.util.texture.TextureIO.PNG);
2418	2449	} catch (java.io.IOException e)
	2450	+ {
	2451	+ throw new javax.media.opengl.GLException(e);
	2452	+ }
	2453	+
	2454	+ if (bump)
	2455	+ texturedata = ConvertBump(texturedata, false);
	2456	+
	2457	+ com.sun.opengl.util.texture.Texture texture =
	2458	+ com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2459	+
	2460	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2461	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2462	+
	2463	+ return texture;
	2464	+ }
	2465	+
	2466	+ com.sun.opengl.util.texture.Texture GetBimTexture(BufferedImage name, boolean bump)
	2467	+ {
	2468	+ TextureData texturedata = null;
	2469	+
	2470	+ try
	2471	+ {
	2472	+ texturedata =
	2473	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2474	+ name,
	2475	+ true);
	2476	+ } catch (Exception e)
2419	2477	{
2420	2478	throw new javax.media.opengl.GLException(e);
2421	2479	}
..	..	@@ -3502,6 +3560,8 @@
3502	3560
3503	3561	System.out.println("LOADING TEXTURE : " + name);
3504	3562
	3563	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3564	+
3505	3565	//
3506	3566	if (false) // compressbit > 0)
3507	3567	{
..	..	@@ -7900,7 +7960,7 @@
7900	7960	String pigment = Object3D.GetPigment(tex);
7901	7961	String bump = Object3D.GetBump(tex);
7902	7962
7903		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7963	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7904	7964	{
7905	7965	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7906	7966	// System.out.println("; bump = " + bump);
..	..	@@ -7917,6 +7977,64 @@
7917	7977
7918	7978	ReleaseTexture(bump, true);
7919	7979	ReleaseTexture(pigment, false);
	7980	+ }
	7981	+
	7982	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7983	+ {
	7984	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7985	+ {
	7986	+ return;
	7987	+ }
	7988	+
	7989	+ if (tex == null)
	7990	+ {
	7991	+ ReleaseTexture(null, false);
	7992	+ return;
	7993	+ }
	7994	+
	7995	+ String pigment = Object3D.GetPigment(tex);
	7996	+
	7997	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7998	+ {
	7999	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8000	+ // System.out.println("; bump = " + bump);
	8001	+ }
	8002	+
	8003	+ if (pigment.equals(""))
	8004	+ {
	8005	+ pigment = null;
	8006	+ }
	8007	+
	8008	+ ReleaseTexture(pigment, false);
	8009	+ }
	8010	+
	8011	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8012	+ {
	8013	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8014	+ {
	8015	+ return;
	8016	+ }
	8017	+
	8018	+ if (tex == null)
	8019	+ {
	8020	+ ReleaseTexture(null, true);
	8021	+ return;
	8022	+ }
	8023	+
	8024	+ String bump = Object3D.GetBump(tex);
	8025	+
	8026	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8027	+ {
	8028	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8029	+ // System.out.println("; bump = " + bump);
	8030	+ }
	8031	+
	8032	+ if (bump.equals(""))
	8033	+ {
	8034	+ bump = null;
	8035	+ }
	8036	+
	8037	+ ReleaseTexture(bump, true);
7920	8038	}
7921	8039
7922	8040	void ReleaseTexture(String tex, boolean bump)
..	..	@@ -8022,7 +8140,55 @@
8022	8140	}
8023	8141	}
8024	8142
8025		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8143	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8144	+ {
	8145	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8146	+// ambientOcclusion ) // \|\| !textureon)
	8147	+// {
	8148	+// return; // false;
	8149	+// }
	8150	+//
	8151	+// if (tex == null)
	8152	+// {
	8153	+// BindTexture(null,false,resolution);
	8154	+// BindTexture(null,true,resolution);
	8155	+// return;
	8156	+// }
	8157	+//
	8158	+// String pigment = Object3D.GetPigment(tex);
	8159	+// String bump = Object3D.GetBump(tex);
	8160	+//
	8161	+// usedtextures.add(pigment);
	8162	+// usedtextures.add(bump);
	8163	+//
	8164	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8165	+// {
	8166	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8167	+// // System.out.println("; bump = " + bump);
	8168	+// }
	8169	+//
	8170	+// if (bump.equals(""))
	8171	+// {
	8172	+// bump = null;
	8173	+// }
	8174	+// if (pigment.equals(""))
	8175	+// {
	8176	+// pigment = null;
	8177	+// }
	8178	+//
	8179	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8180	+// BindTexture(pigment, false, resolution);
	8181	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8182	+// BindTexture(bump, true, resolution);
	8183	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8184	+//
	8185	+// return; // true;
	8186	+
	8187	+ BindPigmentTexture(tex, resolution);
	8188	+ BindBumpTexture(tex, resolution);
	8189	+ }
	8190	+
	8191	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8026	8192	{
8027	8193	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8028	8194	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8032,18 +8198,48 @@
8032	8198
8033	8199	if (tex == null)
8034	8200	{
8035		- BindTexture(null,false,resolution);
8036		- BindTexture(null,true,resolution);
	8201	+ BindTexture(null, null,false,resolution);
8037	8202	return;
8038	8203	}
8039	8204
8040	8205	String pigment = Object3D.GetPigment(tex);
	8206	+
	8207	+ usedtextures.add(pigment);
	8208	+
	8209	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8210	+ {
	8211	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8212	+ // System.out.println("; bump = " + bump);
	8213	+ }
	8214	+
	8215	+ if (pigment.equals(""))
	8216	+ {
	8217	+ pigment = null;
	8218	+ }
	8219	+
	8220	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8221	+ BindTexture(tex.pigmenttexture, pigment, false, resolution);
	8222	+ }
	8223	+
	8224	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8225	+ {
	8226	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8227	+ ambientOcclusion ) // \|\| !textureon)
	8228	+ {
	8229	+ return; // false;
	8230	+ }
	8231	+
	8232	+ if (tex == null)
	8233	+ {
	8234	+ BindTexture(null, null,true,resolution);
	8235	+ return;
	8236	+ }
	8237	+
8041	8238	String bump = Object3D.GetBump(tex);
8042	8239
8043		- usedtextures.put(pigment, pigment);
8044		- usedtextures.put(bump, bump);
	8240	+ usedtextures.add(bump);
8045	8241
8046		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8242	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8047	8243	{
8048	8244	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8049	8245	// System.out.println("; bump = " + bump);
..	..	@@ -8053,42 +8249,70 @@
8053	8249	{
8054	8250	bump = null;
8055	8251	}
8056		- if (pigment.equals(""))
8057		- {
8058		- pigment = null;
8059		- }
8060	8252
8061		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8062		- BindTexture(pigment, false, resolution);
8063	8253	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8064		- BindTexture(bump, true, resolution);
	8254	+ BindTexture(tex.bumptexture, bump, true, resolution);
8065	8255	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8066		-
8067		- return; // true;
8068	8256	}
8069	8257
8070		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8258	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8259	+
	8260	+ private boolean FileExists(String tex)
8071	8261	{
8072		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8262	+ if (missingTextures.contains(tex))
	8263	+ {
	8264	+ return false;
	8265	+ }
	8266	+
	8267	+ boolean fileExists = new File(tex).exists();
	8268	+
	8269	+ if (!fileExists)
	8270	+ {
	8271	+ // If file exists, the "new File()" is not executed sgain
	8272	+ missingTextures.add(tex);
	8273	+ }
	8274	+
	8275	+ return fileExists;
	8276	+ }
	8277	+
	8278	+ CacheTexture GetCacheTexture(java.awt.image.BufferedImage bim, String tex, boolean bump, int resolution) throws Exception
	8279	+ {
	8280	+ CacheTexture texturecache = null;
8073	8281
8074	8282	if (tex != null)
8075	8283	{
8076	8284	String texname = tex;
8077	8285
8078		- String[] split = tex.split("Textures");
8079		- if (split.length > 1)
8080		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8081		- else
8082		- if (!texname.startsWith("/"))
8083		- texname = "/Users/nbriere/Textures/" + texname;
	8286	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8287	+
	8288	+// String[] split = tex.split("Textures");
	8289	+// if (split.length > 1)
	8290	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8291	+// else
	8292	+// if (!texname.startsWith("/"))
	8293	+// texname = "/Users/nbriere/Textures/" + texname;
	8294	+ if (!FileExists(tex))
	8295	+ {
	8296	+ texname = fallbackTextureName;
	8297	+ }
8084	8298
8085	8299	if (CACHETEXTURE)
8086		- texture = textures.get(texname); // TEXTURE CACHE
8087		-
8088		- TextureData texturedata = null;
8089		-
8090		- if (texture == null \|\| texture.resolution < resolution)
8091	8300	{
	8301	+ if (bim == null)
	8302	+ texturecache = textures.get(texname); // TEXTURE CACHE
	8303	+ else
	8304	+ texturecache = bimtextures.get(bim); // TEXTURE CACHE
	8305	+ }
	8306	+
	8307	+ if (texturecache == null \|\| texturecache.resolution < resolution)
	8308	+ {
	8309	+ TextureData texturedata = null;
	8310	+
	8311	+ if (bim == null)
	8312	+ {
	8313	+
	8314	+ }
	8315	+ else
8092	8316	if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8093	8317	{
8094	8318	assert(!bump);
..	..	@@ -8100,19 +8324,19 @@
8100	8324	// }
8101	8325	// else
8102	8326	// {
8103		- texture = textures.get(tex);
8104		- if (texture == null)
	8327	+ texturecache = textures.get(tex);
	8328	+ if (texturecache == null)
8105	8329	{
8106		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8330	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8107	8331	}
8108	8332	// }
8109	8333	} else
8110	8334	if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8111	8335	{
8112	8336	assert(bump);
8113		- texture = textures.get(tex);
8114		- if (texture == null)
8115		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8337	+ texturecache = textures.get(tex);
	8338	+ if (texturecache == null)
	8339	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8116	8340	} else
8117	8341	{
8118	8342	//if (tex.equals("IMMORTAL"))
..	..	@@ -8122,9 +8346,9 @@
8122	8346	//{
8123	8347	if (tex.equals("WHITE_NOISE"))
8124	8348	{
8125		- texture = textures.get(tex);
8126		- if (texture == null)
8127		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8349	+ texturecache = textures.get(tex);
	8350	+ if (texturecache == null)
	8351	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
8128	8352	} else
8129	8353	{
8130	8354	if (textureon)
..	..	@@ -8149,7 +8373,7 @@
8149	8373	}
8150	8374
8151	8375	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8152		- if (!new File(cachename).exists())
	8376	+ if (!FileExists(cachename))
8153	8377	cachename = texname;
8154	8378	else
8155	8379	processbump = false; // don't process bump map again
..	..	@@ -8171,7 +8395,7 @@
8171	8395	}
8172	8396
8173	8397	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8174		- if (!new File(cachename).exists())
	8398	+ if (!FileExists(cachename))
8175	8399	cachename = texname;
8176	8400	else
8177	8401	processbump = false; // don't process bump map again
..	..	@@ -8180,20 +8404,22 @@
8180	8404	texturedata = GetFileTexture(cachename, processbump, resolution);
8181	8405
8182	8406
8183		- if (texturedata != null)
8184		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8407	+ if (texturedata == null)
	8408	+ throw new Exception();
	8409	+
	8410	+ texturecache = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8185	8411	//texture = GetTexture(tex, bump);
8186	8412	}
8187	8413	}
8188	8414	//}
8189	8415	}
8190	8416
8191		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8417	+ if (/CACHETEXTURE &&/ texturecache != null && textureon)
8192	8418	{
8193	8419	//return false;
8194	8420
8195	8421	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8196		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8422	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8197	8423	{
8198	8424	// String ext = "_highres";
8199	8425	// if (REDUCETEXTURE)
..	..	@@ -8282,8 +8508,8 @@
8282	8508	textures.remove(texname);
8283	8509	}
8284	8510
8285		- texture.texturedata = texturedata;
8286		- textures.put(texname, texture);
	8511	+ //texture.texturedata = texturedata;
	8512	+ textures.put(texname, texturecache);
8287	8513
8288	8514	// newtex = true;
8289	8515	}
..	..	@@ -8299,12 +8525,12 @@
8299	8525	}
8300	8526	}
8301	8527
8302		- return texture;
	8528	+ return texturecache;
8303	8529	}
8304	8530
8305		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8531	+ com.sun.opengl.util.texture.Texture GetTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
8306	8532	{
8307		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8533	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
8308	8534
8309	8535	if (bump)
8310	8536	{
..	..	@@ -8320,23 +8546,23 @@
8320	8546	return texture!=null?texture.texture:null;
8321	8547	}
8322	8548
8323		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8549	+ public com.sun.opengl.util.texture.TextureData GetTextureData(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
8324	8550	{
8325		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8551	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
8326	8552
8327	8553	return texture!=null?texture.texturedata:null;
8328	8554	}
8329	8555
8330		- boolean BindTexture(String tex, boolean bump, int resolution)
	8556	+ boolean BindTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
8331	8557	{
8332	8558	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8333	8559	{
8334	8560	return false;
8335	8561	}
8336	8562
8337		- boolean newtex = false;
	8563	+ //boolean newtex = false;
8338	8564
8339		- com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
	8565	+ com.sun.opengl.util.texture.Texture texture = GetTexture(stream, tex, bump, resolution);
8340	8566
8341	8567	if (texture == null)
8342	8568	return false;
..	..	@@ -8366,7 +8592,7 @@
8366	8592	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8367	8593	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8368	8594
8369		- return newtex;
	8595	+ return true; // Warning: not used.
8370	8596	}
8371	8597
8372	8598	ShadowBuffer shadowPBuf;
..	..	@@ -9204,11 +9430,35 @@
9204	9430	jy8[3] = 0.5f;
9205	9431	}
9206	9432
9207		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9433	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9208	9434	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9209	9435	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9210	9436	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9211	9437
	9438	+ void ResetOptions()
	9439	+ {
	9440	+ options1[0] = 100;
	9441	+ options1[1] = 0.025f;
	9442	+ options1[2] = 0.01f;
	9443	+ options1[3] = 0;
	9444	+ options1[4] = 0;
	9445	+
	9446	+ options2[0] = 0;
	9447	+ options2[1] = 0.75f;
	9448	+ options2[2] = 0;
	9449	+ options2[3] = 0;
	9450	+
	9451	+ options3[0] = 1;
	9452	+ options3[1] = 1;
	9453	+ options3[2] = 1;
	9454	+ options3[3] = 0;
	9455	+
	9456	+ options4[0] = 1;
	9457	+ options4[1] = 0;
	9458	+ options4[2] = 1;
	9459	+ options4[3] = 0;
	9460	+ }
	9461	+
9212	9462	static int imagecount = 0; // movie generation
9213	9463
9214	9464	static int jitter = 0;
..	..	@@ -9304,8 +9554,8 @@
9304	9554	assert (parentcam != renderCamera);
9305	9555
9306	9556	if (renderCamera != lightCamera)
9307		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9308		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9557	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9558	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9309	9559
9310	9560	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9311	9561
..	..	@@ -9320,8 +9570,8 @@
9320	9570	LA.matCopy(renderCamera.fromScreen, matrix);
9321	9571
9322	9572	if (renderCamera != lightCamera)
9323		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9324		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9573	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9574	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9325	9575
9326	9576	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9327	9577
..	..	@@ -9538,7 +9788,7 @@
9538	9788
9539	9789	if (!BOXMODE)
9540	9790	{
9541		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9791	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9542	9792	}
9543	9793
9544	9794	if (!BOXMODE)
..	..	@@ -9576,7 +9826,7 @@
9576	9826	ABORTED = false;
9577	9827	}
9578	9828	else
9579		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9829	+ Grafreed.wav.cursor += 735 * ACSIZE;
9580	9830
9581	9831	if (false)
9582	9832	{
..	..	@@ -10239,11 +10489,11 @@
10239	10489
10240	10490	public void display(GLAutoDrawable drawable)
10241	10491	{
10242		- if (GrafreeD.savesound && GrafreeD.hassound)
	10492	+ if (Grafreed.savesound && Grafreed.hassound)
10243	10493	{
10244		- GrafreeD.wav.save();
10245		- GrafreeD.savesound = false;
10246		- GrafreeD.hassound = false;
	10494	+ Grafreed.wav.save();
	10495	+ Grafreed.savesound = false;
	10496	+ Grafreed.hassound = false;
10247	10497	}
10248	10498	// if (DEBUG_SELECTION)
10249	10499	// {
..	..	@@ -10319,6 +10569,7 @@
10319	10569	ANTIALIAS = 0;
10320	10570	//System.out.println("RESTART");
10321	10571	AAtimer.restart();
	10572	+ Globals.TIMERRUNNING = true;
10322	10573	}
10323	10574	}
10324	10575	}
..	..	@@ -10373,7 +10624,7 @@
10373	10624	Object3D theobject = object;
10374	10625	Object3D theparent = object.parent;
10375	10626	object.parent = null;
10376		- object = (Object3D)GrafreeD.clone(object);
	10627	+ object = (Object3D)Grafreed.clone(object);
10377	10628	object.Stripify();
10378	10629	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10379	10630	theobject.PreprocessOcclusion(this);
..	..	@@ -10386,13 +10637,14 @@
10386	10637	ambientOcclusion = false;
10387	10638	}
10388	10639
10389		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10640	+ if (//Globals.lighttouched &&
	10641	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10390	10642	{
10391	10643	//if (RENDERSHADOW) // ?
10392	10644	if (!IsFrozen())
10393	10645	{
10394	10646	// dec 2012
10395		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10647	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10396	10648	{
10397	10649	Globals.framecount++;
10398	10650	shadowbuffer.display();
..	..	@@ -10519,8 +10771,8 @@
10519	10771
10520	10772	// if (parentcam != renderCamera) // not a light
10521	10773	if (cam != lightCamera)
10522		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10523		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10774	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10775	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10524	10776
10525	10777	for (int j = 0; j < 4; j++)
10526	10778	{
..	..	@@ -10534,8 +10786,8 @@
10534	10786
10535	10787	// if (parentcam != renderCamera) // not a light
10536	10788	if (cam != lightCamera)
10537		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10538		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10789	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10790	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10539	10791
10540	10792	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10541	10793
..	..	@@ -10794,7 +11046,16 @@
10794	11046	// Bump noise
10795	11047	gl.glActiveTexture(GL.GL_TEXTURE6);
10796	11048	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10797		- BindTexture(NOISE_TEXTURE, false, 2);
	11049	+
	11050	+ try
	11051	+ {
	11052	+ BindTexture(null, NOISE_TEXTURE, false, 2);
	11053	+ }
	11054	+ catch (Exception e)
	11055	+ {
	11056	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11057	+ }
	11058	+
10798	11059
10799	11060	gl.glActiveTexture(GL.GL_TEXTURE0);
10800	11061	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10817,9 +11078,9 @@
10817	11078
10818	11079	gl.glMatrixMode(GL.GL_MODELVIEW);
10819	11080
10820		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10821		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10822		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11081	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11082	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11083	+gl.glEnable(gl.GL_MULTISAMPLE);
10823	11084	} else
10824	11085	{
10825	11086	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10830,7 +11091,7 @@
10830	11091	//System.out.println("BLENDING ON");
10831	11092	gl.glEnable(GL.GL_BLEND);
10832	11093	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10833		-
	11094	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10834	11095	gl.glMatrixMode(gl.GL_PROJECTION);
10835	11096	gl.glLoadIdentity();
10836	11097
..	..	@@ -10919,8 +11180,8 @@
10919	11180	System.err.println("parentcam != renderCamera");
10920	11181
10921	11182	// if (cam != lightCamera)
10922		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10923		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11183	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11184	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10924	11185	}
10925	11186
10926	11187	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10941,8 +11202,8 @@
10941	11202	if (true) // TODO
10942	11203	{
10943	11204	if (cam != lightCamera)
10944		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10945		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11205	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11206	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10946	11207	}
10947	11208
10948	11209	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11279,23 +11540,44 @@
11279	11540	e.printStackTrace();
11280	11541	}
11281	11542
11282		- if (GrafreeD.RENDERME > 0)
11283		- GrafreeD.RENDERME--; // mechante magouille
	11543	+ if (Grafreed.RENDERME > 0)
	11544	+ Grafreed.RENDERME--; // mechante magouille
11284	11545
11285	11546	Globals.ONESTEP = false;
11286	11547	}
11287	11548
11288	11549	static boolean zoomonce = false;
11289	11550
	11551	+ static void CreateSelectedPoint()
	11552	+ {
	11553	+ if (selectedpoint == null)
	11554	+ {
	11555	+ debugpointG = new Sphere();
	11556	+ debugpointP = new Sphere();
	11557	+ debugpointC = new Sphere();
	11558	+ debugpointR = new Sphere();
	11559	+
	11560	+ selectedpoint = new Superellipsoid();
	11561	+
	11562	+ for (int i=0; i<8; i++)
	11563	+ {
	11564	+ debugpoints[i] = new Sphere();
	11565	+ }
	11566	+ }
	11567	+ }
	11568	+
11290	11569	void DrawObject(GL gl, boolean draw)
11291	11570	{
	11571	+ // To clear camera values
	11572	+ ResetOptions();
	11573	+
11292	11574	//System.out.println("DRAW OBJECT " + mouseDown);
11293	11575	// DrawMode() = SELECTION;
11294	11576	//GL gl = getGL();
11295	11577	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11296	11578	{
11297	11579	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11298		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11580	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11299	11581	pingthread.StepToTarget(true); // true);
11300	11582	// zoomonce = false;
11301	11583	}
..	..	@@ -11350,7 +11632,14 @@
11350	11632
11351	11633	usedtextures.clear();
11352	11634
11353		- BindTextures(DEFAULT_TEXTURES, 2);
	11635	+ try
	11636	+ {
	11637	+ BindTextures(DEFAULT_TEXTURES, 2);
	11638	+ }
	11639	+ catch (Exception e)
	11640	+ {
	11641	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11642	+ }
11354	11643	}
11355	11644	//System.out.println("--> " + stackdepth);
11356	11645	// GrafreeD.traceon();
..	..	@@ -11360,8 +11649,9 @@
11360	11649
11361	11650	if (DrawMode() == DEFAULT)
11362	11651	{
11363		- if (DEBUG)
	11652	+ if (Globals.DEBUG)
11364	11653	{
	11654	+ CreateSelectedPoint();
11365	11655	float radius = 0.05f;
11366	11656	if (selectedpoint.radius != radius)
11367	11657	{
..	..	@@ -11424,7 +11714,7 @@
11424	11714	if (tex.equals("WHITE_NOISE"))
11425	11715	continue;
11426	11716
11427		- if (!usedtextures.containsKey(tex))
	11717	+ if (!usedtextures.contains(tex))
11428	11718	{
11429	11719	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11430	11720	textures.get(tex).texture.dispose();
..	..	@@ -11441,7 +11731,14 @@
11441	11731	if (checker != null && DrawMode() == DEFAULT)
11442	11732	{
11443	11733	//BindTexture(IMMORTAL_TEXTURE);
11444		- BindTextures(checker.GetTextures(), checker.texres);
	11734	+ try
	11735	+ {
	11736	+ BindTextures(checker.GetTextures(), checker.texres);
	11737	+ }
	11738	+ catch (Exception e)
	11739	+ {
	11740	+ System.err.println("FAILED: " + checker.GetTextures());
	11741	+ }
11445	11742	// NEAREST
11446	11743	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11447	11744	DrawChecker(gl);
..	..	@@ -11523,7 +11820,7 @@
11523	11820	return;
11524	11821	}
11525	11822
11526		- String string = obj.GetToolTip();
	11823	+ String string = obj.toString(); //.GetToolTip();
11527	11824
11528	11825	GL gl = GetGL();
11529	11826
..	..	@@ -11840,8 +12137,8 @@
11840	12137	//obj.TransformToWorld(light, light);
11841	12138	for (int i = tp.size(); --i >= 0;)
11842	12139	{
11843		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11844		- LA.xformPos(light, tp.get(i).toParent, light);
	12140	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12141	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11845	12142	}
11846	12143
11847	12144
..	..	@@ -11858,8 +12155,8 @@
11858	12155	parentcam = cameras[0];
11859	12156	}
11860	12157
11861		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11862		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12158	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12159	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11863	12160
11864	12161	LA.xformPos(light, renderCamera.toScreen, light);
11865	12162
..	..	@@ -12473,8 +12770,8 @@
12473	12770
12474	12771	// display shadow only (bump == 0)
12475	12772	"SUB temp.x, half.x, shadow.x;" +
12476		- "MOV temp.y, -params6.x;" +
12477		- "SLT temp.z, temp.y, zero.x;" +
	12773	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12774	+ "SLT temp.z, temp.y, -one2048th.x;" +
12478	12775	"SUB temp.y, one.x, temp.z;" +
12479	12776	"MUL temp.x, temp.x, temp.y;" +
12480	12777	"KIL temp.x;" +
..	..	@@ -12754,7 +13051,7 @@
12754	13051	"MUL final.y, fragment.texcoord[0].x, c256;" +
12755	13052	"FLR final.x, final.y;" +
12756	13053	"SUB final.y, final.y, final.x;" +
12757		- //"MUL final.x, final.x, c256i;" +
	13054	+ "MUL final.x, final.x, c256i;" +
12758	13055	"MOV final.z, zero.x;" +
12759	13056	"MOV final.a, one.w;":""
12760	13057	) +
..	..	@@ -12762,7 +13059,7 @@
12762	13059	"MUL final.y, fragment.texcoord[0].y, c256;" +
12763	13060	"FLR final.x, final.y;" +
12764	13061	"SUB final.y, final.y, final.x;" +
12765		- //"MUL final.x, final.x, c256i;" +
	13062	+ "MUL final.x, final.x, c256i;" +
12766	13063	"MOV final.z, zero.x;" +
12767	13064	"MOV final.a, one.w;":""
12768	13065	) +
..	..	@@ -12805,7 +13102,7 @@
12805	13102	//once = true;
12806	13103	}
12807	13104
12808		- System.out.print("Program #" + mode + "; length = " + program.length());
	13105	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12809	13106	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12810	13107	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12811	13108
..	..	@@ -12938,12 +13235,16 @@
12938	13235
12939	13236	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12940	13237	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13238	+
	13239	+ // Compare fragment depth in light space with shadowmap.
12941	13240	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12942	13241	"SGE temp.y, temp.x, zero.x;" +
12943		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13242	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13243	+
	13244	+ // Reverse comparison
12944	13245	"SUB temp.x, one.x, temp.x;" +
12945	13246	"MUL " + shadow + ".x, temp.x, temp.y;" +
12946		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13247	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12947	13248	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12948	13249
12949	13250	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12957,6 +13258,10 @@
12957	13258	// No shadow for backface
12958	13259	"DP3 temp.x, normal, lightd;" +
12959	13260	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13261	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13262	+
	13263	+ // No shadow when out of frustrum
	13264	+ "SGE temp.x, " + depth + ".z, one.z;" +
12960	13265	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12961	13266	"";
12962	13267	}
..	..	@@ -13103,7 +13408,8 @@
13103	13408	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13104	13409	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13105	13410	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13106		- Object3D.cVector2[] vector2buffer;
	13411	+
	13412	+ //Object3D.cVector2[] vector2buffer;
13107	13413
13108	13414	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13109	13415	// OUT : diff, spec
..	..	@@ -13119,9 +13425,10 @@
13119	13425	"DP3 " + dest + ".z," + "normals," + "eye;" +
13120	13426	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13121	13427	//"MOV " + dest + ".w," + "normal.z;" +
13122		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13123		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13124		- //"MOV " + dest + ".z," + "params2.w;" +
	13428	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13429	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13430	+
	13431	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13125	13432	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13126	13433	"RCP " + dest + ".w," + dest + ".w;" +
13127	13434	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13515,7 +13822,7 @@
13515	13822	public void mousePressed(MouseEvent e)
13516	13823	{
13517	13824	//System.out.println("mousePressed: " + e);
13518		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13825	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13519	13826	}
13520	13827
13521	13828	static long prevtime = 0;
..	..	@@ -13591,8 +13898,8 @@
13591	13898	// mode \|= META;
13592	13899	//}
13593	13900
13594		- SetMouseMode(WHEEL \| e.getModifiersEx());
13595		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13901	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13902	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13596	13903	anchorX = ax;
13597	13904	anchorY = ay;
13598	13905	prevX = px;
..	..	@@ -13626,6 +13933,7 @@
13626	13933	else
13627	13934	if (evt.getSource() == AAtimer)
13628	13935	{
	13936	+ Globals.TIMERRUNNING = false;
13629	13937	if (mouseDown)
13630	13938	{
13631	13939	//new Exception().printStackTrace();
..	..	@@ -13651,6 +13959,10 @@
13651	13959	// LIVE = waslive;
13652	13960	// wasliveok = true;
13653	13961	// waslive = false;
	13962	+
	13963	+ // May 2019 Forget it:
	13964	+ if (true)
	13965	+ return;
13654	13966
13655	13967	// source == timer
13656	13968	if (mouseDown)
..	..	@@ -13681,7 +13993,7 @@
13681	13993
13682	13994	// fev 2014???
13683	13995	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13684		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	13996	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13685	13997	pingthread.StepToTarget(true); // true);
13686	13998	}
13687	13999	// if (!LIVE)
..	..	@@ -13690,12 +14002,13 @@
13690	14002
13691	14003	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13692	14004
13693		- void clickStart(int x, int y, int modifiers)
	14005	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13694	14006	{
13695	14007	if (!wasliveok)
13696	14008	return;
13697	14009
13698	14010	AAtimer.restart(); //
	14011	+ Globals.TIMERRUNNING = true;
13699	14012
13700	14013	// waslive = LIVE;
13701	14014	// LIVE = false;
..	..	@@ -13707,7 +14020,7 @@
13707	14020	// touched = true; // main DL
13708	14021	if (isRenderer)
13709	14022	{
13710		- SetMouseMode(modifiers);
	14023	+ SetMouseMode(modifiers, modifiersex);
13711	14024	}
13712	14025
13713	14026	selectX = anchorX = x;
..	..	@@ -13720,7 +14033,7 @@
13720	14033	clicked = true;
13721	14034	hold = false;
13722	14035
13723		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14036	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13724	14037	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13725	14038	{
13726	14039	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13751,7 +14064,7 @@
13751	14064	info.camera = renderCamera;
13752	14065	info.x = x;
13753	14066	info.y = y;
13754		- info.modifiers = modifiers;
	14067	+ info.modifiers = modifiersex;
13755	14068	editObj = object.doEditClick(info, 0);
13756	14069	if (!editObj)
13757	14070	{
..	..	@@ -13768,9 +14081,12 @@
13768	14081
13769	14082	public void mouseDragged(MouseEvent e)
13770	14083	{
	14084	+ Globals.MOUSEDRAGGED = true;
	14085	+
13771	14086	//System.out.println("mouseDragged: " + e);
13772	14087	if (isRenderer)
13773	14088	movingcamera = true;
	14089	+
13774	14090	//if (drawing)
13775	14091	//return;
13776	14092	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13780,7 +14096,7 @@
13780	14096	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13781	14097	}
13782	14098	else
13783		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14099	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13784	14100
13785	14101	//try { Thread.sleep(1); } catch (Exception ex) {}
13786	14102	}
..	..	@@ -14017,7 +14333,7 @@
14017	14333	{
14018	14334	Globals.lighttouched = true;
14019	14335	}
14020		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14336	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14021	14337	}
14022	14338	//else
14023	14339	}
..	..	@@ -14031,12 +14347,12 @@
14031	14347	void GoDown(int mod)
14032	14348	{
14033	14349	MODIFIERS \|= COMMAND;
14034		- /*
	14350	+ /**/
14035	14351	if((mod&SHIFT) == SHIFT)
14036	14352	manipCamera.RotatePosition(0, -speed);
14037	14353	else
14038		- manipCamera.BackForth(0, -speed*delta, getWidth());
14039		- */
	14354	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14355	+ /**/
14040	14356	if ((mod & SHIFT) == SHIFT)
14041	14357	{
14042	14358	mouseMode = mouseMode; // VR??
..	..	@@ -14052,12 +14368,12 @@
14052	14368	void GoUp(int mod)
14053	14369	{
14054	14370	MODIFIERS \|= COMMAND;
14055		- /*
	14371	+ /**/
14056	14372	if((mod&SHIFT) == SHIFT)
14057	14373	manipCamera.RotatePosition(0, speed);
14058	14374	else
14059		- manipCamera.BackForth(0, speed*delta, getWidth());
14060		- */
	14375	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14376	+ /**/
14061	14377	if ((mod & SHIFT) == SHIFT)
14062	14378	{
14063	14379	mouseMode = mouseMode;
..	..	@@ -14073,12 +14389,12 @@
14073	14389	void GoLeft(int mod)
14074	14390	{
14075	14391	MODIFIERS \|= COMMAND;
14076		- /*
	14392	+ /**/
14077	14393	if((mod&SHIFT) == SHIFT)
14078		- manipCamera.RotatePosition(speed, 0);
14079		- else
14080	14394	manipCamera.Translate(speed*delta, 0, getWidth());
14081		- */
	14395	+ else
	14396	+ manipCamera.RotatePosition(speed, 0);
	14397	+ /**/
14082	14398	if ((mod & SHIFT) == SHIFT)
14083	14399	{
14084	14400	mouseMode = mouseMode;
..	..	@@ -14094,12 +14410,12 @@
14094	14410	void GoRight(int mod)
14095	14411	{
14096	14412	MODIFIERS \|= COMMAND;
14097		- /*
	14413	+ /**/
14098	14414	if((mod&SHIFT) == SHIFT)
14099		- manipCamera.RotatePosition(-speed, 0);
14100		- else
14101	14415	manipCamera.Translate(-speed*delta, 0, getWidth());
14102		- */
	14416	+ else
	14417	+ manipCamera.RotatePosition(-speed, 0);
	14418	+ /**/
14103	14419	if ((mod & SHIFT) == SHIFT)
14104	14420	{
14105	14421	mouseMode = mouseMode;
..	..	@@ -14117,7 +14433,7 @@
14117	14433	int X, Y;
14118	14434	boolean SX, SY;
14119	14435
14120		- void drag(int x, int y, int modifiers)
	14436	+ void drag(int x, int y, int modifiers, int modifiersex)
14121	14437	{
14122	14438	if (IsFrozen())
14123	14439	{
..	..	@@ -14126,17 +14442,17 @@
14126	14442
14127	14443	drag = true; // NEW
14128	14444
14129		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14445	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14130	14446
14131	14447	X = x;
14132	14448	Y = y;
14133	14449	// floating state for animation
14134		- MODIFIERS = modifiers;
14135		- modifiers &= ~1024;
	14450	+ MODIFIERS = modifiersex;
	14451	+ modifiersex &= ~1024;
14136	14452	if (false) // modifiers != 0)
14137	14453	{
14138	14454	//new Exception().printStackTrace();
14139		- System.out.println("mouseDragged: " + modifiers);
	14455	+ System.out.println("mouseDragged: " + modifiersex);
14140	14456	System.out.println("SHIFT = " + SHIFT);
14141	14457	System.out.println("CONTROL = " + COMMAND);
14142	14458	System.out.println("META = " + META);
..	..	@@ -14156,7 +14472,8 @@
14156	14472	info.camera = renderCamera;
14157	14473	info.x = x;
14158	14474	info.y = y;
14159		- object.editWindow.copy.doEditDrag(info);
	14475	+ object.GetWindow().copy
	14476	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14160	14477	} else
14161	14478	{
14162	14479	if (x < startX)
..	..	@@ -14320,7 +14637,9 @@
14320	14637	ci.camera = renderCamera;
14321	14638	if (!isRenderer)
14322	14639	{
14323		- if (object.editWindow.copy.doEditClick(ci, 0))
	14640	+ //ObjEditor editWindow = object.editWindow;
	14641	+ //Object3D copy = editWindow.copy;
	14642	+ if (object.doEditClick(ci, 0))
14324	14643	{
14325	14644	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14326	14645	} else
..	..	@@ -14332,7 +14651,11 @@
14332	14651
14333	14652	public void mouseReleased(MouseEvent e)
14334	14653	{
	14654	+ Globals.MOUSEDRAGGED = false;
	14655	+
14335	14656	movingcamera = false;
	14657	+ X = 0; // getBounds().width/2;
	14658	+ Y = 0; // getBounds().height/2;
14336	14659	//System.out.println("mouseReleased: " + e);
14337	14660	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14338	14661	}
..	..	@@ -14355,9 +14678,9 @@
14355	14678	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14356	14679	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14357	14680
14358		- if (control \|\| command \|\| IsFrozen())
	14681	+// No delay if (control \|\| command \|\| IsFrozen())
14359	14682	timeout = true;
14360		- else
	14683	+// ?? May 2019 else
14361	14684	// timer.setDelay((modifiers & 128) != 0?0:350);
14362	14685	mouseDown = false;
14363	14686	if (!control && !command) // june 2013
..	..	@@ -14467,7 +14790,7 @@
14467	14790	System.out.println("keyReleased: " + e);
14468	14791	}
14469	14792
14470		- void SetMouseMode(int modifiers)
	14793	+ void SetMouseMode(int modifiers, int modifiersex)
14471	14794	{
14472	14795	//System.out.println("SetMouseMode = " + modifiers);
14473	14796	//modifiers &= ~1024;
..	..	@@ -14479,25 +14802,25 @@
14479	14802	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14480	14803	// return;
14481	14804	//System.out.println("SetMode = " + modifiers);
14482		- if ((modifiers & WHEEL) == WHEEL)
	14805	+ if ((modifiersex & WHEEL) == WHEEL)
14483	14806	{
14484	14807	mouseMode \|= ZOOM;
14485	14808	}
14486	14809
14487	14810	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14488		- if (capsLocked \|\| (modifiers & META) == META)
	14811	+ if (capsLocked) // \|\| (modifiers & META) == META)
14489	14812	{
14490	14813	mouseMode \|= VR; // BACKFORTH;
14491	14814	}
14492		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14815	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14493	14816	{
14494	14817	mouseMode \|= SELECT;
14495	14818	}
14496		- if ((modifiers & COMMAND) == COMMAND)
	14819	+ if ((modifiersex & COMMAND) == COMMAND)
14497	14820	{
14498	14821	mouseMode \|= SELECT;
14499	14822	}
14500		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14823	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14501	14824	{
14502	14825	mouseMode &= ~VR;
14503	14826	mouseMode \|= TRANSLATE;
..	..	@@ -14526,7 +14849,7 @@
14526	14849
14527	14850	if (isRenderer) //
14528	14851	{
14529		- SetMouseMode(modifiers);
	14852	+ SetMouseMode(0, modifiers);
14530	14853	}
14531	14854
14532	14855	Globals.theRenderer.keyPressed(key);
..	..	@@ -14673,7 +14996,9 @@
14673	14996	case 'E' : COMPACT ^= true;
14674	14997	repaint();
14675	14998	break;
14676		- case 'W' : DEBUGHSB ^= true;
	14999	+ case 'W' : // Wide Window (fullscreen)
	15000	+ //DEBUGHSB ^= true;
	15001	+ ObjEditor.theFrame.ToggleFullScreen();
14677	15002	repaint();
14678	15003	break;
14679	15004	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14698,8 +15023,8 @@
14698	15023	RevertCamera();
14699	15024	repaint();
14700	15025	break;
14701		- case 'L':
14702	15026	case 'l':
	15027	+ //case 'L':
14703	15028	if (lightMode)
14704	15029	{
14705	15030	lightMode = false;
..	..	@@ -14842,9 +15167,9 @@
14842	15167	case '_':
14843	15168	kompactbit = 5;
14844	15169	break;
14845		- case '+':
14846		- kompactbit = 6;
14847		- break;
	15170	+// case '+':
	15171	+// kompactbit = 6;
	15172	+// break;
14848	15173	case ' ':
14849	15174	lightMode ^= true;
14850	15175	Globals.lighttouched = true;
..	..	@@ -14856,13 +15181,14 @@
14856	15181	case ESC:
14857	15182	RENDERPROGRAM += 1;
14858	15183	RENDERPROGRAM %= 3;
	15184	+
14859	15185	repaint();
14860	15186	break;
14861	15187	case 'Z':
14862	15188	//RESIZETEXTURE ^= true;
14863	15189	//break;
14864	15190	case 'z':
14865		- RENDERSHADOW ^= true;
	15191	+ Globals.RENDERSHADOW ^= true;
14866	15192	Globals.lighttouched = true;
14867	15193	repaint();
14868	15194	break;
..	..	@@ -14895,8 +15221,9 @@
14895	15221	case DELETE:
14896	15222	ClearSelection();
14897	15223	break;
14898		- /*
14899	15224	case '+':
	15225	+
	15226	+ /*
14900	15227	//fontsize += 1;
14901	15228	bbzoom *= 2;
14902	15229	repaint();
..	..	@@ -14913,17 +15240,17 @@
14913	15240	case '=':
14914	15241	IncDepth();
14915	15242	//fontsize += 1;
14916		- object.editWindow.refreshContents(true);
	15243	+ object.GetWindow().refreshContents(true);
14917	15244	maskbit = 6;
14918	15245	break;
14919	15246	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14920	15247	DecDepth();
14921	15248	maskbit = 5;
14922	15249	//if(fontsize > 1) fontsize -= 1;
14923		- if (object.editWindow == null)
14924		- new Exception().printStackTrace();
14925		- else
14926		- object.editWindow.refreshContents(true);
	15250	+// if (object.editWindow == null)
	15251	+// new Exception().printStackTrace();
	15252	+// else
	15253	+ object.GetWindow().refreshContents(true);
14927	15254	break;
14928	15255	case '{':
14929	15256	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14986,7 +15313,7 @@
14986	15313	//mode = ROTATE;
14987	15314	if ((MODIFIERS & COMMAND) == 0) // VR??
14988	15315	{
14989		- SetMouseMode(modifiers);
	15316	+ SetMouseMode(0, modifiers);
14990	15317	}
14991	15318	}
14992	15319
..	..	@@ -15122,7 +15449,7 @@
15122	15449	{
15123	15450	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15124	15451	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15125		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15452	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15126	15453	{
15127	15454	mouseMoved(e);
15128	15455	} else
..	..	@@ -15147,7 +15474,7 @@
15147	15474	}
15148	15475	*/
15149	15476
15150		- object.editWindow.EditSelection();
	15477	+ object.GetWindow().EditSelection(false);
15151	15478	}
15152	15479
15153	15480	void SelectParent()
..	..	@@ -15164,10 +15491,10 @@
15164	15491	{
15165	15492	//selectees.remove(i);
15166	15493	System.out.println("select parent of " + elem);
15167		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15494	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15168	15495	} else
15169	15496	{
15170		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15497	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15171	15498	}
15172	15499
15173	15500	first = false;
..	..	@@ -15209,12 +15536,12 @@
15209	15536	for (int j = 0; j < group.children.size(); j++)
15210	15537	{
15211	15538	elem = (Object3D) group.children.elementAt(j);
15212		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15539	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15213	15540	first = false;
15214	15541	}
15215	15542	} else
15216	15543	{
15217		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15544	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15218	15545	}
15219	15546
15220	15547	first = false;
..	..	@@ -15225,21 +15552,21 @@
15225	15552	{
15226	15553	//Composite group = (Composite) object;
15227	15554	Object3D group = object;
15228		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15555	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15229	15556	}
15230	15557
15231	15558	void ResetTransform(int mask)
15232	15559	{
15233	15560	//Composite group = (Composite) object;
15234	15561	Object3D group = object;
15235		- group.editWindow.ResetTransform(mask);
	15562	+ group.GetWindow().ResetTransform(mask);
15236	15563	}
15237	15564
15238	15565	void FlipTransform()
15239	15566	{
15240	15567	//Composite group = (Composite) object;
15241	15568	Object3D group = object;
15242		- group.editWindow.FlipTransform();
	15569	+ group.GetWindow().FlipTransform();
15243	15570	// group.editWindow.ReduceMesh(true);
15244	15571	}
15245	15572
..	..	@@ -15247,7 +15574,7 @@
15247	15574	{
15248	15575	//Composite group = (Composite) object;
15249	15576	Object3D group = object;
15250		- group.editWindow.PrintMemory();
	15577	+ group.GetWindow().PrintMemory();
15251	15578	// group.editWindow.ReduceMesh(true);
15252	15579	}
15253	15580
..	..	@@ -15255,7 +15582,7 @@
15255	15582	{
15256	15583	//Composite group = (Composite) object;
15257	15584	Object3D group = object;
15258		- group.editWindow.ResetCentroid();
	15585	+ group.GetWindow().ResetCentroid();
15259	15586	}
15260	15587
15261	15588	void IncDepth()
..	..	@@ -15341,7 +15668,9 @@
15341	15668	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15342	15669	//Image img = CreateImage(width, height);
15343	15670	//System.out.println("width = " + width + "; height = " + height + "\n");
	15671	+
15344	15672	Graphics gr = g; // img.getGraphics();
	15673	+
15345	15674	if (!hasMarquee)
15346	15675	{
15347	15676	if (Xmin < Xmax) // !locked)
..	..	@@ -15429,6 +15758,7 @@
15429	15758	info.bounds.y += (height - desired) / 2;
15430	15759	}
15431	15760	}
	15761	+
15432	15762	info.g = gr;
15433	15763	info.camera = renderCamera;
15434	15764	/*
..	..	@@ -15438,15 +15768,55 @@
15438	15768	*/
15439	15769	if (!isRenderer)
15440	15770	{
15441		- object.drawEditHandles(info, 0);
	15771	+ Grafreed.Assert(object != null);
	15772	+ Grafreed.Assert(object.selection != null);
	15773	+ if (object.selection.Size() > 0)
	15774	+ {
	15775	+ int hitSomething = object.selection.get(0).hitSomething;
	15776	+
	15777	+ info.DX = 0;
	15778	+ info.DY = 0;
	15779	+ info.W = 1;
	15780	+ if (hitSomething == Object3D.hitCenter)
	15781	+ {
	15782	+ info.DX = X;
	15783	+ if (X != 0)
	15784	+ info.DX -= info.bounds.width/2;
	15785	+
	15786	+ info.DY = Y;
	15787	+ if (Y != 0)
	15788	+ info.DY -= info.bounds.height/2;
	15789	+ }
	15790	+
	15791	+ object.drawEditHandles(info, 0);
	15792	+
	15793	+ if (drag && (X != 0 \|\| Y != 0))
	15794	+ {
	15795	+ switch (hitSomething)
	15796	+ {
	15797	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15798	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15799	+ break;
	15800	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15801	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15802	+ break;
	15803	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15804	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15805	+ break;
	15806	+ }
	15807	+
	15808	+ }
	15809	+ }
15442	15810	}
15443	15811	}
	15812	+
15444	15813	if (isRenderer)
15445	15814	{
15446	15815	//gr.setColor(Color.black);
15447	15816	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15448	15817	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15449	15818	}
	15819	+
15450	15820	if (hasMarquee)
15451	15821	{
15452	15822	gr.setXORMode(Color.white);
..	..	@@ -15559,6 +15929,7 @@
15559	15929	public boolean mouseDown(Event evt, int x, int y)
15560	15930	{
15561	15931	System.out.println("mouseDown: " + evt);
	15932	+ System.exit(0);
15562	15933	/*
15563	15934	locked = true;
15564	15935	drag = false;
..	..	@@ -15602,7 +15973,7 @@
15602	15973	{
15603	15974	keyPressed(0, modifiers);
15604	15975	}
15605		- clickStart(x, y, modifiers);
	15976	+ // clickStart(x, y, modifiers);
15606	15977	return true;
15607	15978	}
15608	15979
..	..	@@ -15720,7 +16091,7 @@
15720	16091	{
15721	16092	keyReleased(0, 0);
15722	16093	}
15723		- drag(x, y, modifiers);
	16094	+ drag(x, y, 0, modifiers);
15724	16095	return true;
15725	16096	}
15726	16097
..	..	@@ -15852,7 +16223,7 @@
15852	16223	Object3D object;
15853	16224	static Object3D trackedobject;
15854	16225	Camera renderCamera; // Light or Eye (or Occlusion)
15855		- /static/ Camera manipCamera; // Light or Eye
	16226	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15856	16227	/static/ Camera eyeCamera;
15857	16228	/static/ Camera lightCamera;
15858	16229	int cameracount;
..	..	@@ -16137,16 +16508,16 @@
16137	16508	cStatic.objectstack[materialdepth++] = checker;
16138	16509	//System.out.println("material " + material);
16139	16510	//Applet3D.tracein(this, selected);
16140		- vector2buffer = checker.projectedVertices;
	16511	+ //vector2buffer = checker.projectedVertices;
16141	16512
16142	16513	//checker.GetMaterial().Draw(this, false); // true);
16143		- DrawMaterial(checker.GetMaterial(), false); // true);
	16514	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16144	16515
16145	16516	materialdepth -= 1;
16146	16517	if (materialdepth > 0)
16147	16518	{
16148		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16149		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16519	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16520	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16150	16521	}
16151	16522	//checker.GetMaterial().opacity = 1f;
16152	16523	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16232,6 +16603,14 @@
16232	16603	}
16233	16604	}
16234	16605
	16606	+ private Object3D GetFolder()
	16607	+ {
	16608	+ Object3D folder = object.GetWindow().copy;
	16609	+ if (object.GetWindow().copy.selection.Size() > 0)
	16610	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16611	+ return folder;
	16612	+ }
	16613	+
16235	16614	class SelectBuffer implements GLEventListener
16236	16615	{
16237	16616
..	..	@@ -16311,6 +16690,17 @@
16311	16690
16312	16691	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16313	16692
	16693	+ if (PAINTMODE)
	16694	+ {
	16695	+ if (object.GetWindow().copy.selection.Size() > 0)
	16696	+ {
	16697	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16698	+
	16699	+ // Make what you paint not selectable.
	16700	+ paintobj.ResetSelectable();
	16701	+ }
	16702	+ }
	16703	+
16314	16704	//int tmp = selection_view;
16315	16705	//selection_view = -1;
16316	16706	int temp = DrawMode();
..	..	@@ -16322,6 +16712,17 @@
16322	16712	// temp = DEFAULT; // patch for selection debug
16323	16713	Globals.drawMode = temp; // WARNING
16324	16714
	16715	+ if (PAINTMODE)
	16716	+ {
	16717	+ if (object.GetWindow().copy.selection.Size() > 0)
	16718	+ {
	16719	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16720	+
	16721	+ // Revert.
	16722	+ paintobj.RestoreSelectable();
	16723	+ }
	16724	+ }
	16725	+
16325	16726	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16326	16727
16327	16728	// trying different ways of getting the depth info over
..	..	@@ -16369,6 +16770,8 @@
16369	16770	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16370	16771	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16371	16772	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16773	+
	16774	+ CreateSelectedPoint();
16372	16775
16373	16776	// Will fit the mesh !!!
16374	16777	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16418,34 +16821,36 @@
16418	16821	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]));
16419	16822	}
16420	16823
16421		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16824	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16422	16825	}
16423	16826	}
16424	16827
16425	16828	if (!movingcamera && !PAINTMODE)
16426		- object.editWindow.ScreenFitPoint(); // fev 2014
	16829	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16427	16830
16428		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16831	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16429	16832	{
16430		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16833	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16431	16834
16432		- Object3D group = new Object3D("inst" + paintcount++);
	16835	+ if (object.GetWindow().copy.selection.Size() > 0)
	16836	+ {
	16837	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16433	16838
16434		- group.CreateMaterial(); // use a void leaf to select instances
16435		-
16436		- group.add(paintobj); // link
16437		-
16438		- object.editWindow.SnapObject(group);
16439		-
16440		- Object3D folder = object.editWindow.copy;
16441		-
16442		- if (object.editWindow.copy.selection.Size() > 0)
16443		- folder = object.editWindow.copy.selection.elementAt(0);
16444		-
16445		- folder.add(group);
16446		-
16447		- object.editWindow.ResetModel();
16448		- object.editWindow.refreshContents();
	16839	+ Object3D inst = new Object3D("inst" + paintcount++);
	16840	+
	16841	+ inst.CreateMaterial(); // use a void leaf to select instances
	16842	+
	16843	+ inst.add(paintobj); // link
	16844	+
	16845	+ object.GetWindow().SnapObject(inst);
	16846	+
	16847	+ Object3D folder = paintFolder; // GetFolder();
	16848	+
	16849	+ folder.add(inst);
	16850	+
	16851	+ object.GetWindow().ResetModel();
	16852	+ object.GetWindow().refreshContents();
	16853	+ }
16449	16854	}
16450	16855	else
16451	16856	paintcount = 0;
..	..	@@ -16484,6 +16889,11 @@
16484	16889	//System.out.println("objects[color] = " + objects[color]);
16485	16890	//objects[color].Select();
16486	16891	indexcount = 0;
	16892	+ ObjEditor window = object.GetWindow();
	16893	+ if (window != null && deselect)
	16894	+ {
	16895	+ window.Select(null, deselect, true);
	16896	+ }
16487	16897	object.Select(color, deselect);
16488	16898	}
16489	16899
..	..	@@ -16583,7 +16993,7 @@
16583	16993	gl.glDisable(gl.GL_CULL_FACE);
16584	16994	}
16585	16995
16586		- if (!RENDERSHADOW)
	16996	+ if (!Globals.RENDERSHADOW)
16587	16997	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16588	16998
16589	16999	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16593,7 +17003,7 @@
16593	17003	//gl.glColorMask(false, false, false, false);
16594	17004
16595	17005	//render_scene_from_light_view(gl, drawable, 0, 0);
16596		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17006	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16597	17007	{
16598	17008	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16599	17009
..	..	@@ -17009,23 +17419,15 @@
17009	17419	int AAbuffersize = 0;
17010	17420
17011	17421	//double[] selectedpoint = new double[3];
17012		- static Superellipsoid selectedpoint = new Superellipsoid();
	17422	+ static Superellipsoid selectedpoint;
17013	17423	static Sphere previousselectedpoint = null;
17014		- static Sphere debugpointG = new Sphere();
17015		- static Sphere debugpointP = new Sphere();
17016		- static Sphere debugpointC = new Sphere();
17017		- static Sphere debugpointR = new Sphere();
	17424	+ static Sphere debugpointG;
	17425	+ static Sphere debugpointP;
	17426	+ static Sphere debugpointC;
	17427	+ static Sphere debugpointR;
17018	17428
17019	17429	static Sphere debugpoints[] = new Sphere[8];
17020	17430
17021		- static
17022		- {
17023		- for (int i=0; i<8; i++)
17024		- {
17025		- debugpoints[i] = new Sphere();
17026		- }
17027		- }
17028		-
17029	17431	static void InitPoints(float radius)
17030	17432	{
17031	17433	for (int i=0; i<8; i++)