~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;
..	..	@@ -92,6 +89,8 @@
92	89
93	90	static int tickcount = 0; // slow pose issue
94	91
	92	+static boolean BUTTONLESSWHEEL = false;
	93	+static boolean ZOOMBOXMODE = false;
95	94	static boolean BOXMODE = false;
96	95	static boolean IMAGEFLIP = false;
97	96	static boolean SMOOTHFOCUS = false;
..	..	@@ -106,7 +105,7 @@
106	105	static boolean OEIL = true;
107	106	static boolean OEILONCE = false; // do oeilon then oeiloff
108	107	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	108	+static boolean SWITCH = true; // false;
110	109	static boolean HANDLES = false; // selection doesn't work!!
111	110	static boolean PAINTMODE = false;
112	111
..	..	@@ -149,6 +148,8 @@
149	148	defaultcaps.setAccumBlueBits(16);
150	149	defaultcaps.setAccumAlphaBits(16);
151	150	}
	151	+
	152	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
152	153
153	154	void SetAsGLRenderer(boolean b)
154	155	{
..	..	@@ -223,6 +224,11 @@
223	224	public boolean IsBoxMode()
224	225	{
225	226	return BOXMODE;
	227	+ }
	228	+
	229	+ public boolean IsZoomBoxMode()
	230	+ {
	231	+ return ZOOMBOXMODE;
226	232	}
227	233
228	234	public void ClearDepth()
..	..	@@ -320,7 +326,7 @@
320	326	cStatic.objectstack[materialdepth++] = obj;
321	327	//System.out.println("material " + material);
322	328	//Applet3D.tracein(this, selected);
323		- display.vector2buffer = obj.projectedVertices;
	329	+ //display.vector2buffer = obj.projectedVertices;
324	330	if (obj instanceof Camera)
325	331	{
326	332	display.options1[0] = material.shift;
..	..	@@ -329,14 +335,28 @@
329	335	display.options1[2] = material.shadowbias;
330	336	display.options1[3] = material.aniso;
331	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]);
332	343	display.options2[0] = material.opacity;
333	344	display.options2[1] = material.diffuse;
334	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]);
335	349
336	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]);
337	354	display.options4[0] = material.cameralight/0.2f;
338	355	display.options4[1] = material.subsurface;
339	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]);
340	360
341	361	// if (display.CURRENTANTIALIAS > 0)
342	362	// display.options3[3] /= 4;
..	..	@@ -352,7 +372,7 @@
352	372	/**/
353	373	} else
354	374	{
355		- DrawMaterial(material, selected);
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
356	376	}
357	377	} else
358	378	{
..	..	@@ -376,8 +396,8 @@
376	396	cStatic.objectstack[materialdepth++] = obj;
377	397	//System.out.println("material " + material);
378	398	//Applet3D.tracein("selected ", selected);
379		- display.vector2buffer = obj.projectedVertices;
380		- display.DrawMaterial(material, selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
381	401	}
382	402	}
383	403
..	..	@@ -394,8 +414,8 @@
394	414	materialdepth -= 1;
395	415	if (materialdepth > 0)
396	416	{
397		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
398		- 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);
399	419	}
400	420	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
401	421	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -415,8 +435,8 @@
415	435	materialdepth -= 1;
416	436	if (materialdepth > 0)
417	437	{
418		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
419		- 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);
420	440	}
421	441	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
422	442	//else
..	..	@@ -457,10 +477,12 @@
457	477	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
458	478	{
459	479	//gl.glBegin(gl.GL_TRIANGLES);
460		- 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	+ ;
461	483	if (!hasnorm)
462	484	{
463		- // System.out.println("FUCK!!");
	485	+ // System.out.println("Mesh normal");
464	486	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
465	487	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
466	488	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1185,10 +1207,12 @@
1185	1207	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1186	1208	}
1187	1209	}
	1210	+
1188	1211	if (flipV)
1189	1212	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1190	1213	else
1191	1214	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1215	+
1192	1216	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1193	1217	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1194	1218
..	..	@@ -1208,10 +1232,12 @@
1208	1232	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1209	1233	}
1210	1234	}
	1235	+
