~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -37,7 +41,6 @@
37	41	static boolean[] selectedstack = new boolean[65536];
38	42	static int materialdepth = 0;
39	43
40		- static boolean DEBUG = false;
41	44	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	45
43	46	// camera change fix
..	..	@@ -45,6 +48,39 @@
45	48	static boolean ABORTED = false;
46	49
47	50	static int STEP = 1;
	51	+
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	53	+ {
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
	83	+ }
48	84
49	85	/static/ private boolean CULLFACE = false; // true;
50	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -61,7 +97,7 @@
61	97	//boolean REDUCETEXTURE = true;
62	98	boolean CACHETEXTURE = true;
63	99	boolean CLEANCACHE = false; // true;
64		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
65	101	boolean COMPRESSTEXTURE = false;
66	102	boolean KOMPACTTEXTURE = false; // true;
67	103	boolean RESIZETEXTURE = false;
..	..	@@ -170,7 +206,8 @@
170	206
171	207	SetCamera(cam);
172	208
173		- SetLight(new Camera(new cVector(10, 10, -20)));
	209	+ // Warning: not used.
	210	+ SetLight(new Camera(new cVector(15, 10, -20)));
174	211
175	212	object = o;
176	213
..	..	@@ -327,7 +364,7 @@
327	364	cStatic.objectstack[materialdepth++] = obj;
328	365	//System.out.println("material " + material);
329	366	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	367	+ //display.vector2buffer = obj.projectedVertices;
331	368	if (obj instanceof Camera)
332	369	{
333	370	display.options1[0] = material.shift;
..	..	@@ -336,14 +373,28 @@
336	373	display.options1[2] = material.shadowbias;
337	374	display.options1[3] = material.aniso;
338	375	display.options1[4] = material.anisoV;
	376	+// System.out.println("display.options1[0] " + display.options1[0]);
	377	+// System.out.println("display.options1[1] " + display.options1[1]);
	378	+// System.out.println("display.options1[2] " + display.options1[2]);
	379	+// System.out.println("display.options1[3] " + display.options1[3]);
	380	+// System.out.println("display.options1[4] " + display.options1[4]);
339	381	display.options2[0] = material.opacity;
340	382	display.options2[1] = material.diffuse;
341	383	display.options2[2] = material.factor;
	384	+// System.out.println("display.options2[0] " + display.options2[0]);
	385	+// System.out.println("display.options2[1] " + display.options2[1]);
	386	+// System.out.println("display.options2[2] " + display.options2[2]);
342	387
343	388	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	389	+// System.out.println("display.options3[0] " + display.options3[0]);
	390	+// System.out.println("display.options3[1] " + display.options3[1]);
	391	+// System.out.println("display.options3[2] " + display.options3[2]);
344	392	display.options4[0] = material.cameralight/0.2f;
345	393	display.options4[1] = material.subsurface;
346	394	display.options4[2] = material.sheen;
	395	+// System.out.println("display.options4[0] " + display.options4[0]);
	396	+// System.out.println("display.options4[1] " + display.options4[1]);
	397	+// System.out.println("display.options4[2] " + display.options4[2]);
347	398
348	399	// if (display.CURRENTANTIALIAS > 0)
349	400	// display.options3[3] /= 4;
..	..	@@ -359,7 +410,7 @@
359	410	/**/
360	411	} else
361	412	{
362		- DrawMaterial(material, selected);
	413	+ DrawMaterial(material, selected, obj.projectedVertices);
363	414	}
364	415	} else
365	416	{
..	..	@@ -383,8 +434,8 @@
383	434	cStatic.objectstack[materialdepth++] = obj;
384	435	//System.out.println("material " + material);
385	436	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	437	+ //display.vector2buffer = obj.projectedVertices;
	438	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	439	}
389	440	}
390	441
..	..	@@ -401,8 +452,8 @@
401	452	materialdepth -= 1;
402	453	if (materialdepth > 0)
403	454	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	455	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	456	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	457	}
407	458	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	459	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +473,8 @@
422	473	materialdepth -= 1;
423	474	if (materialdepth > 0)
424	475	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	476	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	477	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	478	}
428	479	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	480	//else
..	..	@@ -464,10 +515,12 @@
464	515	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	516	{
466	517	//gl.glBegin(gl.GL_TRIANGLES);
467		- boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	518	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	519	+ // TEST LIVE NORMALS && !obj.dontselect
	520	+ ;
468	521	if (!hasnorm)
469	522	{
470		- // System.out.println("FUCK!!");
	523	+ // System.out.println("Mesh normal");
471	524	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	525	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	526	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1192,10 +1245,12 @@
1192	1245	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1246	}
1194	1247	}
	1248	+
1195	1249	if (flipV)
1196	1250	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1251	else
1198	1252	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1253	+
1199	1254	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1255	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1256
..	..	@@ -1215,10 +1270,12 @@
1215	1270	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1271	}
1217	1272	}
	1273	+
1218	1274	if (flipV)
1219	1275	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1276	else
1221	1277	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1278	+
1222	1279	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1280	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1281
..	..	@@ -1246,8 +1303,10 @@
1246	1303	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1304	else
1248	1305	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1306	+
1249	1307	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1308	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1309	+
1251	1310	count2 += 2;
1252	1311	count3 += 3;
1253	1312	}
..	..	@@ -1603,7 +1662,7 @@
1603	1662	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1663	}
1605	1664
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1665	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1666	{
1608	1667	CameraPane display = this;
1609	1668	//new Exception().printStackTrace();
..	..	@@ -1638,7 +1697,7 @@
1638	1697	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1698	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1699	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1700	+ colorV[3] = 1; // material.opacity;
1642	1701
1643	1702	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1703	//System.out.println("Opacity = " + opacity);
..	..	@@ -1746,9 +1805,9 @@
1746	1805	display.modelParams7[2] = 0;
1747	1806	display.modelParams7[3] = 0;
1748	1807
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1808	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1809
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1810	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1811	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1812	{
1754	1813	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -2044,7 +2103,7 @@
2044	2103	//System.err.println("Oeil on");
2045	2104	OEIL = true;
2046	2105	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2106	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2048	2107	//pingthread.StepToTarget(true);
2049	2108	}
2050	2109
..	..	@@ -2259,7 +2318,7 @@
2259	2318
2260	2319	void ToggleDebug()
2261	2320	{
2262		- DEBUG ^= true;
	2321	+ Globals.DEBUG ^= true;
2263	2322	}
2264	2323
2265	2324	void ToggleLookAt()
..	..	@@ -2277,10 +2336,17 @@
2277	2336	HANDLES ^= true;
2278	2337	}
2279	2338
	2339	+ Object3D paintFolder;
	2340	+
2280	2341	void TogglePaint()
2281	2342	{
2282	2343	PAINTMODE ^= true;
2283	2344	paintcount = 0;
	2345	+
	2346	+ if (PAINTMODE)
	2347	+ {
	2348	+ paintFolder = GetFolder();
	2349	+ }
2284	2350	}
2285	2351
2286	2352	void SwapCamera(int a, int b)
..	..	@@ -2377,6 +2443,21 @@
2377	2443	return currentGL;
2378	2444	}
2379	2445
	2446	+ static private BufferedImage CreateBim(TextureData texturedata)
	2447	+ {
	2448	+ Grafreed.Assert(texturedata != null);
	2449	+
	2450	+ int width = texturedata.getWidth();
	2451	+ int height = texturedata.getHeight();
	2452	+
	2453	+ Buffer buffer = texturedata.getBuffer();
	2454	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2455	+
	2456	+ byte[] bytes = bytebuf.array();
	2457	+
	2458	+ return CreateBim(bytes, width, height);
	2459	+ }
	2460	+
