~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
..	..	@@ -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);
..	..	@@ -1746,9 +1822,9 @@
1746	1822	display.modelParams7[2] = 0;
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
..	..	@@ -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,
..	..	@@ -10474,6 +10773,7 @@
10474	10773	ANTIALIAS = 0;
10475	10774	//System.out.println("RESTART");
10476	10775	AAtimer.restart();
	10776	+ Globals.TIMERRUNNING = true;
10477	10777	}
10478	10778	}
10479	10779	}
..	..	@@ -10541,7 +10841,8 @@
10541	10841	ambientOcclusion = false;
10542	10842	}
10543	10843
10544		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10844	+ if (//Globals.lighttouched &&
	10845	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10545	10846	{
10546	10847	//if (RENDERSHADOW) // ?
10547	10848	if (!IsFrozen())
..	..	@@ -10560,7 +10861,7 @@
10560	10861
10561	10862	if (wait)
10562	10863	{
10563		- Sleep(500);
	10864	+ Sleep(200); // blocks everything
10564	10865
10565	10866	wait = false;
10566	10867	}
..	..	@@ -10675,7 +10976,7 @@
10675	10976	// if (parentcam != renderCamera) // not a light
10676	10977	if (cam != lightCamera)
10677	10978	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10678		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10979	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10679	10980
10680	10981	for (int j = 0; j < 4; j++)
10681	10982	{
..	..	@@ -10690,7 +10991,7 @@
10690	10991	// if (parentcam != renderCamera) // not a light
10691	10992	if (cam != lightCamera)
10692	10993	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10693		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10994	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10694	10995
10695	10996	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10696	10997
..	..	@@ -10776,13 +11077,43 @@
10776	11077	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10777	11078	}
10778	11079
10779		- if (newenvy > -1)
	11080	+// if (newenvy > -1)
	11081	+// {
	11082	+// LoadEnvy(newenvy);
	11083	+// }
	11084	+//
	11085	+// newenvy = -1;
	11086	+
	11087	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10780	11088	{
10781		- LoadEnvy(newenvy);
	11089	+ if (cubemaprgb == null)
	11090	+ {
	11091	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11092	+ }
	11093	+
	11094	+ cubemap = cubemaprgb;
10782	11095	}
10783		-
10784		- newenvy = -1;
10785		-
	11096	+ else
	11097	+ {
	11098	+ if (object.skyboxname != null)
	11099	+ {
	11100	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11101	+ {
	11102	+ if (cubemap != null && cubemap != cubemaprgb)
	11103	+ cubemap.dispose();
	11104	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11105	+ loadedskyboxname = object.skyboxname;
	11106	+ }
	11107	+ }
	11108	+ else
	11109	+ {
	11110	+ cubemapcustom = null;
	11111	+ loadedskyboxname = null;
	11112	+ }
	11113	+
	11114	+ cubemap = cubemapcustom;
	11115	+ }
	11116	+
10786	11117	ratio = ((double) getWidth()) / getHeight();
10787	11118	//System.out.println("ratio = " + ratio);
10788	11119
..	..	@@ -10798,7 +11129,7 @@
10798	11129
10799	11130	if (!IsFrozen() && !ambientOcclusion)
10800	11131	{
10801		- DrawSkyBox(gl);
	11132	+ DrawSkyBox(gl, (float)ratio);
10802	11133	}
10803	11134
10804	11135	//if (selection_view == -1)
..	..	@@ -10981,9 +11312,9 @@
10981	11312
10982	11313	gl.glMatrixMode(GL.GL_MODELVIEW);
10983	11314
10984		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10985		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10986		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11315	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11316	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11317	+gl.glEnable(gl.GL_MULTISAMPLE);
10987	11318	} else
10988	11319	{
10989	11320	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10994,7 +11325,7 @@
10994	11325	//System.out.println("BLENDING ON");
10995	11326	gl.glEnable(GL.GL_BLEND);
10996	11327	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10997		-
	11328	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10998	11329	gl.glMatrixMode(gl.GL_PROJECTION);
10999	11330	gl.glLoadIdentity();
11000	11331
..	..	@@ -11084,7 +11415,7 @@
11084	11415
11085	11416	// if (cam != lightCamera)
11086	11417	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11087		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11418	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11088	11419	}
11089	11420
11090	11421	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11243,7 +11574,7 @@
11243	11574	}
11244	11575	}
11245	11576
11246		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11577	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11247	11578	{
11248	11579	//gl.glDepthFunc(GL.GL_LEQUAL);
11249	11580	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11251,24 +11582,21 @@
11251	11582
11252	11583	boolean texon = textureon;
11253	11584
11254		- if (RENDERPROGRAM > 0)
11255		- {
11256		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11257		- textureon = false;
11258		- }
	11585	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11586	+ textureon = false;
	11587	+
11259	11588	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11260	11589	//System.out.println("ALLO");
11261	11590	gl.glColorMask(false, false, false, false);
11262	11591	DrawObject(gl);
11263		- if (RENDERPROGRAM > 0)
11264		- {
11265		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11266		- textureon = texon;
11267		- }
	11592	+
	11593	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11594	+ textureon = texon;
	11595	+
11268	11596	gl.glColorMask(true, true, true, true);
11269	11597
11270	11598	gl.glDepthFunc(GL.GL_EQUAL);
11271		- //gl.glDepthMask(false);
	11599	+ gl.glDepthMask(false);
11272	11600	}
11273	11601
11274	11602	if (false) // DrawMode() == SHADOW)
..	..	@@ -11451,15 +11779,36 @@
11451	11779
11452	11780	static boolean zoomonce = false;
11453	11781
	11782	+ static void CreateSelectedPoint()
	11783	+ {
	11784	+ if (selectedpoint == null)
	11785	+ {
	11786	+ debugpointG = new Sphere();
	11787	+ debugpointP = new Sphere();
	11788	+ debugpointC = new Sphere();
	11789	+ debugpointR = new Sphere();
	11790	+
	11791	+ selectedpoint = new Superellipsoid();
	11792	+
	11793	+ for (int i=0; i<8; i++)
	11794	+ {
	11795	+ debugpoints[i] = new Sphere();
	11796	+ }
	11797	+ }
	11798	+ }
	11799	+