1211	1236	if (flipV)
1212	1237	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1213	1238	else
1214	1239	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1240	+
1215	1241	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1216	1242	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1217	1243
..	..	@@ -1239,8 +1265,10 @@
1239	1265	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1240	1266	else
1241	1267	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
1242	1269	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1243	1270	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1271	+
1244	1272	count2 += 2;
1245	1273	count3 += 3;
1246	1274	}
..	..	@@ -1596,7 +1624,7 @@
1596	1624	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1597	1625	}
1598	1626
1599		- void DrawMaterial(cMaterial material, boolean selected)
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1600	1628	{
1601	1629	CameraPane display = this;
1602	1630	//new Exception().printStackTrace();
..	..	@@ -1612,18 +1640,18 @@
1612	1640	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1613	1641	if (!material.multiply)
1614	1642	{
1615		- display.color = color;
	1643	+ display.color = material.color;
1616	1644	display.saturation = material.modulation;
1617	1645	}
1618	1646	else
1619	1647	{
1620		- display.color = color2;
	1648	+ display.color = material.color2;
1621	1649	display.saturation = material.modulation2;
1622	1650	}
1623	1651
1624	1652	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1625	1653
1626		- float[] colorV = GrafreeD.colorV;
	1654	+ float[] colorV = Grafreed.colorV;
1627	1655
1628	1656	/**/
1629	1657	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1631,7 +1659,7 @@
1631	1659	colorV[0] = display.modelParams0[0] * material.diffuse;
1632	1660	colorV[1] = display.modelParams0[1] * material.diffuse;
1633	1661	colorV[2] = display.modelParams0[2] * material.diffuse;
1634		- colorV[3] = material.opacity;
	1662	+ colorV[3] = 1; // material.opacity;
1635	1663
1636	1664	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1637	1665	//System.out.println("Opacity = " + opacity);
..	..	@@ -1739,9 +1767,9 @@
1739	1767	display.modelParams7[2] = 0;
1740	1768	display.modelParams7[3] = 0;
1741	1769
1742		- display.modelParams6[0] = 100; // criss de bug de bump
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
1743	1771
1744		- Object3D.cVector2[] extparams = display.vector2buffer;
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1745	1773	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1746	1774	{
1747	1775	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1883,7 +1911,7 @@
1883	1911	void PushMatrix(double[][] matrix)
1884	1912	{
1885	1913	// GrafreeD.tracein(matrix);
1886		- PushMatrix(matrix,1);
	1914	+ PushMatrix(matrix, 1);
1887	1915	}
1888	1916
1889	1917	void PushMatrix()
..	..	@@ -2135,7 +2163,7 @@
2135	2163	System.err.println("LIVE = " + Globals.isLIVE());
2136	2164
2137	2165	if (!Globals.isLIVE()) // save sound
2138		- GrafreeD.savesound = true; // wav.save();
	2166	+ Grafreed.savesound = true; // wav.save();
2139	2167	// else
2140	2168	repaint(); // start loop // may 2013
2141	2169	}
..	..	@@ -2168,6 +2196,11 @@
2168	2196	public void ToggleBoxMode()
2169	2197	{
2170	2198	BOXMODE ^= true;
	2199	+ }
	2200	+
	2201	+ public void ToggleZoomBoxMode()
	2202	+ {
	2203	+ ZOOMBOXMODE ^= true;
2171	2204	}
2172	2205
2173	2206	public void ToggleSmoothFocus()
..	..	@@ -2247,7 +2280,7 @@
2247	2280
2248	2281	void ToggleDebug()
2249	2282	{
2250		- DEBUG ^= true;
	2283	+ Globals.DEBUG ^= true;
2251	2284	}
2252	2285
2253	2286	void ToggleLookAt()
..	..	@@ -2255,9 +2288,9 @@
2255	2288	LOOKAT ^= true;
2256	2289	}
2257	2290
2258		- void ToggleRandom()
	2291	+ void ToggleSwitch()
2259	2292	{
2260		- RANDOM ^= true;
	2293	+ SWITCH ^= true;
2261	2294	}
2262	2295
2263	2296	void ToggleHandles()
..	..	@@ -2364,7 +2397,129 @@
2364	2397	{
2365	2398	return currentGL;
2366	2399	}
2367		-
	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	+
2368	2523	/**/
2369	2524	class CacheTexture
2370	2525	{
..	..	@@ -4196,6 +4351,7 @@
4196	4351
4197	4352	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4198	4353	{
	4354	+ new Exception().printStackTrace();
4199	4355	System.exit(0);
4200	4356	com.sun.opengl.util.texture.Texture texture = null;
4201	4357
..	..	@@ -7908,6 +8064,64 @@
7908	8064	ReleaseTexture(pigment, false);
7909	8065	}
7910	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	+
7911	8125	void ReleaseTexture(String tex, boolean bump)
7912	8126	{
7913	8127	if (// DrawMode() != 0 \|\| /tex == null \|\|/
..	..	@@ -8011,7 +8225,7 @@
8011	8225	}
8012	8226	}
8013	8227
8014		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8228	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8015	8229	{
8016	8230	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8017	8231	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8056,7 +8270,94 @@
8056	8270	return; // true;
8057	8271	}
8058	8272
8059		- 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
8060	8361	{
8061	8362	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8062	8363
..	..	@@ -8064,12 +8365,18 @@
8064	8365	{
8065	8366	String texname = tex;
8066	8367
8067		- String[] split = tex.split("Textures");
8068		- if (split.length > 1)
8069		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8070		- else
8071		- if (!texname.startsWith("/"))
8072		- 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	+ }
8073	8380
8074	8381	if (CACHETEXTURE)
8075	8382	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -8138,7 +8445,7 @@
8138	8445	}
8139	8446
8140	8447	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8141		- if (!new File(cachename).exists())
	8448	+ if (!FileExists(cachename))
8142	8449	cachename = texname;
8143	8450	else
8144	8451	processbump = false; // don't process bump map again
..	..	@@ -8160,7 +8467,7 @@
8160	8467	}
8161	8468
8162	8469	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8163		- if (!new File(cachename).exists())
	8470	+ if (!FileExists(cachename))
