~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
..	..	@@ -45,6 +44,39 @@
45	44	static boolean ABORTED = false;
46	45
47	46	static int STEP = 1;
	47	+
	48	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	49	+ {
	50	+ int[] pixels = new int[bytes.length/3];
	51	+ for (int i=pixels.length; --i>=0;)
	52	+ {
	53	+ int i3 = i*3;
	54	+ pixels[i] = 0xFF;
	55	+ pixels[i] <<= 8;
	56	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	57	+ pixels[i] <<= 8;
	58	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3] & 0xFF;
	61	+ }
	62	+ /*
	63	+ int r=0,g=0,b=0,a=0;
	64	+ for (int i=0; i<width; i++)
	65	+ for (int j=0; j<height; j++)
	66	+ {
	67	+ int index = j*width+i;
	68	+ int p = pixels[index];
	69	+ a = ((p>>24) & 0xFF);
	70	+ r = ((p>>16) & 0xFF);
	71	+ g = ((p>>8) & 0xFF);
	72	+ b = (p & 0xFF);
	73	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	74	+ }
	75	+ /**/
	76	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	77	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	78	+ return rendImage;
	79	+ }
48	80
49	81	/static/ private boolean CULLFACE = false; // true;
50	82	/static/ boolean NEAREST = false; // true;
..	..	@@ -61,7 +93,7 @@
61	93	//boolean REDUCETEXTURE = true;
62	94	boolean CACHETEXTURE = true;
63	95	boolean CLEANCACHE = false; // true;
64		- boolean MIPMAP = false; // true;
	96	+ boolean MIPMAP = true; // false; // true;
65	97	boolean COMPRESSTEXTURE = false;
66	98	boolean KOMPACTTEXTURE = false; // true;
67	99	boolean RESIZETEXTURE = false;
..	..	@@ -149,6 +181,8 @@
149	181	defaultcaps.setAccumBlueBits(16);
150	182	defaultcaps.setAccumAlphaBits(16);
151	183	}
	184	+
	185	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
152	186
153	187	void SetAsGLRenderer(boolean b)
154	188	{
..	..	@@ -325,7 +359,7 @@
325	359	cStatic.objectstack[materialdepth++] = obj;
326	360	//System.out.println("material " + material);
327	361	//Applet3D.tracein(this, selected);
328		- display.vector2buffer = obj.projectedVertices;
	362	+ //display.vector2buffer = obj.projectedVertices;
329	363	if (obj instanceof Camera)
330	364	{
331	365	display.options1[0] = material.shift;
..	..	@@ -334,14 +368,28 @@
334	368	display.options1[2] = material.shadowbias;
335	369	display.options1[3] = material.aniso;
336	370	display.options1[4] = material.anisoV;
	371	+// System.out.println("display.options1[0] " + display.options1[0]);
	372	+// System.out.println("display.options1[1] " + display.options1[1]);
	373	+// System.out.println("display.options1[2] " + display.options1[2]);
	374	+// System.out.println("display.options1[3] " + display.options1[3]);
	375	+// System.out.println("display.options1[4] " + display.options1[4]);
337	376	display.options2[0] = material.opacity;
338	377	display.options2[1] = material.diffuse;
339	378	display.options2[2] = material.factor;
	379	+// System.out.println("display.options2[0] " + display.options2[0]);
	380	+// System.out.println("display.options2[1] " + display.options2[1]);
	381	+// System.out.println("display.options2[2] " + display.options2[2]);
340	382
341	383	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	384	+// System.out.println("display.options3[0] " + display.options3[0]);
	385	+// System.out.println("display.options3[1] " + display.options3[1]);
	386	+// System.out.println("display.options3[2] " + display.options3[2]);
342	387	display.options4[0] = material.cameralight/0.2f;
343	388	display.options4[1] = material.subsurface;
344	389	display.options4[2] = material.sheen;
	390	+// System.out.println("display.options4[0] " + display.options4[0]);
	391	+// System.out.println("display.options4[1] " + display.options4[1]);
	392	+// System.out.println("display.options4[2] " + display.options4[2]);
345	393
346	394	// if (display.CURRENTANTIALIAS > 0)
347	395	// display.options3[3] /= 4;
..	..	@@ -357,7 +405,7 @@
357	405	/**/
358	406	} else
359	407	{
360		- DrawMaterial(material, selected);
	408	+ DrawMaterial(material, selected, obj.projectedVertices);
361	409	}
362	410	} else
363	411	{
..	..	@@ -381,8 +429,8 @@
381	429	cStatic.objectstack[materialdepth++] = obj;
382	430	//System.out.println("material " + material);
383	431	//Applet3D.tracein("selected ", selected);
384		- display.vector2buffer = obj.projectedVertices;
385		- display.DrawMaterial(material, selected);
	432	+ //display.vector2buffer = obj.projectedVertices;
	433	+ display.DrawMaterial(material, selected, obj.projectedVertices);
386	434	}
387	435	}
388	436
..	..	@@ -399,8 +447,8 @@
399	447	materialdepth -= 1;
400	448	if (materialdepth > 0)
401	449	{
402		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
403		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	450	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	451	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
404	452	}
405	453	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
406	454	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -420,8 +468,8 @@
420	468	materialdepth -= 1;
421	469	if (materialdepth > 0)
422	470	{
423		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
424		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	471	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	472	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
425	473	}
426	474	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
427	475	//else
..	..	@@ -462,10 +510,12 @@
462	510	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463	511	{
464	512	//gl.glBegin(gl.GL_TRIANGLES);
465		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	513	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	514	+ // TEST LIVE NORMALS && !obj.dontselect
	515	+ ;
466	516	if (!hasnorm)
467	517	{
468		- // System.out.println("FUCK!!");
	518	+ // System.out.println("Mesh normal");
469	519	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
470	520	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
471	521	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1190,10 +1240,12 @@
1190	1240	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1191	1241	}
1192	1242	}
	1243	+
1193	1244	if (flipV)
1194	1245	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1195	1246	else
1196	1247	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1248	+
1197	1249	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1198	1250	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1199	1251
..	..	@@ -1213,10 +1265,12 @@
1213	1265	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1214	1266	}
1215	1267	}
	1268	+
1216	1269	if (flipV)
1217	1270	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1218	1271	else
1219	1272	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1273	+
1220	1274	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1221	1275	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1222	1276
..	..	@@ -1244,8 +1298,10 @@
1244	1298	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1245	1299	else
1246	1300	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1301	+
1247	1302	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1248	1303	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1304	+
1249	1305	count2 += 2;
1250	1306	count3 += 3;
1251	1307	}
..	..	@@ -1601,7 +1657,7 @@
1601	1657	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1602	1658	}
1603	1659
1604		- void DrawMaterial(cMaterial material, boolean selected)
	1660	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1605	1661	{
1606	1662	CameraPane display = this;
1607	1663	//new Exception().printStackTrace();
..	..	@@ -1628,7 +1684,7 @@
1628	1684
1629	1685	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1630	1686
1631		- float[] colorV = GrafreeD.colorV;
	1687	+ float[] colorV = Grafreed.colorV;
1632	1688
1633	1689	/**/
1634	1690	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1636,7 +1692,7 @@
1636	1692	colorV[0] = display.modelParams0[0] * material.diffuse;
1637	1693	colorV[1] = display.modelParams0[1] * material.diffuse;
1638	1694	colorV[2] = display.modelParams0[2] * material.diffuse;
1639		- colorV[3] = material.opacity;
	1695	+ colorV[3] = 1; // material.opacity;
1640	1696
1641	1697	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1642	1698	//System.out.println("Opacity = " + opacity);
..	..	@@ -1744,9 +1800,9 @@
1744	1800	display.modelParams7[2] = 0;
1745	1801	display.modelParams7[3] = 0;
1746	1802
1747		- display.modelParams6[0] = 100; // criss de bug de bump
	1803	+ //display.modelParams6[0] = 100; // criss de bug de bump
1748	1804
1749		- Object3D.cVector2[] extparams = display.vector2buffer;
	1805	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1750	1806	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1751	1807	{
1752	1808	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1888,7 +1944,7 @@
1888	1944	void PushMatrix(double[][] matrix)
1889	1945	{
1890	1946	// GrafreeD.tracein(matrix);
1891		- PushMatrix(matrix,1);
	1947	+ PushMatrix(matrix, 1);
1892	1948	}
1893	1949
1894	1950	void PushMatrix()
..	..	@@ -2042,7 +2098,7 @@
2042	2098	//System.err.println("Oeil on");
2043	2099	OEIL = true;
2044	2100	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2045		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2101	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2046	2102	//pingthread.StepToTarget(true);
2047	2103	}
2048	2104
..	..	@@ -2140,7 +2196,7 @@
2140	2196	System.err.println("LIVE = " + Globals.isLIVE());
2141	2197
2142	2198	if (!Globals.isLIVE()) // save sound
2143		- GrafreeD.savesound = true; // wav.save();
	2199	+ Grafreed.savesound = true; // wav.save();
2144	2200	// else
2145	2201	repaint(); // start loop // may 2013
2146	2202	}
..	..	@@ -2257,7 +2313,7 @@
2257	2313
2258	2314	void ToggleDebug()
2259	2315	{
2260		- DEBUG ^= true;
	2316	+ Globals.DEBUG ^= true;
2261	2317	}
2262	2318
2263	2319	void ToggleLookAt()
..	..	@@ -2265,7 +2321,7 @@
2265	2321	LOOKAT ^= true;
2266	2322	}
2267	2323
2268		- void ToggleRandom()
	2324	+ void ToggleSwitch()
