~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;
..	..	@@ -151,6 +187,18 @@
151	187	}
152	188
153	189	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	190	+
	191	+ public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	192	+ {
	193	+ try
	194	+ {
	195	+ cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	196	+ } catch (IOException e)
	197	+ {
	198	+ System.out.println("NAME = " + name);
	199	+ e.printStackTrace(); // throw new RuntimeException(e);
	200	+ }
	201	+ }
154	202
155	203	void SetAsGLRenderer(boolean b)
156	204	{
..	..	@@ -170,7 +218,8 @@
170	218
171	219	SetCamera(cam);
172	220
173		- SetLight(new Camera(new cVector(10, 10, -20)));
	221	+ // Warning: not used.
	222	+ SetLight(new Camera(new cVector(15, 10, -20)));
174	223
175	224	object = o;
176	225
..	..	@@ -327,7 +376,7 @@
327	376	cStatic.objectstack[materialdepth++] = obj;
328	377	//System.out.println("material " + material);
329	378	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	379	+ //display.vector2buffer = obj.projectedVertices;
331	380	if (obj instanceof Camera)
332	381	{
333	382	display.options1[0] = material.shift;
..	..	@@ -336,14 +385,28 @@
336	385	display.options1[2] = material.shadowbias;
337	386	display.options1[3] = material.aniso;
338	387	display.options1[4] = material.anisoV;
	388	+// System.out.println("display.options1[0] " + display.options1[0]);
	389	+// System.out.println("display.options1[1] " + display.options1[1]);
	390	+// System.out.println("display.options1[2] " + display.options1[2]);
	391	+// System.out.println("display.options1[3] " + display.options1[3]);
	392	+// System.out.println("display.options1[4] " + display.options1[4]);
339	393	display.options2[0] = material.opacity;
340	394	display.options2[1] = material.diffuse;
341	395	display.options2[2] = material.factor;
	396	+// System.out.println("display.options2[0] " + display.options2[0]);
	397	+// System.out.println("display.options2[1] " + display.options2[1]);
	398	+// System.out.println("display.options2[2] " + display.options2[2]);
342	399
343	400	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	401	+// System.out.println("display.options3[0] " + display.options3[0]);
	402	+// System.out.println("display.options3[1] " + display.options3[1]);
	403	+// System.out.println("display.options3[2] " + display.options3[2]);
344	404	display.options4[0] = material.cameralight/0.2f;
345	405	display.options4[1] = material.subsurface;
346	406	display.options4[2] = material.sheen;
	407	+// System.out.println("display.options4[0] " + display.options4[0]);
	408	+// System.out.println("display.options4[1] " + display.options4[1]);
	409	+// System.out.println("display.options4[2] " + display.options4[2]);
347	410
348	411	// if (display.CURRENTANTIALIAS > 0)
349	412	// display.options3[3] /= 4;
..	..	@@ -359,7 +422,7 @@
359	422	/**/
360	423	} else
361	424	{
362		- DrawMaterial(material, selected);
	425	+ DrawMaterial(material, selected, obj.projectedVertices);
363	426	}
364	427	} else
365	428	{
..	..	@@ -383,8 +446,8 @@
383	446	cStatic.objectstack[materialdepth++] = obj;
384	447	//System.out.println("material " + material);
385	448	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	449	+ //display.vector2buffer = obj.projectedVertices;
	450	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	451	}
389	452	}
390	453
..	..	@@ -401,8 +464,8 @@
401	464	materialdepth -= 1;
402	465	if (materialdepth > 0)
403	466	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	467	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	468	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	469	}
407	470	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	471	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +485,8 @@
422	485	materialdepth -= 1;
423	486	if (materialdepth > 0)
424	487	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	488	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	489	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	490	}
428	491	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	492	//else
..	..	@@ -464,10 +527,12 @@
464	527	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	528	{
466	529	//gl.glBegin(gl.GL_TRIANGLES);
467		- boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	530	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	531	+ // TEST LIVE NORMALS && !obj.dontselect
	532	+ ;
468	533	if (!hasnorm)
469	534	{
470		- // System.out.println("FUCK!!");
	535	+ // System.out.println("Mesh normal");
471	536	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	537	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	538	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1192,10 +1257,12 @@
1192	1257	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1258	}
1194	1259	}
	1260	+
1195	1261	if (flipV)
1196	1262	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1263	else
1198	1264	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1265	+
1199	1266	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1267	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1268
..	..	@@ -1215,10 +1282,12 @@
1215	1282	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1283	}
1217	1284	}
	1285	+
1218	1286	if (flipV)
1219	1287	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1288	else
1221	1289	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1290	+
1222	1291	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1292	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1293
..	..	@@ -1246,8 +1315,10 @@
1246	1315	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1316	else
1248	1317	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1318	+
1249	1319	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1320	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1321	+
1251	1322	count2 += 2;
1252	1323	count3 += 3;
1253	1324	}
..	..	@@ -1426,6 +1497,8 @@
1426	1497	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1427	1498	}
1428	1499
	1500	+ float[] colorV = new float[4];
	1501	+
1429	1502	void SetColor(Object3D obj, Vertex p0)
1430	1503	{
1431	1504	CameraPane display = this;
..	..	@@ -1493,8 +1566,6 @@
1493	1566	{
1494	1567	return;
1495	1568	}
1496		-
1497		- float[] colorV = new float[3];
1498	1569
1499	1570	if (false) // marked)
1500	1571	{
..	..	@@ -1603,7 +1674,7 @@
1603	1674	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1675	}
1605	1676
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1677	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1678	{
1608	1679	CameraPane display = this;
1609	1680	//new Exception().printStackTrace();
..	..	@@ -1638,7 +1709,7 @@
1638	1709	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1710	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1711	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1712	+ colorV[3] = 1; // material.opacity;
1642	1713
1643	1714	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1715	//System.out.println("Opacity = " + opacity);
..	..	@@ -1746,9 +1817,9 @@
1746	1817	display.modelParams7[2] = 0;
1747	1818	display.modelParams7[3] = 0;
1748	1819
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1820	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1821
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1822	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1823	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1824	{
1754	1825	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -2044,7 +2115,7 @@
2044	2115	//System.err.println("Oeil on");
2045	2116	OEIL = true;
2046	2117	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2118	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2048	2119	//pingthread.StepToTarget(true);
2049	2120	}
2050	2121
..	..	@@ -2259,7 +2330,7 @@
2259	2330
2260	2331	void ToggleDebug()
2261	2332	{
2262		- DEBUG ^= true;
	2333	+ Globals.DEBUG ^= true;
2263	2334	}
2264	2335
2265	2336	void ToggleLookAt()
..	..	@@ -2277,10 +2348,17 @@
2277	2348	HANDLES ^= true;
2278	2349	}
2279	2350
	2351	+ Object3D paintFolder;
	2352	+
2280	2353	void TogglePaint()
2281	2354	{
2282	2355	PAINTMODE ^= true;
2283	2356	paintcount = 0;
	2357	+
	2358	+ if (PAINTMODE)
	2359	+ {
	2360	+ paintFolder = GetFolder();
	2361	+ }
2284	2362	}
2285	2363
2286	2364	void SwapCamera(int a, int b)
..	..	@@ -2377,6 +2455,21 @@
2377	2455	return currentGL;
2378	2456	}
2379	2457
	2458	+ static private BufferedImage CreateBim(TextureData texturedata)
	2459	+ {
	2460	+ Grafreed.Assert(texturedata != null);
	2461	+
	2462	+ int width = texturedata.getWidth();
	2463	+ int height = texturedata.getHeight();
	2464	+
	2465	+ Buffer buffer = texturedata.getBuffer();
	2466	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2467	+
	2468	+ byte[] bytes = bytebuf.array();
	2469	+
	2470	+ return CreateBim(bytes, width, height);
	2471	+ }
	2472	+
2380	2473	/**/
2381	2474	class CacheTexture
2382	2475	{
..	..	@@ -2385,28 +2478,31 @@
2385	2478
2386	2479	int resolution;
2387	2480
2388		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2481	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2389	2482	{
2390		- texture = tex;
	2483	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2484	+ texturedata = texdata;
2391	2485	resolution = res;
2392	2486	}
2393	2487	}
2394	2488	/**/
2395	2489
2396	2490	// 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>();
	2491	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2492	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2493	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2494	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2495	+
2400	2496	int pigmentdepth = 0;
2401	2497	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2498	int bumpdepth = 0;
2403	2499	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2404	2500	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2405	2501	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2406		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2502	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2407	2503	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2408	2504
2409		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2505	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2410	2506	{
2411	2507	TextureData texturedata = null;
2412	2508
..	..	@@ -2425,13 +2521,34 @@
2425	2521	if (bump)
2426	2522	texturedata = ConvertBump(texturedata, false);
2427	2523
2428		- com.sun.opengl.util.texture.Texture texture =
2429		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2524	+// com.sun.opengl.util.texture.Texture texture =
	2525	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2430	2526
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);
	2527	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2528	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2433	2529
