~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;
..	..	@@ -106,7 +142,7 @@
106	142	static boolean OEIL = true;
107	143	static boolean OEILONCE = false; // do oeilon then oeiloff
108	144	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	145	+static boolean SWITCH = true; // false;
110	146	static boolean HANDLES = false; // selection doesn't work!!
111	147	static boolean PAINTMODE = false;
112	148
..	..	@@ -149,6 +185,8 @@
149	185	defaultcaps.setAccumBlueBits(16);
150	186	defaultcaps.setAccumAlphaBits(16);
151	187	}
	188	+
	189	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
152	190
153	191	void SetAsGLRenderer(boolean b)
154	192	{
..	..	@@ -325,7 +363,7 @@
325	363	cStatic.objectstack[materialdepth++] = obj;
326	364	//System.out.println("material " + material);
327	365	//Applet3D.tracein(this, selected);
328		- display.vector2buffer = obj.projectedVertices;
	366	+ //display.vector2buffer = obj.projectedVertices;
329	367	if (obj instanceof Camera)
330	368	{
331	369	display.options1[0] = material.shift;
..	..	@@ -334,14 +372,28 @@
334	372	display.options1[2] = material.shadowbias;
335	373	display.options1[3] = material.aniso;
336	374	display.options1[4] = material.anisoV;
	375	+// System.out.println("display.options1[0] " + display.options1[0]);
	376	+// System.out.println("display.options1[1] " + display.options1[1]);
	377	+// System.out.println("display.options1[2] " + display.options1[2]);
	378	+// System.out.println("display.options1[3] " + display.options1[3]);
	379	+// System.out.println("display.options1[4] " + display.options1[4]);
337	380	display.options2[0] = material.opacity;
338	381	display.options2[1] = material.diffuse;
339	382	display.options2[2] = material.factor;
	383	+// System.out.println("display.options2[0] " + display.options2[0]);
	384	+// System.out.println("display.options2[1] " + display.options2[1]);
	385	+// System.out.println("display.options2[2] " + display.options2[2]);
340	386
341	387	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	388	+// System.out.println("display.options3[0] " + display.options3[0]);
	389	+// System.out.println("display.options3[1] " + display.options3[1]);
	390	+// System.out.println("display.options3[2] " + display.options3[2]);
342	391	display.options4[0] = material.cameralight/0.2f;
343	392	display.options4[1] = material.subsurface;
344	393	display.options4[2] = material.sheen;
	394	+// System.out.println("display.options4[0] " + display.options4[0]);
	395	+// System.out.println("display.options4[1] " + display.options4[1]);
	396	+// System.out.println("display.options4[2] " + display.options4[2]);
345	397
346	398	// if (display.CURRENTANTIALIAS > 0)
347	399	// display.options3[3] /= 4;
..	..	@@ -357,7 +409,7 @@
357	409	/**/
358	410	} else
359	411	{
360		- DrawMaterial(material, selected);
	412	+ DrawMaterial(material, selected, obj.projectedVertices);
361	413	}
362	414	} else
363	415	{
..	..	@@ -381,8 +433,8 @@
381	433	cStatic.objectstack[materialdepth++] = obj;
382	434	//System.out.println("material " + material);
383	435	//Applet3D.tracein("selected ", selected);
384		- display.vector2buffer = obj.projectedVertices;
385		- display.DrawMaterial(material, selected);
	436	+ //display.vector2buffer = obj.projectedVertices;
	437	+ display.DrawMaterial(material, selected, obj.projectedVertices);
386	438	}
387	439	}
388	440
..	..	@@ -399,8 +451,8 @@
399	451	materialdepth -= 1;
400	452	if (materialdepth > 0)
401	453	{
402		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
403		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	454	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	455	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
404	456	}
405	457	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
406	458	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -420,8 +472,8 @@
420	472	materialdepth -= 1;
421	473	if (materialdepth > 0)
422	474	{
423		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
424		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	475	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	476	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
425	477	}
426	478	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
427	479	//else
..	..	@@ -462,10 +514,12 @@
462	514	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463	515	{
464	516	//gl.glBegin(gl.GL_TRIANGLES);
465		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	517	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	518	+ // TEST LIVE NORMALS && !obj.dontselect
	519	+ ;
466	520	if (!hasnorm)
467	521	{
468		- // System.out.println("FUCK!!");
	522	+ // System.out.println("Mesh normal");
469	523	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
470	524	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
471	525	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1190,10 +1244,12 @@
1190	1244	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1191	1245	}
1192	1246	}
	1247	+
1193	1248	if (flipV)
1194	1249	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1195	1250	else
1196	1251	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1252	+
1197	1253	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1198	1254	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1199	1255
..	..	@@ -1213,10 +1269,12 @@
1213	1269	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1214	1270	}
1215	1271	}
	1272	+
1216	1273	if (flipV)
1217	1274	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1218	1275	else
1219	1276	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1277	+
1220	1278	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1221	1279	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1222	1280
..	..	@@ -1244,8 +1302,10 @@
1244	1302	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1245	1303	else
1246	1304	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1305	+
1247	1306	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1248	1307	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1308	+
1249	1309	count2 += 2;
1250	1310	count3 += 3;
1251	1311	}
..	..	@@ -1601,7 +1661,7 @@
1601	1661	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1602	1662	}
1603	1663
1604		- void DrawMaterial(cMaterial material, boolean selected)
	1664	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1605	1665	{
1606	1666	CameraPane display = this;
1607	1667	//new Exception().printStackTrace();
..	..	@@ -1628,7 +1688,7 @@
1628	1688
1629	1689	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1630	1690
1631		- float[] colorV = GrafreeD.colorV;
	1691	+ float[] colorV = Grafreed.colorV;
1632	1692
1633	1693	/**/
1634	1694	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1636,7 +1696,7 @@
1636	1696	colorV[0] = display.modelParams0[0] * material.diffuse;
1637	1697	colorV[1] = display.modelParams0[1] * material.diffuse;
1638	1698	colorV[2] = display.modelParams0[2] * material.diffuse;
1639		- colorV[3] = material.opacity;
	1699	+ colorV[3] = 1; // material.opacity;
1640	1700
1641	1701	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1642	1702	//System.out.println("Opacity = " + opacity);
..	..	@@ -1744,9 +1804,9 @@
1744	1804	display.modelParams7[2] = 0;
1745	1805	display.modelParams7[3] = 0;
1746	1806
1747		- display.modelParams6[0] = 100; // criss de bug de bump
	1807	+ //display.modelParams6[0] = 100; // criss de bug de bump
1748	1808
1749		- Object3D.cVector2[] extparams = display.vector2buffer;
	1809	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1750	1810	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1751	1811	{
1752	1812	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1888,7 +1948,7 @@
1888	1948	void PushMatrix(double[][] matrix)
1889	1949	{
1890	1950	// GrafreeD.tracein(matrix);
1891		- PushMatrix(matrix,1);
	1951	+ PushMatrix(matrix, 1);
1892	1952	}
1893	1953
1894	1954	void PushMatrix()
..	..	@@ -2042,7 +2102,7 @@
2042	2102	//System.err.println("Oeil on");
2043	2103	OEIL = true;
2044	2104	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2045		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2105	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2046	2106	//pingthread.StepToTarget(true);
2047	2107	}
2048	2108
..	..	@@ -2140,7 +2200,7 @@
2140	2200	System.err.println("LIVE = " + Globals.isLIVE());
2141	2201
2142	2202	if (!Globals.isLIVE()) // save sound
2143		- GrafreeD.savesound = true; // wav.save();
	2203	+ Grafreed.savesound = true; // wav.save();
2144	2204	// else
2145	2205	repaint(); // start loop // may 2013
2146	2206	}
..	..	@@ -2257,7 +2317,7 @@
2257	2317
2258	2318	void ToggleDebug()
2259	2319	{
2260		- DEBUG ^= true;
	2320	+ Globals.DEBUG ^= true;
2261	2321	}
2262	2322
2263	2323	void ToggleLookAt()
..	..	@@ -2265,9 +2325,9 @@
2265	2325	LOOKAT ^= true;
2266	2326	}
2267	2327
2268		- void ToggleRandom()
	2328	+ void ToggleSwitch()
2269	2329	{
2270		- RANDOM ^= true;
	2330	+ SWITCH ^= true;
2271	2331	}
2272	2332
2273	2333	void ToggleHandles()
..	..	@@ -2275,10 +2335,17 @@
2275	2335	HANDLES ^= true;
2276	2336	}
2277	2337
	2338	+ Object3D paintFolder;
	2339	+
2278	2340	void TogglePaint()
2279	2341	{
2280	2342	PAINTMODE ^= true;
2281	2343	paintcount = 0;
	2344	+
	2345	+ if (PAINTMODE)
	2346	+ {
	2347	+ paintFolder = GetFolder();
	2348	+ }
2282	2349	}
2283	2350
2284	2351	void SwapCamera(int a, int b)
..	..	@@ -2374,7 +2441,22 @@
2374	2441	{
2375	2442	return currentGL;
2376	2443	}
2377		-
	2444	+
	2445	+ static private BufferedImage CreateBim(TextureData texturedata)
	2446	+ {
	2447	+ Grafreed.Assert(texturedata != null);
	2448	+
	2449	+ int width = texturedata.getWidth();
	2450	+ int height = texturedata.getHeight();
	2451	+
	2452	+ Buffer buffer = texturedata.getBuffer();
	2453	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2454	+
	2455	+ byte[] bytes = bytebuf.array();
	2456	+
	2457	+ return CreateBim(bytes, width, height);
	2458	+ }
	2459	+