2269	2325	{
2270	2326	SWITCH ^= true;
2271	2327	}
..	..	@@ -2275,10 +2331,17 @@
2275	2331	HANDLES ^= true;
2276	2332	}
2277	2333
	2334	+ Object3D paintFolder;
	2335	+
2278	2336	void TogglePaint()
2279	2337	{
2280	2338	PAINTMODE ^= true;
2281	2339	paintcount = 0;
	2340	+
	2341	+ if (PAINTMODE)
	2342	+ {
	2343	+ paintFolder = GetFolder();
	2344	+ }
2282	2345	}
2283	2346
2284	2347	void SwapCamera(int a, int b)
..	..	@@ -2374,7 +2437,22 @@
2374	2437	{
2375	2438	return currentGL;
2376	2439	}
2377		-
	2440	+
	2441	+ static private BufferedImage CreateBim(TextureData texturedata)
	2442	+ {
	2443	+ Grafreed.Assert(texturedata != null);
	2444	+
	2445	+ int width = texturedata.getWidth();
	2446	+ int height = texturedata.getHeight();
	2447	+
	2448	+ Buffer buffer = texturedata.getBuffer();
	2449	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2450	+
	2451	+ byte[] bytes = bytebuf.array();
	2452	+
	2453	+ return CreateBim(bytes, width, height);
	2454	+ }
	2455	+
2378	2456	/**/
2379	2457	class CacheTexture
2380	2458	{
..	..	@@ -2383,28 +2461,31 @@
2383	2461
2384	2462	int resolution;
2385	2463
2386		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2464	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2387	2465	{
2388		- texture = tex;
	2466	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2467	+ texturedata = texdata;
2389	2468	resolution = res;
2390	2469	}
2391	2470	}
2392	2471	/**/
2393	2472
2394	2473	// 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>();
	2474	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2475	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2476	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2477	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2478	+
2398	2479	int pigmentdepth = 0;
2399	2480	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2400	2481	int bumpdepth = 0;
2401	2482	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2483	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2403	2484	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2404		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2485	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2405	2486	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2406	2487
2407		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2488	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2408	2489	{
2409	2490	TextureData texturedata = null;
2410	2491
..	..	@@ -2423,13 +2504,34 @@
2423	2504	if (bump)
2424	2505	texturedata = ConvertBump(texturedata, false);
2425	2506
2426		- com.sun.opengl.util.texture.Texture texture =
2427		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2507	+// com.sun.opengl.util.texture.Texture texture =
	2508	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2428	2509
2429		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2430		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2510	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2511	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2431	2512
2432		- return texture;
	2513	+ return texturedata;
	2514	+ }
	2515	+
	2516	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2517	+ {
	2518	+ TextureData texturedata = null;
	2519	+
	2520	+ try
	2521	+ {
	2522	+ texturedata =
	2523	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2524	+ bim,
	2525	+ true);
	2526	+ } catch (Exception e)
	2527	+ {
	2528	+ throw new javax.media.opengl.GLException(e);
	2529	+ }
	2530	+
	2531	+ if (bump)
	2532	+ texturedata = ConvertBump(texturedata, false);
	2533	+
	2534	+ return texturedata;
2433	2535	}
2434	2536
2435	2537	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3502,6 +3604,8 @@
3502	3604
3503	3605	System.out.println("LOADING TEXTURE : " + name);
3504	3606
	3607	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3608	+
3505	3609	//
3506	3610	if (false) // compressbit > 0)
3507	3611	{
..	..	@@ -7900,7 +8004,7 @@
7900	8004	String pigment = Object3D.GetPigment(tex);
7901	8005	String bump = Object3D.GetBump(tex);
7902	8006
7903		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8007	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7904	8008	{
7905	8009	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7906	8010	// System.out.println("; bump = " + bump);
..	..	@@ -7915,11 +8019,69 @@
7915	8019	pigment = null;
7916	8020	}
7917	8021
7918		- ReleaseTexture(bump, true);
7919		- ReleaseTexture(pigment, false);
	8022	+ ReleaseTexture(tex, true);
	8023	+ ReleaseTexture(tex, false);
7920	8024	}
7921	8025
7922		- void ReleaseTexture(String tex, boolean bump)
	8026	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8027	+ {
	8028	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8029	+ {
	8030	+ return;
	8031	+ }
	8032	+
	8033	+ if (tex == null)
	8034	+ {
	8035	+ ReleaseTexture(null, false);
	8036	+ return;
	8037	+ }
	8038	+
	8039	+ String pigment = Object3D.GetPigment(tex);
	8040	+
	8041	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8042	+ {
	8043	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8044	+ // System.out.println("; bump = " + bump);
	8045	+ }
	8046	+
	8047	+ if (pigment.equals(""))
	8048	+ {
	8049	+ pigment = null;
	8050	+ }
	8051	+
	8052	+ ReleaseTexture(tex, false);
	8053	+ }
	8054	+
	8055	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8056	+ {
	8057	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8058	+ {
	8059	+ return;
	8060	+ }
	8061	+
	8062	+ if (tex == null)
	8063	+ {
	8064	+ ReleaseTexture(null, true);
	8065	+ return;
	8066	+ }
	8067	+
	8068	+ String bump = Object3D.GetBump(tex);
	8069	+
	8070	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8071	+ {
	8072	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8073	+ // System.out.println("; bump = " + bump);
	8074	+ }
	8075	+
	8076	+ if (bump.equals(""))
	8077	+ {
	8078	+ bump = null;
	8079	+ }
	8080	+
	8081	+ ReleaseTexture(tex, true);
	8082	+ }
	8083	+
	8084	+ void ReleaseTexture(cTexture tex, boolean bump)