2434		- return texture;
	2530	+ return texturedata;
	2531	+ }
	2532	+
	2533	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2534	+ {
	2535	+ TextureData texturedata = null;
	2536	+
	2537	+ try
	2538	+ {
	2539	+ texturedata =
	2540	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2541	+ bim,
	2542	+ true);
	2543	+ } catch (Exception e)
	2544	+ {
	2545	+ throw new javax.media.opengl.GLException(e);
	2546	+ }
	2547	+
	2548	+ if (bump)
	2549	+ texturedata = ConvertBump(texturedata, false);
	2550	+
	2551	+ return texturedata;
2435	2552	}
2436	2553
2437	2554	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3504,6 +3621,8 @@
3504	3621
3505	3622	System.out.println("LOADING TEXTURE : " + name);
3506	3623
	3624	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3625	+
3507	3626	//
3508	3627	if (false) // compressbit > 0)
3509	3628	{
..	..	@@ -7902,7 +8021,7 @@
7902	8021	String pigment = Object3D.GetPigment(tex);
7903	8022	String bump = Object3D.GetBump(tex);
7904	8023
7905		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8024	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7906	8025	{
7907	8026	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7908	8027	// System.out.println("; bump = " + bump);
..	..	@@ -7917,11 +8036,69 @@
7917	8036	pigment = null;
7918	8037	}
7919	8038
7920		- ReleaseTexture(bump, true);
7921		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
7922	8041	}
7923	8042
7924		- void ReleaseTexture(String tex, boolean bump)
	8043	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8044	+ {
	8045	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8046	+ {
	8047	+ return;
	8048	+ }
	8049	+
	8050	+ if (tex == null)
	8051	+ {
	8052	+ ReleaseTexture(null, false);
	8053	+ return;
	8054	+ }
	8055	+
	8056	+ String pigment = Object3D.GetPigment(tex);
	8057	+
	8058	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8059	+ {
	8060	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8061	+ // System.out.println("; bump = " + bump);
	8062	+ }
	8063	+
	8064	+ if (pigment.equals(""))
	8065	+ {
	8066	+ pigment = null;
	8067	+ }
	8068	+
	8069	+ ReleaseTexture(tex, false);
	8070	+ }
	8071	+
	8072	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8073	+ {
	8074	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8075	+ {
	8076	+ return;
	8077	+ }
	8078	+
	8079	+ if (tex == null)
	8080	+ {
	8081	+ ReleaseTexture(null, true);
	8082	+ return;
	8083	+ }
	8084	+
	8085	+ String bump = Object3D.GetBump(tex);
	8086	+
	8087	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8088	+ {
	8089	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8090	+ // System.out.println("; bump = " + bump);
	8091	+ }
	8092	+
	8093	+ if (bump.equals(""))
	8094	+ {
	8095	+ bump = null;
	8096	+ }
	8097	+
	8098	+ ReleaseTexture(tex, true);
	8099	+ }
	8100	+
	8101	+ void ReleaseTexture(cTexture tex, boolean bump)
7925	8102	{
7926	8103	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7927	8104	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7932,7 +8109,7 @@
7932	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7933	8110
7934	8111	if (tex != null)
7935		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7936	8113
7937	8114	// //assert( texture != null );
7938	8115	// if (texture == null)
..	..	@@ -8026,6 +8203,54 @@
8026	8203
8027	8204	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8028	8205	{
	8206	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8207	+// ambientOcclusion ) // \|\| !textureon)
	8208	+// {
	8209	+// return; // false;
	8210	+// }
	8211	+//
	8212	+// if (tex == null)
	8213	+// {
	8214	+// BindTexture(null,false,resolution);
	8215	+// BindTexture(null,true,resolution);
	8216	+// return;
	8217	+// }
	8218	+//
	8219	+// String pigment = Object3D.GetPigment(tex);
	8220	+// String bump = Object3D.GetBump(tex);
	8221	+//
	8222	+// usedtextures.add(pigment);
	8223	+// usedtextures.add(bump);
	8224	+//
	8225	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8226	+// {
	8227	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8228	+// // System.out.println("; bump = " + bump);
	8229	+// }
	8230	+//
	8231	+// if (bump.equals(""))
	8232	+// {
	8233	+// bump = null;
	8234	+// }
	8235	+// if (pigment.equals(""))
	8236	+// {
	8237	+// pigment = null;
	8238	+// }
	8239	+//
	8240	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8241	+// BindTexture(pigment, false, resolution);
	8242	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8243	+// BindTexture(bump, true, resolution);
	8244	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8245	+//
	8246	+// return; // true;
	8247	+
	8248	+ BindPigmentTexture(tex, resolution);
	8249	+ BindBumpTexture(tex, resolution);
	8250	+ }
	8251	+
	8252	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8253	+ {
8029	8254	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8030	8255	ambientOcclusion ) // \|\| !textureon)
8031	8256	{
..	..	@@ -8035,17 +8260,47 @@
8035	8260	if (tex == null)
8036	8261	{
8037	8262	BindTexture(null,false,resolution);
8038		- BindTexture(null,true,resolution);
8039	8263	return;
8040	8264	}
8041	8265
8042	8266	String pigment = Object3D.GetPigment(tex);
	8267	+
	8268	+ usedtextures.add(tex);
	8269	+
	8270	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8271	+ {
	8272	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8273	+ // System.out.println("; bump = " + bump);
	8274	+ }
	8275	+
	8276	+ if (pigment.equals(""))
	8277	+ {
	8278	+ pigment = null;
	8279	+ }
	8280	+
	8281	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8282	+ BindTexture(tex, false, resolution);
	8283	+ }
	8284	+
	8285	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8286	+ {
	8287	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8288	+ ambientOcclusion ) // \|\| !textureon)
	8289	+ {
	8290	+ return; // false;
	8291	+ }
	8292	+
	8293	+ if (tex == null)
	8294	+ {
	8295	+ BindTexture(null,true,resolution);
	8296	+ return;
	8297	+ }
	8298	+
8043	8299	String bump = Object3D.GetBump(tex);
8044	8300
8045		- usedtextures.put(pigment, pigment);
8046		- usedtextures.put(bump, bump);
	8301	+ usedtextures.add(tex);
8047	8302
8048		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8303	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8049	8304	{
8050	8305	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8051	8306	// System.out.println("; bump = " + bump);
..	..	@@ -8055,18 +8310,10 @@
8055	8310	{
8056	8311	bump = null;
8057	8312	}
8058		- if (pigment.equals(""))
8059		- {
8060		- pigment = null;
8061		- }
8062	8313
8063		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8064		- BindTexture(pigment, false, resolution);
8065	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8066		- BindTexture(bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
8067	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8068		-
8069		- return; // true;
8070	8317	}
8071	8318
8072	8319	java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
..	..	@@ -8089,13 +8336,19 @@
8089	8336	return fileExists;
8090	8337	}
8091	8338
8092		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8339	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8093	8340	{
8094		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8341	+ CacheTexture texturecache = null;
8095	8342
8096	8343	if (tex != null)
8097	8344	{
8098		- String texname = tex;
	8345	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8346	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8347	+
	8348	+ if (texname.equals("") && texdata == null)
	8349	+ {
	8350	+ return null;
	8351	+ }
8099	8352
8100	8353	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8101	8354
..	..	@@ -8105,19 +8358,46 @@
8105	8358	// else
8106	8359	// if (!texname.startsWith("/"))
8107	8360	// texname = "/Users/nbriere/Textures/" + texname;
8108		- if (!FileExists(tex))
	8361	+ if (!FileExists(texname) && !texname.startsWith("@"))
8109	8362	{
8110	8363	texname = fallbackTextureName;
8111	8364	}
8112	8365
8113	8366	if (CACHETEXTURE)
8114		- texture = textures.get(texname); // TEXTURE CACHE
8115		-
8116		- TextureData texturedata = null;
8117		-
8118		- if (texture == null \|\| texture.resolution < resolution)
8119	8367	{
8120		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8368	+ if (texdata == null)
	8369	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8370	+ else
	8371	+ texturecache = bimtextures.get(texdata);
	8372	+ }
	8373	+
	8374	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8375	+ {
	8376	+ TextureData texturedata = null;
	8377	+
	8378	+ if (texdata != null && textureon)
	8379	+ {
	8380	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8381	+
	8382	+ try
	8383	+ {
	8384	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8385	+ }
	8386	+ catch (Exception e)
	8387	+ {
	8388	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8389	+ }
	8390	+
	8391	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8392	+ bimtextures.put(texdata, texturecache);
	8393	+
	8394	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8395	+
	8396	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8397	+ //bim2 = bim;
	8398	+ }
	8399	+ else
	8400	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8121	8401	{
8122	8402	assert(!bump);
8123	8403	// if (bump)
..	..	@@ -8128,19 +8408,23 @@
8128	8408	// }
8129	8409	// else
8130	8410	// {
8131		- texture = textures.get(tex);
8132		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
8133	8413	{
8134		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8135	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
8136	8418	// }
8137	8419	} else
8138		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8139	8421	{
8140	8422	assert(bump);
8141		- texture = textures.get(tex);
8142		- if (texture == null)
8143		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8423	+ // texturecache = textures.get(texname); // suspicious
	8424	+ if (texturecache == null)
	8425	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ else
	8427	+ new Exception().printStackTrace();
8144	8428	} else
8145	8429	{
8146	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -8148,11 +8432,22 @@
8148	8432	// texture = GetResourceTexture("default.png");
8149	8433	//} else
8150	8434	//{
8151		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
8152	8436	{
8153		- texture = textures.get(tex);
8154		- if (texture == null)
8155		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8437	+ // texturecache = textures.get(texname); // suspicious
	8438	+ if (texturecache == null)
	8439	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ else
	8441	+ new Exception().printStackTrace();
	8442	+ } else
	8443	+ {
	8444	+ if (texname.startsWith("@"))
	8445	+ {
	8446	+ // texturecache = textures.get(texname); // suspicious
	8447	+ if (texturecache == null)
	8448	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8449	+ else
	8450	+ new Exception().printStackTrace();
8156	8451	} else
8157	8452	{
8158	8453	if (textureon)
..	..	@@ -8211,19 +8506,20 @@
8211	8506	if (texturedata == null)
8212	8507	throw new Exception();
8213	8508
8214		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8509	+ texturecache = new CacheTexture(texturedata,resolution);
8215	8510	//texture = GetTexture(tex, bump);
8216	8511	}
	8512	+ }
8217	8513	}
8218	8514	//}
8219	8515	}
8220	8516
8221		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8517	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8222	8518	{
8223	8519	//return false;
8224	8520
8225	8521	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8226		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8522	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8227	8523	{
8228	8524	// String ext = "_highres";
8229	8525	// if (REDUCETEXTURE)
..	..	@@ -8240,52 +8536,17 @@
8240	8536	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8241	8537	if (!cachefile.exists())
8242	8538	{
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))
	8539	+ //if (texturedata.getWidth() == texturedata.getHeight())
8252	8540	{
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);
	8541	+ BufferedImage rendImage = CreateBim(texturedata);
	8542	+
8283	8543	ImageWriter writer = null;
8284	8544	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8285	8545	if (iter.hasNext()) {
8286	8546	writer = (ImageWriter)iter.next();
8287	8547	}
8288		- float compressionQuality = 0.9f;
	8548	+
	8549	+ float compressionQuality = 0.85f;
8289	8550	try
8290	8551	{
8291	8552	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8302,18 +8563,20 @@
8302	8563	}
8303	8564	}
8304	8565	}
8305		-
	8566	+
	8567	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8568	+
8306	8569	//System.out.println("Texture = " + tex);
8307		- if (textures.containsKey(texname))
	8570	+ if (textures.containsKey(tex))
8308	8571	{
8309		- CacheTexture thetex = textures.get(texname);
	8572	+ CacheTexture thetex = textures.get(tex);
8310	8573	thetex.texture.disable();
8311	8574	thetex.texture.dispose();
8312		- textures.remove(texname);
	8575	+ textures.remove(tex);
8313	8576	}
8314	8577
8315		- texture.texturedata = texturedata;
8316		- textures.put(texname, texture);
	8578	+ //texture.texturedata = texturedata;
	8579	+ textures.put(tex, texturecache);
8317	8580
8318	8581	// newtex = true;
8319	8582	}
..	..	@@ -8329,10 +8592,44 @@
8329	8592	}
8330	8593	}
8331	8594
8332		- return texture;
	8595	+ return texturecache;
