~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;
..	..	@@ -150,6 +186,20 @@
150	186	defaultcaps.setAccumAlphaBits(16);
151	187	}
152	188
	189	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	190	+
	191	+ public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	192	+ {
	193	+ try
	194	+ {
	195	+ cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	196	+ } catch (IOException e)
	197	+ {
	198	+ System.out.println("NAME = " + name);
	199	+ e.printStackTrace(); // throw new RuntimeException(e);
	200	+ }
	201	+ }
	202	+
153	203	void SetAsGLRenderer(boolean b)
154	204	{
155	205	isRenderer = b;
..	..	@@ -168,7 +218,8 @@
168	218
169	219	SetCamera(cam);
170	220
171		- SetLight(new Camera(new cVector(10, 10, -20)));
	221	+ // Warning: not used.
	222	+ SetLight(new Camera(new cVector(15, 10, -20)));
172	223
173	224	object = o;
174	225
..	..	@@ -325,7 +376,7 @@
325	376	cStatic.objectstack[materialdepth++] = obj;
326	377	//System.out.println("material " + material);
327	378	//Applet3D.tracein(this, selected);
328		- display.vector2buffer = obj.projectedVertices;
	379	+ //display.vector2buffer = obj.projectedVertices;
329	380	if (obj instanceof Camera)
330	381	{
331	382	display.options1[0] = material.shift;
..	..	@@ -334,14 +385,28 @@
334	385	display.options1[2] = material.shadowbias;
335	386	display.options1[3] = material.aniso;
336	387	display.options1[4] = material.anisoV;
	388	+// System.out.println("display.options1[0] " + display.options1[0]);
	389	+// System.out.println("display.options1[1] " + display.options1[1]);
	390	+// System.out.println("display.options1[2] " + display.options1[2]);
	391	+// System.out.println("display.options1[3] " + display.options1[3]);
	392	+// System.out.println("display.options1[4] " + display.options1[4]);
337	393	display.options2[0] = material.opacity;
338	394	display.options2[1] = material.diffuse;
339	395	display.options2[2] = material.factor;
	396	+// System.out.println("display.options2[0] " + display.options2[0]);
	397	+// System.out.println("display.options2[1] " + display.options2[1]);
	398	+// System.out.println("display.options2[2] " + display.options2[2]);
340	399
341	400	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	401	+// System.out.println("display.options3[0] " + display.options3[0]);
	402	+// System.out.println("display.options3[1] " + display.options3[1]);
	403	+// System.out.println("display.options3[2] " + display.options3[2]);
342	404	display.options4[0] = material.cameralight/0.2f;
343	405	display.options4[1] = material.subsurface;
344	406	display.options4[2] = material.sheen;
	407	+// System.out.println("display.options4[0] " + display.options4[0]);
	408	+// System.out.println("display.options4[1] " + display.options4[1]);
	409	+// System.out.println("display.options4[2] " + display.options4[2]);
345	410
346	411	// if (display.CURRENTANTIALIAS > 0)
347	412	// display.options3[3] /= 4;
..	..	@@ -357,7 +422,7 @@
357	422	/**/
358	423	} else
359	424	{
360		- DrawMaterial(material, selected);
	425	+ DrawMaterial(material, selected, obj.projectedVertices);
361	426	}
362	427	} else
363	428	{
..	..	@@ -381,8 +446,8 @@
381	446	cStatic.objectstack[materialdepth++] = obj;
382	447	//System.out.println("material " + material);
383	448	//Applet3D.tracein("selected ", selected);
384		- display.vector2buffer = obj.projectedVertices;
385		- display.DrawMaterial(material, selected);
	449	+ //display.vector2buffer = obj.projectedVertices;
	450	+ display.DrawMaterial(material, selected, obj.projectedVertices);
386	451	}
387	452	}
388	453
..	..	@@ -399,8 +464,8 @@
399	464	materialdepth -= 1;
400	465	if (materialdepth > 0)
401	466	{
402		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
403		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	467	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	468	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
404	469	}
405	470	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
406	471	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -420,8 +485,8 @@
420	485	materialdepth -= 1;
421	486	if (materialdepth > 0)
422	487	{
423		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
424		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	488	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	489	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
425	490	}
426	491	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
427	492	//else
..	..	@@ -462,10 +527,12 @@
462	527	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463	528	{
464	529	//gl.glBegin(gl.GL_TRIANGLES);
465		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	530	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	531	+ // TEST LIVE NORMALS && !obj.dontselect
	532	+ ;
466	533	if (!hasnorm)
467	534	{
468		- // System.out.println("FUCK!!");
	535	+ // System.out.println("Mesh normal");
469	536	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
470	537	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
471	538	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1190,10 +1257,12 @@
1190	1257	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1191	1258	}
1192	1259	}
	1260	+
1193	1261	if (flipV)
1194	1262	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1195	1263	else
1196	1264	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1265	+
1197	1266	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1198	1267	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1199	1268
..	..	@@ -1213,10 +1282,12 @@
1213	1282	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1214	1283	}
1215	1284	}
	1285	+
1216	1286	if (flipV)
1217	1287	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1218	1288	else
1219	1289	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1290	+
1220	1291	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1221	1292	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1222	1293
..	..	@@ -1244,8 +1315,10 @@
1244	1315	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1245	1316	else
1246	1317	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1318	+
1247	1319	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1248	1320	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1321	+
1249	1322	count2 += 2;
1250	1323	count3 += 3;
1251	1324	}
..	..	@@ -1424,6 +1497,8 @@
1424	1497	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1425	1498	}
1426	1499
	1500	+ float[] colorV = new float[4];
	1501	+
1427	1502	void SetColor(Object3D obj, Vertex p0)
1428	1503	{
1429	1504	CameraPane display = this;
..	..	@@ -1491,8 +1566,6 @@
1491	1566	{
1492	1567	return;
1493	1568	}
1494		-
1495		- float[] colorV = new float[3];
1496	1569
1497	1570	if (false) // marked)
1498	1571	{
..	..	@@ -1601,7 +1674,7 @@
1601	1674	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1602	1675	}
1603	1676
1604		- void DrawMaterial(cMaterial material, boolean selected)
	1677	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1605	1678	{
1606	1679	CameraPane display = this;
1607	1680	//new Exception().printStackTrace();
..	..	@@ -1636,7 +1709,7 @@
1636	1709	colorV[0] = display.modelParams0[0] * material.diffuse;
1637	1710	colorV[1] = display.modelParams0[1] * material.diffuse;
1638	1711	colorV[2] = display.modelParams0[2] * material.diffuse;
1639		- colorV[3] = material.opacity;
	1712	+ colorV[3] = 1; // material.opacity;
1640	1713
1641	1714	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1642	1715	//System.out.println("Opacity = " + opacity);
..	..	@@ -1744,9 +1817,9 @@
1744	1817	display.modelParams7[2] = 0;
1745	1818	display.modelParams7[3] = 0;
1746	1819
1747		- display.modelParams6[0] = 100; // criss de bug de bump
	1820	+ //display.modelParams6[0] = 100; // criss de bug de bump
1748	1821
1749		- Object3D.cVector2[] extparams = display.vector2buffer;
	1822	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1750	1823	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1751	1824	{
1752	1825	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1888,7 +1961,7 @@
1888	1961	void PushMatrix(double[][] matrix)
1889	1962	{
1890	1963	// GrafreeD.tracein(matrix);
1891		- PushMatrix(matrix,1);
	1964	+ PushMatrix(matrix, 1);
1892	1965	}
1893	1966
1894	1967	void PushMatrix()
..	..	@@ -2042,7 +2115,7 @@
2042	2115	//System.err.println("Oeil on");
2043	2116	OEIL = true;
2044	2117	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2045		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2118	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2046	2119	//pingthread.StepToTarget(true);
2047	2120	}
2048	2121
..	..	@@ -2257,7 +2330,7 @@
2257	2330
2258	2331	void ToggleDebug()
2259	2332	{
2260		- DEBUG ^= true;
	2333	+ Globals.DEBUG ^= true;
2261	2334	}
2262	2335
2263	2336	void ToggleLookAt()
..	..	@@ -2265,7 +2338,7 @@
2265	2338	LOOKAT ^= true;
2266	2339	}
2267	2340
2268		- void ToggleRandom()
	2341	+ void ToggleSwitch()
2269	2342	{
2270	2343	SWITCH ^= true;
2271	2344	}
..	..	@@ -2275,10 +2348,17 @@
2275	2348	HANDLES ^= true;
2276	2349	}
2277	2350
	2351	+ Object3D paintFolder;
	2352	+
2278	2353	void TogglePaint()
2279	2354	{
2280	2355	PAINTMODE ^= true;
2281	2356	paintcount = 0;
	2357	+
	2358	+ if (PAINTMODE)
	2359	+ {
	2360	+ paintFolder = GetFolder();
	2361	+ }
2282	2362	}
2283	2363
2284	2364	void SwapCamera(int a, int b)
..	..	@@ -2374,7 +2454,22 @@
2374	2454	{
2375	2455	return currentGL;
2376	2456	}
2377		-
	2457	+
	2458	+ static private BufferedImage CreateBim(TextureData texturedata)
	2459	+ {
	2460	+ Grafreed.Assert(texturedata != null);
	2461	+
	2462	+ int width = texturedata.getWidth();
	2463	+ int height = texturedata.getHeight();
	2464	+
	2465	+ Buffer buffer = texturedata.getBuffer();
	2466	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2467	+
	2468	+ byte[] bytes = bytebuf.array();
	2469	+
	2470	+ return CreateBim(bytes, width, height);
	2471	+ }
	2472	+
