~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;
..	..	@@ -74,7 +110,11 @@
74	110	//private Mat4f spotlightTransform = new Mat4f();
75	111	//private Mat4f spotlightInverseTransform = new Mat4f();
76	112	static GLContext glcontext = null;
77		- /static/ com.sun.opengl.util.texture.Texture cubemap;
	113	+ /static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
	114	+ /static/ com.sun.opengl.util.texture.Texture cubemapcustom;
	115	+ /static/ com.sun.opengl.util.texture.Texture cubemaprgb;
	116	+ boolean transformMode;
	117	+
78	118	boolean reverseUP = false;
79	119	static boolean frozen = false;
80	120	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -128,7 +168,7 @@
128	168
129	169
130	170	// OPTIONS
131		- boolean Skinshader = true;
	171	+ boolean Skinshader = false; // true;
132	172	boolean cameraLight = false;
133	173	boolean UVdebug = false;
134	174	boolean Udebug = false;
..	..	@@ -137,7 +177,7 @@
137	177	static boolean doublesided = false; // true; // reversed normals are awful for conformance
138	178	boolean anisotropy = true;
139	179	boolean softshadow = true; // slower but better false;
140		- boolean opacityhalo = false;
	180	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
141	181
142	182	boolean macromode = false;
143	183
..	..	@@ -151,6 +191,19 @@
151	191	}
152	192
153	193	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	194	+
	195	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	196	+ {
	197	+ try
	198	+ {
	199	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	200	+ } catch (IOException e)
	201	+ {
	202	+ System.out.println("NAME = " + name);
	203	+ e.printStackTrace(); // throw new RuntimeException(e);
	204	+ return null;
	205	+ }
	206	+ }
154	207
155	208	void SetAsGLRenderer(boolean b)
156	209	{
..	..	@@ -170,7 +223,8 @@
170	223
171	224	SetCamera(cam);
172	225
173		- SetLight(new Camera(new cVector(10, 10, -20)));
	226	+ // Warning: not used.
	227	+ SetLight(new Camera(new cVector(15, 10, -20)));
174	228
175	229	object = o;
176	230
..	..	@@ -327,7 +381,7 @@
327	381	cStatic.objectstack[materialdepth++] = obj;
328	382	//System.out.println("material " + material);
329	383	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	384	+ //display.vector2buffer = obj.projectedVertices;
331	385	if (obj instanceof Camera)
332	386	{
333	387	display.options1[0] = material.shift;
..	..	@@ -336,14 +390,28 @@
336	390	display.options1[2] = material.shadowbias;
337	391	display.options1[3] = material.aniso;
338	392	display.options1[4] = material.anisoV;
	393	+// System.out.println("display.options1[0] " + display.options1[0]);
	394	+// System.out.println("display.options1[1] " + display.options1[1]);
	395	+// System.out.println("display.options1[2] " + display.options1[2]);
	396	+// System.out.println("display.options1[3] " + display.options1[3]);
	397	+// System.out.println("display.options1[4] " + display.options1[4]);
339	398	display.options2[0] = material.opacity;
340	399	display.options2[1] = material.diffuse;
341	400	display.options2[2] = material.factor;
	401	+// System.out.println("display.options2[0] " + display.options2[0]);
	402	+// System.out.println("display.options2[1] " + display.options2[1]);
	403	+// System.out.println("display.options2[2] " + display.options2[2]);
342	404
343	405	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	406	+// System.out.println("display.options3[0] " + display.options3[0]);
	407	+// System.out.println("display.options3[1] " + display.options3[1]);
	408	+// System.out.println("display.options3[2] " + display.options3[2]);
344	409	display.options4[0] = material.cameralight/0.2f;
345	410	display.options4[1] = material.subsurface;
346	411	display.options4[2] = material.sheen;
	412	+// System.out.println("display.options4[0] " + display.options4[0]);
	413	+// System.out.println("display.options4[1] " + display.options4[1]);
	414	+// System.out.println("display.options4[2] " + display.options4[2]);
347	415
348	416	// if (display.CURRENTANTIALIAS > 0)
349	417	// display.options3[3] /= 4;
..	..	@@ -359,7 +427,7 @@
359	427	/**/
360	428	} else
361	429	{
362		- DrawMaterial(material, selected);
	430	+ DrawMaterial(material, selected, obj.projectedVertices);
363	431	}
364	432	} else
365	433	{
..	..	@@ -383,8 +451,8 @@
383	451	cStatic.objectstack[materialdepth++] = obj;
384	452	//System.out.println("material " + material);
385	453	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	454	+ //display.vector2buffer = obj.projectedVertices;
	455	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	456	}
389	457	}
390	458
..	..	@@ -401,8 +469,8 @@
401	469	materialdepth -= 1;
402	470	if (materialdepth > 0)
403	471	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	472	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	473	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	474	}
407	475	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	476	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +490,8 @@
422	490	materialdepth -= 1;
423	491	if (materialdepth > 0)
424	492	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	493	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	494	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	495	}
428	496	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	497	//else
..	..	@@ -464,10 +532,12 @@
464	532	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	533	{
466	534	//gl.glBegin(gl.GL_TRIANGLES);
467		- boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	535	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	536	+ // TEST LIVE NORMALS && !obj.dontselect
	537	+ ;
468	538	if (!hasnorm)
469	539	{
470		- // System.out.println("FUCK!!");
	540	+ // System.out.println("Mesh normal");
471	541	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	542	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	543	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1192,10 +1262,12 @@
1192	1262	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1263	}
1194	1264	}
	1265	+
1195	1266	if (flipV)
1196	1267	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1268	else
1198	1269	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1270	+
1199	1271	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1272	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1273
..	..	@@ -1215,10 +1287,12 @@
1215	1287	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1288	}
1217	1289	}
	1290	+
1218	1291	if (flipV)
1219	1292	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1293	else
1221	1294	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1295	+
1222	1296	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1297	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1298
..	..	@@ -1246,8 +1320,10 @@
1246	1320	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1321	else
1248	1322	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1323	+
1249	1324	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1325	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1326	+
1251	1327	count2 += 2;
1252	1328	count3 += 3;
1253	1329	}
..	..	@@ -1426,6 +1502,8 @@
1426	1502	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1427	1503	}
1428	1504
	1505	+ float[] colorV = new float[4];
	1506	+
1429	1507	void SetColor(Object3D obj, Vertex p0)
1430	1508	{
1431	1509	CameraPane display = this;
..	..	@@ -1493,8 +1571,6 @@
1493	1571	{
1494	1572	return;
1495	1573	}
1496		-
1497		- float[] colorV = new float[3];
1498	1574
1499	1575	if (false) // marked)
1500	1576	{
..	..	@@ -1603,7 +1679,7 @@
1603	1679	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1680	}
1605	1681
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1682	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1683	{
1608	1684	CameraPane display = this;
1609	1685	//new Exception().printStackTrace();
..	..	@@ -1638,7 +1714,7 @@
1638	1714	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1715	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1716	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1717	+ colorV[3] = 1; // material.opacity;
1642	1718
1643	1719	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1720	//System.out.println("Opacity = " + opacity);
..	..	@@ -1743,12 +1819,12 @@
1743	1819
1744	1820	display.modelParams7[0] = 0;
1745	1821	display.modelParams7[1] = 1000;
1746		- display.modelParams7[2] = 0;
	1822	+ display.modelParams7[2] = material.parallax;
1747	1823	display.modelParams7[3] = 0;
1748	1824
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1825	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1826
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1827	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1828	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1829	{
1754	1830	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1976,9 +2052,9 @@
1976	2052	switch(viewcode)
1977	2053	{
1978	2054	case 0: return "main";
1979		- case 1: return "one";
1980		- case 2: return "two";
1981		- case 3: return "three";
	2055	+ case 1: return "Red";
	2056	+ case 2: return "Green";
	2057	+ case 3: return "Blue";
1982	2058	case 4: return "light";
1983	2059	}
1984	2060
..	..	@@ -2044,7 +2120,7 @@
2044	2120	//System.err.println("Oeil on");
2045	2121	OEIL = true;
2046	2122	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2123	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2048	2124	//pingthread.StepToTarget(true);
2049	2125	}
2050	2126
..	..	@@ -2259,7 +2335,7 @@
2259	2335
2260	2336	void ToggleDebug()
2261	2337	{
2262		- DEBUG ^= true;
	2338	+ Globals.DEBUG ^= true;
2263	2339	}
2264	2340
2265	2341	void ToggleLookAt()
..	..	@@ -2277,10 +2353,17 @@
2277	2353	HANDLES ^= true;
2278	2354	}
2279	2355
	2356	+ Object3D paintFolder;
	2357	+
2280	2358	void TogglePaint()
2281	2359	{
2282	2360	PAINTMODE ^= true;
2283	2361	paintcount = 0;
	2362	+
	2363	+ if (PAINTMODE)
	2364	+ {
	2365	+ paintFolder = GetFolder();
	2366	+ }
2284	2367	}
2285	2368
2286	2369	void SwapCamera(int a, int b)
..	..	@@ -2377,6 +2460,21 @@
2377	2460	return currentGL;
2378	2461	}
2379	2462
	2463	+ static private BufferedImage CreateBim(TextureData texturedata)
	2464	+ {
	2465	+ Grafreed.Assert(texturedata != null);
	2466	+
	2467	+ int width = texturedata.getWidth();
	2468	+ int height = texturedata.getHeight();
	2469	+
	2470	+ Buffer buffer = texturedata.getBuffer();
	2471	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2472	+
	2473	+ byte[] bytes = bytebuf.array();
	2474	+
	2475	+ return CreateBim(bytes, width, height);
	2476	+ }
	2477	+
2380	2478	/**/
2381	2479	class CacheTexture
2382	2480	{
..	..	@@ -2385,28 +2483,31 @@
2385	2483
2386	2484	int resolution;
2387	2485
2388		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2486	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2389	2487	{
2390		- texture = tex;
	2488	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2489	+ texturedata = texdata;
2391	2490	resolution = res;
2392	2491	}
2393	2492	}
2394	2493	/**/
2395	2494
2396	2495	// TEXTURE static Texture texture;
2397		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2398		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2399		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2496	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2497	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2498	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2499	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2500	+
2400	2501	int pigmentdepth = 0;
2401	2502	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2503	int bumpdepth = 0;
2403	2504	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2404	2505	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2405	2506	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2406		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2507	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2407	2508	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2408	2509
2409		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2510	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2410	2511	{
2411	2512	TextureData texturedata = null;
2412	2513
..	..	@@ -2416,7 +2517,7 @@
2416	2517	com.sun.opengl.util.texture.TextureIO.newTextureData(
2417	2518	getClass().getClassLoader().getResourceAsStream(name),
2418	2519	true,
2419		- com.sun.opengl.util.texture.TextureIO.PNG);
	2520	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2420	2521	} catch (java.io.IOException e)