2378	2460	/**/
2379	2461	class CacheTexture
2380	2462	{
..	..	@@ -2383,28 +2465,31 @@
2383	2465
2384	2466	int resolution;
2385	2467
2386		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2468	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2387	2469	{
2388		- texture = tex;
	2470	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2471	+ texturedata = texdata;
2389	2472	resolution = res;
2390	2473	}
2391	2474	}
2392	2475	/**/
2393	2476
2394	2477	// TEXTURE static Texture texture;
2395		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2396		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2397		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2478	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2479	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2480	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2481	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2482	+
2398	2483	int pigmentdepth = 0;
2399	2484	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2400	2485	int bumpdepth = 0;
2401	2486	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2487	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2403	2488	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2404		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2489	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2405	2490	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2406	2491
2407		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2492	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2408	2493	{
2409	2494	TextureData texturedata = null;
2410	2495
..	..	@@ -2423,13 +2508,34 @@
2423	2508	if (bump)
2424	2509	texturedata = ConvertBump(texturedata, false);
2425	2510
2426		- com.sun.opengl.util.texture.Texture texture =
2427		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2511	+// com.sun.opengl.util.texture.Texture texture =
	2512	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2428	2513
2429		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2430		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2514	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2515	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2431	2516
2432		- return texture;
	2517	+ return texturedata;
	2518	+ }
	2519	+
	2520	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2521	+ {
	2522	+ TextureData texturedata = null;
	2523	+
	2524	+ try
	2525	+ {
	2526	+ texturedata =
	2527	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2528	+ bim,
	2529	+ true);
	2530	+ } catch (Exception e)
	2531	+ {
	2532	+ throw new javax.media.opengl.GLException(e);
	2533	+ }
	2534	+
	2535	+ if (bump)
	2536	+ texturedata = ConvertBump(texturedata, false);
	2537	+
	2538	+ return texturedata;
2433	2539	}
2434	2540
2435	2541	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3502,6 +3608,8 @@
3502	3608
3503	3609	System.out.println("LOADING TEXTURE : " + name);
3504	3610
	3611	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3612	+
3505	3613	//
3506	3614	if (false) // compressbit > 0)
3507	3615	{
..	..	@@ -7900,7 +8008,7 @@
7900	8008	String pigment = Object3D.GetPigment(tex);
7901	8009	String bump = Object3D.GetBump(tex);
7902	8010
7903		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8011	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7904	8012	{
7905	8013	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7906	8014	// System.out.println("; bump = " + bump);
..	..	@@ -7915,11 +8023,69 @@
7915	8023	pigment = null;
7916	8024	}
7917	8025
7918		- ReleaseTexture(bump, true);
7919		- ReleaseTexture(pigment, false);
	8026	+ ReleaseTexture(tex, true);
	8027	+ ReleaseTexture(tex, false);
7920	8028	}
7921	8029
7922		- void ReleaseTexture(String tex, boolean bump)
	8030	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8031	+ {
	8032	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8033	+ {
	8034	+ return;
	8035	+ }
	8036	+
	8037	+ if (tex == null)
	8038	+ {
	8039	+ ReleaseTexture(null, false);
	8040	+ return;
	8041	+ }
	8042	+
	8043	+ String pigment = Object3D.GetPigment(tex);
	8044	+
	8045	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8046	+ {
	8047	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8048	+ // System.out.println("; bump = " + bump);
	8049	+ }
	8050	+
	8051	+ if (pigment.equals(""))
	8052	+ {
	8053	+ pigment = null;
	8054	+ }
	8055	+
	8056	+ ReleaseTexture(tex, false);
	8057	+ }
	8058	+
	8059	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8060	+ {
	8061	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8062	+ {
	8063	+ return;
	8064	+ }
	8065	+
	8066	+ if (tex == null)
	8067	+ {
	8068	+ ReleaseTexture(null, true);
	8069	+ return;
	8070	+ }
	8071	+
	8072	+ String bump = Object3D.GetBump(tex);
	8073	+
	8074	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8075	+ {
	8076	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8077	+ // System.out.println("; bump = " + bump);
	8078	+ }
	8079	+
	8080	+ if (bump.equals(""))
	8081	+ {
	8082	+ bump = null;
	8083	+ }
	8084	+
	8085	+ ReleaseTexture(tex, true);
	8086	+ }
	8087	+
	8088	+ void ReleaseTexture(cTexture tex, boolean bump)
7923	8089	{
7924	8090	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7925	8091	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7930,7 +8096,7 @@
7930	8096	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7931	8097
7932	8098	if (tex != null)
7933		- texture = textures.get(tex);
	8099	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7934	8100
7935	8101	// //assert( texture != null );
7936	8102	// if (texture == null)
..	..	@@ -8022,7 +8188,55 @@
8022	8188	}
8023	8189	}
8024	8190
8025		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8191	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8192	+ {
	8193	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8194	+// ambientOcclusion ) // \|\| !textureon)
	8195	+// {
	8196	+// return; // false;
	8197	+// }
	8198	+//
	8199	+// if (tex == null)
	8200	+// {
	8201	+// BindTexture(null,false,resolution);
	8202	+// BindTexture(null,true,resolution);
	8203	+// return;
	8204	+// }
	8205	+//
	8206	+// String pigment = Object3D.GetPigment(tex);
	8207	+// String bump = Object3D.GetBump(tex);
	8208	+//
	8209	+// usedtextures.add(pigment);
	8210	+// usedtextures.add(bump);
	8211	+//
	8212	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8213	+// {
	8214	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8215	+// // System.out.println("; bump = " + bump);
	8216	+// }
	8217	+//
	8218	+// if (bump.equals(""))
	8219	+// {
	8220	+// bump = null;
	8221	+// }
	8222	+// if (pigment.equals(""))
	8223	+// {
	8224	+// pigment = null;
	8225	+// }
	8226	+//
	8227	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8228	+// BindTexture(pigment, false, resolution);
	8229	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8230	+// BindTexture(bump, true, resolution);
	8231	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8232	+//
	8233	+// return; // true;
	8234	+
	8235	+ BindPigmentTexture(tex, resolution);
	8236	+ BindBumpTexture(tex, resolution);
	8237	+ }
	8238	+
	8239	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8026	8240	{
8027	8241	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8028	8242	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8033,17 +8247,47 @@
8033	8247	if (tex == null)
8034	8248	{
8035	8249	BindTexture(null,false,resolution);
8036		- BindTexture(null,true,resolution);
8037	8250	return;
8038	8251	}
8039	8252
8040	8253	String pigment = Object3D.GetPigment(tex);
	8254	+
	8255	+ usedtextures.add(tex);
	8256	+
	8257	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8258	+ {
	8259	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8260	+ // System.out.println("; bump = " + bump);
	8261	+ }
	8262	+
	8263	+ if (pigment.equals(""))
	8264	+ {
	8265	+ pigment = null;
	8266	+ }
	8267	+
	8268	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8269	+ BindTexture(tex, false, resolution);
	8270	+ }
	8271	+
	8272	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8273	+ {
	8274	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8275	+ ambientOcclusion ) // \|\| !textureon)
	8276	+ {
	8277	+ return; // false;
	8278	+ }
	8279	+
	8280	+ if (tex == null)
	8281	+ {
	8282	+ BindTexture(null,true,resolution);
	8283	+ return;
	8284	+ }
	8285	+
8041	8286	String bump = Object3D.GetBump(tex);
8042	8287
8043		- usedtextures.put(pigment, pigment);
8044		- usedtextures.put(bump, bump);
	8288	+ usedtextures.add(tex);
8045	8289
8046		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8290	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8047	8291	{
8048	8292	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8049	8293	// System.out.println("; bump = " + bump);
..	..	@@ -8053,43 +8297,94 @@
8053	8297	{
8054	8298	bump = null;
8055	8299	}
8056		- if (pigment.equals(""))
8057		- {
8058		- pigment = null;
8059		- }
8060	8300
8061		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8062		- BindTexture(pigment, false, resolution);
8063	8301	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8064		- BindTexture(bump, true, resolution);
	8302	+ BindTexture(tex, true, resolution);
8065	8303	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8066		-
8067		- return; // true;
8068	8304	}
8069	8305
8070		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8306	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8307	+
	8308	+ private boolean FileExists(String tex)
