~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -37,7 +37,6 @@
37	37	static boolean[] selectedstack = new boolean[65536];
38	38	static int materialdepth = 0;
39	39
40		- static boolean DEBUG = false;
41	40	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	41
43	42	// camera change fix
..	..	@@ -61,7 +60,7 @@
61	60	//boolean REDUCETEXTURE = true;
62	61	boolean CACHETEXTURE = true;
63	62	boolean CLEANCACHE = false; // true;
64		- boolean MIPMAP = false; // true;
	63	+ boolean MIPMAP = true; // false; // true;
65	64	boolean COMPRESSTEXTURE = false;
66	65	boolean KOMPACTTEXTURE = false; // true;
67	66	boolean RESIZETEXTURE = false;
..	..	@@ -149,6 +148,8 @@
149	148	defaultcaps.setAccumBlueBits(16);
150	149	defaultcaps.setAccumAlphaBits(16);
151	150	}
	151	+
	152	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
152	153
153	154	void SetAsGLRenderer(boolean b)
154	155	{
..	..	@@ -325,7 +326,7 @@
325	326	cStatic.objectstack[materialdepth++] = obj;
326	327	//System.out.println("material " + material);
327	328	//Applet3D.tracein(this, selected);
328		- display.vector2buffer = obj.projectedVertices;
	329	+ //display.vector2buffer = obj.projectedVertices;
329	330	if (obj instanceof Camera)
330	331	{
331	332	display.options1[0] = material.shift;
..	..	@@ -334,14 +335,28 @@
334	335	display.options1[2] = material.shadowbias;
335	336	display.options1[3] = material.aniso;
336	337	display.options1[4] = material.anisoV;
	338	+// System.out.println("display.options1[0] " + display.options1[0]);
	339	+// System.out.println("display.options1[1] " + display.options1[1]);
	340	+// System.out.println("display.options1[2] " + display.options1[2]);
	341	+// System.out.println("display.options1[3] " + display.options1[3]);
	342	+// System.out.println("display.options1[4] " + display.options1[4]);
337	343	display.options2[0] = material.opacity;
338	344	display.options2[1] = material.diffuse;
339	345	display.options2[2] = material.factor;
	346	+// System.out.println("display.options2[0] " + display.options2[0]);
	347	+// System.out.println("display.options2[1] " + display.options2[1]);
	348	+// System.out.println("display.options2[2] " + display.options2[2]);
340	349
341	350	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	351	+// System.out.println("display.options3[0] " + display.options3[0]);
	352	+// System.out.println("display.options3[1] " + display.options3[1]);
	353	+// System.out.println("display.options3[2] " + display.options3[2]);
342	354	display.options4[0] = material.cameralight/0.2f;
343	355	display.options4[1] = material.subsurface;
344	356	display.options4[2] = material.sheen;
	357	+// System.out.println("display.options4[0] " + display.options4[0]);
	358	+// System.out.println("display.options4[1] " + display.options4[1]);
	359	+// System.out.println("display.options4[2] " + display.options4[2]);
345	360
346	361	// if (display.CURRENTANTIALIAS > 0)
347	362	// display.options3[3] /= 4;
..	..	@@ -357,7 +372,7 @@
357	372	/**/
358	373	} else
359	374	{
360		- DrawMaterial(material, selected);
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
361	376	}
362	377	} else
363	378	{
..	..	@@ -381,8 +396,8 @@
381	396	cStatic.objectstack[materialdepth++] = obj;
382	397	//System.out.println("material " + material);
383	398	//Applet3D.tracein("selected ", selected);
384		- display.vector2buffer = obj.projectedVertices;
385		- display.DrawMaterial(material, selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
386	401	}
387	402	}
388	403
..	..	@@ -399,8 +414,8 @@
399	414	materialdepth -= 1;
400	415	if (materialdepth > 0)
401	416	{
402		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
403		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	417	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	418	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
404	419	}
405	420	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
406	421	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -420,8 +435,8 @@
420	435	materialdepth -= 1;
421	436	if (materialdepth > 0)
422	437	{
423		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
424		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	438	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	439	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
425	440	}
426	441	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
427	442	//else
..	..	@@ -462,10 +477,12 @@
462	477	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463	478	{
464	479	//gl.glBegin(gl.GL_TRIANGLES);
465		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	480	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	481	+ // TEST LIVE NORMALS && !obj.dontselect
	482	+ ;
466	483	if (!hasnorm)
467	484	{
468		- // System.out.println("FUCK!!");
	485	+ // System.out.println("Mesh normal");
469	486	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
470	487	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
471	488	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1190,10 +1207,12 @@
1190	1207	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1191	1208	}
1192	1209	}
	1210	+
1193	1211	if (flipV)
1194	1212	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1195	1213	else
1196	1214	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1215	+
1197	1216	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1198	1217	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1199	1218
..	..	@@ -1213,10 +1232,12 @@
1213	1232	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1214	1233	}
1215	1234	}
	1235	+
1216	1236	if (flipV)
1217	1237	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1218	1238	else
1219	1239	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1240	+
1220	1241	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1221	1242	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1222	1243
..	..	@@ -1244,8 +1265,10 @@
1244	1265	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1245	1266	else
1246	1267	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
1247	1269	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1248	1270	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1271	+
1249	1272	count2 += 2;
1250	1273	count3 += 3;
1251	1274	}
..	..	@@ -1601,7 +1624,7 @@
1601	1624	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1602	1625	}
1603	1626
1604		- void DrawMaterial(cMaterial material, boolean selected)
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1605	1628	{
1606	1629	CameraPane display = this;
1607	1630	//new Exception().printStackTrace();
..	..	@@ -1628,7 +1651,7 @@
1628	1651
1629	1652	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1630	1653
1631		- float[] colorV = GrafreeD.colorV;
	1654	+ float[] colorV = Grafreed.colorV;
1632	1655
1633	1656	/**/
1634	1657	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1636,7 +1659,7 @@
1636	1659	colorV[0] = display.modelParams0[0] * material.diffuse;
1637	1660	colorV[1] = display.modelParams0[1] * material.diffuse;
1638	1661	colorV[2] = display.modelParams0[2] * material.diffuse;
1639		- colorV[3] = material.opacity;
	1662	+ colorV[3] = 1; // material.opacity;
1640	1663
1641	1664	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1642	1665	//System.out.println("Opacity = " + opacity);
..	..	@@ -1744,9 +1767,9 @@
1744	1767	display.modelParams7[2] = 0;
1745	1768	display.modelParams7[3] = 0;
1746	1769
1747		- display.modelParams6[0] = 100; // criss de bug de bump
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
1748	1771
1749		- Object3D.cVector2[] extparams = display.vector2buffer;
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1750	1773	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1751	1774	{
1752	1775	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1888,7 +1911,7 @@
1888	1911	void PushMatrix(double[][] matrix)
1889	1912	{
1890	1913	// GrafreeD.tracein(matrix);
1891		- PushMatrix(matrix,1);
	1914	+ PushMatrix(matrix, 1);
1892	1915	}
1893	1916
1894	1917	void PushMatrix()
..	..	@@ -2042,7 +2065,7 @@
2042	2065	//System.err.println("Oeil on");
2043	2066	OEIL = true;
2044	2067	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2045		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2068	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2046	2069	//pingthread.StepToTarget(true);
2047	2070	}
2048	2071
..	..	@@ -2140,7 +2163,7 @@
2140	2163	System.err.println("LIVE = " + Globals.isLIVE());
2141	2164
2142	2165	if (!Globals.isLIVE()) // save sound
2143		- GrafreeD.savesound = true; // wav.save();
	2166	+ Grafreed.savesound = true; // wav.save();
2144	2167	// else
2145	2168	repaint(); // start loop // may 2013
2146	2169	}
..	..	@@ -2257,7 +2280,7 @@
2257	2280
2258	2281	void ToggleDebug()
2259	2282	{
2260		- DEBUG ^= true;
	2283	+ Globals.DEBUG ^= true;
2261	2284	}
2262	2285
2263	2286	void ToggleLookAt()
..	..	@@ -2265,7 +2288,7 @@
2265	2288	LOOKAT ^= true;
2266	2289	}
2267	2290
2268		- void ToggleRandom()
	2291	+ void ToggleSwitch()