7923	8085	{
7924	8086	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7925	8087	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7930,7 +8092,7 @@
7930	8092	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7931	8093
7932	8094	if (tex != null)
7933		- texture = textures.get(tex);
	8095	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7934	8096
7935	8097	// //assert( texture != null );
7936	8098	// if (texture == null)
..	..	@@ -8022,7 +8184,55 @@
8022	8184	}
8023	8185	}
8024	8186
8025		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8187	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8188	+ {
	8189	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8190	+// ambientOcclusion ) // \|\| !textureon)
	8191	+// {
	8192	+// return; // false;
	8193	+// }
	8194	+//
	8195	+// if (tex == null)
	8196	+// {
	8197	+// BindTexture(null,false,resolution);
	8198	+// BindTexture(null,true,resolution);
	8199	+// return;
	8200	+// }
	8201	+//
	8202	+// String pigment = Object3D.GetPigment(tex);
	8203	+// String bump = Object3D.GetBump(tex);
	8204	+//
	8205	+// usedtextures.add(pigment);
	8206	+// usedtextures.add(bump);
	8207	+//
	8208	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8209	+// {
	8210	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8211	+// // System.out.println("; bump = " + bump);
	8212	+// }
	8213	+//
	8214	+// if (bump.equals(""))
	8215	+// {
	8216	+// bump = null;
	8217	+// }
	8218	+// if (pigment.equals(""))
	8219	+// {
	8220	+// pigment = null;
	8221	+// }
	8222	+//
	8223	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8224	+// BindTexture(pigment, false, resolution);
	8225	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8226	+// BindTexture(bump, true, resolution);
	8227	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8228	+//
	8229	+// return; // true;
	8230	+
	8231	+ BindPigmentTexture(tex, resolution);
	8232	+ BindBumpTexture(tex, resolution);
	8233	+ }
	8234	+
	8235	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8026	8236	{
8027	8237	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8028	8238	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8033,17 +8243,47 @@
8033	8243	if (tex == null)
8034	8244	{
8035	8245	BindTexture(null,false,resolution);
8036		- BindTexture(null,true,resolution);
8037	8246	return;
8038	8247	}
8039	8248
8040	8249	String pigment = Object3D.GetPigment(tex);
	8250	+
	8251	+ usedtextures.add(tex);
	8252	+
	8253	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8254	+ {
	8255	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8256	+ // System.out.println("; bump = " + bump);
	8257	+ }
	8258	+
	8259	+ if (pigment.equals(""))
	8260	+ {
	8261	+ pigment = null;
	8262	+ }
	8263	+
	8264	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8265	+ BindTexture(tex, false, resolution);
	8266	+ }
	8267	+
	8268	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8269	+ {
	8270	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8271	+ ambientOcclusion ) // \|\| !textureon)
	8272	+ {
	8273	+ return; // false;
	8274	+ }
	8275	+
	8276	+ if (tex == null)
	8277	+ {
	8278	+ BindTexture(null,true,resolution);
	8279	+ return;
	8280	+ }
	8281	+
8041	8282	String bump = Object3D.GetBump(tex);
8042	8283
8043		- usedtextures.put(pigment, pigment);
8044		- usedtextures.put(bump, bump);
	8284	+ usedtextures.add(tex);
8045	8285
8046		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8286	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8047	8287	{
8048	8288	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8049	8289	// System.out.println("; bump = " + bump);
..	..	@@ -8053,47 +8293,82 @@
8053	8293	{
8054	8294	bump = null;
8055	8295	}
8056		- if (pigment.equals(""))
8057		- {
8058		- pigment = null;
8059		- }
8060	8296
8061		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8062		- BindTexture(pigment, false, resolution);
8063	8297	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8064		- BindTexture(bump, true, resolution);
	8298	+ BindTexture(tex, true, resolution);
8065	8299	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8066		-
8067		- return; // true;
8068	8300	}
8069	8301
8070		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8302	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8303	+
	8304	+ private boolean FileExists(String tex)
8071	8305	{
8072		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8306	+ if (missingTextures.contains(tex))
	8307	+ {
	8308	+ return false;
	8309	+ }
	8310	+
	8311	+ boolean fileExists = new File(tex).exists();
	8312	+
	8313	+ if (!fileExists)
	8314	+ {
	8315	+ // If file exists, the "new File()" is not executed sgain
	8316	+ missingTextures.add(tex);
	8317	+ }
	8318	+
	8319	+ return fileExists;
	8320	+ }
	8321	+
	8322	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8323	+ {
	8324	+ CacheTexture texturecache = null;
8073	8325
8074	8326	if (tex != null)
8075	8327	{
8076		- String texname = tex;
	8328	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8329	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8077	8330
	8331	+ if (texname.equals("") && texdata == null)
	8332	+ {
	8333	+ return null;
	8334	+ }
	8335	+
	8336	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8337	+
8078	8338	// String[] split = tex.split("Textures");
8079	8339	// if (split.length > 1)
8080	8340	// texname = "/Users/nbriere/Textures" + split[split.length-1];
8081	8341	// else
8082	8342	// if (!texname.startsWith("/"))
8083	8343	// texname = "/Users/nbriere/Textures/" + texname;
8084		- if (!new File(tex).exists())
	8344	+ if (!FileExists(texname))
8085	8345	{
8086		- texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
	8346	+ texname = fallbackTextureName;
8087	8347	}
8088	8348
8089	8349	if (CACHETEXTURE)
8090		- texture = textures.get(texname); // TEXTURE CACHE
8091		-
8092		- TextureData texturedata = null;
8093		-
8094		- if (texture == null \|\| texture.resolution < resolution)
8095	8350	{
8096		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8351	+ if (texdata == null)
	8352	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8353	+ else
	8354	+ texturecache = bimtextures.get(texdata);
	8355	+ }
	8356	+
	8357	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8358	+ {
	8359	+ TextureData texturedata = null;
	8360	+
	8361	+ if (texdata != null)
	8362	+ {
	8363	+ BufferedImage bim = //new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8364	+
	8365	+ CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8366	+
	8367	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8368	+ bimtextures.put(texdata, texturecache);
	8369	+ }
	8370	+ else
	8371	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8097	8372	{
8098	8373	assert(!bump);
8099	8374	// if (bump)
..	..	@@ -8104,19 +8379,23 @@
8104	8379	// }
8105	8380	// else
8106	8381	// {
8107		- texture = textures.get(tex);
8108		- if (texture == null)
	8382	+ // texturecache = textures.get(texname); // suspicious
	8383	+ if (texturecache == null)
8109	8384	{
8110		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8385	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8111	8386	}
	8387	+ else
	8388	+ new Exception().printStackTrace();
8112	8389	// }
8113	8390	} else
8114		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8391	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8115	8392	{
8116	8393	assert(bump);
8117		- texture = textures.get(tex);
8118		- if (texture == null)
8119		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8394	+ // texturecache = textures.get(texname); // suspicious
	8395	+ if (texturecache == null)
	8396	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8397	+ else
	8398	+ new Exception().printStackTrace();
8120	8399	} else
8121	8400	{
8122	8401	//if (tex.equals("IMMORTAL"))
..	..	@@ -8124,11 +8403,13 @@
8124	8403	// texture = GetResourceTexture("default.png");
8125	8404	//} else
8126	8405	//{
8127		- if (tex.equals("WHITE_NOISE"))
	8406	+ if (texname.endsWith("WHITE_NOISE"))
8128	8407	{
8129		- texture = textures.get(tex);
8130		- if (texture == null)
8131		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8408	+ // texturecache = textures.get(texname); // suspicious
	8409	+ if (texturecache == null)
	8410	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8411	+ else
	8412	+ new Exception().printStackTrace();
8132	8413	} else
8133	8414	{
8134	8415	if (textureon)
..	..	@@ -8153,7 +8434,7 @@
8153	8434	}
8154	8435
8155	8436	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8156		- if (!new File(cachename).exists())
	8437	+ if (!FileExists(cachename))
8157	8438	cachename = texname;
8158	8439	else
8159	8440	processbump = false; // don't process bump map again
..	..	@@ -8175,7 +8456,7 @@
8175	8456	}
8176	8457
8177	8458	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8178		- if (!new File(cachename).exists())
	8459	+ if (!FileExists(cachename))
8179	8460	cachename = texname;
8180	8461	else
8181	8462	processbump = false; // don't process bump map again
..	..	@@ -8184,20 +8465,22 @@
8184	8465	texturedata = GetFileTexture(cachename, processbump, resolution);
8185	8466
8186	8467
8187		- if (texturedata != null)
8188		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8468	+ if (texturedata == null)
	8469	+ throw new Exception();
	8470	+
	8471	+ texturecache = new CacheTexture(texturedata,resolution);
8189	8472	//texture = GetTexture(tex, bump);
8190	8473	}
8191	8474	}
8192	8475	//}
8193	8476	}
8194	8477
8195		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8478	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8196	8479	{
8197	8480	//return false;
8198	8481
8199	8482	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8200		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8483	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8201	8484	{
8202	8485	// String ext = "_highres";
8203	8486	// if (REDUCETEXTURE)
..	..	@@ -8214,52 +8497,17 @@
8214	8497	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8215	8498	if (!cachefile.exists())
8216	8499	{
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))
	8500	+ //if (texturedata.getWidth() == texturedata.getHeight())
8226	8501	{
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);
	8502	+ BufferedImage rendImage = CreateBim(texturedata);
	8503	+
8257	8504	ImageWriter writer = null;
8258	8505	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8259	8506	if (iter.hasNext()) {
8260	8507	writer = (ImageWriter)iter.next();
8261	8508	}
8262		- float compressionQuality = 0.9f;
	8509	+
	8510	+ float compressionQuality = 0.85f;
8263	8511	try
8264	8512	{
8265	8513	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8276,18 +8524,20 @@
8276	8524	}
8277	8525	}
8278	8526	}
8279		-
	8527	+
	8528	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8529	+