8071	8309	{
8072		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8310	+ if (missingTextures.contains(tex))
	8311	+ {
	8312	+ return false;
	8313	+ }
	8314	+
	8315	+ boolean fileExists = new File(tex).exists();
	8316	+
	8317	+ if (!fileExists)
	8318	+ {
	8319	+ // If file exists, the "new File()" is not executed sgain
	8320	+ missingTextures.add(tex);
	8321	+ }
	8322	+
	8323	+ return fileExists;
	8324	+ }
	8325	+
	8326	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8327	+ {
	8328	+ CacheTexture texturecache = null;
8073	8329
8074	8330	if (tex != null)
8075	8331	{
8076		- String texname = tex;
	8332	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8333	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8077	8334
8078		- String[] split = tex.split("Textures");
8079		- if (split.length > 1)
8080		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8081		- else
8082		- if (!texname.startsWith("/"))
8083		- texname = "/Users/nbriere/Textures/" + texname;
	8335	+ if (texname.equals("") && texdata == null)
	8336	+ {
	8337	+ return null;
	8338	+ }
	8339	+
	8340	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8341	+
	8342	+// String[] split = tex.split("Textures");
	8343	+// if (split.length > 1)
	8344	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8345	+// else
	8346	+// if (!texname.startsWith("/"))
	8347	+// texname = "/Users/nbriere/Textures/" + texname;
	8348	+ if (!FileExists(texname))
	8349	+ {
	8350	+ texname = fallbackTextureName;
	8351	+ }
8084	8352
8085	8353	if (CACHETEXTURE)
8086		- texture = textures.get(texname); // TEXTURE CACHE
8087		-
8088		- TextureData texturedata = null;
8089		-
8090		- if (texture == null \|\| texture.resolution < resolution)
8091	8354	{
8092		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8355	+ if (texdata == null)
	8356	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8357	+ else
	8358	+ texturecache = bimtextures.get(texdata);
	8359	+ }
	8360	+
	8361	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8362	+ {
	8363	+ TextureData texturedata = null;
	8364	+
	8365	+ if (texdata != null && textureon)
	8366	+ {
	8367	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8368	+
	8369	+ try
	8370	+ {
	8371	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8372	+ }
	8373	+ catch (Exception e)
	8374	+ {
	8375	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8376	+ }
	8377	+
	8378	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8379	+ bimtextures.put(texdata, texturecache);
	8380	+
	8381	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8382	+
	8383	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8384	+ //bim2 = bim;
	8385	+ }
	8386	+ else
	8387	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8093	8388	{
8094	8389	assert(!bump);
8095	8390	// if (bump)
..	..	@@ -8100,19 +8395,23 @@
8100	8395	// }
8101	8396	// else
8102	8397	// {
8103		- texture = textures.get(tex);
8104		- if (texture == null)
	8398	+ // texturecache = textures.get(texname); // suspicious
	8399	+ if (texturecache == null)
8105	8400	{
8106		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8401	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8107	8402	}
	8403	+ else
	8404	+ new Exception().printStackTrace();
8108	8405	// }
8109	8406	} else
8110		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8407	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8111	8408	{
8112	8409	assert(bump);
8113		- texture = textures.get(tex);
8114		- if (texture == null)
8115		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8410	+ // texturecache = textures.get(texname); // suspicious
	8411	+ if (texturecache == null)
	8412	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8413	+ else
	8414	+ new Exception().printStackTrace();
8116	8415	} else
8117	8416	{
8118	8417	//if (tex.equals("IMMORTAL"))
..	..	@@ -8120,11 +8419,13 @@
8120	8419	// texture = GetResourceTexture("default.png");
8121	8420	//} else
8122	8421	//{
8123		- if (tex.equals("WHITE_NOISE"))
	8422	+ if (texname.endsWith("WHITE_NOISE"))
8124	8423	{
8125		- texture = textures.get(tex);
8126		- if (texture == null)
8127		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8424	+ // texturecache = textures.get(texname); // suspicious
	8425	+ if (texturecache == null)
	8426	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8427	+ else
	8428	+ new Exception().printStackTrace();
8128	8429	} else
8129	8430	{
8130	8431	if (textureon)
..	..	@@ -8149,7 +8450,7 @@
8149	8450	}
8150	8451
8151	8452	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8152		- if (!new File(cachename).exists())
	8453	+ if (!FileExists(cachename))
8153	8454	cachename = texname;
8154	8455	else
8155	8456	processbump = false; // don't process bump map again
..	..	@@ -8171,7 +8472,7 @@
8171	8472	}
8172	8473
8173	8474	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8174		- if (!new File(cachename).exists())
	8475	+ if (!FileExists(cachename))
8175	8476	cachename = texname;
8176	8477	else
8177	8478	processbump = false; // don't process bump map again
..	..	@@ -8180,20 +8481,22 @@
8180	8481	texturedata = GetFileTexture(cachename, processbump, resolution);
8181	8482
8182	8483
8183		- if (texturedata != null)
8184		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8484	+ if (texturedata == null)
	8485	+ throw new Exception();
	8486	+
	8487	+ texturecache = new CacheTexture(texturedata,resolution);
8185	8488	//texture = GetTexture(tex, bump);
8186	8489	}
8187	8490	}
8188	8491	//}
8189	8492	}
8190	8493
8191		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8494	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8192	8495	{
8193	8496	//return false;
8194	8497
8195	8498	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8196		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8499	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8197	8500	{
8198	8501	// String ext = "_highres";
8199	8502	// if (REDUCETEXTURE)
..	..	@@ -8210,52 +8513,17 @@
8210	8513	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8211	8514	if (!cachefile.exists())
8212	8515	{
8213		- // cache to disk
8214		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8215		- //buffers[0].
8216		-
8217		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8218		- int[] pixels = new int[bytebuf.capacity()/3];
8219		-
8220		- // squared size heuristic...
8221		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8516	+ //if (texturedata.getWidth() == texturedata.getHeight())
8222	8517	{
8223		- for (int i=pixels.length; --i>=0;)
8224		- {
8225		- int i3 = i*3;
8226		- pixels[i] = 0xFF;
8227		- pixels[i] <<= 8;
8228		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8229		- pixels[i] <<= 8;
8230		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8231		- pixels[i] <<= 8;
8232		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8233		- }
8234		-
8235		- /*
8236		- int r=0,g=0,b=0,a=0;
8237		- for (int i=0; i<width; i++)
8238		- for (int j=0; j<height; j++)
8239		- {
8240		- int index = j*width+i;
8241		- int p = pixels[index];
8242		- a = ((p>>24) & 0xFF);
8243		- r = ((p>>16) & 0xFF);
8244		- g = ((p>>8) & 0xFF);
8245		- b = (p & 0xFF);
8246		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8247		- }
8248		- /**/
8249		- int width = (int)Math.sqrt(pixels.length); // squared
8250		- int height = width;
8251		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8252		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8518	+ BufferedImage rendImage = CreateBim(texturedata);
	8519	+
8253	8520	ImageWriter writer = null;
8254	8521	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8255	8522	if (iter.hasNext()) {
8256	8523	writer = (ImageWriter)iter.next();
8257	8524	}
8258		- float compressionQuality = 0.9f;
	8525	+
	8526	+ float compressionQuality = 0.85f;
8259	8527	try
8260	8528	{
8261	8529	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8272,18 +8540,20 @@
8272	8540	}
8273	8541	}
8274	8542	}
8275		-
	8543	+
	8544	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8545	+
8276	8546	//System.out.println("Texture = " + tex);
8277		- if (textures.containsKey(texname))
	8547	+ if (textures.containsKey(tex))
8278	8548	{
8279		- CacheTexture thetex = textures.get(texname);
	8549	+ CacheTexture thetex = textures.get(tex);
8280	8550	thetex.texture.disable();
8281	8551	thetex.texture.dispose();
8282		- textures.remove(texname);
	8552	+ textures.remove(tex);
8283	8553	}
8284	8554
8285		- texture.texturedata = texturedata;
8286		- textures.put(texname, texture);
	8555	+ //texture.texturedata = texturedata;
	8556	+ textures.put(tex, texturecache);
8287	8557
8288	8558	// newtex = true;
8289	8559	}
..	..	@@ -8299,10 +8569,44 @@
8299	8569	}
8300	8570	}
8301	8571
8302		- return texture;
	8572	+ return texturecache;
8303	8573	}
8304	8574
8305		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8575	+ static void EmbedTextures(cTexture tex)
	8576	+ {
	8577	+ if (tex.pigmentdata == null)
	8578	+ {
	8579	+ //String texname = Object3D.GetPigment(tex);
	8580	+
	8581	+ CacheTexture texturecache = texturepigment.get(tex);
	8582	+
	8583	+ if (texturecache != null)
	8584	+ {
	8585	+ tex.pw = texturecache.texturedata.getWidth();
	8586	+ tex.ph = texturecache.texturedata.getHeight();
	8587	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8588	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8589	+ ;
	8590	+ //, tex.pw, tex.ph), 0.5f);
	8591	+ }
	8592	+ }
	8593	+
	8594	+ if (tex.bumpdata == null)
	8595	+ {
	8596	+ //String texname = Object3D.GetBump(tex);
	8597	+
	8598	+ CacheTexture texturecache = texturebump.get(tex);
	8599	+
	8600	+ if (texturecache != null)
	8601	+ {
	8602	+ tex.bw = texturecache.texturedata.getWidth();
	8603	+ tex.bh = texturecache.texturedata.getHeight();
	8604	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8605	+ }
	8606	+ }
	8607	+ }
	8608	+
	8609	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8306	8610	{
8307	8611	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8308	8612
..	..	@@ -8320,21 +8624,21 @@
8320	8624	return texture!=null?texture.texture:null;
8321	8625	}
8322	8626
8323		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8627	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8324	8628	{
8325	8629	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8326	8630
8327	8631	return texture!=null?texture.texturedata:null;
8328	8632	}
8329	8633
8330		- boolean BindTexture(String tex, boolean bump, int resolution)
	8634	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8331	8635	{
8332	8636	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8333	8637	{
8334	8638	return false;
8335	8639	}
8336	8640
8337		- boolean newtex = false;
	8641	+ //boolean newtex = false;
8338	8642
8339	8643	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8340	8644
..	..	@@ -8366,9 +8670,75 @@
8366	8670	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8367	8671	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8368	8672
8369		- return newtex;
	8673	+ return true; // Warning: not used.
8370	8674	}
8371	8675
	8676	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8677	+ {
	8678	+ try
	8679	+ {
	8680	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8681	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8682	+ ImageWriter writer = writers.next();
	8683	+
	8684	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8685	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8686	+ param.setCompressionQuality(quality);
	8687	+
	8688	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8689	+ writer.setOutput(ios);
	8690	+ writer.write(null, new IIOImage(image, null, null), param);
	8691	+
	8692	+ byte[] data = baos.toByteArray();
	8693	+ writer.dispose();
	8694	+ return data;
	8695	+ }
	8696	+ catch (Exception e)
	8697	+ {
	8698	+ e.printStackTrace();
	8699	+ return null;
	8700	+ }
	8701	+ }
	8702	+
	8703	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8704	+ {
	8705	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8706	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8707	+ ImageReader reader = writers.next();
	8708	+
	8709	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8710	+
	8711	+ ImageReadParam param = reader.getDefaultReadParam();
	8712	+ param.setDestination(bim);
	8713	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8714	+
	8715	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8716	+ reader.setInput(ios);
	8717	+ BufferedImage bim2 = reader.read(0, param);
	8718	+ reader.dispose();
	8719	+
	8720	+// WritableRaster raster = bim2.getRaster();
	8721	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8722	+// byte[] bytes = data.getData();
	8723	+//
	8724	+// int[] pixels = new int[bytes.length/3];
	8725	+// for (int i=pixels.length; --i>=0;)
	8726	+// {
	8727	+// int i3 = i*3;
	8728	+// pixels[i] = 0xFF;
	8729	+// pixels[i] <<= 8;
	8730	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8731	+// pixels[i] <<= 8;
	8732	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8733	+// pixels[i] <<= 8;
	8734	+// pixels[i] \|= bytes[i3] & 0xFF;
	8735	+// }
	8736	+//
	8737	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8738	+
	8739	+ return bim;
	8740	+ }
	8741	+
