~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,9 @@
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;
78	116	boolean reverseUP = false;
79	117	static boolean frozen = false;
80	118	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -137,7 +175,7 @@
137	175	static boolean doublesided = false; // true; // reversed normals are awful for conformance
138	176	boolean anisotropy = true;
139	177	boolean softshadow = true; // slower but better false;
140		- boolean opacityhalo = false;
	178	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
141	179
142	180	boolean macromode = false;
143	181
..	..	@@ -151,6 +189,19 @@
151	189	}
152	190
153	191	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	192	+
	193	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	194	+ {
	195	+ try
	196	+ {
	197	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	198	+ } catch (IOException e)
	199	+ {
	200	+ System.out.println("NAME = " + name);
	201	+ e.printStackTrace(); // throw new RuntimeException(e);
	202	+ return null;
	203	+ }
	204	+ }
154	205
155	206	void SetAsGLRenderer(boolean b)
156	207	{
..	..	@@ -170,7 +221,8 @@
170	221
171	222	SetCamera(cam);
172	223
173		- SetLight(new Camera(new cVector(10, 10, -20)));
	224	+ // Warning: not used.
	225	+ SetLight(new Camera(new cVector(15, 10, -20)));
174	226
175	227	object = o;
176	228
..	..	@@ -327,7 +379,7 @@
327	379	cStatic.objectstack[materialdepth++] = obj;
328	380	//System.out.println("material " + material);
329	381	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	382	+ //display.vector2buffer = obj.projectedVertices;
331	383	if (obj instanceof Camera)
332	384	{
333	385	display.options1[0] = material.shift;
..	..	@@ -336,14 +388,28 @@
336	388	display.options1[2] = material.shadowbias;
337	389	display.options1[3] = material.aniso;
338	390	display.options1[4] = material.anisoV;
	391	+// System.out.println("display.options1[0] " + display.options1[0]);
	392	+// System.out.println("display.options1[1] " + display.options1[1]);
	393	+// System.out.println("display.options1[2] " + display.options1[2]);
	394	+// System.out.println("display.options1[3] " + display.options1[3]);
	395	+// System.out.println("display.options1[4] " + display.options1[4]);
339	396	display.options2[0] = material.opacity;
340	397	display.options2[1] = material.diffuse;
341	398	display.options2[2] = material.factor;
	399	+// System.out.println("display.options2[0] " + display.options2[0]);
	400	+// System.out.println("display.options2[1] " + display.options2[1]);
	401	+// System.out.println("display.options2[2] " + display.options2[2]);
342	402
343	403	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	404	+// System.out.println("display.options3[0] " + display.options3[0]);
	405	+// System.out.println("display.options3[1] " + display.options3[1]);
	406	+// System.out.println("display.options3[2] " + display.options3[2]);
344	407	display.options4[0] = material.cameralight/0.2f;
345	408	display.options4[1] = material.subsurface;
346	409	display.options4[2] = material.sheen;
	410	+// System.out.println("display.options4[0] " + display.options4[0]);
	411	+// System.out.println("display.options4[1] " + display.options4[1]);
	412	+// System.out.println("display.options4[2] " + display.options4[2]);
347	413
348	414	// if (display.CURRENTANTIALIAS > 0)
349	415	// display.options3[3] /= 4;
..	..	@@ -359,7 +425,7 @@
359	425	/**/
360	426	} else
361	427	{
362		- DrawMaterial(material, selected);
	428	+ DrawMaterial(material, selected, obj.projectedVertices);
363	429	}
364	430	} else
365	431	{
..	..	@@ -383,8 +449,8 @@
383	449	cStatic.objectstack[materialdepth++] = obj;
384	450	//System.out.println("material " + material);
385	451	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	452	+ //display.vector2buffer = obj.projectedVertices;
	453	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	454	}
389	455	}
390	456
..	..	@@ -401,8 +467,8 @@
401	467	materialdepth -= 1;
402	468	if (materialdepth > 0)
403	469	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	470	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	471	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	472	}
407	473	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	474	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +488,8 @@
422	488	materialdepth -= 1;
423	489	if (materialdepth > 0)
424	490	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	491	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	492	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	493	}
428	494	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	495	//else
..	..	@@ -464,10 +530,12 @@
464	530	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	531	{
466	532	//gl.glBegin(gl.GL_TRIANGLES);
467		- boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	533	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	534	+ // TEST LIVE NORMALS && !obj.dontselect
	535	+ ;
468	536	if (!hasnorm)
469	537	{
470		- // System.out.println("FUCK!!");
	538	+ // System.out.println("Mesh normal");
471	539	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	540	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	541	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1192,10 +1260,12 @@
1192	1260	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1261	}
1194	1262	}
	1263	+
1195	1264	if (flipV)
1196	1265	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1266	else
1198	1267	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
1199	1269	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1270	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1271
..	..	@@ -1215,10 +1285,12 @@
1215	1285	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1286	}
1217	1287	}
	1288	+
1218	1289	if (flipV)
1219	1290	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1291	else
1221	1292	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1293	+
1222	1294	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1295	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1296
..	..	@@ -1246,8 +1318,10 @@
1246	1318	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1319	else
1248	1320	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1321	+
1249	1322	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1323	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1324	+
1251	1325	count2 += 2;
1252	1326	count3 += 3;
1253	1327	}
..	..	@@ -1426,6 +1500,8 @@
1426	1500	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1427	1501	}
1428	1502
	1503	+ float[] colorV = new float[4];
	1504	+
1429	1505	void SetColor(Object3D obj, Vertex p0)
1430	1506	{
1431	1507	CameraPane display = this;
..	..	@@ -1493,8 +1569,6 @@
1493	1569	{
1494	1570	return;
1495	1571	}
1496		-
1497		- float[] colorV = new float[3];
1498	1572
1499	1573	if (false) // marked)
1500	1574	{
..	..	@@ -1603,7 +1677,7 @@
1603	1677	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1678	}
1605	1679
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1680	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1681	{
1608	1682	CameraPane display = this;
1609	1683	//new Exception().printStackTrace();
..	..	@@ -1638,7 +1712,7 @@
1638	1712	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1713	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1714	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1715	+ colorV[3] = 1; // material.opacity;
1642	1716
1643	1717	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1718	//System.out.println("Opacity = " + opacity);
..	..	@@ -1746,9 +1820,9 @@
1746	1820	display.modelParams7[2] = 0;
1747	1821	display.modelParams7[3] = 0;
1748	1822
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1823	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1824
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1825	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1826	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1827	{
1754	1828	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -2044,7 +2118,7 @@
2044	2118	//System.err.println("Oeil on");
2045	2119	OEIL = true;
2046	2120	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2121	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2048	2122	//pingthread.StepToTarget(true);
2049	2123	}
2050	2124
..	..	@@ -2259,7 +2333,7 @@
2259	2333
2260	2334	void ToggleDebug()
2261	2335	{
2262		- DEBUG ^= true;
	2336	+ Globals.DEBUG ^= true;
2263	2337	}
2264	2338
2265	2339	void ToggleLookAt()
..	..	@@ -2277,10 +2351,17 @@
2277	2351	HANDLES ^= true;
2278	2352	}
2279	2353
	2354	+ Object3D paintFolder;
	2355	+
2280	2356	void TogglePaint()
2281	2357	{
2282	2358	PAINTMODE ^= true;
2283	2359	paintcount = 0;
	2360	+
	2361	+ if (PAINTMODE)
	2362	+ {
	2363	+ paintFolder = GetFolder();
	2364	+ }
2284	2365	}
2285	2366
2286	2367	void SwapCamera(int a, int b)
..	..	@@ -2377,6 +2458,21 @@
2377	2458	return currentGL;
2378	2459	}
2379	2460
	2461	+ static private BufferedImage CreateBim(TextureData texturedata)
	2462	+ {
	2463	+ Grafreed.Assert(texturedata != null);
	2464	+
	2465	+ int width = texturedata.getWidth();
	2466	+ int height = texturedata.getHeight();
	2467	+
	2468	+ Buffer buffer = texturedata.getBuffer();
	2469	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2470	+
	2471	+ byte[] bytes = bytebuf.array();
	2472	+
	2473	+ return CreateBim(bytes, width, height);
	2474	+ }
	2475	+
2380	2476	/**/
2381	2477	class CacheTexture
2382	2478	{
..	..	@@ -2385,28 +2481,31 @@
2385	2481
2386	2482	int resolution;
2387	2483
2388		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2484	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2389	2485	{
2390		- texture = tex;
	2486	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2487	+ texturedata = texdata;
2391	2488	resolution = res;
2392	2489	}
2393	2490	}
2394	2491	/**/
2395	2492
2396	2493	// 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>();
	2494	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2495	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2496	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2497	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2498	+
2400	2499	int pigmentdepth = 0;
2401	2500	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2501	int bumpdepth = 0;
2403	2502	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2404	2503	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2405	2504	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2406		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2505	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2407	2506	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2408	2507
2409		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2508	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2410	2509	{
2411	2510	TextureData texturedata = null;
2412	2511
..	..	@@ -2425,13 +2524,34 @@
2425	2524	if (bump)
2426	2525	texturedata = ConvertBump(texturedata, false);
2427	2526
2428		- com.sun.opengl.util.texture.Texture texture =
2429		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2527	+// com.sun.opengl.util.texture.Texture texture =
	2528	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2430	2529
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);
	2530	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2531	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2433	2532
2434		- return texture;
	2533	+ return texturedata;
	2534	+ }
	2535	+
	2536	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2537	+ {
	2538	+ TextureData texturedata = null;
	2539	+
	2540	+ try
	2541	+ {
	2542	+ texturedata =
	2543	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2544	+ bim,
	2545	+ true);
	2546	+ } catch (Exception e)
	2547	+ {
	2548	+ throw new javax.media.opengl.GLException(e);
	2549	+ }
	2550	+
	2551	+ if (bump)
	2552	+ texturedata = ConvertBump(texturedata, false);
	2553	+
	2554	+ return texturedata;