2380	2461	/**/
2381	2462	class CacheTexture
2382	2463	{
..	..	@@ -2385,28 +2466,31 @@
2385	2466
2386	2467	int resolution;
2387	2468
2388		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2469	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2389	2470	{
2390		- texture = tex;
	2471	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2472	+ texturedata = texdata;
2391	2473	resolution = res;
2392	2474	}
2393	2475	}
2394	2476	/**/
2395	2477
2396	2478	// TEXTURE static Texture texture;
2397		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2398		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2399		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2479	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2480	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2481	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2482	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2483	+
2400	2484	int pigmentdepth = 0;
2401	2485	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2486	int bumpdepth = 0;
2403	2487	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2404	2488	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2405	2489	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2406		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2490	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2407	2491	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2408	2492
2409		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2493	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2410	2494	{
2411	2495	TextureData texturedata = null;
2412	2496
..	..	@@ -2425,13 +2509,34 @@
2425	2509	if (bump)
2426	2510	texturedata = ConvertBump(texturedata, false);
2427	2511
2428		- com.sun.opengl.util.texture.Texture texture =
2429		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2512	+// com.sun.opengl.util.texture.Texture texture =
	2513	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2430	2514
2431		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2432		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2515	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2516	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2433	2517
2434		- return texture;
	2518	+ return texturedata;
	2519	+ }
	2520	+
	2521	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2522	+ {
	2523	+ TextureData texturedata = null;
	2524	+
	2525	+ try
	2526	+ {
	2527	+ texturedata =
	2528	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2529	+ bim,
	2530	+ true);
	2531	+ } catch (Exception e)
	2532	+ {
	2533	+ throw new javax.media.opengl.GLException(e);
	2534	+ }
	2535	+
	2536	+ if (bump)
	2537	+ texturedata = ConvertBump(texturedata, false);
	2538	+
	2539	+ return texturedata;
2435	2540	}
2436	2541
2437	2542	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3504,6 +3609,8 @@
3504	3609
3505	3610	System.out.println("LOADING TEXTURE : " + name);
3506	3611
	3612	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3613	+
3507	3614	//
3508	3615	if (false) // compressbit > 0)
3509	3616	{
..	..	@@ -7902,7 +8009,7 @@
7902	8009	String pigment = Object3D.GetPigment(tex);
7903	8010	String bump = Object3D.GetBump(tex);
7904	8011
7905		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8012	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7906	8013	{
7907	8014	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7908	8015	// System.out.println("; bump = " + bump);
..	..	@@ -7917,8 +8024,8 @@
7917	8024	pigment = null;
7918	8025	}
7919	8026
7920		- ReleaseTexture(bump, true);
7921		- ReleaseTexture(pigment, false);
	8027	+ ReleaseTexture(tex, true);
	8028	+ ReleaseTexture(tex, false);
7922	8029	}
7923	8030
7924	8031	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7936,7 +8043,7 @@
7936	8043
7937	8044	String pigment = Object3D.GetPigment(tex);
7938	8045
7939		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8046	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7940	8047	{
7941	8048	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7942	8049	// System.out.println("; bump = " + bump);
..	..	@@ -7947,7 +8054,7 @@
7947	8054	pigment = null;
7948	8055	}
7949	8056
7950		- ReleaseTexture(pigment, false);
	8057	+ ReleaseTexture(tex, false);
7951	8058	}
7952	8059
7953	8060	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -7965,7 +8072,7 @@
7965	8072
7966	8073	String bump = Object3D.GetBump(tex);
7967	8074
7968		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8075	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7969	8076	{
7970	8077	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7971	8078	// System.out.println("; bump = " + bump);
..	..	@@ -7976,10 +8083,10 @@
7976	8083	bump = null;
7977	8084	}
7978	8085
7979		- ReleaseTexture(bump, true);
	8086	+ ReleaseTexture(tex, true);
7980	8087	}
7981	8088
7982		- void ReleaseTexture(String tex, boolean bump)
	8089	+ void ReleaseTexture(cTexture tex, boolean bump)
7983	8090	{
7984	8091	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7985	8092	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7990,7 +8097,7 @@
7990	8097	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7991	8098
7992	8099	if (tex != null)
7993		- texture = textures.get(tex);
	8100	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7994	8101
7995	8102	// //assert( texture != null );
7996	8103	// if (texture == null)
..	..	@@ -8084,47 +8191,50 @@
8084	8191
8085	8192	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8086	8193	{
8087		- if (// DrawMode() != 0 \|\| /tex == null \|\|/
8088		- ambientOcclusion ) // \|\| !textureon)
8089		- {
8090		- return; // false;
8091		- }
8092		-
8093		- if (tex == null)
8094		- {
8095		- BindTexture(null,false,resolution);
8096		- BindTexture(null,true,resolution);
8097		- return;
8098		- }
	8194	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8195	+// ambientOcclusion ) // \|\| !textureon)
	8196	+// {
	8197	+// return; // false;
	8198	+// }
	8199	+//
	8200	+// if (tex == null)
	8201	+// {
	8202	+// BindTexture(null,false,resolution);
	8203	+// BindTexture(null,true,resolution);
	8204	+// return;
	8205	+// }
	8206	+//
	8207	+// String pigment = Object3D.GetPigment(tex);
	8208	+// String bump = Object3D.GetBump(tex);
	8209	+//
	8210	+// usedtextures.add(pigment);
	8211	+// usedtextures.add(bump);
	8212	+//
	8213	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8214	+// {
	8215	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8216	+// // System.out.println("; bump = " + bump);
	8217	+// }
	8218	+//
	8219	+// if (bump.equals(""))
	8220	+// {
	8221	+// bump = null;
	8222	+// }
	8223	+// if (pigment.equals(""))
	8224	+// {
	8225	+// pigment = null;
	8226	+// }
	8227	+//
	8228	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8229	+// BindTexture(pigment, false, resolution);
	8230	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8231	+// BindTexture(bump, true, resolution);
	8232	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8233	+//
	8234	+// return; // true;
8099	8235
8100		- String pigment = Object3D.GetPigment(tex);
8101		- String bump = Object3D.GetBump(tex);
8102		-
8103		- usedtextures.put(pigment, pigment);
8104		- usedtextures.put(bump, bump);
8105		-
8106		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8107		- {
8108		- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8109		- // System.out.println("; bump = " + bump);
8110		- }
8111		-
8112		- if (bump.equals(""))
8113		- {
8114		- bump = null;
8115		- }
8116		- if (pigment.equals(""))
8117		- {
8118		- pigment = null;
8119		- }
8120		-
8121		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8122		- BindTexture(pigment, false, resolution);
8123		- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8124		- BindTexture(bump, true, resolution);
8125		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8126		-
8127		- return; // true;
	8236	+ BindPigmentTexture(tex, resolution);
	8237	+ BindBumpTexture(tex, resolution);
8128	8238	}
8129	8239
8130	8240	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8143,9 +8253,9 @@
8143	8253
8144	8254	String pigment = Object3D.GetPigment(tex);
8145	8255
8146		- usedtextures.put(pigment, pigment);
	8256	+ usedtextures.add(tex);
8147	8257
8148		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8258	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8149	8259	{
8150	8260	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8151	8261	// System.out.println("; bump = " + bump);
..	..	@@ -8157,7 +8267,7 @@
8157	8267	}
8158	8268
8159	8269	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8160		- BindTexture(pigment, false, resolution);
	8270	+ BindTexture(tex, false, resolution);
8161	8271	}
8162	8272
8163	8273	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8176,9 +8286,9 @@
8176	8286
8177	8287	String bump = Object3D.GetBump(tex);
8178	8288
8179		- usedtextures.put(bump, bump);
	8289	+ usedtextures.add(tex);
8180	8290
8181		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8291	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8182	8292	{
8183	8293	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8184	8294	// System.out.println("; bump = " + bump);
..	..	@@ -8190,7 +8300,7 @@
8190	8300	}
8191	8301
8192	8302	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8193		- BindTexture(bump, true, resolution);
	8303	+ BindTexture(tex, true, resolution);