2421	2522	{
2422	2523	throw new javax.media.opengl.GLException(e);
..	..	@@ -2425,13 +2526,34 @@
2425	2526	if (bump)
2426	2527	texturedata = ConvertBump(texturedata, false);
2427	2528
2428		- com.sun.opengl.util.texture.Texture texture =
2429		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2529	+// com.sun.opengl.util.texture.Texture texture =
	2530	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2430	2531
2431		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2432		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2532	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2533	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2433	2534
2434		- return texture;
	2535	+ return texturedata;
	2536	+ }
	2537	+
	2538	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2539	+ {
	2540	+ TextureData texturedata = null;
	2541	+
	2542	+ try
	2543	+ {
	2544	+ texturedata =
	2545	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2546	+ bim,
	2547	+ true);
	2548	+ } catch (Exception e)
	2549	+ {
	2550	+ throw new javax.media.opengl.GLException(e);
	2551	+ }
	2552	+
	2553	+ if (bump)
	2554	+ texturedata = ConvertBump(texturedata, false);
	2555	+
	2556	+ return texturedata;
2435	2557	}
2436	2558
2437	2559	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3504,6 +3626,8 @@
3504	3626
3505	3627	System.out.println("LOADING TEXTURE : " + name);
3506	3628
	3629	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3630	+
3507	3631	//
3508	3632	if (false) // compressbit > 0)
3509	3633	{
..	..	@@ -7902,7 +8026,7 @@
7902	8026	String pigment = Object3D.GetPigment(tex);
7903	8027	String bump = Object3D.GetBump(tex);
7904	8028
7905		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8029	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7906	8030	{
7907	8031	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7908	8032	// System.out.println("; bump = " + bump);
..	..	@@ -7917,8 +8041,8 @@
7917	8041	pigment = null;
7918	8042	}
7919	8043
7920		- ReleaseTexture(bump, true);
7921		- ReleaseTexture(pigment, false);
	8044	+ ReleaseTexture(tex, true);
	8045	+ ReleaseTexture(tex, false);
7922	8046	}
7923	8047
7924	8048	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7936,7 +8060,7 @@
7936	8060
7937	8061	String pigment = Object3D.GetPigment(tex);
7938	8062
7939		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8063	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7940	8064	{
7941	8065	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7942	8066	// System.out.println("; bump = " + bump);
..	..	@@ -7947,7 +8071,7 @@
7947	8071	pigment = null;
7948	8072	}
7949	8073
7950		- ReleaseTexture(pigment, false);
	8074	+ ReleaseTexture(tex, false);
7951	8075	}
7952	8076
7953	8077	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -7965,7 +8089,7 @@
7965	8089
7966	8090	String bump = Object3D.GetBump(tex);
7967	8091
7968		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8092	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7969	8093	{
7970	8094	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7971	8095	// System.out.println("; bump = " + bump);
..	..	@@ -7976,10 +8100,10 @@
7976	8100	bump = null;
7977	8101	}
7978	8102
7979		- ReleaseTexture(bump, true);
	8103	+ ReleaseTexture(tex, true);
7980	8104	}
7981	8105
7982		- void ReleaseTexture(String tex, boolean bump)
	8106	+ void ReleaseTexture(cTexture tex, boolean bump)
7983	8107	{
7984	8108	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7985	8109	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7990,7 +8114,7 @@
7990	8114	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7991	8115
7992	8116	if (tex != null)
7993		- texture = textures.get(tex);
	8117	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7994	8118
7995	8119	// //assert( texture != null );
7996	8120	// if (texture == null)
..	..	@@ -8084,47 +8208,50 @@
8084	8208
8085	8209	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8086	8210	{
8087		- if (// DrawMode() != 0 \|\| /tex == null \|\|/
8088		- ambientOcclusion ) // \|\| !textureon)
8089		- {
8090		- return; // false;
8091		- }
8092		-
8093		- if (tex == null)
8094		- {
8095		- BindTexture(null,false,resolution);
8096		- BindTexture(null,true,resolution);
8097		- return;
8098		- }
	8211	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8212	+// ambientOcclusion ) // \|\| !textureon)
	8213	+// {
	8214	+// return; // false;
	8215	+// }
	8216	+//
	8217	+// if (tex == null)
	8218	+// {
	8219	+// BindTexture(null,false,resolution);
	8220	+// BindTexture(null,true,resolution);
	8221	+// return;
	8222	+// }
	8223	+//
	8224	+// String pigment = Object3D.GetPigment(tex);
	8225	+// String bump = Object3D.GetBump(tex);
	8226	+//
	8227	+// usedtextures.add(pigment);
	8228	+// usedtextures.add(bump);
	8229	+//
	8230	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8231	+// {
	8232	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8233	+// // System.out.println("; bump = " + bump);
	8234	+// }
	8235	+//
	8236	+// if (bump.equals(""))
	8237	+// {
	8238	+// bump = null;
	8239	+// }
	8240	+// if (pigment.equals(""))
	8241	+// {
	8242	+// pigment = null;
	8243	+// }
	8244	+//
	8245	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8246	+// BindTexture(pigment, false, resolution);
	8247	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8248	+// BindTexture(bump, true, resolution);
	8249	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8250	+//
	8251	+// return; // true;
8099	8252
8100		- String pigment = Object3D.GetPigment(tex);
8101		- String bump = Object3D.GetBump(tex);
8102		-
8103		- usedtextures.put(pigment, pigment);
8104		- usedtextures.put(bump, bump);
8105		-
8106		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8107		- {
8108		- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8109		- // System.out.println("; bump = " + bump);
8110		- }
8111		-
8112		- if (bump.equals(""))
8113		- {
8114		- bump = null;
8115		- }
8116		- if (pigment.equals(""))
8117		- {
8118		- pigment = null;
8119		- }
8120		-
8121		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8122		- BindTexture(pigment, false, resolution);
8123		- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8124		- BindTexture(bump, true, resolution);
8125		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8126		-
8127		- return; // true;
	8253	+ BindPigmentTexture(tex, resolution);
	8254	+ BindBumpTexture(tex, resolution);
8128	8255	}
8129	8256
8130	8257	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8143,9 +8270,9 @@
8143	8270
8144	8271	String pigment = Object3D.GetPigment(tex);
8145	8272
8146		- usedtextures.put(pigment, pigment);
	8273	+ usedtextures.add(tex);
8147	8274
8148		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8275	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8149	8276	{
8150	8277	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8151	8278	// System.out.println("; bump = " + bump);
..	..	@@ -8157,7 +8284,7 @@
8157	8284	}
8158	8285
8159	8286	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8160		- BindTexture(pigment, false, resolution);
	8287	+ BindTexture(tex, false, resolution);
8161	8288	}
8162	8289
8163	8290	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8176,9 +8303,9 @@
8176	8303
8177	8304	String bump = Object3D.GetBump(tex);
8178	8305
8179		- usedtextures.put(bump, bump);
	8306	+ usedtextures.add(tex);
8180	8307
8181		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8308	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8182	8309	{
8183	8310	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8184	8311	// System.out.println("; bump = " + bump);
..	..	@@ -8190,7 +8317,7 @@
8190	8317	}
8191	8318
8192	8319	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8193		- BindTexture(bump, true, resolution);
	8320	+ BindTexture(tex, true, resolution);
