~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,7 @@
2376	2404	{
2377	2405	return currentGL;
2378	2406	}
2379		-
	2407	+
2380	2408	/**/
2381	2409	class CacheTexture
2382	2410	{
..	..	@@ -2394,9 +2422,10 @@
2394	2422	/**/
2395	2423
2396	2424	// 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>();
	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	+
2400	2429	int pigmentdepth = 0;
2401	2430	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2431	int bumpdepth = 0;
..	..	@@ -2418,6 +2447,33 @@
2418	2447	true,
2419	2448	com.sun.opengl.util.texture.TextureIO.PNG);
2420	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)
2421	2477	{
2422	2478	throw new javax.media.opengl.GLException(e);
2423	2479	}
..	..	@@ -3504,6 +3560,8 @@
3504	3560
3505	3561	System.out.println("LOADING TEXTURE : " + name);
3506	3562
	3563	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3564	+
3507	3565	//
3508	3566	if (false) // compressbit > 0)
3509	3567	{
..	..	@@ -4208,6 +4266,7 @@
4208	4266
4209	4267	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4210	4268	{
	4269	+ new Exception().printStackTrace();
4211	4270	System.exit(0);
4212	4271	com.sun.opengl.util.texture.Texture texture = null;
4213	4272
..	..	@@ -7901,7 +7960,7 @@
7901	7960	String pigment = Object3D.GetPigment(tex);
7902	7961	String bump = Object3D.GetBump(tex);
7903	7962
7904		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7963	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7905	7964	{
7906	7965	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7907	7966	// System.out.println("; bump = " + bump);
..	..	@@ -7918,6 +7977,64 @@
7918	7977
7919	7978	ReleaseTexture(bump, true);
7920	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);
7921	8038	}
7922	8039
7923	8040	void ReleaseTexture(String tex, boolean bump)
..	..	@@ -8023,7 +8140,55 @@
8023	8140	}
8024	8141	}
8025	8142
8026		- /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
8027	8192	{
8028	8193	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8029	8194	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8033,18 +8198,48 @@
8033	8198
8034	8199	if (tex == null)
8035	8200	{
8036		- BindTexture(null,false,resolution);
8037		- BindTexture(null,true,resolution);
	8201	+ BindTexture(null, null,false,resolution);
8038	8202	return;
8039	8203	}
8040	8204
8041	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	+
8042	8238	String bump = Object3D.GetBump(tex);
8043	8239
8044		- usedtextures.put(pigment, pigment);
8045		- usedtextures.put(bump, bump);
	8240	+ usedtextures.add(bump);
8046	8241
8047		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8242	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8048	8243	{
8049	8244	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8050	8245	// System.out.println("; bump = " + bump);
..	..	@@ -8054,42 +8249,70 @@
8054	8249	{
8055	8250	bump = null;
8056	8251	}
8057		- if (pigment.equals(""))
8058		- {
8059		- pigment = null;
8060		- }
8061	8252
8062		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8063		- BindTexture(pigment, false, resolution);
8064	8253	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8065		- BindTexture(bump, true, resolution);
	8254	+ BindTexture(tex.bumptexture, bump, true, resolution);
8066	8255	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8067		-
8068		- return; // true;
8069	8256	}
8070	8257
8071		- 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)
8072	8261	{
8073		- 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;
8074	8281
8075	8282	if (tex != null)
8076	8283	{
8077	8284	String texname = tex;
8078	8285
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;
	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	+ }
8085	8298
8086	8299	if (CACHETEXTURE)
8087		- texture = textures.get(texname); // TEXTURE CACHE
8088		-
8089		- TextureData texturedata = null;
8090		-
8091		- if (texture == null \|\| texture.resolution < resolution)
8092	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
8093	8316	if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8094	8317	{
8095	8318	assert(!bump);
..	..	@@ -8101,19 +8324,19 @@
8101	8324	// }
8102	8325	// else
8103	8326	// {
8104		- texture = textures.get(tex);
8105		- if (texture == null)
	8327	+ texturecache = textures.get(tex);
	8328	+ if (texturecache == null)
8106	8329	{
8107		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8330	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8108	8331	}
8109	8332	// }
8110	8333	} else
8111	8334	if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8112	8335	{
8113	8336	assert(bump);
8114		- texture = textures.get(tex);
8115		- if (texture == null)
8116		- 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);
8117	8340	} else
8118	8341	{
8119	8342	//if (tex.equals("IMMORTAL"))
..	..	@@ -8123,9 +8346,9 @@
8123	8346	//{
8124	8347	if (tex.equals("WHITE_NOISE"))
8125	8348	{
8126		- texture = textures.get(tex);
8127		- if (texture == null)
8128		- 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);
8129	8352	} else
8130	8353	{
8131	8354	if (textureon)
..	..	@@ -8150,7 +8373,7 @@
8150	8373	}
8151	8374
8152	8375	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8153		- if (!new File(cachename).exists())
	8376	+ if (!FileExists(cachename))
8154	8377	cachename = texname;
8155	8378	else
8156	8379	processbump = false; // don't process bump map again
..	..	@@ -8172,7 +8395,7 @@
8172	8395	}
8173	8396
8174	8397	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8175		- if (!new File(cachename).exists())
	8398	+ if (!FileExists(cachename))