8194	8304	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8195	8305	}
8196	8306
..	..	@@ -8214,13 +8324,19 @@
8214	8324	return fileExists;
8215	8325	}
8216	8326
8217		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8327	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8218	8328	{
8219		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8329	+ CacheTexture texturecache = null;
8220	8330
8221	8331	if (tex != null)
8222	8332	{
8223		- String texname = tex;
	8333	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8334	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8335	+
	8336	+ if (texname.equals("") && texdata == null)
	8337	+ {
	8338	+ return null;
	8339	+ }
8224	8340
8225	8341	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8226	8342
..	..	@@ -8230,19 +8346,46 @@
8230	8346	// else
8231	8347	// if (!texname.startsWith("/"))
8232	8348	// texname = "/Users/nbriere/Textures/" + texname;
8233		- if (!FileExists(tex))
	8349	+ if (!FileExists(texname))
8234	8350	{
8235	8351	texname = fallbackTextureName;
8236	8352	}
8237	8353
8238	8354	if (CACHETEXTURE)
8239		- texture = textures.get(texname); // TEXTURE CACHE
8240		-
8241		- TextureData texturedata = null;
8242		-
8243		- if (texture == null \|\| texture.resolution < resolution)
8244	8355	{
8245		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8356	+ if (texdata == null)
	8357	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8358	+ else
	8359	+ texturecache = bimtextures.get(texdata);
	8360	+ }
	8361	+
	8362	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8363	+ {
	8364	+ TextureData texturedata = null;
	8365	+
	8366	+ if (texdata != null && textureon)
	8367	+ {
	8368	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8369	+
	8370	+ try
	8371	+ {
	8372	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8373	+ }
	8374	+ catch (Exception e)
	8375	+ {
	8376	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8377	+ }
	8378	+
	8379	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8380	+ bimtextures.put(texdata, texturecache);
	8381	+
	8382	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8383	+
	8384	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8385	+ //bim2 = bim;
	8386	+ }
	8387	+ else
	8388	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8246	8389	{
8247	8390	assert(!bump);
8248	8391	// if (bump)
..	..	@@ -8253,19 +8396,23 @@
8253	8396	// }
8254	8397	// else
8255	8398	// {
8256		- texture = textures.get(tex);
8257		- if (texture == null)
	8399	+ // texturecache = textures.get(texname); // suspicious
	8400	+ if (texturecache == null)
8258	8401	{
8259		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8402	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8260	8403	}
	8404	+ else
	8405	+ new Exception().printStackTrace();
8261	8406	// }
8262	8407	} else
8263		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8408	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8264	8409	{
8265	8410	assert(bump);
8266		- texture = textures.get(tex);
8267		- if (texture == null)
8268		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
	8413	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ else
	8415	+ new Exception().printStackTrace();
8269	8416	} else
8270	8417	{
8271	8418	//if (tex.equals("IMMORTAL"))
..	..	@@ -8273,11 +8420,13 @@
8273	8420	// texture = GetResourceTexture("default.png");
8274	8421	//} else
8275	8422	//{
8276		- if (tex.equals("WHITE_NOISE"))
	8423	+ if (texname.endsWith("WHITE_NOISE"))
8277	8424	{
8278		- texture = textures.get(tex);
8279		- if (texture == null)
8280		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8425	+ // texturecache = textures.get(texname); // suspicious
	8426	+ if (texturecache == null)
	8427	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8428	+ else
	8429	+ new Exception().printStackTrace();
8281	8430	} else
8282	8431	{
8283	8432	if (textureon)
..	..	@@ -8336,19 +8485,19 @@
8336	8485	if (texturedata == null)
8337	8486	throw new Exception();
8338	8487
8339		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8488	+ texturecache = new CacheTexture(texturedata,resolution);
8340	8489	//texture = GetTexture(tex, bump);
8341	8490	}
8342	8491	}
8343	8492	//}
8344	8493	}
8345	8494
8346		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8495	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8347	8496	{
8348	8497	//return false;
8349	8498
8350	8499	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8351		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8500	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8352	8501	{
8353	8502	// String ext = "_highres";
8354	8503	// if (REDUCETEXTURE)
..	..	@@ -8365,52 +8514,17 @@
8365	8514	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8366	8515	if (!cachefile.exists())
8367	8516	{
8368		- // cache to disk
8369		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8370		- //buffers[0].
8371		-
8372		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8373		- int[] pixels = new int[bytebuf.capacity()/3];
8374		-
8375		- // squared size heuristic...
8376		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8517	+ //if (texturedata.getWidth() == texturedata.getHeight())
8377	8518	{
8378		- for (int i=pixels.length; --i>=0;)
8379		- {
8380		- int i3 = i*3;
8381		- pixels[i] = 0xFF;
8382		- pixels[i] <<= 8;
8383		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8384		- pixels[i] <<= 8;
8385		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8386		- pixels[i] <<= 8;
8387		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8388		- }
8389		-
8390		- /*
8391		- int r=0,g=0,b=0,a=0;
8392		- for (int i=0; i<width; i++)
8393		- for (int j=0; j<height; j++)
8394		- {
8395		- int index = j*width+i;
8396		- int p = pixels[index];
8397		- a = ((p>>24) & 0xFF);
8398		- r = ((p>>16) & 0xFF);
8399		- g = ((p>>8) & 0xFF);
8400		- b = (p & 0xFF);
8401		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8402		- }
8403		- /**/
8404		- int width = (int)Math.sqrt(pixels.length); // squared
8405		- int height = width;
8406		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8407		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8519	+ BufferedImage rendImage = CreateBim(texturedata);
	8520	+
8408	8521	ImageWriter writer = null;
8409	8522	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8410	8523	if (iter.hasNext()) {
8411	8524	writer = (ImageWriter)iter.next();
8412	8525	}
8413		- float compressionQuality = 0.9f;
	8526	+
	8527	+ float compressionQuality = 0.85f;
8414	8528	try
8415	8529	{
8416	8530	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8427,18 +8541,20 @@
8427	8541	}
8428	8542	}
8429	8543	}
8430		-
	8544	+
	8545	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8546	+
8431	8547	//System.out.println("Texture = " + tex);
8432		- if (textures.containsKey(texname))
	8548	+ if (textures.containsKey(tex))
8433	8549	{
8434		- CacheTexture thetex = textures.get(texname);
	8550	+ CacheTexture thetex = textures.get(tex);
8435	8551	thetex.texture.disable();
8436	8552	thetex.texture.dispose();
8437		- textures.remove(texname);
	8553	+ textures.remove(tex);
8438	8554	}
8439	8555
8440		- texture.texturedata = texturedata;
8441		- textures.put(texname, texture);
	8556	+ //texture.texturedata = texturedata;
	8557	+ textures.put(tex, texturecache);
8442	8558
8443	8559	// newtex = true;
8444	8560	}
..	..	@@ -8454,10 +8570,44 @@
8454	8570	}
8455	8571	}
8456	8572
8457		- return texture;
	8573	+ return texturecache;
8458	8574	}
8459	8575
8460		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8576	+ static void EmbedTextures(cTexture tex)
	8577	+ {
	8578	+ if (tex.pigmentdata == null)
	8579	+ {
	8580	+ //String texname = Object3D.GetPigment(tex);
	8581	+
	8582	+ CacheTexture texturecache = texturepigment.get(tex);
	8583	+
	8584	+ if (texturecache != null)
	8585	+ {
	8586	+ tex.pw = texturecache.texturedata.getWidth();
	8587	+ tex.ph = texturecache.texturedata.getHeight();
	8588	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8589	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8590	+ ;
	8591	+ //, tex.pw, tex.ph), 0.5f);
	8592	+ }
	8593	+ }
	8594	+
	8595	+ if (tex.bumpdata == null)
	8596	+ {
	8597	+ //String texname = Object3D.GetBump(tex);
	8598	+
	8599	+ CacheTexture texturecache = texturebump.get(tex);
	8600	+
	8601	+ if (texturecache != null)
	8602	+ {
	8603	+ tex.bw = texturecache.texturedata.getWidth();
	8604	+ tex.bh = texturecache.texturedata.getHeight();
	8605	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8606	+ }
	8607	+ }
	8608	+ }
	8609	+
	8610	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8461	8611	{
8462	8612	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8463	8613
..	..	@@ -8475,21 +8625,21 @@
8475	8625	return texture!=null?texture.texture:null;
8476	8626	}
8477	8627
8478		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8628	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8479	8629	{
8480	8630	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8481	8631
8482	8632	return texture!=null?texture.texturedata:null;
8483	8633	}
8484	8634
8485		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8635	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8486	8636	{
8487	8637	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8488	8638	{
8489	8639	return false;
8490	8640	}
8491	8641
8492		- boolean newtex = false;
	8642	+ //boolean newtex = false;
8493	8643
8494	8644	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8495	8645
..	..	@@ -8521,9 +8671,75 @@
8521	8671	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8522	8672	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8523	8673
8524		- return newtex;
	8674	+ return true; // Warning: not used.
8525	8675	}
8526	8676
	8677	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8678	+ {
	8679	+ try
	8680	+ {
	8681	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8682	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8683	+ ImageWriter writer = writers.next();
	8684	+
	8685	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8686	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8687	+ param.setCompressionQuality(quality);
	8688	+
	8689	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8690	+ writer.setOutput(ios);
	8691	+ writer.write(null, new IIOImage(image, null, null), param);
	8692	+
	8693	+ byte[] data = baos.toByteArray();
	8694	+ writer.dispose();
	8695	+ return data;
	8696	+ }
	8697	+ catch (Exception e)
	8698	+ {
	8699	+ e.printStackTrace();
	8700	+ return null;
	8701	+ }
	8702	+ }
	8703	+
	8704	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8705	+ {
	8706	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8707	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8708	+ ImageReader reader = writers.next();
	8709	+
	8710	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8711	+
	8712	+ ImageReadParam param = reader.getDefaultReadParam();
	8713	+ param.setDestination(bim);
	8714	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8715	+
	8716	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8717	+ reader.setInput(ios);
	8718	+ BufferedImage bim2 = reader.read(0, param);
	8719	+ reader.dispose();
	8720	+
	8721	+// WritableRaster raster = bim2.getRaster();
	8722	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8723	+// byte[] bytes = data.getData();
	8724	+//
	8725	+// int[] pixels = new int[bytes.length/3];
	8726	+// for (int i=pixels.length; --i>=0;)
	8727	+// {
	8728	+// int i3 = i*3;
	8729	+// pixels[i] = 0xFF;
	8730	+// pixels[i] <<= 8;
	8731	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8732	+// pixels[i] <<= 8;
	8733	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8734	+// pixels[i] <<= 8;
	8735	+// pixels[i] \|= bytes[i3] & 0xFF;
	8736	+// }
	8737	+//
	8738	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8739	+
	8740	+ return bim;
	8741	+ }
	8742	+