8194	8321	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8195	8322	}
8196	8323
..	..	@@ -8214,13 +8341,19 @@
8214	8341	return fileExists;
8215	8342	}
8216	8343
8217		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8344	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8218	8345	{
8219		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8346	+ CacheTexture texturecache = null;
8220	8347
8221	8348	if (tex != null)
8222	8349	{
8223		- String texname = tex;
	8350	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8351	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8352	+
	8353	+ if (texname.equals("") && texdata == null)
	8354	+ {
	8355	+ return null;
	8356	+ }
8224	8357
8225	8358	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8226	8359
..	..	@@ -8230,19 +8363,46 @@
8230	8363	// else
8231	8364	// if (!texname.startsWith("/"))
8232	8365	// texname = "/Users/nbriere/Textures/" + texname;
8233		- if (!FileExists(tex))
	8366	+ if (!FileExists(texname) && !texname.startsWith("@"))
8234	8367	{
8235	8368	texname = fallbackTextureName;
8236	8369	}
8237	8370
8238	8371	if (CACHETEXTURE)
8239		- texture = textures.get(texname); // TEXTURE CACHE
8240		-
8241		- TextureData texturedata = null;
8242		-
8243		- if (texture == null \|\| texture.resolution < resolution)
8244	8372	{
8245		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8373	+ if (texdata == null)
	8374	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8375	+ else
	8376	+ texturecache = bimtextures.get(texdata);
	8377	+ }
	8378	+
	8379	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8380	+ {
	8381	+ TextureData texturedata = null;
	8382	+
	8383	+ if (texdata != null && textureon)
	8384	+ {
	8385	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8386	+
	8387	+ try
	8388	+ {
	8389	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8390	+ }
	8391	+ catch (Exception e)
	8392	+ {
	8393	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8394	+ }
	8395	+
	8396	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8397	+ bimtextures.put(texdata, texturecache);
	8398	+
	8399	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8400	+
	8401	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8402	+ //bim2 = bim;
	8403	+ }
	8404	+ else
	8405	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8246	8406	{
8247	8407	assert(!bump);
8248	8408	// if (bump)
..	..	@@ -8253,19 +8413,23 @@
8253	8413	// }
8254	8414	// else
8255	8415	// {
8256		- texture = textures.get(tex);
8257		- if (texture == null)
	8416	+ // texturecache = textures.get(texname); // suspicious
	8417	+ if (texturecache == null)
8258	8418	{
8259		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8419	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8260	8420	}
	8421	+ else
	8422	+ new Exception().printStackTrace();
8261	8423	// }
8262	8424	} else
8263		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8425	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8264	8426	{
8265	8427	assert(bump);
8266		- texture = textures.get(tex);
8267		- if (texture == null)
8268		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8428	+ // texturecache = textures.get(texname); // suspicious
	8429	+ if (texturecache == null)
	8430	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8431	+ else
	8432	+ new Exception().printStackTrace();
8269	8433	} else
8270	8434	{
8271	8435	//if (tex.equals("IMMORTAL"))
..	..	@@ -8273,11 +8437,22 @@
8273	8437	// texture = GetResourceTexture("default.png");
8274	8438	//} else
8275	8439	//{
8276		- if (tex.equals("WHITE_NOISE"))
	8440	+ if (texname.endsWith("WHITE_NOISE"))
8277	8441	{
8278		- texture = textures.get(tex);
8279		- if (texture == null)
8280		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8442	+ // texturecache = textures.get(texname); // suspicious
	8443	+ if (texturecache == null)
	8444	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8445	+ else
	8446	+ new Exception().printStackTrace();
	8447	+ } else
	8448	+ {
	8449	+ if (texname.startsWith("@"))
	8450	+ {
	8451	+ // texturecache = textures.get(texname); // suspicious
	8452	+ if (texturecache == null)
	8453	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8454	+ else
	8455	+ new Exception().printStackTrace();
8281	8456	} else
8282	8457	{
8283	8458	if (textureon)
..	..	@@ -8336,19 +8511,20 @@
8336	8511	if (texturedata == null)
8337	8512	throw new Exception();
8338	8513
8339		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8514	+ texturecache = new CacheTexture(texturedata,resolution);
8340	8515	//texture = GetTexture(tex, bump);
8341	8516	}
	8517	+ }
8342	8518	}
8343	8519	//}
8344	8520	}
8345	8521
8346		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8522	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8347	8523	{
8348	8524	//return false;
8349	8525
8350	8526	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8351		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8527	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8352	8528	{
8353	8529	// String ext = "_highres";
8354	8530	// if (REDUCETEXTURE)
..	..	@@ -8365,52 +8541,17 @@
8365	8541	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8366	8542	if (!cachefile.exists())
8367	8543	{
8368		- // cache to disk
8369		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8370		- //buffers[0].
8371		-
8372		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8373		- int[] pixels = new int[bytebuf.capacity()/3];
8374		-
8375		- // squared size heuristic...
8376		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8544	+ //if (texturedata.getWidth() == texturedata.getHeight())
8377	8545	{
8378		- for (int i=pixels.length; --i>=0;)
8379		- {
8380		- int i3 = i*3;
8381		- pixels[i] = 0xFF;
8382		- pixels[i] <<= 8;
8383		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8384		- pixels[i] <<= 8;
8385		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8386		- pixels[i] <<= 8;
8387		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8388		- }
8389		-
8390		- /*
8391		- int r=0,g=0,b=0,a=0;
8392		- for (int i=0; i<width; i++)
8393		- for (int j=0; j<height; j++)
8394		- {
8395		- int index = j*width+i;
8396		- int p = pixels[index];
8397		- a = ((p>>24) & 0xFF);
8398		- r = ((p>>16) & 0xFF);
8399		- g = ((p>>8) & 0xFF);
8400		- b = (p & 0xFF);
8401		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8402		- }
8403		- /**/
8404		- int width = (int)Math.sqrt(pixels.length); // squared
8405		- int height = width;
8406		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8407		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8546	+ BufferedImage rendImage = CreateBim(texturedata);
	8547	+
8408	8548	ImageWriter writer = null;
8409	8549	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8410	8550	if (iter.hasNext()) {
8411	8551	writer = (ImageWriter)iter.next();
8412	8552	}
8413		- float compressionQuality = 0.9f;
	8553	+
	8554	+ float compressionQuality = 0.85f;
8414	8555	try
8415	8556	{
8416	8557	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8427,18 +8568,20 @@
8427	8568	}
8428	8569	}
8429	8570	}
8430		-
	8571	+
	8572	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8573	+
8431	8574	//System.out.println("Texture = " + tex);
8432		- if (textures.containsKey(texname))
	8575	+ if (textures.containsKey(tex))
8433	8576	{
8434		- CacheTexture thetex = textures.get(texname);
	8577	+ CacheTexture thetex = textures.get(tex);
8435	8578	thetex.texture.disable();
8436	8579	thetex.texture.dispose();
8437		- textures.remove(texname);
	8580	+ textures.remove(tex);
8438	8581	}
8439	8582
8440		- texture.texturedata = texturedata;
8441		- textures.put(texname, texture);
	8583	+ //texture.texturedata = texturedata;
	8584	+ textures.put(tex, texturecache);
8442	8585
8443	8586	// newtex = true;
8444	8587	}
..	..	@@ -8454,10 +8597,44 @@
8454	8597	}
8455	8598	}
8456	8599
8457		- return texture;
	8600	+ return texturecache;
8458	8601	}
8459	8602
8460		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8603	+ static void EmbedTextures(cTexture tex)
	8604	+ {
	8605	+ if (tex.pigmentdata == null)
	8606	+ {
	8607	+ //String texname = Object3D.GetPigment(tex);
	8608	+
	8609	+ CacheTexture texturecache = texturepigment.get(tex);
	8610	+
	8611	+ if (texturecache != null)
	8612	+ {
	8613	+ tex.pw = texturecache.texturedata.getWidth();
	8614	+ tex.ph = texturecache.texturedata.getHeight();
	8615	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8616	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8617	+ ;
	8618	+ //, tex.pw, tex.ph), 0.5f);
	8619	+ }
	8620	+ }
	8621	+
	8622	+ if (tex.bumpdata == null)
	8623	+ {
	8624	+ //String texname = Object3D.GetBump(tex);
	8625	+
	8626	+ CacheTexture texturecache = texturebump.get(tex);
	8627	+
	8628	+ if (texturecache != null)
	8629	+ {
	8630	+ tex.bw = texturecache.texturedata.getWidth();
	8631	+ tex.bh = texturecache.texturedata.getHeight();
	8632	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8633	+ }
	8634	+ }
	8635	+ }
	8636	+
	8637	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8461	8638	{
8462	8639	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8463	8640
..	..	@@ -8475,21 +8652,21 @@
8475	8652	return texture!=null?texture.texture:null;
8476	8653	}
8477	8654
8478		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8655	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8479	8656	{
8480	8657	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8481	8658
8482	8659	return texture!=null?texture.texturedata:null;
8483	8660	}
8484	8661
8485		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8662	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8486	8663	{
8487	8664	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8488	8665	{
8489	8666	return false;
8490	8667	}
8491	8668
8492		- boolean newtex = false;
	8669	+ //boolean newtex = false;
8493	8670
8494	8671	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8495	8672
..	..	@@ -8521,9 +8698,75 @@
8521	8698	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8522	8699	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8523	8700
8524		- return newtex;
	8701	+ return true; // Warning: not used.
8525	8702	}
8526	8703
	8704	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8705	+ {
	8706	+ try
	8707	+ {
	8708	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8709	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8710	+ ImageWriter writer = writers.next();
	8711	+
	8712	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8713	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8714	+ param.setCompressionQuality(quality);
	8715	+
	8716	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8717	+ writer.setOutput(ios);
	8718	+ writer.write(null, new IIOImage(image, null, null), param);
	8719	+
	8720	+ byte[] data = baos.toByteArray();
	8721	+ writer.dispose();
	8722	+ return data;
	8723	+ }
	8724	+ catch (Exception e)
	8725	+ {
	8726	+ e.printStackTrace();
	8727	+ return null;
	8728	+ }
	8729	+ }
	8730	+
	8731	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8732	+ {
	8733	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8734	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8735	+ ImageReader reader = writers.next();
	8736	+
	8737	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8738	+
	8739	+ ImageReadParam param = reader.getDefaultReadParam();
	8740	+ param.setDestination(bim);
	8741	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8742	+
	8743	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8744	+ reader.setInput(ios);
	8745	+ BufferedImage bim2 = reader.read(0, param);
	8746	+ reader.dispose();
	8747	+
	8748	+// WritableRaster raster = bim2.getRaster();
	8749	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8750	+// byte[] bytes = data.getData();
	8751	+//
	8752	+// int[] pixels = new int[bytes.length/3];
	8753	+// for (int i=pixels.length; --i>=0;)
	8754	+// {
	8755	+// int i3 = i*3;
	8756	+// pixels[i] = 0xFF;
	8757	+// pixels[i] <<= 8;
	8758	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8759	+// pixels[i] <<= 8;
	8760	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8761	+// pixels[i] <<= 8;
	8762	+// pixels[i] \|= bytes[i3] & 0xFF;
	8763	+// }
	8764	+//
	8765	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8766	+
	8767	+ return bim;
	8768	+ }
	8769	+
8527	8770	ShadowBuffer shadowPBuf;
8528	8771	AntialiasBuffer antialiasPBuf;
8529	8772	int MAXSTACK;
..	..	@@ -8540,10 +8783,12 @@
8540	8783
8541	8784	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8542	8785	MAXSTACK = temp[0];
8543		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8786	+ if (Globals.DEBUG)
	8787	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8544	8788	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8545	8789	MAXSTACK = temp[0];
8546		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8790	+ if (Globals.DEBUG)
	8791	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8547	8792
8548	8793	// Use debug pipeline
8549	8794	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8551,7 +8796,8 @@
8551	8796	gl = drawable.getGL(); //
8552	8797
8553	8798	GL gl3 = getGL();
8554		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8555	8801
8556	8802
8557	8803	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8716,7 +8962,7 @@
8716	8962
8717	8963	if (cubemap == null)
8718	8964	{
8719		- LoadEnvy(5);
	8965	+ //LoadEnvy(1);
8720	8966	}
8721	8967
8722	8968	//cubemap.enable();
..	..	@@ -8992,6 +9238,8 @@
8992	9238
8993	9239	void LoadEnvy(int which)
8994	9240	{
	9241	+ assert(false);
	9242	+
8995	9243	String name;
8996	9244	String ext;
8997	9245
..	..	@@ -9003,37 +9251,58 @@
9003	9251	cubemap = null;
9004	9252	return;
9005	9253	case 1:
9006		- name = "cubemaps/box_";
9007		- ext = "png";
	9254	+ name = "cubemaps/rgb/";
	9255	+ ext = "jpg";
9008	9256	reverseUP = false;
9009	9257	break;
9010	9258	case 2:
9011		- name = "cubemaps/uffizi_";
9012		- ext = "png";
9013		- break; // reverseUP = true; break;
	9259	+ name = "cubemaps/uffizi/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
9014	9263	case 3:
9015		- name = "cubemaps/CloudyHills_";
9016		- ext = "tga";
	9264	+ name = "cubemaps/CloudyHills/";
	9265	+ ext = "jpg";
9017	9266	reverseUP = false;
9018	9267	break;
9019	9268	case 4:
9020		- name = "cubemaps/cornell_";
	9269	+ name = "cubemaps/cornell/";
9021	9270	ext = "png";
9022	9271	reverseUP = false;
9023	9272	break;
	9273	+ case 5:
	9274	+ name = "cubemaps/skycube/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
	9278	+ case 6:
	9279	+ name = "cubemaps/SaintLazarusChurch3/";
	9280	+ ext = "jpg";
	9281	+ reverseUP = false;
	9282	+ break;
	9283	+ case 7:
	9284	+ name = "cubemaps/Sodermalmsallen/";
	9285	+ ext = "jpg";
	9286	+ reverseUP = false;
	9287	+ break;
	9288	+ case 8:
	9289	+ name = "cubemaps/Sodermalmsallen2/";
	9290	+ ext = "jpg";
	9291	+ reverseUP = false;
	9292	+ break;
	9293	+ case 9:
	9294	+ name = "cubemaps/UnionSquare/";
	9295	+ ext = "jpg";
	9296	+ reverseUP = false;
	9297	+ break;
9024	9298	default:
9025		- name = "cubemaps/rgb_";
9026		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9299	+ name = "cubemaps/box/";
	9300	+ ext = "png"; /mipmap = true;/
	9301	+ reverseUP = false;
9027	9302	break;
9028	9303	}
9029		-
9030		- try
9031		- {
9032		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9033		- } catch (IOException e)
9034		- {
9035		- throw new RuntimeException(e);
9036		- }
	9304	+
	9305	+ LoadSkybox(name, ext, mipmap);