8176	8399	cachename = texname;
8177	8400	else
8178	8401	processbump = false; // don't process bump map again
..	..	@@ -8181,20 +8404,22 @@
8181	8404	texturedata = GetFileTexture(cachename, processbump, resolution);
8182	8405
8183	8406
8184		- if (texturedata != null)
8185		- 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);
8186	8411	//texture = GetTexture(tex, bump);
8187	8412	}
8188	8413	}
8189	8414	//}
8190	8415	}
8191	8416
8192		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8417	+ if (/CACHETEXTURE &&/ texturecache != null && textureon)
8193	8418	{
8194	8419	//return false;
8195	8420
8196	8421	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8197		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8422	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8198	8423	{
8199	8424	// String ext = "_highres";
8200	8425	// if (REDUCETEXTURE)
..	..	@@ -8283,8 +8508,8 @@
8283	8508	textures.remove(texname);
8284	8509	}
8285	8510
8286		- texture.texturedata = texturedata;
8287		- textures.put(texname, texture);
	8511	+ //texture.texturedata = texturedata;
	8512	+ textures.put(texname, texturecache);
8288	8513
8289	8514	// newtex = true;
8290	8515	}
..	..	@@ -8300,12 +8525,12 @@
8300	8525	}
8301	8526	}
8302	8527
8303		- return texture;
	8528	+ return texturecache;
8304	8529	}
8305	8530
8306		- 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
8307	8532	{
8308		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8533	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
8309	8534
8310	8535	if (bump)
8311	8536	{
..	..	@@ -8321,23 +8546,23 @@
8321	8546	return texture!=null?texture.texture:null;
8322	8547	}
8323	8548
8324		- 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
8325	8550	{
8326		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8551	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
8327	8552
8328	8553	return texture!=null?texture.texturedata:null;
8329	8554	}
8330	8555
8331		- boolean BindTexture(String tex, boolean bump, int resolution)
	8556	+ boolean BindTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
8332	8557	{
8333	8558	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8334	8559	{
8335	8560	return false;
8336	8561	}
8337	8562
8338		- boolean newtex = false;
	8563	+ //boolean newtex = false;
8339	8564
8340		- com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
	8565	+ com.sun.opengl.util.texture.Texture texture = GetTexture(stream, tex, bump, resolution);
8341	8566
8342	8567	if (texture == null)
8343	8568	return false;
..	..	@@ -8367,7 +8592,7 @@
8367	8592	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8368	8593	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8369	8594
8370		- return newtex;
	8595	+ return true; // Warning: not used.
8371	8596	}
8372	8597
8373	8598	ShadowBuffer shadowPBuf;
..	..	@@ -9205,11 +9430,35 @@
9205	9430	jy8[3] = 0.5f;
9206	9431	}
9207	9432
9208		- 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
9209	9434	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9210	9435	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9211	9436	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9212	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	+
9213	9462	static int imagecount = 0; // movie generation
9214	9463
9215	9464	static int jitter = 0;
..	..	@@ -9305,8 +9554,8 @@
9305	9554	assert (parentcam != renderCamera);
9306	9555
9307	9556	if (renderCamera != lightCamera)
9308		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9309		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9557	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9558	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9310	9559
9311	9560	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9312	9561
..	..	@@ -9321,8 +9570,8 @@
9321	9570	LA.matCopy(renderCamera.fromScreen, matrix);
9322	9571
9323	9572	if (renderCamera != lightCamera)
9324		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9325		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9573	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9574	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9326	9575
9327	9576	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9328	9577
..	..	@@ -9394,7 +9643,7 @@
9394	9643	//gl.glFlush();
9395	9644	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9396	9645
9397		- if (ANIMATION && ABORTED)
	9646	+ if (Globals.ANIMATION && ABORTED)
9398	9647	{
9399	9648	System.err.println(" ABORTED FRAME");
9400	9649	break;
..	..	@@ -9424,7 +9673,7 @@
9424	9673	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9425	9674
9426	9675	// save image
9427		- if (ANIMATION && !ABORTED)
	9676	+ if (Globals.ANIMATION && !ABORTED)
9428	9677	{
9429	9678	VPwidth = viewport[2];
9430	9679	VPheight = viewport[3];
..	..	@@ -9535,11 +9784,11 @@
9535	9784
9536	9785	// imagecount++;
9537	9786
9538		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9787	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9539	9788
9540	9789	if (!BOXMODE)
9541	9790	{
9542		- 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) + ")");
9543	9792	}
9544	9793
9545	9794	if (!BOXMODE)
..	..	@@ -9577,7 +9826,7 @@
9577	9826	ABORTED = false;
9578	9827	}
9579	9828	else
9580		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9829	+ Grafreed.wav.cursor += 735 * ACSIZE;
9581	9830
9582	9831	if (false)
9583	9832	{
..	..	@@ -10240,11 +10489,11 @@
10240	10489
10241	10490	public void display(GLAutoDrawable drawable)
10242	10491	{
10243		- if (GrafreeD.savesound && GrafreeD.hassound)
	10492	+ if (Grafreed.savesound && Grafreed.hassound)
10244	10493	{
10245		- GrafreeD.wav.save();
10246		- GrafreeD.savesound = false;
10247		- GrafreeD.hassound = false;
	10494	+ Grafreed.wav.save();
	10495	+ Grafreed.savesound = false;
	10496	+ Grafreed.hassound = false;
10248	10497	}
10249	10498	// if (DEBUG_SELECTION)
10250	10499	// {
..	..	@@ -10320,6 +10569,7 @@
10320	10569	ANTIALIAS = 0;
10321	10570	//System.out.println("RESTART");
10322	10571	AAtimer.restart();
	10572	+ Globals.TIMERRUNNING = true;
10323	10573	}
10324	10574	}
10325	10575	}
..	..	@@ -10374,7 +10624,7 @@
10374	10624	Object3D theobject = object;
10375	10625	Object3D theparent = object.parent;
10376	10626	object.parent = null;
10377		- object = (Object3D)GrafreeD.clone(object);
	10627	+ object = (Object3D)Grafreed.clone(object);
