~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,11 +8024,69 @@
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		- void ReleaseTexture(String tex, boolean bump)
	8031	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8032	+ {
	8033	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8034	+ {
	8035	+ return;
	8036	+ }
	8037	+
	8038	+ if (tex == null)
	8039	+ {
	8040	+ ReleaseTexture(null, false);
	8041	+ return;
	8042	+ }
	8043	+
	8044	+ String pigment = Object3D.GetPigment(tex);
	8045	+
	8046	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8047	+ {
	8048	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8049	+ // System.out.println("; bump = " + bump);
	8050	+ }
	8051	+
	8052	+ if (pigment.equals(""))
	8053	+ {
	8054	+ pigment = null;
	8055	+ }
	8056	+
	8057	+ ReleaseTexture(tex, false);
	8058	+ }
	8059	+
	8060	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8061	+ {
	8062	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8063	+ {
	8064	+ return;
	8065	+ }
	8066	+
	8067	+ if (tex == null)
	8068	+ {
	8069	+ ReleaseTexture(null, true);
	8070	+ return;
	8071	+ }
	8072	+
	8073	+ String bump = Object3D.GetBump(tex);
	8074	+
	8075	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8076	+ {
	8077	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8078	+ // System.out.println("; bump = " + bump);
	8079	+ }
	8080	+
	8081	+ if (bump.equals(""))
	8082	+ {
	8083	+ bump = null;
	8084	+ }
	8085	+
	8086	+ ReleaseTexture(tex, true);
	8087	+ }
	8088	+
	8089	+ void ReleaseTexture(cTexture tex, boolean bump)