9037	9306	}
9038	9307
9039	9308	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9065,8 +9334,12 @@
9065	9334	static double[] model = new double[16];
9066	9335	double[] camera2light = new double[16];
9067	9336	double[] light2camera = new double[16];
9068		- int newenvy = -1;
9069		- boolean envyoff = true; // false;
	9337	+
	9338	+ //int newenvy = -1;
	9339	+ //boolean envyoff = false;
	9340	+
	9341	+ String loadedskyboxname;
	9342	+
9070	9343	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9071	9344	//float[] light0 = { 0,0,0 };
9072	9345	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9359,11 +9632,35 @@
9359	9632	jy8[3] = 0.5f;
9360	9633	}
9361	9634
9362		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9635	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9363	9636	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9364	9637	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9365	9638	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9366	9639
	9640	+ void ResetOptions()
	9641	+ {
	9642	+ options1[0] = 100;
	9643	+ options1[1] = 0.025f;
	9644	+ options1[2] = 0.01f;
	9645	+ options1[3] = 0;
	9646	+ options1[4] = 0;
	9647	+
	9648	+ options2[0] = 0;
	9649	+ options2[1] = 0.75f;
	9650	+ options2[2] = 0;
	9651	+ options2[3] = 0;
	9652	+
	9653	+ options3[0] = 1;
	9654	+ options3[1] = 1;
	9655	+ options3[2] = 1;
	9656	+ options3[3] = 0;
	9657	+
	9658	+ options4[0] = 1;
	9659	+ options4[1] = 0;
	9660	+ options4[2] = 1;
	9661	+ options4[3] = 0;
	9662	+ }
	9663	+
9367	9664	static int imagecount = 0; // movie generation
9368	9665
9369	9666	static int jitter = 0;
..	..	@@ -9460,7 +9757,7 @@
9460	9757
9461	9758	if (renderCamera != lightCamera)
9462	9759	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9463		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9760	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9464	9761
9465	9762	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9466	9763
..	..	@@ -9476,7 +9773,7 @@
9476	9773
9477	9774	if (renderCamera != lightCamera)
9478	9775	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9479		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9776	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9480	9777
9481	9778	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9482	9779
..	..	@@ -9522,10 +9819,12 @@
9522	9819	rati = 1 / rati;
9523	9820	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9524	9821	}
9525		- assert (newenvy == -1);
	9822	+
	9823	+ //assert (newenvy == -1);
	9824	+
9526	9825	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9527	9826	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9528		- DrawSkyBox(gl);
	9827	+ DrawSkyBox(gl, (float)rati);
9529	9828	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9530	9829	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9531	9830	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10391,9 +10690,18 @@
10391	10690	static boolean init = false;
10392	10691
10393	10692	double[][] matrix = LA.newMatrix();
	10693	+
	10694	+ // This is to refresh the UI of the material panel.
	10695	+ ObjEditor patchMaterial;
10394	10696
10395	10697	public void display(GLAutoDrawable drawable)
10396	10698	{
	10699	+ if (patchMaterial.patchMaterial)
	10700	+ {
	10701	+ patchMaterial.patchMaterial = false;
	10702	+ patchMaterial.objectPanel.setSelectedIndex(1);
	10703	+ }
	10704	+
10397	10705	if (Grafreed.savesound && Grafreed.hassound)
10398	10706	{
10399	10707	Grafreed.wav.save();
..	..	@@ -10474,6 +10782,7 @@
10474	10782	ANTIALIAS = 0;
10475	10783	//System.out.println("RESTART");
10476	10784	AAtimer.restart();
	10785	+ Globals.TIMERRUNNING = true;
10477	10786	}
10478	10787	}
10479	10788	}
..	..	@@ -10541,7 +10850,8 @@
10541	10850	ambientOcclusion = false;
10542	10851	}
10543	10852
10544		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10853	+ if (//Globals.lighttouched &&
	10854	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10545	10855	{
10546	10856	//if (RENDERSHADOW) // ?
10547	10857	if (!IsFrozen())
..	..	@@ -10560,7 +10870,7 @@
10560	10870
10561	10871	if (wait)
10562	10872	{
10563		- Sleep(500);
	10873	+ Sleep(200); // blocks everything
10564	10874
10565	10875	wait = false;
10566	10876	}
..	..	@@ -10675,7 +10985,7 @@
10675	10985	// if (parentcam != renderCamera) // not a light
10676	10986	if (cam != lightCamera)
10677	10987	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10678		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10988	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10679	10989
10680	10990	for (int j = 0; j < 4; j++)
10681	10991	{
..	..	@@ -10690,7 +11000,7 @@
10690	11000	// if (parentcam != renderCamera) // not a light
10691	11001	if (cam != lightCamera)
10692	11002	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10693		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	11003	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10694	11004
10695	11005	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10696	11006
..	..	@@ -10776,13 +11086,43 @@
10776	11086	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10777	11087	}
10778	11088
10779		- if (newenvy > -1)
	11089	+// if (newenvy > -1)
	11090	+// {
	11091	+// LoadEnvy(newenvy);
	11092	+// }
	11093	+//
	11094	+// newenvy = -1;
	11095	+
	11096	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10780	11097	{
10781		- LoadEnvy(newenvy);
	11098	+ if (cubemaprgb == null)
	11099	+ {
	11100	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11101	+ }
	11102	+
	11103	+ cubemap = cubemaprgb;
10782	11104	}
10783		-
10784		- newenvy = -1;
10785		-
	11105	+ else
	11106	+ {
	11107	+ if (object.skyboxname != null)
	11108	+ {
	11109	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11110	+ {
	11111	+ if (cubemap != null && cubemap != cubemaprgb)
	11112	+ cubemap.dispose();
	11113	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11114	+ loadedskyboxname = object.skyboxname;
	11115	+ }
	11116	+ }
	11117	+ else
	11118	+ {
	11119	+ cubemapcustom = null;
	11120	+ loadedskyboxname = null;
	11121	+ }
	11122	+
	11123	+ cubemap = cubemapcustom;
	11124	+ }
	11125	+
10786	11126	ratio = ((double) getWidth()) / getHeight();
10787	11127	//System.out.println("ratio = " + ratio);
10788	11128
..	..	@@ -10798,7 +11138,7 @@
10798	11138
10799	11139	if (!IsFrozen() && !ambientOcclusion)
10800	11140	{
10801		- DrawSkyBox(gl);
	11141	+ DrawSkyBox(gl, (float)ratio);
10802	11142	}
10803	11143
10804	11144	//if (selection_view == -1)
..	..	@@ -10981,9 +11321,9 @@
10981	11321
10982	11322	gl.glMatrixMode(GL.GL_MODELVIEW);
10983	11323
10984		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10985		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10986		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11324	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11325	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11326	+gl.glEnable(gl.GL_MULTISAMPLE);
10987	11327	} else
10988	11328	{
10989	11329	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10994,7 +11334,7 @@
10994	11334	//System.out.println("BLENDING ON");
10995	11335	gl.glEnable(GL.GL_BLEND);
10996	11336	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10997		-
	11337	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10998	11338	gl.glMatrixMode(gl.GL_PROJECTION);
10999	11339	gl.glLoadIdentity();
11000	11340
..	..	@@ -11084,7 +11424,7 @@
11084	11424
11085	11425	// if (cam != lightCamera)
11086	11426	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11087		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11427	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11088	11428	}
11089	11429
11090	11430	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11243,7 +11583,7 @@
11243	11583	}
11244	11584	}
11245	11585
11246		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11586	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11247	11587	{
11248	11588	//gl.glDepthFunc(GL.GL_LEQUAL);
11249	11589	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11251,24 +11591,21 @@
11251	11591
11252	11592	boolean texon = textureon;
11253	11593
11254		- if (RENDERPROGRAM > 0)
11255		- {
11256		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11257		- textureon = false;
11258		- }
	11594	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11595	+ textureon = false;
	11596	+
11259	11597	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11260	11598	//System.out.println("ALLO");
11261	11599	gl.glColorMask(false, false, false, false);
11262	11600	DrawObject(gl);
11263		- if (RENDERPROGRAM > 0)
11264		- {
11265		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11266		- textureon = texon;
11267		- }
	11601	+
	11602	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11603	+ textureon = texon;
	11604	+
11268	11605	gl.glColorMask(true, true, true, true);
11269	11606
11270	11607	gl.glDepthFunc(GL.GL_EQUAL);
11271		- //gl.glDepthMask(false);
	11608	+ gl.glDepthMask(false);
11272	11609	}
11273	11610
11274	11611	if (false) // DrawMode() == SHADOW)
..	..	@@ -11451,15 +11788,36 @@
11451	11788
11452	11789	static boolean zoomonce = false;
11453	11790
	11791	+ static void CreateSelectedPoint()
	11792	+ {
	11793	+ if (selectedpoint == null)
	11794	+ {
	11795	+ debugpointG = new Sphere();
	11796	+ debugpointP = new Sphere();
	11797	+ debugpointC = new Sphere();
	11798	+ debugpointR = new Sphere();
	11799	+
	11800	+ selectedpoint = new Superellipsoid();
	11801	+
	11802	+ for (int i=0; i<8; i++)
	11803	+ {
	11804	+ debugpoints[i] = new Sphere();
	11805	+ }
	11806	+ }
	11807	+ }
	11808	+