2378	2473	/**/
2379	2474	class CacheTexture
2380	2475	{
..	..	@@ -2383,28 +2478,31 @@
2383	2478
2384	2479	int resolution;
2385	2480
2386		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2481	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2387	2482	{
2388		- texture = tex;
	2483	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2484	+ texturedata = texdata;
2389	2485	resolution = res;
2390	2486	}
2391	2487	}
2392	2488	/**/
2393	2489
2394	2490	// 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>();
	2491	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2492	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2493	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2494	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2495	+
2398	2496	int pigmentdepth = 0;
2399	2497	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2400	2498	int bumpdepth = 0;
2401	2499	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2500	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2403	2501	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2404		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2502	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2405	2503	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2406	2504
2407		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2505	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2408	2506	{
2409	2507	TextureData texturedata = null;
2410	2508
..	..	@@ -2423,13 +2521,34 @@
2423	2521	if (bump)
2424	2522	texturedata = ConvertBump(texturedata, false);
2425	2523
2426		- com.sun.opengl.util.texture.Texture texture =
2427		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2524	+// com.sun.opengl.util.texture.Texture texture =
	2525	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2428	2526
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);
	2527	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2528	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2431	2529
2432		- return texture;
	2530	+ return texturedata;
	2531	+ }
	2532	+
	2533	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2534	+ {
	2535	+ TextureData texturedata = null;
	2536	+
	2537	+ try
	2538	+ {
	2539	+ texturedata =
	2540	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2541	+ bim,
	2542	+ true);
	2543	+ } catch (Exception e)
	2544	+ {
	2545	+ throw new javax.media.opengl.GLException(e);
	2546	+ }
	2547	+
	2548	+ if (bump)
	2549	+ texturedata = ConvertBump(texturedata, false);
	2550	+
	2551	+ return texturedata;
2433	2552	}
2434	2553
2435	2554	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3502,6 +3621,8 @@
3502	3621
3503	3622	System.out.println("LOADING TEXTURE : " + name);
3504	3623
	3624	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3625	+
3505	3626	//
3506	3627	if (false) // compressbit > 0)
3507	3628	{
..	..	@@ -7900,7 +8021,7 @@
7900	8021	String pigment = Object3D.GetPigment(tex);
7901	8022	String bump = Object3D.GetBump(tex);
7902	8023
7903		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8024	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7904	8025	{
7905	8026	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7906	8027	// System.out.println("; bump = " + bump);
..	..	@@ -7915,11 +8036,69 @@
7915	8036	pigment = null;
7916	8037	}
7917	8038
7918		- ReleaseTexture(bump, true);
7919		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
7920	8041	}
7921	8042
7922		- void ReleaseTexture(String tex, boolean bump)
	8043	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8044	+ {
	8045	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8046	+ {
	8047	+ return;
	8048	+ }
	8049	+
	8050	+ if (tex == null)
	8051	+ {
	8052	+ ReleaseTexture(null, false);
	8053	+ return;
	8054	+ }
	8055	+
	8056	+ String pigment = Object3D.GetPigment(tex);
	8057	+
	8058	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8059	+ {
	8060	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8061	+ // System.out.println("; bump = " + bump);
	8062	+ }
	8063	+
	8064	+ if (pigment.equals(""))
	8065	+ {
	8066	+ pigment = null;
	8067	+ }
	8068	+
	8069	+ ReleaseTexture(tex, false);
	8070	+ }
	8071	+
	8072	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8073	+ {
	8074	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8075	+ {
	8076	+ return;
	8077	+ }
	8078	+
	8079	+ if (tex == null)
	8080	+ {
	8081	+ ReleaseTexture(null, true);
	8082	+ return;
	8083	+ }
	8084	+
	8085	+ String bump = Object3D.GetBump(tex);
	8086	+
	8087	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8088	+ {
	8089	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8090	+ // System.out.println("; bump = " + bump);
	8091	+ }
	8092	+
	8093	+ if (bump.equals(""))
	8094	+ {
	8095	+ bump = null;
	8096	+ }
	8097	+
	8098	+ ReleaseTexture(tex, true);
	8099	+ }
	8100	+
	8101	+ void ReleaseTexture(cTexture tex, boolean bump)