8280	8530	//System.out.println("Texture = " + tex);
8281		- if (textures.containsKey(texname))
	8531	+ if (textures.containsKey(tex))
8282	8532	{
8283		- CacheTexture thetex = textures.get(texname);
	8533	+ CacheTexture thetex = textures.get(tex);
8284	8534	thetex.texture.disable();
8285	8535	thetex.texture.dispose();
8286		- textures.remove(texname);
	8536	+ textures.remove(tex);
8287	8537	}
8288	8538
8289		- texture.texturedata = texturedata;
8290		- textures.put(texname, texture);
	8539	+ //texture.texturedata = texturedata;
	8540	+ textures.put(tex, texturecache);
8291	8541
8292	8542	// newtex = true;
8293	8543	}
..	..	@@ -8303,10 +8553,41 @@
8303	8553	}
8304	8554	}
8305	8555
8306		- return texture;
	8556	+ return texturecache;
8307	8557	}
8308	8558
8309		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8559	+ static void EmbedTextures(cTexture tex)
	8560	+ {
	8561	+ if (tex.pigmentdata == null)
	8562	+ {
	8563	+ String texname = Object3D.GetPigment(tex);
	8564	+
	8565	+ CacheTexture texturecache = texturepigment.get(tex);
	8566	+
	8567	+ if (texturecache != null)
	8568	+ {
	8569	+ tex.pigmentdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
	8570	+ tex.pw = texturecache.texturedata.getWidth();
	8571	+ tex.ph = texturecache.texturedata.getHeight();
	8572	+ }
	8573	+ }
	8574	+
	8575	+ if (tex.bumpdata == null)
	8576	+ {
	8577	+ String texname = Object3D.GetBump(tex);
	8578	+
	8579	+ CacheTexture texturecache = texturebump.get(tex);
	8580	+
	8581	+ if (texturecache != null)
	8582	+ {
	8583	+ tex.bumpdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
	8584	+ tex.bw = texturecache.texturedata.getWidth();
	8585	+ tex.bh = texturecache.texturedata.getHeight();
	8586	+ }
	8587	+ }
	8588	+ }
	8589	+
	8590	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8310	8591	{
8311	8592	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8312	8593
..	..	@@ -8324,21 +8605,21 @@
8324	8605	return texture!=null?texture.texture:null;
8325	8606	}
8326	8607
8327		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8608	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8328	8609	{
8329	8610	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8330	8611
8331	8612	return texture!=null?texture.texturedata:null;
8332	8613	}
8333	8614
8334		- boolean BindTexture(String tex, boolean bump, int resolution)
	8615	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8335	8616	{
8336	8617	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8337	8618	{
8338	8619	return false;
8339	8620	}
8340	8621
8341		- boolean newtex = false;
	8622	+ //boolean newtex = false;
8342	8623
8343	8624	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8344	8625
..	..	@@ -8370,7 +8651,7 @@
8370	8651	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8371	8652	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8372	8653
8373		- return newtex;
	8654	+ return true; // Warning: not used.
8374	8655	}
8375	8656
8376	8657	ShadowBuffer shadowPBuf;
..	..	@@ -9208,11 +9489,35 @@
9208	9489	jy8[3] = 0.5f;
9209	9490	}
9210	9491
9211		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9492	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9212	9493	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9213	9494	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9214	9495	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9215	9496
	9497	+ void ResetOptions()
	9498	+ {
	9499	+ options1[0] = 100;
	9500	+ options1[1] = 0.025f;
	9501	+ options1[2] = 0.01f;
	9502	+ options1[3] = 0;
	9503	+ options1[4] = 0;
	9504	+
	9505	+ options2[0] = 0;
	9506	+ options2[1] = 0.75f;
	9507	+ options2[2] = 0;
	9508	+ options2[3] = 0;
	9509	+
	9510	+ options3[0] = 1;
	9511	+ options3[1] = 1;
	9512	+ options3[2] = 1;
	9513	+ options3[3] = 0;
	9514	+
	9515	+ options4[0] = 1;
	9516	+ options4[1] = 0;
	9517	+ options4[2] = 1;
	9518	+ options4[3] = 0;
	9519	+ }
	9520	+
9216	9521	static int imagecount = 0; // movie generation
9217	9522
9218	9523	static int jitter = 0;
..	..	@@ -9308,8 +9613,8 @@
9308	9613	assert (parentcam != renderCamera);
9309	9614
9310	9615	if (renderCamera != lightCamera)
9311		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9312		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9616	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9617	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9313	9618
9314	9619	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9315	9620
..	..	@@ -9324,8 +9629,8 @@
9324	9629	LA.matCopy(renderCamera.fromScreen, matrix);
9325	9630
9326	9631	if (renderCamera != lightCamera)
9327		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9328		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9632	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9633	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9329	9634
9330	9635	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9331	9636
..	..	@@ -9542,7 +9847,7 @@
9542	9847
9543	9848	if (!BOXMODE)
9544	9849	{
9545		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9850	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9546	9851	}
9547	9852
9548	9853	if (!BOXMODE)
..	..	@@ -9580,7 +9885,7 @@
9580	9885	ABORTED = false;
9581	9886	}
9582	9887	else
9583		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9888	+ Grafreed.wav.cursor += 735 * ACSIZE;
9584	9889
9585	9890	if (false)
9586	9891	{
..	..	@@ -10243,11 +10548,11 @@
10243	10548
10244	10549	public void display(GLAutoDrawable drawable)
10245	10550	{
10246		- if (GrafreeD.savesound && GrafreeD.hassound)
	10551	+ if (Grafreed.savesound && Grafreed.hassound)
10247	10552	{
10248		- GrafreeD.wav.save();
10249		- GrafreeD.savesound = false;
10250		- GrafreeD.hassound = false;
	10553	+ Grafreed.wav.save();
	10554	+ Grafreed.savesound = false;
	10555	+ Grafreed.hassound = false;
10251	10556	}
10252	10557	// if (DEBUG_SELECTION)
10253	10558	// {
..	..	@@ -10323,6 +10628,7 @@
10323	10628	ANTIALIAS = 0;
10324	10629	//System.out.println("RESTART");
10325	10630	AAtimer.restart();
	10631	+ Globals.TIMERRUNNING = true;
10326	10632	}
10327	10633	}
10328	10634	}
..	..	@@ -10377,7 +10683,7 @@
10377	10683	Object3D theobject = object;
10378	10684	Object3D theparent = object.parent;
10379	10685	object.parent = null;
10380		- object = (Object3D)GrafreeD.clone(object);
	10686	+ object = (Object3D)Grafreed.clone(object);
