~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,11 +8041,69 @@
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		- void ReleaseTexture(String tex, boolean bump)
	8048	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8049	+ {
	8050	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8051	+ {
	8052	+ return;
	8053	+ }
	8054	+
	8055	+ if (tex == null)
	8056	+ {
	8057	+ ReleaseTexture(null, false);
	8058	+ return;
	8059	+ }
	8060	+
	8061	+ String pigment = Object3D.GetPigment(tex);
	8062	+
	8063	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8064	+ {
	8065	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8066	+ // System.out.println("; bump = " + bump);
	8067	+ }
	8068	+
	8069	+ if (pigment.equals(""))
	8070	+ {
	8071	+ pigment = null;
	8072	+ }
	8073	+
	8074	+ ReleaseTexture(tex, false);
	8075	+ }
	8076	+
	8077	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8078	+ {
	8079	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8080	+ {
	8081	+ return;
	8082	+ }
	8083	+
	8084	+ if (tex == null)
	8085	+ {
	8086	+ ReleaseTexture(null, true);
	8087	+ return;
	8088	+ }
	8089	+
	8090	+ String bump = Object3D.GetBump(tex);
	8091	+
	8092	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8093	+ {
	8094	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8095	+ // System.out.println("; bump = " + bump);
	8096	+ }
	8097	+
	8098	+ if (bump.equals(""))
	8099	+ {
	8100	+ bump = null;
	8101	+ }
	8102	+
	8103	+ ReleaseTexture(tex, true);
	8104	+ }
	8105	+
	8106	+ void ReleaseTexture(cTexture tex, boolean bump)
7925	8107	{
7926	8108	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7927	8109	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7932,7 +8114,7 @@
7932	8114	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7933	8115
7934	8116	if (tex != null)
7935		- texture = textures.get(tex);
	8117	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7936	8118
7937	8119	// //assert( texture != null );
7938	8120	// if (texture == null)
..	..	@@ -8026,6 +8208,54 @@
8026	8208
8027	8209	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8028	8210	{
	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;
	8252	+
	8253	+ BindPigmentTexture(tex, resolution);
	8254	+ BindBumpTexture(tex, resolution);
	8255	+ }
	8256	+
	8257	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8258	+ {
8029	8259	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8030	8260	ambientOcclusion ) // \|\| !textureon)
8031	8261	{
..	..	@@ -8035,17 +8265,47 @@
8035	8265	if (tex == null)
8036	8266	{
8037	8267	BindTexture(null,false,resolution);
8038		- BindTexture(null,true,resolution);
8039	8268	return;
8040	8269	}
8041	8270
8042	8271	String pigment = Object3D.GetPigment(tex);
	8272	+
	8273	+ usedtextures.add(tex);
	8274	+
	8275	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8276	+ {
	8277	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8278	+ // System.out.println("; bump = " + bump);
	8279	+ }
	8280	+
	8281	+ if (pigment.equals(""))
	8282	+ {
	8283	+ pigment = null;
	8284	+ }
	8285	+
	8286	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8287	+ BindTexture(tex, false, resolution);
	8288	+ }
	8289	+
	8290	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8291	+ {
	8292	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8293	+ ambientOcclusion ) // \|\| !textureon)
	8294	+ {
	8295	+ return; // false;
	8296	+ }
	8297	+
	8298	+ if (tex == null)
	8299	+ {
	8300	+ BindTexture(null,true,resolution);
	8301	+ return;
	8302	+ }
	8303	+
8043	8304	String bump = Object3D.GetBump(tex);
8044	8305
8045		- usedtextures.put(pigment, pigment);
8046		- usedtextures.put(bump, bump);
	8306	+ usedtextures.add(tex);
8047	8307
8048		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8308	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8049	8309	{
8050	8310	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8051	8311	// System.out.println("; bump = " + bump);
..	..	@@ -8055,18 +8315,10 @@
8055	8315	{
8056	8316	bump = null;
8057	8317	}
8058		- if (pigment.equals(""))
8059		- {
8060		- pigment = null;
8061		- }
8062	8318
8063		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8064		- BindTexture(pigment, false, resolution);
8065	8319	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8066		- BindTexture(bump, true, resolution);
	8320	+ BindTexture(tex, true, resolution);
8067	8321	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8068		-
8069		- return; // true;
8070	8322	}
8071	8323
8072	8324	java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
..	..	@@ -8089,13 +8341,19 @@
8089	8341	return fileExists;
8090	8342	}
8091	8343
8092		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8344	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8093	8345	{
8094		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8346	+ CacheTexture texturecache = null;
8095	8347
8096	8348	if (tex != null)
8097	8349	{
8098		- 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	+ }
8099	8357
8100	8358	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8101	8359
..	..	@@ -8105,19 +8363,46 @@
8105	8363	// else
8106	8364	// if (!texname.startsWith("/"))
8107	8365	// texname = "/Users/nbriere/Textures/" + texname;
8108		- if (!FileExists(tex))
	8366	+ if (!FileExists(texname) && !texname.startsWith("@"))
8109	8367	{
8110	8368	texname = fallbackTextureName;
8111	8369	}
8112	8370
8113	8371	if (CACHETEXTURE)
8114		- texture = textures.get(texname); // TEXTURE CACHE
8115		-
8116		- TextureData texturedata = null;
8117		-
8118		- if (texture == null \|\| texture.resolution < resolution)
8119	8372	{
8120		- 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(""))
8121	8406	{
8122	8407	assert(!bump);
8123	8408	// if (bump)
..	..	@@ -8128,19 +8413,23 @@
8128	8413	// }
8129	8414	// else
8130	8415	// {
8131		- texture = textures.get(tex);
8132		- if (texture == null)
	8416	+ // texturecache = textures.get(texname); // suspicious
	8417	+ if (texturecache == null)
8133	8418	{
8134		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8419	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8135	8420	}
	8421	+ else
	8422	+ new Exception().printStackTrace();
8136	8423	// }
8137	8424	} else
8138		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8425	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8139	8426	{
8140	8427	assert(bump);
8141		- texture = textures.get(tex);
8142		- if (texture == null)
8143		- 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();
8144	8433	} else
8145	8434	{
8146	8435	//if (tex.equals("IMMORTAL"))
..	..	@@ -8148,11 +8437,22 @@
8148	8437	// texture = GetResourceTexture("default.png");
8149	8438	//} else
8150	8439	//{
8151		- if (tex.equals("WHITE_NOISE"))
	8440	+ if (texname.endsWith("WHITE_NOISE"))
8152	8441	{
8153		- texture = textures.get(tex);
8154		- if (texture == null)
8155		- 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();
8156	8456	} else
8157	8457	{
8158	8458	if (textureon)
..	..	@@ -8211,19 +8511,20 @@
8211	8511	if (texturedata == null)
8212	8512	throw new Exception();
8213	8513
8214		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8514	+ texturecache = new CacheTexture(texturedata,resolution);
8215	8515	//texture = GetTexture(tex, bump);
8216	8516	}
	8517	+ }
8217	8518	}
8218	8519	//}
8219	8520	}
8220	8521
8221		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8522	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8222	8523	{
8223	8524	//return false;
8224	8525
8225	8526	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8226		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8527	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8227	8528	{
8228	8529	// String ext = "_highres";
8229	8530	// if (REDUCETEXTURE)
..	..	@@ -8240,52 +8541,17 @@
8240	8541	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8241	8542	if (!cachefile.exists())
8242	8543	{
8243		- // cache to disk
8244		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8245		- //buffers[0].
8246		-
8247		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8248		- int[] pixels = new int[bytebuf.capacity()/3];
8249		-
8250		- // squared size heuristic...
8251		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8544	+ //if (texturedata.getWidth() == texturedata.getHeight())
8252	8545	{
8253		- for (int i=pixels.length; --i>=0;)
8254		- {
8255		- int i3 = i*3;
8256		- pixels[i] = 0xFF;
8257		- pixels[i] <<= 8;
8258		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8259		- pixels[i] <<= 8;
8260		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8261		- pixels[i] <<= 8;
8262		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8263		- }
8264		-
8265		- /*
8266		- int r=0,g=0,b=0,a=0;
8267		- for (int i=0; i<width; i++)
8268		- for (int j=0; j<height; j++)
8269		- {
8270		- int index = j*width+i;
8271		- int p = pixels[index];
8272		- a = ((p>>24) & 0xFF);
8273		- r = ((p>>16) & 0xFF);
8274		- g = ((p>>8) & 0xFF);
8275		- b = (p & 0xFF);
8276		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8277		- }
8278		- /**/
8279		- int width = (int)Math.sqrt(pixels.length); // squared
8280		- int height = width;
8281		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8282		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8546	+ BufferedImage rendImage = CreateBim(texturedata);
	8547	+
8283	8548	ImageWriter writer = null;
8284	8549	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8285	8550	if (iter.hasNext()) {
8286	8551	writer = (ImageWriter)iter.next();
8287	8552	}
8288		- float compressionQuality = 0.9f;
	8553	+
	8554	+ float compressionQuality = 0.85f;
8289	8555	try
8290	8556	{
8291	8557	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8302,18 +8568,20 @@
8302	8568	}
8303	8569	}
8304	8570	}
8305		-
	8571	+
	8572	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8573	+
8306	8574	//System.out.println("Texture = " + tex);
8307		- if (textures.containsKey(texname))
	8575	+ if (textures.containsKey(tex))
8308	8576	{
8309		- CacheTexture thetex = textures.get(texname);
	8577	+ CacheTexture thetex = textures.get(tex);
8310	8578	thetex.texture.disable();
8311	8579	thetex.texture.dispose();
8312		- textures.remove(texname);
	8580	+ textures.remove(tex);
8313	8581	}
8314	8582
8315		- texture.texturedata = texturedata;
8316		- textures.put(texname, texture);
	8583	+ //texture.texturedata = texturedata;
	8584	+ textures.put(tex, texturecache);
8317	8585
8318	8586	// newtex = true;
8319	8587	}
..	..	@@ -8329,10 +8597,44 @@
8329	8597	}
8330	8598	}
8331	8599
8332		- return texture;
	8600	+ return texturecache;