8527	8743	ShadowBuffer shadowPBuf;
8528	8744	AntialiasBuffer antialiasPBuf;
8529	8745	int MAXSTACK;
..	..	@@ -9359,11 +9575,35 @@
9359	9575	jy8[3] = 0.5f;
9360	9576	}
9361	9577
9362		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9578	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9363	9579	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9364	9580	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9365	9581	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9366	9582
	9583	+ void ResetOptions()
	9584	+ {
	9585	+ options1[0] = 100;
	9586	+ options1[1] = 0.025f;
	9587	+ options1[2] = 0.01f;
	9588	+ options1[3] = 0;
	9589	+ options1[4] = 0;
	9590	+
	9591	+ options2[0] = 0;
	9592	+ options2[1] = 0.75f;
	9593	+ options2[2] = 0;
	9594	+ options2[3] = 0;
	9595	+
	9596	+ options3[0] = 1;
	9597	+ options3[1] = 1;
	9598	+ options3[2] = 1;
	9599	+ options3[3] = 0;
	9600	+
	9601	+ options4[0] = 1;
	9602	+ options4[1] = 0;
	9603	+ options4[2] = 1;
	9604	+ options4[3] = 0;
	9605	+ }
	9606	+
9367	9607	static int imagecount = 0; // movie generation
9368	9608
9369	9609	static int jitter = 0;
..	..	@@ -9460,7 +9700,7 @@
9460	9700
9461	9701	if (renderCamera != lightCamera)
9462	9702	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9463		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9703	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9464	9704
9465	9705	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9466	9706
..	..	@@ -9476,7 +9716,7 @@
9476	9716
9477	9717	if (renderCamera != lightCamera)
9478	9718	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9479		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9719	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9480	9720
9481	9721	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9482	9722
..	..	@@ -10474,6 +10714,7 @@
10474	10714	ANTIALIAS = 0;
10475	10715	//System.out.println("RESTART");
10476	10716	AAtimer.restart();
	10717	+ Globals.TIMERRUNNING = true;