7925	8090	{
7926	8091	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7927	8092	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7932,7 +8097,7 @@
7932	8097	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7933	8098
7934	8099	if (tex != null)
7935		- texture = textures.get(tex);
	8100	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7936	8101
7937	8102	// //assert( texture != null );
7938	8103	// if (texture == null)
..	..	@@ -8026,6 +8191,54 @@
8026	8191
8027	8192	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8028	8193	{
	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;
	8235	+
	8236	+ BindPigmentTexture(tex, resolution);
	8237	+ BindBumpTexture(tex, resolution);
	8238	+ }
	8239	+
	8240	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8241	+ {
8029	8242	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8030	8243	ambientOcclusion ) // \|\| !textureon)
8031	8244	{
..	..	@@ -8035,17 +8248,47 @@
8035	8248	if (tex == null)
8036	8249	{
8037	8250	BindTexture(null,false,resolution);
8038		- BindTexture(null,true,resolution);
8039	8251	return;
8040	8252	}
8041	8253
8042	8254	String pigment = Object3D.GetPigment(tex);
	8255	+
	8256	+ usedtextures.add(tex);
	8257	+
	8258	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8259	+ {
	8260	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8261	+ // System.out.println("; bump = " + bump);
	8262	+ }
	8263	+
	8264	+ if (pigment.equals(""))
	8265	+ {
	8266	+ pigment = null;
	8267	+ }
	8268	+
	8269	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8270	+ BindTexture(tex, false, resolution);
	8271	+ }
	8272	+
	8273	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8274	+ {
	8275	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8276	+ ambientOcclusion ) // \|\| !textureon)
	8277	+ {
	8278	+ return; // false;
	8279	+ }
	8280	+
	8281	+ if (tex == null)
	8282	+ {
	8283	+ BindTexture(null,true,resolution);
	8284	+ return;
	8285	+ }
	8286	+
8043	8287	String bump = Object3D.GetBump(tex);
8044	8288
8045		- usedtextures.put(pigment, pigment);
8046		- usedtextures.put(bump, bump);
	8289	+ usedtextures.add(tex);
8047	8290
8048		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8291	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8049	8292	{
8050	8293	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8051	8294	// System.out.println("; bump = " + bump);
..	..	@@ -8055,18 +8298,10 @@
8055	8298	{
8056	8299	bump = null;
8057	8300	}
8058		- if (pigment.equals(""))
8059		- {
8060		- pigment = null;
8061		- }
8062	8301
8063		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8064		- BindTexture(pigment, false, resolution);
8065	8302	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8066		- BindTexture(bump, true, resolution);
	8303	+ BindTexture(tex, true, resolution);
8067	8304	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8068		-
8069		- return; // true;
8070	8305	}
8071	8306
8072	8307	java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
..	..	@@ -8089,13 +8324,19 @@
8089	8324	return fileExists;
8090	8325	}
8091	8326
8092		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8327	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8093	8328	{
8094		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8329	+ CacheTexture texturecache = null;
8095	8330
8096	8331	if (tex != null)
8097	8332	{
8098		- 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	+ }
8099	8340
8100	8341	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8101	8342
..	..	@@ -8105,19 +8346,46 @@
8105	8346	// else
8106	8347	// if (!texname.startsWith("/"))
8107	8348	// texname = "/Users/nbriere/Textures/" + texname;
8108		- if (!FileExists(tex))
	8349	+ if (!FileExists(texname))
8109	8350	{
8110	8351	texname = fallbackTextureName;
8111	8352	}
8112	8353
8113	8354	if (CACHETEXTURE)
8114		- texture = textures.get(texname); // TEXTURE CACHE
8115		-
8116		- TextureData texturedata = null;
8117		-
8118		- if (texture == null \|\| texture.resolution < resolution)
8119	8355	{
8120		- 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(""))
8121	8389	{
8122	8390	assert(!bump);
8123	8391	// if (bump)
..	..	@@ -8128,19 +8396,23 @@
8128	8396	// }
8129	8397	// else
8130	8398	// {
8131		- texture = textures.get(tex);
8132		- if (texture == null)
	8399	+ // texturecache = textures.get(texname); // suspicious
	8400	+ if (texturecache == null)
8133	8401	{
8134		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8402	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8135	8403	}
	8404	+ else
	8405	+ new Exception().printStackTrace();
8136	8406	// }
8137	8407	} else
8138		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8408	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8139	8409	{
8140	8410	assert(bump);
8141		- texture = textures.get(tex);
8142		- if (texture == null)
8143		- 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();
8144	8416	} else
8145	8417	{
8146	8418	//if (tex.equals("IMMORTAL"))
..	..	@@ -8148,11 +8420,13 @@
8148	8420	// texture = GetResourceTexture("default.png");
8149	8421	//} else
8150	8422	//{
8151		- if (tex.equals("WHITE_NOISE"))
	8423	+ if (texname.endsWith("WHITE_NOISE"))
8152	8424	{
8153		- texture = textures.get(tex);
8154		- if (texture == null)
8155		- 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();
8156	8430	} else
8157	8431	{
8158	8432	if (textureon)
..	..	@@ -8211,19 +8485,19 @@
8211	8485	if (texturedata == null)
8212	8486	throw new Exception();
8213	8487
8214		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8488	+ texturecache = new CacheTexture(texturedata,resolution);
8215	8489	//texture = GetTexture(tex, bump);
8216	8490	}
8217	8491	}
8218	8492	//}
8219	8493	}
8220	8494
8221		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8495	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8222	8496	{
8223	8497	//return false;
8224	8498
8225	8499	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8226		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8500	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8227	8501	{
8228	8502	// String ext = "_highres";
8229	8503	// if (REDUCETEXTURE)
..	..	@@ -8240,52 +8514,17 @@
8240	8514	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8241	8515	if (!cachefile.exists())
8242	8516	{
8243		- // cache to disk
8244		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8245		- //buffers[0].
8246		-
8247		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8248		- int[] pixels = new int[bytebuf.capacity()/3];
8249		-
8250		- // squared size heuristic...
8251		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8517	+ //if (texturedata.getWidth() == texturedata.getHeight())
8252	8518	{
8253		- for (int i=pixels.length; --i>=0;)
8254		- {
8255		- int i3 = i*3;
8256		- pixels[i] = 0xFF;
8257		- pixels[i] <<= 8;
8258		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8259		- pixels[i] <<= 8;
8260		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8261		- pixels[i] <<= 8;
8262		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8263		- }
8264		-
8265		- /*
8266		- int r=0,g=0,b=0,a=0;
8267		- for (int i=0; i<width; i++)
8268		- for (int j=0; j<height; j++)
8269		- {
8270		- int index = j*width+i;
8271		- int p = pixels[index];
8272		- a = ((p>>24) & 0xFF);
8273		- r = ((p>>16) & 0xFF);
8274		- g = ((p>>8) & 0xFF);
8275		- b = (p & 0xFF);
8276		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8277		- }
8278		- /**/
8279		- int width = (int)Math.sqrt(pixels.length); // squared
8280		- int height = width;
8281		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8282		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8519	+ BufferedImage rendImage = CreateBim(texturedata);
	8520	+
8283	8521	ImageWriter writer = null;
8284	8522	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8285	8523	if (iter.hasNext()) {
8286	8524	writer = (ImageWriter)iter.next();
8287	8525	}
8288		- float compressionQuality = 0.9f;
	8526	+
	8527	+ float compressionQuality = 0.85f;
8289	8528	try
8290	8529	{
8291	8530	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8302,18 +8541,20 @@
8302	8541	}
8303	8542	}
8304	8543	}
8305		-
	8544	+
	8545	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8546	+
8306	8547	//System.out.println("Texture = " + tex);
8307		- if (textures.containsKey(texname))
	8548	+ if (textures.containsKey(tex))
8308	8549	{
8309		- CacheTexture thetex = textures.get(texname);
	8550	+ CacheTexture thetex = textures.get(tex);
8310	8551	thetex.texture.disable();
8311	8552	thetex.texture.dispose();
8312		- textures.remove(texname);
	8553	+ textures.remove(tex);
8313	8554	}
8314	8555
8315		- texture.texturedata = texturedata;
8316		- textures.put(texname, texture);
	8556	+ //texture.texturedata = texturedata;
	8557	+ textures.put(tex, texturecache);
8317	8558
8318	8559	// newtex = true;
8319	8560	}
..	..	@@ -8329,10 +8570,44 @@
8329	8570	}
8330	8571	}
8331	8572
8332		- return texture;
	8573	+ return texturecache;