8164	8471	cachename = texname;
8165	8472	else
8166	8473	processbump = false; // don't process bump map again
..	..	@@ -8169,7 +8476,9 @@
8169	8476	texturedata = GetFileTexture(cachename, processbump, resolution);
8170	8477
8171	8478
8172		- if (texturedata != null)
	8479	+ if (texturedata == null)
	8480	+ throw new Exception();
	8481	+
8173	8482	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8174	8483	//texture = GetTexture(tex, bump);
8175	8484	}
..	..	@@ -8291,7 +8600,7 @@
8291	8600	return texture;
8292	8601	}
8293	8602
8294		- 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
8295	8604	{
8296	8605	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8297	8606
..	..	@@ -8309,14 +8618,14 @@
8309	8618	return texture!=null?texture.texture:null;
8310	8619	}
8311	8620
8312		- 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
8313	8622	{
8314	8623	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8315	8624
8316	8625	return texture!=null?texture.texturedata:null;
8317	8626	}
8318	8627
8319		- boolean BindTexture(String tex, boolean bump, int resolution)
	8628	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
8320	8629	{
8321	8630	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8322	8631	{
..	..	@@ -9193,11 +9502,35 @@
9193	9502	jy8[3] = 0.5f;
9194	9503	}
9195	9504
9196		- 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
9197	9506	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9198	9507	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9199	9508	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9200	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	+
9201	9534	static int imagecount = 0; // movie generation
9202	9535
9203	9536	static int jitter = 0;
..	..	@@ -9293,8 +9626,8 @@
9293	9626	assert (parentcam != renderCamera);
9294	9627
9295	9628	if (renderCamera != lightCamera)
9296		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9297		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9629	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9630	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9298	9631
9299	9632	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9300	9633
..	..	@@ -9309,8 +9642,8 @@
9309	9642	LA.matCopy(renderCamera.fromScreen, matrix);
9310	9643
9311	9644	if (renderCamera != lightCamera)
9312		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9313		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9645	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9646	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9314	9647
9315	9648	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9316	9649
..	..	@@ -9382,7 +9715,7 @@
9382	9715	//gl.glFlush();
9383	9716	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9384	9717
9385		- if (ANIMATION && ABORTED)
	9718	+ if (Globals.ANIMATION && ABORTED)
9386	9719	{
9387	9720	System.err.println(" ABORTED FRAME");
9388	9721	break;
..	..	@@ -9412,7 +9745,7 @@
9412	9745	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9413	9746
9414	9747	// save image
9415		- if (ANIMATION && !ABORTED)
	9748	+ if (Globals.ANIMATION && !ABORTED)
9416	9749	{
9417	9750	VPwidth = viewport[2];
9418	9751	VPheight = viewport[3];
..	..	@@ -9523,11 +9856,11 @@
9523	9856
9524	9857	// imagecount++;
9525	9858
9526		- 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;
9527	9860
9528	9861	if (!BOXMODE)
9529	9862	{
9530		- 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) + ")");
9531	9864	}
9532	9865
9533	9866	if (!BOXMODE)
..	..	@@ -9565,7 +9898,7 @@
9565	9898	ABORTED = false;
9566	9899	}
9567	9900	else
9568		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9901	+ Grafreed.wav.cursor += 735 * ACSIZE;
9569	9902
9570	9903	if (false)
9571	9904	{
..	..	@@ -10228,11 +10561,11 @@
10228	10561
10229	10562	public void display(GLAutoDrawable drawable)
10230	10563	{
10231		- if (GrafreeD.savesound && GrafreeD.hassound)
	10564	+ if (Grafreed.savesound && Grafreed.hassound)
10232	10565	{
10233		- GrafreeD.wav.save();
10234		- GrafreeD.savesound = false;
10235		- GrafreeD.hassound = false;
	10566	+ Grafreed.wav.save();
	10567	+ Grafreed.savesound = false;
	10568	+ Grafreed.hassound = false;
10236	10569	}
10237	10570	// if (DEBUG_SELECTION)
10238	10571	// {
..	..	@@ -10308,6 +10641,7 @@
10308	10641	ANTIALIAS = 0;
10309	10642	//System.out.println("RESTART");
10310	10643	AAtimer.restart();
	10644	+ Globals.TIMERRUNNING = true;
10311	10645	}
10312	10646	}
10313	10647	}
..	..	@@ -10362,7 +10696,7 @@
10362	10696	Object3D theobject = object;
10363	10697	Object3D theparent = object.parent;
10364	10698	object.parent = null;
10365		- object = (Object3D)GrafreeD.clone(object);
	10699	+ object = (Object3D)Grafreed.clone(object);