2435	2555	}
2436	2556
2437	2557	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3504,6 +3624,8 @@
3504	3624
3505	3625	System.out.println("LOADING TEXTURE : " + name);
3506	3626
	3627	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3628	+
3507	3629	//
3508	3630	if (false) // compressbit > 0)
3509	3631	{
..	..	@@ -7902,7 +8024,7 @@
7902	8024	String pigment = Object3D.GetPigment(tex);
7903	8025	String bump = Object3D.GetBump(tex);
7904	8026
7905		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8027	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7906	8028	{
7907	8029	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7908	8030	// System.out.println("; bump = " + bump);
..	..	@@ -7917,8 +8039,8 @@
7917	8039	pigment = null;
7918	8040	}
7919	8041
7920		- ReleaseTexture(bump, true);
7921		- ReleaseTexture(pigment, false);
	8042	+ ReleaseTexture(tex, true);
	8043	+ ReleaseTexture(tex, false);
7922	8044	}
7923	8045
7924	8046	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7936,7 +8058,7 @@
7936	8058
7937	8059	String pigment = Object3D.GetPigment(tex);
7938	8060
7939		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8061	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7940	8062	{
7941	8063	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7942	8064	// System.out.println("; bump = " + bump);
..	..	@@ -7947,7 +8069,7 @@
7947	8069	pigment = null;
7948	8070	}
7949	8071
7950		- ReleaseTexture(pigment, false);
	8072	+ ReleaseTexture(tex, false);
7951	8073	}
7952	8074
7953	8075	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -7965,7 +8087,7 @@
7965	8087
7966	8088	String bump = Object3D.GetBump(tex);
7967	8089
7968		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8090	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7969	8091	{
7970	8092	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7971	8093	// System.out.println("; bump = " + bump);
..	..	@@ -7976,10 +8098,10 @@
7976	8098	bump = null;
7977	8099	}
7978	8100
7979		- ReleaseTexture(bump, true);
	8101	+ ReleaseTexture(tex, true);
7980	8102	}
7981	8103
7982		- void ReleaseTexture(String tex, boolean bump)
	8104	+ void ReleaseTexture(cTexture tex, boolean bump)
7983	8105	{
7984	8106	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7985	8107	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7990,7 +8112,7 @@
7990	8112	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7991	8113
7992	8114	if (tex != null)
7993		- texture = textures.get(tex);
	8115	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7994	8116
7995	8117	// //assert( texture != null );
7996	8118	// if (texture == null)
..	..	@@ -8084,47 +8206,50 @@
8084	8206
8085	8207	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8086	8208	{
8087		- if (// DrawMode() != 0 \|\| /tex == null \|\|/
8088		- ambientOcclusion ) // \|\| !textureon)
8089		- {
8090		- return; // false;
8091		- }
8092		-
8093		- if (tex == null)
8094		- {
8095		- BindTexture(null,false,resolution);
8096		- BindTexture(null,true,resolution);
8097		- return;
8098		- }
	8209	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8210	+// ambientOcclusion ) // \|\| !textureon)
	8211	+// {
	8212	+// return; // false;
	8213	+// }
	8214	+//
	8215	+// if (tex == null)
	8216	+// {
	8217	+// BindTexture(null,false,resolution);
	8218	+// BindTexture(null,true,resolution);
	8219	+// return;
	8220	+// }
	8221	+//
	8222	+// String pigment = Object3D.GetPigment(tex);
	8223	+// String bump = Object3D.GetBump(tex);
	8224	+//
	8225	+// usedtextures.add(pigment);
	8226	+// usedtextures.add(bump);
	8227	+//
	8228	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8229	+// {
	8230	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8231	+// // System.out.println("; bump = " + bump);
	8232	+// }
	8233	+//
	8234	+// if (bump.equals(""))
	8235	+// {
	8236	+// bump = null;
	8237	+// }
	8238	+// if (pigment.equals(""))
	8239	+// {
	8240	+// pigment = null;
	8241	+// }
	8242	+//
	8243	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8244	+// BindTexture(pigment, false, resolution);
	8245	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8246	+// BindTexture(bump, true, resolution);
	8247	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8248	+//
	8249	+// return; // true;
8099	8250
8100		- String pigment = Object3D.GetPigment(tex);
8101		- String bump = Object3D.GetBump(tex);
8102		-
8103		- usedtextures.put(pigment, pigment);
8104		- usedtextures.put(bump, bump);
8105		-
8106		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8107		- {
8108		- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8109		- // System.out.println("; bump = " + bump);
8110		- }
8111		-
8112		- if (bump.equals(""))
8113		- {
8114		- bump = null;
8115		- }
8116		- if (pigment.equals(""))
8117		- {
8118		- pigment = null;
8119		- }
8120		-
8121		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8122		- BindTexture(pigment, false, resolution);
8123		- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8124		- BindTexture(bump, true, resolution);
8125		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8126		-
8127		- return; // true;
	8251	+ BindPigmentTexture(tex, resolution);
	8252	+ BindBumpTexture(tex, resolution);
8128	8253	}
8129	8254
8130	8255	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8143,9 +8268,9 @@
8143	8268
8144	8269	String pigment = Object3D.GetPigment(tex);
8145	8270
8146		- usedtextures.put(pigment, pigment);
	8271	+ usedtextures.add(tex);
8147	8272
8148		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8273	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8149	8274	{
8150	8275	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8151	8276	// System.out.println("; bump = " + bump);
..	..	@@ -8157,7 +8282,7 @@
8157	8282	}
8158	8283
8159	8284	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8160		- BindTexture(pigment, false, resolution);
	8285	+ BindTexture(tex, false, resolution);
8161	8286	}
8162	8287
8163	8288	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8176,9 +8301,9 @@
8176	8301
8177	8302	String bump = Object3D.GetBump(tex);
8178	8303
8179		- usedtextures.put(bump, bump);
	8304	+ usedtextures.add(tex);
8180	8305
8181		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8306	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8182	8307	{
8183	8308	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8184	8309	// System.out.println("; bump = " + bump);
..	..	@@ -8190,7 +8315,7 @@
8190	8315	}
8191	8316
8192	8317	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8193		- BindTexture(bump, true, resolution);
	8318	+ BindTexture(tex, true, resolution);