8333	8596	}
8334	8597
8335		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8598	+ static void EmbedTextures(cTexture tex)
	8599	+ {
	8600	+ if (tex.pigmentdata == null)
	8601	+ {
	8602	+ //String texname = Object3D.GetPigment(tex);
	8603	+
	8604	+ CacheTexture texturecache = texturepigment.get(tex);
	8605	+
	8606	+ if (texturecache != null)
	8607	+ {
	8608	+ tex.pw = texturecache.texturedata.getWidth();
	8609	+ tex.ph = texturecache.texturedata.getHeight();
	8610	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8611	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8612	+ ;
	8613	+ //, tex.pw, tex.ph), 0.5f);
	8614	+ }
	8615	+ }
	8616	+
	8617	+ if (tex.bumpdata == null)
	8618	+ {
	8619	+ //String texname = Object3D.GetBump(tex);
	8620	+
	8621	+ CacheTexture texturecache = texturebump.get(tex);
	8622	+
	8623	+ if (texturecache != null)
	8624	+ {
	8625	+ tex.bw = texturecache.texturedata.getWidth();
	8626	+ tex.bh = texturecache.texturedata.getHeight();
	8627	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8628	+ }
	8629	+ }
	8630	+ }
	8631	+
	8632	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8336	8633	{
8337	8634	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8338	8635
..	..	@@ -8350,21 +8647,21 @@
8350	8647	return texture!=null?texture.texture:null;
8351	8648	}
8352	8649
8353		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8650	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8354	8651	{
8355	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8356	8653
8357	8654	return texture!=null?texture.texturedata:null;
8358	8655	}
8359	8656
8360		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8657	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8361	8658	{
8362	8659	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8363	8660	{
8364	8661	return false;
8365	8662	}
8366	8663
8367		- boolean newtex = false;
	8664	+ //boolean newtex = false;
8368	8665
8369	8666	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8370	8667
..	..	@@ -8396,9 +8693,75 @@
8396	8693	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8397	8694	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8398	8695
8399		- return newtex;
	8696	+ return true; // Warning: not used.
8400	8697	}
8401	8698
	8699	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8700	+ {
	8701	+ try
	8702	+ {
	8703	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8704	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8705	+ ImageWriter writer = writers.next();
	8706	+
	8707	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8708	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8709	+ param.setCompressionQuality(quality);
	8710	+
	8711	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8712	+ writer.setOutput(ios);
	8713	+ writer.write(null, new IIOImage(image, null, null), param);
	8714	+
	8715	+ byte[] data = baos.toByteArray();
	8716	+ writer.dispose();
	8717	+ return data;
	8718	+ }
	8719	+ catch (Exception e)
	8720	+ {
	8721	+ e.printStackTrace();
	8722	+ return null;
	8723	+ }
	8724	+ }
	8725	+
	8726	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8727	+ {
	8728	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8729	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8730	+ ImageReader reader = writers.next();
	8731	+
	8732	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8733	+
	8734	+ ImageReadParam param = reader.getDefaultReadParam();
	8735	+ param.setDestination(bim);
	8736	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8737	+
	8738	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8739	+ reader.setInput(ios);
	8740	+ BufferedImage bim2 = reader.read(0, param);
	8741	+ reader.dispose();
	8742	+
	8743	+// WritableRaster raster = bim2.getRaster();
	8744	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8745	+// byte[] bytes = data.getData();
	8746	+//
	8747	+// int[] pixels = new int[bytes.length/3];
	8748	+// for (int i=pixels.length; --i>=0;)
	8749	+// {
	8750	+// int i3 = i*3;
	8751	+// pixels[i] = 0xFF;
	8752	+// pixels[i] <<= 8;
	8753	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8754	+// pixels[i] <<= 8;
	8755	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8756	+// pixels[i] <<= 8;
	8757	+// pixels[i] \|= bytes[i3] & 0xFF;
	8758	+// }
	8759	+//
	8760	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8761	+
	8762	+ return bim;
	8763	+ }
	8764	+
8402	8765	ShadowBuffer shadowPBuf;
8403	8766	AntialiasBuffer antialiasPBuf;
8404	8767	int MAXSTACK;
..	..	@@ -8415,10 +8778,12 @@
8415	8778
8416	8779	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8417	8780	MAXSTACK = temp[0];
8418		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8781	+ if (Globals.DEBUG)
	8782	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8419	8783	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8420	8784	MAXSTACK = temp[0];
8421		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8785	+ if (Globals.DEBUG)
	8786	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8422	8787
8423	8788	// Use debug pipeline
8424	8789	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8426,7 +8791,8 @@
8426	8791	gl = drawable.getGL(); //
8427	8792
8428	8793	GL gl3 = getGL();
8429		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8794	+ if (Globals.DEBUG)
	8795	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8430	8796
8431	8797
8432	8798	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8591,7 +8957,7 @@
8591	8957
8592	8958	if (cubemap == null)
8593	8959	{
8594		- LoadEnvy(5);
	8960	+ //LoadEnvy(1);
8595	8961	}
8596	8962
8597	8963	//cubemap.enable();
..	..	@@ -8878,37 +9244,58 @@
8878	9244	cubemap = null;
8879	9245	return;
8880	9246	case 1:
8881		- name = "cubemaps/box_";
8882		- ext = "png";
	9247	+ name = "cubemaps/rgb/";
	9248	+ ext = "jpg";
8883	9249	reverseUP = false;
8884	9250	break;
8885	9251	case 2:
8886		- name = "cubemaps/uffizi_";
8887		- ext = "png";
8888		- break; // reverseUP = true; break;
	9252	+ name = "cubemaps/uffizi/";
	9253	+ ext = "jpg";
	9254	+ reverseUP = false;
	9255	+ break;