10366	10700	object.Stripify();
10367	10701	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10368	10702	theobject.PreprocessOcclusion(this);
..	..	@@ -10375,13 +10709,14 @@
10375	10709	ambientOcclusion = false;
10376	10710	}
10377	10711
10378		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10712	+ if (//Globals.lighttouched &&
	10713	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10379	10714	{
10380	10715	//if (RENDERSHADOW) // ?
10381	10716	if (!IsFrozen())
10382	10717	{
10383	10718	// dec 2012
10384		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10719	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10385	10720	{
10386	10721	Globals.framecount++;
10387	10722	shadowbuffer.display();
..	..	@@ -10508,8 +10843,8 @@
10508	10843
10509	10844	// if (parentcam != renderCamera) // not a light
10510	10845	if (cam != lightCamera)
10511		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10512		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10846	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10847	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10513	10848
10514	10849	for (int j = 0; j < 4; j++)
10515	10850	{
..	..	@@ -10523,8 +10858,8 @@
10523	10858
10524	10859	// if (parentcam != renderCamera) // not a light
10525	10860	if (cam != lightCamera)
10526		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10527		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10861	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10862	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10528	10863
10529	10864	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10530	10865
..	..	@@ -10783,7 +11118,16 @@
10783	11118	// Bump noise
10784	11119	gl.glActiveTexture(GL.GL_TEXTURE6);
10785	11120	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10786		- 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	+
10787	11131
10788	11132	gl.glActiveTexture(GL.GL_TEXTURE0);
10789	11133	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10908,8 +11252,8 @@
10908	11252	System.err.println("parentcam != renderCamera");
10909	11253
10910	11254	// if (cam != lightCamera)
10911		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10912		- 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
10913	11257	}
10914	11258
10915	11259	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10930,8 +11274,8 @@
10930	11274	if (true) // TODO
10931	11275	{
10932	11276	if (cam != lightCamera)
10933		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10934		- 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
10935	11279	}
10936	11280
10937	11281	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11247,8 +11591,14 @@
11247	11591	{
11248	11592	renderpass++;
11249	11593	// System.out.println("Draw object... ");
	11594	+ STEP = 1;
11250	11595	if (FAST) // in case there is no script
11251		- STEP = 16;
	11596	+ STEP = 8;
	11597	+
	11598	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11599	+ {
	11600	+ STEP *= 4;
	11601	+ }
11252	11602
11253	11603	//object.FullInvariants();
11254	11604
..	..	@@ -11262,16 +11612,37 @@
11262	11612	e.printStackTrace();
11263	11613	}
11264	11614
11265		- if (GrafreeD.RENDERME > 0)
11266		- GrafreeD.RENDERME--; // mechante magouille
	11615	+ if (Grafreed.RENDERME > 0)
	11616	+ Grafreed.RENDERME--; // mechante magouille
11267	11617
11268	11618	Globals.ONESTEP = false;
11269	11619	}
11270	11620
11271	11621	static boolean zoomonce = false;
11272	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	+
11273	11641	void DrawObject(GL gl, boolean draw)
11274	11642	{
	11643	+ // To clear camera values
	11644	+ ResetOptions();
	11645	+
11275	11646	//System.out.println("DRAW OBJECT " + mouseDown);
11276	11647	// DrawMode() = SELECTION;
11277	11648	//GL gl = getGL();
..	..	@@ -11333,7 +11704,14 @@
11333	11704
11334	11705	usedtextures.clear();
11335	11706
11336		- 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	+ }
11337	11715	}
11338	11716	//System.out.println("--> " + stackdepth);
11339	11717	// GrafreeD.traceon();
..	..	@@ -11343,8 +11721,9 @@
11343	11721
11344	11722	if (DrawMode() == DEFAULT)
11345	11723	{
11346		- if (DEBUG)
	11724	+ if (Globals.DEBUG)
11347	11725	{
	11726	+ CreateSelectedPoint();
11348	11727	float radius = 0.05f;
11349	11728	if (selectedpoint.radius != radius)
11350	11729	{
..	..	@@ -11424,7 +11803,14 @@
11424	11803	if (checker != null && DrawMode() == DEFAULT)
11425	11804	{
11426	11805	//BindTexture(IMMORTAL_TEXTURE);
11427		- 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	+ }
11428	11814	// NEAREST
11429	11815	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11430	11816	DrawChecker(gl);
..	..	@@ -11506,7 +11892,7 @@
11506	11892	return;
11507	11893	}
11508	11894
11509		- String string = obj.GetToolTip();
	11895	+ String string = obj.toString(); //.GetToolTip();
11510	11896
11511	11897	GL gl = GetGL();
11512	11898
..	..	@@ -11823,8 +12209,8 @@
11823	12209	//obj.TransformToWorld(light, light);
11824	12210	for (int i = tp.size(); --i >= 0;)
11825	12211	{
11826		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11827		- 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);
11828	12214	}
11829	12215
11830	12216
..	..	@@ -11841,8 +12227,8 @@
11841	12227	parentcam = cameras[0];
11842	12228	}
11843	12229
11844		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11845		- 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
11846	12232
11847	12233	LA.xformPos(light, renderCamera.toScreen, light);
11848	12234
..	..	@@ -12456,8 +12842,8 @@
12456	12842
12457	12843	// display shadow only (bump == 0)
12458	12844	"SUB temp.x, half.x, shadow.x;" +
12459		- "MOV temp.y, -params6.x;" +
12460		- "SLT temp.z, temp.y, zero.x;" +
	12845	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12846	+ "SLT temp.z, temp.y, -one2048th.x;" +
12461	12847	"SUB temp.y, one.x, temp.z;" +
12462	12848	"MUL temp.x, temp.x, temp.y;" +
12463	12849	"KIL temp.x;" +
..	..	@@ -12586,8 +12972,10 @@
12586	12972	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12587	12973
12588	12974	"SUB temp.x, one.x, ndotl.x;" +
12589		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12590		- "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
12591	12979	"MUL temp.x, temp.x, temp.y;" +
12592	12980
12593	12981	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12786,7 +13174,7 @@
12786	13174	//once = true;
12787	13175	}
12788	13176
12789		- System.out.print("Program #" + mode + "; length = " + program.length());
	13177	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12790	13178	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12791	13179	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12792	13180
..	..	@@ -12919,12 +13307,16 @@
12919	13307
12920	13308	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12921	13309	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13310	+
	13311	+ // Compare fragment depth in light space with shadowmap.
12922	13312	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12923	13313	"SGE temp.y, temp.x, zero.x;" +
12924		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13314	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13315	+
	13316	+ // Reverse comparison
12925	13317	"SUB temp.x, one.x, temp.x;" +
12926	13318	"MUL " + shadow + ".x, temp.x, temp.y;" +
12927		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13319	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12928	13320	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12929	13321
12930	13322	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12938,6 +13330,10 @@
12938	13330	// No shadow for backface
12939	13331	"DP3 temp.x, normal, lightd;" +
12940	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;" +
12941	13337	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12942	13338	"";
12943	13339	}
..	..	@@ -13084,7 +13480,8 @@
13084	13480	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13085	13481	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13086	13482	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13087		- Object3D.cVector2[] vector2buffer;
	13483	+
	13484	+ //Object3D.cVector2[] vector2buffer;