11454	11809	void DrawObject(GL gl, boolean draw)
11455	11810	{
	11811	+ // To clear camera values
	11812	+ ResetOptions();
	11813	+
11456	11814	//System.out.println("DRAW OBJECT " + mouseDown);
11457	11815	// DrawMode() = SELECTION;
11458	11816	//GL gl = getGL();
11459	11817	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11460	11818	{
11461	11819	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11462		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11820	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11463	11821	pingthread.StepToTarget(true); // true);
11464	11822	// zoomonce = false;
11465	11823	}
..	..	@@ -11531,8 +11889,9 @@
11531	11889
11532	11890	if (DrawMode() == DEFAULT)
11533	11891	{
11534		- if (DEBUG)
	11892	+ if (Globals.DEBUG)
11535	11893	{
	11894	+ CreateSelectedPoint();
11536	11895	float radius = 0.05f;
11537	11896	if (selectedpoint.radius != radius)
11538	11897	{
..	..	@@ -11586,20 +11945,32 @@
11586	11945	ReleaseTextures(DEFAULT_TEXTURES);
11587	11946
11588	11947	if (CLEANCACHE)
11589		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11948	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11590	11949	{
11591		- String tex = e.nextElement();
	11950	+ cTexture tex = e.nextElement();
11592	11951
11593	11952	// System.out.println("Texture --------- " + tex);
11594	11953
11595		- if (tex.equals("WHITE_NOISE"))
	11954	+ if (tex.equals("WHITE_NOISE:"))
11596	11955	continue;
11597	11956
11598		- if (!usedtextures.containsKey(tex))
	11957	+ if (!usedtextures.contains(tex))
11599	11958	{
	11959	+ CacheTexture gettex = texturepigment.get(tex);
11600	11960	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11601		- textures.get(tex).texture.dispose();
11602		- textures.remove(tex);
	11961	+ if (gettex != null)
	11962	+ {
	11963	+ gettex.texture.dispose();
	11964	+ texturepigment.remove(tex);
	11965	+ }
	11966	+
	11967	+ gettex = texturebump.get(tex);
	11968	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11969	+ if (gettex != null)
	11970	+ {
	11971	+ gettex.texture.dispose();
	11972	+ texturebump.remove(tex);
	11973	+ }
11603	11974	}
11604	11975	}
11605	11976	}
..	..	@@ -12019,7 +12390,7 @@
12019	12390	for (int i = tp.size(); --i >= 0;)
12020	12391	{
12021	12392	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12022		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12393	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
12023	12394	}
12024	12395
12025	12396
..	..	@@ -12127,8 +12498,76 @@
12127	12498
12128	12499	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12129	12500
12130		- String program =
	12501	+ String programmin =
	12502	+ // Min shader
12131	12503	"!!ARBfp1.0\n" +
	12504	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12505	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12506	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12507	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12508	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12509	+ "PARAM light2cam0 = program.env[10];" +
	12510	+ "PARAM light2cam1 = program.env[11];" +
	12511	+ "PARAM light2cam2 = program.env[12];" +
	12512	+ "TEMP temp;" +
	12513	+ "TEMP light;" +
	12514	+ "TEMP ndotl;" +
	12515	+ "TEMP normal;" +
	12516	+ "TEMP depth;" +
	12517	+ "TEMP eye;" +
	12518	+ "TEMP pos;" +
	12519	+
	12520	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12521	+ Normalize("normal") +
	12522	+ "MOV light, state.light[0].position;" +
	12523	+ "DP3 ndotl.x, light, normal;" +
	12524	+
	12525	+ // shadow
	12526	+ "MOV pos, fragment.texcoord[1];" +
	12527	+ "MOV temp, pos;" +
	12528	+ ShadowTextureFetch("depth", "temp", "1") +
	12529	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12530	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12531	+
	12532	+ // No shadow when out of frustum
	12533	+ //"SGE temp.y, depth.z, zero123.y;" +
	12534	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12535	+
	12536	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12537	+
	12538	+ // Backlit
	12539	+ "MOV pos.w, zero123.y;" +
	12540	+ "DP4 eye.x, pos, light2cam0;" +
	12541	+ "DP4 eye.y, pos, light2cam1;" +
	12542	+ "DP4 eye.z, pos, light2cam2;" +
	12543	+ Normalize("eye") +
	12544	+
	12545	+ "DP3 ndotl.y, -eye, normal;" +
	12546	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12547	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12548	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12549	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12550	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12551	+
	12552	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12553	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12554	+
	12555	+ // Pigment
	12556	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12557	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12558	+ "MUL temp, temp, ndotl.x;" +
	12559	+
	12560	+ "MUL temp, temp, zero123.z;" +
	12561	+
	12562	+ //"MUL temp, temp, ndotl.y;" +
	12563	+
	12564	+ "MOV temp.w, zero123.y;" + // reset alpha
	12565	+ "MOV result.color, temp;" +
	12566	+ "END";
	12567	+
	12568	+ String programmax =
	12569	+ "!!ARBfp1.0\n" +
	12570	+
12132	12571	//"OPTION ARB_fragment_program_shadow;" +
12133	12572	"PARAM light2cam0 = program.env[10];" +
12134	12573	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12154,7 +12593,7 @@
12154	12593	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12155	12594	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12156	12595	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12157		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12596	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12158	12597	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12159	12598	"PARAM options1 = program.env[62];" + // fog rgb color
12160	12599	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12243,8 +12682,7 @@
12243	12682	"TEMP shininess;" +
12244	12683	"\n" +
12245	12684	"MOV texSamp, one;" +
12246		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12247		-
	12685	+
12248	12686	"MOV mapgrid.x, one2048th.x;" +
12249	12687	"MOV temp, fragment.texcoord[1];" +
12250	12688	/*
..	..	@@ -12265,20 +12703,20 @@
12265	12703	"MUL temp, floor, mapgrid.x;" +
12266	12704	//"TEX depth0, temp, texture[1], 2D;" +
12267	12705	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12268		- TextureFetch("depth0", "temp", "1") +
	12706	+ ShadowTextureFetch("depth0", "temp", "1") +
12269	12707	"") +
12270	12708	"ADD temp.x, temp.x, mapgrid.x;" +
12271	12709	//"TEX depth1, temp, texture[1], 2D;" +
12272	12710	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12273		- TextureFetch("depth1", "temp", "1") +
	12711	+ ShadowTextureFetch("depth1", "temp", "1") +
12274	12712	"") +
12275	12713	"ADD temp.y, temp.y, mapgrid.x;" +
12276	12714	//"TEX depth2, temp, texture[1], 2D;" +
12277		- TextureFetch("depth2", "temp", "1") +
	12715	+ ShadowTextureFetch("depth2", "temp", "1") +
12278	12716	"SUB temp.x, temp.x, mapgrid.x;" +
12279	12717	//"TEX depth3, temp, texture[1], 2D;" +
12280	12718	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12281		- TextureFetch("depth3", "temp", "1") +
	12719	+ ShadowTextureFetch("depth3", "temp", "1") +
12282	12720	"") +
12283	12721	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12284	12722	//"MOV params, material;" +
..	..	@@ -12400,7 +12838,7 @@
12400	12838	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12401	12839	// mar 2013 ??? "KIL alpha.a;" +
12402	12840	"MOV alpha, texSamp.aaaa;" + // y;" +
12403		- "KIL alpha.a;" +
	12841	+ "KIL alpha.a;" + // not sure with parallax mapping
12404	12842	/*
12405	12843	"MUL temp.xy, temp, two;" +
12406	12844	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12486,11 +12924,6 @@
12486	12924	"SUB bump0, bump0, half;" +
12487	12925	"ADD bump, bump, bump0;" +
12488	12926
12489		- "MOV temp.x, texSamp.a;" +
12490		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12491		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12492		- "MOV texSamp.a, temp.x;" +
12493		-
12494	12927	// double-sided
12495	12928	/**/
12496	12929	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12520,6 +12953,41 @@
12520	12953	Normalize("U") +
12521	12954
12522	12955	// parallax mapping
	12956	+
	12957	+ "DP3 temp2.x, V, eye;" +
	12958	+ "DP3 temp2.y, U, eye;" +
	12959	+ "DP3 temp2.z, normal, eye;" +
	12960	+ "RCP temp2.z, temp2.z;" +
	12961	+
	12962	+ "DP3 temp2.w, texSamp, texSamp;" + // Height
	12963	+ "RSQ temp2.w, temp2.w;" +
	12964	+ "RCP temp2.w, temp2.w;" +
	12965	+
	12966	+ "SUB temp2.w, temp2.w, half;" +
	12967	+// "SGE temp.x, temp2.w, eps.x;" +
	12968	+// "MUL temp2.w, temp2.w, temp.x;" +
	12969	+
	12970	+ //"MOV texSamp, U;" +
	12971	+
	12972	+ "MUL temp2.z, temp2.z, temp2.w;" +
	12973	+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
	12974	+
	12975	+ "MUL temp2, temp2, temp2.z;" +
	12976	+
	12977	+ "MOV temp, fragment.texcoord[0];" +
	12978	+
	12979	+ "SUB temp, temp, temp2;" +
	12980	+
	12981	+ "TEX texSamp, temp, texture[0], 2D;" +
	12982	+ "POW texSamp.a, texSamp.a, params6.w;" + // punch through
	12983	+ "MOV alpha, texSamp.aaaa;" +
	12984	+
	12985	+// parallax mapping
	12986	+
	12987	+ "MOV temp.x, texSamp.a;" +
	12988	+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
	12989	+ //"LRP texSamp0, params5.x, texSamp0, one;" +
	12990	+ "MOV texSamp.a, temp.x;" +
12523	12991
12524	12992	//"MOV temp, fragment.texcoord[0];" +
12525	12993	//
..	..	@@ -12649,10 +13117,10 @@
12649	13117	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12650	13118	"") +
12651	13119
12652		- // display shadow only (bump == 0)
	13120	+ // display shadow only (fakedepth == 0)
12653	13121	"SUB temp.x, half.x, shadow.x;" +
12654	13122	"MOV temp.y, -params5.z;" + // params6.x;" +
12655		- "SLT temp.z, temp.y, -one2048th.x;" +
	13123	+ "SLT temp.z, temp.y, -c256i.x;" +
12656	13124	"SUB temp.y, one.x, temp.z;" +
12657	13125	"MUL temp.x, temp.x, temp.y;" +
12658	13126	"KIL temp.x;" +
..	..	@@ -12983,8 +13451,19 @@
12983	13451	//once = true;
12984	13452	}
12985	13453
12986		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12987		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13454	+ String program = programmax;
	13455	+
	13456	+ if (Globals.MINSHADER)
	13457	+ {
	13458	+ program = programmin;
	13459	+ }
	13460	+
	13461	+ if (Globals.DEBUG)
	13462	+ {
	13463	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13464	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13465	+ }
	13466	+
12988	13467	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12989	13468
12990	13469	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13031,7 +13510,8 @@
13031	13510	"\n" +
13032	13511	"END\n";
13033	13512
13034		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13513	+ if (Globals.DEBUG)
	13514	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13035	13515	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13036	13516
13037	13517	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13076,25 +13556,26 @@
13076	13556	return out;
13077	13557	}
13078	13558
13079		- String TextureFetch(String dest, String src, String unit)
	13559	+ // Also does frustum culling
	13560	+ String ShadowTextureFetch(String dest, String src, String unit)
13080	13561	{
13081	13562	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13082	13563	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13083	13564	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13565	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13566	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13084	13567	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13085		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13086		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13087		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13088		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13568	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13569	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13089	13570	//"SWZ buffer, temp, w,w,w,w;";
13090		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13571	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13091	13572	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13092	13573	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13093	13574	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13094		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13575	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13095	13576
13096		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13097		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13577	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13578	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13098	13579	}
13099	13580
13100	13581	String Shadow(String depth, String shadow)
..	..	@@ -13141,7 +13622,7 @@
13141	13622	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13142	13623	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13143	13624
13144		- // No shadow when out of frustrum
	13625	+ // No shadow when out of frustum
13145	13626	"SGE temp.x, " + depth + ".z, one.z;" +
13146	13627	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13147	13628	"";
..	..	@@ -13288,8 +13769,9 @@
13288	13769	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13289	13770	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13290	13771	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13291		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13292		- Object3D.cVector2[] vector2buffer;
	13772	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
	13773	+
	13774	+ //Object3D.cVector2[] vector2buffer;
13293	13775
13294	13776	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13295	13777	// OUT : diff, spec
..	..	@@ -13305,9 +13787,10 @@
13305	13787	"DP3 " + dest + ".z," + "normals," + "eye;" +
13306	13788	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13307	13789	//"MOV " + dest + ".w," + "normal.z;" +
13308		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13309		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13310		- //"MOV " + dest + ".z," + "params2.w;" +
	13790	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13791	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13792	+
	13793	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13311	13794	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13312	13795	"RCP " + dest + ".w," + dest + ".w;" +
