~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,8 +55,6 @@
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;
..	..	@@ -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()
..	..	@@ -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()
..	..	@@ -2376,7 +2397,129 @@
2376	2397	{
2377	2398	return currentGL;
2378	2399	}
2379		-
	2400	+
	2401	+ private void GetRemoteZip(String url, String name, boolean unzip, boolean save)
	2402	+ {
	2403	+ java.net.URL u;
	2404	+ InputStream is = null;
	2405	+ DataInputStream dis;
	2406	+ java.util.zip.ZipInputStream zis;
	2407	+ //String s;
	2408	+
	2409	+ System.out.println("GetRemoteZip " + name);
	2410	+
	2411	+ int total = 0; // dis.available();
	2412	+
	2413	+ byte[] bytes = new byte[16384];
	2414	+
	2415	+ try
	2416	+ {
	2417	+ u = new java.net.URL(url + name);
	2418	+ is = u.openStream();
	2419	+
	2420	+ System.out.println(url + name);
	2421	+
	2422	+ if (unzip)
	2423	+ {
	2424	+ //dis = new DataInputStream(new BufferedInputStream(is));
	2425	+ zis = new java.util.zip.ZipInputStream(new BufferedInputStream(is));
	2426	+ //while ((s = dis.readLine()) != null)
	2427	+
	2428	+ if (save)
	2429	+ new java.io.File(name).mkdirs();
	2430	+
	2431	+ // FileOutputStream stream = new FileOutputStream("test.zip");
	2432	+ //
	2433	+ // int count;
	2434	+ //
	2435	+ // while ((count = dis.read(bytes)) != -1)
	2436	+ // {
	2437	+ // //System.out.println(s);
	2438	+ // System.out.println(count);
	2439	+ // total += count;
	2440	+ // stream.write(bytes);
	2441	+ // }
	2442	+ //
	2443	+ // stream.close();
	2444	+
	2445	+ // now iterate through each item in the stream. The get next
	2446	+ // entry call will return a ZipEntry for each file in the
	2447	+ // stream
	2448	+ java.util.zip.ZipEntry entry;
	2449	+ while((entry = zis.getNextEntry())!=null)
	2450	+ {
	2451	+ if (entry.getName().endsWith(".gsm"))
	2452	+ {
	2453	+ continue;
	2454	+ }
	2455	+
	2456	+ String s = String.format("Entry: %s len %d added %TD",
	2457	+ entry.getName(), entry.getSize(),
	2458	+ new java.util.Date(entry.getTime()));
	2459	+ System.out.println(s);
	2460	+
	2461	+ if (save)
	2462	+ {
	2463	+ // Once we get the entry from the stream, the stream is
	2464	+ // positioned read to read the raw data, and we keep
	2465	+ // reading until read returns 0 or less.
	2466	+ String outpath = name + "/" + entry.getName();
	2467	+ FileOutputStream output = null;
	2468	+ try
	2469	+ {
	2470	+ output = new FileOutputStream(outpath);
	2471	+ int len = 0;
	2472	+ while ((len = zis.read(bytes)) > 0)
	2473	+ {
	2474	+ output.write(bytes, 0, len);
	2475	+ }
	2476	+ }
	2477	+ finally
	2478	+ {
	2479	+ // we must always close the output file
	2480	+ if(output!=null) output.close();
	2481	+ }
	2482	+ }
	2483	+ }
	2484	+ }
	2485	+ }
	2486	+ catch (java.net.MalformedURLException mue)
	2487	+ {
	2488	+ System.err.println("Ouch - a MalformedURLException happened.");
	2489	+ mue.printStackTrace();
	2490	+ //System.exit(2);
	2491	+ }
	2492	+ catch (IOException ioe)
	2493	+ {
	2494	+ //System.err.println("Oops - an IOException happened.");
	2495	+ //ioe.printStackTrace();
	2496	+ //System.exit(3);
	2497	+ }
	2498	+ finally
	2499	+ {
	2500	+ try
	2501	+ {
	2502	+ if (is != null)
	2503	+ is.close();
	2504	+ }
	2505	+ catch (IOException ioe)
	2506	+ {
	2507	+ }
	2508	+ }
	2509	+
	2510	+ // System.out.println("length = " + total);
	2511	+
	2512	+// try
	2513	+// {
	2514	+// Runtime.getRuntime().exec("/usr/local/bin/wget https://archive3d.net/?a=download&do=get&id=7caca905");
	2515	+// }
	2516	+// catch (Exception e)
	2517	+// {
	2518	+// e.printStackTrace();
	2519	+// }
	2520	+
	2521	+ }
	2522	+
2380	2523	/**/
2381	2524	class CacheTexture
2382	2525	{
..	..	@@ -7921,6 +8064,64 @@
7921	8064	ReleaseTexture(pigment, false);
7922	8065	}
7923	8066
	8067	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8068	+ {
	8069	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8070	+ {
	8071	+ return;
	8072	+ }
	8073	+
	8074	+ if (tex == null)
	8075	+ {
	8076	+ ReleaseTexture(null, false);
	8077	+ return;
	8078	+ }
	8079	+
	8080	+ String pigment = Object3D.GetPigment(tex);
	8081	+
	8082	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8083	+ {
	8084	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8085	+ // System.out.println("; bump = " + bump);
	8086	+ }
	8087	+
	8088	+ if (pigment.equals(""))
	8089	+ {
	8090	+ pigment = null;
	8091	+ }
	8092	+
	8093	+ ReleaseTexture(pigment, false);
	8094	+ }
	8095	+
	8096	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8097	+ {
	8098	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8099	+ {
	8100	+ return;
	8101	+ }
	8102	+
	8103	+ if (tex == null)
	8104	+ {
	8105	+ ReleaseTexture(null, true);
	8106	+ return;
	8107	+ }
	8108	+
	8109	+ String bump = Object3D.GetBump(tex);
	8110	+
	8111	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8112	+ {
	8113	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8114	+ // System.out.println("; bump = " + bump);
	8115	+ }
	8116	+
	8117	+ if (bump.equals(""))
	8118	+ {
	8119	+ bump = null;
	8120	+ }
	8121	+
	8122	+ ReleaseTexture(bump, true);
	8123	+ }
	8124	+