7923	8102	{
7924	8103	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7925	8104	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7930,7 +8109,7 @@
7930	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7931	8110
7932	8111	if (tex != null)
7933		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7934	8113
7935	8114	// //assert( texture != null );
7936	8115	// if (texture == null)
..	..	@@ -8024,6 +8203,54 @@
8024	8203
8025	8204	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8026	8205	{
	8206	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8207	+// ambientOcclusion ) // \|\| !textureon)
	8208	+// {
	8209	+// return; // false;
	8210	+// }
	8211	+//
	8212	+// if (tex == null)
	8213	+// {
	8214	+// BindTexture(null,false,resolution);
	8215	+// BindTexture(null,true,resolution);
	8216	+// return;
	8217	+// }
	8218	+//
	8219	+// String pigment = Object3D.GetPigment(tex);
	8220	+// String bump = Object3D.GetBump(tex);
	8221	+//
	8222	+// usedtextures.add(pigment);
	8223	+// usedtextures.add(bump);
	8224	+//
	8225	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8226	+// {
	8227	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8228	+// // System.out.println("; bump = " + bump);
	8229	+// }
	8230	+//
	8231	+// if (bump.equals(""))
	8232	+// {
	8233	+// bump = null;
	8234	+// }
	8235	+// if (pigment.equals(""))
	8236	+// {
	8237	+// pigment = null;
	8238	+// }
	8239	+//
	8240	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8241	+// BindTexture(pigment, false, resolution);
	8242	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8243	+// BindTexture(bump, true, resolution);
	8244	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8245	+//
	8246	+// return; // true;
	8247	+
	8248	+ BindPigmentTexture(tex, resolution);
	8249	+ BindBumpTexture(tex, resolution);
	8250	+ }
	8251	+
	8252	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8253	+ {
8027	8254	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8028	8255	ambientOcclusion ) // \|\| !textureon)
8029	8256	{
..	..	@@ -8033,17 +8260,47 @@
8033	8260	if (tex == null)
8034	8261	{
8035	8262	BindTexture(null,false,resolution);
8036		- BindTexture(null,true,resolution);
8037	8263	return;
8038	8264	}
8039	8265
8040	8266	String pigment = Object3D.GetPigment(tex);
	8267	+
	8268	+ usedtextures.add(tex);
	8269	+
	8270	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8271	+ {
	8272	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8273	+ // System.out.println("; bump = " + bump);
	8274	+ }
	8275	+
	8276	+ if (pigment.equals(""))
	8277	+ {
	8278	+ pigment = null;
	8279	+ }
	8280	+
	8281	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8282	+ BindTexture(tex, false, resolution);
	8283	+ }
	8284	+
	8285	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8286	+ {
	8287	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8288	+ ambientOcclusion ) // \|\| !textureon)
	8289	+ {
	8290	+ return; // false;
	8291	+ }
	8292	+
	8293	+ if (tex == null)
	8294	+ {
	8295	+ BindTexture(null,true,resolution);
	8296	+ return;
	8297	+ }
	8298	+
8041	8299	String bump = Object3D.GetBump(tex);
8042	8300
8043		- usedtextures.put(pigment, pigment);
8044		- usedtextures.put(bump, bump);
	8301	+ usedtextures.add(tex);
8045	8302
8046		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8303	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8047	8304	{
8048	8305	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8049	8306	// System.out.println("; bump = " + bump);
..	..	@@ -8053,47 +8310,94 @@
8053	8310	{
8054	8311	bump = null;
8055	8312	}
8056		- if (pigment.equals(""))
8057		- {
8058		- pigment = null;
8059		- }
8060	8313
8061		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8062		- BindTexture(pigment, false, resolution);
8063	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8064		- BindTexture(bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
8065	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8066		-
8067		- return; // true;
8068	8317	}
8069	8318
8070		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8319	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8320	+
	8321	+ private boolean FileExists(String tex)
8071	8322	{
8072		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8323	+ if (missingTextures.contains(tex))
	8324	+ {
	8325	+ return false;
	8326	+ }
	8327	+
	8328	+ boolean fileExists = new File(tex).exists();
	8329	+
	8330	+ if (!fileExists)
	8331	+ {
	8332	+ // If file exists, the "new File()" is not executed sgain
	8333	+ missingTextures.add(tex);
	8334	+ }
	8335	+
	8336	+ return fileExists;
	8337	+ }
	8338	+
	8339	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8340	+ {
	8341	+ CacheTexture texturecache = null;
8073	8342
8074	8343	if (tex != null)
8075	8344	{
8076		- String texname = tex;
	8345	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8346	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8077	8347
	8348	+ if (texname.equals("") && texdata == null)
	8349	+ {
	8350	+ return null;
	8351	+ }
	8352	+
	8353	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8354	+
8078	8355	// String[] split = tex.split("Textures");
8079	8356	// if (split.length > 1)
8080	8357	// texname = "/Users/nbriere/Textures" + split[split.length-1];
8081	8358	// else
8082	8359	// if (!texname.startsWith("/"))
8083	8360	// texname = "/Users/nbriere/Textures/" + texname;
8084		- if (!new File(tex).exists())
	8361	+ if (!FileExists(texname))
8085	8362	{
8086		- texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
	8363	+ texname = fallbackTextureName;
8087	8364	}
8088	8365
8089	8366	if (CACHETEXTURE)
8090		- texture = textures.get(texname); // TEXTURE CACHE
8091		-
8092		- TextureData texturedata = null;
8093		-
8094		- if (texture == null \|\| texture.resolution < resolution)
8095	8367	{
8096		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8368	+ if (texdata == null)
	8369	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8370	+ else
	8371	+ texturecache = bimtextures.get(texdata);
	8372	+ }
	8373	+
	8374	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8375	+ {
	8376	+ TextureData texturedata = null;
	8377	+
	8378	+ if (texdata != null && textureon)
	8379	+ {
	8380	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8381	+
	8382	+ try
	8383	+ {
	8384	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8385	+ }
	8386	+ catch (Exception e)
	8387	+ {
	8388	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8389	+ }
	8390	+
	8391	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8392	+ bimtextures.put(texdata, texturecache);
	8393	+
	8394	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8395	+
	8396	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8397	+ //bim2 = bim;
	8398	+ }
	8399	+ else
	8400	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8097	8401	{
8098	8402	assert(!bump);
8099	8403	// if (bump)
..	..	@@ -8104,19 +8408,23 @@
8104	8408	// }
8105	8409	// else
8106	8410	// {
8107		- texture = textures.get(tex);
8108		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
8109	8413	{
8110		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8111	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
8112	8418	// }
8113	8419	} else
8114		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8115	8421	{
8116	8422	assert(bump);
8117		- texture = textures.get(tex);
8118		- if (texture == null)
8119		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8423	+ // texturecache = textures.get(texname); // suspicious
	8424	+ if (texturecache == null)
	8425	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ else
	8427	+ new Exception().printStackTrace();
8120	8428	} else
8121	8429	{
8122	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -8124,11 +8432,13 @@
8124	8432	// texture = GetResourceTexture("default.png");
8125	8433	//} else
8126	8434	//{
8127		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
8128	8436	{
8129		- texture = textures.get(tex);
8130		- if (texture == null)
8131		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8437	+ // texturecache = textures.get(texname); // suspicious
	8438	+ if (texturecache == null)
	8439	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ else
	8441	+ new Exception().printStackTrace();
8132	8442	} else
8133	8443	{
8134	8444	if (textureon)
..	..	@@ -8153,7 +8463,7 @@
8153	8463	}
8154	8464
8155	8465	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8156		- if (!new File(cachename).exists())
	8466	+ if (!FileExists(cachename))
8157	8467	cachename = texname;
8158	8468	else
8159	8469	processbump = false; // don't process bump map again
..	..	@@ -8175,7 +8485,7 @@
8175	8485	}
8176	8486
8177	8487	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8178		- if (!new File(cachename).exists())
	8488	+ if (!FileExists(cachename))
8179	8489	cachename = texname;
8180	8490	else
8181	8491	processbump = false; // don't process bump map again
..	..	@@ -8187,19 +8497,19 @@
8187	8497	if (texturedata == null)
8188	8498	throw new Exception();
8189	8499
8190		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8500	+ texturecache = new CacheTexture(texturedata,resolution);
8191	8501	//texture = GetTexture(tex, bump);
8192	8502	}
8193	8503	}
8194	8504	//}
8195	8505	}
8196	8506
8197		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8507	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8198	8508	{
8199	8509	//return false;
8200	8510
8201	8511	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8202		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8512	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8203	8513	{
8204	8514	// String ext = "_highres";
8205	8515	// if (REDUCETEXTURE)
..	..	@@ -8216,52 +8526,17 @@
8216	8526	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8217	8527	if (!cachefile.exists())
8218	8528	{
8219		- // cache to disk
8220		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8221		- //buffers[0].
8222		-
8223		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8224		- int[] pixels = new int[bytebuf.capacity()/3];
8225		-
8226		- // squared size heuristic...
8227		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8529	+ //if (texturedata.getWidth() == texturedata.getHeight())
8228	8530	{
8229		- for (int i=pixels.length; --i>=0;)
8230		- {
8231		- int i3 = i*3;
8232		- pixels[i] = 0xFF;
8233		- pixels[i] <<= 8;
8234		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8235		- pixels[i] <<= 8;
8236		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8237		- pixels[i] <<= 8;
8238		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8239		- }
8240		-
8241		- /*
8242		- int r=0,g=0,b=0,a=0;
8243		- for (int i=0; i<width; i++)
8244		- for (int j=0; j<height; j++)
8245		- {
8246		- int index = j*width+i;
8247		- int p = pixels[index];
8248		- a = ((p>>24) & 0xFF);
8249		- r = ((p>>16) & 0xFF);
8250		- g = ((p>>8) & 0xFF);
8251		- b = (p & 0xFF);
8252		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8253		- }
8254		- /**/
8255		- int width = (int)Math.sqrt(pixels.length); // squared
8256		- int height = width;
8257		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8258		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8531	+ BufferedImage rendImage = CreateBim(texturedata);
	8532	+
8259	8533	ImageWriter writer = null;
8260	8534	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8261	8535	if (iter.hasNext()) {
8262	8536	writer = (ImageWriter)iter.next();
8263	8537	}
8264		- float compressionQuality = 0.9f;
	8538	+
	8539	+ float compressionQuality = 0.85f;
8265	8540	try
8266	8541	{
8267	8542	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8278,18 +8553,20 @@
8278	8553	}
8279	8554	}
8280	8555	}
8281		-
	8556	+
	8557	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8558	+
8282	8559	//System.out.println("Texture = " + tex);
8283		- if (textures.containsKey(texname))
	8560	+ if (textures.containsKey(tex))
8284	8561	{
8285		- CacheTexture thetex = textures.get(texname);
	8562	+ CacheTexture thetex = textures.get(tex);
8286	8563	thetex.texture.disable();
8287	8564	thetex.texture.dispose();
8288		- textures.remove(texname);
	8565	+ textures.remove(tex);
8289	8566	}
8290	8567
8291		- texture.texturedata = texturedata;
8292		- textures.put(texname, texture);
	8568	+ //texture.texturedata = texturedata;
	8569	+ textures.put(tex, texturecache);
8293	8570
8294	8571	// newtex = true;
8295	8572	}
..	..	@@ -8305,10 +8582,44 @@
8305	8582	}
8306	8583	}
8307	8584
8308		- return texture;
	8585	+ return texturecache;
8309	8586	}
8310	8587
8311		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8588	+ static void EmbedTextures(cTexture tex)
	8589	+ {
	8590	+ if (tex.pigmentdata == null)
	8591	+ {
	8592	+ //String texname = Object3D.GetPigment(tex);
	8593	+
	8594	+ CacheTexture texturecache = texturepigment.get(tex);
	8595	+
	8596	+ if (texturecache != null)
	8597	+ {
	8598	+ tex.pw = texturecache.texturedata.getWidth();
	8599	+ tex.ph = texturecache.texturedata.getHeight();
	8600	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8601	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8602	+ ;
	8603	+ //, tex.pw, tex.ph), 0.5f);
	8604	+ }
	8605	+ }
	8606	+
	8607	+ if (tex.bumpdata == null)
	8608	+ {
	8609	+ //String texname = Object3D.GetBump(tex);
	8610	+
	8611	+ CacheTexture texturecache = texturebump.get(tex);
	8612	+
	8613	+ if (texturecache != null)
	8614	+ {
	8615	+ tex.bw = texturecache.texturedata.getWidth();
	8616	+ tex.bh = texturecache.texturedata.getHeight();
	8617	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8618	+ }
	8619	+ }
	8620	+ }
	8621	+
	8622	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8312	8623	{
8313	8624	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8314	8625
..	..	@@ -8326,21 +8637,21 @@
8326	8637	return texture!=null?texture.texture:null;
8327	8638	}
8328	8639
8329		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8640	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8330	8641	{
8331	8642	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8332	8643
8333	8644	return texture!=null?texture.texturedata:null;
8334	8645	}
8335	8646
8336		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8647	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8337	8648	{
8338	8649	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8339	8650	{
8340	8651	return false;
8341	8652	}
8342	8653
8343		- boolean newtex = false;
	8654	+ //boolean newtex = false;
8344	8655
8345	8656	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8346	8657
..	..	@@ -8372,9 +8683,75 @@
8372	8683	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8373	8684	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8374	8685
8375		- return newtex;
	8686	+ return true; // Warning: not used.
8376	8687	}
8377	8688
	8689	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8690	+ {
	8691	+ try
	8692	+ {
	8693	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8694	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8695	+ ImageWriter writer = writers.next();
	8696	+
	8697	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8698	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8699	+ param.setCompressionQuality(quality);
	8700	+
	8701	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8702	+ writer.setOutput(ios);
	8703	+ writer.write(null, new IIOImage(image, null, null), param);
	8704	+
	8705	+ byte[] data = baos.toByteArray();
	8706	+ writer.dispose();
	8707	+ return data;
	8708	+ }
	8709	+ catch (Exception e)
	8710	+ {
	8711	+ e.printStackTrace();
	8712	+ return null;
	8713	+ }
	8714	+ }
	8715	+
	8716	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8717	+ {
	8718	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8719	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8720	+ ImageReader reader = writers.next();
	8721	+
	8722	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8723	+
	8724	+ ImageReadParam param = reader.getDefaultReadParam();
	8725	+ param.setDestination(bim);
	8726	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8727	+
	8728	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8729	+ reader.setInput(ios);
	8730	+ BufferedImage bim2 = reader.read(0, param);
	8731	+ reader.dispose();
	8732	+
	8733	+// WritableRaster raster = bim2.getRaster();
	8734	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8735	+// byte[] bytes = data.getData();
	8736	+//
	8737	+// int[] pixels = new int[bytes.length/3];
	8738	+// for (int i=pixels.length; --i>=0;)
	8739	+// {
	8740	+// int i3 = i*3;
	8741	+// pixels[i] = 0xFF;
	8742	+// pixels[i] <<= 8;
	8743	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8744	+// pixels[i] <<= 8;
	8745	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8746	+// pixels[i] <<= 8;
	8747	+// pixels[i] \|= bytes[i3] & 0xFF;
	8748	+// }
	8749	+//
	8750	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8751	+
	8752	+ return bim;
	8753	+ }
	8754	+
8378	8755	ShadowBuffer shadowPBuf;
8379	8756	AntialiasBuffer antialiasPBuf;
8380	8757	int MAXSTACK;
..	..	@@ -8567,7 +8944,7 @@
8567	8944
8568	8945	if (cubemap == null)
8569	8946	{
8570		- LoadEnvy(5);
	8947	+ //LoadEnvy(1);
8571	8948	}
8572	8949
8573	8950	//cubemap.enable();
..	..	@@ -8854,37 +9231,58 @@
8854	9231	cubemap = null;
8855	9232	return;
8856	9233	case 1:
8857		- name = "cubemaps/box_";
8858		- ext = "png";
	9234	+ name = "cubemaps/rgb/";
	9235	+ ext = "jpg";
8859	9236	reverseUP = false;
8860	9237	break;
8861	9238	case 2:
8862		- name = "cubemaps/uffizi_";
8863		- ext = "png";
8864		- break; // reverseUP = true; break;
	9239	+ name = "cubemaps/uffizi/";
	9240	+ ext = "jpg";
	9241	+ reverseUP = false;
	9242	+ break;
8865	9243	case 3:
8866		- name = "cubemaps/CloudyHills_";
8867		- ext = "tga";
	9244	+ name = "cubemaps/CloudyHills/";
	9245	+ ext = "jpg";
8868	9246	reverseUP = false;
8869	9247	break;
8870	9248	case 4:
8871		- name = "cubemaps/cornell_";
	9249	+ name = "cubemaps/cornell/";
8872	9250	ext = "png";
8873	9251	reverseUP = false;
8874	9252	break;
	9253	+ case 5:
	9254	+ name = "cubemaps/skycube/";
	9255	+ ext = "jpg";
	9256	+ reverseUP = false;
	9257	+ break;
	9258	+ case 6:
	9259	+ name = "cubemaps/SaintLazarusChurch3/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
	9263	+ case 7:
	9264	+ name = "cubemaps/Sodermalmsallen/";
	9265	+ ext = "jpg";
	9266	+ reverseUP = false;
	9267	+ break;
	9268	+ case 8:
	9269	+ name = "cubemaps/Sodermalmsallen2/";
	9270	+ ext = "jpg";
	9271	+ reverseUP = false;
	9272	+ break;
	9273	+ case 9:
	9274	+ name = "cubemaps/UnionSquare/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
8875	9278	default:
8876		- name = "cubemaps/rgb_";
8877		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9279	+ name = "cubemaps/box/";
	9280	+ ext = "png"; /mipmap = true;/
	9281	+ reverseUP = false;
8878	9282	break;
8879	9283	}
8880		-
8881		- try
8882		- {
8883		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8884		- } catch (IOException e)
8885		- {
8886		- throw new RuntimeException(e);
8887		- }
	9284	+
	9285	+ LoadSkybox(name, ext, mipmap);