8194	8319	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8195	8320	}
8196	8321
..	..	@@ -8214,13 +8339,19 @@
8214	8339	return fileExists;
8215	8340	}
8216	8341
8217		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8342	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8218	8343	{
8219		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8344	+ CacheTexture texturecache = null;
8220	8345
8221	8346	if (tex != null)
8222	8347	{
8223		- String texname = tex;
	8348	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8349	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8350	+
	8351	+ if (texname.equals("") && texdata == null)
	8352	+ {
	8353	+ return null;
	8354	+ }
8224	8355
8225	8356	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8226	8357
..	..	@@ -8230,19 +8361,46 @@
8230	8361	// else
8231	8362	// if (!texname.startsWith("/"))
8232	8363	// texname = "/Users/nbriere/Textures/" + texname;
8233		- if (!FileExists(tex))
	8364	+ if (!FileExists(texname) && !texname.startsWith("@"))
8234	8365	{
8235	8366	texname = fallbackTextureName;
8236	8367	}
8237	8368
8238	8369	if (CACHETEXTURE)
8239		- texture = textures.get(texname); // TEXTURE CACHE
8240		-
8241		- TextureData texturedata = null;
8242		-
8243		- if (texture == null \|\| texture.resolution < resolution)
8244	8370	{
8245		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8371	+ if (texdata == null)
	8372	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8373	+ else
	8374	+ texturecache = bimtextures.get(texdata);
	8375	+ }
	8376	+
	8377	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8378	+ {
	8379	+ TextureData texturedata = null;
	8380	+
	8381	+ if (texdata != null && textureon)
	8382	+ {
	8383	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8384	+
	8385	+ try
	8386	+ {
	8387	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8388	+ }
	8389	+ catch (Exception e)
	8390	+ {
	8391	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8392	+ }
	8393	+
	8394	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8395	+ bimtextures.put(texdata, texturecache);
	8396	+
	8397	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8398	+
	8399	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8400	+ //bim2 = bim;
	8401	+ }
	8402	+ else
	8403	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8246	8404	{
8247	8405	assert(!bump);
8248	8406	// if (bump)
..	..	@@ -8253,19 +8411,23 @@
8253	8411	// }
8254	8412	// else
8255	8413	// {
8256		- texture = textures.get(tex);
8257		- if (texture == null)
	8414	+ // texturecache = textures.get(texname); // suspicious
	8415	+ if (texturecache == null)
8258	8416	{
8259		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8417	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8260	8418	}
	8419	+ else
	8420	+ new Exception().printStackTrace();
8261	8421	// }
8262	8422	} else
8263		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8423	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8264	8424	{
8265	8425	assert(bump);
8266		- texture = textures.get(tex);
8267		- if (texture == null)
8268		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ // texturecache = textures.get(texname); // suspicious
	8427	+ if (texturecache == null)
	8428	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8429	+ else
	8430	+ new Exception().printStackTrace();
8269	8431	} else
8270	8432	{
8271	8433	//if (tex.equals("IMMORTAL"))
..	..	@@ -8273,11 +8435,22 @@
8273	8435	// texture = GetResourceTexture("default.png");
8274	8436	//} else
8275	8437	//{
8276		- if (tex.equals("WHITE_NOISE"))
	8438	+ if (texname.endsWith("WHITE_NOISE"))
8277	8439	{
8278		- texture = textures.get(tex);
8279		- if (texture == null)
8280		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ // texturecache = textures.get(texname); // suspicious
	8441	+ if (texturecache == null)
	8442	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8443	+ else
	8444	+ new Exception().printStackTrace();
	8445	+ } else
	8446	+ {
	8447	+ if (texname.startsWith("@"))
	8448	+ {
	8449	+ // texturecache = textures.get(texname); // suspicious
	8450	+ if (texturecache == null)
	8451	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8452	+ else
	8453	+ new Exception().printStackTrace();
8281	8454	} else
8282	8455	{
8283	8456	if (textureon)
..	..	@@ -8336,19 +8509,20 @@
8336	8509	if (texturedata == null)
8337	8510	throw new Exception();
8338	8511
8339		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8512	+ texturecache = new CacheTexture(texturedata,resolution);
8340	8513	//texture = GetTexture(tex, bump);
8341	8514	}
	8515	+ }
8342	8516	}
8343	8517	//}
8344	8518	}
8345	8519
8346		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8520	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8347	8521	{
8348	8522	//return false;
8349	8523
8350	8524	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8351		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8525	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8352	8526	{
8353	8527	// String ext = "_highres";
8354	8528	// if (REDUCETEXTURE)
..	..	@@ -8365,52 +8539,17 @@
8365	8539	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8366	8540	if (!cachefile.exists())
8367	8541	{
8368		- // cache to disk
8369		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8370		- //buffers[0].
8371		-
8372		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8373		- int[] pixels = new int[bytebuf.capacity()/3];
8374		-
8375		- // squared size heuristic...
8376		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8542	+ //if (texturedata.getWidth() == texturedata.getHeight())
8377	8543	{
8378		- for (int i=pixels.length; --i>=0;)
8379		- {
8380		- int i3 = i*3;
8381		- pixels[i] = 0xFF;
8382		- pixels[i] <<= 8;
8383		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8384		- pixels[i] <<= 8;
8385		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8386		- pixels[i] <<= 8;
8387		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8388		- }
8389		-
8390		- /*
8391		- int r=0,g=0,b=0,a=0;
8392		- for (int i=0; i<width; i++)
8393		- for (int j=0; j<height; j++)
8394		- {
8395		- int index = j*width+i;
8396		- int p = pixels[index];
8397		- a = ((p>>24) & 0xFF);
8398		- r = ((p>>16) & 0xFF);
8399		- g = ((p>>8) & 0xFF);
8400		- b = (p & 0xFF);
8401		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8402		- }
8403		- /**/
8404		- int width = (int)Math.sqrt(pixels.length); // squared
8405		- int height = width;
8406		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8407		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8544	+ BufferedImage rendImage = CreateBim(texturedata);
	8545	+
8408	8546	ImageWriter writer = null;
8409	8547	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8410	8548	if (iter.hasNext()) {
8411	8549	writer = (ImageWriter)iter.next();
8412	8550	}
8413		- float compressionQuality = 0.9f;
	8551	+
	8552	+ float compressionQuality = 0.85f;
8414	8553	try
8415	8554	{
8416	8555	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8427,18 +8566,20 @@
8427	8566	}
8428	8567	}
8429	8568	}
8430		-
	8569	+
	8570	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8571	+
8431	8572	//System.out.println("Texture = " + tex);
8432		- if (textures.containsKey(texname))
	8573	+ if (textures.containsKey(tex))
8433	8574	{
8434		- CacheTexture thetex = textures.get(texname);
	8575	+ CacheTexture thetex = textures.get(tex);
8435	8576	thetex.texture.disable();
8436	8577	thetex.texture.dispose();
8437		- textures.remove(texname);
	8578	+ textures.remove(tex);
8438	8579	}
8439	8580
8440		- texture.texturedata = texturedata;
8441		- textures.put(texname, texture);
	8581	+ //texture.texturedata = texturedata;
	8582	+ textures.put(tex, texturecache);
8442	8583
8443	8584	// newtex = true;
8444	8585	}
..	..	@@ -8454,10 +8595,44 @@
8454	8595	}
8455	8596	}
8456	8597
8457		- return texture;
	8598	+ return texturecache;
8458	8599	}
8459	8600
8460		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8601	+ static void EmbedTextures(cTexture tex)
	8602	+ {
	8603	+ if (tex.pigmentdata == null)
	8604	+ {
	8605	+ //String texname = Object3D.GetPigment(tex);
	8606	+
	8607	+ CacheTexture texturecache = texturepigment.get(tex);
	8608	+
	8609	+ if (texturecache != null)
	8610	+ {
	8611	+ tex.pw = texturecache.texturedata.getWidth();
	8612	+ tex.ph = texturecache.texturedata.getHeight();
	8613	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8614	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8615	+ ;
	8616	+ //, tex.pw, tex.ph), 0.5f);
	8617	+ }
	8618	+ }
	8619	+
	8620	+ if (tex.bumpdata == null)
	8621	+ {
	8622	+ //String texname = Object3D.GetBump(tex);
	8623	+
	8624	+ CacheTexture texturecache = texturebump.get(tex);
	8625	+
	8626	+ if (texturecache != null)
	8627	+ {
	8628	+ tex.bw = texturecache.texturedata.getWidth();
	8629	+ tex.bh = texturecache.texturedata.getHeight();
	8630	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8631	+ }
	8632	+ }
	8633	+ }
	8634	+
	8635	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8461	8636	{
8462	8637	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8463	8638
..	..	@@ -8475,21 +8650,21 @@
8475	8650	return texture!=null?texture.texture:null;
8476	8651	}
8477	8652
8478		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8653	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8479	8654	{
8480	8655	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8481	8656
8482	8657	return texture!=null?texture.texturedata:null;
8483	8658	}
8484	8659
8485		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8660	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8486	8661	{
8487	8662	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8488	8663	{
8489	8664	return false;
8490	8665	}
8491	8666
8492		- boolean newtex = false;
	8667	+ //boolean newtex = false;
8493	8668
8494	8669	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8495	8670
..	..	@@ -8521,9 +8696,75 @@
8521	8696	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8522	8697	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8523	8698
8524		- return newtex;
	8699	+ return true; // Warning: not used.
8525	8700	}
8526	8701
	8702	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8703	+ {
	8704	+ try
	8705	+ {
	8706	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8707	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8708	+ ImageWriter writer = writers.next();
	8709	+
	8710	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8711	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8712	+ param.setCompressionQuality(quality);
	8713	+
	8714	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8715	+ writer.setOutput(ios);
	8716	+ writer.write(null, new IIOImage(image, null, null), param);
	8717	+
	8718	+ byte[] data = baos.toByteArray();
	8719	+ writer.dispose();
	8720	+ return data;
	8721	+ }
	8722	+ catch (Exception e)
	8723	+ {
	8724	+ e.printStackTrace();
	8725	+ return null;
	8726	+ }
	8727	+ }
	8728	+
	8729	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8730	+ {
	8731	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8732	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8733	+ ImageReader reader = writers.next();
	8734	+
	8735	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8736	+
	8737	+ ImageReadParam param = reader.getDefaultReadParam();
	8738	+ param.setDestination(bim);
	8739	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8740	+
	8741	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8742	+ reader.setInput(ios);
	8743	+ BufferedImage bim2 = reader.read(0, param);
	8744	+ reader.dispose();
	8745	+
	8746	+// WritableRaster raster = bim2.getRaster();
	8747	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8748	+// byte[] bytes = data.getData();
	8749	+//
	8750	+// int[] pixels = new int[bytes.length/3];
	8751	+// for (int i=pixels.length; --i>=0;)
	8752	+// {
	8753	+// int i3 = i*3;
	8754	+// pixels[i] = 0xFF;
	8755	+// pixels[i] <<= 8;
	8756	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8757	+// pixels[i] <<= 8;
	8758	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8759	+// pixels[i] <<= 8;
	8760	+// pixels[i] \|= bytes[i3] & 0xFF;
	8761	+// }
	8762	+//
	8763	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8764	+
	8765	+ return bim;
	8766	+ }
	8767	+
8527	8768	ShadowBuffer shadowPBuf;
8528	8769	AntialiasBuffer antialiasPBuf;
8529	8770	int MAXSTACK;
..	..	@@ -8540,10 +8781,12 @@
8540	8781
8541	8782	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8542	8783	MAXSTACK = temp[0];
8543		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8784	+ if (Globals.DEBUG)
	8785	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8544	8786	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8545	8787	MAXSTACK = temp[0];
8546		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8788	+ if (Globals.DEBUG)
	8789	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8547	8790
8548	8791	// Use debug pipeline
8549	8792	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8551,7 +8794,8 @@
8551	8794	gl = drawable.getGL(); //
8552	8795
8553	8796	GL gl3 = getGL();
8554		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8797	+ if (Globals.DEBUG)
	8798	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8555	8799