7924	8125	void ReleaseTexture(String tex, boolean bump)
7925	8126	{
7926	8127	if (// DrawMode() != 0 \|\| /tex == null \|\|/
..	..	@@ -8024,7 +8225,7 @@
8024	8225	}
8025	8226	}
8026	8227
8027		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8228	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8028	8229	{
8029	8230	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8030	8231	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8069,7 +8270,94 @@
8069	8270	return; // true;
8070	8271	}
8071	8272
8072		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8273	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8274	+ {
	8275	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8276	+ ambientOcclusion ) // \|\| !textureon)
	8277	+ {
	8278	+ return; // false;
	8279	+ }
	8280	+
	8281	+ if (tex == null)
	8282	+ {
	8283	+ BindTexture(null,false,resolution);
	8284	+ return;
	8285	+ }
	8286	+
	8287	+ String pigment = Object3D.GetPigment(tex);
	8288	+
	8289	+ usedtextures.put(pigment, pigment);
	8290	+
	8291	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8292	+ {
	8293	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8294	+ // System.out.println("; bump = " + bump);
	8295	+ }
	8296	+
	8297	+ if (pigment.equals(""))
	8298	+ {
	8299	+ pigment = null;
	8300	+ }
	8301	+
	8302	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8303	+ BindTexture(pigment, false, resolution);
	8304	+ }
	8305	+
	8306	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8307	+ {
	8308	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8309	+ ambientOcclusion ) // \|\| !textureon)
	8310	+ {
	8311	+ return; // false;
	8312	+ }
	8313	+
	8314	+ if (tex == null)
	8315	+ {
	8316	+ BindTexture(null,true,resolution);
	8317	+ return;
	8318	+ }
	8319	+
	8320	+ String bump = Object3D.GetBump(tex);
	8321	+
	8322	+ usedtextures.put(bump, bump);
	8323	+
	8324	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8325	+ {
	8326	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8327	+ // System.out.println("; bump = " + bump);
	8328	+ }
	8329	+
	8330	+ if (bump.equals(""))
	8331	+ {
	8332	+ bump = null;
	8333	+ }
	8334	+
	8335	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8336	+ BindTexture(bump, true, resolution);
	8337	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8338	+ }
	8339	+
	8340	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8341	+
	8342	+ private boolean FileExists(String tex)
	8343	+ {
	8344	+ if (missingTextures.contains(tex))
	8345	+ {
	8346	+ return false;
	8347	+ }
	8348	+
	8349	+ boolean fileExists = new File(tex).exists();
	8350	+
	8351	+ if (!fileExists)
	8352	+ {
	8353	+ // If file exists, the "new File()" is not executed sgain
	8354	+ missingTextures.add(tex);
	8355	+ }
	8356	+
	8357	+ return fileExists;
	8358	+ }
	8359	+
	8360	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
8073	8361	{
8074	8362	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8075	8363
..	..	@@ -8077,12 +8365,18 @@
8077	8365	{
8078	8366	String texname = tex;
8079	8367
8080		- String[] split = tex.split("Textures");
8081		- if (split.length > 1)
8082		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8083		- else
8084		- if (!texname.startsWith("/"))
8085		- texname = "/Users/nbriere/Textures/" + texname;
	8368	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8369	+
	8370	+// String[] split = tex.split("Textures");
	8371	+// if (split.length > 1)
	8372	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8373	+// else
	8374	+// if (!texname.startsWith("/"))
	8375	+// texname = "/Users/nbriere/Textures/" + texname;
	8376	+ if (!FileExists(tex))
	8377	+ {
	8378	+ texname = fallbackTextureName;
	8379	+ }
8086	8380
8087	8381	if (CACHETEXTURE)
8088	8382	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -8151,7 +8445,7 @@
8151	8445	}
8152	8446
8153	8447	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8154		- if (!new File(cachename).exists())
	8448	+ if (!FileExists(cachename))
8155	8449	cachename = texname;
8156	8450	else
8157	8451	processbump = false; // don't process bump map again
..	..	@@ -8173,7 +8467,7 @@
8173	8467	}
8174	8468
8175	8469	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8176		- if (!new File(cachename).exists())
	8470	+ if (!FileExists(cachename))
8177	8471	cachename = texname;
8178	8472	else
8179	8473	processbump = false; // don't process bump map again
..	..	@@ -8182,7 +8476,9 @@
8182	8476	texturedata = GetFileTexture(cachename, processbump, resolution);
8183	8477
8184	8478
8185		- if (texturedata != null)
	8479	+ if (texturedata == null)
	8480	+ throw new Exception();
	8481	+
8186	8482	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8187	8483	//texture = GetTexture(tex, bump);
8188	8484	}
..	..	@@ -8304,7 +8600,7 @@
8304	8600	return texture;
8305	8601	}
8306	8602
8307		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8603	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
8308	8604	{
8309	8605	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8310	8606
..	..	@@ -8322,14 +8618,14 @@
8322	8618	return texture!=null?texture.texture:null;
8323	8619	}
8324	8620
8325		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8621	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
8326	8622	{
8327	8623	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8328	8624
8329	8625	return texture!=null?texture.texturedata:null;
8330	8626	}
8331	8627
8332		- boolean BindTexture(String tex, boolean bump, int resolution)
	8628	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