8888	9286	}
8889	9287
8890	9288	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8916,8 +9314,13 @@
8916	9314	static double[] model = new double[16];
8917	9315	double[] camera2light = new double[16];
8918	9316	double[] light2camera = new double[16];
8919		- int newenvy = -1;
	9317	+
	9318	+ //int newenvy = -1;
8920	9319	boolean envyoff = true; // false;
	9320	+ String skyboxname = "";
	9321	+ String skyboxext;
	9322	+ String loadedskyboxname = "";
	9323	+
8921	9324	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8922	9325	//float[] light0 = { 0,0,0 };
8923	9326	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9210,11 +9613,35 @@
9210	9613	jy8[3] = 0.5f;
9211	9614	}
9212	9615
9213		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9616	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9214	9617	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9215	9618	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9216	9619	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9217	9620
	9621	+ void ResetOptions()
	9622	+ {
	9623	+ options1[0] = 100;
	9624	+ options1[1] = 0.025f;
	9625	+ options1[2] = 0.01f;
	9626	+ options1[3] = 0;
	9627	+ options1[4] = 0;
	9628	+
	9629	+ options2[0] = 0;
	9630	+ options2[1] = 0.75f;
	9631	+ options2[2] = 0;
	9632	+ options2[3] = 0;
	9633	+
	9634	+ options3[0] = 1;
	9635	+ options3[1] = 1;
	9636	+ options3[2] = 1;
	9637	+ options3[3] = 0;
	9638	+
	9639	+ options4[0] = 1;
	9640	+ options4[1] = 0;
	9641	+ options4[2] = 1;
	9642	+ options4[3] = 0;
	9643	+ }
	9644	+
9218	9645	static int imagecount = 0; // movie generation
9219	9646
9220	9647	static int jitter = 0;
..	..	@@ -9310,8 +9737,8 @@
9310	9737	assert (parentcam != renderCamera);
9311	9738
9312	9739	if (renderCamera != lightCamera)
9313		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9314		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9740	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9741	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9315	9742
9316	9743	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9317	9744
..	..	@@ -9326,8 +9753,8 @@
9326	9753	LA.matCopy(renderCamera.fromScreen, matrix);
9327	9754
9328	9755	if (renderCamera != lightCamera)
9329		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9330		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9756	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9757	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9331	9758
9332	9759	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9333	9760
..	..	@@ -9373,10 +9800,12 @@
9373	9800	rati = 1 / rati;
9374	9801	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9375	9802	}
9376		- assert (newenvy == -1);
	9803	+
	9804	+ //assert (newenvy == -1);
	9805	+
9377	9806	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9378	9807	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9379		- DrawSkyBox(gl);
	9808	+ DrawSkyBox(gl, (float)rati);
9380	9809	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9381	9810	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9382	9811	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10325,6 +10754,7 @@
10325	10754	ANTIALIAS = 0;
10326	10755	//System.out.println("RESTART");
10327	10756	AAtimer.restart();
	10757	+ Globals.TIMERRUNNING = true;