10378	10628	object.Stripify();
10379	10629	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10380	10630	theobject.PreprocessOcclusion(this);
..	..	@@ -10387,13 +10637,14 @@
10387	10637	ambientOcclusion = false;
10388	10638	}
10389	10639
10390		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10640	+ if (//Globals.lighttouched &&
	10641	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10391	10642	{
10392	10643	//if (RENDERSHADOW) // ?
10393	10644	if (!IsFrozen())
10394	10645	{
10395	10646	// dec 2012
10396		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10647	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10397	10648	{
10398	10649	Globals.framecount++;
10399	10650	shadowbuffer.display();
..	..	@@ -10520,8 +10771,8 @@
10520	10771
10521	10772	// if (parentcam != renderCamera) // not a light
10522	10773	if (cam != lightCamera)
10523		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10524		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10774	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10775	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10525	10776
10526	10777	for (int j = 0; j < 4; j++)
10527	10778	{
..	..	@@ -10535,8 +10786,8 @@
10535	10786
10536	10787	// if (parentcam != renderCamera) // not a light
10537	10788	if (cam != lightCamera)
10538		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10539		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10789	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10790	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10540	10791
10541	10792	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10542	10793
..	..	@@ -10795,7 +11046,16 @@
10795	11046	// Bump noise
10796	11047	gl.glActiveTexture(GL.GL_TEXTURE6);
10797	11048	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10798		- 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	+
10799	11059
10800	11060	gl.glActiveTexture(GL.GL_TEXTURE0);
10801	11061	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10818,9 +11078,9 @@
10818	11078
10819	11079	gl.glMatrixMode(GL.GL_MODELVIEW);
10820	11080
10821		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10822		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10823		-//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);
10824	11084	} else
10825	11085	{
10826	11086	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10831,7 +11091,7 @@
10831	11091	//System.out.println("BLENDING ON");
10832	11092	gl.glEnable(GL.GL_BLEND);
10833	11093	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10834		-
	11094	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10835	11095	gl.glMatrixMode(gl.GL_PROJECTION);
10836	11096	gl.glLoadIdentity();
10837	11097
..	..	@@ -10920,8 +11180,8 @@
10920	11180	System.err.println("parentcam != renderCamera");
10921	11181
10922	11182	// if (cam != lightCamera)
10923		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10924		- 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
10925	11185	}
10926	11186
10927	11187	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10942,8 +11202,8 @@
10942	11202	if (true) // TODO
10943	11203	{
10944	11204	if (cam != lightCamera)
10945		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10946		- 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
10947	11207	}
10948	11208
10949	11209	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11259,8 +11519,14 @@
11259	11519	{
11260	11520	renderpass++;
11261	11521	// System.out.println("Draw object... ");
	11522	+ STEP = 1;
11262	11523	if (FAST) // in case there is no script
11263		- STEP = 16;
	11524	+ STEP = 8;
	11525	+
	11526	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11527	+ {
	11528	+ STEP *= 4;
	11529	+ }
11264	11530
11265	11531	//object.FullInvariants();
11266	11532
..	..	@@ -11274,23 +11540,44 @@
11274	11540	e.printStackTrace();
11275	11541	}
11276	11542
11277		- if (GrafreeD.RENDERME > 0)
11278		- GrafreeD.RENDERME--; // mechante magouille
	11543	+ if (Grafreed.RENDERME > 0)
	11544	+ Grafreed.RENDERME--; // mechante magouille
11279	11545
11280	11546	Globals.ONESTEP = false;
11281	11547	}
11282	11548
11283	11549	static boolean zoomonce = false;
11284	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	+
11285	11569	void DrawObject(GL gl, boolean draw)
11286	11570	{
	11571	+ // To clear camera values
	11572	+ ResetOptions();
	11573	+
11287	11574	//System.out.println("DRAW OBJECT " + mouseDown);
11288	11575	// DrawMode() = SELECTION;
11289	11576	//GL gl = getGL();
11290	11577	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11291	11578	{
11292	11579	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11293		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11580	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11294	11581	pingthread.StepToTarget(true); // true);
11295	11582	// zoomonce = false;
11296	11583	}
..	..	@@ -11345,7 +11632,14 @@
11345	11632
11346	11633	usedtextures.clear();
11347	11634
11348		- 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	+ }
11349	11643	}
11350	11644	//System.out.println("--> " + stackdepth);
11351	11645	// GrafreeD.traceon();
..	..	@@ -11355,8 +11649,9 @@
11355	11649
11356	11650	if (DrawMode() == DEFAULT)
11357	11651	{
11358		- if (DEBUG)
	11652	+ if (Globals.DEBUG)
11359	11653	{
	11654	+ CreateSelectedPoint();
11360	11655	float radius = 0.05f;
11361	11656	if (selectedpoint.radius != radius)
11362	11657	{
..	..	@@ -11419,7 +11714,7 @@
11419	11714	if (tex.equals("WHITE_NOISE"))
11420	11715	continue;
11421	11716
11422		- if (!usedtextures.containsKey(tex))
	11717	+ if (!usedtextures.contains(tex))
11423	11718	{
11424	11719	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11425	11720	textures.get(tex).texture.dispose();
..	..	@@ -11436,7 +11731,14 @@
11436	11731	if (checker != null && DrawMode() == DEFAULT)
11437	11732	{
11438	11733	//BindTexture(IMMORTAL_TEXTURE);
11439		- 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	+ }
11440	11742	// NEAREST
11441	11743	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11442	11744	DrawChecker(gl);
..	..	@@ -11518,7 +11820,7 @@
11518	11820	return;
11519	11821	}
11520	11822
11521		- String string = obj.GetToolTip();
	11823	+ String string = obj.toString(); //.GetToolTip();
11522	11824
11523	11825	GL gl = GetGL();
11524	11826
..	..	@@ -11835,8 +12137,8 @@
11835	12137	//obj.TransformToWorld(light, light);
11836	12138	for (int i = tp.size(); --i >= 0;)
11837	12139	{
11838		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11839		- 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);
11840	12142	}
11841	12143
11842	12144
..	..	@@ -11853,8 +12155,8 @@
11853	12155	parentcam = cameras[0];
11854	12156	}
11855	12157
11856		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11857		- 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
11858	12160
11859	12161	LA.xformPos(light, renderCamera.toScreen, light);
11860	12162
..	..	@@ -12468,8 +12770,8 @@
12468	12770
12469	12771	// display shadow only (bump == 0)
12470	12772	"SUB temp.x, half.x, shadow.x;" +
12471		- "MOV temp.y, -params6.x;" +
12472		- "SLT temp.z, temp.y, zero.x;" +
	12773	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12774	+ "SLT temp.z, temp.y, -one2048th.x;" +
12473	12775	"SUB temp.y, one.x, temp.z;" +
12474	12776	"MUL temp.x, temp.x, temp.y;" +
12475	12777	"KIL temp.x;" +
..	..	@@ -12598,8 +12900,10 @@
12598	12900	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12599	12901
12600	12902	"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
	12903	+ // Tuning for default skin
	12904	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12905	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12906	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12603	12907	"MUL temp.x, temp.x, temp.y;" +
12604	12908
12605	12909	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12747,7 +13051,7 @@
12747	13051	"MUL final.y, fragment.texcoord[0].x, c256;" +
12748	13052	"FLR final.x, final.y;" +
12749	13053	"SUB final.y, final.y, final.x;" +
12750		- //"MUL final.x, final.x, c256i;" +
	13054	+ "MUL final.x, final.x, c256i;" +
12751	13055	"MOV final.z, zero.x;" +
12752	13056	"MOV final.a, one.w;":""
12753	13057	) +
..	..	@@ -12755,7 +13059,7 @@
12755	13059	"MUL final.y, fragment.texcoord[0].y, c256;" +
12756	13060	"FLR final.x, final.y;" +
12757	13061	"SUB final.y, final.y, final.x;" +
12758		- //"MUL final.x, final.x, c256i;" +
	13062	+ "MUL final.x, final.x, c256i;" +
12759	13063	"MOV final.z, zero.x;" +
12760	13064	"MOV final.a, one.w;":""
12761	13065	) +
..	..	@@ -12798,7 +13102,7 @@
12798	13102	//once = true;
12799	13103	}
12800	13104
12801		- System.out.print("Program #" + mode + "; length = " + program.length());
	13105	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12802	13106	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12803	13107	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12804	13108