8556	8800
8557	8801	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8716,7 +8960,7 @@
8716	8960
8717	8961	if (cubemap == null)
8718	8962	{
8719		- LoadEnvy(5);
	8963	+ //LoadEnvy(1);
8720	8964	}
8721	8965
8722	8966	//cubemap.enable();
..	..	@@ -8992,6 +9236,8 @@
8992	9236
8993	9237	void LoadEnvy(int which)
8994	9238	{
	9239	+ assert(false);
	9240	+
8995	9241	String name;
8996	9242	String ext;
8997	9243
..	..	@@ -9003,37 +9249,58 @@
9003	9249	cubemap = null;
9004	9250	return;
9005	9251	case 1:
9006		- name = "cubemaps/box_";
9007		- ext = "png";
	9252	+ name = "cubemaps/rgb/";
	9253	+ ext = "jpg";
9008	9254	reverseUP = false;
9009	9255	break;
9010	9256	case 2:
9011		- name = "cubemaps/uffizi_";
9012		- ext = "png";
9013		- break; // reverseUP = true; break;
	9257	+ name = "cubemaps/uffizi/";
	9258	+ ext = "jpg";
	9259	+ reverseUP = false;
	9260	+ break;
9014	9261	case 3:
9015		- name = "cubemaps/CloudyHills_";
9016		- ext = "tga";
	9262	+ name = "cubemaps/CloudyHills/";
	9263	+ ext = "jpg";
9017	9264	reverseUP = false;
9018	9265	break;
9019	9266	case 4:
9020		- name = "cubemaps/cornell_";
	9267	+ name = "cubemaps/cornell/";
9021	9268	ext = "png";
9022	9269	reverseUP = false;
9023	9270	break;
	9271	+ case 5:
	9272	+ name = "cubemaps/skycube/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
	9276	+ case 6:
	9277	+ name = "cubemaps/SaintLazarusChurch3/";
	9278	+ ext = "jpg";
	9279	+ reverseUP = false;
	9280	+ break;
	9281	+ case 7:
	9282	+ name = "cubemaps/Sodermalmsallen/";
	9283	+ ext = "jpg";
	9284	+ reverseUP = false;
	9285	+ break;
	9286	+ case 8:
	9287	+ name = "cubemaps/Sodermalmsallen2/";
	9288	+ ext = "jpg";
	9289	+ reverseUP = false;
	9290	+ break;
	9291	+ case 9:
	9292	+ name = "cubemaps/UnionSquare/";
	9293	+ ext = "jpg";
	9294	+ reverseUP = false;
	9295	+ break;
9024	9296	default:
9025		- name = "cubemaps/rgb_";
9026		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9297	+ name = "cubemaps/box/";
	9298	+ ext = "png"; /mipmap = true;/
	9299	+ reverseUP = false;
9027	9300	break;
9028	9301	}
9029		-
9030		- try
9031		- {
9032		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9033		- } catch (IOException e)
9034		- {
9035		- throw new RuntimeException(e);
9036		- }
	9302	+
	9303	+ LoadSkybox(name, ext, mipmap);
9037	9304	}
9038	9305
9039	9306	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9065,8 +9332,12 @@
9065	9332	static double[] model = new double[16];
9066	9333	double[] camera2light = new double[16];
9067	9334	double[] light2camera = new double[16];
9068		- int newenvy = -1;
9069		- boolean envyoff = true; // false;
	9335	+
	9336	+ //int newenvy = -1;
	9337	+ //boolean envyoff = false;
	9338	+
	9339	+ String loadedskyboxname;
	9340	+
9070	9341	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9071	9342	//float[] light0 = { 0,0,0 };
9072	9343	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9359,11 +9630,35 @@
9359	9630	jy8[3] = 0.5f;
9360	9631	}
9361	9632
9362		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9633	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9363	9634	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9364	9635	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9365	9636	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9366	9637
	9638	+ void ResetOptions()
	9639	+ {
	9640	+ options1[0] = 100;
	9641	+ options1[1] = 0.025f;
	9642	+ options1[2] = 0.01f;
	9643	+ options1[3] = 0;
	9644	+ options1[4] = 0;
	9645	+
	9646	+ options2[0] = 0;
	9647	+ options2[1] = 0.75f;
	9648	+ options2[2] = 0;
	9649	+ options2[3] = 0;
	9650	+
	9651	+ options3[0] = 1;
	9652	+ options3[1] = 1;
	9653	+ options3[2] = 1;
	9654	+ options3[3] = 0;
	9655	+
	9656	+ options4[0] = 1;
	9657	+ options4[1] = 0;
	9658	+ options4[2] = 1;
	9659	+ options4[3] = 0;
	9660	+ }
	9661	+
9367	9662	static int imagecount = 0; // movie generation
9368	9663
9369	9664	static int jitter = 0;
..	..	@@ -9460,7 +9755,7 @@
9460	9755
9461	9756	if (renderCamera != lightCamera)
9462	9757	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9463		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9758	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9464	9759
9465	9760	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9466	9761
..	..	@@ -9476,7 +9771,7 @@
9476	9771
9477	9772	if (renderCamera != lightCamera)
9478	9773	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9479		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9774	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9480	9775
9481	9776	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9482	9777
..	..	@@ -9522,10 +9817,12 @@
9522	9817	rati = 1 / rati;
9523	9818	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9524	9819	}
9525		- assert (newenvy == -1);
	9820	+
	9821	+ //assert (newenvy == -1);
	9822	+
9526	9823	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9527	9824	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9528		- DrawSkyBox(gl);
	9825	+ DrawSkyBox(gl, (float)rati);
9529	9826	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9530	9827	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9531	9828	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10474,6 +10771,7 @@
10474	10771	ANTIALIAS = 0;
10475	10772	//System.out.println("RESTART");
10476	10773	AAtimer.restart();
	10774	+ Globals.TIMERRUNNING = true;
10477	10775	}
10478	10776	}
10479	10777	}
..	..	@@ -10541,7 +10839,8 @@
10541	10839	ambientOcclusion = false;
10542	10840	}
10543	10841
10544		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10842	+ if (//Globals.lighttouched &&
	10843	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10545	10844	{
10546	10845	//if (RENDERSHADOW) // ?
10547	10846	if (!IsFrozen())
..	..	@@ -10560,7 +10859,7 @@
10560	10859
10561	10860	if (wait)
10562	10861	{
10563		- Sleep(500);
	10862	+ Sleep(200); // blocks everything
10564	10863
10565	10864	wait = false;
10566	10865	}
..	..	@@ -10675,7 +10974,7 @@
10675	10974	// if (parentcam != renderCamera) // not a light
10676	10975	if (cam != lightCamera)
10677	10976	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10678		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10977	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10679	10978
10680	10979	for (int j = 0; j < 4; j++)
10681	10980	{
..	..	@@ -10690,7 +10989,7 @@
10690	10989	// if (parentcam != renderCamera) // not a light
10691	10990	if (cam != lightCamera)
10692	10991	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10693		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10992	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10694	10993
10695	10994	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10696	10995
..	..	@@ -10776,13 +11075,41 @@
10776	11075	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10777	11076	}
10778	11077
10779		- if (newenvy > -1)
	11078	+// if (newenvy > -1)
	11079	+// {
	11080	+// LoadEnvy(newenvy);
	11081	+// }
	11082	+//
	11083	+// newenvy = -1;
	11084	+
	11085	+ if (object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10780	11086	{
10781		- LoadEnvy(newenvy);
	11087	+ if (cubemaprgb == null)
	11088	+ {
	11089	+ cubemaprgb = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11090	+ }
	11091	+
	11092	+ cubemap = cubemaprgb;
10782	11093	}
10783		-
10784		- newenvy = -1;
10785		-
	11094	+ else
	11095	+ {
	11096	+ if (object.skyboxname != null)
	11097	+ {
	11098	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11099	+ {
	11100	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11101	+ loadedskyboxname = object.skyboxname;
	11102	+ }
	11103	+ }
	11104	+ else
	11105	+ {
	11106	+ cubemapcustom = null;
	11107	+ loadedskyboxname = null;
	11108	+ }
	11109	+
	11110	+ cubemap = cubemapcustom;
	11111	+ }
	11112	+
10786	11113	ratio = ((double) getWidth()) / getHeight();
10787	11114	//System.out.println("ratio = " + ratio);
10788	11115
..	..	@@ -10798,7 +11125,7 @@
10798	11125
10799	11126	if (!IsFrozen() && !ambientOcclusion)
10800	11127	{
10801		- DrawSkyBox(gl);
	11128	+ DrawSkyBox(gl, (float)ratio);
10802	11129	}
10803	11130
10804	11131	//if (selection_view == -1)
..	..	@@ -10981,9 +11308,9 @@
10981	11308
10982	11309	gl.glMatrixMode(GL.GL_MODELVIEW);
10983	11310
10984		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10985		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10986		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11311	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11312	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11313	+gl.glEnable(gl.GL_MULTISAMPLE);
10987	11314	} else
10988	11315	{
10989	11316	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10994,7 +11321,7 @@
10994	11321	//System.out.println("BLENDING ON");
10995	11322	gl.glEnable(GL.GL_BLEND);
10996	11323	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10997		-
	11324	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10998	11325	gl.glMatrixMode(gl.GL_PROJECTION);
10999	11326	gl.glLoadIdentity();
11000	11327
..	..	@@ -11084,7 +11411,7 @@
11084	11411
11085	11412	// if (cam != lightCamera)
11086	11413	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11087		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11414	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11088	11415	}
11089	11416
11090	11417	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11243,7 +11570,7 @@
11243	11570	}
11244	11571	}
11245	11572
11246		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11573	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11247	11574	{
11248	11575	//gl.glDepthFunc(GL.GL_LEQUAL);
11249	11576	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11251,24 +11578,21 @@
11251	11578
11252	11579	boolean texon = textureon;
11253	11580
11254		- if (RENDERPROGRAM > 0)
11255		- {
11256		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11257		- textureon = false;
11258		- }
	11581	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11582	+ textureon = false;
	11583	+
11259	11584	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11260	11585	//System.out.println("ALLO");
11261	11586	gl.glColorMask(false, false, false, false);
11262	11587	DrawObject(gl);
11263		- if (RENDERPROGRAM > 0)
11264		- {
11265		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11266		- textureon = texon;
11267		- }
	11588	+
	11589	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11590	+ textureon = texon;
	11591	+
11268	11592	gl.glColorMask(true, true, true, true);
11269	11593
11270	11594	gl.glDepthFunc(GL.GL_EQUAL);
11271		- //gl.glDepthMask(false);
	11595	+ gl.glDepthMask(false);
11272	11596	}
11273	11597
11274	11598	if (false) // DrawMode() == SHADOW)
..	..	@@ -11451,15 +11775,36 @@
11451	11775
11452	11776	static boolean zoomonce = false;
11453	11777
	11778	+ static void CreateSelectedPoint()
	11779	+ {
	11780	+ if (selectedpoint == null)
	11781	+ {
	11782	+ debugpointG = new Sphere();
	11783	+ debugpointP = new Sphere();
	11784	+ debugpointC = new Sphere();
	11785	+ debugpointR = new Sphere();
	11786	+
	11787	+ selectedpoint = new Superellipsoid();
	11788	+
	11789	+ for (int i=0; i<8; i++)
	11790	+ {
	11791	+ debugpoints[i] = new Sphere();
	11792	+ }
	11793	+ }
	11794	+ }
	11795	+