13088	13485
13089	13486	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13090	13487	// OUT : diff, spec
..	..	@@ -13100,9 +13497,10 @@
13100	13497	"DP3 " + dest + ".z," + "normals," + "eye;" +
13101	13498	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13102	13499	//"MOV " + dest + ".w," + "normal.z;" +
13103		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13104		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13105		- //"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
13106	13504	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13107	13505	"RCP " + dest + ".w," + dest + ".w;" +
13108	13506	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13496,7 +13894,7 @@
13496	13894	public void mousePressed(MouseEvent e)
13497	13895	{
13498	13896	//System.out.println("mousePressed: " + e);
13499		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13897	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13500	13898	}
13501	13899
13502	13900	static long prevtime = 0;
..	..	@@ -13523,6 +13921,7 @@
13523	13921
13524	13922	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13525	13923
	13924	+ if (BUTTONLESSWHEEL)
13526	13925	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13527	13926	{
13528	13927	return;
..	..	@@ -13531,7 +13930,7 @@
13531	13930	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13532	13931
13533	13932	// TIMER
13534		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13933	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13535	13934	{
13536	13935	keepboxmode = BOXMODE;
13537	13936	keepsupport = SUPPORT;
..	..	@@ -13571,8 +13970,8 @@
13571	13970	// mode \|= META;
13572	13971	//}
13573	13972
13574		- SetMouseMode(WHEEL \| e.getModifiersEx());
13575		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13973	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13974	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13576	13975	anchorX = ax;
13577	13976	anchorY = ay;
13578	13977	prevX = px;
..	..	@@ -13606,6 +14005,7 @@
13606	14005	else
13607	14006	if (evt.getSource() == AAtimer)
13608	14007	{
	14008	+ Globals.TIMERRUNNING = false;
13609	14009	if (mouseDown)
13610	14010	{
13611	14011	//new Exception().printStackTrace();
..	..	@@ -13631,6 +14031,10 @@
13631	14031	// LIVE = waslive;
13632	14032	// wasliveok = true;
13633	14033	// waslive = false;
	14034	+
	14035	+ // May 2019 Forget it:
	14036	+ if (true)
	14037	+ return;
13634	14038
13635	14039	// source == timer
13636	14040	if (mouseDown)
..	..	@@ -13670,12 +14074,13 @@
13670	14074
13671	14075	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13672	14076
13673		- void clickStart(int x, int y, int modifiers)
	14077	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13674	14078	{
13675	14079	if (!wasliveok)
13676	14080	return;
13677	14081
13678	14082	AAtimer.restart(); //
	14083	+ Globals.TIMERRUNNING = true;
13679	14084
13680	14085	// waslive = LIVE;
13681	14086	// LIVE = false;
..	..	@@ -13687,7 +14092,7 @@
13687	14092	// touched = true; // main DL
13688	14093	if (isRenderer)
13689	14094	{
13690		- SetMouseMode(modifiers);
	14095	+ SetMouseMode(modifiers, modifiersex);
13691	14096	}
13692	14097
13693	14098	selectX = anchorX = x;
..	..	@@ -13700,7 +14105,7 @@
13700	14105	clicked = true;
13701	14106	hold = false;
13702	14107
13703		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14108	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13704	14109	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13705	14110	{
13706	14111	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13731,7 +14136,7 @@
13731	14136	info.camera = renderCamera;
13732	14137	info.x = x;
13733	14138	info.y = y;
13734		- info.modifiers = modifiers;
	14139	+ info.modifiers = modifiersex;
13735	14140	editObj = object.doEditClick(info, 0);
13736	14141	if (!editObj)
13737	14142	{
..	..	@@ -13748,11 +14153,14 @@
13748	14153
13749	14154	public void mouseDragged(MouseEvent e)
13750	14155	{
	14156	+ Globals.MOUSEDRAGGED = true;
	14157	+
	14158	+ //System.out.println("mouseDragged: " + e);
13751	14159	if (isRenderer)
13752	14160	movingcamera = true;
	14161	+
13753	14162	//if (drawing)
13754	14163	//return;
13755		- //System.out.println("mouseDragged: " + e);
13756	14164	if ((e.getModifiersEx() & CTRL) != 0
13757	14165	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13758	14166	{
..	..	@@ -13760,7 +14168,7 @@
13760	14168	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13761	14169	}
13762	14170	else
13763		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14171	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13764	14172
13765	14173	//try { Thread.sleep(1); } catch (Exception ex) {}
13766	14174	}
..	..	@@ -13933,6 +14341,7 @@
13933	14341
13934	14342	public void run()
13935	14343	{
	14344	+ new Exception().printStackTrace();
13936	14345	System.exit(0);
13937	14346	for (;;)
13938	14347	{
..	..	@@ -13996,7 +14405,7 @@
13996	14405	{
13997	14406	Globals.lighttouched = true;
13998	14407	}
13999		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14408	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14000	14409	}
14001	14410	//else
14002	14411	}
..	..	@@ -14096,7 +14505,7 @@
14096	14505	int X, Y;
14097	14506	boolean SX, SY;
14098	14507
14099		- void drag(int x, int y, int modifiers)
	14508	+ void drag(int x, int y, int modifiers, int modifiersex)
14100	14509	{
14101	14510	if (IsFrozen())
14102	14511	{
..	..	@@ -14105,17 +14514,17 @@
14105	14514
14106	14515	drag = true; // NEW
14107	14516
14108		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14517	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14109	14518
14110	14519	X = x;
14111	14520	Y = y;
14112	14521	// floating state for animation
14113		- MODIFIERS = modifiers;
14114		- modifiers &= ~1024;
	14522	+ MODIFIERS = modifiersex;
	14523	+ modifiersex &= ~1024;
14115	14524	if (false) // modifiers != 0)
14116	14525	{
14117	14526	//new Exception().printStackTrace();
14118		- System.out.println("mouseDragged: " + modifiers);
	14527	+ System.out.println("mouseDragged: " + modifiersex);
14119	14528	System.out.println("SHIFT = " + SHIFT);
14120	14529	System.out.println("CONTROL = " + COMMAND);
14121	14530	System.out.println("META = " + META);
..	..	@@ -14135,7 +14544,8 @@
14135	14544	info.camera = renderCamera;
14136	14545	info.x = x;
14137	14546	info.y = y;
14138		- object.editWindow.copy.doEditDrag(info);
	14547	+ object.GetWindow().copy
	14548	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14139	14549	} else
14140	14550	{
14141	14551	if (x < startX)
..	..	@@ -14287,7 +14697,6 @@
14287	14697	public void mouseMoved(MouseEvent e)
14288	14698	{
14289	14699	//System.out.println("mouseMoved: " + e);
14290		-
14291	14700	if (isRenderer)
14292	14701	return;
14293	14702
..	..	@@ -14300,7 +14709,9 @@
14300	14709	ci.camera = renderCamera;
14301	14710	if (!isRenderer)
14302	14711	{
14303		- if (object.editWindow.copy.doEditClick(ci, 0))
	14712	+ //ObjEditor editWindow = object.editWindow;
	14713	+ //Object3D copy = editWindow.copy;
	14714	+ if (object.doEditClick(ci, 0))
14304	14715	{
14305	14716	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14306	14717	} else
..	..	@@ -14312,7 +14723,10 @@
14312	14723
14313	14724	public void mouseReleased(MouseEvent e)
14314	14725	{
	14726	+ Globals.MOUSEDRAGGED = false;
	14727	+
14315	14728	movingcamera = false;
	14729	+ X = Y = 0;
14316	14730	//System.out.println("mouseReleased: " + e);
14317	14731	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14318	14732	}
..	..	@@ -14335,9 +14749,9 @@
14335	14749	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14336	14750	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14337	14751
14338		- if (control \|\| command \|\| IsFrozen())
	14752	+// No delay if (control \|\| command \|\| IsFrozen())
14339	14753	timeout = true;
14340		- else
	14754	+// ?? May 2019 else
14341	14755	// timer.setDelay((modifiers & 128) != 0?0:350);
14342	14756	mouseDown = false;
14343	14757	if (!control && !command) // june 2013
..	..	@@ -14447,7 +14861,7 @@
14447	14861	System.out.println("keyReleased: " + e);
14448	14862	}
14449	14863
14450		- void SetMouseMode(int modifiers)
	14864	+ void SetMouseMode(int modifiers, int modifiersex)
14451	14865	{
14452	14866	//System.out.println("SetMouseMode = " + modifiers);
14453	14867	//modifiers &= ~1024;
..	..	@@ -14459,25 +14873,25 @@
14459	14873	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14460	14874	// return;
14461	14875	//System.out.println("SetMode = " + modifiers);
14462		- if ((modifiers & WHEEL) == WHEEL)
	14876	+ if ((modifiersex & WHEEL) == WHEEL)
14463	14877	{
14464	14878	mouseMode \|= ZOOM;
14465	14879	}
14466	14880
14467	14881	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14468		- if (capsLocked \|\| (modifiers & META) == META)
	14882	+ if (capsLocked) // \|\| (modifiers & META) == META)
14469	14883	{
14470	14884	mouseMode \|= VR; // BACKFORTH;
14471	14885	}
14472		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14886	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14473	14887	{
14474	14888	mouseMode \|= SELECT;
14475	14889	}
14476		- if ((modifiers & COMMAND) == COMMAND)
	14890	+ if ((modifiersex & COMMAND) == COMMAND)
14477	14891	{
14478	14892	mouseMode \|= SELECT;
14479	14893	}
14480		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14894	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14481	14895	{
14482	14896	mouseMode &= ~VR;
14483	14897	mouseMode \|= TRANSLATE;
..	..	@@ -14506,7 +14920,7 @@
14506	14920
14507	14921	if (isRenderer) //
14508	14922	{
14509		- SetMouseMode(modifiers);
	14923	+ SetMouseMode(0, modifiers);
14510	14924	}
14511	14925
14512	14926	Globals.theRenderer.keyPressed(key);
..	..	@@ -14678,8 +15092,14 @@
14678	15092	RevertCamera();
14679	15093	repaint();
14680	15094	break;
14681		- case 'L':
14682	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':
14683	15103	if (lightMode)
14684	15104	{
14685	15105	lightMode = false;
..	..	@@ -14822,27 +15242,25 @@
14822	15242	case '_':
14823	15243	kompactbit = 5;
14824	15244	break;
14825		- case '+':
14826		- kompactbit = 6;
14827		- break;
	15245	+// case '+':
	15246	+// kompactbit = 6;
	15247	+// break;
14828	15248	case ' ':
14829		- lightMode ^= true;
14830		- Globals.lighttouched = true;
14831		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14832		- targetLookAt.set(manipCamera.lookAt);
	15249	+ ObjEditor.theFrame.ToggleFullScreen();
14833	15250	repaint();
14834	15251	break;
14835	15252	//case '`' :
14836	15253	case ESC:
14837	15254	RENDERPROGRAM += 1;
14838	15255	RENDERPROGRAM %= 3;
	15256	+
14839	15257	repaint();
14840	15258	break;
14841	15259	case 'Z':
14842	15260	//RESIZETEXTURE ^= true;
14843	15261	//break;
14844	15262	case 'z':
14845		- RENDERSHADOW ^= true;
	15263	+ Globals.RENDERSHADOW ^= true;
14846	15264	Globals.lighttouched = true;
14847	15265	repaint();
14848	15266	break;
..	..	@@ -14875,8 +15293,15 @@
14875	15293	case DELETE:
14876	15294	ClearSelection();
14877	15295	break;
14878		- /*
14879	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	+ /*
14880	15305	//fontsize += 1;
14881	15306	bbzoom *= 2;
14882	15307	repaint();
..	..	@@ -14966,7 +15391,7 @@
14966	15391	//mode = ROTATE;
14967	15392	if ((MODIFIERS & COMMAND) == 0) // VR??
14968	15393	{
14969		- SetMouseMode(modifiers);
	15394	+ SetMouseMode(0, modifiers);
14970	15395	}
14971	15396	}
14972	15397
..	..	@@ -15100,8 +15525,9 @@
15100	15525
15101	15526	protected void processMouseMotionEvent(MouseEvent e)
15102	15527	{
15103		- //System.out.println("processMouseMotionEvent: " + mouseMode);
15104		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15528	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15529	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15530	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15105	15531	{
15106	15532	mouseMoved(e);
15107	15533	} else
..	..	@@ -15126,11 +15552,12 @@
15126	15552	}
15127	15553	*/
15128	15554
15129		- object.editWindow.EditSelection();
	15555	+ object.editWindow.EditSelection(false);
15130	15556	}
15131	15557
15132	15558	void SelectParent()
15133	15559	{
	15560	+ new Exception().printStackTrace();
15134	15561	System.exit(0);
15135	15562	Composite group = (Composite) object;
15136	15563	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15154,6 +15581,7 @@
15154	15581
15155	15582	void SelectChildren()
15156	15583	{
	15584	+ new Exception().printStackTrace();
15157	15585	System.exit(0);
15158	15586	/*
15159	15587	Composite group = (Composite) object;
..	..	@@ -15318,7 +15746,9 @@
15318	15746	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15319	15747	//Image img = CreateImage(width, height);
15320	15748	//System.out.println("width = " + width + "; height = " + height + "\n");
	15749	+
15321	15750	Graphics gr = g; // img.getGraphics();
	15751	+
15322	15752	if (!hasMarquee)
15323	15753	{
15324	15754	if (Xmin < Xmax) // !locked)
..	..	@@ -15416,14 +15846,33 @@
15416	15846	if (!isRenderer)
15417	15847	{
15418	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	+ }
15419	15866	}
15420	15867	}
	15868	+
15421	15869	if (isRenderer)
15422	15870	{
15423	15871	//gr.setColor(Color.black);
15424	15872	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15425	15873	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15426	15874	}
	15875	+
15427	15876	if (hasMarquee)
15428	15877	{
15429	15878	gr.setXORMode(Color.white);
..	..	@@ -15536,6 +15985,7 @@
15536	15985	public boolean mouseDown(Event evt, int x, int y)
15537	15986	{
15538	15987	System.out.println("mouseDown: " + evt);
	15988	+ System.exit(0);
15539	15989	/*
15540	15990	locked = true;
15541	15991	drag = false;
..	..	@@ -15579,7 +16029,7 @@
15579	16029	{
15580	16030	keyPressed(0, modifiers);
15581	16031	}
15582		- clickStart(x, y, modifiers);
	16032	+ // clickStart(x, y, modifiers);
15583	16033	return true;
15584	16034	}
15585	16035
..	..	@@ -15697,7 +16147,7 @@
15697	16147	{
15698	16148	keyReleased(0, 0);
15699	16149	}
15700		- drag(x, y, modifiers);
	16150	+ drag(x, y, 0, modifiers);
15701	16151	return true;
15702	16152	}
15703	16153
..	..	@@ -15829,7 +16279,7 @@
15829	16279	Object3D object;
15830	16280	static Object3D trackedobject;
15831	16281	Camera renderCamera; // Light or Eye (or Occlusion)
15832		- /static/ Camera manipCamera; // Light or Eye
	16282	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15833	16283	/static/ Camera eyeCamera;
15834	16284	/static/ Camera lightCamera;
15835	16285	int cameracount;
..	..	@@ -16114,16 +16564,16 @@
16114	16564	cStatic.objectstack[materialdepth++] = checker;
16115	16565	//System.out.println("material " + material);
16116	16566	//Applet3D.tracein(this, selected);
16117		- vector2buffer = checker.projectedVertices;
	16567	+ //vector2buffer = checker.projectedVertices;
16118	16568
16119	16569	//checker.GetMaterial().Draw(this, false); // true);
16120		- DrawMaterial(checker.GetMaterial(), false); // true);
	16570	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16121	16571
16122	16572	materialdepth -= 1;
16123	16573	if (materialdepth > 0)
16124	16574	{
16125		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16126		- 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);
16127	16577	}
16128	16578	//checker.GetMaterial().opacity = 1f;
16129	16579	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16267,6 +16717,7 @@
16267	16717	{
16268	16718	if (!selection)
16269	16719	{
	16720	+ new Exception().printStackTrace();
16270	16721	System.exit(0);
16271	16722	return;
16272	16723	}
..	..	@@ -16346,6 +16797,8 @@
16346	16797	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16347	16798	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
16348	16799
	16800	+ CreateSelectedPoint();
	16801	+
16349	16802	// Will fit the mesh !!!
16350	16803	selectedpoint.toParent[0][0] = 0.0001;
16351	16804	selectedpoint.toParent[1][1] = 0.0001;
..	..	@@ -16394,16 +16847,16 @@
16394	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]));
16395	16848	}
16396	16849
16397		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16850	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16398	16851	}
16399	16852	}
16400	16853
16401	16854	if (!movingcamera && !PAINTMODE)
16402	16855	object.editWindow.ScreenFitPoint(); // fev 2014
16403	16856
16404		- 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)
16405	16858	{
16406		- 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);
16407	16860
16408	16861	Object3D group = new Object3D("inst" + paintcount++);
16409	16862
..	..	@@ -16460,6 +16913,11 @@
16460	16913	//System.out.println("objects[color] = " + objects[color]);
16461	16914	//objects[color].Select();
16462	16915	indexcount = 0;
	16916	+ ObjEditor window = object.GetWindow();
	16917	+ if (window != null && deselect)
	16918	+ {
	16919	+ window.Select(null, deselect, true);
	16920	+ }
16463	16921	object.Select(color, deselect);
16464	16922	}
16465	16923
..	..	@@ -16559,7 +17017,7 @@
16559	17017	gl.glDisable(gl.GL_CULL_FACE);
16560	17018	}
16561	17019
16562		- if (!RENDERSHADOW)
	17020	+ if (!Globals.RENDERSHADOW)
16563	17021	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16564	17022
16565	17023	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16569,7 +17027,7 @@
16569	17027	//gl.glColorMask(false, false, false, false);
16570	17028
16571	17029	//render_scene_from_light_view(gl, drawable, 0, 0);
16572		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17030	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16573	17031	{
16574	17032	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16575	17033
..	..	@@ -16985,23 +17443,15 @@
16985	17443	int AAbuffersize = 0;
16986	17444
16987	17445	//double[] selectedpoint = new double[3];
16988		- static Superellipsoid selectedpoint = new Superellipsoid();
	17446	+ static Superellipsoid selectedpoint;
16989	17447	static Sphere previousselectedpoint = null;
16990		- static Sphere debugpointG = new Sphere();
16991		- static Sphere debugpointP = new Sphere();
16992		- static Sphere debugpointC = new Sphere();
16993		- static Sphere debugpointR = new Sphere();
	17448	+ static Sphere debugpointG;
	17449	+ static Sphere debugpointP;
	17450	+ static Sphere debugpointC;
	17451	+ static Sphere debugpointR;
16994	17452
16995	17453	static Sphere debugpoints[] = new Sphere[8];
16996	17454
16997		- static
16998		- {
16999		- for (int i=0; i<8; i++)
17000		- {
17001		- debugpoints[i] = new Sphere();
17002		- }
17003		- }
17004		-
17005	17455	static void InitPoints(float radius)
17006	17456	{
17007	17457	for (int i=0; i<8; i++)