..	..	@@ -12931,12 +13235,16 @@
12931	13235
12932	13236	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12933	13237	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13238	+
	13239	+ // Compare fragment depth in light space with shadowmap.
12934	13240	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12935	13241	"SGE temp.y, temp.x, zero.x;" +
12936		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13242	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13243	+
	13244	+ // Reverse comparison
12937	13245	"SUB temp.x, one.x, temp.x;" +
12938	13246	"MUL " + shadow + ".x, temp.x, temp.y;" +
12939		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13247	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12940	13248	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12941	13249
12942	13250	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12950,6 +13258,10 @@
12950	13258	// No shadow for backface
12951	13259	"DP3 temp.x, normal, lightd;" +
12952	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;" +
12953	13265	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12954	13266	"";
12955	13267	}
..	..	@@ -13096,7 +13408,8 @@
13096	13408	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13097	13409	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13098	13410	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13099		- Object3D.cVector2[] vector2buffer;
	13411	+
	13412	+ //Object3D.cVector2[] vector2buffer;
13100	13413
13101	13414	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13102	13415	// OUT : diff, spec
..	..	@@ -13112,9 +13425,10 @@
13112	13425	"DP3 " + dest + ".z," + "normals," + "eye;" +
13113	13426	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13114	13427	//"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;" +
	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