10477	10718	}
10478	10719	}
10479	10720	}
..	..	@@ -10541,7 +10782,8 @@
10541	10782	ambientOcclusion = false;
10542	10783	}
10543	10784
10544		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10785	+ if (//Globals.lighttouched &&
	10786	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10545	10787	{
10546	10788	//if (RENDERSHADOW) // ?
10547	10789	if (!IsFrozen())
..	..	@@ -10675,7 +10917,7 @@
10675	10917	// if (parentcam != renderCamera) // not a light
10676	10918	if (cam != lightCamera)
10677	10919	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10678		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10920	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10679	10921
10680	10922	for (int j = 0; j < 4; j++)
10681	10923	{
..	..	@@ -10690,7 +10932,7 @@
10690	10932	// if (parentcam != renderCamera) // not a light
10691	10933	if (cam != lightCamera)
10692	10934	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10693		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10935	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10694	10936
10695	10937	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10696	10938
..	..	@@ -10981,9 +11223,9 @@
10981	11223
10982	11224	gl.glMatrixMode(GL.GL_MODELVIEW);
10983	11225
10984		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10985		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10986		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11226	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11227	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11228	+gl.glEnable(gl.GL_MULTISAMPLE);
10987	11229	} else
10988	11230	{
10989	11231	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10994,7 +11236,7 @@
10994	11236	//System.out.println("BLENDING ON");
10995	11237	gl.glEnable(GL.GL_BLEND);
10996	11238	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10997		-
	11239	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10998	11240	gl.glMatrixMode(gl.GL_PROJECTION);
10999	11241	gl.glLoadIdentity();
11000	11242
..	..	@@ -11243,7 +11485,7 @@
11243	11485	}
11244	11486	}
11245	11487
11246		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11488	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11247	11489	{
11248	11490	//gl.glDepthFunc(GL.GL_LEQUAL);
11249	11491	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11251,24 +11493,21 @@
11251	11493
11252	11494	boolean texon = textureon;
11253	11495
11254		- if (RENDERPROGRAM > 0)
11255		- {
11256		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11257		- textureon = false;
11258		- }
	11496	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11497	+ textureon = false;
	11498	+
11259	11499	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11260	11500	//System.out.println("ALLO");
11261	11501	gl.glColorMask(false, false, false, false);
11262	11502	DrawObject(gl);
11263		- if (RENDERPROGRAM > 0)
11264		- {
11265		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11266		- textureon = texon;
11267		- }
	11503	+
	11504	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11505	+ textureon = texon;
	11506	+
11268	11507	gl.glColorMask(true, true, true, true);
11269	11508
11270	11509	gl.glDepthFunc(GL.GL_EQUAL);
11271		- //gl.glDepthMask(false);
	11510	+ gl.glDepthMask(false);
11272	11511	}
11273	11512
11274	11513	if (false) // DrawMode() == SHADOW)
..	..	@@ -11451,15 +11690,36 @@
11451	11690
11452	11691	static boolean zoomonce = false;
11453	11692
	11693	+ static void CreateSelectedPoint()
	11694	+ {
	11695	+ if (selectedpoint == null)
	11696	+ {
	11697	+ debugpointG = new Sphere();
	11698	+ debugpointP = new Sphere();
	11699	+ debugpointC = new Sphere();
	11700	+ debugpointR = new Sphere();
	11701	+
	11702	+ selectedpoint = new Superellipsoid();
	11703	+
	11704	+ for (int i=0; i<8; i++)
	11705	+ {
	11706	+ debugpoints[i] = new Sphere();
	11707	+ }
	11708	+ }
	11709	+ }
	11710	+
11454	11711	void DrawObject(GL gl, boolean draw)
11455	11712	{
	11713	+ // To clear camera values
	11714	+ ResetOptions();
	11715	+
11456	11716	//System.out.println("DRAW OBJECT " + mouseDown);
11457	11717	// DrawMode() = SELECTION;
11458	11718	//GL gl = getGL();
11459	11719	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11460	11720	{
11461	11721	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11462		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11722	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11463	11723	pingthread.StepToTarget(true); // true);
11464	11724	// zoomonce = false;
11465	11725	}
..	..	@@ -11531,8 +11791,9 @@
11531	11791
11532	11792	if (DrawMode() == DEFAULT)
11533	11793	{
11534		- if (DEBUG)
	11794	+ if (Globals.DEBUG)
11535	11795	{
	11796	+ CreateSelectedPoint();
11536	11797	float radius = 0.05f;
11537	11798	if (selectedpoint.radius != radius)
11538	11799	{
..	..	@@ -11586,20 +11847,32 @@
11586	11847	ReleaseTextures(DEFAULT_TEXTURES);
11587	11848
11588	11849	if (CLEANCACHE)
11589		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11850	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11590	11851	{
11591		- String tex = e.nextElement();
	11852	+ cTexture tex = e.nextElement();
11592	11853
11593	11854	// System.out.println("Texture --------- " + tex);
11594	11855
11595		- if (tex.equals("WHITE_NOISE"))
	11856	+ if (tex.equals("WHITE_NOISE:"))
11596	11857	continue;
11597	11858
11598		- if (!usedtextures.containsKey(tex))
	11859	+ if (!usedtextures.contains(tex))
11599	11860	{
	11861	+ CacheTexture gettex = texturepigment.get(tex);
11600	11862	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11601		- textures.get(tex).texture.dispose();
11602		- textures.remove(tex);
	11863	+ if (gettex != null)
	11864	+ {
	11865	+ gettex.texture.dispose();
	11866	+ texturepigment.remove(tex);
	11867	+ }
	11868	+
	11869	+ gettex = texturebump.get(tex);
	11870	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11871	+ if (gettex != null)
	11872	+ {
	11873	+ gettex.texture.dispose();
	11874	+ texturebump.remove(tex);
	11875	+ }
11603	11876	}
11604	11877	}
11605	11878	}
..	..	@@ -12019,7 +12292,7 @@
12019	12292	for (int i = tp.size(); --i >= 0;)
12020	12293	{
12021	12294	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12022		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12295	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
12023	12296	}
12024	12297
12025	12298
..	..	@@ -12128,7 +12401,74 @@
12128	12401	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12129	12402
12130	12403	String program =
	12404	+ // Min shader
12131	12405	"!!ARBfp1.0\n" +
	12406	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12407	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12408	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12409	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12410	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12411	+ "PARAM light2cam0 = program.env[10];" +
	12412	+ "PARAM light2cam1 = program.env[11];" +
	12413	+ "PARAM light2cam2 = program.env[12];" +
	12414	+ "TEMP temp;" +
	12415	+ "TEMP light;" +
	12416	+ "TEMP ndotl;" +
	12417	+ "TEMP normal;" +
	12418	+ "TEMP depth;" +
	12419	+ "TEMP eye;" +
	12420	+ "TEMP pos;" +
	12421	+
	12422	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12423	+ Normalize("normal") +
	12424	+ "MOV light, state.light[0].position;" +
	12425	+ "DP3 ndotl.x, light, normal;" +
	12426	+
	12427	+ // shadow
	12428	+ "MOV pos, fragment.texcoord[1];" +
	12429	+ "MOV temp, pos;" +
	12430	+ ShadowTextureFetch("depth", "temp", "1") +
	12431	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12432	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12433	+
	12434	+ // No shadow when out of frustum
	12435	+ //"SGE temp.y, depth.z, zero123.y;" +
	12436	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12437	+
	12438	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12439	+
	12440	+ // Backlit
	12441	+ "MOV pos.w, zero123.y;" +
	12442	+ "DP4 eye.x, pos, light2cam0;" +
	12443	+ "DP4 eye.y, pos, light2cam1;" +
	12444	+ "DP4 eye.z, pos, light2cam2;" +
	12445	+ Normalize("eye") +
	12446	+
	12447	+ "DP3 ndotl.y, -eye, normal;" +
	12448	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12449	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12450	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12451	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12452	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12453	+
	12454	+ "MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12455	+
	12456	+ // Pigment
	12457	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12458	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12459	+ "MUL temp, temp, ndotl.x;" +
	12460	+
	12461	+ "MUL temp, temp, zero123.z;" +
	12462	+
	12463	+ //"MUL temp, temp, ndotl.y;" +
	12464	+
	12465	+ "MOV temp.w, zero123.y;" + // reset alpha
	12466	+ "MOV result.color, temp;" +
	12467	+ "END";
	12468	+
	12469	+ String program2 =
	12470	+ "!!ARBfp1.0\n" +
	12471	+
12132	12472	//"OPTION ARB_fragment_program_shadow;" +
12133	12473	"PARAM light2cam0 = program.env[10];" +
12134	12474	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12243,8 +12583,7 @@
12243	12583	"TEMP shininess;" +
12244	12584	"\n" +
12245	12585	"MOV texSamp, one;" +
12246		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12247		-
	12586	+
12248	12587	"MOV mapgrid.x, one2048th.x;" +
12249	12588	"MOV temp, fragment.texcoord[1];" +
12250	12589	/*
..	..	@@ -12265,20 +12604,20 @@
12265	12604	"MUL temp, floor, mapgrid.x;" +
12266	12605	//"TEX depth0, temp, texture[1], 2D;" +
12267	12606	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12268		- TextureFetch("depth0", "temp", "1") +
	12607	+ ShadowTextureFetch("depth0", "temp", "1") +
12269	12608	"") +
12270	12609	"ADD temp.x, temp.x, mapgrid.x;" +
12271	12610	//"TEX depth1, temp, texture[1], 2D;" +
12272	12611	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12273		- TextureFetch("depth1", "temp", "1") +
	12612	+ ShadowTextureFetch("depth1", "temp", "1") +
12274	12613	"") +
12275	12614	"ADD temp.y, temp.y, mapgrid.x;" +
12276	12615	//"TEX depth2, temp, texture[1], 2D;" +
12277		- TextureFetch("depth2", "temp", "1") +
	12616	+ ShadowTextureFetch("depth2", "temp", "1") +
12278	12617	"SUB temp.x, temp.x, mapgrid.x;" +
12279	12618	//"TEX depth3, temp, texture[1], 2D;" +
12280	12619	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12281		- TextureFetch("depth3", "temp", "1") +
	12620	+ ShadowTextureFetch("depth3", "temp", "1") +
12282	12621	"") +
12283	12622	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12284	12623	//"MOV params, material;" +
..	..	@@ -12649,7 +12988,7 @@
12649	12988	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12650	12989	"") +
12651	12990
12652		- // display shadow only (bump == 0)
	12991	+ // display shadow only (fakedepth == 0)
12653	12992	"SUB temp.x, half.x, shadow.x;" +
12654	12993	"MOV temp.y, -params5.z;" + // params6.x;" +
12655	12994	"SLT temp.z, temp.y, -one2048th.x;" +
..	..	@@ -13076,25 +13415,26 @@
13076	13415	return out;
13077	13416	}
13078	13417
13079		- String TextureFetch(String dest, String src, String unit)
	13418	+ // Also does frustum culling
	13419	+ String ShadowTextureFetch(String dest, String src, String unit)
13080	13420	{
13081	13421	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13082	13422	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13083	13423	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13424	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13425	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13084	13426	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13085		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13086		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13087		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13088		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13427	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13428	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13089	13429	//"SWZ buffer, temp, w,w,w,w;";
13090		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13430	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13091	13431	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13092	13432	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13093	13433	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13094		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13434	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13095	13435
13096		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13097		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13436	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13437	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13098	13438	}
13099	13439
13100	13440	String Shadow(String depth, String shadow)
..	..	@@ -13141,7 +13481,7 @@
13141	13481	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13142	13482	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13143	13483
13144		- // No shadow when out of frustrum
	13484	+ // No shadow when out of frustum
13145	13485	"SGE temp.x, " + depth + ".z, one.z;" +
13146	13486	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13147	13487	"";
..	..	@@ -13289,7 +13629,8 @@
13289	13629	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13290	13630	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13291	13631	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13292		- Object3D.cVector2[] vector2buffer;
	13632	+
	13633	+ //Object3D.cVector2[] vector2buffer;
13293	13634
13294	13635	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13295	13636	// OUT : diff, spec
..	..	@@ -13305,9 +13646,10 @@
13305	13646	"DP3 " + dest + ".z," + "normals," + "eye;" +
13306	13647	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13307	13648	//"MOV " + dest + ".w," + "normal.z;" +
13308		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13309		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13310		- //"MOV " + dest + ".z," + "params2.w;" +
	13649	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13650	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13651	+
	13652	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13311	13653	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13312	13654	"RCP " + dest + ".w," + dest + ".w;" +
13313	13655	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13812,6 +14154,7 @@
13812	14154	else
13813	14155	if (evt.getSource() == AAtimer)
13814	14156	{
	14157	+ Globals.TIMERRUNNING = false;
13815	14158	if (mouseDown)
13816	14159	{
13817	14160	//new Exception().printStackTrace();
..	..	@@ -13871,7 +14214,7 @@
13871	14214
13872	14215	// fev 2014???
13873	14216	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13874		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14217	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13875	14218	pingthread.StepToTarget(true); // true);
13876	14219	}
13877	14220	// if (!LIVE)
..	..	@@ -13886,6 +14229,7 @@
13886	14229	return;
13887	14230
13888	14231	AAtimer.restart(); //
	14232	+ Globals.TIMERRUNNING = true;
13889	14233
13890	14234	// waslive = LIVE;
13891	14235	// LIVE = false;
..	..	@@ -13935,14 +14279,15 @@
13935	14279	drag = false;
13936	14280	//System.out.println("Mouse DOWN");
13937	14281	editObj = false;
13938		- ClickInfo info = new ClickInfo();
13939		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13940		- info.pane = this;
13941		- info.camera = renderCamera;
13942		- info.x = x;
13943		- info.y = y;
13944		- info.modifiers = modifiersex;
13945		- editObj = object.doEditClick(info, 0);
	14282	+ //ClickInfo info = new ClickInfo();
	14283	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14284	+ object.clickInfo.pane = this;
	14285	+ object.clickInfo.camera = renderCamera;
	14286	+ object.clickInfo.x = x;
	14287	+ object.clickInfo.y = y;
	14288	+ object.clickInfo.modifiers = modifiersex;
	14289	+ editObj = object.doEditClick(//info,
	14290	+ 0);
13946	14291	if (!editObj)
13947	14292	{
13948	14293	hasMarquee = true;
..	..	@@ -14224,12 +14569,12 @@
14224	14569	void GoDown(int mod)
14225	14570	{
14226	14571	MODIFIERS \|= COMMAND;
14227		- /*
	14572	+ /**/
14228	14573	if((mod&SHIFT) == SHIFT)
14229	14574	manipCamera.RotatePosition(0, -speed);
14230	14575	else
14231		- manipCamera.BackForth(0, -speed*delta, getWidth());
14232		- */
	14576	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14577	+ /**/
14233	14578	if ((mod & SHIFT) == SHIFT)
14234	14579	{
14235	14580	mouseMode = mouseMode; // VR??
..	..	@@ -14245,12 +14590,12 @@
14245	14590	void GoUp(int mod)
14246	14591	{
14247	14592	MODIFIERS \|= COMMAND;
14248		- /*
	14593	+ /**/
14249	14594	if((mod&SHIFT) == SHIFT)
14250	14595	manipCamera.RotatePosition(0, speed);
14251	14596	else
14252		- manipCamera.BackForth(0, speed*delta, getWidth());
14253		- */
	14597	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14598	+ /**/
14254	14599	if ((mod & SHIFT) == SHIFT)
14255	14600	{
14256	14601	mouseMode = mouseMode;
..	..	@@ -14266,12 +14611,12 @@
14266	14611	void GoLeft(int mod)
14267	14612	{
14268	14613	MODIFIERS \|= COMMAND;
14269		- /*
	14614	+ /**/
14270	14615	if((mod&SHIFT) == SHIFT)
14271		- manipCamera.RotatePosition(speed, 0);
14272		- else
14273	14616	manipCamera.Translate(speed*delta, 0, getWidth());
14274		- */
	14617	+ else
	14618	+ manipCamera.RotatePosition(speed, 0);
	14619	+ /**/
14275	14620	if ((mod & SHIFT) == SHIFT)
14276	14621	{
14277	14622	mouseMode = mouseMode;
..	..	@@ -14287,12 +14632,12 @@
14287	14632	void GoRight(int mod)
14288	14633	{
14289	14634	MODIFIERS \|= COMMAND;
14290		- /*
	14635	+ /**/
14291	14636	if((mod&SHIFT) == SHIFT)
14292		- manipCamera.RotatePosition(-speed, 0);
14293		- else
14294	14637	manipCamera.Translate(-speed*delta, 0, getWidth());
14295		- */
	14638	+ else
	14639	+ manipCamera.RotatePosition(-speed, 0);
	14640	+ /**/
14296	14641	if ((mod & SHIFT) == SHIFT)
14297	14642	{
14298	14643	mouseMode = mouseMode;
..	..	@@ -14342,14 +14687,16 @@
14342	14687	if (editObj)
14343	14688	{
14344	14689	drag = true;
14345		- ClickInfo info = new ClickInfo();
14346		- info.bounds.setBounds(0, 0,
	14690	+ //ClickInfo info = new ClickInfo();
	14691	+ object.clickInfo.bounds.setBounds(0, 0,
14347	14692	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14348		- info.pane = this;
14349		- info.camera = renderCamera;
14350		- info.x = x;
14351		- info.y = y;
14352		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14693	+ object.clickInfo.pane = this;
	14694	+ object.clickInfo.camera = renderCamera;
	14695	+ object.clickInfo.x = x;
	14696	+ object.clickInfo.y = y;
	14697	+ object //.GetWindow().copy
	14698	+ .doEditDrag(//info,
	14699	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14353	14700	} else
14354	14701	{
14355	14702	if (x < startX)
..	..	@@ -14498,22 +14845,27 @@
14498	14845	}
14499	14846	}
14500	14847
	14848	+// ClickInfo clickInfo = new ClickInfo();
	14849	+
14501	14850	public void mouseMoved(MouseEvent e)
14502	14851	{
14503	14852	//System.out.println("mouseMoved: " + e);
14504	14853	if (isRenderer)
14505	14854	return;
14506	14855
14507		- ClickInfo ci = new ClickInfo();
14508		- ci.x = e.getX();
14509		- ci.y = e.getY();
14510		- ci.modifiers = e.getModifiersEx();
14511		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14512		- ci.pane = this;
14513		- ci.camera = renderCamera;
	14856	+ // Mouse cursor feedback
	14857	+ object.clickInfo.x = e.getX();
	14858	+ object.clickInfo.y = e.getY();
	14859	+ object.clickInfo.modifiers = e.getModifiersEx();
	14860	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14861	+ object.clickInfo.pane = this;
	14862	+ object.clickInfo.camera = renderCamera;
14514	14863	if (!isRenderer)
14515	14864	{
14516		- if (object.editWindow.copy.doEditClick(ci, 0))
	14865	+ //ObjEditor editWindow = object.editWindow;
	14866	+ //Object3D copy = editWindow.copy;
	14867	+ if (object.doEditClick(//clickInfo,
	14868	+ 0))
14517	14869	{
14518	14870	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14519	14871	} else
..	..	@@ -14528,7 +14880,8 @@
14528	14880	Globals.MOUSEDRAGGED = false;
14529	14881
14530	14882	movingcamera = false;
14531		- X = Y = 0;
	14883	+ X = 0; // getBounds().width/2;
	14884	+ Y = 0; // getBounds().height/2;
14532	14885	//System.out.println("mouseReleased: " + e);
14533	14886	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14534	14887	}
..	..	@@ -14784,7 +15137,8 @@
14784	15137	// break;
14785	15138	case 'T':
14786	15139	CACHETEXTURE ^= true;
14787		- textures.clear();
	15140	+ texturepigment.clear();
	15141	+ texturebump.clear();
14788	15142	// repaint();
14789	15143	break;
14790	15144	case 'Y':
..	..	@@ -14869,7 +15223,9 @@
14869	15223	case 'E' : COMPACT ^= true;
14870	15224	repaint();
14871	15225	break;
14872		- case 'W' : DEBUGHSB ^= true;
	15226	+ case 'W' : // Wide Window (fullscreen)
	15227	+ //DEBUGHSB ^= true;
	15228	+ ObjEditor.theFrame.ToggleFullScreen();
14873	15229	repaint();
14874	15230	break;
14875	15231	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14894,8 +15250,8 @@
14894	15250	RevertCamera();
14895	15251	repaint();
14896	15252	break;
14897		- case 'L':
14898	15253	case 'l':
	15254	+ //case 'L':
14899	15255	if (lightMode)
14900	15256	{
14901	15257	lightMode = false;
..	..	@@ -15038,9 +15394,9 @@
15038	15394	case '_':
15039	15395	kompactbit = 5;
15040	15396	break;
15041		- case '+':
15042		- kompactbit = 6;
15043		- break;
	15397	+// case '+':
	15398	+// kompactbit = 6;
	15399	+// break;
15044	15400	case ' ':
15045	15401	lightMode ^= true;
15046	15402	Globals.lighttouched = true;
..	..	@@ -15052,6 +15408,7 @@
15052	15408	case ESC:
15053	15409	RENDERPROGRAM += 1;
15054	15410	RENDERPROGRAM %= 3;
	15411	+
15055	15412	repaint();
15056	15413	break;
15057	15414	case 'Z':
..	..	@@ -15091,8 +15448,9 @@
15091	15448	case DELETE:
15092	15449	ClearSelection();
15093	15450	break;
15094		- /*
15095	15451	case '+':
	15452	+
	15453	+ /*
15096	15454	//fontsize += 1;
15097	15455	bbzoom *= 2;
15098	15456	repaint();
..	..	@@ -15109,17 +15467,17 @@
15109	15467	case '=':
15110	15468	IncDepth();
15111	15469	//fontsize += 1;
15112		- object.editWindow.refreshContents(true);
	15470	+ object.GetWindow().refreshContents(true);
15113	15471	maskbit = 6;
15114	15472	break;
15115	15473	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15116	15474	DecDepth();
15117	15475	maskbit = 5;
15118	15476	//if(fontsize > 1) fontsize -= 1;
15119		- if (object.editWindow == null)
15120		- new Exception().printStackTrace();
15121		- else
15122		- object.editWindow.refreshContents(true);
	15477	+// if (object.editWindow == null)
	15478	+// new Exception().printStackTrace();
	15479	+// else
	15480	+ object.GetWindow().refreshContents(true);
15123	15481	break;
15124	15482	case '{':
15125	15483	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15343,7 +15701,7 @@
15343	15701	}
15344	15702	*/
15345	15703
15346		- object.editWindow.EditSelection();
	15704	+ object.GetWindow().EditSelection(false);
15347	15705	}
15348	15706
15349	15707	void SelectParent()
..	..	@@ -15360,10 +15718,10 @@
15360	15718	{
15361	15719	//selectees.remove(i);
15362	15720	System.out.println("select parent of " + elem);
15363		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15721	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15364	15722	} else
15365	15723	{
15366		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15724	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15367	15725	}
15368	15726
15369	15727	first = false;
..	..	@@ -15405,12 +15763,12 @@
15405	15763	for (int j = 0; j < group.children.size(); j++)
15406	15764	{
15407	15765	elem = (Object3D) group.children.elementAt(j);
15408		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15766	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15409	15767	first = false;
15410	15768	}
15411	15769	} else
15412	15770	{
15413		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15771	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15414	15772	}
15415	15773
15416	15774	first = false;
..	..	@@ -15421,21 +15779,21 @@
15421	15779	{
15422	15780	//Composite group = (Composite) object;
15423	15781	Object3D group = object;
15424		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15782	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15425	15783	}
15426	15784
15427	15785	void ResetTransform(int mask)
15428	15786	{
15429	15787	//Composite group = (Composite) object;
15430	15788	Object3D group = object;
15431		- group.editWindow.ResetTransform(mask);
	15789	+ group.GetWindow().ResetTransform(mask);
15432	15790	}
15433	15791
15434	15792	void FlipTransform()
15435	15793	{
15436	15794	//Composite group = (Composite) object;
15437	15795	Object3D group = object;
15438		- group.editWindow.FlipTransform();
	15796	+ group.GetWindow().FlipTransform();
15439	15797	// group.editWindow.ReduceMesh(true);
15440	15798	}
15441	15799
..	..	@@ -15443,7 +15801,7 @@
15443	15801	{
15444	15802	//Composite group = (Composite) object;
15445	15803	Object3D group = object;
15446		- group.editWindow.PrintMemory();
	15804	+ group.GetWindow().PrintMemory();
15447	15805	// group.editWindow.ReduceMesh(true);
15448	15806	}
15449	15807
..	..	@@ -15451,7 +15809,7 @@
15451	15809	{
15452	15810	//Composite group = (Composite) object;
15453	15811	Object3D group = object;
15454		- group.editWindow.ResetCentroid();
	15812	+ group.GetWindow().ResetCentroid();
15455	15813	}
15456	15814
15457	15815	void IncDepth()
..	..	@@ -15533,8 +15891,6 @@
15533	15891
15534	15892	int width = getBounds().width;
15535	15893	int height = getBounds().height;
15536		- ClickInfo info = new ClickInfo();
15537		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15538	15894	//Image img = CreateImage(width, height);
15539	15895	//System.out.println("width = " + width + "; height = " + height + "\n");
15540	15896
..	..	@@ -15611,48 +15967,77 @@
15611	15967	}
15612	15968	if (object != null && !hasMarquee)
15613	15969	{
	15970	+ if (object.clickInfo == null)
	15971	+ object.clickInfo = new ClickInfo();
	15972	+ ClickInfo info = object.clickInfo;
	15973	+ //ClickInfo info = new ClickInfo();
	15974	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	15975	+
15614	15976	if (isRenderer)
15615	15977	{
15616		- info.flags++;
	15978	+ object.clickInfo.flags++;
15617	15979	double frameAspect = (double) width / (double) height;
15618	15980	if (frameAspect > renderCamera.aspect)
15619	15981	{
15620	15982	int desired = (int) ((double) height * renderCamera.aspect);
15621		- info.bounds.width -= width - desired;
15622		- info.bounds.x += (width - desired) / 2;
	15983	+ object.clickInfo.bounds.width -= width - desired;
	15984	+ object.clickInfo.bounds.x += (width - desired) / 2;
15623	15985	} else
15624	15986	{
15625	15987	int desired = (int) ((double) width / renderCamera.aspect);
15626		- info.bounds.height -= height - desired;
15627		- info.bounds.y += (height - desired) / 2;
	15988	+ object.clickInfo.bounds.height -= height - desired;
	15989	+ object.clickInfo.bounds.y += (height - desired) / 2;
15628	15990	}
15629	15991	}
15630		- info.g = gr;
15631		- info.camera = renderCamera;
	15992	+
	15993	+ object.clickInfo.g = gr;
	15994	+ object.clickInfo.camera = renderCamera;
15632	15995	/*
15633	15996	// Memory intensive (brep.verticescopy)
15634	15997	if (!(object instanceof Composite))
15635	15998	object.draw(info, 0, false); // SLOW :
15636	15999	*/
15637		- if (!isRenderer)
	16000	+ if (!isRenderer) // && drag)
15638	16001	{
15639		- object.drawEditHandles(info, 0);
15640		-
15641		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16002	+ Grafreed.Assert(object != null);
	16003	+ Grafreed.Assert(object.selection != null);
	16004	+ if (object.selection.Size() > 0)
15642	16005	{
15643		- switch (object.selection.get(0).hitSomething)
	16006	+ int hitSomething = object.selection.get(0).hitSomething;
	16007	+
	16008	+ object.clickInfo.DX = 0;
	16009	+ object.clickInfo.DY = 0;
	16010	+ object.clickInfo.W = 1;
	16011	+ if (hitSomething == Object3D.hitCenter)
15644	16012	{
15645		- case Object3D.hitCenter: gr.setColor(Color.pink);
15646		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15647		- break;
15648		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15649		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15650		- break;
15651		- case Object3D.hitScale: gr.setColor(Color.cyan);
15652		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15653		- break;
	16013	+ info.DX = X;
	16014	+ if (X != 0)
	16015	+ info.DX -= info.bounds.width/2;
	16016	+
	16017	+ info.DY = Y;
	16018	+ if (Y != 0)
	16019	+ info.DY -= info.bounds.height/2;
15654	16020	}
15655		-
	16021	+
	16022	+ object.drawEditHandles(//info,
	16023	+ 0);
	16024	+
	16025	+ if (drag && (X != 0 \|\| Y != 0))
	16026	+ {
	16027	+ switch (hitSomething)
	16028	+ {
	16029	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16030	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16031	+ break;
	16032	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16033	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16034	+ break;
	16035	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16036	+ gr.drawLine(X, Y, 0, 0);
	16037	+ break;
	16038	+ }
	16039	+
	16040	+ }
15656	16041	}
15657	16042	}
15658	16043	}
..	..	@@ -16355,16 +16740,16 @@
16355	16740	cStatic.objectstack[materialdepth++] = checker;
16356	16741	//System.out.println("material " + material);
16357	16742	//Applet3D.tracein(this, selected);
16358		- vector2buffer = checker.projectedVertices;
	16743	+ //vector2buffer = checker.projectedVertices;
16359	16744
16360	16745	//checker.GetMaterial().Draw(this, false); // true);
16361		- DrawMaterial(checker.GetMaterial(), false); // true);
	16746	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16362	16747
16363	16748	materialdepth -= 1;
16364	16749	if (materialdepth > 0)
16365	16750	{
16366		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16367		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16751	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16752	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16368	16753	}
16369	16754	//checker.GetMaterial().opacity = 1f;
16370	16755	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16450,6 +16835,14 @@
16450	16835	}
16451	16836	}
16452	16837
	16838	+ private Object3D GetFolder()
	16839	+ {
	16840	+ Object3D folder = object.GetWindow().copy;
	16841	+ if (object.GetWindow().copy.selection.Size() > 0)
	16842	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16843	+ return folder;
	16844	+ }
	16845	+
16453	16846	class SelectBuffer implements GLEventListener
16454	16847	{
16455	16848
..	..	@@ -16529,6 +16922,17 @@
16529	16922
16530	16923	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16531	16924
	16925	+ if (PAINTMODE)
	16926	+ {
	16927	+ if (object.GetWindow().copy.selection.Size() > 0)
	16928	+ {
	16929	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16930	+
	16931	+ // Make what you paint not selectable.
	16932	+ paintobj.ResetSelectable();
	16933	+ }
	16934	+ }
	16935	+
16532	16936	//int tmp = selection_view;
16533	16937	//selection_view = -1;
16534	16938	int temp = DrawMode();
..	..	@@ -16540,6 +16944,17 @@
16540	16944	// temp = DEFAULT; // patch for selection debug
16541	16945	Globals.drawMode = temp; // WARNING
16542	16946
	16947	+ if (PAINTMODE)
	16948	+ {
	16949	+ if (object.GetWindow().copy.selection.Size() > 0)
	16950	+ {
	16951	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16952	+
	16953	+ // Revert.
	16954	+ paintobj.RestoreSelectable();
	16955	+ }
	16956	+ }
	16957	+
16543	16958	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16544	16959
16545	16960	// trying different ways of getting the depth info over
..	..	@@ -16587,6 +17002,8 @@
16587	17002	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16588	17003	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16589	17004	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17005	+
	17006	+ CreateSelectedPoint();
16590	17007
16591	17008	// Will fit the mesh !!!
16592	17009	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16641,29 +17058,31 @@
16641	17058	}
16642	17059
16643	17060	if (!movingcamera && !PAINTMODE)
16644		- object.editWindow.ScreenFitPoint(); // fev 2014
	17061	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16645	17062
16646		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17063	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16647	17064	{
16648		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17065	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16649	17066
16650		- Object3D group = new Object3D("inst" + paintcount++);
	17067	+ if (object.GetWindow().copy.selection.Size() > 0)
	17068	+ {
	17069	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16651	17070
16652		- group.CreateMaterial(); // use a void leaf to select instances
16653		-
16654		- group.add(paintobj); // link
16655		-
16656		- object.editWindow.SnapObject(group);
16657		-
16658		- Object3D folder = object.editWindow.copy;
16659		-
16660		- if (object.editWindow.copy.selection.Size() > 0)
16661		- folder = object.editWindow.copy.selection.elementAt(0);
16662		-
16663		- folder.add(group);
16664		-
16665		- object.editWindow.ResetModel();
16666		- object.editWindow.refreshContents();
	17071	+ Object3D inst = new Object3D("inst" + paintcount++);
	17072	+
	17073	+ inst.CreateMaterial(); // use a void leaf to select instances
	17074	+
	17075	+ inst.add(paintobj); // link
	17076	+
	17077	+ object.GetWindow().SnapObject(inst);
	17078	+
	17079	+ Object3D folder = paintFolder; // GetFolder();
	17080	+
	17081	+ folder.add(inst);
	17082	+
	17083	+ object.GetWindow().ResetModel();
	17084	+ object.GetWindow().refreshContents();
	17085	+ }
16667	17086	}
16668	17087	else
16669	17088	paintcount = 0;
..	..	@@ -16702,6 +17121,11 @@
16702	17121	//System.out.println("objects[color] = " + objects[color]);
16703	17122	//objects[color].Select();
16704	17123	indexcount = 0;
	17124	+ ObjEditor window = object.GetWindow();
	17125	+ if (window != null && deselect)
	17126	+ {
	17127	+ window.Select(null, deselect, true);
	17128	+ }
16705	17129	object.Select(color, deselect);
16706	17130	}
16707	17131
..	..	@@ -17227,23 +17651,15 @@
17227	17651	int AAbuffersize = 0;
17228	17652
17229	17653	//double[] selectedpoint = new double[3];
17230		- static Superellipsoid selectedpoint = new Superellipsoid();
	17654	+ static Superellipsoid selectedpoint;
17231	17655	static Sphere previousselectedpoint = null;
17232		- static Sphere debugpointG = new Sphere();
17233		- static Sphere debugpointP = new Sphere();
17234		- static Sphere debugpointC = new Sphere();
17235		- static Sphere debugpointR = new Sphere();
	17656	+ static Sphere debugpointG;
	17657	+ static Sphere debugpointP;
	17658	+ static Sphere debugpointC;
	17659	+ static Sphere debugpointR;
17236	17660
17237	17661	static Sphere debugpoints[] = new Sphere[8];
17238	17662
17239		- static
17240		- {
17241		- for (int i=0; i<8; i++)
17242		- {
17243		- debugpoints[i] = new Sphere();
17244		- }
17245		- }
17246		-
17247	17663	static void InitPoints(float radius)
17248	17664	{
17249	17665	for (int i=0; i<8; i++)