8333	8601	}
8334	8602
8335		- 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
8336	8638	{
8337	8639	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8338	8640
..	..	@@ -8350,21 +8652,21 @@
8350	8652	return texture!=null?texture.texture:null;
8351	8653	}
8352	8654
8353		- 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
8354	8656	{
8355	8657	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8356	8658
8357	8659	return texture!=null?texture.texturedata:null;
8358	8660	}
8359	8661
8360		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8662	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8361	8663	{
8362	8664	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8363	8665	{
8364	8666	return false;
8365	8667	}
8366	8668
8367		- boolean newtex = false;
	8669	+ //boolean newtex = false;
8368	8670
8369	8671	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8370	8672
..	..	@@ -8396,9 +8698,75 @@
8396	8698	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8397	8699	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8398	8700
8399		- return newtex;
	8701	+ return true; // Warning: not used.
8400	8702	}
8401	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	+
8402	8770	ShadowBuffer shadowPBuf;
8403	8771	AntialiasBuffer antialiasPBuf;
8404	8772	int MAXSTACK;
..	..	@@ -8415,10 +8783,12 @@
8415	8783
8416	8784	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8417	8785	MAXSTACK = temp[0];
8418		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8786	+ if (Globals.DEBUG)
	8787	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8419	8788	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8420	8789	MAXSTACK = temp[0];
8421		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8790	+ if (Globals.DEBUG)
	8791	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8422	8792
8423	8793	// Use debug pipeline
8424	8794	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8426,7 +8796,8 @@
8426	8796	gl = drawable.getGL(); //
8427	8797
8428	8798	GL gl3 = getGL();
8429		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8430	8801
8431	8802
8432	8803	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8591,7 +8962,7 @@
8591	8962
8592	8963	if (cubemap == null)
8593	8964	{
8594		- LoadEnvy(5);
	8965	+ //LoadEnvy(1);
8595	8966	}
8596	8967
8597	8968	//cubemap.enable();
..	..	@@ -8867,6 +9238,8 @@
8867	9238
8868	9239	void LoadEnvy(int which)
8869	9240	{
	9241	+ assert(false);
	9242	+
8870	9243	String name;
8871	9244	String ext;
8872	9245
..	..	@@ -8878,37 +9251,58 @@
8878	9251	cubemap = null;
8879	9252	return;
8880	9253	case 1:
8881		- name = "cubemaps/box_";
8882		- ext = "png";
	9254	+ name = "cubemaps/rgb/";
	9255	+ ext = "jpg";
8883	9256	reverseUP = false;
8884	9257	break;
8885	9258	case 2:
8886		- name = "cubemaps/uffizi_";
8887		- ext = "png";
8888		- break; // reverseUP = true; break;
	9259	+ name = "cubemaps/uffizi/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
8889	9263	case 3:
8890		- name = "cubemaps/CloudyHills_";
8891		- ext = "tga";
	9264	+ name = "cubemaps/CloudyHills/";
	9265	+ ext = "jpg";
8892	9266	reverseUP = false;
8893	9267	break;
8894	9268	case 4:
8895		- name = "cubemaps/cornell_";
	9269	+ name = "cubemaps/cornell/";
8896	9270	ext = "png";
8897	9271	reverseUP = false;
8898	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;
8899	9298	default:
8900		- name = "cubemaps/rgb_";
8901		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9299	+ name = "cubemaps/box/";
	9300	+ ext = "png"; /mipmap = true;/
	9301	+ reverseUP = false;
8902	9302	break;
8903	9303	}
8904		-
8905		- try
8906		- {
8907		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8908		- } catch (IOException e)
8909		- {
8910		- throw new RuntimeException(e);
8911		- }
	9304	+
	9305	+ LoadSkybox(name, ext, mipmap);
8912	9306	}
8913	9307
8914	9308	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8940,8 +9334,12 @@
8940	9334	static double[] model = new double[16];
8941	9335	double[] camera2light = new double[16];
8942	9336	double[] light2camera = new double[16];
8943		- int newenvy = -1;
8944		- boolean envyoff = true; // false;
	9337	+
	9338	+ //int newenvy = -1;
	9339	+ //boolean envyoff = false;
	9340	+
	9341	+ String loadedskyboxname;
	9342	+