13313	13796	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13812,6 +14295,7 @@
13812	14295	else
13813	14296	if (evt.getSource() == AAtimer)
13814	14297	{
	14298	+ Globals.TIMERRUNNING = false;
13815	14299	if (mouseDown)
13816	14300	{
13817	14301	//new Exception().printStackTrace();
..	..	@@ -13871,7 +14355,7 @@
13871	14355
13872	14356	// fev 2014???
13873	14357	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13874		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14358	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13875	14359	pingthread.StepToTarget(true); // true);
13876	14360	}
13877	14361	// if (!LIVE)
..	..	@@ -13886,6 +14370,7 @@
13886	14370	return;
13887	14371
13888	14372	AAtimer.restart(); //
	14373	+ Globals.TIMERRUNNING = true;
13889	14374
13890	14375	// waslive = LIVE;
13891	14376	// LIVE = false;
..	..	@@ -13935,14 +14420,15 @@
13935	14420	drag = false;
13936	14421	//System.out.println("Mouse DOWN");
13937	14422	editObj = false;
13938		- ClickInfo info = new ClickInfo();
13939		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13940		- info.pane = this;
13941		- info.camera = renderCamera;
13942		- info.x = x;
13943		- info.y = y;
13944		- info.modifiers = modifiersex;
13945		- editObj = object.doEditClick(info, 0);
	14423	+ //ClickInfo info = new ClickInfo();
	14424	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14425	+ object.clickInfo.pane = this;
	14426	+ object.clickInfo.camera = renderCamera;
	14427	+ object.clickInfo.x = x;
	14428	+ object.clickInfo.y = y;
	14429	+ object.clickInfo.modifiers = modifiersex;
	14430	+ editObj = object.doEditClick(//info,
	14431	+ 0);
13946	14432	if (!editObj)
13947	14433	{
13948	14434	hasMarquee = true;
..	..	@@ -14224,12 +14710,18 @@
14224	14710	void GoDown(int mod)
14225	14711	{
14226	14712	MODIFIERS \|= COMMAND;
14227		- /*
	14713	+ boolean isVR = (mouseMode&VR)!=0;
	14714	+ /**/
14228	14715	if((mod&SHIFT) == SHIFT)
14229		- manipCamera.RotatePosition(0, -speed);
	14716	+ {
	14717	+ if (isVR)
	14718	+ manipCamera.RotateInterest(0, -speed);
	14719	+ else
	14720	+ manipCamera.RotatePosition(0, -speed);
	14721	+ }
14230	14722	else
14231		- manipCamera.BackForth(0, -speed*delta, getWidth());
14232		- */
	14723	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	14724	+ /**/
14233	14725	if ((mod & SHIFT) == SHIFT)
14234	14726	{
14235	14727	mouseMode = mouseMode; // VR??
..	..	@@ -14238,6 +14730,8 @@
14238	14730	mouseMode \|= BACKFORTH;
14239	14731	}
14240	14732
	14733	+ targetLookAt.set(manipCamera.lookAt);
	14734	+
14241	14735	//prevX = X = anchorX;
14242	14736	prevY = Y = anchorY - (int) (renderCamera.Distance());
14243	14737	}
..	..	@@ -14245,12 +14739,19 @@
14245	14739	void GoUp(int mod)
14246	14740	{
14247	14741	MODIFIERS \|= COMMAND;
14248		- /*
	14742	+ /**/
	14743	+ boolean isVR = (mouseMode&VR)!=0;
	14744	+
14249	14745	if((mod&SHIFT) == SHIFT)
14250		- manipCamera.RotatePosition(0, speed);
	14746	+ {
	14747	+ if (isVR)
	14748	+ manipCamera.RotateInterest(0, speed);
	14749	+ else
	14750	+ manipCamera.RotatePosition(0, speed);
	14751	+ }
14251	14752	else
14252		- manipCamera.BackForth(0, speed*delta, getWidth());
14253		- */
	14753	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	14754	+ /**/
14254	14755	if ((mod & SHIFT) == SHIFT)
14255	14756	{
14256	14757	mouseMode = mouseMode;
..	..	@@ -14259,6 +14760,8 @@
14259	14760	mouseMode \|= BACKFORTH;
14260	14761	}
14261	14762
	14763	+ targetLookAt.set(manipCamera.lookAt);
	14764	+
14262	14765	//prevX = X = anchorX;
14263	14766	prevY = Y = anchorY + (int) (renderCamera.Distance());
14264	14767	}
..	..	@@ -14266,12 +14769,17 @@
14266	14769	void GoLeft(int mod)
14267	14770	{
14268	14771	MODIFIERS \|= COMMAND;
14269		- /*
	14772	+ /**/
14270	14773	if((mod&SHIFT) == SHIFT)
14271		- manipCamera.RotatePosition(speed, 0);
	14774	+ manipCamera.Translate(speed*delta, 0, getWidth());
14272	14775	else
14273		- manipCamera.Translate(speed*delta, 0, getWidth());
14274		- */
	14776	+ {
	14777	+ if ((mouseMode&VR)!=0)
	14778	+ manipCamera.RotateInterest(-speed, 0);
	14779	+ else
	14780	+ manipCamera.RotatePosition(speed, 0);
	14781	+ }
	14782	+ /**/
14275	14783	if ((mod & SHIFT) == SHIFT)
14276	14784	{
14277	14785	mouseMode = mouseMode;
..	..	@@ -14280,6 +14788,8 @@
14280	14788	mouseMode \|= ROTATE;
14281	14789	} // TRANSLATE;
14282	14790
	14791	+ targetLookAt.set(manipCamera.lookAt);
	14792	+
14283	14793	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14284	14794	prevY = Y = anchorY;
14285	14795	}
..	..	@@ -14287,12 +14797,18 @@
14287	14797	void GoRight(int mod)
14288	14798	{
14289	14799	MODIFIERS \|= COMMAND;
14290		- /*
	14800	+ /**/
14291	14801	if((mod&SHIFT) == SHIFT)
14292		- manipCamera.RotatePosition(-speed, 0);
	14802	+ manipCamera.Translate(-speed*delta, 0, getWidth());
14293	14803	else
14294		- manipCamera.Translate(-speed*delta, 0, getWidth());
14295		- */
	14804	+ {
	14805	+ if ((mouseMode&VR)!=0)
	14806	+ manipCamera.RotateInterest(speed, 0);
	14807	+ else
	14808	+ manipCamera.RotatePosition(-speed, 0);
	14809	+ }
	14810	+
	14811	+ /**/
14296	14812	if ((mod & SHIFT) == SHIFT)
14297	14813	{
14298	14814	mouseMode = mouseMode;
..	..	@@ -14301,6 +14817,8 @@
14301	14817	mouseMode \|= ROTATE;
14302	14818	} // TRANSLATE;
14303	14819
	14820	+ targetLookAt.set(manipCamera.lookAt);
	14821	+
14304	14822	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14305	14823	prevY = Y = anchorY;
14306	14824	}
..	..	@@ -14342,14 +14860,16 @@
14342	14860	if (editObj)
14343	14861	{
14344	14862	drag = true;
14345		- ClickInfo info = new ClickInfo();
14346		- info.bounds.setBounds(0, 0,
	14863	+ //ClickInfo info = new ClickInfo();
	14864	+ object.clickInfo.bounds.setBounds(0, 0,
14347	14865	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14348		- info.pane = this;
14349		- info.camera = renderCamera;
14350		- info.x = x;
14351		- info.y = y;
14352		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14866	+ object.clickInfo.pane = this;
	14867	+ object.clickInfo.camera = renderCamera;
	14868	+ object.clickInfo.x = x;
	14869	+ object.clickInfo.y = y;
	14870	+ object //.GetWindow().copy
	14871	+ .doEditDrag(//info,
	14872	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14353	14873	} else
14354	14874	{
14355	14875	if (x < startX)
..	..	@@ -14498,22 +15018,27 @@
14498	15018	}
14499	15019	}
14500	15020
	15021	+// ClickInfo clickInfo = new ClickInfo();
	15022	+
14501	15023	public void mouseMoved(MouseEvent e)
14502	15024	{
14503	15025	//System.out.println("mouseMoved: " + e);
14504	15026	if (isRenderer)
14505	15027	return;
14506	15028
14507		- ClickInfo ci = new ClickInfo();
14508		- ci.x = e.getX();
14509		- ci.y = e.getY();
14510		- ci.modifiers = e.getModifiersEx();
14511		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14512		- ci.pane = this;
14513		- ci.camera = renderCamera;
	15029	+ // Mouse cursor feedback
	15030	+ object.clickInfo.x = e.getX();
	15031	+ object.clickInfo.y = e.getY();
	15032	+ object.clickInfo.modifiers = e.getModifiersEx();
	15033	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15034	+ object.clickInfo.pane = this;
	15035	+ object.clickInfo.camera = renderCamera;
14514	15036	if (!isRenderer)
14515	15037	{
14516		- if (object.editWindow.copy.doEditClick(ci, 0))
	15038	+ //ObjEditor editWindow = object.editWindow;
	15039	+ //Object3D copy = editWindow.copy;
	15040	+ if (object.doEditClick(//clickInfo,
	15041	+ 0))
14517	15042	{
14518	15043	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14519	15044	} else
..	..	@@ -14528,7 +15053,8 @@
14528	15053	Globals.MOUSEDRAGGED = false;
14529	15054
14530	15055	movingcamera = false;
14531		- X = Y = 0;
	15056	+ X = 0; // getBounds().width/2;
	15057	+ Y = 0; // getBounds().height/2;
14532	15058	//System.out.println("mouseReleased: " + e);
14533	15059	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14534	15060	}
..	..	@@ -14784,7 +15310,8 @@
14784	15310	// break;
14785	15311	case 'T':
14786	15312	CACHETEXTURE ^= true;
14787		- textures.clear();
	15313	+ texturepigment.clear();
	15314	+ texturebump.clear();
14788	15315	// repaint();
14789	15316	break;
14790	15317	case 'Y':
..	..	@@ -14794,8 +15321,8 @@
14794	15321	case 'K':
14795	15322	KOMPACTTEXTURE ^= true;
14796	15323	//textures.clear();
14797		- break;
14798		- case 'P': // Texture Projection macros
	15324	+ // break;
	15325	+ //case 'P': // Texture Projection macros
14799	15326	// SAVETEXTURE ^= true;
14800	15327	macromode = true;
14801	15328	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -14869,7 +15396,9 @@
14869	15396	case 'E' : COMPACT ^= true;
14870	15397	repaint();
14871	15398	break;
14872		- case 'W' : DEBUGHSB ^= true;
	15399	+ case 'W' : // Wide Window (fullscreen)
	15400	+ //DEBUGHSB ^= true;
	15401	+ ObjEditor.theFrame.ToggleFullScreen();
14873	15402	repaint();
14874	15403	break;
14875	15404	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14894,8 +15423,8 @@
14894	15423	RevertCamera();
14895	15424	repaint();
14896	15425	break;
14897		- case 'L':
14898	15426	case 'l':
	15427	+ //case 'L':
14899	15428	if (lightMode)
14900	15429	{
14901	15430	lightMode = false;
..	..	@@ -14914,7 +15443,7 @@
14914	15443	targetLookAt.set(manipCamera.lookAt);
14915	15444	repaint();
14916	15445	break;
14917		- case 'p':
	15446	+ case 'P': // p':
14918	15447	// c'est quoi ca au juste? spherical ^= true;
14919	15448	Skinshader ^= true; programInitialized = false;
14920	15449	repaint();
..	..	@@ -14959,20 +15488,24 @@
14959	15488	OCCLUSION_CULLING ^= true;
14960	15489	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14961	15490	break;
14962		- case '0': envyoff ^= true; repaint(); break;
	15491	+ //case '0': envyoff ^= true; repaint(); break;
14963	15492	case '1':
14964	15493	case '2':
14965	15494	case '3':
14966	15495	case '4':
14967	15496	case '5':
14968		- newenvy = Character.getNumericValue(key);
14969		- repaint();
14970		- break;
14971	15497	case '6':
14972	15498	case '7':
14973	15499	case '8':
14974	15500	case '9':
14975		- BGcolor = (key - '6')/3.f;
	15501	+ if (true) // envyoff)
	15502	+ {
	15503	+ BGcolor = (key - '1')/8.f;
	15504	+ }
	15505	+ else
	15506	+ {
	15507	+ //newenvy = Character.getNumericValue(key);
	15508	+ }
14976	15509	repaint();
14977	15510	break;
14978	15511	case '!':
..	..	@@ -15038,9 +15571,9 @@
15038	15571	case '_':
15039	15572	kompactbit = 5;
15040	15573	break;
15041		- case '+':
15042		- kompactbit = 6;
15043		- break;
	15574	+// case '+':
	15575	+// kompactbit = 6;
	15576	+// break;
15044	15577	case ' ':
15045	15578	lightMode ^= true;
15046	15579	Globals.lighttouched = true;
..	..	@@ -15052,6 +15585,7 @@
15052	15585	case ESC:
15053	15586	RENDERPROGRAM += 1;
15054	15587	RENDERPROGRAM %= 3;
	15588	+
15055	15589	repaint();
15056	15590	break;
15057	15591	case 'Z':
..	..	@@ -15091,8 +15625,9 @@
15091	15625	case DELETE:
15092	15626	ClearSelection();
15093	15627	break;
15094		- /*
15095	15628	case '+':
	15629	+
	15630	+ /*
15096	15631	//fontsize += 1;
15097	15632	bbzoom *= 2;
15098	15633	repaint();
..	..	@@ -15109,17 +15644,17 @@
15109	15644	case '=':
15110	15645	IncDepth();
15111	15646	//fontsize += 1;
15112		- object.editWindow.refreshContents(true);
	15647	+ object.GetWindow().refreshContents(true);
15113	15648	maskbit = 6;
15114	15649	break;
15115	15650	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15116	15651	DecDepth();
15117	15652	maskbit = 5;
15118	15653	//if(fontsize > 1) fontsize -= 1;
15119		- if (object.editWindow == null)
15120		- new Exception().printStackTrace();
15121		- else
15122		- object.editWindow.refreshContents(true);
	15654	+// if (object.editWindow == null)
	15655	+// new Exception().printStackTrace();
	15656	+// else
	15657	+ object.GetWindow().refreshContents(true);
15123	15658	break;
15124	15659	case '{':
15125	15660	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15343,7 +15878,7 @@
15343	15878	}
15344	15879	*/
15345	15880
15346		- object.editWindow.EditSelection();
	15881	+ object.GetWindow().EditSelection(false);
15347	15882	}
15348	15883
15349	15884	void SelectParent()
..	..	@@ -15360,10 +15895,10 @@
15360	15895	{
15361	15896	//selectees.remove(i);
15362	15897	System.out.println("select parent of " + elem);
15363		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15898	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15364	15899	} else
15365	15900	{
15366		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15901	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15367	15902	}
15368	15903
15369	15904	first = false;
..	..	@@ -15405,12 +15940,12 @@
15405	15940	for (int j = 0; j < group.children.size(); j++)
15406	15941	{
15407	15942	elem = (Object3D) group.children.elementAt(j);
15408		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15943	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15409	15944	first = false;
15410	15945	}
15411	15946	} else
15412	15947	{
15413		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15948	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15414	15949	}
15415	15950
15416	15951	first = false;
..	..	@@ -15421,21 +15956,21 @@
15421	15956	{
15422	15957	//Composite group = (Composite) object;
15423	15958	Object3D group = object;
15424		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15959	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15425	15960	}
15426	15961
15427	15962	void ResetTransform(int mask)
15428	15963	{
15429	15964	//Composite group = (Composite) object;
15430	15965	Object3D group = object;
15431		- group.editWindow.ResetTransform(mask);
	15966	+ group.GetWindow().ResetTransform(mask);
15432	15967	}
15433	15968
15434	15969	void FlipTransform()
15435	15970	{
15436	15971	//Composite group = (Composite) object;
15437	15972	Object3D group = object;
15438		- group.editWindow.FlipTransform();
	15973	+ group.GetWindow().FlipTransform();
15439	15974	// group.editWindow.ReduceMesh(true);
15440	15975	}
15441	15976
..	..	@@ -15443,7 +15978,7 @@
15443	15978	{
15444	15979	//Composite group = (Composite) object;
15445	15980	Object3D group = object;
15446		- group.editWindow.PrintMemory();
	15981	+ group.GetWindow().PrintMemory();
15447	15982	// group.editWindow.ReduceMesh(true);
15448	15983	}
15449	15984
..	..	@@ -15451,7 +15986,7 @@
15451	15986	{
15452	15987	//Composite group = (Composite) object;
15453	15988	Object3D group = object;
15454		- group.editWindow.ResetCentroid();
	15989	+ group.GetWindow().ResetCentroid();
15455	15990	}
15456	15991
15457	15992	void IncDepth()
..	..	@@ -15533,8 +16068,6 @@
15533	16068
15534	16069	int width = getBounds().width;
15535	16070	int height = getBounds().height;
15536		- ClickInfo info = new ClickInfo();
15537		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15538	16071	//Image img = CreateImage(width, height);
15539	16072	//System.out.println("width = " + width + "; height = " + height + "\n");
15540	16073
..	..	@@ -15611,48 +16144,77 @@
15611	16144	}
15612	16145	if (object != null && !hasMarquee)
15613	16146	{
	16147	+ if (object.clickInfo == null)
	16148	+ object.clickInfo = new ClickInfo();
	16149	+ ClickInfo info = object.clickInfo;
	16150	+ //ClickInfo info = new ClickInfo();
	16151	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16152	+
15614	16153	if (isRenderer)
15615	16154	{
15616		- info.flags++;
	16155	+ object.clickInfo.flags++;
15617	16156	double frameAspect = (double) width / (double) height;
15618	16157	if (frameAspect > renderCamera.aspect)
15619	16158	{
15620	16159	int desired = (int) ((double) height * renderCamera.aspect);
15621		- info.bounds.width -= width - desired;
15622		- info.bounds.x += (width - desired) / 2;
	16160	+ object.clickInfo.bounds.width -= width - desired;
	16161	+ object.clickInfo.bounds.x += (width - desired) / 2;
15623	16162	} else
15624	16163	{
15625	16164	int desired = (int) ((double) width / renderCamera.aspect);
15626		- info.bounds.height -= height - desired;
15627		- info.bounds.y += (height - desired) / 2;
	16165	+ object.clickInfo.bounds.height -= height - desired;
	16166	+ object.clickInfo.bounds.y += (height - desired) / 2;
15628	16167	}
15629	16168	}
15630		- info.g = gr;
15631		- info.camera = renderCamera;
	16169	+
	16170	+ object.clickInfo.g = gr;
	16171	+ object.clickInfo.camera = renderCamera;
15632	16172	/*
15633	16173	// Memory intensive (brep.verticescopy)
15634	16174	if (!(object instanceof Composite))
15635	16175	object.draw(info, 0, false); // SLOW :
15636	16176	*/
15637		- if (!isRenderer)
	16177	+ if (!isRenderer) // && drag)
15638	16178	{
15639		- object.drawEditHandles(info, 0);
15640		-
15641		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16179	+ Grafreed.Assert(object != null);
	16180	+ Grafreed.Assert(object.selection != null);
	16181	+ if (object.selection.Size() > 0)
15642	16182	{
15643		- switch (object.selection.get(0).hitSomething)
	16183	+ int hitSomething = object.selection.get(0).hitSomething;
	16184	+
	16185	+ object.clickInfo.DX = 0;
	16186	+ object.clickInfo.DY = 0;
	16187	+ object.clickInfo.W = 1;
	16188	+ if (hitSomething == Object3D.hitCenter)
15644	16189	{
15645		- case Object3D.hitCenter: gr.setColor(Color.pink);
15646		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15647		- break;
15648		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15649		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15650		- break;
15651		- case Object3D.hitScale: gr.setColor(Color.cyan);
15652		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15653		- break;
	16190	+ info.DX = X;
	16191	+ if (X != 0)
	16192	+ info.DX -= info.bounds.width/2;
	16193	+
	16194	+ info.DY = Y;
	16195	+ if (Y != 0)
	16196	+ info.DY -= info.bounds.height/2;
15654	16197	}
15655		-
	16198	+
	16199	+ object.drawEditHandles(//info,
	16200	+ 0);
	16201	+
	16202	+ if (drag && (X != 0 \|\| Y != 0))
	16203	+ {
	16204	+ switch (hitSomething)
	16205	+ {
	16206	+ case Object3D.hitCenter: gr.setColor(Color.white);
	16207	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16208	+ break;
	16209	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16210	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16211	+ break;
	16212	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16213	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16214	+ break;
	16215	+ }
	16216	+
	16217	+ }
15656	16218	}
15657	16219	}
15658	16220	}
..	..	@@ -15667,7 +16229,7 @@
15667	16229	if (hasMarquee)
15668	16230	{
15669	16231	gr.setXORMode(Color.white);
15670		- gr.setColor(Color.red);
	16232	+ gr.setColor(Color.white);
15671	16233	if (!firstime)
15672	16234	{
15673	16235	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -16134,6 +16696,8 @@
16134	16696	private /static/ boolean firstime;
16135	16697	private /static/ cVector newView = new cVector();
16136	16698	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16699	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16700	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16137	16701	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16138	16702	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16139	16703	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16146,29 +16710,67 @@
16146	16710	{
16147	16711	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16148	16712
	16713	+ int usedsuf = 0;
	16714	+
16149	16715	for (int i = 0; i < suffixes.length; i++)
16150	16716	{
16151		- String resourceName = basename + suffixes[i] + "." + suffix;
16152		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16153		- mipmapped,
16154		- FileUtil.getFileSuffix(resourceName));
16155		- if (data == null)
	16717	+ String[] suffixe = suffixes;
	16718	+ String[] fallback = suffixes2;
	16719	+ String[] fallfallback = suffixes3;
	16720	+
	16721	+ for (int c=usedsuf; --c>=0;)
16156	16722	{
16157		- throw new IOException("Unable to load texture " + resourceName);
	16723	+// String[] temp = suffixe;
	16724	+// suffixe = fallback;
	16725	+// fallback = fallfallback;
	16726	+// fallfallback = temp;
16158	16727	}
	16728	+
	16729	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16730	+ TextureData data;
	16731	+
	16732	+ try
	16733	+ {
	16734	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16735	+ mipmapped,
	16736	+ FileUtil.getFileSuffix(resourceName));
	16737	+ }
	16738	+ catch (Exception e)
	16739	+ {
	16740	+ try
	16741	+ {
	16742	+ resourceName = basename + fallback[i] + "." + suffix;
	16743	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16744	+ mipmapped,
	16745	+ FileUtil.getFileSuffix(resourceName));
	16746	+ }
	16747	+ catch (Exception e2)
	16748	+ {
	16749	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16750	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16751	+ mipmapped,
	16752	+ FileUtil.getFileSuffix(resourceName));
	16753	+ }
	16754	+ }
	16755	+
16159	16756	//System.out.println("Target = " + targets[i]);
16160	16757	cubemap.updateImage(data, targets[i]);
16161	16758	}
16162	16759
16163	16760	return cubemap;
16164	16761	}
	16762	+
16165	16763	int bigsphere = -1;
16166	16764
16167	16765	float BGcolor = 0.5f;
16168	16766
16169		- private void DrawSkyBox(GL gl)
	16767	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16768	+
	16769	+ private void DrawSkyBox(GL gl, float ratio)
16170	16770	{
16171		- if (envyoff \|\| cubemap == null)
	16771	+ if (//envyoff \|\|
	16772	+ WIREFRAME \|\|
	16773	+ cubemap == null)
16172	16774	{
16173	16775	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16174	16776	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16183,7 +16785,17 @@
16183	16785	// Compensates for ExaminerViewer's modification of modelview matrix
16184	16786	gl.glMatrixMode(GL.GL_MODELVIEW);
16185	16787	gl.glLoadIdentity();
	16788	+ gl.glScalef(1,ratio,1);
16186	16789
	16790	+// colorV[0] = 2;
	16791	+// colorV[1] = 2;
	16792	+// colorV[2] = 2;
	16793	+// colorV[3] = 1;
	16794	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16795	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16796	+//
	16797	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16798	+
16187	16799	//gl.glActiveTexture(GL.GL_TEXTURE1);
16188	16800	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16189	16801
..	..	@@ -16215,6 +16827,7 @@
16215	16827	{
16216	16828	gl.glScalef(1.0f, -1.0f, 1.0f);
16217	16829	}
	16830	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16218	16831	gl.glMultMatrixd(viewrot_1, 0);
16219	16832	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16220	16833	//viewer.updateInverseRotation(gl);
..	..	@@ -16255,7 +16868,8 @@
16255	16868	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16256	16869
16257	16870	cubemap.disable();
16258		- ////cubemap.unbind();
	16871	+ //cubemap.dispose();
	16872	+
16259	16873	if (CULLFACE)
16260	16874	{
16261	16875	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16355,16 +16969,16 @@
16355	16969	cStatic.objectstack[materialdepth++] = checker;
16356	16970	//System.out.println("material " + material);
16357	16971	//Applet3D.tracein(this, selected);
16358		- vector2buffer = checker.projectedVertices;
	16972	+ //vector2buffer = checker.projectedVertices;
16359	16973
16360	16974	//checker.GetMaterial().Draw(this, false); // true);
16361		- DrawMaterial(checker.GetMaterial(), false); // true);
	16975	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16362	16976
16363	16977	materialdepth -= 1;
16364	16978	if (materialdepth > 0)
16365	16979	{
16366		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16367		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16980	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16981	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16368	16982	}
16369	16983	//checker.GetMaterial().opacity = 1f;
16370	16984	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16450,6 +17064,14 @@
16450	17064	}
16451	17065	}
16452	17066
	17067	+ private Object3D GetFolder()
	17068	+ {
	17069	+ Object3D folder = object.GetWindow().copy;
	17070	+ if (object.GetWindow().copy.selection.Size() > 0)
	17071	+ folder = object.GetWindow().copy.selection.elementAt(0);
	17072	+ return folder;
	17073	+ }
	17074	+
16453	17075	class SelectBuffer implements GLEventListener
16454	17076	{
16455	17077
..	..	@@ -16465,7 +17087,7 @@
16465	17087	//new Exception().printStackTrace();
16466	17088	System.out.println("select buffer init");
16467	17089	// Use debug pipeline
16468		- drawable.setGL(new DebugGL(drawable.getGL()));
	17090	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16469	17091
16470	17092	GL gl = drawable.getGL();
16471	17093
..	..	@@ -16529,6 +17151,17 @@
16529	17151
16530	17152	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16531	17153
	17154	+ if (PAINTMODE)
	17155	+ {
	17156	+ if (object.GetWindow().copy.selection.Size() > 0)
	17157	+ {
	17158	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17159	+
	17160	+ // Make what you paint not selectable.
	17161	+ paintobj.ResetSelectable();
	17162	+ }
	17163	+ }
	17164	+
16532	17165	//int tmp = selection_view;
16533	17166	//selection_view = -1;
16534	17167	int temp = DrawMode();
..	..	@@ -16540,6 +17173,17 @@
16540	17173	// temp = DEFAULT; // patch for selection debug
16541	17174	Globals.drawMode = temp; // WARNING
16542	17175
	17176	+ if (PAINTMODE)
	17177	+ {
	17178	+ if (object.GetWindow().copy.selection.Size() > 0)
	17179	+ {
	17180	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17181	+
	17182	+ // Revert.
	17183	+ paintobj.RestoreSelectable();
	17184	+ }
	17185	+ }
	17186	+
16543	17187	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16544	17188
16545	17189	// trying different ways of getting the depth info over
..	..	@@ -16587,6 +17231,8 @@
16587	17231	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16588	17232	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16589	17233	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17234	+
	17235	+ CreateSelectedPoint();
16590	17236
16591	17237	// Will fit the mesh !!!
16592	17238	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16641,29 +17287,31 @@
16641	17287	}
16642	17288
16643	17289	if (!movingcamera && !PAINTMODE)
16644		- object.editWindow.ScreenFitPoint(); // fev 2014
	17290	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16645	17291
16646		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17292	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16647	17293	{
16648		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17294	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16649	17295
16650		- Object3D group = new Object3D("inst" + paintcount++);
	17296	+ if (object.GetWindow().copy.selection.Size() > 0)
	17297	+ {
	17298	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16651	17299
16652		- group.CreateMaterial(); // use a void leaf to select instances
16653		-
16654		- group.add(paintobj); // link
16655		-
16656		- object.editWindow.SnapObject(group);
16657		-
16658		- Object3D folder = object.editWindow.copy;
16659		-
16660		- if (object.editWindow.copy.selection.Size() > 0)
16661		- folder = object.editWindow.copy.selection.elementAt(0);
16662		-
16663		- folder.add(group);
16664		-
16665		- object.editWindow.ResetModel();
16666		- object.editWindow.refreshContents();
	17300	+ Object3D inst = new Object3D("inst" + paintcount++);
	17301	+
	17302	+ inst.CreateMaterial(); // use a void leaf to select instances
	17303	+
	17304	+ inst.add(paintobj); // link
	17305	+
	17306	+ object.GetWindow().SnapObject(inst);
	17307	+
	17308	+ Object3D folder = paintFolder; // GetFolder();
	17309	+
	17310	+ folder.add(inst);
	17311	+
	17312	+ object.GetWindow().ResetModel();
	17313	+ object.GetWindow().refreshContents();
	17314	+ }
16667	17315	}
16668	17316	else
16669	17317	paintcount = 0;
..	..	@@ -16702,6 +17350,11 @@
16702	17350	//System.out.println("objects[color] = " + objects[color]);
16703	17351	//objects[color].Select();
16704	17352	indexcount = 0;
	17353	+ ObjEditor window = object.GetWindow();
	17354	+ if (window != null && deselect)
	17355	+ {
	17356	+ window.Select(null, deselect, true);
	17357	+ }
16705	17358	object.Select(color, deselect);
16706	17359	}
16707	17360
..	..	@@ -16752,6 +17405,7 @@
16752	17405
16753	17406	public void init(GLAutoDrawable drawable)
16754	17407	{
	17408	+ if (Globals.DEBUG)
16755	17409	System.out.println("shadow buffer init");
16756	17410
16757	17411	GL gl = drawable.getGL();
..	..	@@ -16980,10 +17634,14 @@
16980	17634	gl.glFlush();
16981	17635
16982	17636	/**/
16983		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17637	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
16984	17638
16985		- float[] pixels = occlusionsizebuffer.array();
	17639	+ float[] depths = occlusiondepthbuffer.array();
16986	17640
	17641	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17642	+
	17643	+ int[] pixels = selectsizebuffer.array();
	17644	+
16987	17645	double r = 0, g = 0, b = 0;
16988	17646
16989	17647	double count = 0;
..	..	@@ -16994,7 +17652,7 @@
16994	17652
16995	17653	double FACTOR = 1;
16996	17654
16997		- for (int i = 0; i < pixels.length; i++)
	17655	+ for (int i = 0; i < depths.length; i++)
16998	17656	{
16999	17657	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17000	17658	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17077,7 +17735,7 @@
17077	17735
17078	17736	double scale = ray.z; // 1; // cos
17079	17737
17080		- float depth = pixels[newindex];
	17738	+ float depth = depths[newindex];
17081	17739
17082	17740	/*
17083	17741	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17227,23 +17885,15 @@
17227	17885	int AAbuffersize = 0;
17228	17886
17229	17887	//double[] selectedpoint = new double[3];
17230		- static Superellipsoid selectedpoint = new Superellipsoid();
	17888	+ static Superellipsoid selectedpoint;
17231	17889	static Sphere previousselectedpoint = null;
17232		- static Sphere debugpointG = new Sphere();
17233		- static Sphere debugpointP = new Sphere();
17234		- static Sphere debugpointC = new Sphere();
17235		- static Sphere debugpointR = new Sphere();
	17890	+ static Sphere debugpointG;
	17891	+ static Sphere debugpointP;
	17892	+ static Sphere debugpointC;
	17893	+ static Sphere debugpointR;
17236	17894
17237	17895	static Sphere debugpoints[] = new Sphere[8];
17238	17896
17239		- static
17240		- {
17241		- for (int i=0; i<8; i++)
17242		- {
17243		- debugpoints[i] = new Sphere();
17244		- }
17245		- }
17246		-
17247	17897	static void InitPoints(float radius)
17248	17898	{
17249	17899	for (int i=0; i<8; i++)
..	..	@@ -17282,11 +17932,14 @@
17282	17932	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17283	17933	static IntBuffer bigAAbuffer;
17284	17934	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17285		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17935	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17286	17936	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17287	17937	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17288	17938	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17289		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17939	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17940	+
	17941	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17942	+
17290	17943	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17291	17944	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17292	17945	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();