8372	8742	ShadowBuffer shadowPBuf;
8373	8743	AntialiasBuffer antialiasPBuf;
8374	8744	int MAXSTACK;
..	..	@@ -9204,11 +9574,35 @@
9204	9574	jy8[3] = 0.5f;
9205	9575	}
9206	9576
9207		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9577	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9208	9578	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9209	9579	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9210	9580	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9211	9581
	9582	+ void ResetOptions()
	9583	+ {
	9584	+ options1[0] = 100;
	9585	+ options1[1] = 0.025f;
	9586	+ options1[2] = 0.01f;
	9587	+ options1[3] = 0;
	9588	+ options1[4] = 0;
	9589	+
	9590	+ options2[0] = 0;
	9591	+ options2[1] = 0.75f;
	9592	+ options2[2] = 0;
	9593	+ options2[3] = 0;
	9594	+
	9595	+ options3[0] = 1;
	9596	+ options3[1] = 1;
	9597	+ options3[2] = 1;
	9598	+ options3[3] = 0;
	9599	+
	9600	+ options4[0] = 1;
	9601	+ options4[1] = 0;
	9602	+ options4[2] = 1;
	9603	+ options4[3] = 0;
	9604	+ }
	9605	+
9212	9606	static int imagecount = 0; // movie generation
9213	9607
9214	9608	static int jitter = 0;
..	..	@@ -9304,8 +9698,8 @@
9304	9698	assert (parentcam != renderCamera);
9305	9699
9306	9700	if (renderCamera != lightCamera)
9307		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9308		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9701	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9702	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9309	9703
9310	9704	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9311	9705
..	..	@@ -9320,8 +9714,8 @@
9320	9714	LA.matCopy(renderCamera.fromScreen, matrix);
9321	9715
9322	9716	if (renderCamera != lightCamera)
9323		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9324		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9717	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9718	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9325	9719
9326	9720	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9327	9721
..	..	@@ -9538,7 +9932,7 @@
9538	9932
9539	9933	if (!BOXMODE)
9540	9934	{
9541		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9935	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9542	9936	}
9543	9937
9544	9938	if (!BOXMODE)
..	..	@@ -9576,7 +9970,7 @@
9576	9970	ABORTED = false;
9577	9971	}
9578	9972	else
9579		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9973	+ Grafreed.wav.cursor += 735 * ACSIZE;
9580	9974
9581	9975	if (false)
9582	9976	{
..	..	@@ -10239,11 +10633,11 @@
10239	10633
10240	10634	public void display(GLAutoDrawable drawable)
10241	10635	{
10242		- if (GrafreeD.savesound && GrafreeD.hassound)
	10636	+ if (Grafreed.savesound && Grafreed.hassound)
10243	10637	{
10244		- GrafreeD.wav.save();
10245		- GrafreeD.savesound = false;
10246		- GrafreeD.hassound = false;
	10638	+ Grafreed.wav.save();
	10639	+ Grafreed.savesound = false;
	10640	+ Grafreed.hassound = false;
10247	10641	}
10248	10642	// if (DEBUG_SELECTION)
10249	10643	// {
..	..	@@ -10319,6 +10713,7 @@
10319	10713	ANTIALIAS = 0;
10320	10714	//System.out.println("RESTART");
10321	10715	AAtimer.restart();
	10716	+ Globals.TIMERRUNNING = true;
10322	10717	}
10323	10718	}
10324	10719	}
..	..	@@ -10373,7 +10768,7 @@
10373	10768	Object3D theobject = object;
10374	10769	Object3D theparent = object.parent;
10375	10770	object.parent = null;
10376		- object = (Object3D)GrafreeD.clone(object);
	10771	+ object = (Object3D)Grafreed.clone(object);
10377	10772	object.Stripify();
10378	10773	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10379	10774	theobject.PreprocessOcclusion(this);
..	..	@@ -10386,13 +10781,14 @@
10386	10781	ambientOcclusion = false;
10387	10782	}
10388	10783
10389		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10784	+ if (//Globals.lighttouched &&
	10785	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10390	10786	{
10391	10787	//if (RENDERSHADOW) // ?
10392	10788	if (!IsFrozen())
10393	10789	{
10394	10790	// dec 2012
10395		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10791	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10396	10792	{
10397	10793	Globals.framecount++;
10398	10794	shadowbuffer.display();
..	..	@@ -10519,8 +10915,8 @@
10519	10915
10520	10916	// if (parentcam != renderCamera) // not a light
10521	10917	if (cam != lightCamera)
10522		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10523		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10918	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10919	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10524	10920
10525	10921	for (int j = 0; j < 4; j++)
10526	10922	{
..	..	@@ -10534,8 +10930,8 @@
10534	10930
10535	10931	// if (parentcam != renderCamera) // not a light
10536	10932	if (cam != lightCamera)
10537		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10538		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10933	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10934	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10539	10935
10540	10936	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10541	10937
..	..	@@ -10794,7 +11190,16 @@
10794	11190	// Bump noise
10795	11191	gl.glActiveTexture(GL.GL_TEXTURE6);
10796	11192	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10797		- BindTexture(NOISE_TEXTURE, false, 2);
	11193	+
	11194	+ try
	11195	+ {
	11196	+ BindTexture(NOISE_TEXTURE, false, 2);
	11197	+ }
	11198	+ catch (Exception e)
	11199	+ {
	11200	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11201	+ }
	11202	+
10798	11203
10799	11204	gl.glActiveTexture(GL.GL_TEXTURE0);
10800	11205	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10817,9 +11222,9 @@
10817	11222
10818	11223	gl.glMatrixMode(GL.GL_MODELVIEW);
10819	11224
10820		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10821		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10822		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11225	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11226	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11227	+gl.glEnable(gl.GL_MULTISAMPLE);
10823	11228	} else
10824	11229	{
10825	11230	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10830,7 +11235,7 @@
10830	11235	//System.out.println("BLENDING ON");
10831	11236	gl.glEnable(GL.GL_BLEND);
10832	11237	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10833		-
	11238	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10834	11239	gl.glMatrixMode(gl.GL_PROJECTION);
10835	11240	gl.glLoadIdentity();
10836	11241
..	..	@@ -10919,8 +11324,8 @@
10919	11324	System.err.println("parentcam != renderCamera");
10920	11325
10921	11326	// if (cam != lightCamera)
10922		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10923		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11327	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11328	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10924	11329	}
10925	11330
10926	11331	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10941,8 +11346,8 @@
10941	11346	if (true) // TODO
10942	11347	{
10943	11348	if (cam != lightCamera)
10944		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10945		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11349	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11350	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10946	11351	}
10947	11352
10948	11353	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11079,7 +11484,7 @@
11079	11484	}
11080	11485	}
11081	11486
11082		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11487	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11083	11488	{
11084	11489	//gl.glDepthFunc(GL.GL_LEQUAL);
11085	11490	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11087,24 +11492,21 @@
11087	11492
11088	11493	boolean texon = textureon;
11089	11494
11090		- if (RENDERPROGRAM > 0)
11091		- {
11092		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11093		- textureon = false;
11094		- }
	11495	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11496	+ textureon = false;
	11497	+
11095	11498	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11096	11499	//System.out.println("ALLO");
11097	11500	gl.glColorMask(false, false, false, false);
11098	11501	DrawObject(gl);
11099		- if (RENDERPROGRAM > 0)
11100		- {
11101		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11102		- textureon = texon;
11103		- }
	11502	+
	11503	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11504	+ textureon = texon;
	11505	+
11104	11506	gl.glColorMask(true, true, true, true);
11105	11507
11106	11508	gl.glDepthFunc(GL.GL_EQUAL);
11107		- //gl.glDepthMask(false);
	11509	+ gl.glDepthMask(false);
11108	11510	}
11109	11511
11110	11512	if (false) // DrawMode() == SHADOW)
..	..	@@ -11279,23 +11681,44 @@
11279	11681	e.printStackTrace();
11280	11682	}
11281	11683
11282		- if (GrafreeD.RENDERME > 0)
11283		- GrafreeD.RENDERME--; // mechante magouille
	11684	+ if (Grafreed.RENDERME > 0)
	11685	+ Grafreed.RENDERME--; // mechante magouille
11284	11686
11285	11687	Globals.ONESTEP = false;
11286	11688	}
11287	11689
11288	11690	static boolean zoomonce = false;
11289	11691
	11692	+ static void CreateSelectedPoint()
	11693	+ {
	11694	+ if (selectedpoint == null)
	11695	+ {
	11696	+ debugpointG = new Sphere();
	11697	+ debugpointP = new Sphere();
	11698	+ debugpointC = new Sphere();
	11699	+ debugpointR = new Sphere();
	11700	+
	11701	+ selectedpoint = new Superellipsoid();
	11702	+
	11703	+ for (int i=0; i<8; i++)
	11704	+ {
	11705	+ debugpoints[i] = new Sphere();
	11706	+ }
	11707	+ }
	11708	+ }
	11709	+