8945	9343	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8946	9344	//float[] light0 = { 0,0,0 };
8947	9345	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9234,11 +9632,35 @@
9234	9632	jy8[3] = 0.5f;
9235	9633	}
9236	9634
9237		- 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
9238	9636	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9239	9637	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9240	9638	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9241	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	+
9242	9664	static int imagecount = 0; // movie generation
9243	9665
9244	9666	static int jitter = 0;
..	..	@@ -9335,7 +9757,7 @@
9335	9757
9336	9758	if (renderCamera != lightCamera)
9337	9759	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9338		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9760	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9339	9761
9340	9762	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9341	9763
..	..	@@ -9351,7 +9773,7 @@
9351	9773
9352	9774	if (renderCamera != lightCamera)
9353	9775	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9354		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9776	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9355	9777
9356	9778	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9357	9779
..	..	@@ -9397,10 +9819,12 @@
9397	9819	rati = 1 / rati;
9398	9820	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9399	9821	}
9400		- assert (newenvy == -1);
	9822	+
	9823	+ //assert (newenvy == -1);
	9824	+
9401	9825	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9402	9826	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9403		- DrawSkyBox(gl);
	9827	+ DrawSkyBox(gl, (float)rati);
9404	9828	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9405	9829	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9406	9830	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10349,6 +10773,7 @@
10349	10773	ANTIALIAS = 0;
10350	10774	//System.out.println("RESTART");
10351	10775	AAtimer.restart();
	10776	+ Globals.TIMERRUNNING = true;