10328	10758	}
10329	10759	}
10330	10760	}
..	..	@@ -10392,13 +10822,14 @@
10392	10822	ambientOcclusion = false;
10393	10823	}
10394	10824
10395		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10825	+ if (//Globals.lighttouched &&
	10826	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10396	10827	{
10397	10828	//if (RENDERSHADOW) // ?
10398	10829	if (!IsFrozen())
10399	10830	{
10400	10831	// dec 2012
10401		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10832	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10402	10833	{
10403	10834	Globals.framecount++;
10404	10835	shadowbuffer.display();
..	..	@@ -10525,8 +10956,8 @@
10525	10956
10526	10957	// if (parentcam != renderCamera) // not a light
10527	10958	if (cam != lightCamera)
10528		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10529		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10959	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10960	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10530	10961
10531	10962	for (int j = 0; j < 4; j++)
10532	10963	{
..	..	@@ -10540,8 +10971,8 @@
10540	10971
10541	10972	// if (parentcam != renderCamera) // not a light
10542	10973	if (cam != lightCamera)
10543		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10544		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10974	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10975	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10545	10976
10546	10977	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10547	10978
..	..	@@ -10627,13 +11058,19 @@
10627	11058	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10628	11059	}
10629	11060
10630		- if (newenvy > -1)
	11061	+// if (newenvy > -1)
	11062	+// {
	11063	+// LoadEnvy(newenvy);
	11064	+// }
	11065	+//
	11066	+// newenvy = -1;
	11067	+
	11068	+ if (!skyboxname.equals(this.loadedskyboxname))
10631	11069	{
10632		- LoadEnvy(newenvy);
	11070	+ LoadSkybox(skyboxname + "/", skyboxext, false);
	11071	+ loadedskyboxname = skyboxname;
10633	11072	}
10634		-
10635		- newenvy = -1;
10636		-
	11073	+
10637	11074	ratio = ((double) getWidth()) / getHeight();
10638	11075	//System.out.println("ratio = " + ratio);
10639	11076
..	..	@@ -10649,7 +11086,7 @@
10649	11086
10650	11087	if (!IsFrozen() && !ambientOcclusion)
10651	11088	{
10652		- DrawSkyBox(gl);
	11089	+ DrawSkyBox(gl, (float)ratio);
10653	11090	}
10654	11091
10655	11092	//if (selection_view == -1)
..	..	@@ -10832,9 +11269,9 @@
10832	11269
10833	11270	gl.glMatrixMode(GL.GL_MODELVIEW);
10834	11271
10835		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10836		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10837		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11272	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11273	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11274	+gl.glEnable(gl.GL_MULTISAMPLE);
10838	11275	} else
10839	11276	{
10840	11277	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10845,7 +11282,7 @@
10845	11282	//System.out.println("BLENDING ON");
10846	11283	gl.glEnable(GL.GL_BLEND);
10847	11284	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10848		-
	11285	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10849	11286	gl.glMatrixMode(gl.GL_PROJECTION);
10850	11287	gl.glLoadIdentity();
10851	11288
..	..	@@ -10934,8 +11371,8 @@
10934	11371	System.err.println("parentcam != renderCamera");
10935	11372
10936	11373	// if (cam != lightCamera)
10937		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10938		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11374	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11375	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10939	11376	}
10940	11377
10941	11378	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10956,8 +11393,8 @@
10956	11393	if (true) // TODO
10957	11394	{
10958	11395	if (cam != lightCamera)
10959		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10960		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11396	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11397	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10961	11398	}
10962	11399
10963	11400	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11094,7 +11531,7 @@
11094	11531	}
11095	11532	}
11096	11533
11097		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11534	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11098	11535	{
11099	11536	//gl.glDepthFunc(GL.GL_LEQUAL);
11100	11537	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11102,24 +11539,21 @@
11102	11539
11103	11540	boolean texon = textureon;
11104	11541
11105		- if (RENDERPROGRAM > 0)
11106		- {
11107		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11108		- textureon = false;
11109		- }
	11542	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11543	+ textureon = false;
	11544	+
11110	11545	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11111	11546	//System.out.println("ALLO");
11112	11547	gl.glColorMask(false, false, false, false);
11113	11548	DrawObject(gl);
11114		- if (RENDERPROGRAM > 0)
11115		- {
11116		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11117		- textureon = texon;
11118		- }
	11549	+
	11550	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11551	+ textureon = texon;
	11552	+
11119	11553	gl.glColorMask(true, true, true, true);
11120	11554
11121	11555	gl.glDepthFunc(GL.GL_EQUAL);
11122		- //gl.glDepthMask(false);
	11556	+ gl.glDepthMask(false);
11123	11557	}
11124	11558
11125	11559	if (false) // DrawMode() == SHADOW)
..	..	@@ -11302,15 +11736,36 @@
11302	11736
11303	11737	static boolean zoomonce = false;
11304	11738
	11739	+ static void CreateSelectedPoint()
	11740	+ {
	11741	+ if (selectedpoint == null)
	11742	+ {
	11743	+ debugpointG = new Sphere();
	11744	+ debugpointP = new Sphere();
	11745	+ debugpointC = new Sphere();
	11746	+ debugpointR = new Sphere();
	11747	+
	11748	+ selectedpoint = new Superellipsoid();
	11749	+
	11750	+ for (int i=0; i<8; i++)
	11751	+ {
	11752	+ debugpoints[i] = new Sphere();
	11753	+ }
	11754	+ }
	11755	+ }
	11756	+
11305	11757	void DrawObject(GL gl, boolean draw)
11306	11758	{
	11759	+ // To clear camera values
	11760	+ ResetOptions();
	11761	+
11307	11762	//System.out.println("DRAW OBJECT " + mouseDown);
11308	11763	// DrawMode() = SELECTION;
11309	11764	//GL gl = getGL();
11310	11765	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11311	11766	{
11312	11767	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11313		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11768	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11314	11769	pingthread.StepToTarget(true); // true);
11315	11770	// zoomonce = false;
11316	11771	}
..	..	@@ -11382,8 +11837,9 @@
11382	11837
11383	11838	if (DrawMode() == DEFAULT)
11384	11839	{
11385		- if (DEBUG)
	11840	+ if (Globals.DEBUG)
11386	11841	{
	11842	+ CreateSelectedPoint();
11387	11843	float radius = 0.05f;
11388	11844	if (selectedpoint.radius != radius)
11389	11845	{
..	..	@@ -11437,20 +11893,32 @@
11437	11893	ReleaseTextures(DEFAULT_TEXTURES);
11438	11894
11439	11895	if (CLEANCACHE)
11440		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11896	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11441	11897	{
11442		- String tex = e.nextElement();
	11898	+ cTexture tex = e.nextElement();
11443	11899
11444	11900	// System.out.println("Texture --------- " + tex);
11445	11901
11446		- if (tex.equals("WHITE_NOISE"))
	11902	+ if (tex.equals("WHITE_NOISE:"))
11447	11903	continue;
11448	11904
11449		- if (!usedtextures.containsKey(tex))
	11905	+ if (!usedtextures.contains(tex))
11450	11906	{
	11907	+ CacheTexture gettex = texturepigment.get(tex);
11451	11908	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11452		- textures.get(tex).texture.dispose();
11453		- textures.remove(tex);
	11909	+ if (gettex != null)
	11910	+ {
	11911	+ gettex.texture.dispose();
	11912	+ texturepigment.remove(tex);
	11913	+ }
	11914	+
	11915	+ gettex = texturebump.get(tex);
	11916	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11917	+ if (gettex != null)
	11918	+ {
	11919	+ gettex.texture.dispose();
	11920	+ texturebump.remove(tex);
	11921	+ }
11454	11922	}
11455	11923	}
11456	11924	}
..	..	@@ -11552,7 +12020,7 @@
11552	12020	return;
11553	12021	}
11554	12022
11555		- String string = obj.GetToolTip();
	12023	+ String string = obj.toString(); //.GetToolTip();
11556	12024
11557	12025	GL gl = GetGL();
11558	12026
..	..	@@ -11869,8 +12337,8 @@
11869	12337	//obj.TransformToWorld(light, light);
11870	12338	for (int i = tp.size(); --i >= 0;)
11871	12339	{
11872		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11873		- LA.xformPos(light, tp.get(i).toParent, light);
	12340	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12341	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11874	12342	}
11875	12343
11876	12344
..	..	@@ -11887,8 +12355,8 @@
11887	12355	parentcam = cameras[0];
11888	12356	}
11889	12357
11890		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11891		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12358	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12359	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11892	12360
11893	12361	LA.xformPos(light, renderCamera.toScreen, light);
11894	12362
..	..	@@ -11978,8 +12446,76 @@
11978	12446
11979	12447	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11980	12448
	12449	+ String program0 =
	12450	+ // Min shader
	12451	+ "!!ARBfp1.0\n" +
	12452	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12453	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12454	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12455	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12456	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12457	+ "PARAM light2cam0 = program.env[10];" +
	12458	+ "PARAM light2cam1 = program.env[11];" +
	12459	+ "PARAM light2cam2 = program.env[12];" +
	12460	+ "TEMP temp;" +
	12461	+ "TEMP light;" +
	12462	+ "TEMP ndotl;" +
	12463	+ "TEMP normal;" +
	12464	+ "TEMP depth;" +
	12465	+ "TEMP eye;" +
	12466	+ "TEMP pos;" +
	12467	+
	12468	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12469	+ Normalize("normal") +
	12470	+ "MOV light, state.light[0].position;" +
	12471	+ "DP3 ndotl.x, light, normal;" +
	12472	+
	12473	+ // shadow
	12474	+ "MOV pos, fragment.texcoord[1];" +
	12475	+ "MOV temp, pos;" +
	12476	+ ShadowTextureFetch("depth", "temp", "1") +
	12477	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12478	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12479	+
	12480	+ // No shadow when out of frustum
	12481	+ //"SGE temp.y, depth.z, zero123.y;" +
	12482	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12483	+
	12484	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12485	+
	12486	+ // Backlit
	12487	+ "MOV pos.w, zero123.y;" +
	12488	+ "DP4 eye.x, pos, light2cam0;" +
	12489	+ "DP4 eye.y, pos, light2cam1;" +
	12490	+ "DP4 eye.z, pos, light2cam2;" +
	12491	+ Normalize("eye") +
	12492	+
	12493	+ "DP3 ndotl.y, -eye, normal;" +
	12494	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12495	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12496	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12497	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12498	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12499	+
	12500	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12501	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12502	+
	12503	+ // Pigment
	12504	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12505	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12506	+ "MUL temp, temp, ndotl.x;" +
	12507	+
	12508	+ "MUL temp, temp, zero123.z;" +
	12509	+
	12510	+ //"MUL temp, temp, ndotl.y;" +
	12511	+
	12512	+ "MOV temp.w, zero123.y;" + // reset alpha
	12513	+ "MOV result.color, temp;" +
	12514	+ "END";
	12515	+
11981	12516	String program =
11982	12517	"!!ARBfp1.0\n" +
	12518	+
11983	12519	//"OPTION ARB_fragment_program_shadow;" +
11984	12520	"PARAM light2cam0 = program.env[10];" +
11985	12521	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12094,8 +12630,7 @@
12094	12630	"TEMP shininess;" +
12095	12631	"\n" +
12096	12632	"MOV texSamp, one;" +
12097		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12098		-
	12633	+
12099	12634	"MOV mapgrid.x, one2048th.x;" +
12100	12635	"MOV temp, fragment.texcoord[1];" +
12101	12636	/*
..	..	@@ -12116,20 +12651,20 @@
12116	12651	"MUL temp, floor, mapgrid.x;" +
12117	12652	//"TEX depth0, temp, texture[1], 2D;" +
12118	12653	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12119		- TextureFetch("depth0", "temp", "1") +
	12654	+ ShadowTextureFetch("depth0", "temp", "1") +
12120	12655	"") +
12121	12656	"ADD temp.x, temp.x, mapgrid.x;" +
12122	12657	//"TEX depth1, temp, texture[1], 2D;" +
12123	12658	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12124		- TextureFetch("depth1", "temp", "1") +
	12659	+ ShadowTextureFetch("depth1", "temp", "1") +
12125	12660	"") +
12126	12661	"ADD temp.y, temp.y, mapgrid.x;" +
12127	12662	//"TEX depth2, temp, texture[1], 2D;" +
12128		- TextureFetch("depth2", "temp", "1") +
	12663	+ ShadowTextureFetch("depth2", "temp", "1") +
12129	12664	"SUB temp.x, temp.x, mapgrid.x;" +
12130	12665	//"TEX depth3, temp, texture[1], 2D;" +
12131	12666	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12132		- TextureFetch("depth3", "temp", "1") +
	12667	+ ShadowTextureFetch("depth3", "temp", "1") +
12133	12668	"") +
12134	12669	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12135	12670	//"MOV params, material;" +
..	..	@@ -12500,10 +13035,10 @@
12500	13035	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12501	13036	"") +
12502	13037
12503		- // display shadow only (bump == 0)
	13038	+ // display shadow only (fakedepth == 0)
12504	13039	"SUB temp.x, half.x, shadow.x;" +
12505		- "MOV temp.y, -params6.x;" +
12506		- "SLT temp.z, temp.y, zero.x;" +
	13040	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13041	+ "SLT temp.z, temp.y, -c256i.x;" +
12507	13042	"SUB temp.y, one.x, temp.z;" +
12508	13043	"MUL temp.x, temp.x, temp.y;" +
12509	13044	"KIL temp.x;" +
..	..	@@ -12834,7 +13369,7 @@
12834	13369	//once = true;
12835	13370	}
12836	13371
12837		- System.out.print("Program #" + mode + "; length = " + program.length());
	13372	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12838	13373	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12839	13374	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12840	13375
..	..	@@ -12927,25 +13462,26 @@
12927	13462	return out;
12928	13463	}
12929	13464
12930		- String TextureFetch(String dest, String src, String unit)
	13465	+ // Also does frustum culling
	13466	+ String ShadowTextureFetch(String dest, String src, String unit)
12931	13467	{
12932	13468	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12933	13469	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12934	13470	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13471	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13472	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12935	13473	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12936		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12937		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12938		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12939		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13474	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13475	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12940	13476	//"SWZ buffer, temp, w,w,w,w;";
12941		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13477	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12942	13478	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12943	13479	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12944	13480	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12945		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13481	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12946	13482
12947		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12948		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13483	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13484	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12949	13485	}
12950	13486
12951	13487	String Shadow(String depth, String shadow)
..	..	@@ -12967,12 +13503,16 @@
12967	13503
12968	13504	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12969	13505	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13506	+
	13507	+ // Compare fragment depth in light space with shadowmap.
12970	13508	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12971	13509	"SGE temp.y, temp.x, zero.x;" +
12972		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13510	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13511	+
	13512	+ // Reverse comparison
12973	13513	"SUB temp.x, one.x, temp.x;" +
12974	13514	"MUL " + shadow + ".x, temp.x, temp.y;" +
12975		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13515	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12976	13516	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12977	13517
12978	13518	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12986,6 +13526,10 @@
12986	13526	// No shadow for backface
12987	13527	"DP3 temp.x, normal, lightd;" +
12988	13528	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13529	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13530	+
	13531	+ // No shadow when out of frustum
	13532	+ "SGE temp.x, " + depth + ".z, one.z;" +
12989	13533	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12990	13534	"";
12991	13535	}
..	..	@@ -13132,7 +13676,8 @@
13132	13676	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13133	13677	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13134	13678	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13135		- Object3D.cVector2[] vector2buffer;
	13679	+
	13680	+ //Object3D.cVector2[] vector2buffer;
13136	13681
13137	13682	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13138	13683	// OUT : diff, spec
..	..	@@ -13148,9 +13693,10 @@
13148	13693	"DP3 " + dest + ".z," + "normals," + "eye;" +
13149	13694	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13150	13695	//"MOV " + dest + ".w," + "normal.z;" +
13151		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13152		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13153		- //"MOV " + dest + ".z," + "params2.w;" +
	13696	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13697	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13698	+
	13699	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13154	13700	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13155	13701	"RCP " + dest + ".w," + dest + ".w;" +
13156	13702	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13655,6 +14201,7 @@
13655	14201	else
13656	14202	if (evt.getSource() == AAtimer)
13657	14203	{
	14204	+ Globals.TIMERRUNNING = false;
13658	14205	if (mouseDown)
13659	14206	{
13660	14207	//new Exception().printStackTrace();
..	..	@@ -13714,7 +14261,7 @@
13714	14261
13715	14262	// fev 2014???
13716	14263	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13717		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14264	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13718	14265	pingthread.StepToTarget(true); // true);
13719	14266	}
13720	14267	// if (!LIVE)
..	..	@@ -13729,6 +14276,7 @@
13729	14276	return;
13730	14277
13731	14278	AAtimer.restart(); //
	14279	+ Globals.TIMERRUNNING = true;
13732	14280
13733	14281	// waslive = LIVE;
13734	14282	// LIVE = false;
..	..	@@ -13778,14 +14326,15 @@
13778	14326	drag = false;
13779	14327	//System.out.println("Mouse DOWN");
13780	14328	editObj = false;
13781		- ClickInfo info = new ClickInfo();
13782		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13783		- info.pane = this;
13784		- info.camera = renderCamera;
13785		- info.x = x;
13786		- info.y = y;
13787		- info.modifiers = modifiersex;
13788		- editObj = object.doEditClick(info, 0);
	14329	+ //ClickInfo info = new ClickInfo();
	14330	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14331	+ object.clickInfo.pane = this;
	14332	+ object.clickInfo.camera = renderCamera;
	14333	+ object.clickInfo.x = x;
	14334	+ object.clickInfo.y = y;
	14335	+ object.clickInfo.modifiers = modifiersex;
	14336	+ editObj = object.doEditClick(//info,
	14337	+ 0);
13789	14338	if (!editObj)
13790	14339	{
13791	14340	hasMarquee = true;
..	..	@@ -13801,9 +14350,12 @@
13801	14350
13802	14351	public void mouseDragged(MouseEvent e)
13803	14352	{
	14353	+ Globals.MOUSEDRAGGED = true;
	14354	+
13804	14355	//System.out.println("mouseDragged: " + e);
13805	14356	if (isRenderer)
13806	14357	movingcamera = true;
	14358	+
13807	14359	//if (drawing)
13808	14360	//return;
13809	14361	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -14064,12 +14616,12 @@
14064	14616	void GoDown(int mod)
14065	14617	{
14066	14618	MODIFIERS \|= COMMAND;
14067		- /*
	14619	+ /**/
14068	14620	if((mod&SHIFT) == SHIFT)
14069	14621	manipCamera.RotatePosition(0, -speed);
14070	14622	else
14071		- manipCamera.BackForth(0, -speed*delta, getWidth());
14072		- */
	14623	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14624	+ /**/
14073	14625	if ((mod & SHIFT) == SHIFT)
14074	14626	{
14075	14627	mouseMode = mouseMode; // VR??
..	..	@@ -14085,12 +14637,12 @@
14085	14637	void GoUp(int mod)
14086	14638	{
14087	14639	MODIFIERS \|= COMMAND;
14088		- /*
	14640	+ /**/
14089	14641	if((mod&SHIFT) == SHIFT)
14090	14642	manipCamera.RotatePosition(0, speed);
14091	14643	else
14092		- manipCamera.BackForth(0, speed*delta, getWidth());
14093		- */
	14644	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14645	+ /**/
14094	14646	if ((mod & SHIFT) == SHIFT)
14095	14647	{
14096	14648	mouseMode = mouseMode;
..	..	@@ -14106,12 +14658,12 @@
14106	14658	void GoLeft(int mod)
14107	14659	{
14108	14660	MODIFIERS \|= COMMAND;
14109		- /*
	14661	+ /**/
14110	14662	if((mod&SHIFT) == SHIFT)
14111		- manipCamera.RotatePosition(speed, 0);
14112		- else
14113	14663	manipCamera.Translate(speed*delta, 0, getWidth());
14114		- */
	14664	+ else
	14665	+ manipCamera.RotatePosition(speed, 0);
	14666	+ /**/
14115	14667	if ((mod & SHIFT) == SHIFT)
14116	14668	{
14117	14669	mouseMode = mouseMode;
..	..	@@ -14127,12 +14679,12 @@
14127	14679	void GoRight(int mod)
14128	14680	{
14129	14681	MODIFIERS \|= COMMAND;
14130		- /*
	14682	+ /**/
14131	14683	if((mod&SHIFT) == SHIFT)
14132		- manipCamera.RotatePosition(-speed, 0);
14133		- else
14134	14684	manipCamera.Translate(-speed*delta, 0, getWidth());
14135		- */
	14685	+ else
	14686	+ manipCamera.RotatePosition(-speed, 0);
	14687	+ /**/
14136	14688	if ((mod & SHIFT) == SHIFT)
14137	14689	{
14138	14690	mouseMode = mouseMode;
..	..	@@ -14182,14 +14734,16 @@
14182	14734	if (editObj)
14183	14735	{
14184	14736	drag = true;
14185		- ClickInfo info = new ClickInfo();
14186		- info.bounds.setBounds(0, 0,
	14737	+ //ClickInfo info = new ClickInfo();
	14738	+ object.clickInfo.bounds.setBounds(0, 0,
14187	14739	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14188		- info.pane = this;
14189		- info.camera = renderCamera;
14190		- info.x = x;
14191		- info.y = y;
14192		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14740	+ object.clickInfo.pane = this;
	14741	+ object.clickInfo.camera = renderCamera;
	14742	+ object.clickInfo.x = x;
	14743	+ object.clickInfo.y = y;
	14744	+ object //.GetWindow().copy
	14745	+ .doEditDrag(//info,
	14746	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14193	14747	} else
14194	14748	{
14195	14749	if (x < startX)
..	..	@@ -14338,22 +14892,27 @@
14338	14892	}
14339	14893	}
14340	14894
	14895	+// ClickInfo clickInfo = new ClickInfo();
	14896	+
14341	14897	public void mouseMoved(MouseEvent e)
14342	14898	{
14343	14899	//System.out.println("mouseMoved: " + e);
14344	14900	if (isRenderer)
14345	14901	return;
14346	14902
14347		- ClickInfo ci = new ClickInfo();
14348		- ci.x = e.getX();
14349		- ci.y = e.getY();
14350		- ci.modifiers = e.getModifiersEx();
14351		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14352		- ci.pane = this;
14353		- ci.camera = renderCamera;
	14903	+ // Mouse cursor feedback
	14904	+ object.clickInfo.x = e.getX();
	14905	+ object.clickInfo.y = e.getY();
	14906	+ object.clickInfo.modifiers = e.getModifiersEx();
	14907	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14908	+ object.clickInfo.pane = this;
	14909	+ object.clickInfo.camera = renderCamera;
14354	14910	if (!isRenderer)
14355	14911	{
14356		- if (object.editWindow.copy.doEditClick(ci, 0))
	14912	+ //ObjEditor editWindow = object.editWindow;
	14913	+ //Object3D copy = editWindow.copy;
	14914	+ if (object.doEditClick(//clickInfo,
	14915	+ 0))
14357	14916	{
14358	14917	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14359	14918	} else
..	..	@@ -14365,7 +14924,11 @@
14365	14924
14366	14925	public void mouseReleased(MouseEvent e)
14367	14926	{
	14927	+ Globals.MOUSEDRAGGED = false;
	14928	+
14368	14929	movingcamera = false;
	14930	+ X = 0; // getBounds().width/2;
	14931	+ Y = 0; // getBounds().height/2;
14369	14932	//System.out.println("mouseReleased: " + e);
14370	14933	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14371	14934	}
..	..	@@ -14621,7 +15184,8 @@
14621	15184	// break;
14622	15185	case 'T':
14623	15186	CACHETEXTURE ^= true;
14624		- textures.clear();
	15187	+ texturepigment.clear();
	15188	+ texturebump.clear();
14625	15189	// repaint();
14626	15190	break;
14627	15191	case 'Y':
..	..	@@ -14706,7 +15270,9 @@
14706	15270	case 'E' : COMPACT ^= true;
14707	15271	repaint();
14708	15272	break;
14709		- case 'W' : DEBUGHSB ^= true;
	15273	+ case 'W' : // Wide Window (fullscreen)
	15274	+ //DEBUGHSB ^= true;
	15275	+ ObjEditor.theFrame.ToggleFullScreen();
14710	15276	repaint();
14711	15277	break;
14712	15278	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14731,8 +15297,8 @@
14731	15297	RevertCamera();
14732	15298	repaint();
14733	15299	break;
14734		- case 'L':
14735	15300	case 'l':
	15301	+ //case 'L':
14736	15302	if (lightMode)
14737	15303	{
14738	15304	lightMode = false;
..	..	@@ -14802,14 +15368,18 @@
14802	15368	case '3':
14803	15369	case '4':
14804	15370	case '5':
14805		- newenvy = Character.getNumericValue(key);
14806		- repaint();
14807		- break;
14808	15371	case '6':
14809	15372	case '7':
14810	15373	case '8':
14811	15374	case '9':
14812		- BGcolor = (key - '6')/3.f;
	15375	+ if (envyoff)
	15376	+ {
	15377	+ BGcolor = (key - '1')/8.f;
	15378	+ }
	15379	+ else
	15380	+ {
	15381	+ //newenvy = Character.getNumericValue(key);
	15382	+ }
14813	15383	repaint();
14814	15384	break;
14815	15385	case '!':
..	..	@@ -14875,9 +15445,9 @@
14875	15445	case '_':
14876	15446	kompactbit = 5;
14877	15447	break;
14878		- case '+':
14879		- kompactbit = 6;
14880		- break;
	15448	+// case '+':
	15449	+// kompactbit = 6;
	15450	+// break;
14881	15451	case ' ':
14882	15452	lightMode ^= true;
14883	15453	Globals.lighttouched = true;
..	..	@@ -14889,6 +15459,7 @@
14889	15459	case ESC:
14890	15460	RENDERPROGRAM += 1;
14891	15461	RENDERPROGRAM %= 3;
	15462	+
14892	15463	repaint();
14893	15464	break;
14894	15465	case 'Z':
..	..	@@ -14928,8 +15499,9 @@
14928	15499	case DELETE:
14929	15500	ClearSelection();
14930	15501	break;
14931		- /*
14932	15502	case '+':
	15503	+
	15504	+ /*
14933	15505	//fontsize += 1;
14934	15506	bbzoom *= 2;
14935	15507	repaint();
..	..	@@ -14946,17 +15518,17 @@
14946	15518	case '=':
14947	15519	IncDepth();
14948	15520	//fontsize += 1;
14949		- object.editWindow.refreshContents(true);
	15521	+ object.GetWindow().refreshContents(true);
14950	15522	maskbit = 6;
14951	15523	break;
14952	15524	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14953	15525	DecDepth();
14954	15526	maskbit = 5;
14955	15527	//if(fontsize > 1) fontsize -= 1;
14956		- if (object.editWindow == null)
14957		- new Exception().printStackTrace();
14958		- else
14959		- object.editWindow.refreshContents(true);
	15528	+// if (object.editWindow == null)
	15529	+// new Exception().printStackTrace();
	15530	+// else
	15531	+ object.GetWindow().refreshContents(true);
14960	15532	break;
14961	15533	case '{':
14962	15534	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15180,7 +15752,7 @@
15180	15752	}
15181	15753	*/
15182	15754
15183		- object.editWindow.EditSelection();
	15755	+ object.GetWindow().EditSelection(false);
15184	15756	}
15185	15757
15186	15758	void SelectParent()
..	..	@@ -15197,10 +15769,10 @@
15197	15769	{
15198	15770	//selectees.remove(i);
15199	15771	System.out.println("select parent of " + elem);
15200		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15772	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15201	15773	} else
15202	15774	{
15203		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15775	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15204	15776	}
15205	15777
15206	15778	first = false;
..	..	@@ -15242,12 +15814,12 @@
15242	15814	for (int j = 0; j < group.children.size(); j++)
15243	15815	{
15244	15816	elem = (Object3D) group.children.elementAt(j);
15245		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15817	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15246	15818	first = false;
15247	15819	}
15248	15820	} else
15249	15821	{
15250		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15822	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15251	15823	}
15252	15824
15253	15825	first = false;
..	..	@@ -15258,21 +15830,21 @@
15258	15830	{
15259	15831	//Composite group = (Composite) object;
15260	15832	Object3D group = object;
15261		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15833	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15262	15834	}
15263	15835
15264	15836	void ResetTransform(int mask)
15265	15837	{
15266	15838	//Composite group = (Composite) object;
15267	15839	Object3D group = object;
15268		- group.editWindow.ResetTransform(mask);
	15840	+ group.GetWindow().ResetTransform(mask);
15269	15841	}
15270	15842
15271	15843	void FlipTransform()
15272	15844	{
15273	15845	//Composite group = (Composite) object;
15274	15846	Object3D group = object;
15275		- group.editWindow.FlipTransform();
	15847	+ group.GetWindow().FlipTransform();
15276	15848	// group.editWindow.ReduceMesh(true);
15277	15849	}
15278	15850
..	..	@@ -15280,7 +15852,7 @@
15280	15852	{
15281	15853	//Composite group = (Composite) object;
15282	15854	Object3D group = object;
15283		- group.editWindow.PrintMemory();
	15855	+ group.GetWindow().PrintMemory();
15284	15856	// group.editWindow.ReduceMesh(true);
15285	15857	}
15286	15858
..	..	@@ -15288,7 +15860,7 @@
15288	15860	{
15289	15861	//Composite group = (Composite) object;
15290	15862	Object3D group = object;
15291		- group.editWindow.ResetCentroid();
	15863	+ group.GetWindow().ResetCentroid();
15292	15864	}
15293	15865
15294	15866	void IncDepth()
..	..	@@ -15370,11 +15942,11 @@
15370	15942
15371	15943	int width = getBounds().width;
15372	15944	int height = getBounds().height;
15373		- ClickInfo info = new ClickInfo();
15374		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15375	15945	//Image img = CreateImage(width, height);
15376	15946	//System.out.println("width = " + width + "; height = " + height + "\n");
	15947	+
15377	15948	Graphics gr = g; // img.getGraphics();
	15949	+
15378	15950	if (!hasMarquee)
15379	15951	{
15380	15952	if (Xmin < Xmax) // !locked)
..	..	@@ -15446,40 +16018,88 @@
15446	16018	}
15447	16019	if (object != null && !hasMarquee)
15448	16020	{
	16021	+ if (object.clickInfo == null)
	16022	+ object.clickInfo = new ClickInfo();
	16023	+ ClickInfo info = object.clickInfo;
	16024	+ //ClickInfo info = new ClickInfo();
	16025	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16026	+
15449	16027	if (isRenderer)
15450	16028	{
15451		- info.flags++;
	16029	+ object.clickInfo.flags++;
15452	16030	double frameAspect = (double) width / (double) height;
15453	16031	if (frameAspect > renderCamera.aspect)
15454	16032	{
15455	16033	int desired = (int) ((double) height * renderCamera.aspect);
15456		- info.bounds.width -= width - desired;
15457		- info.bounds.x += (width - desired) / 2;
	16034	+ object.clickInfo.bounds.width -= width - desired;
	16035	+ object.clickInfo.bounds.x += (width - desired) / 2;
15458	16036	} else
15459	16037	{
15460	16038	int desired = (int) ((double) width / renderCamera.aspect);
15461		- info.bounds.height -= height - desired;
15462		- info.bounds.y += (height - desired) / 2;
	16039	+ object.clickInfo.bounds.height -= height - desired;
	16040	+ object.clickInfo.bounds.y += (height - desired) / 2;
15463	16041	}
15464	16042	}
15465		- info.g = gr;
15466		- info.camera = renderCamera;
	16043	+
	16044	+ object.clickInfo.g = gr;
	16045	+ object.clickInfo.camera = renderCamera;
15467	16046	/*
15468	16047	// Memory intensive (brep.verticescopy)
15469	16048	if (!(object instanceof Composite))
15470	16049	object.draw(info, 0, false); // SLOW :
15471	16050	*/
15472		- if (!isRenderer)
	16051	+ if (!isRenderer) // && drag)
15473	16052	{
15474		- object.drawEditHandles(info, 0);
	16053	+ Grafreed.Assert(object != null);
	16054	+ Grafreed.Assert(object.selection != null);
	16055	+ if (object.selection.Size() > 0)
	16056	+ {
	16057	+ int hitSomething = object.selection.get(0).hitSomething;
	16058	+
	16059	+ object.clickInfo.DX = 0;
	16060	+ object.clickInfo.DY = 0;
	16061	+ object.clickInfo.W = 1;
	16062	+ if (hitSomething == Object3D.hitCenter)
	16063	+ {
	16064	+ info.DX = X;
	16065	+ if (X != 0)
	16066	+ info.DX -= info.bounds.width/2;
	16067	+
	16068	+ info.DY = Y;
	16069	+ if (Y != 0)
	16070	+ info.DY -= info.bounds.height/2;
	16071	+ }
	16072	+
	16073	+ object.drawEditHandles(//info,
	16074	+ 0);
	16075	+
	16076	+ if (drag && (X != 0 \|\| Y != 0))
	16077	+ {
	16078	+ switch (hitSomething)
	16079	+ {
	16080	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16081	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16082	+ break;
	16083	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16084	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16085	+ break;
	16086	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16087	+ gr.drawLine(X, Y, 0, 0);
	16088	+ break;
	16089	+ }
	16090	+
	16091	+ }
	16092	+ }
15475	16093	}
15476	16094	}
	16095	+
15477	16096	if (isRenderer)
15478	16097	{
15479	16098	//gr.setColor(Color.black);
15480	16099	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15481	16100	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15482	16101	}
	16102	+
15483	16103	if (hasMarquee)
15484	16104	{
15485	16105	gr.setXORMode(Color.white);
..	..	@@ -15886,7 +16506,7 @@
15886	16506	Object3D object;
15887	16507	static Object3D trackedobject;
15888	16508	Camera renderCamera; // Light or Eye (or Occlusion)
15889		- /static/ Camera manipCamera; // Light or Eye
	16509	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15890	16510	/static/ Camera eyeCamera;
15891	16511	/static/ Camera lightCamera;
15892	16512	int cameracount;
..	..	@@ -15982,7 +16602,9 @@
15982	16602
15983	16603	float BGcolor = 0.5f;
15984	16604
15985		- private void DrawSkyBox(GL gl)
	16605	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16606	+
	16607	+ private void DrawSkyBox(GL gl, float ratio)
15986	16608	{
15987	16609	if (envyoff \|\| cubemap == null)
15988	16610	{
..	..	@@ -15999,7 +16621,17 @@
15999	16621	// Compensates for ExaminerViewer's modification of modelview matrix
16000	16622	gl.glMatrixMode(GL.GL_MODELVIEW);
16001	16623	gl.glLoadIdentity();
	16624	+ gl.glScalef(1,ratio,1);
16002	16625
	16626	+ colorV[0] = 2;
	16627	+ colorV[1] = 2;
	16628	+ colorV[2] = 2;
	16629	+ colorV[3] = 1;
	16630	+ gl.glDisable(gl.GL_COLOR_MATERIAL);
	16631	+ gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16632	+
	16633	+ gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16634	+
16003	16635	//gl.glActiveTexture(GL.GL_TEXTURE1);
16004	16636	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16005	16637
..	..	@@ -16012,7 +16644,7 @@
16012	16644	// GL_NORMAL_MAP texgen mode. Temporarily enabling lighting
16013	16645	// causes the normals to be sent down. Thanks to Ken Dyke.
16014	16646	//gl.glEnable(GL.GL_LIGHTING);
16015		- gl.glDisable(GL.GL_LIGHTING);
	16647	+ gl.glEnable(GL.GL_LIGHTING);
16016	16648
16017	16649	gl.glTexGeni(GL.GL_S, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
16018	16650	gl.glTexGeni(GL.GL_T, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
..	..	@@ -16171,16 +16803,16 @@
16171	16803	cStatic.objectstack[materialdepth++] = checker;
16172	16804	//System.out.println("material " + material);
16173	16805	//Applet3D.tracein(this, selected);
16174		- vector2buffer = checker.projectedVertices;
	16806	+ //vector2buffer = checker.projectedVertices;
16175	16807
16176	16808	//checker.GetMaterial().Draw(this, false); // true);
16177		- DrawMaterial(checker.GetMaterial(), false); // true);
	16809	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16178	16810
16179	16811	materialdepth -= 1;
16180	16812	if (materialdepth > 0)
16181	16813	{
16182		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16183		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16814	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16815	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16184	16816	}
16185	16817	//checker.GetMaterial().opacity = 1f;
16186	16818	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16266,6 +16898,14 @@
16266	16898	}
16267	16899	}
16268	16900
	16901	+ private Object3D GetFolder()
	16902	+ {
	16903	+ Object3D folder = object.GetWindow().copy;
	16904	+ if (object.GetWindow().copy.selection.Size() > 0)
	16905	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16906	+ return folder;
	16907	+ }
	16908	+
16269	16909	class SelectBuffer implements GLEventListener
16270	16910	{
16271	16911
..	..	@@ -16281,7 +16921,7 @@
16281	16921	//new Exception().printStackTrace();
16282	16922	System.out.println("select buffer init");
16283	16923	// Use debug pipeline
16284		- drawable.setGL(new DebugGL(drawable.getGL()));
	16924	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16285	16925
16286	16926	GL gl = drawable.getGL();
16287	16927
..	..	@@ -16345,6 +16985,17 @@
16345	16985
16346	16986	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16347	16987
	16988	+ if (PAINTMODE)
	16989	+ {
	16990	+ if (object.GetWindow().copy.selection.Size() > 0)
	16991	+ {
	16992	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16993	+
	16994	+ // Make what you paint not selectable.
	16995	+ paintobj.ResetSelectable();
	16996	+ }
	16997	+ }
	16998	+
16348	16999	//int tmp = selection_view;
16349	17000	//selection_view = -1;
16350	17001	int temp = DrawMode();
..	..	@@ -16356,6 +17007,17 @@
16356	17007	// temp = DEFAULT; // patch for selection debug
16357	17008	Globals.drawMode = temp; // WARNING
16358	17009
	17010	+ if (PAINTMODE)
	17011	+ {
	17012	+ if (object.GetWindow().copy.selection.Size() > 0)
	17013	+ {
	17014	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17015	+
	17016	+ // Revert.
	17017	+ paintobj.RestoreSelectable();
	17018	+ }
	17019	+ }
	17020	+
16359	17021	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16360	17022
16361	17023	// trying different ways of getting the depth info over
..	..	@@ -16403,6 +17065,8 @@
16403	17065	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16404	17066	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16405	17067	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17068	+
	17069	+ CreateSelectedPoint();
16406	17070
16407	17071	// Will fit the mesh !!!
16408	17072	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16457,29 +17121,31 @@
16457	17121	}
16458	17122
16459	17123	if (!movingcamera && !PAINTMODE)
16460		- object.editWindow.ScreenFitPoint(); // fev 2014
	17124	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16461	17125
16462		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17126	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16463	17127	{
16464		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17128	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16465	17129
16466		- Object3D group = new Object3D("inst" + paintcount++);
	17130	+ if (object.GetWindow().copy.selection.Size() > 0)
	17131	+ {
	17132	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16467	17133
16468		- group.CreateMaterial(); // use a void leaf to select instances
16469		-
16470		- group.add(paintobj); // link
16471		-
16472		- object.editWindow.SnapObject(group);
16473		-
16474		- Object3D folder = object.editWindow.copy;
16475		-
16476		- if (object.editWindow.copy.selection.Size() > 0)
16477		- folder = object.editWindow.copy.selection.elementAt(0);
16478		-
16479		- folder.add(group);
16480		-
16481		- object.editWindow.ResetModel();
16482		- object.editWindow.refreshContents();
	17134	+ Object3D inst = new Object3D("inst" + paintcount++);
	17135	+
	17136	+ inst.CreateMaterial(); // use a void leaf to select instances
	17137	+
	17138	+ inst.add(paintobj); // link
	17139	+
	17140	+ object.GetWindow().SnapObject(inst);
	17141	+
	17142	+ Object3D folder = paintFolder; // GetFolder();
	17143	+
	17144	+ folder.add(inst);
	17145	+
	17146	+ object.GetWindow().ResetModel();
	17147	+ object.GetWindow().refreshContents();
	17148	+ }
16483	17149	}
16484	17150	else
16485	17151	paintcount = 0;
..	..	@@ -16518,6 +17184,11 @@
16518	17184	//System.out.println("objects[color] = " + objects[color]);
16519	17185	//objects[color].Select();
16520	17186	indexcount = 0;
	17187	+ ObjEditor window = object.GetWindow();
	17188	+ if (window != null && deselect)
	17189	+ {
	17190	+ window.Select(null, deselect, true);
	17191	+ }
16521	17192	object.Select(color, deselect);
16522	17193	}
16523	17194
..	..	@@ -17043,23 +17714,15 @@
17043	17714	int AAbuffersize = 0;
17044	17715
17045	17716	//double[] selectedpoint = new double[3];
17046		- static Superellipsoid selectedpoint = new Superellipsoid();
	17717	+ static Superellipsoid selectedpoint;
17047	17718	static Sphere previousselectedpoint = null;
17048		- static Sphere debugpointG = new Sphere();
17049		- static Sphere debugpointP = new Sphere();
17050		- static Sphere debugpointC = new Sphere();
17051		- static Sphere debugpointR = new Sphere();
	17719	+ static Sphere debugpointG;
	17720	+ static Sphere debugpointP;
	17721	+ static Sphere debugpointC;
	17722	+ static Sphere debugpointR;
17052	17723
17053	17724	static Sphere debugpoints[] = new Sphere[8];
17054	17725
17055		- static
17056		- {
17057		- for (int i=0; i<8; i++)
17058		- {
17059		- debugpoints[i] = new Sphere();
17060		- }
17061		- }
17062		-
17063	17726	static void InitPoints(float radius)
17064	17727	{
17065	17728	for (int i=0; i<8; i++)