11454	11800	void DrawObject(GL gl, boolean draw)
11455	11801	{
	11802	+ // To clear camera values
	11803	+ ResetOptions();
	11804	+
11456	11805	//System.out.println("DRAW OBJECT " + mouseDown);
11457	11806	// DrawMode() = SELECTION;
11458	11807	//GL gl = getGL();
11459	11808	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11460	11809	{
11461	11810	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11462		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11811	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11463	11812	pingthread.StepToTarget(true); // true);
11464	11813	// zoomonce = false;
11465	11814	}
..	..	@@ -11531,8 +11880,9 @@
11531	11880
11532	11881	if (DrawMode() == DEFAULT)
11533	11882	{
11534		- if (DEBUG)
	11883	+ if (Globals.DEBUG)
11535	11884	{
	11885	+ CreateSelectedPoint();
11536	11886	float radius = 0.05f;
11537	11887	if (selectedpoint.radius != radius)
11538	11888	{
..	..	@@ -11586,20 +11936,32 @@
11586	11936	ReleaseTextures(DEFAULT_TEXTURES);
11587	11937
11588	11938	if (CLEANCACHE)
11589		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11939	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11590	11940	{
11591		- String tex = e.nextElement();
	11941	+ cTexture tex = e.nextElement();
11592	11942
11593	11943	// System.out.println("Texture --------- " + tex);
11594	11944
11595		- if (tex.equals("WHITE_NOISE"))
	11945	+ if (tex.equals("WHITE_NOISE:"))
11596	11946	continue;
11597	11947
11598		- if (!usedtextures.containsKey(tex))
	11948	+ if (!usedtextures.contains(tex))
11599	11949	{
	11950	+ CacheTexture gettex = texturepigment.get(tex);
11600	11951	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11601		- textures.get(tex).texture.dispose();
11602		- textures.remove(tex);
	11952	+ if (gettex != null)
	11953	+ {
	11954	+ gettex.texture.dispose();
	11955	+ texturepigment.remove(tex);
	11956	+ }
	11957	+
	11958	+ gettex = texturebump.get(tex);
	11959	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11960	+ if (gettex != null)
	11961	+ {
	11962	+ gettex.texture.dispose();
	11963	+ texturebump.remove(tex);
	11964	+ }
11603	11965	}
11604	11966	}
11605	11967	}
..	..	@@ -12019,7 +12381,7 @@
12019	12381	for (int i = tp.size(); --i >= 0;)
12020	12382	{
12021	12383	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12022		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12384	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
12023	12385	}
12024	12386
12025	12387
..	..	@@ -12127,8 +12489,76 @@
12127	12489
12128	12490	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12129	12491
12130		- String program =
	12492	+ String programmin =
	12493	+ // Min shader
12131	12494	"!!ARBfp1.0\n" +
	12495	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12496	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12497	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12498	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12499	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12500	+ "PARAM light2cam0 = program.env[10];" +
	12501	+ "PARAM light2cam1 = program.env[11];" +
	12502	+ "PARAM light2cam2 = program.env[12];" +
	12503	+ "TEMP temp;" +
	12504	+ "TEMP light;" +
	12505	+ "TEMP ndotl;" +
	12506	+ "TEMP normal;" +
	12507	+ "TEMP depth;" +
	12508	+ "TEMP eye;" +
	12509	+ "TEMP pos;" +
	12510	+
	12511	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12512	+ Normalize("normal") +
	12513	+ "MOV light, state.light[0].position;" +
	12514	+ "DP3 ndotl.x, light, normal;" +
	12515	+
	12516	+ // shadow
	12517	+ "MOV pos, fragment.texcoord[1];" +
	12518	+ "MOV temp, pos;" +
	12519	+ ShadowTextureFetch("depth", "temp", "1") +
	12520	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12521	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12522	+
	12523	+ // No shadow when out of frustum
	12524	+ //"SGE temp.y, depth.z, zero123.y;" +
	12525	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12526	+
	12527	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12528	+
	12529	+ // Backlit
	12530	+ "MOV pos.w, zero123.y;" +
	12531	+ "DP4 eye.x, pos, light2cam0;" +
	12532	+ "DP4 eye.y, pos, light2cam1;" +
	12533	+ "DP4 eye.z, pos, light2cam2;" +
	12534	+ Normalize("eye") +
	12535	+
	12536	+ "DP3 ndotl.y, -eye, normal;" +
	12537	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12538	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12539	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12540	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12541	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12542	+
	12543	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12544	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12545	+
	12546	+ // Pigment
	12547	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12548	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12549	+ "MUL temp, temp, ndotl.x;" +
	12550	+
	12551	+ "MUL temp, temp, zero123.z;" +
	12552	+
	12553	+ //"MUL temp, temp, ndotl.y;" +
	12554	+
	12555	+ "MOV temp.w, zero123.y;" + // reset alpha
	12556	+ "MOV result.color, temp;" +
	12557	+ "END";
	12558	+
	12559	+ String programmax =
	12560	+ "!!ARBfp1.0\n" +
	12561	+
12132	12562	//"OPTION ARB_fragment_program_shadow;" +
12133	12563	"PARAM light2cam0 = program.env[10];" +
12134	12564	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12243,8 +12673,7 @@
12243	12673	"TEMP shininess;" +
12244	12674	"\n" +
12245	12675	"MOV texSamp, one;" +
12246		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12247		-
	12676	+
12248	12677	"MOV mapgrid.x, one2048th.x;" +
12249	12678	"MOV temp, fragment.texcoord[1];" +
12250	12679	/*
..	..	@@ -12265,20 +12694,20 @@
12265	12694	"MUL temp, floor, mapgrid.x;" +
12266	12695	//"TEX depth0, temp, texture[1], 2D;" +
12267	12696	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12268		- TextureFetch("depth0", "temp", "1") +
	12697	+ ShadowTextureFetch("depth0", "temp", "1") +
12269	12698	"") +
12270	12699	"ADD temp.x, temp.x, mapgrid.x;" +
12271	12700	//"TEX depth1, temp, texture[1], 2D;" +
12272	12701	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12273		- TextureFetch("depth1", "temp", "1") +
	12702	+ ShadowTextureFetch("depth1", "temp", "1") +
12274	12703	"") +
12275	12704	"ADD temp.y, temp.y, mapgrid.x;" +
12276	12705	//"TEX depth2, temp, texture[1], 2D;" +
12277		- TextureFetch("depth2", "temp", "1") +
	12706	+ ShadowTextureFetch("depth2", "temp", "1") +
12278	12707	"SUB temp.x, temp.x, mapgrid.x;" +
12279	12708	//"TEX depth3, temp, texture[1], 2D;" +
12280	12709	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12281		- TextureFetch("depth3", "temp", "1") +
	12710	+ ShadowTextureFetch("depth3", "temp", "1") +
12282	12711	"") +
12283	12712	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12284	12713	//"MOV params, material;" +
..	..	@@ -12649,10 +13078,10 @@
12649	13078	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12650	13079	"") +
12651	13080
12652		- // display shadow only (bump == 0)
	13081	+ // display shadow only (fakedepth == 0)
12653	13082	"SUB temp.x, half.x, shadow.x;" +
12654	13083	"MOV temp.y, -params5.z;" + // params6.x;" +
12655		- "SLT temp.z, temp.y, -one2048th.x;" +
	13084	+ "SLT temp.z, temp.y, -c256i.x;" +
12656	13085	"SUB temp.y, one.x, temp.z;" +
12657	13086	"MUL temp.x, temp.x, temp.y;" +
12658	13087	"KIL temp.x;" +
..	..	@@ -12983,8 +13412,19 @@
12983	13412	//once = true;
12984	13413	}
12985	13414
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 " : ""));
	13415	+ String program = programmax;
	13416	+
	13417	+ if (Globals.MINSHADER)
	13418	+ {
	13419	+ program = programmin;
	13420	+ }
	13421	+
	13422	+ if (Globals.DEBUG)
	13423	+ {
	13424	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13425	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13426	+ }
	13427	+
12988	13428	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12989	13429
12990	13430	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13031,7 +13471,8 @@
13031	13471	"\n" +
13032	13472	"END\n";
13033	13473
13034		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13474	+ if (Globals.DEBUG)
	13475	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13035	13476	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13036	13477
13037	13478	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13076,25 +13517,26 @@
13076	13517	return out;
13077	13518	}
13078	13519
13079		- String TextureFetch(String dest, String src, String unit)
	13520	+ // Also does frustum culling
	13521	+ String ShadowTextureFetch(String dest, String src, String unit)
13080	13522	{
13081	13523	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13082	13524	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13083	13525	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13526	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13527	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13084	13528	"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;" +
	13529	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13530	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13089	13531	//"SWZ buffer, temp, w,w,w,w;";
13090		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13532	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13091	13533	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13092	13534	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13093	13535	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13094		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13536	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13095	13537
13096		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13097		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13538	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13539	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13098	13540	}
13099	13541
13100	13542	String Shadow(String depth, String shadow)
..	..	@@ -13141,7 +13583,7 @@
13141	13583	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13142	13584	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13143	13585
13144		- // No shadow when out of frustrum
	13586	+ // No shadow when out of frustum
13145	13587	"SGE temp.x, " + depth + ".z, one.z;" +
13146	13588	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13147	13589	"";
..	..	@@ -13289,7 +13731,8 @@
13289	13731	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13290	13732	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13291	13733	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13292		- Object3D.cVector2[] vector2buffer;
	13734	+
	13735	+ //Object3D.cVector2[] vector2buffer;
13293	13736
13294	13737	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13295	13738	// OUT : diff, spec
..	..	@@ -13305,9 +13748,10 @@
13305	13748	"DP3 " + dest + ".z," + "normals," + "eye;" +
13306	13749	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13307	13750	//"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;" +
	13751	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13752	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13753	+
	13754	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13311	13755	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13312	13756	"RCP " + dest + ".w," + dest + ".w;" +
13313	13757	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13812,6 +14256,7 @@
13812	14256	else
13813	14257	if (evt.getSource() == AAtimer)
13814	14258	{
	14259	+ Globals.TIMERRUNNING = false;
13815	14260	if (mouseDown)
13816	14261	{
13817	14262	//new Exception().printStackTrace();
..	..	@@ -13871,7 +14316,7 @@
13871	14316
13872	14317	// fev 2014???
13873	14318	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13874		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14319	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13875	14320	pingthread.StepToTarget(true); // true);
13876	14321	}
13877	14322	// if (!LIVE)
..	..	@@ -13886,6 +14331,7 @@
13886	14331	return;
13887	14332
13888	14333	AAtimer.restart(); //
	14334	+ Globals.TIMERRUNNING = true;
13889	14335
13890	14336	// waslive = LIVE;
13891	14337	// LIVE = false;
..	..	@@ -13935,14 +14381,15 @@
13935	14381	drag = false;
13936	14382	//System.out.println("Mouse DOWN");
13937	14383	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);
	14384	+ //ClickInfo info = new ClickInfo();
	14385	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14386	+ object.clickInfo.pane = this;
	14387	+ object.clickInfo.camera = renderCamera;
	14388	+ object.clickInfo.x = x;
	14389	+ object.clickInfo.y = y;
	14390	+ object.clickInfo.modifiers = modifiersex;
	14391	+ editObj = object.doEditClick(//info,
	14392	+ 0);
13946	14393	if (!editObj)
13947	14394	{
13948	14395	hasMarquee = true;
..	..	@@ -14224,12 +14671,18 @@
14224	14671	void GoDown(int mod)
14225	14672	{
14226	14673	MODIFIERS \|= COMMAND;
14227		- /*
	14674	+ boolean isVR = (mouseMode&VR)!=0;
	14675	+ /**/
14228	14676	if((mod&SHIFT) == SHIFT)
14229		- manipCamera.RotatePosition(0, -speed);
	14677	+ {
	14678	+ if (isVR)
	14679	+ manipCamera.RotateInterest(0, -speed);
	14680	+ else
	14681	+ manipCamera.RotatePosition(0, -speed);
	14682	+ }
14230	14683	else
14231		- manipCamera.BackForth(0, -speed*delta, getWidth());
14232		- */
	14684	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	14685	+ /**/
14233	14686	if ((mod & SHIFT) == SHIFT)
14234	14687	{
14235	14688	mouseMode = mouseMode; // VR??
..	..	@@ -14238,6 +14691,8 @@
14238	14691	mouseMode \|= BACKFORTH;
14239	14692	}
14240	14693
	14694	+ targetLookAt.set(manipCamera.lookAt);
	14695	+
14241	14696	//prevX = X = anchorX;
14242	14697	prevY = Y = anchorY - (int) (renderCamera.Distance());
14243	14698	}
..	..	@@ -14245,12 +14700,19 @@
14245	14700	void GoUp(int mod)
14246	14701	{
14247	14702	MODIFIERS \|= COMMAND;
14248		- /*
	14703	+ /**/
	14704	+ boolean isVR = (mouseMode&VR)!=0;
	14705	+
14249	14706	if((mod&SHIFT) == SHIFT)
14250		- manipCamera.RotatePosition(0, speed);
	14707	+ {
	14708	+ if (isVR)
	14709	+ manipCamera.RotateInterest(0, speed);
	14710	+ else
	14711	+ manipCamera.RotatePosition(0, speed);
	14712	+ }
14251	14713	else
14252		- manipCamera.BackForth(0, speed*delta, getWidth());
14253		- */
	14714	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	14715	+ /**/
14254	14716	if ((mod & SHIFT) == SHIFT)
14255	14717	{
14256	14718	mouseMode = mouseMode;
..	..	@@ -14259,6 +14721,8 @@
14259	14721	mouseMode \|= BACKFORTH;
14260	14722	}
14261	14723
	14724	+ targetLookAt.set(manipCamera.lookAt);
	14725	+
14262	14726	//prevX = X = anchorX;
14263	14727	prevY = Y = anchorY + (int) (renderCamera.Distance());
14264	14728	}
..	..	@@ -14266,12 +14730,17 @@
14266	14730	void GoLeft(int mod)
14267	14731	{
14268	14732	MODIFIERS \|= COMMAND;
14269		- /*
	14733	+ /**/
14270	14734	if((mod&SHIFT) == SHIFT)
14271		- manipCamera.RotatePosition(speed, 0);
	14735	+ manipCamera.Translate(speed*delta, 0, getWidth());
14272	14736	else
14273		- manipCamera.Translate(speed*delta, 0, getWidth());
14274		- */
	14737	+ {
	14738	+ if ((mouseMode&VR)!=0)
	14739	+ manipCamera.RotateInterest(-speed, 0);
	14740	+ else
	14741	+ manipCamera.RotatePosition(speed, 0);
	14742	+ }
	14743	+ /**/
14275	14744	if ((mod & SHIFT) == SHIFT)
14276	14745	{
14277	14746	mouseMode = mouseMode;
..	..	@@ -14280,6 +14749,8 @@
14280	14749	mouseMode \|= ROTATE;
14281	14750	} // TRANSLATE;
14282	14751
	14752	+ targetLookAt.set(manipCamera.lookAt);
	14753	+
14283	14754	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14284	14755	prevY = Y = anchorY;
14285	14756	}
..	..	@@ -14287,12 +14758,18 @@
14287	14758	void GoRight(int mod)
14288	14759	{
14289	14760	MODIFIERS \|= COMMAND;
14290		- /*
	14761	+ /**/
14291	14762	if((mod&SHIFT) == SHIFT)
14292		- manipCamera.RotatePosition(-speed, 0);
	14763	+ manipCamera.Translate(-speed*delta, 0, getWidth());
14293	14764	else
14294		- manipCamera.Translate(-speed*delta, 0, getWidth());
14295		- */
	14765	+ {
	14766	+ if ((mouseMode&VR)!=0)
	14767	+ manipCamera.RotateInterest(speed, 0);
	14768	+ else
	14769	+ manipCamera.RotatePosition(-speed, 0);
	14770	+ }
	14771	+
	14772	+ /**/
14296	14773	if ((mod & SHIFT) == SHIFT)
14297	14774	{
14298	14775	mouseMode = mouseMode;
..	..	@@ -14301,6 +14778,8 @@
14301	14778	mouseMode \|= ROTATE;
14302	14779	} // TRANSLATE;
14303	14780
	14781	+ targetLookAt.set(manipCamera.lookAt);
	14782	+
14304	14783	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14305	14784	prevY = Y = anchorY;
14306	14785	}
..	..	@@ -14342,14 +14821,16 @@
14342	14821	if (editObj)
14343	14822	{
14344	14823	drag = true;
14345		- ClickInfo info = new ClickInfo();
14346		- info.bounds.setBounds(0, 0,
	14824	+ //ClickInfo info = new ClickInfo();
	14825	+ object.clickInfo.bounds.setBounds(0, 0,
14347	14826	(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);
	14827	+ object.clickInfo.pane = this;
	14828	+ object.clickInfo.camera = renderCamera;
	14829	+ object.clickInfo.x = x;
	14830	+ object.clickInfo.y = y;
	14831	+ object //.GetWindow().copy
	14832	+ .doEditDrag(//info,
	14833	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14353	14834	} else
14354	14835	{
14355	14836	if (x < startX)
..	..	@@ -14498,22 +14979,27 @@
14498	14979	}
14499	14980	}
14500	14981
	14982	+// ClickInfo clickInfo = new ClickInfo();
	14983	+
14501	14984	public void mouseMoved(MouseEvent e)
14502	14985	{
14503	14986	//System.out.println("mouseMoved: " + e);
14504	14987	if (isRenderer)
14505	14988	return;
14506	14989
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;
	14990	+ // Mouse cursor feedback
	14991	+ object.clickInfo.x = e.getX();
	14992	+ object.clickInfo.y = e.getY();
	14993	+ object.clickInfo.modifiers = e.getModifiersEx();
	14994	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14995	+ object.clickInfo.pane = this;
	14996	+ object.clickInfo.camera = renderCamera;
14514	14997	if (!isRenderer)
14515	14998	{
14516		- if (object.editWindow.copy.doEditClick(ci, 0))
	14999	+ //ObjEditor editWindow = object.editWindow;
	15000	+ //Object3D copy = editWindow.copy;
	15001	+ if (object.doEditClick(//clickInfo,
	15002	+ 0))
14517	15003	{
14518	15004	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14519	15005	} else
..	..	@@ -14528,7 +15014,8 @@
14528	15014	Globals.MOUSEDRAGGED = false;
14529	15015
14530	15016	movingcamera = false;
14531		- X = Y = 0;
	15017	+ X = 0; // getBounds().width/2;
	15018	+ Y = 0; // getBounds().height/2;
14532	15019	//System.out.println("mouseReleased: " + e);
14533	15020	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14534	15021	}
..	..	@@ -14784,7 +15271,8 @@
14784	15271	// break;
14785	15272	case 'T':
14786	15273	CACHETEXTURE ^= true;
14787		- textures.clear();
	15274	+ texturepigment.clear();
	15275	+ texturebump.clear();
14788	15276	// repaint();
14789	15277	break;
14790	15278	case 'Y':
..	..	@@ -14869,7 +15357,9 @@
14869	15357	case 'E' : COMPACT ^= true;
14870	15358	repaint();
14871	15359	break;
14872		- case 'W' : DEBUGHSB ^= true;
	15360	+ case 'W' : // Wide Window (fullscreen)
	15361	+ //DEBUGHSB ^= true;
	15362	+ ObjEditor.theFrame.ToggleFullScreen();
14873	15363	repaint();
14874	15364	break;
14875	15365	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14894,8 +15384,8 @@
14894	15384	RevertCamera();
14895	15385	repaint();
14896	15386	break;
14897		- case 'L':
14898	15387	case 'l':
	15388	+ //case 'L':
14899	15389	if (lightMode)
14900	15390	{
14901	15391	lightMode = false;
..	..	@@ -14959,20 +15449,24 @@
14959	15449	OCCLUSION_CULLING ^= true;
14960	15450	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14961	15451	break;
14962		- case '0': envyoff ^= true; repaint(); break;
	15452	+ //case '0': envyoff ^= true; repaint(); break;
14963	15453	case '1':
14964	15454	case '2':
14965	15455	case '3':
14966	15456	case '4':
14967	15457	case '5':
14968		- newenvy = Character.getNumericValue(key);
14969		- repaint();
14970		- break;
14971	15458	case '6':
14972	15459	case '7':
14973	15460	case '8':
14974	15461	case '9':
14975		- BGcolor = (key - '6')/3.f;
	15462	+ if (true) // envyoff)
	15463	+ {
	15464	+ BGcolor = (key - '1')/8.f;
	15465	+ }
	15466	+ else
	15467	+ {
	15468	+ //newenvy = Character.getNumericValue(key);
	15469	+ }
14976	15470	repaint();
14977	15471	break;
14978	15472	case '!':
..	..	@@ -15038,9 +15532,9 @@
15038	15532	case '_':
15039	15533	kompactbit = 5;
15040	15534	break;
15041		- case '+':
15042		- kompactbit = 6;
15043		- break;
	15535	+// case '+':
	15536	+// kompactbit = 6;
	15537	+// break;
15044	15538	case ' ':
15045	15539	lightMode ^= true;
15046	15540	Globals.lighttouched = true;
..	..	@@ -15052,6 +15546,7 @@
15052	15546	case ESC:
15053	15547	RENDERPROGRAM += 1;
15054	15548	RENDERPROGRAM %= 3;
	15549	+
15055	15550	repaint();
15056	15551	break;
15057	15552	case 'Z':
..	..	@@ -15091,8 +15586,9 @@
15091	15586	case DELETE:
15092	15587	ClearSelection();
15093	15588	break;
15094		- /*
15095	15589	case '+':
	15590	+
	15591	+ /*
15096	15592	//fontsize += 1;
15097	15593	bbzoom *= 2;
15098	15594	repaint();
..	..	@@ -15109,17 +15605,17 @@
15109	15605	case '=':
15110	15606	IncDepth();
15111	15607	//fontsize += 1;
15112		- object.editWindow.refreshContents(true);
	15608	+ object.GetWindow().refreshContents(true);
15113	15609	maskbit = 6;
15114	15610	break;
15115	15611	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15116	15612	DecDepth();
15117	15613	maskbit = 5;
15118	15614	//if(fontsize > 1) fontsize -= 1;
15119		- if (object.editWindow == null)
15120		- new Exception().printStackTrace();
15121		- else
15122		- object.editWindow.refreshContents(true);
	15615	+// if (object.editWindow == null)
	15616	+// new Exception().printStackTrace();
	15617	+// else
	15618	+ object.GetWindow().refreshContents(true);
15123	15619	break;
15124	15620	case '{':
15125	15621	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15343,7 +15839,7 @@
15343	15839	}
15344	15840	*/
15345	15841
15346		- object.editWindow.EditSelection();
	15842	+ object.GetWindow().EditSelection(false);
15347	15843	}
15348	15844
15349	15845	void SelectParent()
..	..	@@ -15360,10 +15856,10 @@
15360	15856	{
15361	15857	//selectees.remove(i);
15362	15858	System.out.println("select parent of " + elem);
15363		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15859	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15364	15860	} else
15365	15861	{
15366		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15862	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15367	15863	}
15368	15864
15369	15865	first = false;
..	..	@@ -15405,12 +15901,12 @@
15405	15901	for (int j = 0; j < group.children.size(); j++)
15406	15902	{
15407	15903	elem = (Object3D) group.children.elementAt(j);
15408		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15904	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15409	15905	first = false;
15410	15906	}
15411	15907	} else
15412	15908	{
15413		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15909	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15414	15910	}
15415	15911
15416	15912	first = false;
..	..	@@ -15421,21 +15917,21 @@
15421	15917	{
15422	15918	//Composite group = (Composite) object;
15423	15919	Object3D group = object;
15424		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15920	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15425	15921	}
15426	15922
15427	15923	void ResetTransform(int mask)
15428	15924	{
15429	15925	//Composite group = (Composite) object;
15430	15926	Object3D group = object;
15431		- group.editWindow.ResetTransform(mask);
	15927	+ group.GetWindow().ResetTransform(mask);
15432	15928	}
15433	15929
15434	15930	void FlipTransform()
15435	15931	{
15436	15932	//Composite group = (Composite) object;
15437	15933	Object3D group = object;
15438		- group.editWindow.FlipTransform();
	15934	+ group.GetWindow().FlipTransform();
15439	15935	// group.editWindow.ReduceMesh(true);
15440	15936	}
15441	15937
..	..	@@ -15443,7 +15939,7 @@
15443	15939	{
15444	15940	//Composite group = (Composite) object;
15445	15941	Object3D group = object;
15446		- group.editWindow.PrintMemory();
	15942	+ group.GetWindow().PrintMemory();
15447	15943	// group.editWindow.ReduceMesh(true);
15448	15944	}
15449	15945
..	..	@@ -15451,7 +15947,7 @@
15451	15947	{
15452	15948	//Composite group = (Composite) object;
15453	15949	Object3D group = object;
15454		- group.editWindow.ResetCentroid();
	15950	+ group.GetWindow().ResetCentroid();
15455	15951	}
15456	15952
15457	15953	void IncDepth()
..	..	@@ -15533,8 +16029,6 @@
15533	16029
15534	16030	int width = getBounds().width;
15535	16031	int height = getBounds().height;
15536		- ClickInfo info = new ClickInfo();
15537		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15538	16032	//Image img = CreateImage(width, height);
15539	16033	//System.out.println("width = " + width + "; height = " + height + "\n");
15540	16034
..	..	@@ -15611,48 +16105,77 @@
15611	16105	}
15612	16106	if (object != null && !hasMarquee)
15613	16107	{
	16108	+ if (object.clickInfo == null)
	16109	+ object.clickInfo = new ClickInfo();
	16110	+ ClickInfo info = object.clickInfo;
	16111	+ //ClickInfo info = new ClickInfo();
	16112	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16113	+
15614	16114	if (isRenderer)
15615	16115	{
15616		- info.flags++;
	16116	+ object.clickInfo.flags++;
15617	16117	double frameAspect = (double) width / (double) height;
15618	16118	if (frameAspect > renderCamera.aspect)
15619	16119	{
15620	16120	int desired = (int) ((double) height * renderCamera.aspect);
15621		- info.bounds.width -= width - desired;
15622		- info.bounds.x += (width - desired) / 2;
	16121	+ object.clickInfo.bounds.width -= width - desired;
	16122	+ object.clickInfo.bounds.x += (width - desired) / 2;
15623	16123	} else
15624	16124	{
15625	16125	int desired = (int) ((double) width / renderCamera.aspect);
15626		- info.bounds.height -= height - desired;
15627		- info.bounds.y += (height - desired) / 2;
	16126	+ object.clickInfo.bounds.height -= height - desired;
	16127	+ object.clickInfo.bounds.y += (height - desired) / 2;
15628	16128	}
15629	16129	}
15630		- info.g = gr;
15631		- info.camera = renderCamera;
	16130	+
	16131	+ object.clickInfo.g = gr;
	16132	+ object.clickInfo.camera = renderCamera;
15632	16133	/*
15633	16134	// Memory intensive (brep.verticescopy)
15634	16135	if (!(object instanceof Composite))
15635	16136	object.draw(info, 0, false); // SLOW :
15636	16137	*/
15637		- if (!isRenderer)
	16138	+ if (!isRenderer) // && drag)
15638	16139	{
15639		- object.drawEditHandles(info, 0);
15640		-
15641		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16140	+ Grafreed.Assert(object != null);
	16141	+ Grafreed.Assert(object.selection != null);
	16142	+ if (object.selection.Size() > 0)
15642	16143	{
15643		- switch (object.selection.get(0).hitSomething)
	16144	+ int hitSomething = object.selection.get(0).hitSomething;
	16145	+
	16146	+ object.clickInfo.DX = 0;
	16147	+ object.clickInfo.DY = 0;
	16148	+ object.clickInfo.W = 1;
	16149	+ if (hitSomething == Object3D.hitCenter)
15644	16150	{
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;
	16151	+ info.DX = X;
	16152	+ if (X != 0)
	16153	+ info.DX -= info.bounds.width/2;
	16154	+
	16155	+ info.DY = Y;
	16156	+ if (Y != 0)
	16157	+ info.DY -= info.bounds.height/2;
15654	16158	}
15655		-
	16159	+
	16160	+ object.drawEditHandles(//info,
	16161	+ 0);
	16162	+
	16163	+ if (drag && (X != 0 \|\| Y != 0))
	16164	+ {
	16165	+ switch (hitSomething)
	16166	+ {
	16167	+ case Object3D.hitCenter: gr.setColor(Color.white);
	16168	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16169	+ break;
	16170	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16171	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16172	+ break;
	16173	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16174	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16175	+ break;
	16176	+ }
	16177	+
	16178	+ }
15656	16179	}
15657	16180	}
15658	16181	}
..	..	@@ -15667,7 +16190,7 @@
15667	16190	if (hasMarquee)
15668	16191	{
15669	16192	gr.setXORMode(Color.white);
15670		- gr.setColor(Color.red);
	16193	+ gr.setColor(Color.white);
15671	16194	if (!firstime)
15672	16195	{
15673	16196	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -16134,6 +16657,8 @@
16134	16657	private /static/ boolean firstime;
16135	16658	private /static/ cVector newView = new cVector();
16136	16659	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16660	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16661	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16137	16662	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16138	16663	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16139	16664	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16146,29 +16671,67 @@
16146	16671	{
16147	16672	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16148	16673
	16674	+ int usedsuf = 0;
	16675	+
16149	16676	for (int i = 0; i < suffixes.length; i++)
16150	16677	{
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)
	16678	+ String[] suffixe = suffixes;
	16679	+ String[] fallback = suffixes2;
	16680	+ String[] fallfallback = suffixes3;
	16681	+
	16682	+ for (int c=usedsuf; --c>=0;)
16156	16683	{
16157		- throw new IOException("Unable to load texture " + resourceName);
	16684	+// String[] temp = suffixe;
	16685	+// suffixe = fallback;
	16686	+// fallback = fallfallback;
	16687	+// fallfallback = temp;
16158	16688	}
	16689	+
	16690	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16691	+ TextureData data;
	16692	+
	16693	+ try
	16694	+ {
	16695	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16696	+ mipmapped,
	16697	+ FileUtil.getFileSuffix(resourceName));
	16698	+ }
	16699	+ catch (Exception e)
	16700	+ {
	16701	+ try
	16702	+ {
	16703	+ resourceName = basename + fallback[i] + "." + suffix;
	16704	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16705	+ mipmapped,
	16706	+ FileUtil.getFileSuffix(resourceName));
	16707	+ }
	16708	+ catch (Exception e2)
	16709	+ {
	16710	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16711	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16712	+ mipmapped,
	16713	+ FileUtil.getFileSuffix(resourceName));
	16714	+ }
	16715	+ }
	16716	+
16159	16717	//System.out.println("Target = " + targets[i]);
16160	16718	cubemap.updateImage(data, targets[i]);
16161	16719	}
16162	16720
16163	16721	return cubemap;
16164	16722	}
	16723	+
16165	16724	int bigsphere = -1;
16166	16725
16167	16726	float BGcolor = 0.5f;
16168	16727
16169		- private void DrawSkyBox(GL gl)
	16728	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16729	+
	16730	+ private void DrawSkyBox(GL gl, float ratio)
16170	16731	{
16171		- if (envyoff \|\| cubemap == null)
	16732	+ if (//envyoff \|\|
	16733	+ WIREFRAME \|\|
	16734	+ cubemap == null)
16172	16735	{
16173	16736	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16174	16737	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16183,7 +16746,17 @@
16183	16746	// Compensates for ExaminerViewer's modification of modelview matrix
16184	16747	gl.glMatrixMode(GL.GL_MODELVIEW);
16185	16748	gl.glLoadIdentity();
	16749	+ gl.glScalef(1,ratio,1);
16186	16750
	16751	+// colorV[0] = 2;
	16752	+// colorV[1] = 2;
	16753	+// colorV[2] = 2;
	16754	+// colorV[3] = 1;
	16755	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16756	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16757	+//
	16758	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16759	+
16187	16760	//gl.glActiveTexture(GL.GL_TEXTURE1);
16188	16761	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16189	16762
..	..	@@ -16215,6 +16788,7 @@
16215	16788	{
16216	16789	gl.glScalef(1.0f, -1.0f, 1.0f);
16217	16790	}
	16791	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16218	16792	gl.glMultMatrixd(viewrot_1, 0);
16219	16793	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16220	16794	//viewer.updateInverseRotation(gl);
..	..	@@ -16255,7 +16829,8 @@
16255	16829	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16256	16830
16257	16831	cubemap.disable();
16258		- ////cubemap.unbind();
	16832	+ //cubemap.dispose();
	16833	+
16259	16834	if (CULLFACE)
16260	16835	{
16261	16836	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16355,16 +16930,16 @@
16355	16930	cStatic.objectstack[materialdepth++] = checker;
16356	16931	//System.out.println("material " + material);
16357	16932	//Applet3D.tracein(this, selected);
16358		- vector2buffer = checker.projectedVertices;
	16933	+ //vector2buffer = checker.projectedVertices;
16359	16934
16360	16935	//checker.GetMaterial().Draw(this, false); // true);
16361		- DrawMaterial(checker.GetMaterial(), false); // true);
	16936	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16362	16937
16363	16938	materialdepth -= 1;
16364	16939	if (materialdepth > 0)
16365	16940	{
16366		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16367		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16941	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16942	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16368	16943	}
16369	16944	//checker.GetMaterial().opacity = 1f;
16370	16945	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16450,6 +17025,14 @@
16450	17025	}
16451	17026	}
16452	17027
	17028	+ private Object3D GetFolder()
	17029	+ {
	17030	+ Object3D folder = object.GetWindow().copy;
	17031	+ if (object.GetWindow().copy.selection.Size() > 0)
	17032	+ folder = object.GetWindow().copy.selection.elementAt(0);
	17033	+ return folder;
	17034	+ }
	17035	+
16453	17036	class SelectBuffer implements GLEventListener
16454	17037	{
16455	17038
..	..	@@ -16465,7 +17048,7 @@
16465	17048	//new Exception().printStackTrace();
16466	17049	System.out.println("select buffer init");
16467	17050	// Use debug pipeline
16468		- drawable.setGL(new DebugGL(drawable.getGL()));
	17051	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16469	17052
16470	17053	GL gl = drawable.getGL();
16471	17054
..	..	@@ -16529,6 +17112,17 @@
16529	17112
16530	17113	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16531	17114
	17115	+ if (PAINTMODE)
	17116	+ {
	17117	+ if (object.GetWindow().copy.selection.Size() > 0)
	17118	+ {
	17119	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17120	+
	17121	+ // Make what you paint not selectable.
	17122	+ paintobj.ResetSelectable();
	17123	+ }
	17124	+ }
	17125	+
16532	17126	//int tmp = selection_view;
16533	17127	//selection_view = -1;
16534	17128	int temp = DrawMode();
..	..	@@ -16540,6 +17134,17 @@
16540	17134	// temp = DEFAULT; // patch for selection debug
16541	17135	Globals.drawMode = temp; // WARNING
16542	17136
	17137	+ if (PAINTMODE)
	17138	+ {
	17139	+ if (object.GetWindow().copy.selection.Size() > 0)
	17140	+ {
	17141	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17142	+
	17143	+ // Revert.
	17144	+ paintobj.RestoreSelectable();
	17145	+ }
	17146	+ }
	17147	+
16543	17148	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16544	17149
16545	17150	// trying different ways of getting the depth info over
..	..	@@ -16587,6 +17192,8 @@
16587	17192	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16588	17193	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16589	17194	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17195	+
	17196	+ CreateSelectedPoint();
16590	17197
16591	17198	// Will fit the mesh !!!
16592	17199	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16641,29 +17248,31 @@
16641	17248	}
16642	17249
16643	17250	if (!movingcamera && !PAINTMODE)
16644		- object.editWindow.ScreenFitPoint(); // fev 2014
	17251	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16645	17252
16646		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17253	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16647	17254	{
16648		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17255	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16649	17256
16650		- Object3D group = new Object3D("inst" + paintcount++);
	17257	+ if (object.GetWindow().copy.selection.Size() > 0)
	17258	+ {
	17259	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16651	17260
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();
	17261	+ Object3D inst = new Object3D("inst" + paintcount++);
	17262	+
	17263	+ inst.CreateMaterial(); // use a void leaf to select instances
	17264	+
	17265	+ inst.add(paintobj); // link
	17266	+
	17267	+ object.GetWindow().SnapObject(inst);
	17268	+
	17269	+ Object3D folder = paintFolder; // GetFolder();
	17270	+
	17271	+ folder.add(inst);
	17272	+
	17273	+ object.GetWindow().ResetModel();
	17274	+ object.GetWindow().refreshContents();
	17275	+ }
16667	17276	}
16668	17277	else
16669	17278	paintcount = 0;
..	..	@@ -16702,6 +17311,11 @@
16702	17311	//System.out.println("objects[color] = " + objects[color]);
16703	17312	//objects[color].Select();
16704	17313	indexcount = 0;
	17314	+ ObjEditor window = object.GetWindow();
	17315	+ if (window != null && deselect)
	17316	+ {
	17317	+ window.Select(null, deselect, true);
	17318	+ }
16705	17319	object.Select(color, deselect);
16706	17320	}
16707	17321
..	..	@@ -16752,6 +17366,7 @@
16752	17366
16753	17367	public void init(GLAutoDrawable drawable)
16754	17368	{
	17369	+ if (Globals.DEBUG)
16755	17370	System.out.println("shadow buffer init");
16756	17371
16757	17372	GL gl = drawable.getGL();
..	..	@@ -16980,10 +17595,14 @@
16980	17595	gl.glFlush();
16981	17596
16982	17597	/**/
16983		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17598	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
16984	17599
16985		- float[] pixels = occlusionsizebuffer.array();
	17600	+ float[] depths = occlusiondepthbuffer.array();
16986	17601
	17602	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17603	+
	17604	+ int[] pixels = selectsizebuffer.array();
	17605	+
16987	17606	double r = 0, g = 0, b = 0;
16988	17607
16989	17608	double count = 0;
..	..	@@ -16994,7 +17613,7 @@
16994	17613
16995	17614	double FACTOR = 1;
16996	17615
16997		- for (int i = 0; i < pixels.length; i++)
	17616	+ for (int i = 0; i < depths.length; i++)
16998	17617	{
16999	17618	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17000	17619	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17077,7 +17696,7 @@
17077	17696
17078	17697	double scale = ray.z; // 1; // cos
17079	17698
17080		- float depth = pixels[newindex];
	17699	+ float depth = depths[newindex];
17081	17700
17082	17701	/*
17083	17702	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17227,23 +17846,15 @@
17227	17846	int AAbuffersize = 0;
17228	17847
17229	17848	//double[] selectedpoint = new double[3];
17230		- static Superellipsoid selectedpoint = new Superellipsoid();
	17849	+ static Superellipsoid selectedpoint;
17231	17850	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();
	17851	+ static Sphere debugpointG;
	17852	+ static Sphere debugpointP;
	17853	+ static Sphere debugpointC;
	17854	+ static Sphere debugpointR;
17236	17855
17237	17856	static Sphere debugpoints[] = new Sphere[8];
17238	17857
17239		- static
17240		- {
17241		- for (int i=0; i<8; i++)
17242		- {
17243		- debugpoints[i] = new Sphere();
17244		- }
17245		- }
17246		-
17247	17858	static void InitPoints(float radius)
17248	17859	{
17249	17860	for (int i=0; i<8; i++)
..	..	@@ -17282,11 +17893,14 @@
17282	17893	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17283	17894	static IntBuffer bigAAbuffer;
17284	17895	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17285		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17896	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17286	17897	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17287	17898	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17288	17899	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17289		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17900	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17901	+
	17902	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17903	+
17290	17904	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17291	17905	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17292	17906	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();