10352	10777	}
10353	10778	}
10354	10779	}
..	..	@@ -10416,7 +10841,8 @@
10416	10841	ambientOcclusion = false;
10417	10842	}
10418	10843
10419		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10844	+ if (//Globals.lighttouched &&
	10845	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10420	10846	{
10421	10847	//if (RENDERSHADOW) // ?
10422	10848	if (!IsFrozen())
..	..	@@ -10435,7 +10861,7 @@
10435	10861
10436	10862	if (wait)
10437	10863	{
10438		- Sleep(500);
	10864	+ Sleep(200); // blocks everything
10439	10865
10440	10866	wait = false;
10441	10867	}
..	..	@@ -10550,7 +10976,7 @@
10550	10976	// if (parentcam != renderCamera) // not a light
10551	10977	if (cam != lightCamera)
10552	10978	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10553		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10979	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10554	10980
10555	10981	for (int j = 0; j < 4; j++)
10556	10982	{
..	..	@@ -10565,7 +10991,7 @@
10565	10991	// if (parentcam != renderCamera) // not a light
10566	10992	if (cam != lightCamera)
10567	10993	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10568		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10994	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10569	10995
10570	10996	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10571	10997
..	..	@@ -10651,13 +11077,43 @@
10651	11077	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10652	11078	}
10653	11079
10654		- 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"))
10655	11088	{
10656		- LoadEnvy(newenvy);
	11089	+ if (cubemaprgb == null)
	11090	+ {
	11091	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb" + "/", "jpg", false);
	11092	+ }
	11093	+
	11094	+ cubemap = cubemaprgb;
10657	11095	}
10658		-
10659		- newenvy = -1;
10660		-
	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	+
10661	11117	ratio = ((double) getWidth()) / getHeight();
10662	11118	//System.out.println("ratio = " + ratio);
10663	11119
..	..	@@ -10673,7 +11129,7 @@
10673	11129
10674	11130	if (!IsFrozen() && !ambientOcclusion)
10675	11131	{
10676		- DrawSkyBox(gl);
	11132	+ DrawSkyBox(gl, (float)ratio);
10677	11133	}
10678	11134
10679	11135	//if (selection_view == -1)
..	..	@@ -10856,9 +11312,9 @@
10856	11312
10857	11313	gl.glMatrixMode(GL.GL_MODELVIEW);
10858	11314
10859		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10860		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10861		-//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);
10862	11318	} else
10863	11319	{
10864	11320	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10869,7 +11325,7 @@
10869	11325	//System.out.println("BLENDING ON");
10870	11326	gl.glEnable(GL.GL_BLEND);
10871	11327	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10872		-
	11328	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10873	11329	gl.glMatrixMode(gl.GL_PROJECTION);
10874	11330	gl.glLoadIdentity();
10875	11331
..	..	@@ -10959,7 +11415,7 @@
10959	11415
10960	11416	// if (cam != lightCamera)
10961	11417	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10962		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11418	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10963	11419	}
10964	11420
10965	11421	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11118,7 +11574,7 @@
11118	11574	}
11119	11575	}
11120	11576
11121		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11577	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11122	11578	{
11123	11579	//gl.glDepthFunc(GL.GL_LEQUAL);
11124	11580	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11126,24 +11582,21 @@
11126	11582
11127	11583	boolean texon = textureon;
11128	11584
11129		- if (RENDERPROGRAM > 0)
11130		- {
11131		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11132		- textureon = false;
11133		- }
	11585	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11586	+ textureon = false;
	11587	+
11134	11588	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11135	11589	//System.out.println("ALLO");
11136	11590	gl.glColorMask(false, false, false, false);
11137	11591	DrawObject(gl);
11138		- if (RENDERPROGRAM > 0)
11139		- {
11140		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11141		- textureon = texon;
11142		- }
	11592	+
	11593	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11594	+ textureon = texon;
	11595	+
11143	11596	gl.glColorMask(true, true, true, true);
11144	11597
11145	11598	gl.glDepthFunc(GL.GL_EQUAL);
11146		- //gl.glDepthMask(false);
	11599	+ gl.glDepthMask(false);
11147	11600	}
11148	11601
11149	11602	if (false) // DrawMode() == SHADOW)
..	..	@@ -11326,15 +11779,36 @@
11326	11779
11327	11780	static boolean zoomonce = false;
11328	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	+
11329	11800	void DrawObject(GL gl, boolean draw)
11330	11801	{
	11802	+ // To clear camera values
	11803	+ ResetOptions();
	11804	+
11331	11805	//System.out.println("DRAW OBJECT " + mouseDown);
11332	11806	// DrawMode() = SELECTION;
11333	11807	//GL gl = getGL();
11334	11808	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11335	11809	{
11336	11810	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11337		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11811	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11338	11812	pingthread.StepToTarget(true); // true);
11339	11813	// zoomonce = false;
11340	11814	}
..	..	@@ -11406,8 +11880,9 @@
11406	11880
11407	11881	if (DrawMode() == DEFAULT)
11408	11882	{
11409		- if (DEBUG)
	11883	+ if (Globals.DEBUG)
11410	11884	{
	11885	+ CreateSelectedPoint();
11411	11886	float radius = 0.05f;
11412	11887	if (selectedpoint.radius != radius)
11413	11888	{
..	..	@@ -11461,20 +11936,32 @@
11461	11936	ReleaseTextures(DEFAULT_TEXTURES);
11462	11937
11463	11938	if (CLEANCACHE)
11464		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11939	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11465	11940	{
11466		- String tex = e.nextElement();
	11941	+ cTexture tex = e.nextElement();
11467	11942
11468	11943	// System.out.println("Texture --------- " + tex);
11469	11944
11470		- if (tex.equals("WHITE_NOISE"))
	11945	+ if (tex.equals("WHITE_NOISE:"))
11471	11946	continue;
11472	11947
11473		- if (!usedtextures.containsKey(tex))
	11948	+ if (!usedtextures.contains(tex))
11474	11949	{
	11950	+ CacheTexture gettex = texturepigment.get(tex);
11475	11951	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11476		- textures.get(tex).texture.dispose();
11477		- 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	+ }
11478	11965	}
11479	11966	}
11480	11967	}
..	..	@@ -11894,7 +12381,7 @@
11894	12381	for (int i = tp.size(); --i >= 0;)
11895	12382	{
11896	12383	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11897		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12384	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11898	12385	}
11899	12386
11900	12387
..	..	@@ -12002,8 +12489,76 @@
12002	12489
12003	12490	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12004	12491
12005		- String program =
	12492	+ String programmin =
	12493	+ // Min shader
12006	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	+
12007	12562	//"OPTION ARB_fragment_program_shadow;" +
12008	12563	"PARAM light2cam0 = program.env[10];" +
12009	12564	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12118,8 +12673,7 @@
12118	12673	"TEMP shininess;" +
12119	12674	"\n" +
12120	12675	"MOV texSamp, one;" +
12121		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12122		-
	12676	+
12123	12677	"MOV mapgrid.x, one2048th.x;" +
12124	12678	"MOV temp, fragment.texcoord[1];" +
12125	12679	/*
..	..	@@ -12140,20 +12694,20 @@
12140	12694	"MUL temp, floor, mapgrid.x;" +
12141	12695	//"TEX depth0, temp, texture[1], 2D;" +
12142	12696	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12143		- TextureFetch("depth0", "temp", "1") +
	12697	+ ShadowTextureFetch("depth0", "temp", "1") +
12144	12698	"") +
12145	12699	"ADD temp.x, temp.x, mapgrid.x;" +
12146	12700	//"TEX depth1, temp, texture[1], 2D;" +
12147	12701	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12148		- TextureFetch("depth1", "temp", "1") +
	12702	+ ShadowTextureFetch("depth1", "temp", "1") +
12149	12703	"") +
12150	12704	"ADD temp.y, temp.y, mapgrid.x;" +
12151	12705	//"TEX depth2, temp, texture[1], 2D;" +
12152		- TextureFetch("depth2", "temp", "1") +
	12706	+ ShadowTextureFetch("depth2", "temp", "1") +
12153	12707	"SUB temp.x, temp.x, mapgrid.x;" +
12154	12708	//"TEX depth3, temp, texture[1], 2D;" +
12155	12709	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12156		- TextureFetch("depth3", "temp", "1") +
	12710	+ ShadowTextureFetch("depth3", "temp", "1") +
12157	12711	"") +
12158	12712	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12159	12713	//"MOV params, material;" +
..	..	@@ -12524,10 +13078,10 @@
12524	13078	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12525	13079	"") +
12526	13080
12527		- // display shadow only (bump == 0)
	13081	+ // display shadow only (fakedepth == 0)
12528	13082	"SUB temp.x, half.x, shadow.x;" +
12529	13083	"MOV temp.y, -params5.z;" + // params6.x;" +
12530		- "SLT temp.z, temp.y, -one2048th.x;" +
	13084	+ "SLT temp.z, temp.y, -c256i.x;" +
12531	13085	"SUB temp.y, one.x, temp.z;" +
12532	13086	"MUL temp.x, temp.x, temp.y;" +
12533	13087	"KIL temp.x;" +
..	..	@@ -12858,6 +13412,13 @@
12858	13412	//once = true;
12859	13413	}
12860	13414
	13415	+ String program = programmax;
	13416	+
	13417	+ if (Globals.MINSHADER)
	13418	+ {
	13419	+ program = programmin;
	13420	+ }
	13421	+
12861	13422	System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12862	13423	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12863	13424	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
..	..	@@ -12951,25 +13512,26 @@
12951	13512	return out;
12952	13513	}
12953	13514
12954		- String TextureFetch(String dest, String src, String unit)
	13515	+ // Also does frustum culling
	13516	+ String ShadowTextureFetch(String dest, String src, String unit)
12955	13517	{
12956	13518	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12957	13519	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12958	13520	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13521	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13522	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12959	13523	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12960		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12961		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12962		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12963		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13524	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13525	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12964	13526	//"SWZ buffer, temp, w,w,w,w;";
12965		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13527	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12966	13528	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12967	13529	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12968	13530	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12969		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13531	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12970	13532
12971		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12972		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13533	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13534	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12973	13535	}
12974	13536
12975	13537	String Shadow(String depth, String shadow)
..	..	@@ -13016,7 +13578,7 @@
13016	13578	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13017	13579	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13018	13580
13019		- // No shadow when out of frustrum
	13581	+ // No shadow when out of frustum
13020	13582	"SGE temp.x, " + depth + ".z, one.z;" +
13021	13583	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13022	13584	"";
..	..	@@ -13164,7 +13726,8 @@
13164	13726	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13165	13727	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13166	13728	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13167		- Object3D.cVector2[] vector2buffer;
	13729	+
	13730	+ //Object3D.cVector2[] vector2buffer;
13168	13731
13169	13732	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13170	13733	// OUT : diff, spec
..	..	@@ -13180,9 +13743,10 @@
13180	13743	"DP3 " + dest + ".z," + "normals," + "eye;" +
13181	13744	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13182	13745	//"MOV " + dest + ".w," + "normal.z;" +
13183		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13184		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13185		- //"MOV " + dest + ".z," + "params2.w;" +
	13746	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13747	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13748	+
	13749	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13186	13750	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13187	13751	"RCP " + dest + ".w," + dest + ".w;" +
13188	13752	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13687,6 +14251,7 @@
13687	14251	else
13688	14252	if (evt.getSource() == AAtimer)
13689	14253	{
	14254	+ Globals.TIMERRUNNING = false;
13690	14255	if (mouseDown)
13691	14256	{
13692	14257	//new Exception().printStackTrace();
..	..	@@ -13746,7 +14311,7 @@
13746	14311
13747	14312	// fev 2014???
13748	14313	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13749		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14314	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13750	14315	pingthread.StepToTarget(true); // true);
13751	14316	}
13752	14317	// if (!LIVE)
..	..	@@ -13761,6 +14326,7 @@
13761	14326	return;
13762	14327
13763	14328	AAtimer.restart(); //
	14329	+ Globals.TIMERRUNNING = true;
13764	14330
13765	14331	// waslive = LIVE;
13766	14332	// LIVE = false;
..	..	@@ -13810,14 +14376,15 @@
13810	14376	drag = false;
13811	14377	//System.out.println("Mouse DOWN");
13812	14378	editObj = false;
13813		- ClickInfo info = new ClickInfo();
13814		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13815		- info.pane = this;
13816		- info.camera = renderCamera;
13817		- info.x = x;
13818		- info.y = y;
13819		- info.modifiers = modifiersex;
13820		- editObj = object.doEditClick(info, 0);
	14379	+ //ClickInfo info = new ClickInfo();
	14380	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14381	+ object.clickInfo.pane = this;
	14382	+ object.clickInfo.camera = renderCamera;
	14383	+ object.clickInfo.x = x;
	14384	+ object.clickInfo.y = y;
	14385	+ object.clickInfo.modifiers = modifiersex;
	14386	+ editObj = object.doEditClick(//info,
	14387	+ 0);
13821	14388	if (!editObj)
13822	14389	{
13823	14390	hasMarquee = true;
..	..	@@ -14099,12 +14666,12 @@
14099	14666	void GoDown(int mod)
14100	14667	{
14101	14668	MODIFIERS \|= COMMAND;
14102		- /*
	14669	+ /**/
14103	14670	if((mod&SHIFT) == SHIFT)
14104		- manipCamera.RotatePosition(0, -speed);
	14671	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14105	14672	else
14106		- manipCamera.BackForth(0, -speed*delta, getWidth());
14107		- */
	14673	+ manipCamera.RotatePosition(0, -speed);
	14674	+ /**/
14108	14675	if ((mod & SHIFT) == SHIFT)
14109	14676	{
14110	14677	mouseMode = mouseMode; // VR??
..	..	@@ -14120,12 +14687,12 @@
14120	14687	void GoUp(int mod)
14121	14688	{
14122	14689	MODIFIERS \|= COMMAND;
14123		- /*
	14690	+ /**/
14124	14691	if((mod&SHIFT) == SHIFT)
14125		- manipCamera.RotatePosition(0, speed);
	14692	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14126	14693	else
14127		- manipCamera.BackForth(0, speed*delta, getWidth());
14128		- */
	14694	+ manipCamera.RotatePosition(0, speed);
	14695	+ /**/
14129	14696	if ((mod & SHIFT) == SHIFT)
14130	14697	{
14131	14698	mouseMode = mouseMode;
..	..	@@ -14141,12 +14708,12 @@
14141	14708	void GoLeft(int mod)
14142	14709	{
14143	14710	MODIFIERS \|= COMMAND;
14144		- /*
	14711	+ /**/
14145	14712	if((mod&SHIFT) == SHIFT)
14146		- manipCamera.RotatePosition(speed, 0);
14147		- else
14148	14713	manipCamera.Translate(speed*delta, 0, getWidth());
14149		- */
	14714	+ else
	14715	+ manipCamera.RotatePosition(speed, 0);
	14716	+ /**/
14150	14717	if ((mod & SHIFT) == SHIFT)
14151	14718	{
14152	14719	mouseMode = mouseMode;
..	..	@@ -14162,12 +14729,12 @@
14162	14729	void GoRight(int mod)
14163	14730	{
14164	14731	MODIFIERS \|= COMMAND;
14165		- /*
	14732	+ /**/
14166	14733	if((mod&SHIFT) == SHIFT)
14167		- manipCamera.RotatePosition(-speed, 0);
14168		- else
14169	14734	manipCamera.Translate(-speed*delta, 0, getWidth());
14170		- */
	14735	+ else
	14736	+ manipCamera.RotatePosition(-speed, 0);
	14737	+ /**/
14171	14738	if ((mod & SHIFT) == SHIFT)
14172	14739	{
14173	14740	mouseMode = mouseMode;
..	..	@@ -14217,14 +14784,16 @@
14217	14784	if (editObj)
14218	14785	{
14219	14786	drag = true;
14220		- ClickInfo info = new ClickInfo();
14221		- info.bounds.setBounds(0, 0,
	14787	+ //ClickInfo info = new ClickInfo();
	14788	+ object.clickInfo.bounds.setBounds(0, 0,
14222	14789	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14223		- info.pane = this;
14224		- info.camera = renderCamera;
14225		- info.x = x;
14226		- info.y = y;
14227		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14790	+ object.clickInfo.pane = this;
	14791	+ object.clickInfo.camera = renderCamera;
	14792	+ object.clickInfo.x = x;
	14793	+ object.clickInfo.y = y;
	14794	+ object //.GetWindow().copy
	14795	+ .doEditDrag(//info,
	14796	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14228	14797	} else
14229	14798	{
14230	14799	if (x < startX)
..	..	@@ -14373,22 +14942,27 @@
14373	14942	}
14374	14943	}
14375	14944
	14945	+// ClickInfo clickInfo = new ClickInfo();
	14946	+
14376	14947	public void mouseMoved(MouseEvent e)
14377	14948	{
14378	14949	//System.out.println("mouseMoved: " + e);
14379	14950	if (isRenderer)
14380	14951	return;
14381	14952
14382		- ClickInfo ci = new ClickInfo();
14383		- ci.x = e.getX();
14384		- ci.y = e.getY();
14385		- ci.modifiers = e.getModifiersEx();
14386		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14387		- ci.pane = this;
14388		- ci.camera = renderCamera;
	14953	+ // Mouse cursor feedback
	14954	+ object.clickInfo.x = e.getX();
	14955	+ object.clickInfo.y = e.getY();
	14956	+ object.clickInfo.modifiers = e.getModifiersEx();
	14957	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14958	+ object.clickInfo.pane = this;
	14959	+ object.clickInfo.camera = renderCamera;
14389	14960	if (!isRenderer)
14390	14961	{
14391		- if (object.editWindow.copy.doEditClick(ci, 0))
	14962	+ //ObjEditor editWindow = object.editWindow;
	14963	+ //Object3D copy = editWindow.copy;
	14964	+ if (object.doEditClick(//clickInfo,
	14965	+ 0))
14392	14966	{
14393	14967	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14394	14968	} else
..	..	@@ -14403,7 +14977,8 @@
14403	14977	Globals.MOUSEDRAGGED = false;
14404	14978
14405	14979	movingcamera = false;
14406		- X = Y = 0;
	14980	+ X = 0; // getBounds().width/2;
	14981	+ Y = 0; // getBounds().height/2;
14407	14982	//System.out.println("mouseReleased: " + e);
14408	14983	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14409	14984	}
..	..	@@ -14659,7 +15234,8 @@
14659	15234	// break;
14660	15235	case 'T':
14661	15236	CACHETEXTURE ^= true;
14662		- textures.clear();
	15237	+ texturepigment.clear();
	15238	+ texturebump.clear();
14663	15239	// repaint();
14664	15240	break;
14665	15241	case 'Y':
..	..	@@ -14744,7 +15320,9 @@
14744	15320	case 'E' : COMPACT ^= true;
14745	15321	repaint();
14746	15322	break;
14747		- case 'W' : DEBUGHSB ^= true;
	15323	+ case 'W' : // Wide Window (fullscreen)
	15324	+ //DEBUGHSB ^= true;
	15325	+ ObjEditor.theFrame.ToggleFullScreen();
14748	15326	repaint();
14749	15327	break;
14750	15328	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14769,8 +15347,8 @@
14769	15347	RevertCamera();
14770	15348	repaint();
14771	15349	break;
14772		- case 'L':
14773	15350	case 'l':
	15351	+ //case 'L':
14774	15352	if (lightMode)
14775	15353	{
14776	15354	lightMode = false;
..	..	@@ -14834,20 +15412,24 @@
14834	15412	OCCLUSION_CULLING ^= true;
14835	15413	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14836	15414	break;
14837		- case '0': envyoff ^= true; repaint(); break;
	15415	+ //case '0': envyoff ^= true; repaint(); break;
14838	15416	case '1':
14839	15417	case '2':
14840	15418	case '3':
14841	15419	case '4':
14842	15420	case '5':
14843		- newenvy = Character.getNumericValue(key);
14844		- repaint();
14845		- break;
14846	15421	case '6':
14847	15422	case '7':
14848	15423	case '8':
14849	15424	case '9':
14850		- BGcolor = (key - '6')/3.f;
	15425	+ if (true) // envyoff)
	15426	+ {
	15427	+ BGcolor = (key - '1')/8.f;
	15428	+ }
	15429	+ else
	15430	+ {
	15431	+ //newenvy = Character.getNumericValue(key);
	15432	+ }
14851	15433	repaint();
14852	15434	break;
14853	15435	case '!':
..	..	@@ -14913,9 +15495,9 @@
14913	15495	case '_':
14914	15496	kompactbit = 5;
14915	15497	break;
14916		- case '+':
14917		- kompactbit = 6;
14918		- break;
	15498	+// case '+':
	15499	+// kompactbit = 6;
	15500	+// break;
14919	15501	case ' ':
14920	15502	lightMode ^= true;
14921	15503	Globals.lighttouched = true;
..	..	@@ -14927,6 +15509,7 @@
14927	15509	case ESC:
14928	15510	RENDERPROGRAM += 1;
14929	15511	RENDERPROGRAM %= 3;
	15512	+
14930	15513	repaint();
14931	15514	break;
14932	15515	case 'Z':
..	..	@@ -14966,8 +15549,9 @@
14966	15549	case DELETE:
14967	15550	ClearSelection();
14968	15551	break;
14969		- /*
14970	15552	case '+':
	15553	+
	15554	+ /*
14971	15555	//fontsize += 1;
14972	15556	bbzoom *= 2;
14973	15557	repaint();
..	..	@@ -14984,17 +15568,17 @@
14984	15568	case '=':
14985	15569	IncDepth();
14986	15570	//fontsize += 1;
14987		- object.editWindow.refreshContents(true);
	15571	+ object.GetWindow().refreshContents(true);
14988	15572	maskbit = 6;
14989	15573	break;
14990	15574	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14991	15575	DecDepth();
14992	15576	maskbit = 5;
14993	15577	//if(fontsize > 1) fontsize -= 1;
14994		- if (object.editWindow == null)
14995		- new Exception().printStackTrace();
14996		- else
14997		- object.editWindow.refreshContents(true);
	15578	+// if (object.editWindow == null)
	15579	+// new Exception().printStackTrace();
	15580	+// else
	15581	+ object.GetWindow().refreshContents(true);
14998	15582	break;
14999	15583	case '{':
15000	15584	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15218,7 +15802,7 @@
15218	15802	}
15219	15803	*/
15220	15804
15221		- object.editWindow.EditSelection();
	15805	+ object.GetWindow().EditSelection(false);
15222	15806	}
15223	15807
15224	15808	void SelectParent()
..	..	@@ -15235,10 +15819,10 @@
15235	15819	{
15236	15820	//selectees.remove(i);
15237	15821	System.out.println("select parent of " + elem);
15238		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15822	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15239	15823	} else
15240	15824	{
15241		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15825	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15242	15826	}
15243	15827
15244	15828	first = false;
..	..	@@ -15280,12 +15864,12 @@
15280	15864	for (int j = 0; j < group.children.size(); j++)
15281	15865	{
15282	15866	elem = (Object3D) group.children.elementAt(j);
15283		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15867	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15284	15868	first = false;
15285	15869	}
15286	15870	} else
15287	15871	{
15288		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15872	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15289	15873	}
15290	15874
15291	15875	first = false;
..	..	@@ -15296,21 +15880,21 @@
15296	15880	{
15297	15881	//Composite group = (Composite) object;
15298	15882	Object3D group = object;
15299		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15883	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15300	15884	}
15301	15885
15302	15886	void ResetTransform(int mask)
15303	15887	{
15304	15888	//Composite group = (Composite) object;
15305	15889	Object3D group = object;
15306		- group.editWindow.ResetTransform(mask);
	15890	+ group.GetWindow().ResetTransform(mask);
15307	15891	}
15308	15892
15309	15893	void FlipTransform()
15310	15894	{
15311	15895	//Composite group = (Composite) object;
15312	15896	Object3D group = object;
15313		- group.editWindow.FlipTransform();
	15897	+ group.GetWindow().FlipTransform();
15314	15898	// group.editWindow.ReduceMesh(true);
15315	15899	}
15316	15900
..	..	@@ -15318,7 +15902,7 @@
15318	15902	{
15319	15903	//Composite group = (Composite) object;
15320	15904	Object3D group = object;
15321		- group.editWindow.PrintMemory();
	15905	+ group.GetWindow().PrintMemory();
15322	15906	// group.editWindow.ReduceMesh(true);
15323	15907	}
15324	15908
..	..	@@ -15326,7 +15910,7 @@
15326	15910	{
15327	15911	//Composite group = (Composite) object;
15328	15912	Object3D group = object;
15329		- group.editWindow.ResetCentroid();
	15913	+ group.GetWindow().ResetCentroid();
15330	15914	}
15331	15915
15332	15916	void IncDepth()
..	..	@@ -15408,8 +15992,6 @@
15408	15992
15409	15993	int width = getBounds().width;
15410	15994	int height = getBounds().height;
15411		- ClickInfo info = new ClickInfo();
15412		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15413	15995	//Image img = CreateImage(width, height);
15414	15996	//System.out.println("width = " + width + "; height = " + height + "\n");
15415	15997
..	..	@@ -15486,48 +16068,77 @@
15486	16068	}
15487	16069	if (object != null && !hasMarquee)
15488	16070	{
	16071	+ if (object.clickInfo == null)
	16072	+ object.clickInfo = new ClickInfo();
	16073	+ ClickInfo info = object.clickInfo;
	16074	+ //ClickInfo info = new ClickInfo();
	16075	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16076	+
15489	16077	if (isRenderer)
15490	16078	{
15491		- info.flags++;
	16079	+ object.clickInfo.flags++;
15492	16080	double frameAspect = (double) width / (double) height;
15493	16081	if (frameAspect > renderCamera.aspect)
15494	16082	{
15495	16083	int desired = (int) ((double) height * renderCamera.aspect);
15496		- info.bounds.width -= width - desired;
15497		- info.bounds.x += (width - desired) / 2;
	16084	+ object.clickInfo.bounds.width -= width - desired;
	16085	+ object.clickInfo.bounds.x += (width - desired) / 2;
15498	16086	} else
15499	16087	{
15500	16088	int desired = (int) ((double) width / renderCamera.aspect);
15501		- info.bounds.height -= height - desired;
15502		- info.bounds.y += (height - desired) / 2;
	16089	+ object.clickInfo.bounds.height -= height - desired;
	16090	+ object.clickInfo.bounds.y += (height - desired) / 2;
15503	16091	}
15504	16092	}
15505		- info.g = gr;
15506		- info.camera = renderCamera;
	16093	+
	16094	+ object.clickInfo.g = gr;
	16095	+ object.clickInfo.camera = renderCamera;
15507	16096	/*
15508	16097	// Memory intensive (brep.verticescopy)
15509	16098	if (!(object instanceof Composite))
15510	16099	object.draw(info, 0, false); // SLOW :
15511	16100	*/
15512		- if (!isRenderer)
	16101	+ if (!isRenderer) // && drag)
15513	16102	{
15514		- object.drawEditHandles(info, 0);
15515		-
15516		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16103	+ Grafreed.Assert(object != null);
	16104	+ Grafreed.Assert(object.selection != null);
	16105	+ if (object.selection.Size() > 0)
15517	16106	{
15518		- switch (object.selection.get(0).hitSomething)
	16107	+ int hitSomething = object.selection.get(0).hitSomething;
	16108	+
	16109	+ object.clickInfo.DX = 0;
	16110	+ object.clickInfo.DY = 0;
	16111	+ object.clickInfo.W = 1;
	16112	+ if (hitSomething == Object3D.hitCenter)
15519	16113	{
15520		- case Object3D.hitCenter: gr.setColor(Color.pink);
15521		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15522		- break;
15523		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15524		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15525		- break;
15526		- case Object3D.hitScale: gr.setColor(Color.cyan);
15527		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15528		- break;
	16114	+ info.DX = X;
	16115	+ if (X != 0)
	16116	+ info.DX -= info.bounds.width/2;
	16117	+
	16118	+ info.DY = Y;
	16119	+ if (Y != 0)
	16120	+ info.DY -= info.bounds.height/2;
15529	16121	}
15530		-
	16122	+
	16123	+ object.drawEditHandles(//info,
	16124	+ 0);
	16125	+
	16126	+ if (drag && (X != 0 \|\| Y != 0))
	16127	+ {
	16128	+ switch (hitSomething)
	16129	+ {
	16130	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16131	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16132	+ break;
	16133	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16134	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16135	+ break;
	16136	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16137	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16138	+ break;
	16139	+ }
	16140	+
	16141	+ }
15531	16142	}
15532	16143	}
15533	16144	}
..	..	@@ -16009,6 +16620,8 @@
16009	16620	private /static/ boolean firstime;
16010	16621	private /static/ cVector newView = new cVector();
16011	16622	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16623	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16624	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16012	16625	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16013	16626	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16014	16627	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16021,29 +16634,67 @@
16021	16634	{
16022	16635	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16023	16636
	16637	+ int usedsuf = 0;
	16638	+
16024	16639	for (int i = 0; i < suffixes.length; i++)
16025	16640	{
16026		- String resourceName = basename + suffixes[i] + "." + suffix;
16027		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16028		- mipmapped,
16029		- FileUtil.getFileSuffix(resourceName));
16030		- if (data == null)
	16641	+ String[] suffixe = suffixes;
	16642	+ String[] fallback = suffixes2;
	16643	+ String[] fallfallback = suffixes3;
	16644	+
	16645	+ for (int c=usedsuf; --c>=0;)
16031	16646	{
16032		- throw new IOException("Unable to load texture " + resourceName);
	16647	+// String[] temp = suffixe;
	16648	+// suffixe = fallback;
	16649	+// fallback = fallfallback;
	16650	+// fallfallback = temp;
16033	16651	}
	16652	+
	16653	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16654	+ TextureData data;
	16655	+
	16656	+ try
	16657	+ {
	16658	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16659	+ mipmapped,
	16660	+ FileUtil.getFileSuffix(resourceName));
	16661	+ }
	16662	+ catch (Exception e)
	16663	+ {
	16664	+ try
	16665	+ {
	16666	+ resourceName = basename + fallback[i] + "." + suffix;
	16667	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16668	+ mipmapped,
	16669	+ FileUtil.getFileSuffix(resourceName));
	16670	+ }
	16671	+ catch (Exception e2)
	16672	+ {
	16673	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16674	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16675	+ mipmapped,
	16676	+ FileUtil.getFileSuffix(resourceName));
	16677	+ }
	16678	+ }
	16679	+
16034	16680	//System.out.println("Target = " + targets[i]);
16035	16681	cubemap.updateImage(data, targets[i]);
16036	16682	}
16037	16683
16038	16684	return cubemap;
16039	16685	}
	16686	+
16040	16687	int bigsphere = -1;
16041	16688
16042	16689	float BGcolor = 0.5f;
16043	16690
16044		- private void DrawSkyBox(GL gl)
	16691	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16692	+
	16693	+ private void DrawSkyBox(GL gl, float ratio)
16045	16694	{
16046		- if (envyoff \|\| cubemap == null)
	16695	+ if (//envyoff \|\|
	16696	+ WIREFRAME \|\|
	16697	+ cubemap == null)
16047	16698	{
16048	16699	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16049	16700	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16058,7 +16709,17 @@
16058	16709	// Compensates for ExaminerViewer's modification of modelview matrix
16059	16710	gl.glMatrixMode(GL.GL_MODELVIEW);
16060	16711	gl.glLoadIdentity();
	16712	+ gl.glScalef(1,ratio,1);
16061	16713
	16714	+// colorV[0] = 2;
	16715	+// colorV[1] = 2;
	16716	+// colorV[2] = 2;
	16717	+// colorV[3] = 1;
	16718	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16719	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16720	+//
	16721	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16722	+
16062	16723	//gl.glActiveTexture(GL.GL_TEXTURE1);
16063	16724	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16064	16725
..	..	@@ -16090,6 +16751,7 @@
16090	16751	{
16091	16752	gl.glScalef(1.0f, -1.0f, 1.0f);
16092	16753	}
	16754	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16093	16755	gl.glMultMatrixd(viewrot_1, 0);
16094	16756	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16095	16757	//viewer.updateInverseRotation(gl);
..	..	@@ -16130,7 +16792,8 @@
16130	16792	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16131	16793
16132	16794	cubemap.disable();
16133		- ////cubemap.unbind();
	16795	+ //cubemap.dispose();
	16796	+
16134	16797	if (CULLFACE)
16135	16798	{
16136	16799	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16230,16 +16893,16 @@
16230	16893	cStatic.objectstack[materialdepth++] = checker;
16231	16894	//System.out.println("material " + material);
16232	16895	//Applet3D.tracein(this, selected);
16233		- vector2buffer = checker.projectedVertices;
	16896	+ //vector2buffer = checker.projectedVertices;
16234	16897
16235	16898	//checker.GetMaterial().Draw(this, false); // true);
16236		- DrawMaterial(checker.GetMaterial(), false); // true);
	16899	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16237	16900
16238	16901	materialdepth -= 1;
16239	16902	if (materialdepth > 0)
16240	16903	{
16241		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16242		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16904	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16905	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16243	16906	}
16244	16907	//checker.GetMaterial().opacity = 1f;
16245	16908	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16325,6 +16988,14 @@
16325	16988	}
16326	16989	}
16327	16990
	16991	+ private Object3D GetFolder()
	16992	+ {
	16993	+ Object3D folder = object.GetWindow().copy;
	16994	+ if (object.GetWindow().copy.selection.Size() > 0)
	16995	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16996	+ return folder;
	16997	+ }
	16998	+
16328	16999	class SelectBuffer implements GLEventListener
16329	17000	{
16330	17001
..	..	@@ -16340,7 +17011,7 @@
16340	17011	//new Exception().printStackTrace();
16341	17012	System.out.println("select buffer init");
16342	17013	// Use debug pipeline
16343		- drawable.setGL(new DebugGL(drawable.getGL()));
	17014	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16344	17015
16345	17016	GL gl = drawable.getGL();
16346	17017
..	..	@@ -16404,6 +17075,17 @@
16404	17075
16405	17076	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16406	17077
	17078	+ if (PAINTMODE)
	17079	+ {
	17080	+ if (object.GetWindow().copy.selection.Size() > 0)
	17081	+ {
	17082	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17083	+
	17084	+ // Make what you paint not selectable.
	17085	+ paintobj.ResetSelectable();
	17086	+ }
	17087	+ }
	17088	+
16407	17089	//int tmp = selection_view;
16408	17090	//selection_view = -1;
16409	17091	int temp = DrawMode();
..	..	@@ -16415,6 +17097,17 @@
16415	17097	// temp = DEFAULT; // patch for selection debug
16416	17098	Globals.drawMode = temp; // WARNING
16417	17099
	17100	+ if (PAINTMODE)
	17101	+ {
	17102	+ if (object.GetWindow().copy.selection.Size() > 0)
	17103	+ {
	17104	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17105	+
	17106	+ // Revert.
	17107	+ paintobj.RestoreSelectable();
	17108	+ }
	17109	+ }
	17110	+
16418	17111	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16419	17112
16420	17113	// trying different ways of getting the depth info over
..	..	@@ -16462,6 +17155,8 @@
16462	17155	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16463	17156	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16464	17157	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17158	+
	17159	+ CreateSelectedPoint();
16465	17160
16466	17161	// Will fit the mesh !!!
16467	17162	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16516,29 +17211,31 @@
16516	17211	}
16517	17212
16518	17213	if (!movingcamera && !PAINTMODE)
16519		- object.editWindow.ScreenFitPoint(); // fev 2014
	17214	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16520	17215
16521		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17216	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16522	17217	{
16523		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17218	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16524	17219
16525		- Object3D group = new Object3D("inst" + paintcount++);
	17220	+ if (object.GetWindow().copy.selection.Size() > 0)
	17221	+ {
	17222	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16526	17223
16527		- group.CreateMaterial(); // use a void leaf to select instances
16528		-
16529		- group.add(paintobj); // link
16530		-
16531		- object.editWindow.SnapObject(group);
16532		-
16533		- Object3D folder = object.editWindow.copy;
16534		-
16535		- if (object.editWindow.copy.selection.Size() > 0)
16536		- folder = object.editWindow.copy.selection.elementAt(0);
16537		-
16538		- folder.add(group);
16539		-
16540		- object.editWindow.ResetModel();
16541		- object.editWindow.refreshContents();
	17224	+ Object3D inst = new Object3D("inst" + paintcount++);
	17225	+
	17226	+ inst.CreateMaterial(); // use a void leaf to select instances
	17227	+
	17228	+ inst.add(paintobj); // link
	17229	+
	17230	+ object.GetWindow().SnapObject(inst);
	17231	+
	17232	+ Object3D folder = paintFolder; // GetFolder();
	17233	+
	17234	+ folder.add(inst);
	17235	+
	17236	+ object.GetWindow().ResetModel();
	17237	+ object.GetWindow().refreshContents();
	17238	+ }
16542	17239	}
16543	17240	else
16544	17241	paintcount = 0;
..	..	@@ -16577,6 +17274,11 @@
16577	17274	//System.out.println("objects[color] = " + objects[color]);
16578	17275	//objects[color].Select();
16579	17276	indexcount = 0;
	17277	+ ObjEditor window = object.GetWindow();
	17278	+ if (window != null && deselect)
	17279	+ {
	17280	+ window.Select(null, deselect, true);
	17281	+ }
16580	17282	object.Select(color, deselect);
16581	17283	}
16582	17284
..	..	@@ -16855,10 +17557,14 @@
16855	17557	gl.glFlush();
16856	17558
16857	17559	/**/
16858		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17560	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
16859	17561
16860		- float[] pixels = occlusionsizebuffer.array();
	17562	+ float[] depths = occlusiondepthbuffer.array();
16861	17563
	17564	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17565	+
	17566	+ int[] pixels = selectsizebuffer.array();
	17567	+
16862	17568	double r = 0, g = 0, b = 0;
16863	17569
16864	17570	double count = 0;
..	..	@@ -16869,7 +17575,7 @@
16869	17575
16870	17576	double FACTOR = 1;
16871	17577
16872		- for (int i = 0; i < pixels.length; i++)
	17578	+ for (int i = 0; i < depths.length; i++)
16873	17579	{
16874	17580	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
16875	17581	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -16952,7 +17658,7 @@
16952	17658
16953	17659	double scale = ray.z; // 1; // cos
16954	17660
16955		- float depth = pixels[newindex];
	17661	+ float depth = depths[newindex];
16956	17662
16957	17663	/*
16958	17664	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17102,23 +17808,15 @@
17102	17808	int AAbuffersize = 0;
17103	17809
17104	17810	//double[] selectedpoint = new double[3];
17105		- static Superellipsoid selectedpoint = new Superellipsoid();
	17811	+ static Superellipsoid selectedpoint;
17106	17812	static Sphere previousselectedpoint = null;
17107		- static Sphere debugpointG = new Sphere();
17108		- static Sphere debugpointP = new Sphere();
17109		- static Sphere debugpointC = new Sphere();
17110		- static Sphere debugpointR = new Sphere();
	17813	+ static Sphere debugpointG;
	17814	+ static Sphere debugpointP;
	17815	+ static Sphere debugpointC;
	17816	+ static Sphere debugpointR;
17111	17817
17112	17818	static Sphere debugpoints[] = new Sphere[8];
17113	17819
17114		- static
17115		- {
17116		- for (int i=0; i<8; i++)
17117		- {
17118		- debugpoints[i] = new Sphere();
17119		- }
17120		- }
17121		-
17122	17820	static void InitPoints(float radius)
17123	17821	{
17124	17822	for (int i=0; i<8; i++)
..	..	@@ -17157,11 +17855,14 @@
17157	17855	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17158	17856	static IntBuffer bigAAbuffer;
17159	17857	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17160		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17858	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17161	17859	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17162	17860	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17163	17861	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17164		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17862	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17863	+
	17864	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17865	+
17165	17866	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17166	17867	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17167	17868	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();