13118	13432	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13119	13433	"RCP " + dest + ".w," + dest + ".w;" +
13120	13434	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13508,7 +13822,7 @@
13508	13822	public void mousePressed(MouseEvent e)
13509	13823	{
13510	13824	//System.out.println("mousePressed: " + e);
13511		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13825	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13512	13826	}
13513	13827
13514	13828	static long prevtime = 0;
..	..	@@ -13584,8 +13898,8 @@
13584	13898	// mode \|= META;
13585	13899	//}
13586	13900
13587		- SetMouseMode(WHEEL \| e.getModifiersEx());
13588		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13901	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13902	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13589	13903	anchorX = ax;
13590	13904	anchorY = ay;
13591	13905	prevX = px;
..	..	@@ -13619,6 +13933,7 @@
13619	13933	else
13620	13934	if (evt.getSource() == AAtimer)
13621	13935	{
	13936	+ Globals.TIMERRUNNING = false;
13622	13937	if (mouseDown)
13623	13938	{
13624	13939	//new Exception().printStackTrace();
..	..	@@ -13644,6 +13959,10 @@
13644	13959	// LIVE = waslive;
13645	13960	// wasliveok = true;
13646	13961	// waslive = false;
	13962	+
	13963	+ // May 2019 Forget it:
	13964	+ if (true)
	13965	+ return;
13647	13966
13648	13967	// source == timer
13649	13968	if (mouseDown)
..	..	@@ -13674,7 +13993,7 @@
13674	13993
13675	13994	// fev 2014???
13676	13995	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13677		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	13996	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13678	13997	pingthread.StepToTarget(true); // true);
13679	13998	}
13680	13999	// if (!LIVE)
..	..	@@ -13683,12 +14002,13 @@
13683	14002
13684	14003	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13685	14004
13686		- void clickStart(int x, int y, int modifiers)
	14005	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13687	14006	{
13688	14007	if (!wasliveok)
13689	14008	return;
13690	14009
13691	14010	AAtimer.restart(); //
	14011	+ Globals.TIMERRUNNING = true;
13692	14012
13693	14013	// waslive = LIVE;
13694	14014	// LIVE = false;
..	..	@@ -13700,7 +14020,7 @@
13700	14020	// touched = true; // main DL
13701	14021	if (isRenderer)
13702	14022	{
13703		- SetMouseMode(modifiers);
	14023	+ SetMouseMode(modifiers, modifiersex);
13704	14024	}
13705	14025
13706	14026	selectX = anchorX = x;
..	..	@@ -13713,7 +14033,7 @@
13713	14033	clicked = true;
13714	14034	hold = false;
13715	14035
13716		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14036	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13717	14037	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13718	14038	{
13719	14039	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13744,7 +14064,7 @@
13744	14064	info.camera = renderCamera;
13745	14065	info.x = x;
13746	14066	info.y = y;
13747		- info.modifiers = modifiers;
	14067	+ info.modifiers = modifiersex;
13748	14068	editObj = object.doEditClick(info, 0);
13749	14069	if (!editObj)
13750	14070	{
..	..	@@ -13761,9 +14081,12 @@
13761	14081
13762	14082	public void mouseDragged(MouseEvent e)
13763	14083	{
	14084	+ Globals.MOUSEDRAGGED = true;
	14085	+
13764	14086	//System.out.println("mouseDragged: " + e);
13765	14087	if (isRenderer)
13766	14088	movingcamera = true;
	14089	+
13767	14090	//if (drawing)
13768	14091	//return;
13769	14092	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13773,7 +14096,7 @@
13773	14096	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13774	14097	}
13775	14098	else
13776		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14099	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13777	14100
13778	14101	//try { Thread.sleep(1); } catch (Exception ex) {}
13779	14102	}
..	..	@@ -13946,6 +14269,7 @@
13946	14269
13947	14270	public void run()
13948	14271	{
	14272	+ new Exception().printStackTrace();
13949	14273	System.exit(0);
13950	14274	for (;;)
13951	14275	{
..	..	@@ -14009,7 +14333,7 @@
14009	14333	{
14010	14334	Globals.lighttouched = true;
14011	14335	}
14012		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14336	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14013	14337	}
14014	14338	//else
14015	14339	}
..	..	@@ -14023,12 +14347,12 @@
14023	14347	void GoDown(int mod)
14024	14348	{
14025	14349	MODIFIERS \|= COMMAND;
14026		- /*
	14350	+ /**/
14027	14351	if((mod&SHIFT) == SHIFT)
14028	14352	manipCamera.RotatePosition(0, -speed);
14029	14353	else
14030		- manipCamera.BackForth(0, -speed*delta, getWidth());
14031		- */
	14354	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14355	+ /**/
14032	14356	if ((mod & SHIFT) == SHIFT)
14033	14357	{
14034	14358	mouseMode = mouseMode; // VR??
..	..	@@ -14044,12 +14368,12 @@
14044	14368	void GoUp(int mod)
14045	14369	{
14046	14370	MODIFIERS \|= COMMAND;
14047		- /*
	14371	+ /**/
14048	14372	if((mod&SHIFT) == SHIFT)
14049	14373	manipCamera.RotatePosition(0, speed);
14050	14374	else
14051		- manipCamera.BackForth(0, speed*delta, getWidth());
14052		- */
	14375	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14376	+ /**/
14053	14377	if ((mod & SHIFT) == SHIFT)
14054	14378	{
14055	14379	mouseMode = mouseMode;
..	..	@@ -14065,12 +14389,12 @@
14065	14389	void GoLeft(int mod)
14066	14390	{
14067	14391	MODIFIERS \|= COMMAND;
14068		- /*
	14392	+ /**/
14069	14393	if((mod&SHIFT) == SHIFT)
14070		- manipCamera.RotatePosition(speed, 0);
14071		- else
14072	14394	manipCamera.Translate(speed*delta, 0, getWidth());
14073		- */
	14395	+ else
	14396	+ manipCamera.RotatePosition(speed, 0);
	14397	+ /**/
14074	14398	if ((mod & SHIFT) == SHIFT)
14075	14399	{
14076	14400	mouseMode = mouseMode;
..	..	@@ -14086,12 +14410,12 @@
14086	14410	void GoRight(int mod)
14087	14411	{
14088	14412	MODIFIERS \|= COMMAND;
14089		- /*
	14413	+ /**/
14090	14414	if((mod&SHIFT) == SHIFT)
14091		- manipCamera.RotatePosition(-speed, 0);
14092		- else
14093	14415	manipCamera.Translate(-speed*delta, 0, getWidth());
14094		- */
	14416	+ else
	14417	+ manipCamera.RotatePosition(-speed, 0);
	14418	+ /**/
14095	14419	if ((mod & SHIFT) == SHIFT)
14096	14420	{
14097	14421	mouseMode = mouseMode;
..	..	@@ -14109,7 +14433,7 @@
14109	14433	int X, Y;
14110	14434	boolean SX, SY;
14111	14435
14112		- void drag(int x, int y, int modifiers)
	14436	+ void drag(int x, int y, int modifiers, int modifiersex)
14113	14437	{
14114	14438	if (IsFrozen())
14115	14439	{
..	..	@@ -14118,17 +14442,17 @@
14118	14442
14119	14443	drag = true; // NEW
14120	14444
14121		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14445	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14122	14446
14123	14447	X = x;
14124	14448	Y = y;
14125	14449	// floating state for animation
14126		- MODIFIERS = modifiers;
14127		- modifiers &= ~1024;
	14450	+ MODIFIERS = modifiersex;
	14451	+ modifiersex &= ~1024;
14128	14452	if (false) // modifiers != 0)
14129	14453	{
14130	14454	//new Exception().printStackTrace();
14131		- System.out.println("mouseDragged: " + modifiers);
	14455	+ System.out.println("mouseDragged: " + modifiersex);
14132	14456	System.out.println("SHIFT = " + SHIFT);
14133	14457	System.out.println("CONTROL = " + COMMAND);
14134	14458	System.out.println("META = " + META);
..	..	@@ -14148,7 +14472,8 @@
14148	14472	info.camera = renderCamera;
14149	14473	info.x = x;
14150	14474	info.y = y;
14151		- object.editWindow.copy.doEditDrag(info);
	14475	+ object.GetWindow().copy
	14476	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14152	14477	} else
14153	14478	{
14154	14479	if (x < startX)
..	..	@@ -14312,7 +14637,9 @@
14312	14637	ci.camera = renderCamera;
14313	14638	if (!isRenderer)
14314	14639	{
14315		- if (object.editWindow.copy.doEditClick(ci, 0))
	14640	+ //ObjEditor editWindow = object.editWindow;
	14641	+ //Object3D copy = editWindow.copy;
	14642	+ if (object.doEditClick(ci, 0))
14316	14643	{
14317	14644	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14318	14645	} else
..	..	@@ -14324,7 +14651,11 @@
14324	14651
14325	14652	public void mouseReleased(MouseEvent e)
14326	14653	{
	14654	+ Globals.MOUSEDRAGGED = false;
	14655	+
14327	14656	movingcamera = false;
	14657	+ X = 0; // getBounds().width/2;
	14658	+ Y = 0; // getBounds().height/2;
14328	14659	//System.out.println("mouseReleased: " + e);
14329	14660	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14330	14661	}
..	..	@@ -14347,9 +14678,9 @@
14347	14678	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14348	14679	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14349	14680
14350		- if (control \|\| command \|\| IsFrozen())
	14681	+// No delay if (control \|\| command \|\| IsFrozen())
14351	14682	timeout = true;
14352		- else
	14683	+// ?? May 2019 else
14353	14684	// timer.setDelay((modifiers & 128) != 0?0:350);
14354	14685	mouseDown = false;
14355	14686	if (!control && !command) // june 2013
..	..	@@ -14459,7 +14790,7 @@
14459	14790	System.out.println("keyReleased: " + e);
14460	14791	}
14461	14792
14462		- void SetMouseMode(int modifiers)
	14793	+ void SetMouseMode(int modifiers, int modifiersex)
14463	14794	{
14464	14795	//System.out.println("SetMouseMode = " + modifiers);
14465	14796	//modifiers &= ~1024;
..	..	@@ -14471,25 +14802,25 @@
14471	14802	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14472	14803	// return;
14473	14804	//System.out.println("SetMode = " + modifiers);
14474		- if ((modifiers & WHEEL) == WHEEL)
	14805	+ if ((modifiersex & WHEEL) == WHEEL)
14475	14806	{
14476	14807	mouseMode \|= ZOOM;
14477	14808	}
14478	14809
14479	14810	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14480		- if (capsLocked \|\| (modifiers & META) == META)
	14811	+ if (capsLocked) // \|\| (modifiers & META) == META)
14481	14812	{
14482	14813	mouseMode \|= VR; // BACKFORTH;
14483	14814	}
14484		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14815	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14485	14816	{
14486	14817	mouseMode \|= SELECT;
14487	14818	}
14488		- if ((modifiers & COMMAND) == COMMAND)
	14819	+ if ((modifiersex & COMMAND) == COMMAND)
14489	14820	{
14490	14821	mouseMode \|= SELECT;
14491	14822	}
14492		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14823	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14493	14824	{
14494	14825	mouseMode &= ~VR;
14495	14826	mouseMode \|= TRANSLATE;
..	..	@@ -14518,7 +14849,7 @@
14518	14849
14519	14850	if (isRenderer) //
14520	14851	{
14521		- SetMouseMode(modifiers);
	14852	+ SetMouseMode(0, modifiers);
14522	14853	}
14523	14854
14524	14855	Globals.theRenderer.keyPressed(key);
..	..	@@ -14665,7 +14996,9 @@
14665	14996	case 'E' : COMPACT ^= true;
14666	14997	repaint();
14667	14998	break;
14668		- case 'W' : DEBUGHSB ^= true;
	14999	+ case 'W' : // Wide Window (fullscreen)
	15000	+ //DEBUGHSB ^= true;
	15001	+ ObjEditor.theFrame.ToggleFullScreen();
14669	15002	repaint();
14670	15003	break;
14671	15004	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14690,8 +15023,8 @@
14690	15023	RevertCamera();
14691	15024	repaint();
14692	15025	break;
14693		- case 'L':
14694	15026	case 'l':
	15027	+ //case 'L':
14695	15028	if (lightMode)
14696	15029	{
14697	15030	lightMode = false;
..	..	@@ -14834,9 +15167,9 @@
14834	15167	case '_':
14835	15168	kompactbit = 5;
14836	15169	break;
14837		- case '+':
14838		- kompactbit = 6;
14839		- break;
	15170	+// case '+':
	15171	+// kompactbit = 6;
	15172	+// break;
14840	15173	case ' ':
14841	15174	lightMode ^= true;
14842	15175	Globals.lighttouched = true;
..	..	@@ -14848,13 +15181,14 @@
14848	15181	case ESC:
14849	15182	RENDERPROGRAM += 1;
14850	15183	RENDERPROGRAM %= 3;
	15184	+
14851	15185	repaint();
14852	15186	break;
14853	15187	case 'Z':
14854	15188	//RESIZETEXTURE ^= true;
14855	15189	//break;
14856	15190	case 'z':
14857		- RENDERSHADOW ^= true;
	15191	+ Globals.RENDERSHADOW ^= true;
14858	15192	Globals.lighttouched = true;
14859	15193	repaint();
14860	15194	break;
..	..	@@ -14887,8 +15221,9 @@
14887	15221	case DELETE:
14888	15222	ClearSelection();
14889	15223	break;
14890		- /*
14891	15224	case '+':
	15225	+
	15226	+ /*
14892	15227	//fontsize += 1;
14893	15228	bbzoom *= 2;
14894	15229	repaint();
..	..	@@ -14905,17 +15240,17 @@
14905	15240	case '=':
14906	15241	IncDepth();
14907	15242	//fontsize += 1;
14908		- object.editWindow.refreshContents(true);
	15243	+ object.GetWindow().refreshContents(true);
14909	15244	maskbit = 6;
14910	15245	break;
14911	15246	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14912	15247	DecDepth();
14913	15248	maskbit = 5;
14914	15249	//if(fontsize > 1) fontsize -= 1;
14915		- if (object.editWindow == null)
14916		- new Exception().printStackTrace();
14917		- else
14918		- object.editWindow.refreshContents(true);
	15250	+// if (object.editWindow == null)
	15251	+// new Exception().printStackTrace();
	15252	+// else
	15253	+ object.GetWindow().refreshContents(true);
14919	15254	break;
14920	15255	case '{':
14921	15256	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14978,7 +15313,7 @@
14978	15313	//mode = ROTATE;
14979	15314	if ((MODIFIERS & COMMAND) == 0) // VR??
14980	15315	{
14981		- SetMouseMode(modifiers);
	15316	+ SetMouseMode(0, modifiers);
14982	15317	}
14983	15318	}
14984	15319
..	..	@@ -15114,7 +15449,7 @@
15114	15449	{
15115	15450	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15116	15451	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15117		- 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)
15118	15453	{
15119	15454	mouseMoved(e);
15120	15455	} else
..	..	@@ -15139,11 +15474,12 @@
15139	15474	}
15140	15475	*/
15141	15476
15142		- object.editWindow.EditSelection();
	15477	+ object.GetWindow().EditSelection(false);
15143	15478	}
15144	15479
15145	15480	void SelectParent()
15146	15481	{
	15482	+ new Exception().printStackTrace();
15147	15483	System.exit(0);
15148	15484	Composite group = (Composite) object;
15149	15485	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15155,10 +15491,10 @@
15155	15491	{
15156	15492	//selectees.remove(i);
15157	15493	System.out.println("select parent of " + elem);
15158		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15494	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15159	15495	} else
15160	15496	{
15161		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15497	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15162	15498	}
15163	15499
15164	15500	first = false;
..	..	@@ -15167,6 +15503,7 @@
15167	15503
15168	15504	void SelectChildren()
15169	15505	{
	15506	+ new Exception().printStackTrace();
15170	15507	System.exit(0);
15171	15508	/*
15172	15509	Composite group = (Composite) object;
..	..	@@ -15199,12 +15536,12 @@
15199	15536	for (int j = 0; j < group.children.size(); j++)
15200	15537	{
15201	15538	elem = (Object3D) group.children.elementAt(j);
15202		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15539	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15203	15540	first = false;
15204	15541	}
15205	15542	} else
15206	15543	{
15207		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15544	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15208	15545	}
15209	15546
15210	15547	first = false;
..	..	@@ -15215,21 +15552,21 @@
15215	15552	{
15216	15553	//Composite group = (Composite) object;
15217	15554	Object3D group = object;
15218		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15555	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15219	15556	}
15220	15557
15221	15558	void ResetTransform(int mask)
15222	15559	{
15223	15560	//Composite group = (Composite) object;
15224	15561	Object3D group = object;
15225		- group.editWindow.ResetTransform(mask);
	15562	+ group.GetWindow().ResetTransform(mask);
15226	15563	}
15227	15564
15228	15565	void FlipTransform()
15229	15566	{
15230	15567	//Composite group = (Composite) object;
15231	15568	Object3D group = object;
15232		- group.editWindow.FlipTransform();
	15569	+ group.GetWindow().FlipTransform();
15233	15570	// group.editWindow.ReduceMesh(true);
15234	15571	}
15235	15572
..	..	@@ -15237,7 +15574,7 @@
15237	15574	{
15238	15575	//Composite group = (Composite) object;
15239	15576	Object3D group = object;
15240		- group.editWindow.PrintMemory();
	15577	+ group.GetWindow().PrintMemory();
15241	15578	// group.editWindow.ReduceMesh(true);
15242	15579	}
15243	15580
..	..	@@ -15245,7 +15582,7 @@
15245	15582	{
15246	15583	//Composite group = (Composite) object;
15247	15584	Object3D group = object;
15248		- group.editWindow.ResetCentroid();
	15585	+ group.GetWindow().ResetCentroid();
15249	15586	}
15250	15587
15251	15588	void IncDepth()
..	..	@@ -15331,7 +15668,9 @@
15331	15668	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15332	15669	//Image img = CreateImage(width, height);
15333	15670	//System.out.println("width = " + width + "; height = " + height + "\n");
	15671	+
15334	15672	Graphics gr = g; // img.getGraphics();
	15673	+
15335	15674	if (!hasMarquee)
15336	15675	{
15337	15676	if (Xmin < Xmax) // !locked)
..	..	@@ -15419,6 +15758,7 @@
15419	15758	info.bounds.y += (height - desired) / 2;
15420	15759	}
15421	15760	}
	15761	+
15422	15762	info.g = gr;
15423	15763	info.camera = renderCamera;
15424	15764	/*
..	..	@@ -15428,15 +15768,55 @@
15428	15768	*/
15429	15769	if (!isRenderer)
15430	15770	{
15431		- 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	+ }
15432	15810	}
15433	15811	}
	15812	+
15434	15813	if (isRenderer)
15435	15814	{
15436	15815	//gr.setColor(Color.black);
15437	15816	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15438	15817	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15439	15818	}
	15819	+
15440	15820	if (hasMarquee)
15441	15821	{
15442	15822	gr.setXORMode(Color.white);
..	..	@@ -15549,6 +15929,7 @@
15549	15929	public boolean mouseDown(Event evt, int x, int y)
15550	15930	{
15551	15931	System.out.println("mouseDown: " + evt);
	15932	+ System.exit(0);
15552	15933	/*
15553	15934	locked = true;
15554	15935	drag = false;
..	..	@@ -15592,7 +15973,7 @@
15592	15973	{
15593	15974	keyPressed(0, modifiers);
15594	15975	}
15595		- clickStart(x, y, modifiers);
	15976	+ // clickStart(x, y, modifiers);
15596	15977	return true;
15597	15978	}
15598	15979
..	..	@@ -15710,7 +16091,7 @@
15710	16091	{
15711	16092	keyReleased(0, 0);
15712	16093	}
15713		- drag(x, y, modifiers);
	16094	+ drag(x, y, 0, modifiers);
15714	16095	return true;
15715	16096	}
15716	16097
..	..	@@ -15842,7 +16223,7 @@
15842	16223	Object3D object;
15843	16224	static Object3D trackedobject;
15844	16225	Camera renderCamera; // Light or Eye (or Occlusion)
15845		- /static/ Camera manipCamera; // Light or Eye
	16226	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15846	16227	/static/ Camera eyeCamera;
15847	16228	/static/ Camera lightCamera;
15848	16229	int cameracount;
..	..	@@ -16127,16 +16508,16 @@
16127	16508	cStatic.objectstack[materialdepth++] = checker;
16128	16509	//System.out.println("material " + material);
16129	16510	//Applet3D.tracein(this, selected);
16130		- vector2buffer = checker.projectedVertices;
	16511	+ //vector2buffer = checker.projectedVertices;
16131	16512
16132	16513	//checker.GetMaterial().Draw(this, false); // true);
16133		- DrawMaterial(checker.GetMaterial(), false); // true);
	16514	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16134	16515
16135	16516	materialdepth -= 1;
16136	16517	if (materialdepth > 0)
16137	16518	{
16138		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16139		- 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);
16140	16521	}
16141	16522	//checker.GetMaterial().opacity = 1f;
16142	16523	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16222,6 +16603,14 @@
16222	16603	}
16223	16604	}
16224	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	+
16225	16614	class SelectBuffer implements GLEventListener
16226	16615	{
16227	16616
..	..	@@ -16280,6 +16669,7 @@
16280	16669	{
16281	16670	if (!selection)
16282	16671	{
	16672	+ new Exception().printStackTrace();
16283	16673	System.exit(0);
16284	16674	return;
16285	16675	}
..	..	@@ -16300,6 +16690,17 @@
16300	16690
16301	16691	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16302	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	+
16303	16704	//int tmp = selection_view;
16304	16705	//selection_view = -1;
16305	16706	int temp = DrawMode();
..	..	@@ -16311,6 +16712,17 @@
16311	16712	// temp = DEFAULT; // patch for selection debug
16312	16713	Globals.drawMode = temp; // WARNING
16313	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	+
16314	16726	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16315	16727
16316	16728	// trying different ways of getting the depth info over
..	..	@@ -16358,6 +16770,8 @@
16358	16770	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16359	16771	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16360	16772	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16773	+
	16774	+ CreateSelectedPoint();
16361	16775
16362	16776	// Will fit the mesh !!!
16363	16777	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16407,34 +16821,36 @@
16407	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]));
16408	16822	}
16409	16823
16410		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16824	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16411	16825	}
16412	16826	}
16413	16827
16414	16828	if (!movingcamera && !PAINTMODE)
16415		- object.editWindow.ScreenFitPoint(); // fev 2014
	16829	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16416	16830
16417		- 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)
16418	16832	{
16419		- 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);
16420	16834
16421		- Object3D group = new Object3D("inst" + paintcount++);
	16835	+ if (object.GetWindow().copy.selection.Size() > 0)
	16836	+ {
	16837	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16422	16838
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();
	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	+ }
16438	16854	}
16439	16855	else
16440	16856	paintcount = 0;
..	..	@@ -16473,6 +16889,11 @@
16473	16889	//System.out.println("objects[color] = " + objects[color]);
16474	16890	//objects[color].Select();
16475	16891	indexcount = 0;
	16892	+ ObjEditor window = object.GetWindow();
	16893	+ if (window != null && deselect)
	16894	+ {
	16895	+ window.Select(null, deselect, true);
	16896	+ }
16476	16897	object.Select(color, deselect);
16477	16898	}
16478	16899
..	..	@@ -16572,7 +16993,7 @@
16572	16993	gl.glDisable(gl.GL_CULL_FACE);
16573	16994	}
16574	16995
16575		- if (!RENDERSHADOW)
	16996	+ if (!Globals.RENDERSHADOW)
16576	16997	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16577	16998
16578	16999	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16582,7 +17003,7 @@
16582	17003	//gl.glColorMask(false, false, false, false);
16583	17004
16584	17005	//render_scene_from_light_view(gl, drawable, 0, 0);
16585		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17006	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16586	17007	{
16587	17008	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16588	17009
..	..	@@ -16998,23 +17419,15 @@
16998	17419	int AAbuffersize = 0;
16999	17420
17000	17421	//double[] selectedpoint = new double[3];
17001		- static Superellipsoid selectedpoint = new Superellipsoid();
	17422	+ static Superellipsoid selectedpoint;
17002	17423	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();
	17424	+ static Sphere debugpointG;
	17425	+ static Sphere debugpointP;
	17426	+ static Sphere debugpointC;
	17427	+ static Sphere debugpointR;
17007	17428
17008	17429	static Sphere debugpoints[] = new Sphere[8];
17009	17430
17010		- static
17011		- {
17012		- for (int i=0; i<8; i++)
17013		- {
17014		- debugpoints[i] = new Sphere();
17015		- }
17016		- }
17017		-
17018	17431	static void InitPoints(float radius)
17019	17432	{
17020	17433	for (int i=0; i<8; i++)