2269	2292	{
2270	2293	SWITCH ^= true;
2271	2294	}
..	..	@@ -2275,10 +2298,17 @@
2275	2298	HANDLES ^= true;
2276	2299	}
2277	2300
	2301	+ Object3D paintFolder;
	2302	+
2278	2303	void TogglePaint()
2279	2304	{
2280	2305	PAINTMODE ^= true;
2281	2306	paintcount = 0;
	2307	+
	2308	+ if (PAINTMODE)
	2309	+ {
	2310	+ paintFolder = GetFolder();
	2311	+ }
2282	2312	}
2283	2313
2284	2314	void SwapCamera(int a, int b)
..	..	@@ -2374,7 +2404,46 @@
2374	2404	{
2375	2405	return currentGL;
2376	2406	}
2377		-
	2407	+
	2408	+ private BufferedImage CreateBim(TextureData texturedata)
	2409	+ {
	2410	+ // cache to disk
	2411	+ Buffer buffer = texturedata.getBuffer(); // getMipmapData();
	2412	+ //buffers[0].
	2413	+ ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
	2414	+ int[] pixels = new int[bytebuf.capacity()/3];
	2415	+ int width = texturedata.getWidth(); //(int)Math.sqrt(pixels.length); // squared
	2416	+ int height = width;
	2417	+ for (int i=pixels.length; --i>=0;)
	2418	+ {
	2419	+ int i3 = i*3;
	2420	+ pixels[i] = 0xFF;
	2421	+ pixels[i] <<= 8;
	2422	+ pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
	2423	+ pixels[i] <<= 8;
	2424	+ pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
	2425	+ pixels[i] <<= 8;
	2426	+ pixels[i] \|= bytebuf.get(i3) & 0xFF;
	2427	+ }
	2428	+ /*
	2429	+ int r=0,g=0,b=0,a=0;
	2430	+ for (int i=0; i<width; i++)
	2431	+ for (int j=0; j<height; j++)
	2432	+ {
	2433	+ int index = j*width+i;
	2434	+ int p = pixels[index];
	2435	+ a = ((p>>24) & 0xFF);
	2436	+ r = ((p>>16) & 0xFF);
	2437	+ g = ((p>>8) & 0xFF);
	2438	+ b = (p & 0xFF);
	2439	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	2440	+ }
	2441	+ /**/
	2442	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	2443	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	2444	+ return rendImage;
	2445	+ }
	2446	+
2378	2447	/**/
2379	2448	class CacheTexture
2380	2449	{
..	..	@@ -2392,9 +2461,10 @@
2392	2461	/**/
2393	2462
2394	2463	// TEXTURE static Texture texture;
2395		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2396		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2397		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2464	+ static public java.util.Hashtable<String, CacheTexture> textures = new java.util.Hashtable<String, CacheTexture>();
	2465	+ static public java.util.Hashtable<BufferedImage, CacheTexture> bimtextures = new java.util.Hashtable<BufferedImage, CacheTexture>();
	2466	+ static public java.util.HashSet<String> usedtextures = new java.util.HashSet<String>();
	2467	+
2398	2468	int pigmentdepth = 0;
2399	2469	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2400	2470	int bumpdepth = 0;
..	..	@@ -2416,6 +2486,33 @@
2416	2486	true,
2417	2487	com.sun.opengl.util.texture.TextureIO.PNG);
2418	2488	} catch (java.io.IOException e)
	2489	+ {
	2490	+ throw new javax.media.opengl.GLException(e);
	2491	+ }
	2492	+
	2493	+ if (bump)
	2494	+ texturedata = ConvertBump(texturedata, false);
	2495	+
	2496	+ com.sun.opengl.util.texture.Texture texture =
	2497	+ com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2498	+
	2499	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2500	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2501	+
	2502	+ return texture;
	2503	+ }
	2504	+
	2505	+ com.sun.opengl.util.texture.Texture GetBimTexture(BufferedImage name, boolean bump)
	2506	+ {
	2507	+ TextureData texturedata = null;
	2508	+
	2509	+ try
	2510	+ {
	2511	+ texturedata =
	2512	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2513	+ name,
	2514	+ true);
	2515	+ } catch (Exception e)
2419	2516	{
2420	2517	throw new javax.media.opengl.GLException(e);
2421	2518	}
..	..	@@ -3502,6 +3599,8 @@
3502	3599
3503	3600	System.out.println("LOADING TEXTURE : " + name);
3504	3601
	3602	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3603	+
3505	3604	//
3506	3605	if (false) // compressbit > 0)
3507	3606	{
..	..	@@ -7900,7 +7999,7 @@
7900	7999	String pigment = Object3D.GetPigment(tex);
7901	8000	String bump = Object3D.GetBump(tex);
7902	8001
7903		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8002	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7904	8003	{
7905	8004	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7906	8005	// System.out.println("; bump = " + bump);
..	..	@@ -7917,6 +8016,64 @@
7917	8016
7918	8017	ReleaseTexture(bump, true);
7919	8018	ReleaseTexture(pigment, false);
	8019	+ }
	8020	+
	8021	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8022	+ {
	8023	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8024	+ {
	8025	+ return;
	8026	+ }
	8027	+
	8028	+ if (tex == null)
	8029	+ {
	8030	+ ReleaseTexture(null, false);
	8031	+ return;
	8032	+ }
	8033	+
	8034	+ String pigment = Object3D.GetPigment(tex);
	8035	+
	8036	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8037	+ {
	8038	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8039	+ // System.out.println("; bump = " + bump);
	8040	+ }
	8041	+
	8042	+ if (pigment.equals(""))
	8043	+ {
	8044	+ pigment = null;
	8045	+ }
	8046	+
	8047	+ ReleaseTexture(pigment, false);
	8048	+ }
	8049	+
	8050	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8051	+ {
	8052	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8053	+ {
	8054	+ return;
	8055	+ }
	8056	+
	8057	+ if (tex == null)
	8058	+ {
	8059	+ ReleaseTexture(null, true);
	8060	+ return;
	8061	+ }
	8062	+
	8063	+ String bump = Object3D.GetBump(tex);
	8064	+
	8065	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8066	+ {
	8067	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8068	+ // System.out.println("; bump = " + bump);
	8069	+ }
	8070	+
	8071	+ if (bump.equals(""))
	8072	+ {
	8073	+ bump = null;
	8074	+ }
	8075	+
	8076	+ ReleaseTexture(bump, true);
7920	8077	}
7921	8078
7922	8079	void ReleaseTexture(String tex, boolean bump)
..	..	@@ -8022,7 +8179,55 @@
8022	8179	}
8023	8180	}
8024	8181
8025		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8182	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8183	+ {
	8184	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8185	+// ambientOcclusion ) // \|\| !textureon)
	8186	+// {
	8187	+// return; // false;
	8188	+// }
	8189	+//
	8190	+// if (tex == null)
	8191	+// {
	8192	+// BindTexture(null,false,resolution);
	8193	+// BindTexture(null,true,resolution);
	8194	+// return;
	8195	+// }
	8196	+//
	8197	+// String pigment = Object3D.GetPigment(tex);
	8198	+// String bump = Object3D.GetBump(tex);
	8199	+//
	8200	+// usedtextures.add(pigment);
	8201	+// usedtextures.add(bump);
	8202	+//
	8203	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8204	+// {
	8205	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8206	+// // System.out.println("; bump = " + bump);
	8207	+// }
	8208	+//
	8209	+// if (bump.equals(""))
	8210	+// {
	8211	+// bump = null;
	8212	+// }
	8213	+// if (pigment.equals(""))
	8214	+// {
	8215	+// pigment = null;
	8216	+// }
	8217	+//
	8218	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8219	+// BindTexture(pigment, false, resolution);
	8220	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8221	+// BindTexture(bump, true, resolution);
	8222	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8223	+//
	8224	+// return; // true;
	8225	+
	8226	+ BindPigmentTexture(tex, resolution);
	8227	+ BindBumpTexture(tex, resolution);
	8228	+ }
	8229	+
	8230	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8026	8231	{
8027	8232	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8028	8233	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8032,18 +8237,48 @@
8032	8237
8033	8238	if (tex == null)
8034	8239	{
8035		- BindTexture(null,false,resolution);
8036		- BindTexture(null,true,resolution);
	8240	+ BindTexture(null, null,false,resolution);
8037	8241	return;
8038	8242	}
8039	8243
8040	8244	String pigment = Object3D.GetPigment(tex);
	8245	+
	8246	+ usedtextures.add(pigment);
	8247	+
	8248	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8249	+ {
	8250	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8251	+ // System.out.println("; bump = " + bump);
	8252	+ }
	8253	+
	8254	+ if (pigment.equals(""))
	8255	+ {
	8256	+ pigment = null;
	8257	+ }
	8258	+
	8259	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8260	+ BindTexture(tex.pigmenttexture, pigment, false, resolution);
	8261	+ }
	8262	+
	8263	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8264	+ {
	8265	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8266	+ ambientOcclusion ) // \|\| !textureon)
	8267	+ {
	8268	+ return; // false;
	8269	+ }
	8270	+
	8271	+ if (tex == null)
	8272	+ {
	8273	+ BindTexture(null, null,true,resolution);
	8274	+ return;
	8275	+ }
	8276	+