11454	11796	void DrawObject(GL gl, boolean draw)
11455	11797	{
	11798	+ // To clear camera values
	11799	+ ResetOptions();
	11800	+
11456	11801	//System.out.println("DRAW OBJECT " + mouseDown);
11457	11802	// DrawMode() = SELECTION;
11458	11803	//GL gl = getGL();
11459	11804	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11460	11805	{
11461	11806	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11462		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11807	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11463	11808	pingthread.StepToTarget(true); // true);
11464	11809	// zoomonce = false;
11465	11810	}
..	..	@@ -11531,8 +11876,9 @@
11531	11876
11532	11877	if (DrawMode() == DEFAULT)
11533	11878	{
11534		- if (DEBUG)
	11879	+ if (Globals.DEBUG)
11535	11880	{
	11881	+ CreateSelectedPoint();
11536	11882	float radius = 0.05f;
11537	11883	if (selectedpoint.radius != radius)
11538	11884	{
..	..	@@ -11586,20 +11932,32 @@
11586	11932	ReleaseTextures(DEFAULT_TEXTURES);
11587	11933
11588	11934	if (CLEANCACHE)
11589		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11935	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11590	11936	{
11591		- String tex = e.nextElement();
	11937	+ cTexture tex = e.nextElement();
11592	11938
11593	11939	// System.out.println("Texture --------- " + tex);
11594	11940
11595		- if (tex.equals("WHITE_NOISE"))
	11941	+ if (tex.equals("WHITE_NOISE:"))
11596	11942	continue;
11597	11943
11598		- if (!usedtextures.containsKey(tex))
	11944	+ if (!usedtextures.contains(tex))
11599	11945	{
	11946	+ CacheTexture gettex = texturepigment.get(tex);
11600	11947	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11601		- textures.get(tex).texture.dispose();
11602		- textures.remove(tex);
	11948	+ if (gettex != null)
	11949	+ {
	11950	+ gettex.texture.dispose();
	11951	+ texturepigment.remove(tex);
	11952	+ }
	11953	+
	11954	+ gettex = texturebump.get(tex);
	11955	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11956	+ if (gettex != null)
	11957	+ {
	11958	+ gettex.texture.dispose();
	11959	+ texturebump.remove(tex);
	11960	+ }
11603	11961	}
11604	11962	}
11605	11963	}
..	..	@@ -12019,7 +12377,7 @@
12019	12377	for (int i = tp.size(); --i >= 0;)
12020	12378	{
12021	12379	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12022		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12380	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
12023	12381	}
12024	12382
12025	12383
..	..	@@ -12127,8 +12485,76 @@
12127	12485
12128	12486	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12129	12487
12130		- String program =
	12488	+ String programmin =
	12489	+ // Min shader
12131	12490	"!!ARBfp1.0\n" +
	12491	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12492	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12493	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12494	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12495	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12496	+ "PARAM light2cam0 = program.env[10];" +
	12497	+ "PARAM light2cam1 = program.env[11];" +
	12498	+ "PARAM light2cam2 = program.env[12];" +
	12499	+ "TEMP temp;" +
	12500	+ "TEMP light;" +
	12501	+ "TEMP ndotl;" +
	12502	+ "TEMP normal;" +
	12503	+ "TEMP depth;" +
	12504	+ "TEMP eye;" +
	12505	+ "TEMP pos;" +
	12506	+
	12507	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12508	+ Normalize("normal") +
	12509	+ "MOV light, state.light[0].position;" +
	12510	+ "DP3 ndotl.x, light, normal;" +
	12511	+
	12512	+ // shadow
	12513	+ "MOV pos, fragment.texcoord[1];" +
	12514	+ "MOV temp, pos;" +
	12515	+ ShadowTextureFetch("depth", "temp", "1") +
	12516	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12517	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12518	+
	12519	+ // No shadow when out of frustum
	12520	+ //"SGE temp.y, depth.z, zero123.y;" +
	12521	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12522	+
	12523	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12524	+
	12525	+ // Backlit
	12526	+ "MOV pos.w, zero123.y;" +
	12527	+ "DP4 eye.x, pos, light2cam0;" +
	12528	+ "DP4 eye.y, pos, light2cam1;" +
	12529	+ "DP4 eye.z, pos, light2cam2;" +
	12530	+ Normalize("eye") +
	12531	+
	12532	+ "DP3 ndotl.y, -eye, normal;" +
	12533	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12534	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12535	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12536	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12537	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12538	+
	12539	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12540	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12541	+
	12542	+ // Pigment
	12543	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12544	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12545	+ "MUL temp, temp, ndotl.x;" +
	12546	+
	12547	+ "MUL temp, temp, zero123.z;" +
	12548	+
	12549	+ //"MUL temp, temp, ndotl.y;" +
	12550	+
	12551	+ "MOV temp.w, zero123.y;" + // reset alpha
	12552	+ "MOV result.color, temp;" +
	12553	+ "END";
	12554	+
	12555	+ String programmax =
	12556	+ "!!ARBfp1.0\n" +
	12557	+
12132	12558	//"OPTION ARB_fragment_program_shadow;" +
12133	12559	"PARAM light2cam0 = program.env[10];" +
12134	12560	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12243,8 +12669,7 @@
12243	12669	"TEMP shininess;" +
12244	12670	"\n" +
12245	12671	"MOV texSamp, one;" +
12246		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12247		-
	12672	+
12248	12673	"MOV mapgrid.x, one2048th.x;" +
12249	12674	"MOV temp, fragment.texcoord[1];" +
12250	12675	/*
..	..	@@ -12265,20 +12690,20 @@
12265	12690	"MUL temp, floor, mapgrid.x;" +
12266	12691	//"TEX depth0, temp, texture[1], 2D;" +
12267	12692	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12268		- TextureFetch("depth0", "temp", "1") +
	12693	+ ShadowTextureFetch("depth0", "temp", "1") +
12269	12694	"") +
12270	12695	"ADD temp.x, temp.x, mapgrid.x;" +
12271	12696	//"TEX depth1, temp, texture[1], 2D;" +
12272	12697	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12273		- TextureFetch("depth1", "temp", "1") +
	12698	+ ShadowTextureFetch("depth1", "temp", "1") +
12274	12699	"") +
12275	12700	"ADD temp.y, temp.y, mapgrid.x;" +
12276	12701	//"TEX depth2, temp, texture[1], 2D;" +
12277		- TextureFetch("depth2", "temp", "1") +
	12702	+ ShadowTextureFetch("depth2", "temp", "1") +
12278	12703	"SUB temp.x, temp.x, mapgrid.x;" +
12279	12704	//"TEX depth3, temp, texture[1], 2D;" +
12280	12705	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12281		- TextureFetch("depth3", "temp", "1") +
	12706	+ ShadowTextureFetch("depth3", "temp", "1") +
12282	12707	"") +
12283	12708	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12284	12709	//"MOV params, material;" +
..	..	@@ -12649,10 +13074,10 @@
12649	13074	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12650	13075	"") +
12651	13076
12652		- // display shadow only (bump == 0)
	13077	+ // display shadow only (fakedepth == 0)
12653	13078	"SUB temp.x, half.x, shadow.x;" +
12654	13079	"MOV temp.y, -params5.z;" + // params6.x;" +
12655		- "SLT temp.z, temp.y, -one2048th.x;" +
	13080	+ "SLT temp.z, temp.y, -c256i.x;" +
12656	13081	"SUB temp.y, one.x, temp.z;" +
12657	13082	"MUL temp.x, temp.x, temp.y;" +
12658	13083	"KIL temp.x;" +
..	..	@@ -12983,6 +13408,13 @@
12983	13408	//once = true;
12984	13409	}
12985	13410
	13411	+ String program = programmax;
	13412	+
	13413	+ if (Globals.MINSHADER)
	13414	+ {
	13415	+ program = programmin;
	13416	+ }
	13417	+
12986	13418	System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12987	13419	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12988	13420	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
..	..	@@ -13076,25 +13508,26 @@
13076	13508	return out;
13077	13509	}
13078	13510
13079		- String TextureFetch(String dest, String src, String unit)
	13511	+ // Also does frustum culling
	13512	+ String ShadowTextureFetch(String dest, String src, String unit)
13080	13513	{
13081	13514	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13082	13515	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13083	13516	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13517	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13518	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13084	13519	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13085		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13086		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13087		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13088		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13520	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13521	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13089	13522	//"SWZ buffer, temp, w,w,w,w;";
13090		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13523	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13091	13524	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13092	13525	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13093	13526	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13094		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13527	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13095	13528
13096		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13097		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13529	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13530	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13098	13531	}
13099	13532
13100	13533	String Shadow(String depth, String shadow)
..	..	@@ -13141,7 +13574,7 @@
13141	13574	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13142	13575	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13143	13576
13144		- // No shadow when out of frustrum
	13577	+ // No shadow when out of frustum
13145	13578	"SGE temp.x, " + depth + ".z, one.z;" +
13146	13579	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13147	13580	"";
..	..	@@ -13289,7 +13722,8 @@
13289	13722	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13290	13723	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13291	13724	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13292		- Object3D.cVector2[] vector2buffer;
	13725	+
	13726	+ //Object3D.cVector2[] vector2buffer;
13293	13727
13294	13728	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13295	13729	// OUT : diff, spec
..	..	@@ -13305,9 +13739,10 @@
13305	13739	"DP3 " + dest + ".z," + "normals," + "eye;" +
13306	13740	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13307	13741	//"MOV " + dest + ".w," + "normal.z;" +
13308		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13309		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13310		- //"MOV " + dest + ".z," + "params2.w;" +
	13742	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13743	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13744	+
	13745	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13311	13746	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13312	13747	"RCP " + dest + ".w," + dest + ".w;" +
13313	13748	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13812,6 +14247,7 @@
13812	14247	else
13813	14248	if (evt.getSource() == AAtimer)
13814	14249	{
	14250	+ Globals.TIMERRUNNING = false;
13815	14251	if (mouseDown)
13816	14252	{
13817	14253	//new Exception().printStackTrace();
..	..	@@ -13871,7 +14307,7 @@
13871	14307
13872	14308	// fev 2014???
13873	14309	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13874		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14310	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13875	14311	pingthread.StepToTarget(true); // true);
13876	14312	}
13877	14313	// if (!LIVE)
..	..	@@ -13886,6 +14322,7 @@
13886	14322	return;
13887	14323
13888	14324	AAtimer.restart(); //
	14325	+ Globals.TIMERRUNNING = true;
13889	14326
13890	14327	// waslive = LIVE;
13891	14328	// LIVE = false;
..	..	@@ -13935,14 +14372,15 @@
13935	14372	drag = false;
13936	14373	//System.out.println("Mouse DOWN");
13937	14374	editObj = false;
13938		- ClickInfo info = new ClickInfo();
13939		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13940		- info.pane = this;
13941		- info.camera = renderCamera;
13942		- info.x = x;
13943		- info.y = y;
13944		- info.modifiers = modifiersex;
13945		- editObj = object.doEditClick(info, 0);
	14375	+ //ClickInfo info = new ClickInfo();
	14376	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14377	+ object.clickInfo.pane = this;
	14378	+ object.clickInfo.camera = renderCamera;
	14379	+ object.clickInfo.x = x;
	14380	+ object.clickInfo.y = y;
	14381	+ object.clickInfo.modifiers = modifiersex;
	14382	+ editObj = object.doEditClick(//info,
	14383	+ 0);
13946	14384	if (!editObj)
13947	14385	{
13948	14386	hasMarquee = true;
..	..	@@ -14224,12 +14662,12 @@
14224	14662	void GoDown(int mod)
14225	14663	{
14226	14664	MODIFIERS \|= COMMAND;
14227		- /*
	14665	+ /**/
14228	14666	if((mod&SHIFT) == SHIFT)
14229		- manipCamera.RotatePosition(0, -speed);
	14667	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14230	14668	else
14231		- manipCamera.BackForth(0, -speed*delta, getWidth());
14232		- */
	14669	+ manipCamera.RotatePosition(0, -speed);
	14670	+ /**/
14233	14671	if ((mod & SHIFT) == SHIFT)
14234	14672	{
14235	14673	mouseMode = mouseMode; // VR??
..	..	@@ -14245,12 +14683,12 @@
14245	14683	void GoUp(int mod)
14246	14684	{
14247	14685	MODIFIERS \|= COMMAND;
14248		- /*
	14686	+ /**/
14249	14687	if((mod&SHIFT) == SHIFT)
14250		- manipCamera.RotatePosition(0, speed);
	14688	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14251	14689	else
14252		- manipCamera.BackForth(0, speed*delta, getWidth());
14253		- */
	14690	+ manipCamera.RotatePosition(0, speed);
	14691	+ /**/
14254	14692	if ((mod & SHIFT) == SHIFT)
14255	14693	{
14256	14694	mouseMode = mouseMode;
..	..	@@ -14266,12 +14704,12 @@
14266	14704	void GoLeft(int mod)
14267	14705	{
14268	14706	MODIFIERS \|= COMMAND;
14269		- /*
	14707	+ /**/
14270	14708	if((mod&SHIFT) == SHIFT)
14271		- manipCamera.RotatePosition(speed, 0);
14272		- else
14273	14709	manipCamera.Translate(speed*delta, 0, getWidth());
14274		- */
	14710	+ else
	14711	+ manipCamera.RotatePosition(speed, 0);
	14712	+ /**/
14275	14713	if ((mod & SHIFT) == SHIFT)
14276	14714	{
14277	14715	mouseMode = mouseMode;
..	..	@@ -14287,12 +14725,12 @@
14287	14725	void GoRight(int mod)
14288	14726	{
14289	14727	MODIFIERS \|= COMMAND;
14290		- /*
	14728	+ /**/
14291	14729	if((mod&SHIFT) == SHIFT)
14292		- manipCamera.RotatePosition(-speed, 0);
14293		- else
14294	14730	manipCamera.Translate(-speed*delta, 0, getWidth());
14295		- */
	14731	+ else
	14732	+ manipCamera.RotatePosition(-speed, 0);
	14733	+ /**/
14296	14734	if ((mod & SHIFT) == SHIFT)
14297	14735	{
14298	14736	mouseMode = mouseMode;
..	..	@@ -14342,14 +14780,16 @@
14342	14780	if (editObj)
14343	14781	{
14344	14782	drag = true;
14345		- ClickInfo info = new ClickInfo();
14346		- info.bounds.setBounds(0, 0,
	14783	+ //ClickInfo info = new ClickInfo();
	14784	+ object.clickInfo.bounds.setBounds(0, 0,
14347	14785	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14348		- info.pane = this;
14349		- info.camera = renderCamera;
14350		- info.x = x;
14351		- info.y = y;
14352		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14786	+ object.clickInfo.pane = this;
	14787	+ object.clickInfo.camera = renderCamera;
	14788	+ object.clickInfo.x = x;
	14789	+ object.clickInfo.y = y;
	14790	+ object //.GetWindow().copy
	14791	+ .doEditDrag(//info,
	14792	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14353	14793	} else
14354	14794	{
14355	14795	if (x < startX)
..	..	@@ -14498,22 +14938,27 @@
14498	14938	}
14499	14939	}
14500	14940
	14941	+// ClickInfo clickInfo = new ClickInfo();
	14942	+
14501	14943	public void mouseMoved(MouseEvent e)
14502	14944	{
14503	14945	//System.out.println("mouseMoved: " + e);
14504	14946	if (isRenderer)
14505	14947	return;
14506	14948
14507		- ClickInfo ci = new ClickInfo();
14508		- ci.x = e.getX();
14509		- ci.y = e.getY();
14510		- ci.modifiers = e.getModifiersEx();
14511		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14512		- ci.pane = this;
14513		- ci.camera = renderCamera;
	14949	+ // Mouse cursor feedback
	14950	+ object.clickInfo.x = e.getX();
	14951	+ object.clickInfo.y = e.getY();
	14952	+ object.clickInfo.modifiers = e.getModifiersEx();
	14953	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14954	+ object.clickInfo.pane = this;
	14955	+ object.clickInfo.camera = renderCamera;
14514	14956	if (!isRenderer)
14515	14957	{
14516		- if (object.editWindow.copy.doEditClick(ci, 0))
	14958	+ //ObjEditor editWindow = object.editWindow;
	14959	+ //Object3D copy = editWindow.copy;
	14960	+ if (object.doEditClick(//clickInfo,
	14961	+ 0))
14517	14962	{
14518	14963	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14519	14964	} else
..	..	@@ -14528,7 +14973,8 @@
14528	14973	Globals.MOUSEDRAGGED = false;
14529	14974
14530	14975	movingcamera = false;
14531		- X = Y = 0;
	14976	+ X = 0; // getBounds().width/2;
	14977	+ Y = 0; // getBounds().height/2;
14532	14978	//System.out.println("mouseReleased: " + e);
14533	14979	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14534	14980	}
..	..	@@ -14784,7 +15230,8 @@
14784	15230	// break;
14785	15231	case 'T':
14786	15232	CACHETEXTURE ^= true;
14787		- textures.clear();
	15233	+ texturepigment.clear();
	15234	+ texturebump.clear();
14788	15235	// repaint();
14789	15236	break;
14790	15237	case 'Y':
..	..	@@ -14869,7 +15316,9 @@
14869	15316	case 'E' : COMPACT ^= true;
14870	15317	repaint();
14871	15318	break;
14872		- case 'W' : DEBUGHSB ^= true;
	15319	+ case 'W' : // Wide Window (fullscreen)
	15320	+ //DEBUGHSB ^= true;
	15321	+ ObjEditor.theFrame.ToggleFullScreen();
14873	15322	repaint();
14874	15323	break;
14875	15324	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14894,8 +15343,8 @@
14894	15343	RevertCamera();
14895	15344	repaint();
14896	15345	break;
14897		- case 'L':
14898	15346	case 'l':
	15347	+ //case 'L':
14899	15348	if (lightMode)
14900	15349	{
14901	15350	lightMode = false;
..	..	@@ -14959,20 +15408,24 @@
14959	15408	OCCLUSION_CULLING ^= true;
14960	15409	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14961	15410	break;
14962		- case '0': envyoff ^= true; repaint(); break;
	15411	+ //case '0': envyoff ^= true; repaint(); break;
14963	15412	case '1':
14964	15413	case '2':
14965	15414	case '3':
14966	15415	case '4':
14967	15416	case '5':
14968		- newenvy = Character.getNumericValue(key);
14969		- repaint();
14970		- break;
14971	15417	case '6':
14972	15418	case '7':
14973	15419	case '8':
14974	15420	case '9':
14975		- BGcolor = (key - '6')/3.f;
	15421	+ if (true) // envyoff)
	15422	+ {
	15423	+ BGcolor = (key - '1')/8.f;
	15424	+ }
	15425	+ else
	15426	+ {
	15427	+ //newenvy = Character.getNumericValue(key);
	15428	+ }
14976	15429	repaint();
14977	15430	break;
14978	15431	case '!':
..	..	@@ -15038,9 +15491,9 @@
15038	15491	case '_':
15039	15492	kompactbit = 5;
15040	15493	break;
15041		- case '+':
15042		- kompactbit = 6;
15043		- break;
	15494	+// case '+':
	15495	+// kompactbit = 6;
	15496	+// break;
15044	15497	case ' ':
15045	15498	lightMode ^= true;
15046	15499	Globals.lighttouched = true;
..	..	@@ -15052,6 +15505,7 @@
15052	15505	case ESC:
15053	15506	RENDERPROGRAM += 1;
15054	15507	RENDERPROGRAM %= 3;
	15508	+
15055	15509	repaint();
15056	15510	break;
15057	15511	case 'Z':
..	..	@@ -15091,8 +15545,9 @@
15091	15545	case DELETE:
15092	15546	ClearSelection();
15093	15547	break;
15094		- /*
15095	15548	case '+':
	15549	+
	15550	+ /*
15096	15551	//fontsize += 1;
15097	15552	bbzoom *= 2;
15098	15553	repaint();
..	..	@@ -15109,17 +15564,17 @@
15109	15564	case '=':
15110	15565	IncDepth();
15111	15566	//fontsize += 1;
15112		- object.editWindow.refreshContents(true);
	15567	+ object.GetWindow().refreshContents(true);
15113	15568	maskbit = 6;
15114	15569	break;
15115	15570	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15116	15571	DecDepth();
15117	15572	maskbit = 5;
15118	15573	//if(fontsize > 1) fontsize -= 1;
15119		- if (object.editWindow == null)
15120		- new Exception().printStackTrace();
15121		- else
15122		- object.editWindow.refreshContents(true);
	15574	+// if (object.editWindow == null)
	15575	+// new Exception().printStackTrace();
	15576	+// else
	15577	+ object.GetWindow().refreshContents(true);
15123	15578	break;
15124	15579	case '{':
15125	15580	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15343,7 +15798,7 @@
15343	15798	}
15344	15799	*/
15345	15800
15346		- object.editWindow.EditSelection();
	15801	+ object.GetWindow().EditSelection(false);
15347	15802	}
15348	15803
15349	15804	void SelectParent()
..	..	@@ -15360,10 +15815,10 @@
15360	15815	{
15361	15816	//selectees.remove(i);
15362	15817	System.out.println("select parent of " + elem);
15363		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15818	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15364	15819	} else
15365	15820	{
15366		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15821	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15367	15822	}
15368	15823
15369	15824	first = false;
..	..	@@ -15405,12 +15860,12 @@
15405	15860	for (int j = 0; j < group.children.size(); j++)
15406	15861	{
15407	15862	elem = (Object3D) group.children.elementAt(j);
15408		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15863	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15409	15864	first = false;
15410	15865	}
15411	15866	} else
15412	15867	{
15413		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15868	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15414	15869	}
15415	15870
15416	15871	first = false;
..	..	@@ -15421,21 +15876,21 @@
15421	15876	{
15422	15877	//Composite group = (Composite) object;
15423	15878	Object3D group = object;
15424		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15879	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15425	15880	}
15426	15881
15427	15882	void ResetTransform(int mask)
15428	15883	{
15429	15884	//Composite group = (Composite) object;
15430	15885	Object3D group = object;
15431		- group.editWindow.ResetTransform(mask);
	15886	+ group.GetWindow().ResetTransform(mask);
15432	15887	}
15433	15888
15434	15889	void FlipTransform()
15435	15890	{
15436	15891	//Composite group = (Composite) object;
15437	15892	Object3D group = object;
15438		- group.editWindow.FlipTransform();
	15893	+ group.GetWindow().FlipTransform();
15439	15894	// group.editWindow.ReduceMesh(true);
15440	15895	}
15441	15896
..	..	@@ -15443,7 +15898,7 @@
15443	15898	{
15444	15899	//Composite group = (Composite) object;
15445	15900	Object3D group = object;
15446		- group.editWindow.PrintMemory();
	15901	+ group.GetWindow().PrintMemory();
15447	15902	// group.editWindow.ReduceMesh(true);
15448	15903	}
15449	15904
..	..	@@ -15451,7 +15906,7 @@
15451	15906	{
15452	15907	//Composite group = (Composite) object;
15453	15908	Object3D group = object;
15454		- group.editWindow.ResetCentroid();
	15909	+ group.GetWindow().ResetCentroid();
15455	15910	}
15456	15911
15457	15912	void IncDepth()
..	..	@@ -15533,8 +15988,6 @@
15533	15988
15534	15989	int width = getBounds().width;
15535	15990	int height = getBounds().height;
15536		- ClickInfo info = new ClickInfo();
15537		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15538	15991	//Image img = CreateImage(width, height);
15539	15992	//System.out.println("width = " + width + "; height = " + height + "\n");
15540	15993
..	..	@@ -15611,48 +16064,77 @@
15611	16064	}
15612	16065	if (object != null && !hasMarquee)
15613	16066	{
	16067	+ if (object.clickInfo == null)
	16068	+ object.clickInfo = new ClickInfo();
	16069	+ ClickInfo info = object.clickInfo;
	16070	+ //ClickInfo info = new ClickInfo();
	16071	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16072	+
15614	16073	if (isRenderer)
15615	16074	{
15616		- info.flags++;
	16075	+ object.clickInfo.flags++;
15617	16076	double frameAspect = (double) width / (double) height;
15618	16077	if (frameAspect > renderCamera.aspect)
15619	16078	{
15620	16079	int desired = (int) ((double) height * renderCamera.aspect);
15621		- info.bounds.width -= width - desired;
15622		- info.bounds.x += (width - desired) / 2;
	16080	+ object.clickInfo.bounds.width -= width - desired;
	16081	+ object.clickInfo.bounds.x += (width - desired) / 2;
15623	16082	} else
15624	16083	{
15625	16084	int desired = (int) ((double) width / renderCamera.aspect);
15626		- info.bounds.height -= height - desired;
15627		- info.bounds.y += (height - desired) / 2;
	16085	+ object.clickInfo.bounds.height -= height - desired;
	16086	+ object.clickInfo.bounds.y += (height - desired) / 2;
15628	16087	}
15629	16088	}
15630		- info.g = gr;
15631		- info.camera = renderCamera;
	16089	+
	16090	+ object.clickInfo.g = gr;
	16091	+ object.clickInfo.camera = renderCamera;
15632	16092	/*
15633	16093	// Memory intensive (brep.verticescopy)
15634	16094	if (!(object instanceof Composite))
15635	16095	object.draw(info, 0, false); // SLOW :
15636	16096	*/
15637		- if (!isRenderer)
	16097	+ if (!isRenderer) // && drag)
15638	16098	{
15639		- object.drawEditHandles(info, 0);
15640		-
15641		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16099	+ Grafreed.Assert(object != null);
	16100	+ Grafreed.Assert(object.selection != null);
	16101	+ if (object.selection.Size() > 0)
15642	16102	{
15643		- switch (object.selection.get(0).hitSomething)
	16103	+ int hitSomething = object.selection.get(0).hitSomething;
	16104	+
	16105	+ object.clickInfo.DX = 0;
	16106	+ object.clickInfo.DY = 0;
	16107	+ object.clickInfo.W = 1;
	16108	+ if (hitSomething == Object3D.hitCenter)
15644	16109	{
15645		- case Object3D.hitCenter: gr.setColor(Color.pink);
15646		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15647		- break;
15648		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15649		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15650		- break;
15651		- case Object3D.hitScale: gr.setColor(Color.cyan);
15652		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15653		- break;
	16110	+ info.DX = X;
	16111	+ if (X != 0)
	16112	+ info.DX -= info.bounds.width/2;
	16113	+
	16114	+ info.DY = Y;
	16115	+ if (Y != 0)
	16116	+ info.DY -= info.bounds.height/2;
15654	16117	}
15655		-
	16118	+
	16119	+ object.drawEditHandles(//info,
	16120	+ 0);
	16121	+
	16122	+ if (drag && (X != 0 \|\| Y != 0))
	16123	+ {
	16124	+ switch (hitSomething)
	16125	+ {
	16126	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16127	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16128	+ break;
	16129	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16130	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16131	+ break;
	16132	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16133	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16134	+ break;
	16135	+ }
	16136	+
	16137	+ }
15656	16138	}
15657	16139	}
15658	16140	}
..	..	@@ -16134,6 +16616,8 @@
16134	16616	private /static/ boolean firstime;
16135	16617	private /static/ cVector newView = new cVector();
16136	16618	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16619	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16620	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16137	16621	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16138	16622	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16139	16623	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16146,29 +16630,67 @@
16146	16630	{
16147	16631	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16148	16632
	16633	+ int usedsuf = 0;
	16634	+
16149	16635	for (int i = 0; i < suffixes.length; i++)
16150	16636	{
16151		- String resourceName = basename + suffixes[i] + "." + suffix;
16152		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16153		- mipmapped,
16154		- FileUtil.getFileSuffix(resourceName));
16155		- if (data == null)
	16637	+ String[] suffixe = suffixes;
	16638	+ String[] fallback = suffixes2;
	16639	+ String[] fallfallback = suffixes3;
	16640	+
	16641	+ for (int c=usedsuf; --c>=0;)
16156	16642	{
16157		- throw new IOException("Unable to load texture " + resourceName);
	16643	+// String[] temp = suffixe;
	16644	+// suffixe = fallback;
	16645	+// fallback = fallfallback;
	16646	+// fallfallback = temp;
16158	16647	}
	16648	+
	16649	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16650	+ TextureData data;
	16651	+
	16652	+ try
	16653	+ {
	16654	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16655	+ mipmapped,
	16656	+ FileUtil.getFileSuffix(resourceName));
	16657	+ }
	16658	+ catch (Exception e)
	16659	+ {
	16660	+ try
	16661	+ {
	16662	+ resourceName = basename + fallback[i] + "." + suffix;
	16663	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16664	+ mipmapped,
	16665	+ FileUtil.getFileSuffix(resourceName));
	16666	+ }
	16667	+ catch (Exception e2)
	16668	+ {
	16669	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16670	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16671	+ mipmapped,
	16672	+ FileUtil.getFileSuffix(resourceName));
	16673	+ }
	16674	+ }
	16675	+
16159	16676	//System.out.println("Target = " + targets[i]);
16160	16677	cubemap.updateImage(data, targets[i]);
16161	16678	}
16162	16679
16163	16680	return cubemap;
16164	16681	}
	16682	+
16165	16683	int bigsphere = -1;
16166	16684
16167	16685	float BGcolor = 0.5f;
16168	16686
16169		- private void DrawSkyBox(GL gl)
	16687	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16688	+
	16689	+ private void DrawSkyBox(GL gl, float ratio)
16170	16690	{
16171		- if (envyoff \|\| cubemap == null)
	16691	+ if (//envyoff \|\|
	16692	+ WIREFRAME \|\|
	16693	+ cubemap == null)
16172	16694	{
16173	16695	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16174	16696	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16183,7 +16705,17 @@
16183	16705	// Compensates for ExaminerViewer's modification of modelview matrix
16184	16706	gl.glMatrixMode(GL.GL_MODELVIEW);
16185	16707	gl.glLoadIdentity();
	16708	+ gl.glScalef(1,ratio,1);
16186	16709
	16710	+// colorV[0] = 2;
	16711	+// colorV[1] = 2;
	16712	+// colorV[2] = 2;
	16713	+// colorV[3] = 1;
	16714	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16715	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16716	+//
	16717	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16718	+
16187	16719	//gl.glActiveTexture(GL.GL_TEXTURE1);
16188	16720	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16189	16721
..	..	@@ -16215,6 +16747,7 @@
16215	16747	{
16216	16748	gl.glScalef(1.0f, -1.0f, 1.0f);
16217	16749	}
	16750	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16218	16751	gl.glMultMatrixd(viewrot_1, 0);
16219	16752	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16220	16753	//viewer.updateInverseRotation(gl);
..	..	@@ -16355,16 +16888,16 @@
16355	16888	cStatic.objectstack[materialdepth++] = checker;
16356	16889	//System.out.println("material " + material);
16357	16890	//Applet3D.tracein(this, selected);
16358		- vector2buffer = checker.projectedVertices;
	16891	+ //vector2buffer = checker.projectedVertices;
16359	16892
16360	16893	//checker.GetMaterial().Draw(this, false); // true);
16361		- DrawMaterial(checker.GetMaterial(), false); // true);
	16894	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16362	16895
16363	16896	materialdepth -= 1;
16364	16897	if (materialdepth > 0)
16365	16898	{
16366		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16367		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16899	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16900	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16368	16901	}
16369	16902	//checker.GetMaterial().opacity = 1f;
16370	16903	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16450,6 +16983,14 @@
16450	16983	}
16451	16984	}
16452	16985
	16986	+ private Object3D GetFolder()
	16987	+ {
	16988	+ Object3D folder = object.GetWindow().copy;
	16989	+ if (object.GetWindow().copy.selection.Size() > 0)
	16990	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16991	+ return folder;
	16992	+ }
	16993	+
16453	16994	class SelectBuffer implements GLEventListener
16454	16995	{
16455	16996
..	..	@@ -16465,7 +17006,7 @@
16465	17006	//new Exception().printStackTrace();
16466	17007	System.out.println("select buffer init");
16467	17008	// Use debug pipeline
16468		- drawable.setGL(new DebugGL(drawable.getGL()));
	17009	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16469	17010
16470	17011	GL gl = drawable.getGL();
16471	17012
..	..	@@ -16529,6 +17070,17 @@
16529	17070
16530	17071	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16531	17072
	17073	+ if (PAINTMODE)
	17074	+ {
	17075	+ if (object.GetWindow().copy.selection.Size() > 0)
	17076	+ {
	17077	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17078	+
	17079	+ // Make what you paint not selectable.
	17080	+ paintobj.ResetSelectable();
	17081	+ }
	17082	+ }
	17083	+
16532	17084	//int tmp = selection_view;
16533	17085	//selection_view = -1;
16534	17086	int temp = DrawMode();
..	..	@@ -16540,6 +17092,17 @@
16540	17092	// temp = DEFAULT; // patch for selection debug
16541	17093	Globals.drawMode = temp; // WARNING
16542	17094
	17095	+ if (PAINTMODE)
	17096	+ {
	17097	+ if (object.GetWindow().copy.selection.Size() > 0)
	17098	+ {
	17099	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17100	+
	17101	+ // Revert.
	17102	+ paintobj.RestoreSelectable();
	17103	+ }
	17104	+ }
	17105	+
16543	17106	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16544	17107
16545	17108	// trying different ways of getting the depth info over
..	..	@@ -16587,6 +17150,8 @@
16587	17150	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16588	17151	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16589	17152	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17153	+
	17154	+ CreateSelectedPoint();
16590	17155
16591	17156	// Will fit the mesh !!!
16592	17157	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16641,29 +17206,31 @@
16641	17206	}
16642	17207
16643	17208	if (!movingcamera && !PAINTMODE)
16644		- object.editWindow.ScreenFitPoint(); // fev 2014
	17209	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16645	17210
16646		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17211	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16647	17212	{
16648		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17213	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16649	17214
16650		- Object3D group = new Object3D("inst" + paintcount++);
	17215	+ if (object.GetWindow().copy.selection.Size() > 0)
	17216	+ {
	17217	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16651	17218
16652		- group.CreateMaterial(); // use a void leaf to select instances
16653		-
16654		- group.add(paintobj); // link
16655		-
16656		- object.editWindow.SnapObject(group);
16657		-
16658		- Object3D folder = object.editWindow.copy;
16659		-
16660		- if (object.editWindow.copy.selection.Size() > 0)
16661		- folder = object.editWindow.copy.selection.elementAt(0);
16662		-
16663		- folder.add(group);
16664		-
16665		- object.editWindow.ResetModel();
16666		- object.editWindow.refreshContents();
	17219	+ Object3D inst = new Object3D("inst" + paintcount++);
	17220	+
	17221	+ inst.CreateMaterial(); // use a void leaf to select instances
	17222	+
	17223	+ inst.add(paintobj); // link
	17224	+
	17225	+ object.GetWindow().SnapObject(inst);
	17226	+
	17227	+ Object3D folder = paintFolder; // GetFolder();
	17228	+
	17229	+ folder.add(inst);
	17230	+
	17231	+ object.GetWindow().ResetModel();
	17232	+ object.GetWindow().refreshContents();
	17233	+ }
16667	17234	}
16668	17235	else
16669	17236	paintcount = 0;
..	..	@@ -16702,6 +17269,11 @@
16702	17269	//System.out.println("objects[color] = " + objects[color]);
16703	17270	//objects[color].Select();
16704	17271	indexcount = 0;
	17272	+ ObjEditor window = object.GetWindow();
	17273	+ if (window != null && deselect)
	17274	+ {
	17275	+ window.Select(null, deselect, true);
	17276	+ }
16705	17277	object.Select(color, deselect);
16706	17278	}
16707	17279
..	..	@@ -16980,10 +17552,14 @@
16980	17552	gl.glFlush();
16981	17553
16982	17554	/**/
16983		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17555	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
16984	17556
16985		- float[] pixels = occlusionsizebuffer.array();
	17557	+ float[] depths = occlusiondepthbuffer.array();
16986	17558
	17559	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17560	+
	17561	+ int[] pixels = selectsizebuffer.array();
	17562	+
16987	17563	double r = 0, g = 0, b = 0;
16988	17564
16989	17565	double count = 0;
..	..	@@ -16994,7 +17570,7 @@
16994	17570
16995	17571	double FACTOR = 1;
16996	17572
16997		- for (int i = 0; i < pixels.length; i++)
	17573	+ for (int i = 0; i < depths.length; i++)
16998	17574	{
16999	17575	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17000	17576	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17077,7 +17653,7 @@
17077	17653
17078	17654	double scale = ray.z; // 1; // cos
17079	17655
17080		- float depth = pixels[newindex];
	17656	+ float depth = depths[newindex];
17081	17657
17082	17658	/*
17083	17659	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17227,23 +17803,15 @@
17227	17803	int AAbuffersize = 0;
17228	17804
17229	17805	//double[] selectedpoint = new double[3];
17230		- static Superellipsoid selectedpoint = new Superellipsoid();
	17806	+ static Superellipsoid selectedpoint;
17231	17807	static Sphere previousselectedpoint = null;
17232		- static Sphere debugpointG = new Sphere();
17233		- static Sphere debugpointP = new Sphere();
17234		- static Sphere debugpointC = new Sphere();
17235		- static Sphere debugpointR = new Sphere();
	17808	+ static Sphere debugpointG;
	17809	+ static Sphere debugpointP;
	17810	+ static Sphere debugpointC;
	17811	+ static Sphere debugpointR;
17236	17812
17237	17813	static Sphere debugpoints[] = new Sphere[8];
17238	17814
17239		- static
17240		- {
17241		- for (int i=0; i<8; i++)
17242		- {
17243		- debugpoints[i] = new Sphere();
17244		- }
17245		- }
17246		-
17247	17815	static void InitPoints(float radius)
17248	17816	{
17249	17817	for (int i=0; i<8; i++)
..	..	@@ -17282,11 +17850,14 @@
17282	17850	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17283	17851	static IntBuffer bigAAbuffer;
17284	17852	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17285		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17853	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17286	17854	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17287	17855	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17288	17856	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17289		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17857	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17858	+
	17859	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17860	+
17290	17861	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17291	17862	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17292	17863	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();