8333	8574	}
8334	8575
8335		- 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
8336	8611	{
8337	8612	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8338	8613
..	..	@@ -8350,21 +8625,21 @@
8350	8625	return texture!=null?texture.texture:null;
8351	8626	}
8352	8627
8353		- 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
8354	8629	{
8355	8630	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8356	8631
8357	8632	return texture!=null?texture.texturedata:null;
8358	8633	}
8359	8634
8360		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8635	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8361	8636	{
8362	8637	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8363	8638	{
8364	8639	return false;
8365	8640	}
8366	8641
8367		- boolean newtex = false;
	8642	+ //boolean newtex = false;
8368	8643
8369	8644	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8370	8645
..	..	@@ -8396,9 +8671,75 @@
8396	8671	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8397	8672	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8398	8673
8399		- return newtex;
	8674	+ return true; // Warning: not used.
8400	8675	}
8401	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	+
8402	8743	ShadowBuffer shadowPBuf;
8403	8744	AntialiasBuffer antialiasPBuf;
8404	8745	int MAXSTACK;
..	..	@@ -9234,11 +9575,35 @@
9234	9575	jy8[3] = 0.5f;
9235	9576	}
9236	9577
9237		- 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
9238	9579	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9239	9580	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9240	9581	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9241	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	+
9242	9607	static int imagecount = 0; // movie generation
9243	9608
9244	9609	static int jitter = 0;
..	..	@@ -9335,7 +9700,7 @@
9335	9700
9336	9701	if (renderCamera != lightCamera)
9337	9702	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9338		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9703	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9339	9704
9340	9705	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9341	9706
..	..	@@ -9351,7 +9716,7 @@
9351	9716
9352	9717	if (renderCamera != lightCamera)
9353	9718	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9354		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9719	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9355	9720
9356	9721	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9357	9722
..	..	@@ -10349,6 +10714,7 @@
10349	10714	ANTIALIAS = 0;
10350	10715	//System.out.println("RESTART");
10351	10716	AAtimer.restart();
	10717	+ Globals.TIMERRUNNING = true;