8041	8277	String bump = Object3D.GetBump(tex);
8042	8278
8043		- usedtextures.put(pigment, pigment);
8044		- usedtextures.put(bump, bump);
	8279	+ usedtextures.add(bump);
8045	8280
8046		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8281	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8047	8282	{
8048	8283	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8049	8284	// System.out.println("; bump = " + bump);
..	..	@@ -8053,46 +8288,70 @@
8053	8288	{
8054	8289	bump = null;
8055	8290	}
8056		- if (pigment.equals(""))
8057		- {
8058		- pigment = null;
8059		- }
8060	8291
8061		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8062		- BindTexture(pigment, false, resolution);
8063	8292	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8064		- BindTexture(bump, true, resolution);
	8293	+ BindTexture(tex.bumptexture, bump, true, resolution);
8065	8294	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8066		-
8067		- return; // true;
8068	8295	}
8069	8296
8070		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8297	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8298	+
	8299	+ private boolean FileExists(String tex)
8071	8300	{
8072		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8301	+ if (missingTextures.contains(tex))
	8302	+ {
	8303	+ return false;
	8304	+ }
	8305	+
	8306	+ boolean fileExists = new File(tex).exists();
	8307	+
	8308	+ if (!fileExists)
	8309	+ {
	8310	+ // If file exists, the "new File()" is not executed sgain
	8311	+ missingTextures.add(tex);
	8312	+ }
	8313	+
	8314	+ return fileExists;
	8315	+ }
	8316	+
	8317	+ CacheTexture GetCacheTexture(java.awt.image.BufferedImage bim, String tex, boolean bump, int resolution) throws Exception
	8318	+ {
	8319	+ CacheTexture texturecache = null;
8073	8320
8074	8321	if (tex != null)
8075	8322	{
8076	8323	String texname = tex;
8077	8324
	8325	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8326	+
8078	8327	// String[] split = tex.split("Textures");
8079	8328	// if (split.length > 1)
8080	8329	// texname = "/Users/nbriere/Textures" + split[split.length-1];
8081	8330	// else
8082	8331	// if (!texname.startsWith("/"))
8083	8332	// texname = "/Users/nbriere/Textures/" + texname;
8084		- if (!new File(tex).exists())
	8333	+ if (!FileExists(tex))
8085	8334	{
8086		- texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
	8335	+ texname = fallbackTextureName;
8087	8336	}
8088	8337
8089	8338	if (CACHETEXTURE)
8090		- texture = textures.get(texname); // TEXTURE CACHE
8091		-
8092		- TextureData texturedata = null;
8093		-
8094		- if (texture == null \|\| texture.resolution < resolution)
8095	8339	{
	8340	+ if (bim == null)
	8341	+ texturecache = textures.get(texname); // TEXTURE CACHE
	8342	+ else
	8343	+ texturecache = bimtextures.get(bim); // TEXTURE CACHE
	8344	+ }
	8345	+
	8346	+ if (texturecache == null \|\| texturecache.resolution < resolution)
	8347	+ {
	8348	+ TextureData texturedata = null;
	8349	+
	8350	+ if (bim != null)
	8351	+ {
	8352	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8353	+ }
	8354	+ else
8096	8355	if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8097	8356	{
8098	8357	assert(!bump);
..	..	@@ -8104,19 +8363,23 @@
8104	8363	// }
8105	8364	// else
8106	8365	// {
8107		- texture = textures.get(tex);
8108		- if (texture == null)
	8366	+ texturecache = textures.get(tex);
	8367	+ if (texturecache == null)
8109	8368	{
8110		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8369	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8111	8370	}
	8371	+ else
	8372	+ new Exception().printStackTrace();
8112	8373	// }
8113	8374	} else
8114	8375	if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8115	8376	{
8116	8377	assert(bump);
8117		- texture = textures.get(tex);
8118		- if (texture == null)
8119		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8378	+ texturecache = textures.get(tex);
	8379	+ if (texturecache == null)
	8380	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8381	+ else
	8382	+ new Exception().printStackTrace();
8120	8383	} else
8121	8384	{
8122	8385	//if (tex.equals("IMMORTAL"))
..	..	@@ -8126,9 +8389,11 @@
8126	8389	//{
8127	8390	if (tex.equals("WHITE_NOISE"))
8128	8391	{
8129		- texture = textures.get(tex);
8130		- if (texture == null)
8131		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8392	+ texturecache = textures.get(tex);
	8393	+ if (texturecache == null)
	8394	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8395	+ else
	8396	+ new Exception().printStackTrace();
8132	8397	} else
8133	8398	{
8134	8399	if (textureon)
..	..	@@ -8153,7 +8418,7 @@
8153	8418	}
8154	8419
8155	8420	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8156		- if (!new File(cachename).exists())
	8421	+ if (!FileExists(cachename))
8157	8422	cachename = texname;
8158	8423	else
8159	8424	processbump = false; // don't process bump map again
..	..	@@ -8175,7 +8440,7 @@
8175	8440	}
8176	8441
8177	8442	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8178		- if (!new File(cachename).exists())
	8443	+ if (!FileExists(cachename))
8179	8444	cachename = texname;
8180	8445	else
8181	8446	processbump = false; // don't process bump map again
..	..	@@ -8184,20 +8449,23 @@
8184	8449	texturedata = GetFileTexture(cachename, processbump, resolution);
8185	8450
8186	8451
8187		- if (texturedata != null)
8188		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8452	+ if (texturedata == null)
	8453	+ throw new Exception();
	8454	+
	8455	+ texturecache = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8189	8456	//texture = GetTexture(tex, bump);
8190	8457	}
8191	8458	}
8192	8459	//}
8193	8460	}
8194	8461
8195		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8462	+ if (/CACHETEXTURE &&/ texturecache != null && textureon)
8196	8463	{
8197	8464	//return false;
	8465	+ assert(bim == null);
8198	8466
8199	8467	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8200		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8468	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8201	8469	{
8202	8470	// String ext = "_highres";
8203	8471	// if (REDUCETEXTURE)
..	..	@@ -8214,52 +8482,17 @@
8214	8482	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8215	8483	if (!cachefile.exists())
8216	8484	{
8217		- // cache to disk
8218		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8219		- //buffers[0].
8220		-
8221		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8222		- int[] pixels = new int[bytebuf.capacity()/3];
8223		-
8224		- // squared size heuristic...
8225		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8485	+ //if (texturedata.getWidth() == texturedata.getHeight())
8226	8486	{
8227		- for (int i=pixels.length; --i>=0;)
8228		- {
8229		- int i3 = i*3;
8230		- pixels[i] = 0xFF;
8231		- pixels[i] <<= 8;
8232		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8233		- pixels[i] <<= 8;
8234		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8235		- pixels[i] <<= 8;
8236		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8237		- }
8238		-
8239		- /*
8240		- int r=0,g=0,b=0,a=0;
8241		- for (int i=0; i<width; i++)
8242		- for (int j=0; j<height; j++)
8243		- {
8244		- int index = j*width+i;
8245		- int p = pixels[index];
8246		- a = ((p>>24) & 0xFF);
8247		- r = ((p>>16) & 0xFF);
8248		- g = ((p>>8) & 0xFF);
8249		- b = (p & 0xFF);
8250		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8251		- }
8252		- /**/
8253		- int width = (int)Math.sqrt(pixels.length); // squared
8254		- int height = width;
8255		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8256		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8487	+ BufferedImage rendImage = CreateBim(texturedata);
	8488	+
8257	8489	ImageWriter writer = null;
8258	8490	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8259	8491	if (iter.hasNext()) {
8260	8492	writer = (ImageWriter)iter.next();
8261	8493	}
8262		- float compressionQuality = 0.9f;
	8494	+
	8495	+ float compressionQuality = 0.85f;
8263	8496	try
8264	8497	{
8265	8498	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8286,8 +8519,8 @@
8286	8519	textures.remove(texname);
8287	8520	}
8288	8521
8289		- texture.texturedata = texturedata;
8290		- textures.put(texname, texture);
	8522	+ //texture.texturedata = texturedata;
	8523	+ textures.put(texname, texturecache);
8291	8524
8292	8525	// newtex = true;
8293	8526	}
..	..	@@ -8303,12 +8536,17 @@
8303	8536	}
8304	8537	}
8305	8538
8306		- return texture;
	8539	+ return texturecache;
8307	8540	}
8308	8541
8309		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8542	+ static void EmbedTextures(cTexture tex)
8310	8543	{
8311		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8544	+
	8545	+ }
	8546	+
	8547	+ com.sun.opengl.util.texture.Texture GetTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
	8548	+ {
	8549	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
8312	8550
8313	8551	if (bump)
8314	8552	{
..	..	@@ -8324,23 +8562,23 @@
8324	8562	return texture!=null?texture.texture:null;
8325	8563	}
8326	8564
8327		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8565	+ public com.sun.opengl.util.texture.TextureData GetTextureData(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
8328	8566	{
8329		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8567	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
8330	8568
8331	8569	return texture!=null?texture.texturedata:null;
8332	8570	}
8333	8571
8334		- boolean BindTexture(String tex, boolean bump, int resolution)
	8572	+ boolean BindTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
8335	8573	{
8336	8574	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8337	8575	{
8338	8576	return false;
8339	8577	}
8340	8578
8341		- boolean newtex = false;
	8579	+ //boolean newtex = false;
8342	8580
8343		- com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
	8581	+ com.sun.opengl.util.texture.Texture texture = GetTexture(stream, tex, bump, resolution);
8344	8582
8345	8583	if (texture == null)
8346	8584	return false;
..	..	@@ -8370,7 +8608,7 @@
8370	8608	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8371	8609	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8372	8610
8373		- return newtex;
	8611	+ return true; // Warning: not used.
8374	8612	}
8375	8613
8376	8614	ShadowBuffer shadowPBuf;
..	..	@@ -9208,11 +9446,35 @@
9208	9446	jy8[3] = 0.5f;
9209	9447	}
9210	9448
9211		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9449	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9212	9450	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9213	9451	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9214	9452	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9215	9453
	9454	+ void ResetOptions()
	9455	+ {
	9456	+ options1[0] = 100;
	9457	+ options1[1] = 0.025f;
	9458	+ options1[2] = 0.01f;
	9459	+ options1[3] = 0;
	9460	+ options1[4] = 0;
	9461	+
	9462	+ options2[0] = 0;
	9463	+ options2[1] = 0.75f;
	9464	+ options2[2] = 0;
	9465	+ options2[3] = 0;
	9466	+
	9467	+ options3[0] = 1;
	9468	+ options3[1] = 1;
	9469	+ options3[2] = 1;
	9470	+ options3[3] = 0;
	9471	+
	9472	+ options4[0] = 1;
	9473	+ options4[1] = 0;
	9474	+ options4[2] = 1;
	9475	+ options4[3] = 0;
	9476	+ }
	9477	+
9216	9478	static int imagecount = 0; // movie generation
9217	9479
9218	9480	static int jitter = 0;
..	..	@@ -9308,8 +9570,8 @@
9308	9570	assert (parentcam != renderCamera);
9309	9571
9310	9572	if (renderCamera != lightCamera)
9311		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9312		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9573	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9574	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9313	9575
9314	9576	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9315	9577
..	..	@@ -9324,8 +9586,8 @@
9324	9586	LA.matCopy(renderCamera.fromScreen, matrix);
9325	9587
9326	9588	if (renderCamera != lightCamera)
9327		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9328		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9589	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9590	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9329	9591
9330	9592	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9331	9593
..	..	@@ -9542,7 +9804,7 @@
9542	9804
9543	9805	if (!BOXMODE)
9544	9806	{
9545		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9807	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9546	9808	}
9547	9809
9548	9810	if (!BOXMODE)
..	..	@@ -9580,7 +9842,7 @@
9580	9842	ABORTED = false;
9581	9843	}
9582	9844	else
9583		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9845	+ Grafreed.wav.cursor += 735 * ACSIZE;
9584	9846
9585	9847	if (false)
9586	9848	{
..	..	@@ -10243,11 +10505,11 @@
10243	10505
10244	10506	public void display(GLAutoDrawable drawable)
10245	10507	{
10246		- if (GrafreeD.savesound && GrafreeD.hassound)
	10508	+ if (Grafreed.savesound && Grafreed.hassound)
10247	10509	{
10248		- GrafreeD.wav.save();
10249		- GrafreeD.savesound = false;
10250		- GrafreeD.hassound = false;
	10510	+ Grafreed.wav.save();
	10511	+ Grafreed.savesound = false;
	10512	+ Grafreed.hassound = false;
10251	10513	}
10252	10514	// if (DEBUG_SELECTION)
10253	10515	// {
..	..	@@ -10323,6 +10585,7 @@
10323	10585	ANTIALIAS = 0;
10324	10586	//System.out.println("RESTART");
10325	10587	AAtimer.restart();
	10588	+ Globals.TIMERRUNNING = true;
10326	10589	}
10327	10590	}
10328	10591	}
..	..	@@ -10377,7 +10640,7 @@
10377	10640	Object3D theobject = object;
10378	10641	Object3D theparent = object.parent;
10379	10642	object.parent = null;
10380		- object = (Object3D)GrafreeD.clone(object);
	10643	+ object = (Object3D)Grafreed.clone(object);