8889	9256	case 3:
8890		- name = "cubemaps/CloudyHills_";
8891		- ext = "tga";
	9257	+ name = "cubemaps/CloudyHills/";
	9258	+ ext = "jpg";
8892	9259	reverseUP = false;
8893	9260	break;
8894	9261	case 4:
8895		- name = "cubemaps/cornell_";
	9262	+ name = "cubemaps/cornell/";
8896	9263	ext = "png";
8897	9264	reverseUP = false;
8898	9265	break;
	9266	+ case 5:
	9267	+ name = "cubemaps/skycube/";
	9268	+ ext = "jpg";
	9269	+ reverseUP = false;
	9270	+ break;
	9271	+ case 6:
	9272	+ name = "cubemaps/SaintLazarusChurch3/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
	9276	+ case 7:
	9277	+ name = "cubemaps/Sodermalmsallen/";
	9278	+ ext = "jpg";
	9279	+ reverseUP = false;
	9280	+ break;
	9281	+ case 8:
	9282	+ name = "cubemaps/Sodermalmsallen2/";
	9283	+ ext = "jpg";
	9284	+ reverseUP = false;
	9285	+ break;
	9286	+ case 9:
	9287	+ name = "cubemaps/UnionSquare/";
	9288	+ ext = "jpg";
	9289	+ reverseUP = false;
	9290	+ break;
8899	9291	default:
8900		- name = "cubemaps/rgb_";
8901		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9292	+ name = "cubemaps/box/";
	9293	+ ext = "png"; /mipmap = true;/
	9294	+ reverseUP = false;
8902	9295	break;
8903	9296	}
8904		-
8905		- try
8906		- {
8907		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8908		- } catch (IOException e)
8909		- {
8910		- throw new RuntimeException(e);
8911		- }
	9297	+
	9298	+ LoadSkybox(name, ext, mipmap);
8912	9299	}
8913	9300
8914	9301	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8940,8 +9327,12 @@
8940	9327	static double[] model = new double[16];
8941	9328	double[] camera2light = new double[16];
8942	9329	double[] light2camera = new double[16];
8943		- int newenvy = -1;
8944		- boolean envyoff = true; // false;
	9330	+
	9331	+ //int newenvy = -1;
	9332	+ //boolean envyoff = false;
	9333	+
	9334	+ String loadedskyboxname;
	9335	+
8945	9336	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8946	9337	//float[] light0 = { 0,0,0 };
8947	9338	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9234,11 +9625,35 @@
9234	9625	jy8[3] = 0.5f;
9235	9626	}
9236	9627
9237		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9628	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9238	9629	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9239	9630	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9240	9631	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9241	9632
	9633	+ void ResetOptions()
	9634	+ {
	9635	+ options1[0] = 100;
	9636	+ options1[1] = 0.025f;
	9637	+ options1[2] = 0.01f;
	9638	+ options1[3] = 0;
	9639	+ options1[4] = 0;
	9640	+
	9641	+ options2[0] = 0;
	9642	+ options2[1] = 0.75f;
	9643	+ options2[2] = 0;
	9644	+ options2[3] = 0;
	9645	+
	9646	+ options3[0] = 1;
	9647	+ options3[1] = 1;
	9648	+ options3[2] = 1;
	9649	+ options3[3] = 0;
	9650	+
	9651	+ options4[0] = 1;
	9652	+ options4[1] = 0;
	9653	+ options4[2] = 1;
	9654	+ options4[3] = 0;
	9655	+ }
	9656	+
9242	9657	static int imagecount = 0; // movie generation
9243	9658
9244	9659	static int jitter = 0;
..	..	@@ -9335,7 +9750,7 @@
9335	9750
9336	9751	if (renderCamera != lightCamera)
9337	9752	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9338		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9753	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9339	9754
9340	9755	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9341	9756
..	..	@@ -9351,7 +9766,7 @@
9351	9766
9352	9767	if (renderCamera != lightCamera)
9353	9768	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9354		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9769	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9355	9770
9356	9771	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9357	9772
..	..	@@ -9397,10 +9812,12 @@
9397	9812	rati = 1 / rati;
9398	9813	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9399	9814	}
9400		- assert (newenvy == -1);
	9815	+
	9816	+ //assert (newenvy == -1);
	9817	+
9401	9818	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9402	9819	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9403		- DrawSkyBox(gl);
	9820	+ DrawSkyBox(gl, (float)rati);
9404	9821	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9405	9822	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9406	9823	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10349,6 +10766,7 @@
10349	10766	ANTIALIAS = 0;
10350	10767	//System.out.println("RESTART");
10351	10768	AAtimer.restart();
	10769	+ Globals.TIMERRUNNING = true;
10352	10770	}
10353	10771	}
10354	10772	}
..	..	@@ -10416,7 +10834,8 @@
10416	10834	ambientOcclusion = false;
10417	10835	}
10418	10836
10419		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10837	+ if (//Globals.lighttouched &&
	10838	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10420	10839	{
10421	10840	//if (RENDERSHADOW) // ?
10422	10841	if (!IsFrozen())
..	..	@@ -10435,7 +10854,7 @@
10435	10854
10436	10855	if (wait)
10437	10856	{
10438		- Sleep(500);
	10857	+ Sleep(200); // blocks everything
10439	10858
10440	10859	wait = false;
10441	10860	}
..	..	@@ -10550,7 +10969,7 @@
10550	10969	// if (parentcam != renderCamera) // not a light
10551	10970	if (cam != lightCamera)
10552	10971	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10553		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10972	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10554	10973
10555	10974	for (int j = 0; j < 4; j++)
10556	10975	{
..	..	@@ -10565,7 +10984,7 @@
10565	10984	// if (parentcam != renderCamera) // not a light
10566	10985	if (cam != lightCamera)
10567	10986	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10568		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10987	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10569	10988
10570	10989	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10571	10990
..	..	@@ -10651,13 +11070,27 @@
10651	11070	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10652	11071	}
10653	11072
10654		- if (newenvy > -1)
	11073	+// if (newenvy > -1)
	11074	+// {
	11075	+// LoadEnvy(newenvy);
	11076	+// }
	11077	+//
	11078	+// newenvy = -1;
	11079	+
	11080	+ if (object.skyboxname != null)
10655	11081	{
10656		- LoadEnvy(newenvy);
	11082	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11083	+ {
	11084	+ LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11085	+ loadedskyboxname = object.skyboxname;
	11086	+ }
10657	11087	}
10658		-
10659		- newenvy = -1;
10660		-
	11088	+ else
	11089	+ {
	11090	+ cubemap = null;
	11091	+ loadedskyboxname = null;
	11092	+ }
	11093	+
10661	11094	ratio = ((double) getWidth()) / getHeight();
10662	11095	//System.out.println("ratio = " + ratio);
10663	11096
..	..	@@ -10673,7 +11106,7 @@
10673	11106
10674	11107	if (!IsFrozen() && !ambientOcclusion)
10675	11108	{
10676		- DrawSkyBox(gl);
	11109	+ DrawSkyBox(gl, (float)ratio);
10677	11110	}
10678	11111
10679	11112	//if (selection_view == -1)
..	..	@@ -10856,9 +11289,9 @@
10856	11289
10857	11290	gl.glMatrixMode(GL.GL_MODELVIEW);
10858	11291
10859		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10860		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10861		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11292	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11293	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11294	+gl.glEnable(gl.GL_MULTISAMPLE);
10862	11295	} else
10863	11296	{
10864	11297	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10869,7 +11302,7 @@
10869	11302	//System.out.println("BLENDING ON");
10870	11303	gl.glEnable(GL.GL_BLEND);
10871	11304	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10872		-
	11305	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10873	11306	gl.glMatrixMode(gl.GL_PROJECTION);
10874	11307	gl.glLoadIdentity();
10875	11308
..	..	@@ -10959,7 +11392,7 @@
10959	11392
10960	11393	// if (cam != lightCamera)
10961	11394	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10962		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11395	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10963	11396	}
10964	11397
10965	11398	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11118,7 +11551,7 @@
11118	11551	}
11119	11552	}
11120	11553
11121		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11554	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11122	11555	{
11123	11556	//gl.glDepthFunc(GL.GL_LEQUAL);
11124	11557	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11126,24 +11559,21 @@
11126	11559
11127	11560	boolean texon = textureon;
11128	11561
11129		- if (RENDERPROGRAM > 0)
11130		- {
11131		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11132		- textureon = false;
11133		- }
	11562	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11563	+ textureon = false;
	11564	+
11134	11565	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11135	11566	//System.out.println("ALLO");
11136	11567	gl.glColorMask(false, false, false, false);
11137	11568	DrawObject(gl);
11138		- if (RENDERPROGRAM > 0)
11139		- {
11140		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11141		- textureon = texon;
11142		- }
	11569	+
	11570	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11571	+ textureon = texon;
	11572	+
11143	11573	gl.glColorMask(true, true, true, true);
11144	11574
11145	11575	gl.glDepthFunc(GL.GL_EQUAL);
11146		- //gl.glDepthMask(false);
	11576	+ gl.glDepthMask(false);
11147	11577	}
11148	11578
11149	11579	if (false) // DrawMode() == SHADOW)
..	..	@@ -11326,15 +11756,36 @@
11326	11756
11327	11757	static boolean zoomonce = false;
11328	11758
	11759	+ static void CreateSelectedPoint()
	11760	+ {
	11761	+ if (selectedpoint == null)
	11762	+ {
	11763	+ debugpointG = new Sphere();
	11764	+ debugpointP = new Sphere();
	11765	+ debugpointC = new Sphere();
	11766	+ debugpointR = new Sphere();
	11767	+
	11768	+ selectedpoint = new Superellipsoid();
	11769	+
	11770	+ for (int i=0; i<8; i++)
	11771	+ {
	11772	+ debugpoints[i] = new Sphere();
	11773	+ }
	11774	+ }
	11775	+ }
	11776	+