10352	10718	}
10353	10719	}
10354	10720	}
..	..	@@ -10416,7 +10782,8 @@
10416	10782	ambientOcclusion = false;
10417	10783	}
10418	10784
10419		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10785	+ if (//Globals.lighttouched &&
	10786	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10420	10787	{
10421	10788	//if (RENDERSHADOW) // ?
10422	10789	if (!IsFrozen())
..	..	@@ -10550,7 +10917,7 @@
10550	10917	// if (parentcam != renderCamera) // not a light
10551	10918	if (cam != lightCamera)
10552	10919	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10553		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10920	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10554	10921
10555	10922	for (int j = 0; j < 4; j++)
10556	10923	{
..	..	@@ -10565,7 +10932,7 @@
10565	10932	// if (parentcam != renderCamera) // not a light
10566	10933	if (cam != lightCamera)
10567	10934	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10568		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10935	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10569	10936
10570	10937	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10571	10938
..	..	@@ -10856,9 +11223,9 @@
10856	11223
10857	11224	gl.glMatrixMode(GL.GL_MODELVIEW);
10858	11225
10859		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10860		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10861		-//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);
10862	11229	} else
10863	11230	{
10864	11231	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10869,7 +11236,7 @@
10869	11236	//System.out.println("BLENDING ON");
10870	11237	gl.glEnable(GL.GL_BLEND);
10871	11238	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10872		-
	11239	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10873	11240	gl.glMatrixMode(gl.GL_PROJECTION);
10874	11241	gl.glLoadIdentity();
10875	11242
..	..	@@ -11118,7 +11485,7 @@
11118	11485	}
11119	11486	}
11120	11487
11121		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11488	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11122	11489	{
11123	11490	//gl.glDepthFunc(GL.GL_LEQUAL);
11124	11491	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11126,24 +11493,21 @@
11126	11493
11127	11494	boolean texon = textureon;
11128	11495
11129		- if (RENDERPROGRAM > 0)
11130		- {
11131		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11132		- textureon = false;
11133		- }
	11496	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11497	+ textureon = false;
	11498	+
11134	11499	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11135	11500	//System.out.println("ALLO");
11136	11501	gl.glColorMask(false, false, false, false);
11137	11502	DrawObject(gl);
11138		- if (RENDERPROGRAM > 0)
11139		- {
11140		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11141		- textureon = texon;
11142		- }
	11503	+
	11504	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11505	+ textureon = texon;
	11506	+
11143	11507	gl.glColorMask(true, true, true, true);
11144	11508
11145	11509	gl.glDepthFunc(GL.GL_EQUAL);
11146		- //gl.glDepthMask(false);
	11510	+ gl.glDepthMask(false);
11147	11511	}
11148	11512
11149	11513	if (false) // DrawMode() == SHADOW)
..	..	@@ -11326,15 +11690,36 @@
11326	11690
11327	11691	static boolean zoomonce = false;
11328	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	+
11329	11711	void DrawObject(GL gl, boolean draw)
11330	11712	{
	11713	+ // To clear camera values
	11714	+ ResetOptions();
	11715	+
11331	11716	//System.out.println("DRAW OBJECT " + mouseDown);
11332	11717	// DrawMode() = SELECTION;
11333	11718	//GL gl = getGL();
11334	11719	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11335	11720	{
11336	11721	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11337		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11722	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11338	11723	pingthread.StepToTarget(true); // true);
11339	11724	// zoomonce = false;
11340	11725	}
..	..	@@ -11406,8 +11791,9 @@
11406	11791
11407	11792	if (DrawMode() == DEFAULT)
11408	11793	{
11409		- if (DEBUG)
	11794	+ if (Globals.DEBUG)
11410	11795	{
	11796	+ CreateSelectedPoint();
11411	11797	float radius = 0.05f;
11412	11798	if (selectedpoint.radius != radius)
11413	11799	{
..	..	@@ -11461,20 +11847,32 @@
11461	11847	ReleaseTextures(DEFAULT_TEXTURES);
11462	11848
11463	11849	if (CLEANCACHE)
11464		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11850	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11465	11851	{
11466		- String tex = e.nextElement();
	11852	+ cTexture tex = e.nextElement();
11467	11853
11468	11854	// System.out.println("Texture --------- " + tex);
11469	11855
11470		- if (tex.equals("WHITE_NOISE"))
	11856	+ if (tex.equals("WHITE_NOISE:"))
11471	11857	continue;
11472	11858
11473		- if (!usedtextures.containsKey(tex))
	11859	+ if (!usedtextures.contains(tex))
11474	11860	{
	11861	+ CacheTexture gettex = texturepigment.get(tex);
11475	11862	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11476		- textures.get(tex).texture.dispose();
11477		- 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	+ }
11478	11876	}
11479	11877	}
11480	11878	}
..	..	@@ -11894,7 +12292,7 @@
11894	12292	for (int i = tp.size(); --i >= 0;)
11895	12293	{
11896	12294	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11897		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12295	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11898	12296	}
11899	12297
11900	12298
..	..	@@ -12003,7 +12401,74 @@
12003	12401	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12004	12402
12005	12403	String program =
	12404	+ // Min shader
12006	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	+
12007	12472	//"OPTION ARB_fragment_program_shadow;" +
12008	12473	"PARAM light2cam0 = program.env[10];" +
12009	12474	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12118,8 +12583,7 @@
12118	12583	"TEMP shininess;" +
12119	12584	"\n" +
12120	12585	"MOV texSamp, one;" +
12121		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12122		-
	12586	+
12123	12587	"MOV mapgrid.x, one2048th.x;" +
12124	12588	"MOV temp, fragment.texcoord[1];" +
12125	12589	/*
..	..	@@ -12140,20 +12604,20 @@
12140	12604	"MUL temp, floor, mapgrid.x;" +
12141	12605	//"TEX depth0, temp, texture[1], 2D;" +
12142	12606	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12143		- TextureFetch("depth0", "temp", "1") +
	12607	+ ShadowTextureFetch("depth0", "temp", "1") +
12144	12608	"") +
12145	12609	"ADD temp.x, temp.x, mapgrid.x;" +
12146	12610	//"TEX depth1, temp, texture[1], 2D;" +
12147	12611	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12148		- TextureFetch("depth1", "temp", "1") +
	12612	+ ShadowTextureFetch("depth1", "temp", "1") +
12149	12613	"") +
12150	12614	"ADD temp.y, temp.y, mapgrid.x;" +
12151	12615	//"TEX depth2, temp, texture[1], 2D;" +
12152		- TextureFetch("depth2", "temp", "1") +
	12616	+ ShadowTextureFetch("depth2", "temp", "1") +
12153	12617	"SUB temp.x, temp.x, mapgrid.x;" +
12154	12618	//"TEX depth3, temp, texture[1], 2D;" +
12155	12619	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12156		- TextureFetch("depth3", "temp", "1") +
	12620	+ ShadowTextureFetch("depth3", "temp", "1") +
12157	12621	"") +
12158	12622	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12159	12623	//"MOV params, material;" +
..	..	@@ -12524,7 +12988,7 @@
12524	12988	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12525	12989	"") +
12526	12990
12527		- // display shadow only (bump == 0)
	12991	+ // display shadow only (fakedepth == 0)
12528	12992	"SUB temp.x, half.x, shadow.x;" +
12529	12993	"MOV temp.y, -params5.z;" + // params6.x;" +
12530	12994	"SLT temp.z, temp.y, -one2048th.x;" +
..	..	@@ -12951,25 +13415,26 @@
12951	13415	return out;
12952	13416	}
12953	13417
12954		- String TextureFetch(String dest, String src, String unit)
	13418	+ // Also does frustum culling
	13419	+ String ShadowTextureFetch(String dest, String src, String unit)
12955	13420	{
12956	13421	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12957	13422	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12958	13423	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13424	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13425	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12959	13426	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12960		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12961		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12962		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12963		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13427	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13428	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12964	13429	//"SWZ buffer, temp, w,w,w,w;";
12965		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13430	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12966	13431	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12967	13432	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12968	13433	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12969		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13434	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12970	13435
12971		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12972		- //"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;";
12973	13438	}
12974	13439
12975	13440	String Shadow(String depth, String shadow)
..	..	@@ -13016,7 +13481,7 @@
13016	13481	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13017	13482	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13018	13483
13019		- // No shadow when out of frustrum
	13484	+ // No shadow when out of frustum
13020	13485	"SGE temp.x, " + depth + ".z, one.z;" +
13021	13486	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13022	13487	"";
..	..	@@ -13164,7 +13629,8 @@
13164	13629	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13165	13630	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13166	13631	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13167		- Object3D.cVector2[] vector2buffer;
	13632	+
	13633	+ //Object3D.cVector2[] vector2buffer;
13168	13634
13169	13635	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13170	13636	// OUT : diff, spec
..	..	@@ -13180,9 +13646,10 @@
13180	13646	"DP3 " + dest + ".z," + "normals," + "eye;" +
13181	13647	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13182	13648	//"MOV " + dest + ".w," + "normal.z;" +
13183		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13184		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13185		- //"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
13186	13653	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13187	13654	"RCP " + dest + ".w," + dest + ".w;" +
13188	13655	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13687,6 +14154,7 @@
13687	14154	else
13688	14155	if (evt.getSource() == AAtimer)
13689	14156	{
	14157	+ Globals.TIMERRUNNING = false;
13690	14158	if (mouseDown)
13691	14159	{
13692	14160	//new Exception().printStackTrace();
..	..	@@ -13746,7 +14214,7 @@
13746	14214
13747	14215	// fev 2014???
13748	14216	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13749		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14217	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13750	14218	pingthread.StepToTarget(true); // true);
13751	14219	}
13752	14220	// if (!LIVE)
..	..	@@ -13761,6 +14229,7 @@
13761	14229	return;
13762	14230
13763	14231	AAtimer.restart(); //
	14232	+ Globals.TIMERRUNNING = true;
13764	14233
13765	14234	// waslive = LIVE;
13766	14235	// LIVE = false;
..	..	@@ -13810,14 +14279,15 @@
13810	14279	drag = false;
13811	14280	//System.out.println("Mouse DOWN");
13812	14281	editObj = false;
13813		- ClickInfo info = new ClickInfo();
13814		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13815		- info.pane = this;
13816		- info.camera = renderCamera;
13817		- info.x = x;
13818		- info.y = y;
13819		- info.modifiers = modifiersex;
13820		- 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);
13821	14291	if (!editObj)
13822	14292	{
13823	14293	hasMarquee = true;
..	..	@@ -14099,12 +14569,12 @@
14099	14569	void GoDown(int mod)
14100	14570	{
14101	14571	MODIFIERS \|= COMMAND;
14102		- /*
	14572	+ /**/
14103	14573	if((mod&SHIFT) == SHIFT)
14104	14574	manipCamera.RotatePosition(0, -speed);
14105	14575	else
14106		- manipCamera.BackForth(0, -speed*delta, getWidth());
14107		- */
	14576	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14577	+ /**/
14108	14578	if ((mod & SHIFT) == SHIFT)
14109	14579	{
14110	14580	mouseMode = mouseMode; // VR??
..	..	@@ -14120,12 +14590,12 @@
14120	14590	void GoUp(int mod)
14121	14591	{
14122	14592	MODIFIERS \|= COMMAND;
14123		- /*
	14593	+ /**/
14124	14594	if((mod&SHIFT) == SHIFT)
14125	14595	manipCamera.RotatePosition(0, speed);
14126	14596	else
14127		- manipCamera.BackForth(0, speed*delta, getWidth());
14128		- */
	14597	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14598	+ /**/
14129	14599	if ((mod & SHIFT) == SHIFT)
14130	14600	{
14131	14601	mouseMode = mouseMode;
..	..	@@ -14141,12 +14611,12 @@
14141	14611	void GoLeft(int mod)
14142	14612	{
14143	14613	MODIFIERS \|= COMMAND;
14144		- /*
	14614	+ /**/
14145	14615	if((mod&SHIFT) == SHIFT)
14146		- manipCamera.RotatePosition(speed, 0);
14147		- else
14148	14616	manipCamera.Translate(speed*delta, 0, getWidth());
14149		- */
	14617	+ else
	14618	+ manipCamera.RotatePosition(speed, 0);
	14619	+ /**/
14150	14620	if ((mod & SHIFT) == SHIFT)
14151	14621	{
14152	14622	mouseMode = mouseMode;
..	..	@@ -14162,12 +14632,12 @@
14162	14632	void GoRight(int mod)
14163	14633	{
14164	14634	MODIFIERS \|= COMMAND;
14165		- /*
	14635	+ /**/
14166	14636	if((mod&SHIFT) == SHIFT)
14167		- manipCamera.RotatePosition(-speed, 0);
14168		- else
14169	14637	manipCamera.Translate(-speed*delta, 0, getWidth());
14170		- */
	14638	+ else
	14639	+ manipCamera.RotatePosition(-speed, 0);
	14640	+ /**/
14171	14641	if ((mod & SHIFT) == SHIFT)
14172	14642	{
14173	14643	mouseMode = mouseMode;
..	..	@@ -14217,14 +14687,16 @@
14217	14687	if (editObj)
14218	14688	{
14219	14689	drag = true;
14220		- ClickInfo info = new ClickInfo();
14221		- info.bounds.setBounds(0, 0,
	14690	+ //ClickInfo info = new ClickInfo();
	14691	+ object.clickInfo.bounds.setBounds(0, 0,
14222	14692	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14223		- info.pane = this;
14224		- info.camera = renderCamera;
14225		- info.x = x;
14226		- info.y = y;
14227		- 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);
14228	14700	} else
14229	14701	{
14230	14702	if (x < startX)
..	..	@@ -14373,22 +14845,27 @@
14373	14845	}
14374	14846	}
14375	14847
	14848	+// ClickInfo clickInfo = new ClickInfo();
	14849	+
14376	14850	public void mouseMoved(MouseEvent e)
14377	14851	{
14378	14852	//System.out.println("mouseMoved: " + e);
14379	14853	if (isRenderer)
14380	14854	return;
14381	14855
14382		- ClickInfo ci = new ClickInfo();
14383		- ci.x = e.getX();
14384		- ci.y = e.getY();
14385		- ci.modifiers = e.getModifiersEx();
14386		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14387		- ci.pane = this;
14388		- 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;
14389	14863	if (!isRenderer)
14390	14864	{
14391		- if (object.editWindow.copy.doEditClick(ci, 0))
	14865	+ //ObjEditor editWindow = object.editWindow;
	14866	+ //Object3D copy = editWindow.copy;
	14867	+ if (object.doEditClick(//clickInfo,
	14868	+ 0))
14392	14869	{
14393	14870	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14394	14871	} else
..	..	@@ -14403,7 +14880,8 @@
14403	14880	Globals.MOUSEDRAGGED = false;
14404	14881
14405	14882	movingcamera = false;
14406		- X = Y = 0;
	14883	+ X = 0; // getBounds().width/2;
	14884	+ Y = 0; // getBounds().height/2;
14407	14885	//System.out.println("mouseReleased: " + e);
14408	14886	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14409	14887	}
..	..	@@ -14659,7 +15137,8 @@
14659	15137	// break;
14660	15138	case 'T':
14661	15139	CACHETEXTURE ^= true;
14662		- textures.clear();
	15140	+ texturepigment.clear();
	15141	+ texturebump.clear();
14663	15142	// repaint();
14664	15143	break;
14665	15144	case 'Y':
..	..	@@ -14744,7 +15223,9 @@
14744	15223	case 'E' : COMPACT ^= true;
14745	15224	repaint();
14746	15225	break;
14747		- case 'W' : DEBUGHSB ^= true;
	15226	+ case 'W' : // Wide Window (fullscreen)
	15227	+ //DEBUGHSB ^= true;
	15228	+ ObjEditor.theFrame.ToggleFullScreen();
14748	15229	repaint();
14749	15230	break;
14750	15231	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14769,8 +15250,8 @@
14769	15250	RevertCamera();
14770	15251	repaint();
14771	15252	break;
14772		- case 'L':
14773	15253	case 'l':
	15254	+ //case 'L':
14774	15255	if (lightMode)
14775	15256	{
14776	15257	lightMode = false;
..	..	@@ -14913,9 +15394,9 @@
14913	15394	case '_':
14914	15395	kompactbit = 5;
14915	15396	break;
14916		- case '+':
14917		- kompactbit = 6;
14918		- break;
	15397	+// case '+':
	15398	+// kompactbit = 6;
	15399	+// break;
14919	15400	case ' ':
14920	15401	lightMode ^= true;
14921	15402	Globals.lighttouched = true;
..	..	@@ -14927,6 +15408,7 @@
14927	15408	case ESC:
14928	15409	RENDERPROGRAM += 1;
14929	15410	RENDERPROGRAM %= 3;
	15411	+
14930	15412	repaint();
14931	15413	break;
14932	15414	case 'Z':
..	..	@@ -14966,8 +15448,9 @@
14966	15448	case DELETE:
14967	15449	ClearSelection();
14968	15450	break;
14969		- /*
14970	15451	case '+':
	15452	+
	15453	+ /*
14971	15454	//fontsize += 1;
14972	15455	bbzoom *= 2;
14973	15456	repaint();
..	..	@@ -14984,17 +15467,17 @@
14984	15467	case '=':
14985	15468	IncDepth();
14986	15469	//fontsize += 1;
14987		- object.editWindow.refreshContents(true);
	15470	+ object.GetWindow().refreshContents(true);
14988	15471	maskbit = 6;
14989	15472	break;
14990	15473	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14991	15474	DecDepth();
14992	15475	maskbit = 5;
14993	15476	//if(fontsize > 1) fontsize -= 1;
14994		- if (object.editWindow == null)
14995		- new Exception().printStackTrace();
14996		- else
14997		- object.editWindow.refreshContents(true);
	15477	+// if (object.editWindow == null)
	15478	+// new Exception().printStackTrace();
	15479	+// else
	15480	+ object.GetWindow().refreshContents(true);
14998	15481	break;
14999	15482	case '{':
15000	15483	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15218,7 +15701,7 @@
15218	15701	}
15219	15702	*/
15220	15703
15221		- object.editWindow.EditSelection();
	15704	+ object.GetWindow().EditSelection(false);
15222	15705	}
15223	15706
15224	15707	void SelectParent()
..	..	@@ -15235,10 +15718,10 @@
15235	15718	{
15236	15719	//selectees.remove(i);
15237	15720	System.out.println("select parent of " + elem);
15238		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15721	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15239	15722	} else
15240	15723	{
15241		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15724	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15242	15725	}
15243	15726
15244	15727	first = false;
..	..	@@ -15280,12 +15763,12 @@
15280	15763	for (int j = 0; j < group.children.size(); j++)
15281	15764	{
15282	15765	elem = (Object3D) group.children.elementAt(j);
15283		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15766	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15284	15767	first = false;
15285	15768	}
15286	15769	} else
15287	15770	{
15288		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15771	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15289	15772	}
15290	15773
15291	15774	first = false;
..	..	@@ -15296,21 +15779,21 @@
15296	15779	{
15297	15780	//Composite group = (Composite) object;
15298	15781	Object3D group = object;
15299		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15782	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15300	15783	}
15301	15784
15302	15785	void ResetTransform(int mask)
15303	15786	{
15304	15787	//Composite group = (Composite) object;
15305	15788	Object3D group = object;
15306		- group.editWindow.ResetTransform(mask);
	15789	+ group.GetWindow().ResetTransform(mask);
15307	15790	}
15308	15791
15309	15792	void FlipTransform()
15310	15793	{
15311	15794	//Composite group = (Composite) object;
15312	15795	Object3D group = object;
15313		- group.editWindow.FlipTransform();
	15796	+ group.GetWindow().FlipTransform();
15314	15797	// group.editWindow.ReduceMesh(true);
15315	15798	}
15316	15799
..	..	@@ -15318,7 +15801,7 @@
15318	15801	{
15319	15802	//Composite group = (Composite) object;
15320	15803	Object3D group = object;
15321		- group.editWindow.PrintMemory();
	15804	+ group.GetWindow().PrintMemory();
15322	15805	// group.editWindow.ReduceMesh(true);
15323	15806	}
15324	15807
..	..	@@ -15326,7 +15809,7 @@
15326	15809	{
15327	15810	//Composite group = (Composite) object;
15328	15811	Object3D group = object;
15329		- group.editWindow.ResetCentroid();
	15812	+ group.GetWindow().ResetCentroid();
15330	15813	}
15331	15814
15332	15815	void IncDepth()
..	..	@@ -15408,8 +15891,6 @@
15408	15891
15409	15892	int width = getBounds().width;
15410	15893	int height = getBounds().height;
15411		- ClickInfo info = new ClickInfo();
15412		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15413	15894	//Image img = CreateImage(width, height);
15414	15895	//System.out.println("width = " + width + "; height = " + height + "\n");
15415	15896
..	..	@@ -15486,48 +15967,77 @@
15486	15967	}
15487	15968	if (object != null && !hasMarquee)
15488	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	+
15489	15976	if (isRenderer)
15490	15977	{
15491		- info.flags++;
	15978	+ object.clickInfo.flags++;
15492	15979	double frameAspect = (double) width / (double) height;
15493	15980	if (frameAspect > renderCamera.aspect)
15494	15981	{
15495	15982	int desired = (int) ((double) height * renderCamera.aspect);
15496		- info.bounds.width -= width - desired;
15497		- info.bounds.x += (width - desired) / 2;
	15983	+ object.clickInfo.bounds.width -= width - desired;
	15984	+ object.clickInfo.bounds.x += (width - desired) / 2;
15498	15985	} else
15499	15986	{
15500	15987	int desired = (int) ((double) width / renderCamera.aspect);
15501		- info.bounds.height -= height - desired;
15502		- info.bounds.y += (height - desired) / 2;
	15988	+ object.clickInfo.bounds.height -= height - desired;
	15989	+ object.clickInfo.bounds.y += (height - desired) / 2;
15503	15990	}
15504	15991	}
15505		- info.g = gr;
15506		- info.camera = renderCamera;
	15992	+
	15993	+ object.clickInfo.g = gr;
	15994	+ object.clickInfo.camera = renderCamera;
15507	15995	/*
15508	15996	// Memory intensive (brep.verticescopy)
15509	15997	if (!(object instanceof Composite))
15510	15998	object.draw(info, 0, false); // SLOW :
15511	15999	*/
15512		- if (!isRenderer)
	16000	+ if (!isRenderer) // && drag)
15513	16001	{
15514		- object.drawEditHandles(info, 0);
15515		-
15516		- 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)
15517	16005	{
15518		- 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)
15519	16012	{
15520		- case Object3D.hitCenter: gr.setColor(Color.pink);
15521		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15522		- break;
15523		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15524		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15525		- break;
15526		- case Object3D.hitScale: gr.setColor(Color.cyan);
15527		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15528		- 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;
15529	16020	}
15530		-
	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	+ }
15531	16041	}
15532	16042	}
15533	16043	}
..	..	@@ -16230,16 +16740,16 @@
16230	16740	cStatic.objectstack[materialdepth++] = checker;
16231	16741	//System.out.println("material " + material);
16232	16742	//Applet3D.tracein(this, selected);
16233		- vector2buffer = checker.projectedVertices;
	16743	+ //vector2buffer = checker.projectedVertices;
16234	16744
16235	16745	//checker.GetMaterial().Draw(this, false); // true);
16236		- DrawMaterial(checker.GetMaterial(), false); // true);
	16746	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16237	16747
16238	16748	materialdepth -= 1;
16239	16749	if (materialdepth > 0)
16240	16750	{
16241		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16242		- 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);
16243	16753	}
16244	16754	//checker.GetMaterial().opacity = 1f;
16245	16755	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16325,6 +16835,14 @@
16325	16835	}
16326	16836	}
16327	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	+
16328	16846	class SelectBuffer implements GLEventListener
16329	16847	{
16330	16848
..	..	@@ -16404,6 +16922,17 @@
16404	16922
16405	16923	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16406	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	+
16407	16936	//int tmp = selection_view;
16408	16937	//selection_view = -1;
16409	16938	int temp = DrawMode();
..	..	@@ -16415,6 +16944,17 @@
16415	16944	// temp = DEFAULT; // patch for selection debug
16416	16945	Globals.drawMode = temp; // WARNING
16417	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	+
16418	16958	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16419	16959
16420	16960	// trying different ways of getting the depth info over
..	..	@@ -16462,6 +17002,8 @@
16462	17002	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16463	17003	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16464	17004	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17005	+
	17006	+ CreateSelectedPoint();
16465	17007
16466	17008	// Will fit the mesh !!!
16467	17009	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16516,29 +17058,31 @@
16516	17058	}
16517	17059
16518	17060	if (!movingcamera && !PAINTMODE)
16519		- object.editWindow.ScreenFitPoint(); // fev 2014
	17061	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16520	17062
16521		- 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)
16522	17064	{
16523		- 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);
16524	17066
16525		- Object3D group = new Object3D("inst" + paintcount++);
	17067	+ if (object.GetWindow().copy.selection.Size() > 0)
	17068	+ {
	17069	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16526	17070
16527		- group.CreateMaterial(); // use a void leaf to select instances
16528		-
16529		- group.add(paintobj); // link
16530		-
16531		- object.editWindow.SnapObject(group);
16532		-
16533		- Object3D folder = object.editWindow.copy;
16534		-
16535		- if (object.editWindow.copy.selection.Size() > 0)
16536		- folder = object.editWindow.copy.selection.elementAt(0);
16537		-
16538		- folder.add(group);
16539		-
16540		- object.editWindow.ResetModel();
16541		- 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	+ }
16542	17086	}
16543	17087	else
16544	17088	paintcount = 0;
..	..	@@ -16577,6 +17121,11 @@
16577	17121	//System.out.println("objects[color] = " + objects[color]);
16578	17122	//objects[color].Select();
16579	17123	indexcount = 0;
	17124	+ ObjEditor window = object.GetWindow();
	17125	+ if (window != null && deselect)
	17126	+ {
	17127	+ window.Select(null, deselect, true);
	17128	+ }
16580	17129	object.Select(color, deselect);
16581	17130	}
16582	17131
..	..	@@ -17102,23 +17651,15 @@
17102	17651	int AAbuffersize = 0;
17103	17652
17104	17653	//double[] selectedpoint = new double[3];
17105		- static Superellipsoid selectedpoint = new Superellipsoid();
	17654	+ static Superellipsoid selectedpoint;
17106	17655	static Sphere previousselectedpoint = null;
17107		- static Sphere debugpointG = new Sphere();
17108		- static Sphere debugpointP = new Sphere();
17109		- static Sphere debugpointC = new Sphere();
17110		- static Sphere debugpointR = new Sphere();
	17656	+ static Sphere debugpointG;
	17657	+ static Sphere debugpointP;
	17658	+ static Sphere debugpointC;
	17659	+ static Sphere debugpointR;
17111	17660
17112	17661	static Sphere debugpoints[] = new Sphere[8];
17113	17662
17114		- static
17115		- {
17116		- for (int i=0; i<8; i++)
17117		- {
17118		- debugpoints[i] = new Sphere();
17119		- }
17120		- }
17121		-
17122	17663	static void InitPoints(float radius)
17123	17664	{
17124	17665	for (int i=0; i<8; i++)