11290	11710	void DrawObject(GL gl, boolean draw)
11291	11711	{
	11712	+ // To clear camera values
	11713	+ ResetOptions();
	11714	+
11292	11715	//System.out.println("DRAW OBJECT " + mouseDown);
11293	11716	// DrawMode() = SELECTION;
11294	11717	//GL gl = getGL();
11295	11718	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11296	11719	{
11297	11720	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11298		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11721	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11299	11722	pingthread.StepToTarget(true); // true);
11300	11723	// zoomonce = false;
11301	11724	}
..	..	@@ -11350,7 +11773,14 @@
11350	11773
11351	11774	usedtextures.clear();
11352	11775
11353		- BindTextures(DEFAULT_TEXTURES, 2);
	11776	+ try
	11777	+ {
	11778	+ BindTextures(DEFAULT_TEXTURES, 2);
	11779	+ }
	11780	+ catch (Exception e)
	11781	+ {
	11782	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11783	+ }
11354	11784	}
11355	11785	//System.out.println("--> " + stackdepth);
11356	11786	// GrafreeD.traceon();
..	..	@@ -11360,8 +11790,9 @@
11360	11790
11361	11791	if (DrawMode() == DEFAULT)
11362	11792	{
11363		- if (DEBUG)
	11793	+ if (Globals.DEBUG)
11364	11794	{
	11795	+ CreateSelectedPoint();
11365	11796	float radius = 0.05f;
11366	11797	if (selectedpoint.radius != radius)
11367	11798	{
..	..	@@ -11415,20 +11846,32 @@
11415	11846	ReleaseTextures(DEFAULT_TEXTURES);
11416	11847
11417	11848	if (CLEANCACHE)
11418		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11849	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11419	11850	{
11420		- String tex = e.nextElement();
	11851	+ cTexture tex = e.nextElement();
11421	11852
11422	11853	// System.out.println("Texture --------- " + tex);
11423	11854
11424		- if (tex.equals("WHITE_NOISE"))
	11855	+ if (tex.equals("WHITE_NOISE:"))
11425	11856	continue;
11426	11857
11427		- if (!usedtextures.containsKey(tex))
	11858	+ if (!usedtextures.contains(tex))
11428	11859	{
	11860	+ CacheTexture gettex = texturepigment.get(tex);
11429	11861	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11430		- textures.get(tex).texture.dispose();
11431		- textures.remove(tex);
	11862	+ if (gettex != null)
	11863	+ {
	11864	+ gettex.texture.dispose();
	11865	+ texturepigment.remove(tex);
	11866	+ }
	11867	+
	11868	+ gettex = texturebump.get(tex);
	11869	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11870	+ if (gettex != null)
	11871	+ {
	11872	+ gettex.texture.dispose();
	11873	+ texturebump.remove(tex);
	11874	+ }
11432	11875	}
11433	11876	}
11434	11877	}
..	..	@@ -11441,7 +11884,14 @@
11441	11884	if (checker != null && DrawMode() == DEFAULT)
11442	11885	{
11443	11886	//BindTexture(IMMORTAL_TEXTURE);
11444		- BindTextures(checker.GetTextures(), checker.texres);
	11887	+ try
	11888	+ {
	11889	+ BindTextures(checker.GetTextures(), checker.texres);
	11890	+ }
	11891	+ catch (Exception e)
	11892	+ {
	11893	+ System.err.println("FAILED: " + checker.GetTextures());
	11894	+ }
11445	11895	// NEAREST
11446	11896	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11447	11897	DrawChecker(gl);
..	..	@@ -11523,7 +11973,7 @@
11523	11973	return;
11524	11974	}
11525	11975
11526		- String string = obj.GetToolTip();
	11976	+ String string = obj.toString(); //.GetToolTip();
11527	11977
11528	11978	GL gl = GetGL();
11529	11979
..	..	@@ -11840,8 +12290,8 @@
11840	12290	//obj.TransformToWorld(light, light);
11841	12291	for (int i = tp.size(); --i >= 0;)
11842	12292	{
11843		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11844		- LA.xformPos(light, tp.get(i).toParent, light);
	12293	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12294	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11845	12295	}
11846	12296
11847	12297
..	..	@@ -11858,8 +12308,8 @@
11858	12308	parentcam = cameras[0];
11859	12309	}
11860	12310
11861		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11862		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12311	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12312	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11863	12313
11864	12314	LA.xformPos(light, renderCamera.toScreen, light);
11865	12315
..	..	@@ -11950,7 +12400,52 @@
11950	12400	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11951	12401
11952	12402	String program =
	12403	+ // Min shader
11953	12404	"!!ARBfp1.0\n" +
	12405	+ "PARAM zero123 = { 0.0, 1.0, 2.0, 1.25 };" +
	12406	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12407	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12408	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12409	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12410	+ "TEMP temp;" +
	12411	+ "TEMP light;" +
	12412	+ "TEMP ndotl;" +
	12413	+ "TEMP normal;" +
	12414	+ "TEMP depth;" +
	12415	+
	12416	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12417	+
	12418	+ "MOV light, state.light[0].position;" +
	12419	+ "DP3 ndotl.x, light, normal;" +
	12420	+
	12421	+ // shadow
	12422	+ "MOV temp, fragment.texcoord[1];" +
	12423	+ TextureFetch("depth", "temp", "1") +
	12424	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12425	+ "SLT temp.x, fragment.texcoord[1].z, depth.z;" +
	12426	+
	12427	+
	12428	+ // No shadow when out of frustum
	12429	+ //"SGE temp.y, depth.z, zero123.y;" +
	12430	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12431	+
	12432	+ "MUL ndotl.x, ndotl.x, temp.x;" +
	12433	+ "MAX ndotl.x, ndotl.x, pow2.y;" +
	12434	+
	12435	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12436	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12437	+ "MUL temp, temp, ndotl.x;" +
	12438	+
	12439	+ "MUL temp, temp, zero123.z;" +
	12440	+
	12441	+ "MOV temp.w, zero123.y;" + // reset alpha
	12442	+
	12443	+ "MOV result.color, temp;" +
	12444	+ "END";
	12445	+
	12446	+ String program2 =
	12447	+ "!!ARBfp1.0\n" +
	12448	+
11954	12449	//"OPTION ARB_fragment_program_shadow;" +
11955	12450	"PARAM light2cam0 = program.env[10];" +
11956	12451	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12065,8 +12560,7 @@
12065	12560	"TEMP shininess;" +
12066	12561	"\n" +
12067	12562	"MOV texSamp, one;" +
12068		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12069		-
	12563	+
12070	12564	"MOV mapgrid.x, one2048th.x;" +
12071	12565	"MOV temp, fragment.texcoord[1];" +
12072	12566	/*
..	..	@@ -12471,10 +12965,10 @@
12471	12965	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12472	12966	"") +
12473	12967
12474		- // display shadow only (bump == 0)
	12968	+ // display shadow only (fakedepth == 0)
12475	12969	"SUB temp.x, half.x, shadow.x;" +
12476		- "MOV temp.y, -params6.x;" +
12477		- "SLT temp.z, temp.y, zero.x;" +
	12970	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12971	+ "SLT temp.z, temp.y, -one2048th.x;" +
12478	12972	"SUB temp.y, one.x, temp.z;" +
12479	12973	"MUL temp.x, temp.x, temp.y;" +
12480	12974	"KIL temp.x;" +
..	..	@@ -12754,7 +13248,7 @@
12754	13248	"MUL final.y, fragment.texcoord[0].x, c256;" +
12755	13249	"FLR final.x, final.y;" +
12756	13250	"SUB final.y, final.y, final.x;" +
12757		- //"MUL final.x, final.x, c256i;" +
	13251	+ "MUL final.x, final.x, c256i;" +
12758	13252	"MOV final.z, zero.x;" +
12759	13253	"MOV final.a, one.w;":""
12760	13254	) +
..	..	@@ -12762,7 +13256,7 @@
12762	13256	"MUL final.y, fragment.texcoord[0].y, c256;" +
12763	13257	"FLR final.x, final.y;" +
12764	13258	"SUB final.y, final.y, final.x;" +
12765		- //"MUL final.x, final.x, c256i;" +
	13259	+ "MUL final.x, final.x, c256i;" +
12766	13260	"MOV final.z, zero.x;" +
12767	13261	"MOV final.a, one.w;":""
12768	13262	) +
..	..	@@ -12805,7 +13299,7 @@
12805	13299	//once = true;
12806	13300	}
12807	13301
12808		- System.out.print("Program #" + mode + "; length = " + program.length());
	13302	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12809	13303	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12810	13304	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12811	13305
..	..	@@ -12903,20 +13397,20 @@
12903	13397	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12904	13398	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12905	13399	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13400	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13401	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12906	13402	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12907		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12908		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12909		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12910		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13403	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13404	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12911	13405	//"SWZ buffer, temp, w,w,w,w;";
12912		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13406	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12913	13407	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12914	13408	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12915	13409	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12916		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13410	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12917	13411
12918		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12919		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13412	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13413	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12920	13414	}
12921	13415
12922	13416	String Shadow(String depth, String shadow)
..	..	@@ -12938,12 +13432,16 @@
12938	13432
12939	13433	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12940	13434	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13435	+
	13436	+ // Compare fragment depth in light space with shadowmap.
12941	13437	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12942	13438	"SGE temp.y, temp.x, zero.x;" +
12943		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13439	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13440	+
	13441	+ // Reverse comparison
12944	13442	"SUB temp.x, one.x, temp.x;" +
12945	13443	"MUL " + shadow + ".x, temp.x, temp.y;" +
12946		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13444	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12947	13445	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12948	13446
12949	13447	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12957,6 +13455,10 @@
12957	13455	// No shadow for backface
12958	13456	"DP3 temp.x, normal, lightd;" +
12959	13457	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13458	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13459	+
	13460	+ // No shadow when out of frustum
	13461	+ "SGE temp.x, " + depth + ".z, one.z;" +
12960	13462	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12961	13463	"";
12962	13464	}
..	..	@@ -13103,7 +13605,8 @@
13103	13605	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13104	13606	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13105	13607	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13106		- Object3D.cVector2[] vector2buffer;
	13608	+
	13609	+ //Object3D.cVector2[] vector2buffer;
13107	13610
13108	13611	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13109	13612	// OUT : diff, spec
..	..	@@ -13119,9 +13622,10 @@
13119	13622	"DP3 " + dest + ".z," + "normals," + "eye;" +
13120	13623	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13121	13624	//"MOV " + dest + ".w," + "normal.z;" +
13122		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13123		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13124		- //"MOV " + dest + ".z," + "params2.w;" +
	13625	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13626	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13627	+
	13628	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13125	13629	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13126	13630	"RCP " + dest + ".w," + dest + ".w;" +
13127	13631	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13515,7 +14019,7 @@
13515	14019	public void mousePressed(MouseEvent e)
13516	14020	{
13517	14021	//System.out.println("mousePressed: " + e);
13518		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14022	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13519	14023	}
13520	14024
13521	14025	static long prevtime = 0;
..	..	@@ -13591,8 +14095,8 @@
13591	14095	// mode \|= META;
13592	14096	//}
13593	14097
13594		- SetMouseMode(WHEEL \| e.getModifiersEx());
13595		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14098	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14099	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13596	14100	anchorX = ax;
13597	14101	anchorY = ay;
13598	14102	prevX = px;
..	..	@@ -13626,6 +14130,7 @@
13626	14130	else
13627	14131	if (evt.getSource() == AAtimer)
13628	14132	{
	14133	+ Globals.TIMERRUNNING = false;
13629	14134	if (mouseDown)
13630	14135	{
13631	14136	//new Exception().printStackTrace();
..	..	@@ -13651,6 +14156,10 @@
13651	14156	// LIVE = waslive;
13652	14157	// wasliveok = true;
13653	14158	// waslive = false;
	14159	+
	14160	+ // May 2019 Forget it:
	14161	+ if (true)
	14162	+ return;
13654	14163
13655	14164	// source == timer
13656	14165	if (mouseDown)
..	..	@@ -13681,7 +14190,7 @@
13681	14190
13682	14191	// fev 2014???
13683	14192	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13684		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14193	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13685	14194	pingthread.StepToTarget(true); // true);
13686	14195	}
13687	14196	// if (!LIVE)
..	..	@@ -13690,12 +14199,13 @@
13690	14199
13691	14200	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13692	14201
13693		- void clickStart(int x, int y, int modifiers)
	14202	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13694	14203	{
13695	14204	if (!wasliveok)
13696	14205	return;
13697	14206
13698	14207	AAtimer.restart(); //
	14208	+ Globals.TIMERRUNNING = true;
13699	14209
13700	14210	// waslive = LIVE;
13701	14211	// LIVE = false;
..	..	@@ -13707,7 +14217,7 @@
13707	14217	// touched = true; // main DL
13708	14218	if (isRenderer)
13709	14219	{
13710		- SetMouseMode(modifiers);
	14220	+ SetMouseMode(modifiers, modifiersex);
13711	14221	}
13712	14222
13713	14223	selectX = anchorX = x;
..	..	@@ -13720,7 +14230,7 @@
13720	14230	clicked = true;
13721	14231	hold = false;
13722	14232
13723		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14233	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13724	14234	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13725	14235	{
13726	14236	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13745,14 +14255,15 @@
13745	14255	drag = false;
13746	14256	//System.out.println("Mouse DOWN");
13747	14257	editObj = false;
13748		- ClickInfo info = new ClickInfo();
13749		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13750		- info.pane = this;
13751		- info.camera = renderCamera;
13752		- info.x = x;
13753		- info.y = y;
13754		- info.modifiers = modifiers;
13755		- editObj = object.doEditClick(info, 0);
	14258	+ //ClickInfo info = new ClickInfo();
	14259	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14260	+ object.clickInfo.pane = this;
	14261	+ object.clickInfo.camera = renderCamera;
	14262	+ object.clickInfo.x = x;
	14263	+ object.clickInfo.y = y;
	14264	+ object.clickInfo.modifiers = modifiersex;
	14265	+ editObj = object.doEditClick(//info,
	14266	+ 0);
13756	14267	if (!editObj)
13757	14268	{
13758	14269	hasMarquee = true;
..	..	@@ -13768,9 +14279,12 @@
13768	14279
13769	14280	public void mouseDragged(MouseEvent e)
13770	14281	{
	14282	+ Globals.MOUSEDRAGGED = true;
	14283	+
13771	14284	//System.out.println("mouseDragged: " + e);
13772	14285	if (isRenderer)
13773	14286	movingcamera = true;
	14287	+
13774	14288	//if (drawing)
13775	14289	//return;
13776	14290	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13780,7 +14294,7 @@
13780	14294	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13781	14295	}
13782	14296	else
13783		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14297	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13784	14298
13785	14299	//try { Thread.sleep(1); } catch (Exception ex) {}
13786	14300	}
..	..	@@ -14017,7 +14531,7 @@
14017	14531	{
14018	14532	Globals.lighttouched = true;
14019	14533	}
14020		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14534	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14021	14535	}
14022	14536	//else
14023	14537	}
..	..	@@ -14031,12 +14545,12 @@
14031	14545	void GoDown(int mod)
14032	14546	{
14033	14547	MODIFIERS \|= COMMAND;
14034		- /*
	14548	+ /**/
14035	14549	if((mod&SHIFT) == SHIFT)
14036	14550	manipCamera.RotatePosition(0, -speed);
14037	14551	else
14038		- manipCamera.BackForth(0, -speed*delta, getWidth());
14039		- */
	14552	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14553	+ /**/
14040	14554	if ((mod & SHIFT) == SHIFT)
14041	14555	{
14042	14556	mouseMode = mouseMode; // VR??
..	..	@@ -14052,12 +14566,12 @@
14052	14566	void GoUp(int mod)
14053	14567	{
14054	14568	MODIFIERS \|= COMMAND;
14055		- /*
	14569	+ /**/
14056	14570	if((mod&SHIFT) == SHIFT)
14057	14571	manipCamera.RotatePosition(0, speed);
14058	14572	else
14059		- manipCamera.BackForth(0, speed*delta, getWidth());
14060		- */
	14573	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14574	+ /**/
14061	14575	if ((mod & SHIFT) == SHIFT)
14062	14576	{
14063	14577	mouseMode = mouseMode;
..	..	@@ -14073,12 +14587,12 @@
14073	14587	void GoLeft(int mod)
14074	14588	{
14075	14589	MODIFIERS \|= COMMAND;
14076		- /*
	14590	+ /**/
14077	14591	if((mod&SHIFT) == SHIFT)
14078		- manipCamera.RotatePosition(speed, 0);
14079		- else
14080	14592	manipCamera.Translate(speed*delta, 0, getWidth());
14081		- */
	14593	+ else
	14594	+ manipCamera.RotatePosition(speed, 0);
	14595	+ /**/
14082	14596	if ((mod & SHIFT) == SHIFT)
14083	14597	{
14084	14598	mouseMode = mouseMode;
..	..	@@ -14094,12 +14608,12 @@
14094	14608	void GoRight(int mod)
14095	14609	{
14096	14610	MODIFIERS \|= COMMAND;
14097		- /*
	14611	+ /**/
14098	14612	if((mod&SHIFT) == SHIFT)
14099		- manipCamera.RotatePosition(-speed, 0);
14100		- else
14101	14613	manipCamera.Translate(-speed*delta, 0, getWidth());
14102		- */
	14614	+ else
	14615	+ manipCamera.RotatePosition(-speed, 0);
	14616	+ /**/
14103	14617	if ((mod & SHIFT) == SHIFT)
14104	14618	{
14105	14619	mouseMode = mouseMode;
..	..	@@ -14117,7 +14631,7 @@
14117	14631	int X, Y;
14118	14632	boolean SX, SY;
14119	14633
14120		- void drag(int x, int y, int modifiers)
	14634	+ void drag(int x, int y, int modifiers, int modifiersex)
14121	14635	{
14122	14636	if (IsFrozen())
14123	14637	{
..	..	@@ -14126,17 +14640,17 @@
14126	14640
14127	14641	drag = true; // NEW
14128	14642
14129		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14643	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14130	14644
14131	14645	X = x;
14132	14646	Y = y;
14133	14647	// floating state for animation
14134		- MODIFIERS = modifiers;
14135		- modifiers &= ~1024;
	14648	+ MODIFIERS = modifiersex;
	14649	+ modifiersex &= ~1024;
14136	14650	if (false) // modifiers != 0)
14137	14651	{
14138	14652	//new Exception().printStackTrace();
14139		- System.out.println("mouseDragged: " + modifiers);
	14653	+ System.out.println("mouseDragged: " + modifiersex);
14140	14654	System.out.println("SHIFT = " + SHIFT);
14141	14655	System.out.println("CONTROL = " + COMMAND);
14142	14656	System.out.println("META = " + META);
..	..	@@ -14149,14 +14663,16 @@
14149	14663	if (editObj)
14150	14664	{
14151	14665	drag = true;
14152		- ClickInfo info = new ClickInfo();
14153		- info.bounds.setBounds(0, 0,
	14666	+ //ClickInfo info = new ClickInfo();
	14667	+ object.clickInfo.bounds.setBounds(0, 0,
14154	14668	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14155		- info.pane = this;
14156		- info.camera = renderCamera;
14157		- info.x = x;
14158		- info.y = y;
14159		- object.editWindow.copy.doEditDrag(info);
	14669	+ object.clickInfo.pane = this;
	14670	+ object.clickInfo.camera = renderCamera;
	14671	+ object.clickInfo.x = x;
	14672	+ object.clickInfo.y = y;
	14673	+ object //.GetWindow().copy
	14674	+ .doEditDrag(//info,
	14675	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14160	14676	} else
14161	14677	{
14162	14678	if (x < startX)
..	..	@@ -14305,22 +14821,27 @@
14305	14821	}
14306	14822	}
14307	14823
	14824	+// ClickInfo clickInfo = new ClickInfo();
	14825	+
14308	14826	public void mouseMoved(MouseEvent e)
14309	14827	{
14310	14828	//System.out.println("mouseMoved: " + e);
14311	14829	if (isRenderer)
14312	14830	return;
14313	14831
14314		- ClickInfo ci = new ClickInfo();
14315		- ci.x = e.getX();
14316		- ci.y = e.getY();
14317		- ci.modifiers = e.getModifiersEx();
14318		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14319		- ci.pane = this;
14320		- ci.camera = renderCamera;
	14832	+ // Mouse cursor feedback
	14833	+ object.clickInfo.x = e.getX();
	14834	+ object.clickInfo.y = e.getY();
	14835	+ object.clickInfo.modifiers = e.getModifiersEx();
	14836	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14837	+ object.clickInfo.pane = this;
	14838	+ object.clickInfo.camera = renderCamera;
14321	14839	if (!isRenderer)
14322	14840	{
14323		- if (object.editWindow.copy.doEditClick(ci, 0))
	14841	+ //ObjEditor editWindow = object.editWindow;
	14842	+ //Object3D copy = editWindow.copy;
	14843	+ if (object.doEditClick(//clickInfo,
	14844	+ 0))
14324	14845	{
14325	14846	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14326	14847	} else
..	..	@@ -14332,7 +14853,11 @@
14332	14853
14333	14854	public void mouseReleased(MouseEvent e)
14334	14855	{
	14856	+ Globals.MOUSEDRAGGED = false;
	14857	+
14335	14858	movingcamera = false;
	14859	+ X = 0; // getBounds().width/2;
	14860	+ Y = 0; // getBounds().height/2;
14336	14861	//System.out.println("mouseReleased: " + e);
14337	14862	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14338	14863	}
..	..	@@ -14355,9 +14880,9 @@
14355	14880	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14356	14881	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14357	14882
14358		- if (control \|\| command \|\| IsFrozen())
	14883	+// No delay if (control \|\| command \|\| IsFrozen())
14359	14884	timeout = true;
14360		- else
	14885	+// ?? May 2019 else
14361	14886	// timer.setDelay((modifiers & 128) != 0?0:350);
14362	14887	mouseDown = false;
14363	14888	if (!control && !command) // june 2013
..	..	@@ -14467,7 +14992,7 @@
14467	14992	System.out.println("keyReleased: " + e);
14468	14993	}
14469	14994
14470		- void SetMouseMode(int modifiers)
	14995	+ void SetMouseMode(int modifiers, int modifiersex)
14471	14996	{
14472	14997	//System.out.println("SetMouseMode = " + modifiers);
14473	14998	//modifiers &= ~1024;
..	..	@@ -14479,25 +15004,25 @@
14479	15004	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14480	15005	// return;
14481	15006	//System.out.println("SetMode = " + modifiers);
14482		- if ((modifiers & WHEEL) == WHEEL)
	15007	+ if ((modifiersex & WHEEL) == WHEEL)
14483	15008	{
14484	15009	mouseMode \|= ZOOM;
14485	15010	}
14486	15011
14487	15012	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14488		- if (capsLocked \|\| (modifiers & META) == META)
	15013	+ if (capsLocked) // \|\| (modifiers & META) == META)
14489	15014	{
14490	15015	mouseMode \|= VR; // BACKFORTH;
14491	15016	}
14492		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15017	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14493	15018	{
14494	15019	mouseMode \|= SELECT;
14495	15020	}
14496		- if ((modifiers & COMMAND) == COMMAND)
	15021	+ if ((modifiersex & COMMAND) == COMMAND)
14497	15022	{
14498	15023	mouseMode \|= SELECT;
14499	15024	}
14500		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15025	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14501	15026	{
14502	15027	mouseMode &= ~VR;
14503	15028	mouseMode \|= TRANSLATE;
..	..	@@ -14526,7 +15051,7 @@
14526	15051
14527	15052	if (isRenderer) //
14528	15053	{
14529		- SetMouseMode(modifiers);
	15054	+ SetMouseMode(0, modifiers);
14530	15055	}
14531	15056
14532	15057	Globals.theRenderer.keyPressed(key);
..	..	@@ -14588,7 +15113,8 @@
14588	15113	// break;
14589	15114	case 'T':
14590	15115	CACHETEXTURE ^= true;
14591		- textures.clear();
	15116	+ texturepigment.clear();
	15117	+ texturebump.clear();
14592	15118	// repaint();
14593	15119	break;
14594	15120	case 'Y':
..	..	@@ -14673,7 +15199,9 @@
14673	15199	case 'E' : COMPACT ^= true;
14674	15200	repaint();
14675	15201	break;
14676		- case 'W' : DEBUGHSB ^= true;
	15202	+ case 'W' : // Wide Window (fullscreen)
	15203	+ //DEBUGHSB ^= true;
	15204	+ ObjEditor.theFrame.ToggleFullScreen();
14677	15205	repaint();
14678	15206	break;
14679	15207	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14698,8 +15226,8 @@
14698	15226	RevertCamera();
14699	15227	repaint();
14700	15228	break;
14701		- case 'L':
14702	15229	case 'l':
	15230	+ //case 'L':
14703	15231	if (lightMode)
14704	15232	{
14705	15233	lightMode = false;
..	..	@@ -14842,9 +15370,9 @@
14842	15370	case '_':
14843	15371	kompactbit = 5;
14844	15372	break;
14845		- case '+':
14846		- kompactbit = 6;
14847		- break;
	15373	+// case '+':
	15374	+// kompactbit = 6;
	15375	+// break;
14848	15376	case ' ':
14849	15377	lightMode ^= true;
14850	15378	Globals.lighttouched = true;
..	..	@@ -14856,13 +15384,14 @@
14856	15384	case ESC:
14857	15385	RENDERPROGRAM += 1;
14858	15386	RENDERPROGRAM %= 3;
	15387	+
14859	15388	repaint();
14860	15389	break;
14861	15390	case 'Z':
14862	15391	//RESIZETEXTURE ^= true;
14863	15392	//break;
14864	15393	case 'z':
14865		- RENDERSHADOW ^= true;
	15394	+ Globals.RENDERSHADOW ^= true;
14866	15395	Globals.lighttouched = true;
14867	15396	repaint();
14868	15397	break;
..	..	@@ -14895,8 +15424,9 @@
14895	15424	case DELETE:
14896	15425	ClearSelection();
14897	15426	break;
14898		- /*
14899	15427	case '+':
	15428	+
	15429	+ /*
14900	15430	//fontsize += 1;
14901	15431	bbzoom *= 2;
14902	15432	repaint();
..	..	@@ -14913,17 +15443,17 @@
14913	15443	case '=':
14914	15444	IncDepth();
14915	15445	//fontsize += 1;
14916		- object.editWindow.refreshContents(true);
	15446	+ object.GetWindow().refreshContents(true);
14917	15447	maskbit = 6;
14918	15448	break;
14919	15449	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14920	15450	DecDepth();
14921	15451	maskbit = 5;
14922	15452	//if(fontsize > 1) fontsize -= 1;
14923		- if (object.editWindow == null)
14924		- new Exception().printStackTrace();
14925		- else
14926		- object.editWindow.refreshContents(true);
	15453	+// if (object.editWindow == null)
	15454	+// new Exception().printStackTrace();
	15455	+// else
	15456	+ object.GetWindow().refreshContents(true);
14927	15457	break;
14928	15458	case '{':
14929	15459	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14986,7 +15516,7 @@
14986	15516	//mode = ROTATE;
14987	15517	if ((MODIFIERS & COMMAND) == 0) // VR??
14988	15518	{
14989		- SetMouseMode(modifiers);
	15519	+ SetMouseMode(0, modifiers);
14990	15520	}
14991	15521	}
14992	15522
..	..	@@ -15122,7 +15652,7 @@
15122	15652	{
15123	15653	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15124	15654	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15125		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15655	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15126	15656	{
15127	15657	mouseMoved(e);
15128	15658	} else
..	..	@@ -15147,7 +15677,7 @@
15147	15677	}
15148	15678	*/
15149	15679
15150		- object.editWindow.EditSelection();
	15680	+ object.GetWindow().EditSelection(false);
15151	15681	}
15152	15682
15153	15683	void SelectParent()
..	..	@@ -15164,10 +15694,10 @@
15164	15694	{
15165	15695	//selectees.remove(i);
15166	15696	System.out.println("select parent of " + elem);
15167		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15697	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15168	15698	} else
15169	15699	{
15170		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15700	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15171	15701	}
15172	15702
15173	15703	first = false;
..	..	@@ -15209,12 +15739,12 @@
15209	15739	for (int j = 0; j < group.children.size(); j++)
15210	15740	{
15211	15741	elem = (Object3D) group.children.elementAt(j);
15212		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15742	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15213	15743	first = false;
15214	15744	}
15215	15745	} else
15216	15746	{
15217		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15747	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15218	15748	}
15219	15749
15220	15750	first = false;
..	..	@@ -15225,21 +15755,21 @@
15225	15755	{
15226	15756	//Composite group = (Composite) object;
15227	15757	Object3D group = object;
15228		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15758	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15229	15759	}
15230	15760
15231	15761	void ResetTransform(int mask)
15232	15762	{
15233	15763	//Composite group = (Composite) object;
15234	15764	Object3D group = object;
15235		- group.editWindow.ResetTransform(mask);
	15765	+ group.GetWindow().ResetTransform(mask);
15236	15766	}
15237	15767
15238	15768	void FlipTransform()
15239	15769	{
15240	15770	//Composite group = (Composite) object;
15241	15771	Object3D group = object;
15242		- group.editWindow.FlipTransform();
	15772	+ group.GetWindow().FlipTransform();
15243	15773	// group.editWindow.ReduceMesh(true);
15244	15774	}
15245	15775
..	..	@@ -15247,7 +15777,7 @@
15247	15777	{
15248	15778	//Composite group = (Composite) object;
15249	15779	Object3D group = object;
15250		- group.editWindow.PrintMemory();
	15780	+ group.GetWindow().PrintMemory();
15251	15781	// group.editWindow.ReduceMesh(true);
15252	15782	}
15253	15783
..	..	@@ -15255,7 +15785,7 @@
15255	15785	{
15256	15786	//Composite group = (Composite) object;
15257	15787	Object3D group = object;
15258		- group.editWindow.ResetCentroid();
	15788	+ group.GetWindow().ResetCentroid();
15259	15789	}
15260	15790
15261	15791	void IncDepth()
..	..	@@ -15337,11 +15867,11 @@
15337	15867
15338	15868	int width = getBounds().width;
15339	15869	int height = getBounds().height;
15340		- ClickInfo info = new ClickInfo();
15341		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15342	15870	//Image img = CreateImage(width, height);
15343	15871	//System.out.println("width = " + width + "; height = " + height + "\n");
	15872	+
15344	15873	Graphics gr = g; // img.getGraphics();
	15874	+
15345	15875	if (!hasMarquee)
15346	15876	{
15347	15877	if (Xmin < Xmax) // !locked)
..	..	@@ -15413,40 +15943,88 @@
15413	15943	}
15414	15944	if (object != null && !hasMarquee)
15415	15945	{
	15946	+ if (object.clickInfo == null)
	15947	+ object.clickInfo = new ClickInfo();
	15948	+ ClickInfo info = object.clickInfo;
	15949	+ //ClickInfo info = new ClickInfo();
	15950	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	15951	+
15416	15952	if (isRenderer)
15417	15953	{
15418		- info.flags++;
	15954	+ object.clickInfo.flags++;
15419	15955	double frameAspect = (double) width / (double) height;
15420	15956	if (frameAspect > renderCamera.aspect)
15421	15957	{
15422	15958	int desired = (int) ((double) height * renderCamera.aspect);
15423		- info.bounds.width -= width - desired;
15424		- info.bounds.x += (width - desired) / 2;
	15959	+ object.clickInfo.bounds.width -= width - desired;
	15960	+ object.clickInfo.bounds.x += (width - desired) / 2;
15425	15961	} else
15426	15962	{
15427	15963	int desired = (int) ((double) width / renderCamera.aspect);
15428		- info.bounds.height -= height - desired;
15429		- info.bounds.y += (height - desired) / 2;
	15964	+ object.clickInfo.bounds.height -= height - desired;
	15965	+ object.clickInfo.bounds.y += (height - desired) / 2;
15430	15966	}
15431	15967	}
15432		- info.g = gr;
15433		- info.camera = renderCamera;
	15968	+
	15969	+ object.clickInfo.g = gr;
	15970	+ object.clickInfo.camera = renderCamera;
15434	15971	/*
15435	15972	// Memory intensive (brep.verticescopy)
15436	15973	if (!(object instanceof Composite))
15437	15974	object.draw(info, 0, false); // SLOW :
15438	15975	*/
15439		- if (!isRenderer)
	15976	+ if (!isRenderer) // && drag)
15440	15977	{
15441		- object.drawEditHandles(info, 0);
	15978	+ Grafreed.Assert(object != null);
	15979	+ Grafreed.Assert(object.selection != null);
	15980	+ if (object.selection.Size() > 0)
	15981	+ {
	15982	+ int hitSomething = object.selection.get(0).hitSomething;
	15983	+
	15984	+ object.clickInfo.DX = 0;
	15985	+ object.clickInfo.DY = 0;
	15986	+ object.clickInfo.W = 1;
	15987	+ if (hitSomething == Object3D.hitCenter)
	15988	+ {
	15989	+ info.DX = X;
	15990	+ if (X != 0)
	15991	+ info.DX -= info.bounds.width/2;
	15992	+
	15993	+ info.DY = Y;
	15994	+ if (Y != 0)
	15995	+ info.DY -= info.bounds.height/2;
	15996	+ }
	15997	+
	15998	+ object.drawEditHandles(//info,
	15999	+ 0);
	16000	+
	16001	+ if (drag && (X != 0 \|\| Y != 0))
	16002	+ {
	16003	+ switch (hitSomething)
	16004	+ {
	16005	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16006	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16007	+ break;
	16008	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16009	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16010	+ break;
	16011	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16012	+ gr.drawLine(X, Y, 0, 0);
	16013	+ break;
	16014	+ }
	16015	+
	16016	+ }
	16017	+ }
15442	16018	}
15443	16019	}
	16020	+
15444	16021	if (isRenderer)
15445	16022	{
15446	16023	//gr.setColor(Color.black);
15447	16024	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15448	16025	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15449	16026	}
	16027	+
15450	16028	if (hasMarquee)
15451	16029	{
15452	16030	gr.setXORMode(Color.white);
..	..	@@ -15559,6 +16137,7 @@
15559	16137	public boolean mouseDown(Event evt, int x, int y)
15560	16138	{
15561	16139	System.out.println("mouseDown: " + evt);
	16140	+ System.exit(0);
15562	16141	/*
15563	16142	locked = true;
15564	16143	drag = false;
..	..	@@ -15602,7 +16181,7 @@
15602	16181	{
15603	16182	keyPressed(0, modifiers);
15604	16183	}
15605		- clickStart(x, y, modifiers);
	16184	+ // clickStart(x, y, modifiers);
15606	16185	return true;
15607	16186	}
15608	16187
..	..	@@ -15720,7 +16299,7 @@
15720	16299	{
15721	16300	keyReleased(0, 0);
15722	16301	}
15723		- drag(x, y, modifiers);
	16302	+ drag(x, y, 0, modifiers);
15724	16303	return true;
15725	16304	}
15726	16305
..	..	@@ -15852,7 +16431,7 @@
15852	16431	Object3D object;
15853	16432	static Object3D trackedobject;
15854	16433	Camera renderCamera; // Light or Eye (or Occlusion)
15855		- /static/ Camera manipCamera; // Light or Eye
	16434	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15856	16435	/static/ Camera eyeCamera;
15857	16436	/static/ Camera lightCamera;
15858	16437	int cameracount;
..	..	@@ -16137,16 +16716,16 @@
16137	16716	cStatic.objectstack[materialdepth++] = checker;
16138	16717	//System.out.println("material " + material);
16139	16718	//Applet3D.tracein(this, selected);
16140		- vector2buffer = checker.projectedVertices;
	16719	+ //vector2buffer = checker.projectedVertices;
16141	16720
16142	16721	//checker.GetMaterial().Draw(this, false); // true);
16143		- DrawMaterial(checker.GetMaterial(), false); // true);
	16722	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16144	16723
16145	16724	materialdepth -= 1;
16146	16725	if (materialdepth > 0)
16147	16726	{
16148		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16149		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16727	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16728	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16150	16729	}
16151	16730	//checker.GetMaterial().opacity = 1f;
16152	16731	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16232,6 +16811,14 @@
16232	16811	}
16233	16812	}
16234	16813
	16814	+ private Object3D GetFolder()
	16815	+ {
	16816	+ Object3D folder = object.GetWindow().copy;
	16817	+ if (object.GetWindow().copy.selection.Size() > 0)
	16818	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16819	+ return folder;
	16820	+ }
	16821	+
16235	16822	class SelectBuffer implements GLEventListener
16236	16823	{
16237	16824
..	..	@@ -16311,6 +16898,17 @@
16311	16898
16312	16899	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16313	16900
	16901	+ if (PAINTMODE)
	16902	+ {
	16903	+ if (object.GetWindow().copy.selection.Size() > 0)
	16904	+ {
	16905	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16906	+
	16907	+ // Make what you paint not selectable.
	16908	+ paintobj.ResetSelectable();
	16909	+ }
	16910	+ }
	16911	+
16314	16912	//int tmp = selection_view;
16315	16913	//selection_view = -1;
16316	16914	int temp = DrawMode();
..	..	@@ -16322,6 +16920,17 @@
16322	16920	// temp = DEFAULT; // patch for selection debug
16323	16921	Globals.drawMode = temp; // WARNING
16324	16922
	16923	+ if (PAINTMODE)
	16924	+ {
	16925	+ if (object.GetWindow().copy.selection.Size() > 0)
	16926	+ {
	16927	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16928	+
	16929	+ // Revert.
	16930	+ paintobj.RestoreSelectable();
	16931	+ }
	16932	+ }
	16933	+
16325	16934	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16326	16935
16327	16936	// trying different ways of getting the depth info over
..	..	@@ -16369,6 +16978,8 @@
16369	16978	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16370	16979	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16371	16980	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16981	+
	16982	+ CreateSelectedPoint();
16372	16983
16373	16984	// Will fit the mesh !!!
16374	16985	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16418,34 +17029,36 @@
16418	17029	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
16419	17030	}
16420	17031
16421		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17032	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16422	17033	}
16423	17034	}
16424	17035
16425	17036	if (!movingcamera && !PAINTMODE)
16426		- object.editWindow.ScreenFitPoint(); // fev 2014
	17037	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16427	17038
16428		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17039	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16429	17040	{
16430		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17041	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16431	17042
16432		- Object3D group = new Object3D("inst" + paintcount++);
	17043	+ if (object.GetWindow().copy.selection.Size() > 0)
	17044	+ {
	17045	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16433	17046
16434		- group.CreateMaterial(); // use a void leaf to select instances
16435		-
16436		- group.add(paintobj); // link
16437		-
16438		- object.editWindow.SnapObject(group);
16439		-
16440		- Object3D folder = object.editWindow.copy;
16441		-
16442		- if (object.editWindow.copy.selection.Size() > 0)
16443		- folder = object.editWindow.copy.selection.elementAt(0);
16444		-
16445		- folder.add(group);
16446		-
16447		- object.editWindow.ResetModel();
16448		- object.editWindow.refreshContents();
	17047	+ Object3D inst = new Object3D("inst" + paintcount++);
	17048	+
	17049	+ inst.CreateMaterial(); // use a void leaf to select instances
	17050	+
	17051	+ inst.add(paintobj); // link
	17052	+
	17053	+ object.GetWindow().SnapObject(inst);
	17054	+
	17055	+ Object3D folder = paintFolder; // GetFolder();
	17056	+
	17057	+ folder.add(inst);
	17058	+
	17059	+ object.GetWindow().ResetModel();
	17060	+ object.GetWindow().refreshContents();
	17061	+ }
16449	17062	}
16450	17063	else
16451	17064	paintcount = 0;
..	..	@@ -16484,6 +17097,11 @@
16484	17097	//System.out.println("objects[color] = " + objects[color]);
16485	17098	//objects[color].Select();
16486	17099	indexcount = 0;
	17100	+ ObjEditor window = object.GetWindow();
	17101	+ if (window != null && deselect)
	17102	+ {
	17103	+ window.Select(null, deselect, true);
	17104	+ }
16487	17105	object.Select(color, deselect);
16488	17106	}
16489	17107
..	..	@@ -16583,7 +17201,7 @@
16583	17201	gl.glDisable(gl.GL_CULL_FACE);
16584	17202	}
16585	17203
16586		- if (!RENDERSHADOW)
	17204	+ if (!Globals.RENDERSHADOW)
16587	17205	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16588	17206
16589	17207	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16593,7 +17211,7 @@
16593	17211	//gl.glColorMask(false, false, false, false);
16594	17212
16595	17213	//render_scene_from_light_view(gl, drawable, 0, 0);
16596		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17214	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16597	17215	{
16598	17216	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16599	17217
..	..	@@ -17009,23 +17627,15 @@
17009	17627	int AAbuffersize = 0;
17010	17628
17011	17629	//double[] selectedpoint = new double[3];
17012		- static Superellipsoid selectedpoint = new Superellipsoid();
	17630	+ static Superellipsoid selectedpoint;
17013	17631	static Sphere previousselectedpoint = null;
17014		- static Sphere debugpointG = new Sphere();
17015		- static Sphere debugpointP = new Sphere();
17016		- static Sphere debugpointC = new Sphere();
17017		- static Sphere debugpointR = new Sphere();
	17632	+ static Sphere debugpointG;
	17633	+ static Sphere debugpointP;
	17634	+ static Sphere debugpointC;
	17635	+ static Sphere debugpointR;
17018	17636
17019	17637	static Sphere debugpoints[] = new Sphere[8];
17020	17638
17021		- static
17022		- {
17023		- for (int i=0; i<8; i++)
17024		- {
17025		- debugpoints[i] = new Sphere();
17026		- }
17027		- }
17028		-
17029	17639	static void InitPoints(float radius)
17030	17640	{
17031	17641	for (int i=0; i<8; i++)