8333	8629	{
8334	8630	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8335	8631	{
..	..	@@ -9206,11 +9502,35 @@
9206	9502	jy8[3] = 0.5f;
9207	9503	}
9208	9504
9209		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9505	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9210	9506	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9211	9507	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9212	9508	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9213	9509
	9510	+ void ResetOptions()
	9511	+ {
	9512	+ options1[0] = 100;
	9513	+ options1[1] = 0.025f;
	9514	+ options1[2] = 0.01f;
	9515	+ options1[3] = 0;
	9516	+ options1[4] = 0;
	9517	+
	9518	+ options2[0] = 0;
	9519	+ options2[1] = 0.75f;
	9520	+ options2[2] = 0;
	9521	+ options2[3] = 0;
	9522	+
	9523	+ options3[0] = 1;
	9524	+ options3[1] = 1;
	9525	+ options3[2] = 1;
	9526	+ options3[3] = 0;
	9527	+
	9528	+ options4[0] = 1;
	9529	+ options4[1] = 0;
	9530	+ options4[2] = 1;
	9531	+ options4[3] = 0;
	9532	+ }
	9533	+
9214	9534	static int imagecount = 0; // movie generation
9215	9535
9216	9536	static int jitter = 0;
..	..	@@ -9306,8 +9626,8 @@
9306	9626	assert (parentcam != renderCamera);
9307	9627
9308	9628	if (renderCamera != lightCamera)
9309		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9310		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9629	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9630	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9311	9631
9312	9632	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9313	9633
..	..	@@ -9322,8 +9642,8 @@
9322	9642	LA.matCopy(renderCamera.fromScreen, matrix);
9323	9643
9324	9644	if (renderCamera != lightCamera)
9325		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9326		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9645	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9646	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9327	9647
9328	9648	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9329	9649
..	..	@@ -9395,7 +9715,7 @@
9395	9715	//gl.glFlush();
9396	9716	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9397	9717
9398		- if (ANIMATION && ABORTED)
	9718	+ if (Globals.ANIMATION && ABORTED)
9399	9719	{
9400	9720	System.err.println(" ABORTED FRAME");
9401	9721	break;
..	..	@@ -9425,7 +9745,7 @@
9425	9745	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9426	9746
9427	9747	// save image
9428		- if (ANIMATION && !ABORTED)
	9748	+ if (Globals.ANIMATION && !ABORTED)
9429	9749	{
9430	9750	VPwidth = viewport[2];
9431	9751	VPheight = viewport[3];
..	..	@@ -9536,11 +9856,11 @@
9536	9856
9537	9857	// imagecount++;
9538	9858
9539		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9859	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9540	9860
9541	9861	if (!BOXMODE)
9542	9862	{
9543		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9863	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9544	9864	}
9545	9865
9546	9866	if (!BOXMODE)
..	..	@@ -9578,7 +9898,7 @@
9578	9898	ABORTED = false;
9579	9899	}
9580	9900	else
9581		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9901	+ Grafreed.wav.cursor += 735 * ACSIZE;
9582	9902
9583	9903	if (false)
9584	9904	{
..	..	@@ -10241,11 +10561,11 @@
10241	10561
10242	10562	public void display(GLAutoDrawable drawable)
10243	10563	{
10244		- if (GrafreeD.savesound && GrafreeD.hassound)
	10564	+ if (Grafreed.savesound && Grafreed.hassound)
10245	10565	{
10246		- GrafreeD.wav.save();
10247		- GrafreeD.savesound = false;
10248		- GrafreeD.hassound = false;
	10566	+ Grafreed.wav.save();
	10567	+ Grafreed.savesound = false;
	10568	+ Grafreed.hassound = false;
10249	10569	}
10250	10570	// if (DEBUG_SELECTION)
10251	10571	// {
..	..	@@ -10321,6 +10641,7 @@
10321	10641	ANTIALIAS = 0;
10322	10642	//System.out.println("RESTART");
10323	10643	AAtimer.restart();
	10644	+ Globals.TIMERRUNNING = true;
10324	10645	}
10325	10646	}
10326	10647	}
..	..	@@ -10375,7 +10696,7 @@
10375	10696	Object3D theobject = object;
10376	10697	Object3D theparent = object.parent;
10377	10698	object.parent = null;
10378		- object = (Object3D)GrafreeD.clone(object);
	10699	+ object = (Object3D)Grafreed.clone(object);
10379	10700	object.Stripify();
10380	10701	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10381	10702	theobject.PreprocessOcclusion(this);
..	..	@@ -10388,13 +10709,14 @@
10388	10709	ambientOcclusion = false;
10389	10710	}
10390	10711
10391		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10712	+ if (//Globals.lighttouched &&
	10713	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10392	10714	{
10393	10715	//if (RENDERSHADOW) // ?
10394	10716	if (!IsFrozen())
10395	10717	{
10396	10718	// dec 2012
10397		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10719	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10398	10720	{
10399	10721	Globals.framecount++;
10400	10722	shadowbuffer.display();
..	..	@@ -10521,8 +10843,8 @@
10521	10843
10522	10844	// if (parentcam != renderCamera) // not a light
10523	10845	if (cam != lightCamera)
10524		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10525		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10846	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10847	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10526	10848
10527	10849	for (int j = 0; j < 4; j++)
10528	10850	{
..	..	@@ -10536,8 +10858,8 @@
10536	10858
10537	10859	// if (parentcam != renderCamera) // not a light
10538	10860	if (cam != lightCamera)
10539		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10540		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10861	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10862	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10541	10863
10542	10864	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10543	10865
..	..	@@ -10796,7 +11118,16 @@
10796	11118	// Bump noise
10797	11119	gl.glActiveTexture(GL.GL_TEXTURE6);
10798	11120	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10799		- BindTexture(NOISE_TEXTURE, false, 2);
	11121	+
	11122	+ try
	11123	+ {
	11124	+ BindTexture(NOISE_TEXTURE, false, 2);
	11125	+ }
	11126	+ catch (Exception e)
	11127	+ {
	11128	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11129	+ }
	11130	+
10800	11131
10801	11132	gl.glActiveTexture(GL.GL_TEXTURE0);
10802	11133	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10921,8 +11252,8 @@
10921	11252	System.err.println("parentcam != renderCamera");
10922	11253
10923	11254	// if (cam != lightCamera)
10924		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10925		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11255	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11256	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10926	11257	}
10927	11258
10928	11259	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10943,8 +11274,8 @@
10943	11274	if (true) // TODO
10944	11275	{
10945	11276	if (cam != lightCamera)
10946		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10947		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11277	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11278	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10948	11279	}
10949	11280
10950	11281	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11260,8 +11591,14 @@
11260	11591	{
11261	11592	renderpass++;
11262	11593	// System.out.println("Draw object... ");
	11594	+ STEP = 1;
11263	11595	if (FAST) // in case there is no script
11264		- STEP = 16;
	11596	+ STEP = 8;
	11597	+
	11598	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11599	+ {
	11600	+ STEP *= 4;
	11601	+ }
11265	11602
11266	11603	//object.FullInvariants();
11267	11604
..	..	@@ -11275,16 +11612,37 @@
11275	11612	e.printStackTrace();
11276	11613	}
11277	11614
11278		- if (GrafreeD.RENDERME > 0)
11279		- GrafreeD.RENDERME--; // mechante magouille
	11615	+ if (Grafreed.RENDERME > 0)
	11616	+ Grafreed.RENDERME--; // mechante magouille
11280	11617
11281	11618	Globals.ONESTEP = false;
11282	11619	}
11283	11620
11284	11621	static boolean zoomonce = false;
11285	11622
	11623	+ static void CreateSelectedPoint()
	11624	+ {
	11625	+ if (selectedpoint == null)
	11626	+ {
	11627	+ debugpointG = new Sphere();
	11628	+ debugpointP = new Sphere();
	11629	+ debugpointC = new Sphere();
	11630	+ debugpointR = new Sphere();
	11631	+
	11632	+ selectedpoint = new Superellipsoid();
	11633	+
	11634	+ for (int i=0; i<8; i++)
	11635	+ {
	11636	+ debugpoints[i] = new Sphere();
	11637	+ }
	11638	+ }
	11639	+ }
	11640	+
11286	11641	void DrawObject(GL gl, boolean draw)
11287	11642	{
	11643	+ // To clear camera values
	11644	+ ResetOptions();
	11645	+
11288	11646	//System.out.println("DRAW OBJECT " + mouseDown);
11289	11647	// DrawMode() = SELECTION;
11290	11648	//GL gl = getGL();
..	..	@@ -11346,7 +11704,14 @@
11346	11704
11347	11705	usedtextures.clear();
11348	11706
11349		- BindTextures(DEFAULT_TEXTURES, 2);
	11707	+ try
	11708	+ {
	11709	+ BindTextures(DEFAULT_TEXTURES, 2);
	11710	+ }
	11711	+ catch (Exception e)
	11712	+ {
	11713	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11714	+ }
11350	11715	}
11351	11716	//System.out.println("--> " + stackdepth);
11352	11717	// GrafreeD.traceon();
..	..	@@ -11356,8 +11721,9 @@
11356	11721
11357	11722	if (DrawMode() == DEFAULT)
11358	11723	{
11359		- if (DEBUG)
	11724	+ if (Globals.DEBUG)
11360	11725	{
	11726	+ CreateSelectedPoint();
11361	11727	float radius = 0.05f;
11362	11728	if (selectedpoint.radius != radius)
11363	11729	{
..	..	@@ -11437,7 +11803,14 @@
11437	11803	if (checker != null && DrawMode() == DEFAULT)
11438	11804	{
11439	11805	//BindTexture(IMMORTAL_TEXTURE);
11440		- BindTextures(checker.GetTextures(), checker.texres);
	11806	+ try
	11807	+ {
	11808	+ BindTextures(checker.GetTextures(), checker.texres);
	11809	+ }
	11810	+ catch (Exception e)
	11811	+ {
	11812	+ System.err.println("FAILED: " + checker.GetTextures());
	11813	+ }
11441	11814	// NEAREST
11442	11815	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11443	11816	DrawChecker(gl);
..	..	@@ -11519,7 +11892,7 @@
11519	11892	return;
11520	11893	}
11521	11894
11522		- String string = obj.GetToolTip();
	11895	+ String string = obj.toString(); //.GetToolTip();
11523	11896
11524	11897	GL gl = GetGL();
11525	11898
..	..	@@ -11836,8 +12209,8 @@
11836	12209	//obj.TransformToWorld(light, light);
11837	12210	for (int i = tp.size(); --i >= 0;)
11838	12211	{
11839		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11840		- LA.xformPos(light, tp.get(i).toParent, light);
	12212	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12213	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11841	12214	}
11842	12215
11843	12216
..	..	@@ -11854,8 +12227,8 @@
11854	12227	parentcam = cameras[0];
11855	12228	}
11856	12229
11857		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11858		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12230	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12231	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11859	12232
11860	12233	LA.xformPos(light, renderCamera.toScreen, light);
11861	12234
..	..	@@ -12469,8 +12842,8 @@
12469	12842
12470	12843	// display shadow only (bump == 0)
12471	12844	"SUB temp.x, half.x, shadow.x;" +
12472		- "MOV temp.y, -params6.x;" +
12473		- "SLT temp.z, temp.y, zero.x;" +
	12845	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12846	+ "SLT temp.z, temp.y, -one2048th.x;" +
12474	12847	"SUB temp.y, one.x, temp.z;" +
12475	12848	"MUL temp.x, temp.x, temp.y;" +
12476	12849	"KIL temp.x;" +
..	..	@@ -12599,8 +12972,10 @@
12599	12972	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12600	12973
12601	12974	"SUB temp.x, one.x, ndotl.x;" +
12602		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12603		- "ADD temp.y, one.y, options2.y;" + // sursurface
	12975	+ // Tuning for default skin
	12976	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12977	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12978	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12604	12979	"MUL temp.x, temp.x, temp.y;" +
12605	12980
12606	12981	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12748,7 +13123,7 @@
12748	13123	"MUL final.y, fragment.texcoord[0].x, c256;" +
12749	13124	"FLR final.x, final.y;" +
12750	13125	"SUB final.y, final.y, final.x;" +
12751		- //"MUL final.x, final.x, c256i;" +
	13126	+ "MUL final.x, final.x, c256i;" +
12752	13127	"MOV final.z, zero.x;" +
12753	13128	"MOV final.a, one.w;":""
12754	13129	) +
..	..	@@ -12756,7 +13131,7 @@
12756	13131	"MUL final.y, fragment.texcoord[0].y, c256;" +
12757	13132	"FLR final.x, final.y;" +
12758	13133	"SUB final.y, final.y, final.x;" +
12759		- //"MUL final.x, final.x, c256i;" +
	13134	+ "MUL final.x, final.x, c256i;" +
12760	13135	"MOV final.z, zero.x;" +
12761	13136	"MOV final.a, one.w;":""
12762	13137	) +
..	..	@@ -12799,7 +13174,7 @@
12799	13174	//once = true;
12800	13175	}
12801	13176
12802		- System.out.print("Program #" + mode + "; length = " + program.length());
	13177	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12803	13178	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12804	13179	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12805	13180
..	..	@@ -12932,12 +13307,16 @@
12932	13307
12933	13308	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12934	13309	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13310	+
	13311	+ // Compare fragment depth in light space with shadowmap.
12935	13312	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12936	13313	"SGE temp.y, temp.x, zero.x;" +
12937		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13314	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13315	+
	13316	+ // Reverse comparison
12938	13317	"SUB temp.x, one.x, temp.x;" +
12939	13318	"MUL " + shadow + ".x, temp.x, temp.y;" +
12940		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13319	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12941	13320	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12942	13321
12943	13322	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12951,6 +13330,10 @@
12951	13330	// No shadow for backface
12952	13331	"DP3 temp.x, normal, lightd;" +
12953	13332	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13333	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13334	+
	13335	+ // No shadow when out of frustrum
	13336	+ "SGE temp.x, " + depth + ".z, one.z;" +
12954	13337	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12955	13338	"";
12956	13339	}
..	..	@@ -13097,7 +13480,8 @@
13097	13480	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13098	13481	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13099	13482	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13100		- Object3D.cVector2[] vector2buffer;
	13483	+
	13484	+ //Object3D.cVector2[] vector2buffer;
13101	13485
13102	13486	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13103	13487	// OUT : diff, spec
..	..	@@ -13113,9 +13497,10 @@
13113	13497	"DP3 " + dest + ".z," + "normals," + "eye;" +
13114	13498	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13115	13499	//"MOV " + dest + ".w," + "normal.z;" +
13116		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13117		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13118		- //"MOV " + dest + ".z," + "params2.w;" +
	13500	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13501	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13502	+
	13503	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13119	13504	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13120	13505	"RCP " + dest + ".w," + dest + ".w;" +
13121	13506	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13509,7 +13894,7 @@
13509	13894	public void mousePressed(MouseEvent e)
13510	13895	{
13511	13896	//System.out.println("mousePressed: " + e);
13512		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13897	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13513	13898	}
13514	13899
13515	13900	static long prevtime = 0;
..	..	@@ -13585,8 +13970,8 @@
13585	13970	// mode \|= META;
13586	13971	//}
13587	13972
13588		- SetMouseMode(WHEEL \| e.getModifiersEx());
13589		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13973	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13974	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13590	13975	anchorX = ax;
13591	13976	anchorY = ay;
13592	13977	prevX = px;
..	..	@@ -13620,6 +14005,7 @@
13620	14005	else
13621	14006	if (evt.getSource() == AAtimer)
13622	14007	{
	14008	+ Globals.TIMERRUNNING = false;
13623	14009	if (mouseDown)
13624	14010	{
13625	14011	//new Exception().printStackTrace();
..	..	@@ -13645,6 +14031,10 @@
13645	14031	// LIVE = waslive;
13646	14032	// wasliveok = true;
13647	14033	// waslive = false;
	14034	+
	14035	+ // May 2019 Forget it:
	14036	+ if (true)
	14037	+ return;
13648	14038
13649	14039	// source == timer
13650	14040	if (mouseDown)
..	..	@@ -13684,12 +14074,13 @@
13684	14074
13685	14075	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13686	14076
13687		- void clickStart(int x, int y, int modifiers)
	14077	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13688	14078	{
13689	14079	if (!wasliveok)
13690	14080	return;
13691	14081
13692	14082	AAtimer.restart(); //
	14083	+ Globals.TIMERRUNNING = true;
13693	14084
13694	14085	// waslive = LIVE;
13695	14086	// LIVE = false;
..	..	@@ -13701,7 +14092,7 @@
13701	14092	// touched = true; // main DL
13702	14093	if (isRenderer)
13703	14094	{
13704		- SetMouseMode(modifiers);
	14095	+ SetMouseMode(modifiers, modifiersex);
13705	14096	}
13706	14097
13707	14098	selectX = anchorX = x;
..	..	@@ -13714,7 +14105,7 @@
13714	14105	clicked = true;
13715	14106	hold = false;
13716	14107
13717		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14108	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13718	14109	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13719	14110	{
13720	14111	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13745,7 +14136,7 @@
13745	14136	info.camera = renderCamera;
13746	14137	info.x = x;
13747	14138	info.y = y;
13748		- info.modifiers = modifiers;
	14139	+ info.modifiers = modifiersex;
13749	14140	editObj = object.doEditClick(info, 0);
13750	14141	if (!editObj)
13751	14142	{
..	..	@@ -13762,9 +14153,12 @@
13762	14153
13763	14154	public void mouseDragged(MouseEvent e)
13764	14155	{
	14156	+ Globals.MOUSEDRAGGED = true;
	14157	+
13765	14158	//System.out.println("mouseDragged: " + e);
13766	14159	if (isRenderer)
13767	14160	movingcamera = true;
	14161	+
13768	14162	//if (drawing)
13769	14163	//return;
13770	14164	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13774,7 +14168,7 @@
13774	14168	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13775	14169	}
13776	14170	else
13777		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14171	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13778	14172
13779	14173	//try { Thread.sleep(1); } catch (Exception ex) {}
13780	14174	}
..	..	@@ -14011,7 +14405,7 @@
14011	14405	{
14012	14406	Globals.lighttouched = true;
14013	14407	}
14014		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14408	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14015	14409	}
14016	14410	//else
14017	14411	}
..	..	@@ -14111,7 +14505,7 @@
14111	14505	int X, Y;
14112	14506	boolean SX, SY;
14113	14507
14114		- void drag(int x, int y, int modifiers)
	14508	+ void drag(int x, int y, int modifiers, int modifiersex)
14115	14509	{
14116	14510	if (IsFrozen())
14117	14511	{
..	..	@@ -14120,17 +14514,17 @@
14120	14514
14121	14515	drag = true; // NEW
14122	14516
14123		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14517	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14124	14518
14125	14519	X = x;
14126	14520	Y = y;
14127	14521	// floating state for animation
14128		- MODIFIERS = modifiers;
14129		- modifiers &= ~1024;
	14522	+ MODIFIERS = modifiersex;
	14523	+ modifiersex &= ~1024;
14130	14524	if (false) // modifiers != 0)
14131	14525	{
14132	14526	//new Exception().printStackTrace();
14133		- System.out.println("mouseDragged: " + modifiers);
	14527	+ System.out.println("mouseDragged: " + modifiersex);
14134	14528	System.out.println("SHIFT = " + SHIFT);
14135	14529	System.out.println("CONTROL = " + COMMAND);
14136	14530	System.out.println("META = " + META);
..	..	@@ -14150,7 +14544,8 @@
14150	14544	info.camera = renderCamera;
14151	14545	info.x = x;
14152	14546	info.y = y;
14153		- object.editWindow.copy.doEditDrag(info);
	14547	+ object.GetWindow().copy
	14548	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14154	14549	} else
14155	14550	{
14156	14551	if (x < startX)
..	..	@@ -14314,7 +14709,9 @@
14314	14709	ci.camera = renderCamera;
14315	14710	if (!isRenderer)
14316	14711	{
14317		- if (object.editWindow.copy.doEditClick(ci, 0))
	14712	+ //ObjEditor editWindow = object.editWindow;
	14713	+ //Object3D copy = editWindow.copy;
	14714	+ if (object.doEditClick(ci, 0))
14318	14715	{
14319	14716	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14320	14717	} else
..	..	@@ -14326,7 +14723,10 @@
14326	14723
14327	14724	public void mouseReleased(MouseEvent e)
14328	14725	{
	14726	+ Globals.MOUSEDRAGGED = false;
	14727	+
14329	14728	movingcamera = false;
	14729	+ X = Y = 0;
14330	14730	//System.out.println("mouseReleased: " + e);
14331	14731	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14332	14732	}
..	..	@@ -14349,9 +14749,9 @@
14349	14749	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14350	14750	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14351	14751
14352		- if (control \|\| command \|\| IsFrozen())
	14752	+// No delay if (control \|\| command \|\| IsFrozen())
14353	14753	timeout = true;
14354		- else
	14754	+// ?? May 2019 else
14355	14755	// timer.setDelay((modifiers & 128) != 0?0:350);
14356	14756	mouseDown = false;
14357	14757	if (!control && !command) // june 2013
..	..	@@ -14461,7 +14861,7 @@
14461	14861	System.out.println("keyReleased: " + e);
14462	14862	}
14463	14863
14464		- void SetMouseMode(int modifiers)
	14864	+ void SetMouseMode(int modifiers, int modifiersex)
14465	14865	{
14466	14866	//System.out.println("SetMouseMode = " + modifiers);
14467	14867	//modifiers &= ~1024;
..	..	@@ -14473,25 +14873,25 @@
14473	14873	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14474	14874	// return;
14475	14875	//System.out.println("SetMode = " + modifiers);
14476		- if ((modifiers & WHEEL) == WHEEL)
	14876	+ if ((modifiersex & WHEEL) == WHEEL)
14477	14877	{
14478	14878	mouseMode \|= ZOOM;
14479	14879	}
14480	14880
14481	14881	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14482		- if (capsLocked \|\| (modifiers & META) == META)
	14882	+ if (capsLocked) // \|\| (modifiers & META) == META)
14483	14883	{
14484	14884	mouseMode \|= VR; // BACKFORTH;
14485	14885	}
14486		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14886	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14487	14887	{
14488	14888	mouseMode \|= SELECT;
14489	14889	}
14490		- if ((modifiers & COMMAND) == COMMAND)
	14890	+ if ((modifiersex & COMMAND) == COMMAND)
14491	14891	{
14492	14892	mouseMode \|= SELECT;
14493	14893	}
14494		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14894	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14495	14895	{
14496	14896	mouseMode &= ~VR;
14497	14897	mouseMode \|= TRANSLATE;
..	..	@@ -14520,7 +14920,7 @@
14520	14920
14521	14921	if (isRenderer) //
14522	14922	{
14523		- SetMouseMode(modifiers);
	14923	+ SetMouseMode(0, modifiers);
14524	14924	}
14525	14925
14526	14926	Globals.theRenderer.keyPressed(key);
..	..	@@ -14692,8 +15092,14 @@
14692	15092	RevertCamera();
14693	15093	repaint();
14694	15094	break;
14695		- case 'L':
14696	15095	case 'l':
	15096	+ lightMode ^= true;
	15097	+ Globals.lighttouched = true;
	15098	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	15099	+ targetLookAt.set(manipCamera.lookAt);
	15100	+ repaint();
	15101	+ break;
	15102	+ case 'L':
14697	15103	if (lightMode)
14698	15104	{
14699	15105	lightMode = false;
..	..	@@ -14836,27 +15242,25 @@
14836	15242	case '_':
14837	15243	kompactbit = 5;
14838	15244	break;
14839		- case '+':
14840		- kompactbit = 6;
14841		- break;
	15245	+// case '+':
	15246	+// kompactbit = 6;
	15247	+// break;
14842	15248	case ' ':
14843		- lightMode ^= true;
14844		- Globals.lighttouched = true;
14845		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14846		- targetLookAt.set(manipCamera.lookAt);
	15249	+ ObjEditor.theFrame.ToggleFullScreen();
14847	15250	repaint();
14848	15251	break;
14849	15252	//case '`' :
14850	15253	case ESC:
14851	15254	RENDERPROGRAM += 1;
14852	15255	RENDERPROGRAM %= 3;
	15256	+
14853	15257	repaint();
14854	15258	break;
14855	15259	case 'Z':
14856	15260	//RESIZETEXTURE ^= true;
14857	15261	//break;
14858	15262	case 'z':
14859		- RENDERSHADOW ^= true;
	15263	+ Globals.RENDERSHADOW ^= true;
14860	15264	Globals.lighttouched = true;
14861	15265	repaint();
14862	15266	break;
..	..	@@ -14889,8 +15293,15 @@
14889	15293	case DELETE:
14890	15294	ClearSelection();
14891	15295	break;
14892		- /*
14893	15296	case '+':
	15297	+
	15298	+ //for (int i=0; i<0x7FFFFFFF; i++)
	15299	+ {
	15300	+ //String.format("%08X", i); // "7caca905"
	15301	+ GetRemoteZip("https://archive3d.net/?a=download&do=get&id=", "7caca905", true, true);
	15302	+ }
	15303	+
	15304	+ /*
14894	15305	//fontsize += 1;
14895	15306	bbzoom *= 2;
14896	15307	repaint();
..	..	@@ -14980,7 +15391,7 @@
14980	15391	//mode = ROTATE;
14981	15392	if ((MODIFIERS & COMMAND) == 0) // VR??
14982	15393	{
14983		- SetMouseMode(modifiers);
	15394	+ SetMouseMode(0, modifiers);
14984	15395	}
14985	15396	}
14986	15397
..	..	@@ -15116,7 +15527,7 @@
15116	15527	{
15117	15528	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15118	15529	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15119		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15530	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15120	15531	{
15121	15532	mouseMoved(e);
15122	15533	} else
..	..	@@ -15141,7 +15552,7 @@
15141	15552	}
15142	15553	*/
15143	15554
15144		- object.editWindow.EditSelection();
	15555	+ object.editWindow.EditSelection(false);
15145	15556	}
15146	15557
15147	15558	void SelectParent()
..	..	@@ -15335,7 +15746,9 @@
15335	15746	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15336	15747	//Image img = CreateImage(width, height);
15337	15748	//System.out.println("width = " + width + "; height = " + height + "\n");
	15749	+
15338	15750	Graphics gr = g; // img.getGraphics();
	15751	+
15339	15752	if (!hasMarquee)
15340	15753	{
15341	15754	if (Xmin < Xmax) // !locked)
..	..	@@ -15433,14 +15846,33 @@
15433	15846	if (!isRenderer)
15434	15847	{
15435	15848	object.drawEditHandles(info, 0);
	15849	+
	15850	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15851	+ {
	15852	+ switch (object.selection.get(0).hitSomething)
	15853	+ {
	15854	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15855	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15856	+ break;
	15857	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15858	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15859	+ break;
	15860	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15861	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15862	+ break;
	15863	+ }
	15864	+
	15865	+ }
15436	15866	}
15437	15867	}
	15868	+
15438	15869	if (isRenderer)
15439	15870	{
15440	15871	//gr.setColor(Color.black);
15441	15872	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15442	15873	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15443	15874	}
	15875	+
15444	15876	if (hasMarquee)
15445	15877	{
15446	15878	gr.setXORMode(Color.white);
..	..	@@ -15553,6 +15985,7 @@
15553	15985	public boolean mouseDown(Event evt, int x, int y)
15554	15986	{
15555	15987	System.out.println("mouseDown: " + evt);
	15988	+ System.exit(0);
15556	15989	/*
15557	15990	locked = true;
15558	15991	drag = false;
..	..	@@ -15596,7 +16029,7 @@
15596	16029	{
15597	16030	keyPressed(0, modifiers);
15598	16031	}
15599		- clickStart(x, y, modifiers);
	16032	+ // clickStart(x, y, modifiers);
15600	16033	return true;
15601	16034	}
15602	16035
..	..	@@ -15714,7 +16147,7 @@
15714	16147	{
15715	16148	keyReleased(0, 0);
15716	16149	}
15717		- drag(x, y, modifiers);
	16150	+ drag(x, y, 0, modifiers);
15718	16151	return true;
15719	16152	}
15720	16153
..	..	@@ -15846,7 +16279,7 @@
15846	16279	Object3D object;
15847	16280	static Object3D trackedobject;
15848	16281	Camera renderCamera; // Light or Eye (or Occlusion)
15849		- /static/ Camera manipCamera; // Light or Eye
	16282	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15850	16283	/static/ Camera eyeCamera;
15851	16284	/static/ Camera lightCamera;
15852	16285	int cameracount;
..	..	@@ -16131,16 +16564,16 @@
16131	16564	cStatic.objectstack[materialdepth++] = checker;
16132	16565	//System.out.println("material " + material);
16133	16566	//Applet3D.tracein(this, selected);
16134		- vector2buffer = checker.projectedVertices;
	16567	+ //vector2buffer = checker.projectedVertices;
16135	16568
16136	16569	//checker.GetMaterial().Draw(this, false); // true);
16137		- DrawMaterial(checker.GetMaterial(), false); // true);
	16570	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16138	16571
16139	16572	materialdepth -= 1;
16140	16573	if (materialdepth > 0)
16141	16574	{
16142		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16143		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16575	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16576	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16144	16577	}
16145	16578	//checker.GetMaterial().opacity = 1f;
16146	16579	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16364,6 +16797,8 @@
16364	16797	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16365	16798	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
16366	16799
	16800	+ CreateSelectedPoint();
	16801	+
16367	16802	// Will fit the mesh !!!
16368	16803	selectedpoint.toParent[0][0] = 0.0001;
16369	16804	selectedpoint.toParent[1][1] = 0.0001;
..	..	@@ -16412,16 +16847,16 @@
16412	16847	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]));
16413	16848	}
16414	16849
16415		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16850	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16416	16851	}
16417	16852	}
16418	16853
16419	16854	if (!movingcamera && !PAINTMODE)
16420	16855	object.editWindow.ScreenFitPoint(); // fev 2014
16421	16856
16422		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16857	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16423	16858	{
16424		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16859	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16425	16860
16426	16861	Object3D group = new Object3D("inst" + paintcount++);
16427	16862
..	..	@@ -16478,6 +16913,11 @@
16478	16913	//System.out.println("objects[color] = " + objects[color]);
16479	16914	//objects[color].Select();
16480	16915	indexcount = 0;
	16916	+ ObjEditor window = object.GetWindow();
	16917	+ if (window != null && deselect)
	16918	+ {
	16919	+ window.Select(null, deselect, true);
	16920	+ }
16481	16921	object.Select(color, deselect);
16482	16922	}
16483	16923
..	..	@@ -16577,7 +17017,7 @@
16577	17017	gl.glDisable(gl.GL_CULL_FACE);
16578	17018	}
16579	17019
16580		- if (!RENDERSHADOW)
	17020	+ if (!Globals.RENDERSHADOW)
16581	17021	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16582	17022
16583	17023	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16587,7 +17027,7 @@
16587	17027	//gl.glColorMask(false, false, false, false);
16588	17028
16589	17029	//render_scene_from_light_view(gl, drawable, 0, 0);
16590		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17030	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16591	17031	{
16592	17032	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16593	17033
..	..	@@ -17003,23 +17443,15 @@
17003	17443	int AAbuffersize = 0;
17004	17444
17005	17445	//double[] selectedpoint = new double[3];
17006		- static Superellipsoid selectedpoint = new Superellipsoid();
	17446	+ static Superellipsoid selectedpoint;
17007	17447	static Sphere previousselectedpoint = null;
17008		- static Sphere debugpointG = new Sphere();
17009		- static Sphere debugpointP = new Sphere();
17010		- static Sphere debugpointC = new Sphere();
17011		- static Sphere debugpointR = new Sphere();
	17448	+ static Sphere debugpointG;
	17449	+ static Sphere debugpointP;
	17450	+ static Sphere debugpointC;
	17451	+ static Sphere debugpointR;
17012	17452
17013	17453	static Sphere debugpoints[] = new Sphere[8];
17014	17454
17015		- static
17016		- {
17017		- for (int i=0; i<8; i++)
17018		- {
17019		- debugpoints[i] = new Sphere();
17020		- }
17021		- }
17022		-
17023	17455	static void InitPoints(float radius)
17024	17456	{
17025	17457	for (int i=0; i<8; i++)