10381	10644	object.Stripify();
10382	10645	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10383	10646	theobject.PreprocessOcclusion(this);
..	..	@@ -10390,13 +10653,14 @@
10390	10653	ambientOcclusion = false;
10391	10654	}
10392	10655
10393		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10656	+ if (//Globals.lighttouched &&
	10657	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10394	10658	{
10395	10659	//if (RENDERSHADOW) // ?
10396	10660	if (!IsFrozen())
10397	10661	{
10398	10662	// dec 2012
10399		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10663	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10400	10664	{
10401	10665	Globals.framecount++;
10402	10666	shadowbuffer.display();
..	..	@@ -10523,8 +10787,8 @@
10523	10787
10524	10788	// if (parentcam != renderCamera) // not a light
10525	10789	if (cam != lightCamera)
10526		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10527		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10790	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10791	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10528	10792
10529	10793	for (int j = 0; j < 4; j++)
10530	10794	{
..	..	@@ -10538,8 +10802,8 @@
10538	10802
10539	10803	// if (parentcam != renderCamera) // not a light
10540	10804	if (cam != lightCamera)
10541		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10542		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10805	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10806	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10543	10807
10544	10808	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10545	10809
..	..	@@ -10798,7 +11062,16 @@
10798	11062	// Bump noise
10799	11063	gl.glActiveTexture(GL.GL_TEXTURE6);
10800	11064	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10801		- BindTexture(NOISE_TEXTURE, false, 2);
	11065	+
	11066	+ try
	11067	+ {
	11068	+ BindTexture(null, NOISE_TEXTURE, false, 2);
	11069	+ }
	11070	+ catch (Exception e)
	11071	+ {
	11072	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11073	+ }
	11074	+
10802	11075
10803	11076	gl.glActiveTexture(GL.GL_TEXTURE0);
10804	11077	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10821,9 +11094,9 @@
10821	11094
10822	11095	gl.glMatrixMode(GL.GL_MODELVIEW);
10823	11096
10824		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10825		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10826		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11097	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11098	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11099	+gl.glEnable(gl.GL_MULTISAMPLE);
10827	11100	} else
10828	11101	{
10829	11102	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10834,7 +11107,7 @@
10834	11107	//System.out.println("BLENDING ON");
10835	11108	gl.glEnable(GL.GL_BLEND);
10836	11109	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10837		-
	11110	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10838	11111	gl.glMatrixMode(gl.GL_PROJECTION);
10839	11112	gl.glLoadIdentity();
10840	11113
..	..	@@ -10923,8 +11196,8 @@
10923	11196	System.err.println("parentcam != renderCamera");
10924	11197
10925	11198	// if (cam != lightCamera)
10926		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10927		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11199	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11200	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10928	11201	}
10929	11202
10930	11203	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10945,8 +11218,8 @@
10945	11218	if (true) // TODO
10946	11219	{
10947	11220	if (cam != lightCamera)
10948		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10949		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11221	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11222	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10950	11223	}
10951	11224
10952	11225	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11283,23 +11556,44 @@
11283	11556	e.printStackTrace();
11284	11557	}
11285	11558
11286		- if (GrafreeD.RENDERME > 0)
11287		- GrafreeD.RENDERME--; // mechante magouille
	11559	+ if (Grafreed.RENDERME > 0)
	11560	+ Grafreed.RENDERME--; // mechante magouille
11288	11561
11289	11562	Globals.ONESTEP = false;
11290	11563	}
11291	11564
11292	11565	static boolean zoomonce = false;
11293	11566
	11567	+ static void CreateSelectedPoint()
	11568	+ {
	11569	+ if (selectedpoint == null)
	11570	+ {
	11571	+ debugpointG = new Sphere();
	11572	+ debugpointP = new Sphere();
	11573	+ debugpointC = new Sphere();
	11574	+ debugpointR = new Sphere();
	11575	+
	11576	+ selectedpoint = new Superellipsoid();
	11577	+
	11578	+ for (int i=0; i<8; i++)
	11579	+ {
	11580	+ debugpoints[i] = new Sphere();
	11581	+ }
	11582	+ }
	11583	+ }
	11584	+
11294	11585	void DrawObject(GL gl, boolean draw)
11295	11586	{
	11587	+ // To clear camera values
	11588	+ ResetOptions();
	11589	+
11296	11590	//System.out.println("DRAW OBJECT " + mouseDown);
11297	11591	// DrawMode() = SELECTION;
11298	11592	//GL gl = getGL();
11299	11593	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11300	11594	{
11301	11595	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11302		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11596	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11303	11597	pingthread.StepToTarget(true); // true);
11304	11598	// zoomonce = false;
11305	11599	}
..	..	@@ -11354,7 +11648,14 @@
11354	11648
11355	11649	usedtextures.clear();
11356	11650
11357		- BindTextures(DEFAULT_TEXTURES, 2);
	11651	+ try
	11652	+ {
	11653	+ BindTextures(DEFAULT_TEXTURES, 2);
	11654	+ }
	11655	+ catch (Exception e)
	11656	+ {
	11657	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11658	+ }
11358	11659	}
11359	11660	//System.out.println("--> " + stackdepth);
11360	11661	// GrafreeD.traceon();
..	..	@@ -11364,8 +11665,9 @@
11364	11665
11365	11666	if (DrawMode() == DEFAULT)
11366	11667	{
11367		- if (DEBUG)
	11668	+ if (Globals.DEBUG)
11368	11669	{
	11670	+ CreateSelectedPoint();
11369	11671	float radius = 0.05f;
11370	11672	if (selectedpoint.radius != radius)
11371	11673	{
..	..	@@ -11428,7 +11730,7 @@
11428	11730	if (tex.equals("WHITE_NOISE"))
11429	11731	continue;
11430	11732
11431		- if (!usedtextures.containsKey(tex))
	11733	+ if (!usedtextures.contains(tex))
11432	11734	{
11433	11735	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11434	11736	textures.get(tex).texture.dispose();
..	..	@@ -11445,7 +11747,14 @@
11445	11747	if (checker != null && DrawMode() == DEFAULT)
11446	11748	{
11447	11749	//BindTexture(IMMORTAL_TEXTURE);
11448		- BindTextures(checker.GetTextures(), checker.texres);
	11750	+ try
	11751	+ {
	11752	+ BindTextures(checker.GetTextures(), checker.texres);
	11753	+ }
	11754	+ catch (Exception e)
	11755	+ {
	11756	+ System.err.println("FAILED: " + checker.GetTextures());
	11757	+ }
11449	11758	// NEAREST
11450	11759	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11451	11760	DrawChecker(gl);
..	..	@@ -11527,7 +11836,7 @@
11527	11836	return;
11528	11837	}
11529	11838
11530		- String string = obj.GetToolTip();
	11839	+ String string = obj.toString(); //.GetToolTip();
11531	11840
11532	11841	GL gl = GetGL();
11533	11842
..	..	@@ -11844,8 +12153,8 @@
11844	12153	//obj.TransformToWorld(light, light);
11845	12154	for (int i = tp.size(); --i >= 0;)
11846	12155	{
11847		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11848		- LA.xformPos(light, tp.get(i).toParent, light);
	12156	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12157	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11849	12158	}
11850	12159
11851	12160
..	..	@@ -11862,8 +12171,8 @@
11862	12171	parentcam = cameras[0];
11863	12172	}
11864	12173
11865		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11866		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12174	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12175	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11867	12176
11868	12177	LA.xformPos(light, renderCamera.toScreen, light);
11869	12178
..	..	@@ -12477,8 +12786,8 @@
12477	12786
12478	12787	// display shadow only (bump == 0)
12479	12788	"SUB temp.x, half.x, shadow.x;" +
12480		- "MOV temp.y, -params6.x;" +
12481		- "SLT temp.z, temp.y, zero.x;" +
	12789	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12790	+ "SLT temp.z, temp.y, -one2048th.x;" +
12482	12791	"SUB temp.y, one.x, temp.z;" +
12483	12792	"MUL temp.x, temp.x, temp.y;" +
12484	12793	"KIL temp.x;" +
..	..	@@ -12809,7 +13118,7 @@
12809	13118	//once = true;
12810	13119	}
12811	13120
12812		- System.out.print("Program #" + mode + "; length = " + program.length());
	13121	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12813	13122	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12814	13123	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12815	13124
..	..	@@ -12942,12 +13251,16 @@
12942	13251
12943	13252	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12944	13253	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13254	+
	13255	+ // Compare fragment depth in light space with shadowmap.
12945	13256	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12946	13257	"SGE temp.y, temp.x, zero.x;" +
12947		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13258	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13259	+
	13260	+ // Reverse comparison
12948	13261	"SUB temp.x, one.x, temp.x;" +
12949	13262	"MUL " + shadow + ".x, temp.x, temp.y;" +
12950		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13263	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12951	13264	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12952	13265
12953	13266	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12961,6 +13274,10 @@
12961	13274	// No shadow for backface
12962	13275	"DP3 temp.x, normal, lightd;" +
12963	13276	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13277	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13278	+
	13279	+ // No shadow when out of frustrum
	13280	+ "SGE temp.x, " + depth + ".z, one.z;" +
12964	13281	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12965	13282	"";
12966	13283	}
..	..	@@ -13107,7 +13424,8 @@
13107	13424	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13108	13425	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13109	13426	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13110		- Object3D.cVector2[] vector2buffer;
	13427	+
	13428	+ //Object3D.cVector2[] vector2buffer;
13111	13429
13112	13430	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13113	13431	// OUT : diff, spec
..	..	@@ -13123,9 +13441,10 @@
13123	13441	"DP3 " + dest + ".z," + "normals," + "eye;" +
13124	13442	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13125	13443	//"MOV " + dest + ".w," + "normal.z;" +
13126		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13127		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13128		- //"MOV " + dest + ".z," + "params2.w;" +
	13444	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13445	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13446	+
	13447	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13129	13448	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13130	13449	"RCP " + dest + ".w," + dest + ".w;" +
13131	13450	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13630,6 +13949,7 @@
13630	13949	else
13631	13950	if (evt.getSource() == AAtimer)
13632	13951	{
	13952	+ Globals.TIMERRUNNING = false;
13633	13953	if (mouseDown)
13634	13954	{
13635	13955	//new Exception().printStackTrace();
..	..	@@ -13655,6 +13975,10 @@
13655	13975	// LIVE = waslive;
13656	13976	// wasliveok = true;
13657	13977	// waslive = false;
	13978	+
	13979	+ // May 2019 Forget it:
	13980	+ if (true)
	13981	+ return;
13658	13982
13659	13983	// source == timer
13660	13984	if (mouseDown)
..	..	@@ -13685,7 +14009,7 @@
13685	14009
13686	14010	// fev 2014???
13687	14011	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13688		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14012	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13689	14013	pingthread.StepToTarget(true); // true);
13690	14014	}
13691	14015	// if (!LIVE)
..	..	@@ -13700,6 +14024,7 @@
13700	14024	return;
13701	14025
13702	14026	AAtimer.restart(); //
	14027	+ Globals.TIMERRUNNING = true;
13703	14028
13704	14029	// waslive = LIVE;
13705	14030	// LIVE = false;
..	..	@@ -13772,9 +14097,12 @@
13772	14097
13773	14098	public void mouseDragged(MouseEvent e)
13774	14099	{
	14100	+ Globals.MOUSEDRAGGED = true;
	14101	+
13775	14102	//System.out.println("mouseDragged: " + e);
13776	14103	if (isRenderer)
13777	14104	movingcamera = true;
	14105	+
13778	14106	//if (drawing)
13779	14107	//return;
13780	14108	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -14035,12 +14363,12 @@
14035	14363	void GoDown(int mod)
14036	14364	{
14037	14365	MODIFIERS \|= COMMAND;
14038		- /*
	14366	+ /**/
14039	14367	if((mod&SHIFT) == SHIFT)
14040	14368	manipCamera.RotatePosition(0, -speed);
14041	14369	else
14042		- manipCamera.BackForth(0, -speed*delta, getWidth());
14043		- */
	14370	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14371	+ /**/
14044	14372	if ((mod & SHIFT) == SHIFT)
14045	14373	{
14046	14374	mouseMode = mouseMode; // VR??
..	..	@@ -14056,12 +14384,12 @@
14056	14384	void GoUp(int mod)
14057	14385	{
14058	14386	MODIFIERS \|= COMMAND;
14059		- /*
	14387	+ /**/
14060	14388	if((mod&SHIFT) == SHIFT)
14061	14389	manipCamera.RotatePosition(0, speed);
14062	14390	else
14063		- manipCamera.BackForth(0, speed*delta, getWidth());
14064		- */
	14391	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14392	+ /**/
14065	14393	if ((mod & SHIFT) == SHIFT)
14066	14394	{
14067	14395	mouseMode = mouseMode;
..	..	@@ -14077,12 +14405,12 @@
14077	14405	void GoLeft(int mod)
14078	14406	{
14079	14407	MODIFIERS \|= COMMAND;
14080		- /*
	14408	+ /**/
14081	14409	if((mod&SHIFT) == SHIFT)
14082		- manipCamera.RotatePosition(speed, 0);
14083		- else
14084	14410	manipCamera.Translate(speed*delta, 0, getWidth());
14085		- */
	14411	+ else
	14412	+ manipCamera.RotatePosition(speed, 0);
	14413	+ /**/
14086	14414	if ((mod & SHIFT) == SHIFT)
14087	14415	{
14088	14416	mouseMode = mouseMode;
..	..	@@ -14098,12 +14426,12 @@
14098	14426	void GoRight(int mod)
14099	14427	{
14100	14428	MODIFIERS \|= COMMAND;
14101		- /*
	14429	+ /**/
14102	14430	if((mod&SHIFT) == SHIFT)
14103		- manipCamera.RotatePosition(-speed, 0);
14104		- else
14105	14431	manipCamera.Translate(-speed*delta, 0, getWidth());
14106		- */
	14432	+ else
	14433	+ manipCamera.RotatePosition(-speed, 0);
	14434	+ /**/
14107	14435	if ((mod & SHIFT) == SHIFT)
14108	14436	{
14109	14437	mouseMode = mouseMode;
..	..	@@ -14160,7 +14488,8 @@
14160	14488	info.camera = renderCamera;
14161	14489	info.x = x;
14162	14490	info.y = y;
14163		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14491	+ object.GetWindow().copy
	14492	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14164	14493	} else
14165	14494	{
14166	14495	if (x < startX)
..	..	@@ -14324,7 +14653,9 @@
14324	14653	ci.camera = renderCamera;
14325	14654	if (!isRenderer)
14326	14655	{
14327		- if (object.editWindow.copy.doEditClick(ci, 0))
	14656	+ //ObjEditor editWindow = object.editWindow;
	14657	+ //Object3D copy = editWindow.copy;
	14658	+ if (object.doEditClick(ci, 0))
14328	14659	{
14329	14660	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14330	14661	} else
..	..	@@ -14336,7 +14667,11 @@
14336	14667
14337	14668	public void mouseReleased(MouseEvent e)
14338	14669	{
	14670	+ Globals.MOUSEDRAGGED = false;
	14671	+
14339	14672	movingcamera = false;
	14673	+ X = 0; // getBounds().width/2;
	14674	+ Y = 0; // getBounds().height/2;
14340	14675	//System.out.println("mouseReleased: " + e);
14341	14676	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14342	14677	}
..	..	@@ -14359,7 +14694,7 @@
14359	14694	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14360	14695	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14361	14696
14362		- if (control \|\| command \|\| IsFrozen())
	14697	+// No delay if (control \|\| command \|\| IsFrozen())
14363	14698	timeout = true;
14364	14699	// ?? May 2019 else
14365	14700	// timer.setDelay((modifiers & 128) != 0?0:350);
..	..	@@ -14677,7 +15012,9 @@
14677	15012	case 'E' : COMPACT ^= true;
14678	15013	repaint();
14679	15014	break;
14680		- case 'W' : DEBUGHSB ^= true;
	15015	+ case 'W' : // Wide Window (fullscreen)
	15016	+ //DEBUGHSB ^= true;
	15017	+ ObjEditor.theFrame.ToggleFullScreen();
14681	15018	repaint();
14682	15019	break;
14683	15020	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14702,8 +15039,8 @@
14702	15039	RevertCamera();
14703	15040	repaint();
14704	15041	break;
14705		- case 'L':
14706	15042	case 'l':
	15043	+ //case 'L':
14707	15044	if (lightMode)
14708	15045	{
14709	15046	lightMode = false;
..	..	@@ -14846,9 +15183,9 @@
14846	15183	case '_':
14847	15184	kompactbit = 5;
14848	15185	break;
14849		- case '+':
14850		- kompactbit = 6;
14851		- break;
	15186	+// case '+':
	15187	+// kompactbit = 6;
	15188	+// break;
14852	15189	case ' ':
14853	15190	lightMode ^= true;
14854	15191	Globals.lighttouched = true;
..	..	@@ -14860,13 +15197,14 @@
14860	15197	case ESC:
14861	15198	RENDERPROGRAM += 1;
14862	15199	RENDERPROGRAM %= 3;
	15200	+
14863	15201	repaint();
14864	15202	break;
14865	15203	case 'Z':
14866	15204	//RESIZETEXTURE ^= true;
14867	15205	//break;
14868	15206	case 'z':
14869		- RENDERSHADOW ^= true;
	15207	+ Globals.RENDERSHADOW ^= true;
14870	15208	Globals.lighttouched = true;
14871	15209	repaint();
14872	15210	break;
..	..	@@ -14899,8 +15237,9 @@
14899	15237	case DELETE:
14900	15238	ClearSelection();
14901	15239	break;
14902		- /*
14903	15240	case '+':
	15241	+
	15242	+ /*
14904	15243	//fontsize += 1;
14905	15244	bbzoom *= 2;
14906	15245	repaint();
..	..	@@ -14917,17 +15256,17 @@
14917	15256	case '=':
14918	15257	IncDepth();
14919	15258	//fontsize += 1;
14920		- object.editWindow.refreshContents(true);
	15259	+ object.GetWindow().refreshContents(true);
14921	15260	maskbit = 6;
14922	15261	break;
14923	15262	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14924	15263	DecDepth();
14925	15264	maskbit = 5;
14926	15265	//if(fontsize > 1) fontsize -= 1;
14927		- if (object.editWindow == null)
14928		- new Exception().printStackTrace();
14929		- else
14930		- object.editWindow.refreshContents(true);
	15266	+// if (object.editWindow == null)
	15267	+// new Exception().printStackTrace();
	15268	+// else
	15269	+ object.GetWindow().refreshContents(true);
14931	15270	break;
14932	15271	case '{':
14933	15272	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15151,7 +15490,7 @@
15151	15490	}
15152	15491	*/
15153	15492
15154		- object.editWindow.EditSelection();
	15493	+ object.GetWindow().EditSelection(false);
15155	15494	}
15156	15495
15157	15496	void SelectParent()
..	..	@@ -15168,10 +15507,10 @@
15168	15507	{
15169	15508	//selectees.remove(i);
15170	15509	System.out.println("select parent of " + elem);
15171		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15510	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15172	15511	} else
15173	15512	{
15174		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15513	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15175	15514	}
15176	15515
15177	15516	first = false;
..	..	@@ -15213,12 +15552,12 @@
15213	15552	for (int j = 0; j < group.children.size(); j++)
15214	15553	{
15215	15554	elem = (Object3D) group.children.elementAt(j);
15216		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15555	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15217	15556	first = false;
15218	15557	}
15219	15558	} else
15220	15559	{
15221		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15560	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15222	15561	}
15223	15562
15224	15563	first = false;
..	..	@@ -15229,21 +15568,21 @@
15229	15568	{
15230	15569	//Composite group = (Composite) object;
15231	15570	Object3D group = object;
15232		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15571	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15233	15572	}
15234	15573
15235	15574	void ResetTransform(int mask)
15236	15575	{
15237	15576	//Composite group = (Composite) object;
15238	15577	Object3D group = object;
15239		- group.editWindow.ResetTransform(mask);
	15578	+ group.GetWindow().ResetTransform(mask);
15240	15579	}
15241	15580
15242	15581	void FlipTransform()
15243	15582	{
15244	15583	//Composite group = (Composite) object;
15245	15584	Object3D group = object;
15246		- group.editWindow.FlipTransform();
	15585	+ group.GetWindow().FlipTransform();
15247	15586	// group.editWindow.ReduceMesh(true);
15248	15587	}
15249	15588
..	..	@@ -15251,7 +15590,7 @@
15251	15590	{
15252	15591	//Composite group = (Composite) object;
15253	15592	Object3D group = object;
15254		- group.editWindow.PrintMemory();
	15593	+ group.GetWindow().PrintMemory();
15255	15594	// group.editWindow.ReduceMesh(true);
15256	15595	}
15257	15596
..	..	@@ -15259,7 +15598,7 @@
15259	15598	{
15260	15599	//Composite group = (Composite) object;
15261	15600	Object3D group = object;
15262		- group.editWindow.ResetCentroid();
	15601	+ group.GetWindow().ResetCentroid();
15263	15602	}
15264	15603
15265	15604	void IncDepth()
..	..	@@ -15345,7 +15684,9 @@
15345	15684	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15346	15685	//Image img = CreateImage(width, height);
15347	15686	//System.out.println("width = " + width + "; height = " + height + "\n");
	15687	+
15348	15688	Graphics gr = g; // img.getGraphics();
	15689	+
15349	15690	if (!hasMarquee)
15350	15691	{
15351	15692	if (Xmin < Xmax) // !locked)
..	..	@@ -15433,6 +15774,7 @@
15433	15774	info.bounds.y += (height - desired) / 2;
15434	15775	}
15435	15776	}
	15777	+
15436	15778	info.g = gr;
15437	15779	info.camera = renderCamera;
15438	15780	/*
..	..	@@ -15442,15 +15784,55 @@
15442	15784	*/
15443	15785	if (!isRenderer)
15444	15786	{
15445		- object.drawEditHandles(info, 0);
	15787	+ Grafreed.Assert(object != null);
	15788	+ Grafreed.Assert(object.selection != null);
	15789	+ if (object.selection.Size() > 0)
	15790	+ {
	15791	+ int hitSomething = object.selection.get(0).hitSomething;
	15792	+
	15793	+ info.DX = 0;
	15794	+ info.DY = 0;
	15795	+ info.W = 1;
	15796	+ if (hitSomething == Object3D.hitCenter)
	15797	+ {
	15798	+ info.DX = X;
	15799	+ if (X != 0)
	15800	+ info.DX -= info.bounds.width/2;
	15801	+
	15802	+ info.DY = Y;
	15803	+ if (Y != 0)
	15804	+ info.DY -= info.bounds.height/2;
	15805	+ }
	15806	+
	15807	+ object.drawEditHandles(info, 0);
	15808	+
	15809	+ if (drag && (X != 0 \|\| Y != 0))
	15810	+ {
	15811	+ switch (hitSomething)
	15812	+ {
	15813	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15814	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15815	+ break;
	15816	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15817	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15818	+ break;
	15819	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15820	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15821	+ break;
	15822	+ }
	15823	+
	15824	+ }
	15825	+ }
15446	15826	}
15447	15827	}
	15828	+
15448	15829	if (isRenderer)
15449	15830	{
15450	15831	//gr.setColor(Color.black);
15451	15832	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15452	15833	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15453	15834	}
	15835	+
15454	15836	if (hasMarquee)
15455	15837	{
15456	15838	gr.setXORMode(Color.white);
..	..	@@ -15857,7 +16239,7 @@
15857	16239	Object3D object;
15858	16240	static Object3D trackedobject;
15859	16241	Camera renderCamera; // Light or Eye (or Occlusion)
15860		- /static/ Camera manipCamera; // Light or Eye
	16242	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15861	16243	/static/ Camera eyeCamera;
15862	16244	/static/ Camera lightCamera;
15863	16245	int cameracount;
..	..	@@ -16142,16 +16524,16 @@
16142	16524	cStatic.objectstack[materialdepth++] = checker;
16143	16525	//System.out.println("material " + material);
16144	16526	//Applet3D.tracein(this, selected);
16145		- vector2buffer = checker.projectedVertices;
	16527	+ //vector2buffer = checker.projectedVertices;
16146	16528
16147	16529	//checker.GetMaterial().Draw(this, false); // true);
16148		- DrawMaterial(checker.GetMaterial(), false); // true);
	16530	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16149	16531
16150	16532	materialdepth -= 1;
16151	16533	if (materialdepth > 0)
16152	16534	{
16153		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16154		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16535	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16536	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16155	16537	}
16156	16538	//checker.GetMaterial().opacity = 1f;
16157	16539	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16237,6 +16619,14 @@
16237	16619	}
16238	16620	}
16239	16621
	16622	+ private Object3D GetFolder()
	16623	+ {
	16624	+ Object3D folder = object.GetWindow().copy;
	16625	+ if (object.GetWindow().copy.selection.Size() > 0)
	16626	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16627	+ return folder;
	16628	+ }
	16629	+
16240	16630	class SelectBuffer implements GLEventListener
16241	16631	{
16242	16632
..	..	@@ -16316,6 +16706,17 @@
16316	16706
16317	16707	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16318	16708
	16709	+ if (PAINTMODE)
	16710	+ {
	16711	+ if (object.GetWindow().copy.selection.Size() > 0)
	16712	+ {
	16713	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16714	+
	16715	+ // Make what you paint not selectable.
	16716	+ paintobj.ResetSelectable();
	16717	+ }
	16718	+ }
	16719	+
16319	16720	//int tmp = selection_view;
16320	16721	//selection_view = -1;
16321	16722	int temp = DrawMode();
..	..	@@ -16327,6 +16728,17 @@
16327	16728	// temp = DEFAULT; // patch for selection debug
16328	16729	Globals.drawMode = temp; // WARNING
16329	16730
	16731	+ if (PAINTMODE)
	16732	+ {
	16733	+ if (object.GetWindow().copy.selection.Size() > 0)
	16734	+ {
	16735	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16736	+
	16737	+ // Revert.
	16738	+ paintobj.RestoreSelectable();
	16739	+ }
	16740	+ }
	16741	+
16330	16742	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16331	16743
16332	16744	// trying different ways of getting the depth info over
..	..	@@ -16374,6 +16786,8 @@
16374	16786	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16375	16787	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16376	16788	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16789	+
	16790	+ CreateSelectedPoint();
16377	16791
16378	16792	// Will fit the mesh !!!
16379	16793	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16423,34 +16837,36 @@
16423	16837	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
16424	16838	}
16425	16839
16426		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16840	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16427	16841	}
16428	16842	}
16429	16843
16430	16844	if (!movingcamera && !PAINTMODE)
16431		- object.editWindow.ScreenFitPoint(); // fev 2014
	16845	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16432	16846
16433		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16847	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16434	16848	{
16435		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16849	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16436	16850
16437		- Object3D group = new Object3D("inst" + paintcount++);
	16851	+ if (object.GetWindow().copy.selection.Size() > 0)
	16852	+ {
	16853	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16438	16854
16439		- group.CreateMaterial(); // use a void leaf to select instances
16440		-
16441		- group.add(paintobj); // link
16442		-
16443		- object.editWindow.SnapObject(group);
16444		-
16445		- Object3D folder = object.editWindow.copy;
16446		-
16447		- if (object.editWindow.copy.selection.Size() > 0)
16448		- folder = object.editWindow.copy.selection.elementAt(0);
16449		-
16450		- folder.add(group);
16451		-
16452		- object.editWindow.ResetModel();
16453		- object.editWindow.refreshContents();
	16855	+ Object3D inst = new Object3D("inst" + paintcount++);
	16856	+
	16857	+ inst.CreateMaterial(); // use a void leaf to select instances
	16858	+
	16859	+ inst.add(paintobj); // link
	16860	+
	16861	+ object.GetWindow().SnapObject(inst);
	16862	+
	16863	+ Object3D folder = paintFolder; // GetFolder();
	16864	+
	16865	+ folder.add(inst);
	16866	+
	16867	+ object.GetWindow().ResetModel();
	16868	+ object.GetWindow().refreshContents();
	16869	+ }
16454	16870	}
16455	16871	else
16456	16872	paintcount = 0;
..	..	@@ -16489,6 +16905,11 @@
16489	16905	//System.out.println("objects[color] = " + objects[color]);
16490	16906	//objects[color].Select();
16491	16907	indexcount = 0;
	16908	+ ObjEditor window = object.GetWindow();
	16909	+ if (window != null && deselect)
	16910	+ {
	16911	+ window.Select(null, deselect, true);
	16912	+ }
16492	16913	object.Select(color, deselect);
16493	16914	}
16494	16915
..	..	@@ -16588,7 +17009,7 @@
16588	17009	gl.glDisable(gl.GL_CULL_FACE);
16589	17010	}
16590	17011
16591		- if (!RENDERSHADOW)
	17012	+ if (!Globals.RENDERSHADOW)
16592	17013	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16593	17014
16594	17015	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16598,7 +17019,7 @@
16598	17019	//gl.glColorMask(false, false, false, false);
16599	17020
16600	17021	//render_scene_from_light_view(gl, drawable, 0, 0);
16601		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17022	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16602	17023	{
16603	17024	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16604	17025
..	..	@@ -17014,23 +17435,15 @@
17014	17435	int AAbuffersize = 0;
17015	17436
17016	17437	//double[] selectedpoint = new double[3];
17017		- static Superellipsoid selectedpoint = new Superellipsoid();
	17438	+ static Superellipsoid selectedpoint;
17018	17439	static Sphere previousselectedpoint = null;
17019		- static Sphere debugpointG = new Sphere();
17020		- static Sphere debugpointP = new Sphere();
17021		- static Sphere debugpointC = new Sphere();
17022		- static Sphere debugpointR = new Sphere();
	17440	+ static Sphere debugpointG;
	17441	+ static Sphere debugpointP;
	17442	+ static Sphere debugpointC;
	17443	+ static Sphere debugpointR;
17023	17444
17024	17445	static Sphere debugpoints[] = new Sphere[8];
17025	17446
17026		- static
17027		- {
17028		- for (int i=0; i<8; i++)
17029		- {
17030		- debugpoints[i] = new Sphere();
17031		- }
17032		- }
17033		-
17034	17447	static void InitPoints(float radius)
17035	17448	{
17036	17449	for (int i=0; i<8; i++)