10381	10687	object.Stripify();
10382	10688	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10383	10689	theobject.PreprocessOcclusion(this);
..	..	@@ -10390,13 +10696,14 @@
10390	10696	ambientOcclusion = false;
10391	10697	}
10392	10698
10393		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10699	+ if (//Globals.lighttouched &&
	10700	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10394	10701	{
10395	10702	//if (RENDERSHADOW) // ?
10396	10703	if (!IsFrozen())
10397	10704	{
10398	10705	// dec 2012
10399		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10706	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10400	10707	{
10401	10708	Globals.framecount++;
10402	10709	shadowbuffer.display();
..	..	@@ -10523,8 +10830,8 @@
10523	10830
10524	10831	// if (parentcam != renderCamera) // not a light
10525	10832	if (cam != lightCamera)
10526		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10527		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10833	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10834	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10528	10835
10529	10836	for (int j = 0; j < 4; j++)
10530	10837	{
..	..	@@ -10538,8 +10845,8 @@
10538	10845
10539	10846	// if (parentcam != renderCamera) // not a light
10540	10847	if (cam != lightCamera)
10541		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10542		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10848	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10849	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10543	10850
10544	10851	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10545	10852
..	..	@@ -10798,7 +11105,16 @@
10798	11105	// Bump noise
10799	11106	gl.glActiveTexture(GL.GL_TEXTURE6);
10800	11107	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10801		- BindTexture(NOISE_TEXTURE, false, 2);
	11108	+
	11109	+ try
	11110	+ {
	11111	+ BindTexture(NOISE_TEXTURE, false, 2);
	11112	+ }
	11113	+ catch (Exception e)
	11114	+ {
	11115	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11116	+ }
	11117	+
10802	11118
10803	11119	gl.glActiveTexture(GL.GL_TEXTURE0);
10804	11120	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10821,9 +11137,9 @@
10821	11137
10822	11138	gl.glMatrixMode(GL.GL_MODELVIEW);
10823	11139
10824		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10825		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10826		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11140	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11141	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11142	+gl.glEnable(gl.GL_MULTISAMPLE);
10827	11143	} else
10828	11144	{
10829	11145	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10834,7 +11150,7 @@
10834	11150	//System.out.println("BLENDING ON");
10835	11151	gl.glEnable(GL.GL_BLEND);
10836	11152	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10837		-
	11153	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10838	11154	gl.glMatrixMode(gl.GL_PROJECTION);
10839	11155	gl.glLoadIdentity();
10840	11156
..	..	@@ -10923,8 +11239,8 @@
10923	11239	System.err.println("parentcam != renderCamera");
10924	11240
10925	11241	// if (cam != lightCamera)
10926		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10927		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11242	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11243	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10928	11244	}
10929	11245
10930	11246	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10945,8 +11261,8 @@
10945	11261	if (true) // TODO
10946	11262	{
10947	11263	if (cam != lightCamera)
10948		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10949		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11264	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11265	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10950	11266	}
10951	11267
10952	11268	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11283,23 +11599,44 @@
11283	11599	e.printStackTrace();
11284	11600	}
11285	11601
11286		- if (GrafreeD.RENDERME > 0)
11287		- GrafreeD.RENDERME--; // mechante magouille
	11602	+ if (Grafreed.RENDERME > 0)
	11603	+ Grafreed.RENDERME--; // mechante magouille
11288	11604
11289	11605	Globals.ONESTEP = false;
11290	11606	}
11291	11607
11292	11608	static boolean zoomonce = false;
11293	11609
	11610	+ static void CreateSelectedPoint()
	11611	+ {
	11612	+ if (selectedpoint == null)
	11613	+ {
	11614	+ debugpointG = new Sphere();
	11615	+ debugpointP = new Sphere();
	11616	+ debugpointC = new Sphere();
	11617	+ debugpointR = new Sphere();
	11618	+
	11619	+ selectedpoint = new Superellipsoid();
	11620	+
	11621	+ for (int i=0; i<8; i++)
	11622	+ {
	11623	+ debugpoints[i] = new Sphere();
	11624	+ }
	11625	+ }
	11626	+ }
	11627	+
11294	11628	void DrawObject(GL gl, boolean draw)
11295	11629	{
	11630	+ // To clear camera values
	11631	+ ResetOptions();
	11632	+
11296	11633	//System.out.println("DRAW OBJECT " + mouseDown);
11297	11634	// DrawMode() = SELECTION;
11298	11635	//GL gl = getGL();
11299	11636	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11300	11637	{
11301	11638	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11302		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11639	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11303	11640	pingthread.StepToTarget(true); // true);
11304	11641	// zoomonce = false;
11305	11642	}
..	..	@@ -11354,7 +11691,14 @@
11354	11691
11355	11692	usedtextures.clear();
11356	11693
11357		- BindTextures(DEFAULT_TEXTURES, 2);
	11694	+ try
	11695	+ {
	11696	+ BindTextures(DEFAULT_TEXTURES, 2);
	11697	+ }
	11698	+ catch (Exception e)
	11699	+ {
	11700	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11701	+ }
11358	11702	}
11359	11703	//System.out.println("--> " + stackdepth);
11360	11704	// GrafreeD.traceon();
..	..	@@ -11364,8 +11708,9 @@
11364	11708
11365	11709	if (DrawMode() == DEFAULT)
11366	11710	{
11367		- if (DEBUG)
	11711	+ if (Globals.DEBUG)
11368	11712	{
	11713	+ CreateSelectedPoint();
11369	11714	float radius = 0.05f;
11370	11715	if (selectedpoint.radius != radius)
11371	11716	{
..	..	@@ -11419,20 +11764,32 @@
11419	11764	ReleaseTextures(DEFAULT_TEXTURES);
11420	11765
11421	11766	if (CLEANCACHE)
11422		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11767	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11423	11768	{
11424		- String tex = e.nextElement();
	11769	+ cTexture tex = e.nextElement();
11425	11770
11426	11771	// System.out.println("Texture --------- " + tex);
11427	11772
11428		- if (tex.equals("WHITE_NOISE"))
	11773	+ if (tex.equals("WHITE_NOISE:"))
11429	11774	continue;
11430	11775
11431		- if (!usedtextures.containsKey(tex))
	11776	+ if (!usedtextures.contains(tex))
11432	11777	{
	11778	+ CacheTexture gettex = texturepigment.get(tex);
11433	11779	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11434		- textures.get(tex).texture.dispose();
11435		- textures.remove(tex);
	11780	+ if (gettex != null)
	11781	+ {
	11782	+ gettex.texture.dispose();
	11783	+ texturepigment.remove(tex);
	11784	+ }
	11785	+
	11786	+ gettex = texturebump.get(tex);
	11787	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11788	+ if (gettex != null)
	11789	+ {
	11790	+ gettex.texture.dispose();
	11791	+ texturebump.remove(tex);
	11792	+ }
11436	11793	}
11437	11794	}
11438	11795	}
..	..	@@ -11445,7 +11802,14 @@
11445	11802	if (checker != null && DrawMode() == DEFAULT)
11446	11803	{
11447	11804	//BindTexture(IMMORTAL_TEXTURE);
11448		- BindTextures(checker.GetTextures(), checker.texres);
	11805	+ try
	11806	+ {
	11807	+ BindTextures(checker.GetTextures(), checker.texres);
	11808	+ }
	11809	+ catch (Exception e)
	11810	+ {
	11811	+ System.err.println("FAILED: " + checker.GetTextures());
	11812	+ }
11449	11813	// NEAREST
11450	11814	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11451	11815	DrawChecker(gl);
..	..	@@ -11527,7 +11891,7 @@
11527	11891	return;
11528	11892	}
11529	11893
11530		- String string = obj.GetToolTip();
	11894	+ String string = obj.toString(); //.GetToolTip();
11531	11895
11532	11896	GL gl = GetGL();
11533	11897
..	..	@@ -11844,8 +12208,8 @@
11844	12208	//obj.TransformToWorld(light, light);
11845	12209	for (int i = tp.size(); --i >= 0;)
11846	12210	{
11847		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11848		- LA.xformPos(light, tp.get(i).toParent, light);
	12211	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12212	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11849	12213	}
11850	12214
11851	12215
..	..	@@ -11862,8 +12226,8 @@
11862	12226	parentcam = cameras[0];
11863	12227	}
11864	12228
11865		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11866		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12229	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12230	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11867	12231
11868	12232	LA.xformPos(light, renderCamera.toScreen, light);
11869	12233
..	..	@@ -12477,8 +12841,8 @@
12477	12841
12478	12842	// display shadow only (bump == 0)
12479	12843	"SUB temp.x, half.x, shadow.x;" +
12480		- "MOV temp.y, -params6.x;" +
12481		- "SLT temp.z, temp.y, zero.x;" +
	12844	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12845	+ "SLT temp.z, temp.y, -one2048th.x;" +
12482	12846	"SUB temp.y, one.x, temp.z;" +
12483	12847	"MUL temp.x, temp.x, temp.y;" +
12484	12848	"KIL temp.x;" +
..	..	@@ -12809,7 +13173,7 @@
12809	13173	//once = true;
12810	13174	}
12811	13175
12812		- System.out.print("Program #" + mode + "; length = " + program.length());
	13176	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12813	13177	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12814	13178	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12815	13179
..	..	@@ -12942,12 +13306,16 @@
12942	13306
12943	13307	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12944	13308	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13309	+
	13310	+ // Compare fragment depth in light space with shadowmap.
12945	13311	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12946	13312	"SGE temp.y, temp.x, zero.x;" +
12947		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13313	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13314	+
	13315	+ // Reverse comparison
12948	13316	"SUB temp.x, one.x, temp.x;" +
12949	13317	"MUL " + shadow + ".x, temp.x, temp.y;" +
12950		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13318	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12951	13319	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12952	13320
12953	13321	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12961,6 +13329,10 @@
12961	13329	// No shadow for backface
12962	13330	"DP3 temp.x, normal, lightd;" +
12963	13331	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13332	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13333	+
	13334	+ // No shadow when out of frustrum
	13335	+ "SGE temp.x, " + depth + ".z, one.z;" +
12964	13336	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12965	13337	"";
12966	13338	}
..	..	@@ -13107,7 +13479,8 @@
13107	13479	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13108	13480	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13109	13481	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13110		- Object3D.cVector2[] vector2buffer;
	13482	+
	13483	+ //Object3D.cVector2[] vector2buffer;
13111	13484
13112	13485	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13113	13486	// OUT : diff, spec
..	..	@@ -13123,9 +13496,10 @@
13123	13496	"DP3 " + dest + ".z," + "normals," + "eye;" +
13124	13497	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13125	13498	//"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;" +
	13499	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13500	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13501	+
	13502	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13129	13503	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13130	13504	"RCP " + dest + ".w," + dest + ".w;" +
13131	13505	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13630,6 +14004,7 @@
13630	14004	else
13631	14005	if (evt.getSource() == AAtimer)
13632	14006	{
	14007	+ Globals.TIMERRUNNING = false;
13633	14008	if (mouseDown)
13634	14009	{
13635	14010	//new Exception().printStackTrace();
..	..	@@ -13655,6 +14030,10 @@
13655	14030	// LIVE = waslive;
13656	14031	// wasliveok = true;
13657	14032	// waslive = false;
	14033	+
	14034	+ // May 2019 Forget it:
	14035	+ if (true)
	14036	+ return;
13658	14037
13659	14038	// source == timer
13660	14039	if (mouseDown)
..	..	@@ -13685,7 +14064,7 @@
13685	14064
13686	14065	// fev 2014???
13687	14066	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13688		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14067	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13689	14068	pingthread.StepToTarget(true); // true);
13690	14069	}
13691	14070	// if (!LIVE)
..	..	@@ -13700,6 +14079,7 @@
13700	14079	return;
13701	14080
13702	14081	AAtimer.restart(); //
	14082	+ Globals.TIMERRUNNING = true;
13703	14083
13704	14084	// waslive = LIVE;
13705	14085	// LIVE = false;
..	..	@@ -13772,9 +14152,12 @@
13772	14152
13773	14153	public void mouseDragged(MouseEvent e)
13774	14154	{
	14155	+ Globals.MOUSEDRAGGED = true;
	14156	+
13775	14157	//System.out.println("mouseDragged: " + e);
13776	14158	if (isRenderer)
13777	14159	movingcamera = true;
	14160	+
13778	14161	//if (drawing)
13779	14162	//return;
13780	14163	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -14035,12 +14418,12 @@
14035	14418	void GoDown(int mod)
14036	14419	{
14037	14420	MODIFIERS \|= COMMAND;
14038		- /*
	14421	+ /**/
14039	14422	if((mod&SHIFT) == SHIFT)
14040	14423	manipCamera.RotatePosition(0, -speed);
14041	14424	else
14042		- manipCamera.BackForth(0, -speed*delta, getWidth());
14043		- */
	14425	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14426	+ /**/
14044	14427	if ((mod & SHIFT) == SHIFT)
14045	14428	{
14046	14429	mouseMode = mouseMode; // VR??
..	..	@@ -14056,12 +14439,12 @@
14056	14439	void GoUp(int mod)
14057	14440	{
14058	14441	MODIFIERS \|= COMMAND;
14059		- /*
	14442	+ /**/
14060	14443	if((mod&SHIFT) == SHIFT)
14061	14444	manipCamera.RotatePosition(0, speed);
14062	14445	else
14063		- manipCamera.BackForth(0, speed*delta, getWidth());
14064		- */
	14446	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14447	+ /**/
14065	14448	if ((mod & SHIFT) == SHIFT)
14066	14449	{
14067	14450	mouseMode = mouseMode;
..	..	@@ -14077,12 +14460,12 @@
14077	14460	void GoLeft(int mod)
14078	14461	{
14079	14462	MODIFIERS \|= COMMAND;
14080		- /*
	14463	+ /**/
14081	14464	if((mod&SHIFT) == SHIFT)
14082		- manipCamera.RotatePosition(speed, 0);
14083		- else
14084	14465	manipCamera.Translate(speed*delta, 0, getWidth());
14085		- */
	14466	+ else
	14467	+ manipCamera.RotatePosition(speed, 0);
	14468	+ /**/
14086	14469	if ((mod & SHIFT) == SHIFT)
14087	14470	{
14088	14471	mouseMode = mouseMode;
..	..	@@ -14098,12 +14481,12 @@
14098	14481	void GoRight(int mod)
14099	14482	{
14100	14483	MODIFIERS \|= COMMAND;
14101		- /*
	14484	+ /**/
14102	14485	if((mod&SHIFT) == SHIFT)
14103		- manipCamera.RotatePosition(-speed, 0);
14104		- else
14105	14486	manipCamera.Translate(-speed*delta, 0, getWidth());
14106		- */
	14487	+ else
	14488	+ manipCamera.RotatePosition(-speed, 0);
	14489	+ /**/
14107	14490	if ((mod & SHIFT) == SHIFT)
14108	14491	{
14109	14492	mouseMode = mouseMode;
..	..	@@ -14160,7 +14543,8 @@
14160	14543	info.camera = renderCamera;
14161	14544	info.x = x;
14162	14545	info.y = y;
14163		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14546	+ object.GetWindow().copy
	14547	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14164	14548	} else
14165	14549	{
14166	14550	if (x < startX)
..	..	@@ -14324,7 +14708,9 @@
14324	14708	ci.camera = renderCamera;
14325	14709	if (!isRenderer)
14326	14710	{
14327		- if (object.editWindow.copy.doEditClick(ci, 0))
	14711	+ //ObjEditor editWindow = object.editWindow;
	14712	+ //Object3D copy = editWindow.copy;
	14713	+ if (object.doEditClick(ci, 0))
14328	14714	{
14329	14715	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14330	14716	} else
..	..	@@ -14336,7 +14722,11 @@
14336	14722
14337	14723	public void mouseReleased(MouseEvent e)
14338	14724	{
	14725	+ Globals.MOUSEDRAGGED = false;
	14726	+
14339	14727	movingcamera = false;
	14728	+ X = 0; // getBounds().width/2;
	14729	+ Y = 0; // getBounds().height/2;
14340	14730	//System.out.println("mouseReleased: " + e);
14341	14731	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14342	14732	}
..	..	@@ -14359,7 +14749,7 @@
14359	14749	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14360	14750	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14361	14751
14362		- if (control \|\| command \|\| IsFrozen())
	14752	+// No delay if (control \|\| command \|\| IsFrozen())
14363	14753	timeout = true;
14364	14754	// ?? May 2019 else
14365	14755	// timer.setDelay((modifiers & 128) != 0?0:350);
..	..	@@ -14592,7 +14982,8 @@
14592	14982	// break;
14593	14983	case 'T':
14594	14984	CACHETEXTURE ^= true;
14595		- textures.clear();
	14985	+ texturepigment.clear();
	14986	+ texturebump.clear();
14596	14987	// repaint();
14597	14988	break;
14598	14989	case 'Y':
..	..	@@ -14677,7 +15068,9 @@
14677	15068	case 'E' : COMPACT ^= true;
14678	15069	repaint();
14679	15070	break;
14680		- case 'W' : DEBUGHSB ^= true;
	15071	+ case 'W' : // Wide Window (fullscreen)
	15072	+ //DEBUGHSB ^= true;
	15073	+ ObjEditor.theFrame.ToggleFullScreen();
14681	15074	repaint();
14682	15075	break;
14683	15076	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14702,8 +15095,8 @@
14702	15095	RevertCamera();
14703	15096	repaint();
14704	15097	break;
14705		- case 'L':
14706	15098	case 'l':
	15099	+ //case 'L':
14707	15100	if (lightMode)
14708	15101	{
14709	15102	lightMode = false;
..	..	@@ -14846,9 +15239,9 @@
14846	15239	case '_':
14847	15240	kompactbit = 5;
14848	15241	break;
14849		- case '+':
14850		- kompactbit = 6;
14851		- break;
	15242	+// case '+':
	15243	+// kompactbit = 6;
	15244	+// break;
14852	15245	case ' ':
14853	15246	lightMode ^= true;
14854	15247	Globals.lighttouched = true;
..	..	@@ -14860,13 +15253,14 @@
14860	15253	case ESC:
14861	15254	RENDERPROGRAM += 1;
14862	15255	RENDERPROGRAM %= 3;
	15256	+
14863	15257	repaint();
14864	15258	break;
14865	15259	case 'Z':
14866	15260	//RESIZETEXTURE ^= true;
14867	15261	//break;
14868	15262	case 'z':
14869		- RENDERSHADOW ^= true;
	15263	+ Globals.RENDERSHADOW ^= true;
14870	15264	Globals.lighttouched = true;
14871	15265	repaint();
14872	15266	break;
..	..	@@ -14899,8 +15293,9 @@
14899	15293	case DELETE:
14900	15294	ClearSelection();
14901	15295	break;
14902		- /*
14903	15296	case '+':
	15297	+
	15298	+ /*
14904	15299	//fontsize += 1;
14905	15300	bbzoom *= 2;
14906	15301	repaint();
..	..	@@ -14917,17 +15312,17 @@
14917	15312	case '=':
14918	15313	IncDepth();
14919	15314	//fontsize += 1;
14920		- object.editWindow.refreshContents(true);
	15315	+ object.GetWindow().refreshContents(true);
14921	15316	maskbit = 6;
14922	15317	break;
14923	15318	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14924	15319	DecDepth();
14925	15320	maskbit = 5;
14926	15321	//if(fontsize > 1) fontsize -= 1;
14927		- if (object.editWindow == null)
14928		- new Exception().printStackTrace();
14929		- else
14930		- object.editWindow.refreshContents(true);
	15322	+// if (object.editWindow == null)
	15323	+// new Exception().printStackTrace();
	15324	+// else
	15325	+ object.GetWindow().refreshContents(true);
14931	15326	break;
14932	15327	case '{':
14933	15328	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15151,7 +15546,7 @@
15151	15546	}
15152	15547	*/
15153	15548
15154		- object.editWindow.EditSelection();
	15549	+ object.GetWindow().EditSelection(false);
15155	15550	}
15156	15551
15157	15552	void SelectParent()
..	..	@@ -15168,10 +15563,10 @@
15168	15563	{
15169	15564	//selectees.remove(i);
15170	15565	System.out.println("select parent of " + elem);
15171		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15566	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15172	15567	} else
15173	15568	{
15174		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15569	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15175	15570	}
15176	15571
15177	15572	first = false;
..	..	@@ -15213,12 +15608,12 @@
15213	15608	for (int j = 0; j < group.children.size(); j++)
15214	15609	{
15215	15610	elem = (Object3D) group.children.elementAt(j);
15216		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15611	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15217	15612	first = false;
15218	15613	}
15219	15614	} else
15220	15615	{
15221		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15616	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15222	15617	}
15223	15618
15224	15619	first = false;
..	..	@@ -15229,21 +15624,21 @@
15229	15624	{
15230	15625	//Composite group = (Composite) object;
15231	15626	Object3D group = object;
15232		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15627	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15233	15628	}
15234	15629
15235	15630	void ResetTransform(int mask)
15236	15631	{
15237	15632	//Composite group = (Composite) object;
15238	15633	Object3D group = object;
15239		- group.editWindow.ResetTransform(mask);
	15634	+ group.GetWindow().ResetTransform(mask);
15240	15635	}
15241	15636
15242	15637	void FlipTransform()
15243	15638	{
15244	15639	//Composite group = (Composite) object;
15245	15640	Object3D group = object;
15246		- group.editWindow.FlipTransform();
	15641	+ group.GetWindow().FlipTransform();
15247	15642	// group.editWindow.ReduceMesh(true);
15248	15643	}
15249	15644
..	..	@@ -15251,7 +15646,7 @@
15251	15646	{
15252	15647	//Composite group = (Composite) object;
15253	15648	Object3D group = object;
15254		- group.editWindow.PrintMemory();
	15649	+ group.GetWindow().PrintMemory();
15255	15650	// group.editWindow.ReduceMesh(true);
15256	15651	}
15257	15652
..	..	@@ -15259,7 +15654,7 @@
15259	15654	{
15260	15655	//Composite group = (Composite) object;
15261	15656	Object3D group = object;
15262		- group.editWindow.ResetCentroid();
	15657	+ group.GetWindow().ResetCentroid();
15263	15658	}
15264	15659
15265	15660	void IncDepth()
..	..	@@ -15345,7 +15740,9 @@
15345	15740	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15346	15741	//Image img = CreateImage(width, height);
15347	15742	//System.out.println("width = " + width + "; height = " + height + "\n");
	15743	+
15348	15744	Graphics gr = g; // img.getGraphics();
	15745	+
15349	15746	if (!hasMarquee)
15350	15747	{
15351	15748	if (Xmin < Xmax) // !locked)
..	..	@@ -15433,6 +15830,7 @@
15433	15830	info.bounds.y += (height - desired) / 2;
15434	15831	}
15435	15832	}
	15833	+
15436	15834	info.g = gr;
15437	15835	info.camera = renderCamera;
15438	15836	/*
..	..	@@ -15442,15 +15840,55 @@
15442	15840	*/
15443	15841	if (!isRenderer)
15444	15842	{
15445		- object.drawEditHandles(info, 0);
	15843	+ Grafreed.Assert(object != null);
	15844	+ Grafreed.Assert(object.selection != null);
	15845	+ if (object.selection.Size() > 0)
	15846	+ {
	15847	+ int hitSomething = object.selection.get(0).hitSomething;
	15848	+
	15849	+ info.DX = 0;
	15850	+ info.DY = 0;
	15851	+ info.W = 1;
	15852	+ if (hitSomething == Object3D.hitCenter)
	15853	+ {
	15854	+ info.DX = X;
	15855	+ if (X != 0)
	15856	+ info.DX -= info.bounds.width/2;
	15857	+
	15858	+ info.DY = Y;
	15859	+ if (Y != 0)
	15860	+ info.DY -= info.bounds.height/2;
	15861	+ }
	15862	+
	15863	+ object.drawEditHandles(info, 0);
	15864	+
	15865	+ if (drag && (X != 0 \|\| Y != 0))
	15866	+ {
	15867	+ switch (hitSomething)
	15868	+ {
	15869	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15870	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15871	+ break;
	15872	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15873	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15874	+ break;
	15875	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15876	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15877	+ break;
	15878	+ }
	15879	+
	15880	+ }
	15881	+ }
15446	15882	}
15447	15883	}
	15884	+
15448	15885	if (isRenderer)
15449	15886	{
15450	15887	//gr.setColor(Color.black);
15451	15888	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15452	15889	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15453	15890	}
	15891	+
15454	15892	if (hasMarquee)
15455	15893	{
15456	15894	gr.setXORMode(Color.white);
..	..	@@ -15857,7 +16295,7 @@
15857	16295	Object3D object;
15858	16296	static Object3D trackedobject;
15859	16297	Camera renderCamera; // Light or Eye (or Occlusion)
15860		- /static/ Camera manipCamera; // Light or Eye
	16298	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15861	16299	/static/ Camera eyeCamera;
15862	16300	/static/ Camera lightCamera;
15863	16301	int cameracount;
..	..	@@ -16142,16 +16580,16 @@
16142	16580	cStatic.objectstack[materialdepth++] = checker;
16143	16581	//System.out.println("material " + material);
16144	16582	//Applet3D.tracein(this, selected);
16145		- vector2buffer = checker.projectedVertices;
	16583	+ //vector2buffer = checker.projectedVertices;
16146	16584
16147	16585	//checker.GetMaterial().Draw(this, false); // true);
16148		- DrawMaterial(checker.GetMaterial(), false); // true);
	16586	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16149	16587
16150	16588	materialdepth -= 1;
16151	16589	if (materialdepth > 0)
16152	16590	{
16153		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16154		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16591	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16592	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16155	16593	}
16156	16594	//checker.GetMaterial().opacity = 1f;
16157	16595	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16237,6 +16675,14 @@
16237	16675	}
16238	16676	}
16239	16677
	16678	+ private Object3D GetFolder()
	16679	+ {
	16680	+ Object3D folder = object.GetWindow().copy;
	16681	+ if (object.GetWindow().copy.selection.Size() > 0)
	16682	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16683	+ return folder;
	16684	+ }
	16685	+
16240	16686	class SelectBuffer implements GLEventListener
16241	16687	{
16242	16688
..	..	@@ -16316,6 +16762,17 @@
16316	16762
16317	16763	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16318	16764
	16765	+ if (PAINTMODE)
	16766	+ {
	16767	+ if (object.GetWindow().copy.selection.Size() > 0)
	16768	+ {
	16769	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16770	+
	16771	+ // Make what you paint not selectable.
	16772	+ paintobj.ResetSelectable();
	16773	+ }
	16774	+ }
	16775	+
16319	16776	//int tmp = selection_view;
16320	16777	//selection_view = -1;
16321	16778	int temp = DrawMode();
..	..	@@ -16327,6 +16784,17 @@
16327	16784	// temp = DEFAULT; // patch for selection debug
16328	16785	Globals.drawMode = temp; // WARNING
16329	16786
	16787	+ if (PAINTMODE)
	16788	+ {
	16789	+ if (object.GetWindow().copy.selection.Size() > 0)
	16790	+ {
	16791	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16792	+
	16793	+ // Revert.
	16794	+ paintobj.RestoreSelectable();
	16795	+ }
	16796	+ }
	16797	+
16330	16798	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16331	16799
16332	16800	// trying different ways of getting the depth info over
..	..	@@ -16374,6 +16842,8 @@
16374	16842	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16375	16843	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16376	16844	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16845	+
	16846	+ CreateSelectedPoint();
16377	16847
16378	16848	// Will fit the mesh !!!
16379	16849	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16423,34 +16893,36 @@
16423	16893	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	16894	}
16425	16895
16426		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16896	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16427	16897	}
16428	16898	}
16429	16899
16430	16900	if (!movingcamera && !PAINTMODE)
16431		- object.editWindow.ScreenFitPoint(); // fev 2014
	16901	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16432	16902
16433		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16903	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16434	16904	{
16435		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16905	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16436	16906
16437		- Object3D group = new Object3D("inst" + paintcount++);
	16907	+ if (object.GetWindow().copy.selection.Size() > 0)
	16908	+ {
	16909	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16438	16910
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();
	16911	+ Object3D inst = new Object3D("inst" + paintcount++);
	16912	+
	16913	+ inst.CreateMaterial(); // use a void leaf to select instances
	16914	+
	16915	+ inst.add(paintobj); // link
	16916	+
	16917	+ object.GetWindow().SnapObject(inst);
	16918	+
	16919	+ Object3D folder = paintFolder; // GetFolder();
	16920	+
	16921	+ folder.add(inst);
	16922	+
	16923	+ object.GetWindow().ResetModel();
	16924	+ object.GetWindow().refreshContents();
	16925	+ }
16454	16926	}
16455	16927	else
16456	16928	paintcount = 0;
..	..	@@ -16489,6 +16961,11 @@
16489	16961	//System.out.println("objects[color] = " + objects[color]);
16490	16962	//objects[color].Select();
16491	16963	indexcount = 0;
	16964	+ ObjEditor window = object.GetWindow();
	16965	+ if (window != null && deselect)
	16966	+ {
	16967	+ window.Select(null, deselect, true);
	16968	+ }
16492	16969	object.Select(color, deselect);
16493	16970	}
16494	16971
..	..	@@ -16588,7 +17065,7 @@
16588	17065	gl.glDisable(gl.GL_CULL_FACE);
16589	17066	}
16590	17067
16591		- if (!RENDERSHADOW)
	17068	+ if (!Globals.RENDERSHADOW)
16592	17069	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16593	17070
16594	17071	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16598,7 +17075,7 @@
16598	17075	//gl.glColorMask(false, false, false, false);
16599	17076
16600	17077	//render_scene_from_light_view(gl, drawable, 0, 0);
16601		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17078	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16602	17079	{
16603	17080	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16604	17081
..	..	@@ -17014,23 +17491,15 @@
17014	17491	int AAbuffersize = 0;
17015	17492
17016	17493	//double[] selectedpoint = new double[3];
17017		- static Superellipsoid selectedpoint = new Superellipsoid();
	17494	+ static Superellipsoid selectedpoint;
17018	17495	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();
	17496	+ static Sphere debugpointG;
	17497	+ static Sphere debugpointP;
	17498	+ static Sphere debugpointC;
	17499	+ static Sphere debugpointR;
17023	17500
17024	17501	static Sphere debugpoints[] = new Sphere[8];
17025	17502
17026		- static
17027		- {
17028		- for (int i=0; i<8; i++)
17029		- {
17030		- debugpoints[i] = new Sphere();
17031		- }
17032		- }
17033		-
17034	17503	static void InitPoints(float radius)
17035	17504	{
17036	17505	for (int i=0; i<8; i++)