11329	11777	void DrawObject(GL gl, boolean draw)
11330	11778	{
	11779	+ // To clear camera values
	11780	+ ResetOptions();
	11781	+
11331	11782	//System.out.println("DRAW OBJECT " + mouseDown);
11332	11783	// DrawMode() = SELECTION;
11333	11784	//GL gl = getGL();
11334	11785	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11335	11786	{
11336	11787	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11337		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11788	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11338	11789	pingthread.StepToTarget(true); // true);
11339	11790	// zoomonce = false;
11340	11791	}
..	..	@@ -11406,8 +11857,9 @@
11406	11857
11407	11858	if (DrawMode() == DEFAULT)
11408	11859	{
11409		- if (DEBUG)
	11860	+ if (Globals.DEBUG)
11410	11861	{
	11862	+ CreateSelectedPoint();
11411	11863	float radius = 0.05f;
11412	11864	if (selectedpoint.radius != radius)
11413	11865	{
..	..	@@ -11461,20 +11913,32 @@
11461	11913	ReleaseTextures(DEFAULT_TEXTURES);
11462	11914
11463	11915	if (CLEANCACHE)
11464		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11916	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11465	11917	{
11466		- String tex = e.nextElement();
	11918	+ cTexture tex = e.nextElement();
11467	11919
11468	11920	// System.out.println("Texture --------- " + tex);
11469	11921
11470		- if (tex.equals("WHITE_NOISE"))
	11922	+ if (tex.equals("WHITE_NOISE:"))
11471	11923	continue;
11472	11924
11473		- if (!usedtextures.containsKey(tex))
	11925	+ if (!usedtextures.contains(tex))
11474	11926	{
	11927	+ CacheTexture gettex = texturepigment.get(tex);
11475	11928	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11476		- textures.get(tex).texture.dispose();
11477		- textures.remove(tex);
	11929	+ if (gettex != null)
	11930	+ {
	11931	+ gettex.texture.dispose();
	11932	+ texturepigment.remove(tex);
	11933	+ }
	11934	+
	11935	+ gettex = texturebump.get(tex);
	11936	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11937	+ if (gettex != null)
	11938	+ {
	11939	+ gettex.texture.dispose();
	11940	+ texturebump.remove(tex);
	11941	+ }
11478	11942	}
11479	11943	}
11480	11944	}
..	..	@@ -11894,7 +12358,7 @@
11894	12358	for (int i = tp.size(); --i >= 0;)
11895	12359	{
11896	12360	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11897		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12361	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11898	12362	}
11899	12363
11900	12364
..	..	@@ -12002,8 +12466,76 @@
12002	12466
12003	12467	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12004	12468
12005		- String program =
	12469	+ String programmin =
	12470	+ // Min shader
12006	12471	"!!ARBfp1.0\n" +
	12472	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12473	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12474	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12475	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12476	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12477	+ "PARAM light2cam0 = program.env[10];" +
	12478	+ "PARAM light2cam1 = program.env[11];" +
	12479	+ "PARAM light2cam2 = program.env[12];" +
	12480	+ "TEMP temp;" +
	12481	+ "TEMP light;" +
	12482	+ "TEMP ndotl;" +
	12483	+ "TEMP normal;" +
	12484	+ "TEMP depth;" +
	12485	+ "TEMP eye;" +
	12486	+ "TEMP pos;" +
	12487	+
	12488	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12489	+ Normalize("normal") +
	12490	+ "MOV light, state.light[0].position;" +
	12491	+ "DP3 ndotl.x, light, normal;" +
	12492	+
	12493	+ // shadow
	12494	+ "MOV pos, fragment.texcoord[1];" +
	12495	+ "MOV temp, pos;" +
	12496	+ ShadowTextureFetch("depth", "temp", "1") +
	12497	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12498	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12499	+
	12500	+ // No shadow when out of frustum
	12501	+ //"SGE temp.y, depth.z, zero123.y;" +
	12502	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12503	+
	12504	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12505	+
	12506	+ // Backlit
	12507	+ "MOV pos.w, zero123.y;" +
	12508	+ "DP4 eye.x, pos, light2cam0;" +
	12509	+ "DP4 eye.y, pos, light2cam1;" +
	12510	+ "DP4 eye.z, pos, light2cam2;" +
	12511	+ Normalize("eye") +
	12512	+
	12513	+ "DP3 ndotl.y, -eye, normal;" +
	12514	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12515	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12516	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12517	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12518	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12519	+
	12520	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12521	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12522	+
	12523	+ // Pigment
	12524	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12525	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12526	+ "MUL temp, temp, ndotl.x;" +
	12527	+
	12528	+ "MUL temp, temp, zero123.z;" +
	12529	+
	12530	+ //"MUL temp, temp, ndotl.y;" +
	12531	+
	12532	+ "MOV temp.w, zero123.y;" + // reset alpha
	12533	+ "MOV result.color, temp;" +
	12534	+ "END";
	12535	+
	12536	+ String programmax =
	12537	+ "!!ARBfp1.0\n" +
	12538	+
12007	12539	//"OPTION ARB_fragment_program_shadow;" +
12008	12540	"PARAM light2cam0 = program.env[10];" +
12009	12541	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12118,8 +12650,7 @@
12118	12650	"TEMP shininess;" +
12119	12651	"\n" +
12120	12652	"MOV texSamp, one;" +
12121		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12122		-
	12653	+
12123	12654	"MOV mapgrid.x, one2048th.x;" +
12124	12655	"MOV temp, fragment.texcoord[1];" +
12125	12656	/*
..	..	@@ -12140,20 +12671,20 @@
12140	12671	"MUL temp, floor, mapgrid.x;" +
12141	12672	//"TEX depth0, temp, texture[1], 2D;" +
12142	12673	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12143		- TextureFetch("depth0", "temp", "1") +
	12674	+ ShadowTextureFetch("depth0", "temp", "1") +
12144	12675	"") +
12145	12676	"ADD temp.x, temp.x, mapgrid.x;" +
12146	12677	//"TEX depth1, temp, texture[1], 2D;" +
12147	12678	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12148		- TextureFetch("depth1", "temp", "1") +
	12679	+ ShadowTextureFetch("depth1", "temp", "1") +
12149	12680	"") +
12150	12681	"ADD temp.y, temp.y, mapgrid.x;" +
12151	12682	//"TEX depth2, temp, texture[1], 2D;" +
12152		- TextureFetch("depth2", "temp", "1") +
	12683	+ ShadowTextureFetch("depth2", "temp", "1") +
12153	12684	"SUB temp.x, temp.x, mapgrid.x;" +
12154	12685	//"TEX depth3, temp, texture[1], 2D;" +
12155	12686	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12156		- TextureFetch("depth3", "temp", "1") +
	12687	+ ShadowTextureFetch("depth3", "temp", "1") +
12157	12688	"") +
12158	12689	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12159	12690	//"MOV params, material;" +
..	..	@@ -12524,10 +13055,10 @@
12524	13055	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12525	13056	"") +
12526	13057
12527		- // display shadow only (bump == 0)
	13058	+ // display shadow only (fakedepth == 0)
12528	13059	"SUB temp.x, half.x, shadow.x;" +
12529	13060	"MOV temp.y, -params5.z;" + // params6.x;" +
12530		- "SLT temp.z, temp.y, -one2048th.x;" +
	13061	+ "SLT temp.z, temp.y, -c256i.x;" +
12531	13062	"SUB temp.y, one.x, temp.z;" +
12532	13063	"MUL temp.x, temp.x, temp.y;" +
12533	13064	"KIL temp.x;" +
..	..	@@ -12858,6 +13389,13 @@
12858	13389	//once = true;
12859	13390	}
12860	13391
	13392	+ String program = programmax;
	13393	+
	13394	+ if (Globals.MINSHADER)
	13395	+ {
	13396	+ program = programmin;
	13397	+ }
	13398	+
12861	13399	System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12862	13400	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12863	13401	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
..	..	@@ -12951,25 +13489,26 @@
12951	13489	return out;
12952	13490	}
12953	13491
12954		- String TextureFetch(String dest, String src, String unit)
	13492	+ // Also does frustum culling
	13493	+ String ShadowTextureFetch(String dest, String src, String unit)
12955	13494	{
12956	13495	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12957	13496	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12958	13497	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13498	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13499	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12959	13500	"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;" +
	13501	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13502	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12964	13503	//"SWZ buffer, temp, w,w,w,w;";
12965		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13504	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12966	13505	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12967	13506	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12968	13507	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12969		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13508	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12970	13509
12971		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12972		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13510	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13511	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12973	13512	}
12974	13513
12975	13514	String Shadow(String depth, String shadow)
..	..	@@ -13016,7 +13555,7 @@
13016	13555	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13017	13556	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13018	13557
13019		- // No shadow when out of frustrum
	13558	+ // No shadow when out of frustum
13020	13559	"SGE temp.x, " + depth + ".z, one.z;" +
13021	13560	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13022	13561	"";
..	..	@@ -13164,7 +13703,8 @@
13164	13703	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13165	13704	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13166	13705	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13167		- Object3D.cVector2[] vector2buffer;
	13706	+
	13707	+ //Object3D.cVector2[] vector2buffer;
13168	13708
13169	13709	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13170	13710	// OUT : diff, spec
..	..	@@ -13180,9 +13720,10 @@
13180	13720	"DP3 " + dest + ".z," + "normals," + "eye;" +
13181	13721	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13182	13722	//"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;" +
	13723	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13724	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13725	+
	13726	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13186	13727	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13187	13728	"RCP " + dest + ".w," + dest + ".w;" +
13188	13729	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13687,6 +14228,7 @@
13687	14228	else
13688	14229	if (evt.getSource() == AAtimer)
13689	14230	{
	14231	+ Globals.TIMERRUNNING = false;
13690	14232	if (mouseDown)
13691	14233	{
13692	14234	//new Exception().printStackTrace();
..	..	@@ -13746,7 +14288,7 @@
13746	14288
13747	14289	// fev 2014???
13748	14290	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13749		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14291	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13750	14292	pingthread.StepToTarget(true); // true);
13751	14293	}
13752	14294	// if (!LIVE)
..	..	@@ -13761,6 +14303,7 @@
13761	14303	return;
13762	14304
13763	14305	AAtimer.restart(); //
	14306	+ Globals.TIMERRUNNING = true;
13764	14307
13765	14308	// waslive = LIVE;
13766	14309	// LIVE = false;
..	..	@@ -13810,14 +14353,15 @@
13810	14353	drag = false;
13811	14354	//System.out.println("Mouse DOWN");
13812	14355	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);
	14356	+ //ClickInfo info = new ClickInfo();
	14357	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14358	+ object.clickInfo.pane = this;
	14359	+ object.clickInfo.camera = renderCamera;
	14360	+ object.clickInfo.x = x;
	14361	+ object.clickInfo.y = y;
	14362	+ object.clickInfo.modifiers = modifiersex;
	14363	+ editObj = object.doEditClick(//info,
	14364	+ 0);
13821	14365	if (!editObj)
13822	14366	{
13823	14367	hasMarquee = true;
..	..	@@ -14099,12 +14643,12 @@
14099	14643	void GoDown(int mod)
14100	14644	{
14101	14645	MODIFIERS \|= COMMAND;
14102		- /*
	14646	+ /**/
14103	14647	if((mod&SHIFT) == SHIFT)
14104		- manipCamera.RotatePosition(0, -speed);
	14648	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14105	14649	else
14106		- manipCamera.BackForth(0, -speed*delta, getWidth());
14107		- */
	14650	+ manipCamera.RotatePosition(0, -speed);
	14651	+ /**/
14108	14652	if ((mod & SHIFT) == SHIFT)
14109	14653	{
14110	14654	mouseMode = mouseMode; // VR??
..	..	@@ -14120,12 +14664,12 @@
14120	14664	void GoUp(int mod)
14121	14665	{
14122	14666	MODIFIERS \|= COMMAND;
14123		- /*
	14667	+ /**/
14124	14668	if((mod&SHIFT) == SHIFT)
14125		- manipCamera.RotatePosition(0, speed);
	14669	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14126	14670	else
14127		- manipCamera.BackForth(0, speed*delta, getWidth());
14128		- */
	14671	+ manipCamera.RotatePosition(0, speed);
	14672	+ /**/
14129	14673	if ((mod & SHIFT) == SHIFT)
14130	14674	{
14131	14675	mouseMode = mouseMode;
..	..	@@ -14141,12 +14685,12 @@
14141	14685	void GoLeft(int mod)
14142	14686	{
14143	14687	MODIFIERS \|= COMMAND;
14144		- /*
	14688	+ /**/
14145	14689	if((mod&SHIFT) == SHIFT)
14146		- manipCamera.RotatePosition(speed, 0);
14147		- else
14148	14690	manipCamera.Translate(speed*delta, 0, getWidth());
14149		- */
	14691	+ else
	14692	+ manipCamera.RotatePosition(speed, 0);
	14693	+ /**/
14150	14694	if ((mod & SHIFT) == SHIFT)
14151	14695	{
14152	14696	mouseMode = mouseMode;
..	..	@@ -14162,12 +14706,12 @@
14162	14706	void GoRight(int mod)
14163	14707	{
14164	14708	MODIFIERS \|= COMMAND;
14165		- /*
	14709	+ /**/
14166	14710	if((mod&SHIFT) == SHIFT)
14167		- manipCamera.RotatePosition(-speed, 0);
14168		- else
14169	14711	manipCamera.Translate(-speed*delta, 0, getWidth());
14170		- */
	14712	+ else
	14713	+ manipCamera.RotatePosition(-speed, 0);
	14714	+ /**/
14171	14715	if ((mod & SHIFT) == SHIFT)
14172	14716	{
14173	14717	mouseMode = mouseMode;
..	..	@@ -14217,14 +14761,16 @@
14217	14761	if (editObj)
14218	14762	{
14219	14763	drag = true;
14220		- ClickInfo info = new ClickInfo();
14221		- info.bounds.setBounds(0, 0,
	14764	+ //ClickInfo info = new ClickInfo();
	14765	+ object.clickInfo.bounds.setBounds(0, 0,
14222	14766	(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);
	14767	+ object.clickInfo.pane = this;
	14768	+ object.clickInfo.camera = renderCamera;
	14769	+ object.clickInfo.x = x;
	14770	+ object.clickInfo.y = y;
	14771	+ object //.GetWindow().copy
	14772	+ .doEditDrag(//info,
	14773	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14228	14774	} else
14229	14775	{
14230	14776	if (x < startX)
..	..	@@ -14373,22 +14919,27 @@
14373	14919	}
14374	14920	}
14375	14921
	14922	+// ClickInfo clickInfo = new ClickInfo();
	14923	+
14376	14924	public void mouseMoved(MouseEvent e)
14377	14925	{
14378	14926	//System.out.println("mouseMoved: " + e);
14379	14927	if (isRenderer)
14380	14928	return;
14381	14929
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;
	14930	+ // Mouse cursor feedback
	14931	+ object.clickInfo.x = e.getX();
	14932	+ object.clickInfo.y = e.getY();
	14933	+ object.clickInfo.modifiers = e.getModifiersEx();
	14934	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14935	+ object.clickInfo.pane = this;
	14936	+ object.clickInfo.camera = renderCamera;
14389	14937	if (!isRenderer)
14390	14938	{
14391		- if (object.editWindow.copy.doEditClick(ci, 0))
	14939	+ //ObjEditor editWindow = object.editWindow;
	14940	+ //Object3D copy = editWindow.copy;
	14941	+ if (object.doEditClick(//clickInfo,
	14942	+ 0))
14392	14943	{
14393	14944	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14394	14945	} else
..	..	@@ -14403,7 +14954,8 @@
14403	14954	Globals.MOUSEDRAGGED = false;
14404	14955
14405	14956	movingcamera = false;
14406		- X = Y = 0;
	14957	+ X = 0; // getBounds().width/2;
	14958	+ Y = 0; // getBounds().height/2;
14407	14959	//System.out.println("mouseReleased: " + e);
14408	14960	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14409	14961	}
..	..	@@ -14659,7 +15211,8 @@
14659	15211	// break;
14660	15212	case 'T':
14661	15213	CACHETEXTURE ^= true;
14662		- textures.clear();
	15214	+ texturepigment.clear();
	15215	+ texturebump.clear();
14663	15216	// repaint();
14664	15217	break;
14665	15218	case 'Y':
..	..	@@ -14744,7 +15297,9 @@
14744	15297	case 'E' : COMPACT ^= true;
14745	15298	repaint();
14746	15299	break;
14747		- case 'W' : DEBUGHSB ^= true;
	15300	+ case 'W' : // Wide Window (fullscreen)
	15301	+ //DEBUGHSB ^= true;
	15302	+ ObjEditor.theFrame.ToggleFullScreen();
14748	15303	repaint();
14749	15304	break;
14750	15305	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14769,8 +15324,8 @@
14769	15324	RevertCamera();
14770	15325	repaint();
14771	15326	break;
14772		- case 'L':
14773	15327	case 'l':
	15328	+ //case 'L':
14774	15329	if (lightMode)
14775	15330	{
14776	15331	lightMode = false;
..	..	@@ -14834,20 +15389,24 @@
14834	15389	OCCLUSION_CULLING ^= true;
14835	15390	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14836	15391	break;
14837		- case '0': envyoff ^= true; repaint(); break;
	15392	+ //case '0': envyoff ^= true; repaint(); break;
14838	15393	case '1':
14839	15394	case '2':
14840	15395	case '3':
14841	15396	case '4':
14842	15397	case '5':
14843		- newenvy = Character.getNumericValue(key);
14844		- repaint();
14845		- break;
14846	15398	case '6':
14847	15399	case '7':
14848	15400	case '8':
14849	15401	case '9':
14850		- BGcolor = (key - '6')/3.f;
	15402	+ if (true) // envyoff)
	15403	+ {
	15404	+ BGcolor = (key - '1')/8.f;
	15405	+ }
	15406	+ else
	15407	+ {
	15408	+ //newenvy = Character.getNumericValue(key);
	15409	+ }
14851	15410	repaint();
14852	15411	break;
14853	15412	case '!':
..	..	@@ -14913,9 +15472,9 @@
14913	15472	case '_':
14914	15473	kompactbit = 5;
14915	15474	break;
14916		- case '+':
14917		- kompactbit = 6;
14918		- break;
	15475	+// case '+':
	15476	+// kompactbit = 6;
	15477	+// break;
14919	15478	case ' ':
14920	15479	lightMode ^= true;
14921	15480	Globals.lighttouched = true;
..	..	@@ -14927,6 +15486,7 @@
14927	15486	case ESC:
14928	15487	RENDERPROGRAM += 1;
14929	15488	RENDERPROGRAM %= 3;
	15489	+
14930	15490	repaint();
14931	15491	break;
14932	15492	case 'Z':
..	..	@@ -14966,8 +15526,9 @@
14966	15526	case DELETE:
14967	15527	ClearSelection();
14968	15528	break;
14969		- /*
14970	15529	case '+':
	15530	+
	15531	+ /*
14971	15532	//fontsize += 1;
14972	15533	bbzoom *= 2;
14973	15534	repaint();
..	..	@@ -14984,17 +15545,17 @@
14984	15545	case '=':
14985	15546	IncDepth();
14986	15547	//fontsize += 1;
14987		- object.editWindow.refreshContents(true);
	15548	+ object.GetWindow().refreshContents(true);
14988	15549	maskbit = 6;
14989	15550	break;
14990	15551	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14991	15552	DecDepth();
14992	15553	maskbit = 5;
14993	15554	//if(fontsize > 1) fontsize -= 1;
14994		- if (object.editWindow == null)
14995		- new Exception().printStackTrace();
14996		- else
14997		- object.editWindow.refreshContents(true);
	15555	+// if (object.editWindow == null)
	15556	+// new Exception().printStackTrace();
	15557	+// else
	15558	+ object.GetWindow().refreshContents(true);
14998	15559	break;
14999	15560	case '{':
15000	15561	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15218,7 +15779,7 @@
15218	15779	}
15219	15780	*/
15220	15781
15221		- object.editWindow.EditSelection();
	15782	+ object.GetWindow().EditSelection(false);
15222	15783	}
15223	15784
15224	15785	void SelectParent()
..	..	@@ -15235,10 +15796,10 @@
15235	15796	{
15236	15797	//selectees.remove(i);
15237	15798	System.out.println("select parent of " + elem);
15238		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15799	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15239	15800	} else
15240	15801	{
15241		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15802	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15242	15803	}
15243	15804
15244	15805	first = false;
..	..	@@ -15280,12 +15841,12 @@
15280	15841	for (int j = 0; j < group.children.size(); j++)
15281	15842	{
15282	15843	elem = (Object3D) group.children.elementAt(j);
15283		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15844	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15284	15845	first = false;
15285	15846	}
15286	15847	} else
15287	15848	{
15288		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15849	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15289	15850	}
15290	15851
15291	15852	first = false;
..	..	@@ -15296,21 +15857,21 @@
15296	15857	{
15297	15858	//Composite group = (Composite) object;
15298	15859	Object3D group = object;
15299		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15860	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15300	15861	}
15301	15862
15302	15863	void ResetTransform(int mask)
15303	15864	{
15304	15865	//Composite group = (Composite) object;
15305	15866	Object3D group = object;
15306		- group.editWindow.ResetTransform(mask);
	15867	+ group.GetWindow().ResetTransform(mask);
15307	15868	}
15308	15869
15309	15870	void FlipTransform()
15310	15871	{
15311	15872	//Composite group = (Composite) object;
15312	15873	Object3D group = object;
15313		- group.editWindow.FlipTransform();
	15874	+ group.GetWindow().FlipTransform();
15314	15875	// group.editWindow.ReduceMesh(true);
15315	15876	}
15316	15877
..	..	@@ -15318,7 +15879,7 @@
15318	15879	{
15319	15880	//Composite group = (Composite) object;
15320	15881	Object3D group = object;
15321		- group.editWindow.PrintMemory();
	15882	+ group.GetWindow().PrintMemory();
15322	15883	// group.editWindow.ReduceMesh(true);
15323	15884	}
15324	15885
..	..	@@ -15326,7 +15887,7 @@
15326	15887	{
15327	15888	//Composite group = (Composite) object;
15328	15889	Object3D group = object;
15329		- group.editWindow.ResetCentroid();
	15890	+ group.GetWindow().ResetCentroid();
15330	15891	}
15331	15892
15332	15893	void IncDepth()
..	..	@@ -15408,8 +15969,6 @@
15408	15969
15409	15970	int width = getBounds().width;
15410	15971	int height = getBounds().height;
15411		- ClickInfo info = new ClickInfo();
15412		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15413	15972	//Image img = CreateImage(width, height);
15414	15973	//System.out.println("width = " + width + "; height = " + height + "\n");
15415	15974
..	..	@@ -15486,48 +16045,77 @@
15486	16045	}
15487	16046	if (object != null && !hasMarquee)
15488	16047	{
	16048	+ if (object.clickInfo == null)
	16049	+ object.clickInfo = new ClickInfo();
	16050	+ ClickInfo info = object.clickInfo;
	16051	+ //ClickInfo info = new ClickInfo();
	16052	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16053	+
15489	16054	if (isRenderer)
15490	16055	{
15491		- info.flags++;
	16056	+ object.clickInfo.flags++;
15492	16057	double frameAspect = (double) width / (double) height;
15493	16058	if (frameAspect > renderCamera.aspect)
15494	16059	{
15495	16060	int desired = (int) ((double) height * renderCamera.aspect);
15496		- info.bounds.width -= width - desired;
15497		- info.bounds.x += (width - desired) / 2;
	16061	+ object.clickInfo.bounds.width -= width - desired;
	16062	+ object.clickInfo.bounds.x += (width - desired) / 2;
15498	16063	} else
15499	16064	{
15500	16065	int desired = (int) ((double) width / renderCamera.aspect);
15501		- info.bounds.height -= height - desired;
15502		- info.bounds.y += (height - desired) / 2;
	16066	+ object.clickInfo.bounds.height -= height - desired;
	16067	+ object.clickInfo.bounds.y += (height - desired) / 2;
15503	16068	}
15504	16069	}
15505		- info.g = gr;
15506		- info.camera = renderCamera;
	16070	+
	16071	+ object.clickInfo.g = gr;
	16072	+ object.clickInfo.camera = renderCamera;
15507	16073	/*
15508	16074	// Memory intensive (brep.verticescopy)
15509	16075	if (!(object instanceof Composite))
15510	16076	object.draw(info, 0, false); // SLOW :
15511	16077	*/
15512		- if (!isRenderer)
	16078	+ if (!isRenderer) // && drag)
15513	16079	{
15514		- object.drawEditHandles(info, 0);
15515		-
15516		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16080	+ Grafreed.Assert(object != null);
	16081	+ Grafreed.Assert(object.selection != null);
	16082	+ if (object.selection.Size() > 0)
15517	16083	{
15518		- switch (object.selection.get(0).hitSomething)
	16084	+ int hitSomething = object.selection.get(0).hitSomething;
	16085	+
	16086	+ object.clickInfo.DX = 0;
	16087	+ object.clickInfo.DY = 0;
	16088	+ object.clickInfo.W = 1;
	16089	+ if (hitSomething == Object3D.hitCenter)
15519	16090	{
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;
	16091	+ info.DX = X;
	16092	+ if (X != 0)
	16093	+ info.DX -= info.bounds.width/2;
	16094	+
	16095	+ info.DY = Y;
	16096	+ if (Y != 0)
	16097	+ info.DY -= info.bounds.height/2;
15529	16098	}
15530		-
	16099	+
	16100	+ object.drawEditHandles(//info,
	16101	+ 0);
	16102	+
	16103	+ if (drag && (X != 0 \|\| Y != 0))
	16104	+ {
	16105	+ switch (hitSomething)
	16106	+ {
	16107	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16108	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16109	+ break;
	16110	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16111	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16112	+ break;
	16113	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16114	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16115	+ break;
	16116	+ }
	16117	+
	16118	+ }
15531	16119	}
15532	16120	}
15533	16121	}
..	..	@@ -16009,6 +16597,8 @@
16009	16597	private /static/ boolean firstime;
16010	16598	private /static/ cVector newView = new cVector();
16011	16599	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16600	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16601	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16012	16602	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16013	16603	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16014	16604	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16021,29 +16611,67 @@
16021	16611	{
16022	16612	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16023	16613
	16614	+ int usedsuf = 0;
	16615	+
16024	16616	for (int i = 0; i < suffixes.length; i++)
16025	16617	{
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)
	16618	+ String[] suffixe = suffixes;
	16619	+ String[] fallback = suffixes2;
	16620	+ String[] fallfallback = suffixes3;
	16621	+
	16622	+ for (int c=usedsuf; --c>=0;)
16031	16623	{
16032		- throw new IOException("Unable to load texture " + resourceName);
	16624	+// String[] temp = suffixe;
	16625	+// suffixe = fallback;
	16626	+// fallback = fallfallback;
	16627	+// fallfallback = temp;
16033	16628	}
	16629	+
	16630	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16631	+ TextureData data;
	16632	+
	16633	+ try
	16634	+ {
	16635	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16636	+ mipmapped,
	16637	+ FileUtil.getFileSuffix(resourceName));
	16638	+ }
	16639	+ catch (Exception e)
	16640	+ {
	16641	+ try
	16642	+ {
	16643	+ resourceName = basename + fallback[i] + "." + suffix;
	16644	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16645	+ mipmapped,
	16646	+ FileUtil.getFileSuffix(resourceName));
	16647	+ }
	16648	+ catch (Exception e2)
	16649	+ {
	16650	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16651	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16652	+ mipmapped,
	16653	+ FileUtil.getFileSuffix(resourceName));
	16654	+ }
	16655	+ }
	16656	+
16034	16657	//System.out.println("Target = " + targets[i]);
16035	16658	cubemap.updateImage(data, targets[i]);
16036	16659	}
16037	16660
16038	16661	return cubemap;
16039	16662	}
	16663	+
16040	16664	int bigsphere = -1;
16041	16665
16042	16666	float BGcolor = 0.5f;
16043	16667
16044		- private void DrawSkyBox(GL gl)
	16668	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16669	+
	16670	+ private void DrawSkyBox(GL gl, float ratio)
16045	16671	{
16046		- if (envyoff \|\| cubemap == null)
	16672	+ if (//envyoff \|\|
	16673	+ WIREFRAME \|\|
	16674	+ cubemap == null)
16047	16675	{
16048	16676	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16049	16677	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16058,7 +16686,17 @@
16058	16686	// Compensates for ExaminerViewer's modification of modelview matrix
16059	16687	gl.glMatrixMode(GL.GL_MODELVIEW);
16060	16688	gl.glLoadIdentity();
	16689	+ gl.glScalef(1,ratio,1);
16061	16690
	16691	+// colorV[0] = 2;
	16692	+// colorV[1] = 2;
	16693	+// colorV[2] = 2;
	16694	+// colorV[3] = 1;
	16695	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16696	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16697	+//
	16698	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16699	+
16062	16700	//gl.glActiveTexture(GL.GL_TEXTURE1);
16063	16701	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16064	16702
..	..	@@ -16090,6 +16728,7 @@
16090	16728	{
16091	16729	gl.glScalef(1.0f, -1.0f, 1.0f);
16092	16730	}
	16731	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16093	16732	gl.glMultMatrixd(viewrot_1, 0);
16094	16733	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16095	16734	//viewer.updateInverseRotation(gl);
..	..	@@ -16230,16 +16869,16 @@
16230	16869	cStatic.objectstack[materialdepth++] = checker;
16231	16870	//System.out.println("material " + material);
16232	16871	//Applet3D.tracein(this, selected);
16233		- vector2buffer = checker.projectedVertices;
	16872	+ //vector2buffer = checker.projectedVertices;
16234	16873
16235	16874	//checker.GetMaterial().Draw(this, false); // true);
16236		- DrawMaterial(checker.GetMaterial(), false); // true);
	16875	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16237	16876
16238	16877	materialdepth -= 1;
16239	16878	if (materialdepth > 0)
16240	16879	{
16241		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16242		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16880	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16881	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16243	16882	}
16244	16883	//checker.GetMaterial().opacity = 1f;
16245	16884	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16325,6 +16964,14 @@
16325	16964	}
16326	16965	}
16327	16966
	16967	+ private Object3D GetFolder()
	16968	+ {
	16969	+ Object3D folder = object.GetWindow().copy;
	16970	+ if (object.GetWindow().copy.selection.Size() > 0)
	16971	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16972	+ return folder;
	16973	+ }
	16974	+
16328	16975	class SelectBuffer implements GLEventListener
16329	16976	{
16330	16977
..	..	@@ -16340,7 +16987,7 @@
16340	16987	//new Exception().printStackTrace();
16341	16988	System.out.println("select buffer init");
16342	16989	// Use debug pipeline
16343		- drawable.setGL(new DebugGL(drawable.getGL()));
	16990	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16344	16991
16345	16992	GL gl = drawable.getGL();
16346	16993
..	..	@@ -16404,6 +17051,17 @@
16404	17051
16405	17052	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16406	17053
	17054	+ if (PAINTMODE)
	17055	+ {
	17056	+ if (object.GetWindow().copy.selection.Size() > 0)
	17057	+ {
	17058	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17059	+
	17060	+ // Make what you paint not selectable.
	17061	+ paintobj.ResetSelectable();
	17062	+ }
	17063	+ }
	17064	+
16407	17065	//int tmp = selection_view;
16408	17066	//selection_view = -1;
16409	17067	int temp = DrawMode();
..	..	@@ -16415,6 +17073,17 @@
16415	17073	// temp = DEFAULT; // patch for selection debug
16416	17074	Globals.drawMode = temp; // WARNING
16417	17075
	17076	+ if (PAINTMODE)
	17077	+ {
	17078	+ if (object.GetWindow().copy.selection.Size() > 0)
	17079	+ {
	17080	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17081	+
	17082	+ // Revert.
	17083	+ paintobj.RestoreSelectable();
	17084	+ }
	17085	+ }
	17086	+
16418	17087	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16419	17088
16420	17089	// trying different ways of getting the depth info over
..	..	@@ -16462,6 +17131,8 @@
16462	17131	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16463	17132	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16464	17133	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17134	+
	17135	+ CreateSelectedPoint();
16465	17136
16466	17137	// Will fit the mesh !!!
16467	17138	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16516,29 +17187,31 @@
16516	17187	}
16517	17188
16518	17189	if (!movingcamera && !PAINTMODE)
16519		- object.editWindow.ScreenFitPoint(); // fev 2014
	17190	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16520	17191
16521		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17192	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16522	17193	{
16523		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17194	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16524	17195
16525		- Object3D group = new Object3D("inst" + paintcount++);
	17196	+ if (object.GetWindow().copy.selection.Size() > 0)
	17197	+ {
	17198	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16526	17199
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();
	17200	+ Object3D inst = new Object3D("inst" + paintcount++);
	17201	+
	17202	+ inst.CreateMaterial(); // use a void leaf to select instances
	17203	+
	17204	+ inst.add(paintobj); // link
	17205	+
	17206	+ object.GetWindow().SnapObject(inst);
	17207	+
	17208	+ Object3D folder = paintFolder; // GetFolder();
	17209	+
	17210	+ folder.add(inst);
	17211	+
	17212	+ object.GetWindow().ResetModel();
	17213	+ object.GetWindow().refreshContents();
	17214	+ }
16542	17215	}
16543	17216	else
16544	17217	paintcount = 0;
..	..	@@ -16577,6 +17250,11 @@
16577	17250	//System.out.println("objects[color] = " + objects[color]);
16578	17251	//objects[color].Select();
16579	17252	indexcount = 0;
	17253	+ ObjEditor window = object.GetWindow();
	17254	+ if (window != null && deselect)
	17255	+ {
	17256	+ window.Select(null, deselect, true);
	17257	+ }
16580	17258	object.Select(color, deselect);
16581	17259	}
16582	17260
..	..	@@ -17102,23 +17780,15 @@
17102	17780	int AAbuffersize = 0;
17103	17781
17104	17782	//double[] selectedpoint = new double[3];
17105		- static Superellipsoid selectedpoint = new Superellipsoid();
	17783	+ static Superellipsoid selectedpoint;
17106	17784	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();
	17785	+ static Sphere debugpointG;
	17786	+ static Sphere debugpointP;
	17787	+ static Sphere debugpointC;
	17788	+ static Sphere debugpointR;
17111	17789
17112	17790	static Sphere debugpoints[] = new Sphere[8];
17113	17791
17114		- static
17115		- {
17116		- for (int i=0; i<8; i++)
17117		- {
17118		- debugpoints[i] = new Sphere();
17119		- }
17120		- }
17121		-
17122	17792	static void InitPoints(float radius)
17123	17793	{
17124	17794	for (int i=0; i<8; i++)