~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -37,7 +41,6 @@
37	41	static boolean[] selectedstack = new boolean[65536];
38	42	static int materialdepth = 0;
39	43
40		- static boolean DEBUG = false;
41	44	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	45
43	46	// camera change fix
..	..	@@ -45,6 +48,39 @@
45	48	static boolean ABORTED = false;
46	49
47	50	static int STEP = 1;
	51	+
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	53	+ {
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
	83	+ }
48	84
49	85	/static/ private boolean CULLFACE = false; // true;
50	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -61,7 +97,7 @@
61	97	//boolean REDUCETEXTURE = true;
62	98	boolean CACHETEXTURE = true;
63	99	boolean CLEANCACHE = false; // true;
64		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
65	101	boolean COMPRESSTEXTURE = false;
66	102	boolean KOMPACTTEXTURE = false; // true;
67	103	boolean RESIZETEXTURE = false;
..	..	@@ -151,6 +187,18 @@
151	187	}
152	188
153	189	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	190	+
	191	+ public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	192	+ {
	193	+ try
	194	+ {
	195	+ cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	196	+ } catch (IOException e)
	197	+ {
	198	+ System.out.println("NAME = " + name);
	199	+ e.printStackTrace(); // throw new RuntimeException(e);
	200	+ }
	201	+ }
154	202
155	203	void SetAsGLRenderer(boolean b)
156	204	{
..	..	@@ -170,7 +218,8 @@
170	218
171	219	SetCamera(cam);
172	220
173		- SetLight(new Camera(new cVector(10, 10, -20)));
	221	+ // Warning: not used.
	222	+ SetLight(new Camera(new cVector(15, 10, -20)));
174	223
175	224	object = o;
176	225
..	..	@@ -327,7 +376,7 @@
327	376	cStatic.objectstack[materialdepth++] = obj;
328	377	//System.out.println("material " + material);
329	378	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	379	+ //display.vector2buffer = obj.projectedVertices;
331	380	if (obj instanceof Camera)
332	381	{
333	382	display.options1[0] = material.shift;
..	..	@@ -336,14 +385,28 @@
336	385	display.options1[2] = material.shadowbias;
337	386	display.options1[3] = material.aniso;
338	387	display.options1[4] = material.anisoV;
	388	+// System.out.println("display.options1[0] " + display.options1[0]);
	389	+// System.out.println("display.options1[1] " + display.options1[1]);
	390	+// System.out.println("display.options1[2] " + display.options1[2]);
	391	+// System.out.println("display.options1[3] " + display.options1[3]);
	392	+// System.out.println("display.options1[4] " + display.options1[4]);
339	393	display.options2[0] = material.opacity;
340	394	display.options2[1] = material.diffuse;
341	395	display.options2[2] = material.factor;
	396	+// System.out.println("display.options2[0] " + display.options2[0]);
	397	+// System.out.println("display.options2[1] " + display.options2[1]);
	398	+// System.out.println("display.options2[2] " + display.options2[2]);
342	399
343	400	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	401	+// System.out.println("display.options3[0] " + display.options3[0]);
	402	+// System.out.println("display.options3[1] " + display.options3[1]);
	403	+// System.out.println("display.options3[2] " + display.options3[2]);
344	404	display.options4[0] = material.cameralight/0.2f;
345	405	display.options4[1] = material.subsurface;
346	406	display.options4[2] = material.sheen;
	407	+// System.out.println("display.options4[0] " + display.options4[0]);
	408	+// System.out.println("display.options4[1] " + display.options4[1]);
	409	+// System.out.println("display.options4[2] " + display.options4[2]);
347	410
348	411	// if (display.CURRENTANTIALIAS > 0)
349	412	// display.options3[3] /= 4;
..	..	@@ -359,7 +422,7 @@
359	422	/**/
360	423	} else
361	424	{
362		- DrawMaterial(material, selected);
	425	+ DrawMaterial(material, selected, obj.projectedVertices);
363	426	}
364	427	} else
365	428	{
..	..	@@ -383,8 +446,8 @@
383	446	cStatic.objectstack[materialdepth++] = obj;
384	447	//System.out.println("material " + material);
385	448	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	449	+ //display.vector2buffer = obj.projectedVertices;
	450	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	451	}
389	452	}
390	453
..	..	@@ -401,8 +464,8 @@
401	464	materialdepth -= 1;
402	465	if (materialdepth > 0)
403	466	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	467	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	468	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	469	}
407	470	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	471	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +485,8 @@
422	485	materialdepth -= 1;
423	486	if (materialdepth > 0)
424	487	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	488	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	489	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	490	}
428	491	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	492	//else
..	..	@@ -464,10 +527,12 @@
464	527	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	528	{
466	529	//gl.glBegin(gl.GL_TRIANGLES);
467		- boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	530	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	531	+ // TEST LIVE NORMALS && !obj.dontselect
	532	+ ;
468	533	if (!hasnorm)
469	534	{
470		- // System.out.println("FUCK!!");
	535	+ // System.out.println("Mesh normal");
471	536	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	537	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	538	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1192,10 +1257,12 @@
1192	1257	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1258	}
1194	1259	}
	1260	+
1195	1261	if (flipV)
1196	1262	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1263	else
1198	1264	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1265	+
1199	1266	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1267	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1268
..	..	@@ -1215,10 +1282,12 @@
1215	1282	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1283	}
1217	1284	}
	1285	+
1218	1286	if (flipV)
1219	1287	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1288	else
1221	1289	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1290	+
1222	1291	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1292	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1293
..	..	@@ -1246,8 +1315,10 @@
1246	1315	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1316	else
1248	1317	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1318	+
1249	1319	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1320	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1321	+
1251	1322	count2 += 2;
1252	1323	count3 += 3;
1253	1324	}
..	..	@@ -1426,6 +1497,8 @@
1426	1497	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1427	1498	}
1428	1499
	1500	+ float[] colorV = new float[4];
	1501	+
1429	1502	void SetColor(Object3D obj, Vertex p0)
1430	1503	{
1431	1504	CameraPane display = this;
..	..	@@ -1493,8 +1566,6 @@
1493	1566	{
1494	1567	return;
1495	1568	}
1496		-
1497		- float[] colorV = new float[3];
1498	1569
1499	1570	if (false) // marked)
1500	1571	{
..	..	@@ -1603,7 +1674,7 @@
1603	1674	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1675	}
1605	1676
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1677	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1678	{
1608	1679	CameraPane display = this;
1609	1680	//new Exception().printStackTrace();
..	..	@@ -1638,7 +1709,7 @@
1638	1709	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1710	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1711	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1712	+ colorV[3] = 1; // material.opacity;
1642	1713
1643	1714	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1715	//System.out.println("Opacity = " + opacity);
..	..	@@ -1746,9 +1817,9 @@
1746	1817	display.modelParams7[2] = 0;
1747	1818	display.modelParams7[3] = 0;
1748	1819
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1820	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1821
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1822	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1823	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1824	{
1754	1825	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -2044,7 +2115,7 @@
2044	2115	//System.err.println("Oeil on");
2045	2116	OEIL = true;
2046	2117	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2118	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2048	2119	//pingthread.StepToTarget(true);
2049	2120	}
2050	2121
..	..	@@ -2259,7 +2330,7 @@
2259	2330
2260	2331	void ToggleDebug()
2261	2332	{
2262		- DEBUG ^= true;
	2333	+ Globals.DEBUG ^= true;
2263	2334	}
2264	2335
2265	2336	void ToggleLookAt()
..	..	@@ -2277,10 +2348,17 @@
2277	2348	HANDLES ^= true;
2278	2349	}
2279	2350
	2351	+ Object3D paintFolder;
	2352	+
2280	2353	void TogglePaint()
2281	2354	{
2282	2355	PAINTMODE ^= true;
2283	2356	paintcount = 0;
	2357	+
	2358	+ if (PAINTMODE)
	2359	+ {
	2360	+ paintFolder = GetFolder();
	2361	+ }
2284	2362	}
2285	2363
2286	2364	void SwapCamera(int a, int b)
..	..	@@ -2377,6 +2455,21 @@
2377	2455	return currentGL;
2378	2456	}
2379	2457
	2458	+ static private BufferedImage CreateBim(TextureData texturedata)
	2459	+ {
	2460	+ Grafreed.Assert(texturedata != null);
	2461	+
	2462	+ int width = texturedata.getWidth();
	2463	+ int height = texturedata.getHeight();
	2464	+
	2465	+ Buffer buffer = texturedata.getBuffer();
	2466	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2467	+
	2468	+ byte[] bytes = bytebuf.array();
	2469	+
	2470	+ return CreateBim(bytes, width, height);
	2471	+ }
	2472	+
2380	2473	/**/
2381	2474	class CacheTexture
2382	2475	{
..	..	@@ -2385,28 +2478,31 @@
2385	2478
2386	2479	int resolution;
2387	2480
2388		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2481	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2389	2482	{
2390		- texture = tex;
	2483	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2484	+ texturedata = texdata;
2391	2485	resolution = res;
2392	2486	}
2393	2487	}
2394	2488	/**/
2395	2489
2396	2490	// TEXTURE static Texture texture;
2397		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2398		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2399		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2491	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2492	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2493	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2494	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2495	+
2400	2496	int pigmentdepth = 0;
2401	2497	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2498	int bumpdepth = 0;
2403	2499	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2404	2500	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2405	2501	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2406		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2502	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2407	2503	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2408	2504
2409		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2505	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2410	2506	{
2411	2507	TextureData texturedata = null;
2412	2508
..	..	@@ -2425,13 +2521,34 @@
2425	2521	if (bump)
2426	2522	texturedata = ConvertBump(texturedata, false);
2427	2523
2428		- com.sun.opengl.util.texture.Texture texture =
2429		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2524	+// com.sun.opengl.util.texture.Texture texture =
	2525	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2430	2526
2431		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2432		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2527	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2528	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2433	2529
2434		- return texture;
	2530	+ return texturedata;
	2531	+ }
	2532	+
	2533	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2534	+ {
	2535	+ TextureData texturedata = null;
	2536	+
	2537	+ try
	2538	+ {
	2539	+ texturedata =
	2540	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2541	+ bim,
	2542	+ true);
	2543	+ } catch (Exception e)
	2544	+ {
	2545	+ throw new javax.media.opengl.GLException(e);
	2546	+ }
	2547	+
	2548	+ if (bump)
	2549	+ texturedata = ConvertBump(texturedata, false);
	2550	+
	2551	+ return texturedata;
2435	2552	}
2436	2553
2437	2554	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3504,6 +3621,8 @@
3504	3621
3505	3622	System.out.println("LOADING TEXTURE : " + name);
3506	3623
	3624	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3625	+
3507	3626	//
3508	3627	if (false) // compressbit > 0)
3509	3628	{
..	..	@@ -7902,7 +8021,7 @@
7902	8021	String pigment = Object3D.GetPigment(tex);
7903	8022	String bump = Object3D.GetBump(tex);
7904	8023
7905		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8024	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7906	8025	{
7907	8026	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7908	8027	// System.out.println("; bump = " + bump);
..	..	@@ -7917,8 +8036,8 @@
7917	8036	pigment = null;
7918	8037	}
7919	8038
7920		- ReleaseTexture(bump, true);
7921		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
7922	8041	}
7923	8042
7924	8043	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7936,7 +8055,7 @@
7936	8055
7937	8056	String pigment = Object3D.GetPigment(tex);
7938	8057
7939		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8058	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7940	8059	{
7941	8060	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7942	8061	// System.out.println("; bump = " + bump);
..	..	@@ -7947,7 +8066,7 @@
7947	8066	pigment = null;
7948	8067	}
7949	8068
7950		- ReleaseTexture(pigment, false);
	8069	+ ReleaseTexture(tex, false);
7951	8070	}
7952	8071
7953	8072	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -7965,7 +8084,7 @@
7965	8084
7966	8085	String bump = Object3D.GetBump(tex);
7967	8086
7968		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8087	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7969	8088	{
7970	8089	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7971	8090	// System.out.println("; bump = " + bump);
..	..	@@ -7976,10 +8095,10 @@
7976	8095	bump = null;
7977	8096	}
7978	8097
7979		- ReleaseTexture(bump, true);
	8098	+ ReleaseTexture(tex, true);
7980	8099	}
7981	8100
7982		- void ReleaseTexture(String tex, boolean bump)
	8101	+ void ReleaseTexture(cTexture tex, boolean bump)
7983	8102	{
7984	8103	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7985	8104	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7990,7 +8109,7 @@
7990	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7991	8110
7992	8111	if (tex != null)
7993		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7994	8113
7995	8114	// //assert( texture != null );
7996	8115	// if (texture == null)
..	..	@@ -8084,47 +8203,50 @@
8084	8203
8085	8204	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8086	8205	{
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		- }
	8206	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8207	+// ambientOcclusion ) // \|\| !textureon)
	8208	+// {
	8209	+// return; // false;
	8210	+// }
	8211	+//
	8212	+// if (tex == null)
	8213	+// {
	8214	+// BindTexture(null,false,resolution);
	8215	+// BindTexture(null,true,resolution);
	8216	+// return;
	8217	+// }
	8218	+//
	8219	+// String pigment = Object3D.GetPigment(tex);
	8220	+// String bump = Object3D.GetBump(tex);
	8221	+//
	8222	+// usedtextures.add(pigment);
	8223	+// usedtextures.add(bump);
	8224	+//
	8225	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8226	+// {
	8227	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8228	+// // System.out.println("; bump = " + bump);
	8229	+// }
	8230	+//
	8231	+// if (bump.equals(""))
	8232	+// {
	8233	+// bump = null;
	8234	+// }
	8235	+// if (pigment.equals(""))
	8236	+// {
	8237	+// pigment = null;
	8238	+// }
	8239	+//
	8240	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8241	+// BindTexture(pigment, false, resolution);
	8242	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8243	+// BindTexture(bump, true, resolution);
	8244	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8245	+//
	8246	+// return; // true;
8099	8247
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;
	8248	+ BindPigmentTexture(tex, resolution);
	8249	+ BindBumpTexture(tex, resolution);
8128	8250	}
8129	8251
8130	8252	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8143,9 +8265,9 @@
8143	8265
8144	8266	String pigment = Object3D.GetPigment(tex);
8145	8267
8146		- usedtextures.put(pigment, pigment);
	8268	+ usedtextures.add(tex);
8147	8269
8148		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8270	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8149	8271	{
8150	8272	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8151	8273	// System.out.println("; bump = " + bump);
..	..	@@ -8157,7 +8279,7 @@
8157	8279	}
8158	8280
8159	8281	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8160		- BindTexture(pigment, false, resolution);
	8282	+ BindTexture(tex, false, resolution);
8161	8283	}
8162	8284
8163	8285	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8176,9 +8298,9 @@
8176	8298
8177	8299	String bump = Object3D.GetBump(tex);
8178	8300
8179		- usedtextures.put(bump, bump);
	8301	+ usedtextures.add(tex);
8180	8302
8181		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8303	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8182	8304	{
8183	8305	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8184	8306	// System.out.println("; bump = " + bump);
..	..	@@ -8190,7 +8312,7 @@
8190	8312	}
8191	8313
8192	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8193		- BindTexture(bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
8194	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8195	8317	}
8196	8318
..	..	@@ -8214,13 +8336,19 @@
8214	8336	return fileExists;
8215	8337	}
8216	8338
8217		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8339	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8218	8340	{
8219		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8341	+ CacheTexture texturecache = null;
8220	8342
8221	8343	if (tex != null)
8222	8344	{
8223		- String texname = tex;
	8345	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8346	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8347	+
	8348	+ if (texname.equals("") && texdata == null)
	8349	+ {
	8350	+ return null;
	8351	+ }
8224	8352
8225	8353	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8226	8354
..	..	@@ -8230,19 +8358,46 @@
8230	8358	// else
8231	8359	// if (!texname.startsWith("/"))
8232	8360	// texname = "/Users/nbriere/Textures/" + texname;
8233		- if (!FileExists(tex))
	8361	+ if (!FileExists(texname) && !texname.startsWith("@"))
8234	8362	{
8235	8363	texname = fallbackTextureName;
8236	8364	}
8237	8365
8238	8366	if (CACHETEXTURE)
8239		- texture = textures.get(texname); // TEXTURE CACHE
8240		-
8241		- TextureData texturedata = null;
8242		-
8243		- if (texture == null \|\| texture.resolution < resolution)
8244	8367	{
8245		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8368	+ if (texdata == null)
	8369	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8370	+ else
	8371	+ texturecache = bimtextures.get(texdata);
	8372	+ }
	8373	+
	8374	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8375	+ {
	8376	+ TextureData texturedata = null;
	8377	+
	8378	+ if (texdata != null && textureon)
	8379	+ {
	8380	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8381	+
	8382	+ try
	8383	+ {
	8384	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8385	+ }
	8386	+ catch (Exception e)
	8387	+ {
	8388	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8389	+ }
	8390	+
	8391	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8392	+ bimtextures.put(texdata, texturecache);
	8393	+
	8394	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8395	+
	8396	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8397	+ //bim2 = bim;
	8398	+ }
	8399	+ else
	8400	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8246	8401	{
8247	8402	assert(!bump);
8248	8403	// if (bump)
..	..	@@ -8253,19 +8408,23 @@
8253	8408	// }
8254	8409	// else
8255	8410	// {
8256		- texture = textures.get(tex);
8257		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
8258	8413	{
8259		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8260	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
8261	8418	// }
8262	8419	} else
8263		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8264	8421	{
8265	8422	assert(bump);
8266		- texture = textures.get(tex);
8267		- if (texture == null)
8268		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8423	+ // texturecache = textures.get(texname); // suspicious
	8424	+ if (texturecache == null)
	8425	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ else
	8427	+ new Exception().printStackTrace();
8269	8428	} else
8270	8429	{
8271	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -8273,11 +8432,22 @@
8273	8432	// texture = GetResourceTexture("default.png");
8274	8433	//} else
8275	8434	//{
8276		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
8277	8436	{
8278		- texture = textures.get(tex);
8279		- if (texture == null)
8280		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8437	+ // texturecache = textures.get(texname); // suspicious
	8438	+ if (texturecache == null)
	8439	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ else
	8441	+ new Exception().printStackTrace();
	8442	+ } else
	8443	+ {
	8444	+ if (texname.startsWith("@"))
	8445	+ {
	8446	+ // texturecache = textures.get(texname); // suspicious
	8447	+ if (texturecache == null)
	8448	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8449	+ else
	8450	+ new Exception().printStackTrace();
8281	8451	} else
8282	8452	{
8283	8453	if (textureon)
..	..	@@ -8336,19 +8506,20 @@
8336	8506	if (texturedata == null)
8337	8507	throw new Exception();
8338	8508
8339		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8509	+ texturecache = new CacheTexture(texturedata,resolution);
8340	8510	//texture = GetTexture(tex, bump);
8341	8511	}
	8512	+ }
8342	8513	}
8343	8514	//}
8344	8515	}
8345	8516
8346		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8517	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8347	8518	{
8348	8519	//return false;
8349	8520
8350	8521	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8351		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8522	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8352	8523	{
8353	8524	// String ext = "_highres";
8354	8525	// if (REDUCETEXTURE)
..	..	@@ -8365,52 +8536,17 @@
8365	8536	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8366	8537	if (!cachefile.exists())
8367	8538	{
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))
	8539	+ //if (texturedata.getWidth() == texturedata.getHeight())
8377	8540	{
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);
	8541	+ BufferedImage rendImage = CreateBim(texturedata);
	8542	+
8408	8543	ImageWriter writer = null;
8409	8544	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8410	8545	if (iter.hasNext()) {
8411	8546	writer = (ImageWriter)iter.next();
8412	8547	}
8413		- float compressionQuality = 0.9f;
	8548	+
	8549	+ float compressionQuality = 0.85f;
8414	8550	try
8415	8551	{
8416	8552	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8427,18 +8563,20 @@
8427	8563	}
8428	8564	}
8429	8565	}
8430		-
	8566	+
	8567	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8568	+
8431	8569	//System.out.println("Texture = " + tex);
8432		- if (textures.containsKey(texname))
	8570	+ if (textures.containsKey(tex))
8433	8571	{
8434		- CacheTexture thetex = textures.get(texname);
	8572	+ CacheTexture thetex = textures.get(tex);
8435	8573	thetex.texture.disable();
8436	8574	thetex.texture.dispose();
8437		- textures.remove(texname);
	8575	+ textures.remove(tex);
8438	8576	}
8439	8577
8440		- texture.texturedata = texturedata;
8441		- textures.put(texname, texture);
	8578	+ //texture.texturedata = texturedata;
	8579	+ textures.put(tex, texturecache);
8442	8580
8443	8581	// newtex = true;
8444	8582	}
..	..	@@ -8454,10 +8592,44 @@
8454	8592	}
8455	8593	}
8456	8594
8457		- return texture;
	8595	+ return texturecache;
8458	8596	}
8459	8597
8460		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8598	+ static void EmbedTextures(cTexture tex)
	8599	+ {
	8600	+ if (tex.pigmentdata == null)
	8601	+ {
	8602	+ //String texname = Object3D.GetPigment(tex);
	8603	+
	8604	+ CacheTexture texturecache = texturepigment.get(tex);
	8605	+
	8606	+ if (texturecache != null)
	8607	+ {
	8608	+ tex.pw = texturecache.texturedata.getWidth();
	8609	+ tex.ph = texturecache.texturedata.getHeight();
	8610	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8611	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8612	+ ;
	8613	+ //, tex.pw, tex.ph), 0.5f);
	8614	+ }
	8615	+ }
	8616	+
	8617	+ if (tex.bumpdata == null)
	8618	+ {
	8619	+ //String texname = Object3D.GetBump(tex);
	8620	+
	8621	+ CacheTexture texturecache = texturebump.get(tex);
	8622	+
	8623	+ if (texturecache != null)
	8624	+ {
	8625	+ tex.bw = texturecache.texturedata.getWidth();
	8626	+ tex.bh = texturecache.texturedata.getHeight();
	8627	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8628	+ }
	8629	+ }
	8630	+ }
	8631	+
	8632	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8461	8633	{
8462	8634	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8463	8635
..	..	@@ -8475,21 +8647,21 @@
8475	8647	return texture!=null?texture.texture:null;
8476	8648	}
8477	8649
8478		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8650	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8479	8651	{
8480	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8481	8653
8482	8654	return texture!=null?texture.texturedata:null;
8483	8655	}
8484	8656
8485		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8657	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8486	8658	{
8487	8659	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8488	8660	{
8489	8661	return false;
8490	8662	}
8491	8663
8492		- boolean newtex = false;
	8664	+ //boolean newtex = false;
8493	8665
8494	8666	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8495	8667
..	..	@@ -8521,9 +8693,75 @@
8521	8693	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8522	8694	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8523	8695
8524		- return newtex;
	8696	+ return true; // Warning: not used.
8525	8697	}
8526	8698
	8699	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8700	+ {
	8701	+ try
	8702	+ {
	8703	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8704	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8705	+ ImageWriter writer = writers.next();
	8706	+
	8707	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8708	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8709	+ param.setCompressionQuality(quality);
	8710	+
	8711	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8712	+ writer.setOutput(ios);
	8713	+ writer.write(null, new IIOImage(image, null, null), param);
	8714	+
	8715	+ byte[] data = baos.toByteArray();
	8716	+ writer.dispose();
	8717	+ return data;
	8718	+ }
	8719	+ catch (Exception e)
	8720	+ {
	8721	+ e.printStackTrace();
	8722	+ return null;
	8723	+ }
	8724	+ }
	8725	+
	8726	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8727	+ {
	8728	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8729	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8730	+ ImageReader reader = writers.next();
	8731	+
	8732	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8733	+
	8734	+ ImageReadParam param = reader.getDefaultReadParam();
	8735	+ param.setDestination(bim);
	8736	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8737	+
	8738	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8739	+ reader.setInput(ios);
	8740	+ BufferedImage bim2 = reader.read(0, param);
	8741	+ reader.dispose();
	8742	+
	8743	+// WritableRaster raster = bim2.getRaster();
	8744	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8745	+// byte[] bytes = data.getData();
	8746	+//
	8747	+// int[] pixels = new int[bytes.length/3];
	8748	+// for (int i=pixels.length; --i>=0;)
	8749	+// {
	8750	+// int i3 = i*3;
	8751	+// pixels[i] = 0xFF;
	8752	+// pixels[i] <<= 8;
	8753	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8754	+// pixels[i] <<= 8;
	8755	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8756	+// pixels[i] <<= 8;
	8757	+// pixels[i] \|= bytes[i3] & 0xFF;
	8758	+// }
	8759	+//
	8760	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8761	+
	8762	+ return bim;
	8763	+ }
	8764	+
8527	8765	ShadowBuffer shadowPBuf;
8528	8766	AntialiasBuffer antialiasPBuf;
8529	8767	int MAXSTACK;
..	..	@@ -8716,7 +8954,7 @@
8716	8954
8717	8955	if (cubemap == null)
8718	8956	{
8719		- LoadEnvy(5);
	8957	+ //LoadEnvy(1);
8720	8958	}
8721	8959
8722	8960	//cubemap.enable();
..	..	@@ -9003,37 +9241,58 @@
9003	9241	cubemap = null;
9004	9242	return;
9005	9243	case 1:
9006		- name = "cubemaps/box_";
9007		- ext = "png";
	9244	+ name = "cubemaps/rgb/";
	9245	+ ext = "jpg";
9008	9246	reverseUP = false;
9009	9247	break;
9010	9248	case 2:
9011		- name = "cubemaps/uffizi_";
9012		- ext = "png";
9013		- break; // reverseUP = true; break;
	9249	+ name = "cubemaps/uffizi/";
	9250	+ ext = "jpg";
	9251	+ reverseUP = false;
	9252	+ break;
9014	9253	case 3:
9015		- name = "cubemaps/CloudyHills_";
9016		- ext = "tga";
	9254	+ name = "cubemaps/CloudyHills/";
	9255	+ ext = "jpg";
9017	9256	reverseUP = false;
9018	9257	break;
9019	9258	case 4:
9020		- name = "cubemaps/cornell_";
	9259	+ name = "cubemaps/cornell/";
9021	9260	ext = "png";
9022	9261	reverseUP = false;
9023	9262	break;
	9263	+ case 5:
	9264	+ name = "cubemaps/skycube/";
	9265	+ ext = "jpg";
	9266	+ reverseUP = false;
	9267	+ break;
	9268	+ case 6:
	9269	+ name = "cubemaps/SaintLazarusChurch3/";
	9270	+ ext = "jpg";
	9271	+ reverseUP = false;
	9272	+ break;
	9273	+ case 7:
	9274	+ name = "cubemaps/Sodermalmsallen/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
	9278	+ case 8:
	9279	+ name = "cubemaps/Sodermalmsallen2/";
	9280	+ ext = "jpg";
	9281	+ reverseUP = false;
	9282	+ break;
	9283	+ case 9:
	9284	+ name = "cubemaps/UnionSquare/";
	9285	+ ext = "jpg";
	9286	+ reverseUP = false;
	9287	+ break;
9024	9288	default:
9025		- name = "cubemaps/rgb_";
9026		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9289	+ name = "cubemaps/box/";
	9290	+ ext = "png"; /mipmap = true;/
	9291	+ reverseUP = false;
9027	9292	break;
9028	9293	}
9029		-
9030		- try
9031		- {
9032		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9033		- } catch (IOException e)
9034		- {
9035		- throw new RuntimeException(e);
9036		- }
	9294	+
	9295	+ LoadSkybox(name, ext, mipmap);
9037	9296	}
9038	9297
9039	9298	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9065,8 +9324,12 @@
9065	9324	static double[] model = new double[16];
9066	9325	double[] camera2light = new double[16];
9067	9326	double[] light2camera = new double[16];
9068		- int newenvy = -1;
9069		- boolean envyoff = true; // false;
	9327	+
	9328	+ //int newenvy = -1;
	9329	+ //boolean envyoff = false;
	9330	+
	9331	+ String loadedskyboxname;
	9332	+
9070	9333	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9071	9334	//float[] light0 = { 0,0,0 };
9072	9335	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9359,11 +9622,35 @@
9359	9622	jy8[3] = 0.5f;
9360	9623	}
9361	9624
9362		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9625	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9363	9626	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9364	9627	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9365	9628	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9366	9629
	9630	+ void ResetOptions()
	9631	+ {
	9632	+ options1[0] = 100;
	9633	+ options1[1] = 0.025f;
	9634	+ options1[2] = 0.01f;
	9635	+ options1[3] = 0;
	9636	+ options1[4] = 0;
	9637	+
	9638	+ options2[0] = 0;
	9639	+ options2[1] = 0.75f;
	9640	+ options2[2] = 0;
	9641	+ options2[3] = 0;
	9642	+
	9643	+ options3[0] = 1;
	9644	+ options3[1] = 1;
	9645	+ options3[2] = 1;
	9646	+ options3[3] = 0;
	9647	+
	9648	+ options4[0] = 1;
	9649	+ options4[1] = 0;
	9650	+ options4[2] = 1;
	9651	+ options4[3] = 0;
	9652	+ }
	9653	+
9367	9654	static int imagecount = 0; // movie generation
9368	9655
9369	9656	static int jitter = 0;
..	..	@@ -9460,7 +9747,7 @@
9460	9747
9461	9748	if (renderCamera != lightCamera)
9462	9749	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9463		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9750	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9464	9751
9465	9752	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9466	9753
..	..	@@ -9476,7 +9763,7 @@
9476	9763
9477	9764	if (renderCamera != lightCamera)
9478	9765	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9479		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9766	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9480	9767
9481	9768	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9482	9769
..	..	@@ -9522,10 +9809,12 @@
9522	9809	rati = 1 / rati;
9523	9810	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9524	9811	}
9525		- assert (newenvy == -1);
	9812	+
	9813	+ //assert (newenvy == -1);
	9814	+
9526	9815	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9527	9816	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9528		- DrawSkyBox(gl);
	9817	+ DrawSkyBox(gl, (float)rati);
9529	9818	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9530	9819	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9531	9820	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10474,6 +10763,7 @@
10474	10763	ANTIALIAS = 0;
10475	10764	//System.out.println("RESTART");
10476	10765	AAtimer.restart();
	10766	+ Globals.TIMERRUNNING = true;
10477	10767	}
10478	10768	}
10479	10769	}
..	..	@@ -10541,7 +10831,8 @@
10541	10831	ambientOcclusion = false;
10542	10832	}
10543	10833
10544		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10834	+ if (//Globals.lighttouched &&
	10835	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10545	10836	{
10546	10837	//if (RENDERSHADOW) // ?
10547	10838	if (!IsFrozen())
..	..	@@ -10560,7 +10851,7 @@
10560	10851
10561	10852	if (wait)
10562	10853	{
10563		- Sleep(500);
	10854	+ Sleep(200); // blocks everything
10564	10855
10565	10856	wait = false;
10566	10857	}
..	..	@@ -10675,7 +10966,7 @@
10675	10966	// if (parentcam != renderCamera) // not a light
10676	10967	if (cam != lightCamera)
10677	10968	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10678		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10969	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10679	10970
10680	10971	for (int j = 0; j < 4; j++)
10681	10972	{
..	..	@@ -10690,7 +10981,7 @@
10690	10981	// if (parentcam != renderCamera) // not a light
10691	10982	if (cam != lightCamera)
10692	10983	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10693		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10984	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10694	10985
10695	10986	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10696	10987
..	..	@@ -10776,13 +11067,27 @@
10776	11067	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10777	11068	}
10778	11069
10779		- if (newenvy > -1)
	11070	+// if (newenvy > -1)
	11071	+// {
	11072	+// LoadEnvy(newenvy);
	11073	+// }
	11074	+//
	11075	+// newenvy = -1;
	11076	+
	11077	+ if (object.skyboxname != null)
10780	11078	{
10781		- LoadEnvy(newenvy);
	11079	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11080	+ {
	11081	+ LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11082	+ loadedskyboxname = object.skyboxname;
	11083	+ }
10782	11084	}
10783		-
10784		- newenvy = -1;
10785		-
	11085	+ else
	11086	+ {
	11087	+ cubemap = null;
	11088	+ loadedskyboxname = null;
	11089	+ }
	11090	+
10786	11091	ratio = ((double) getWidth()) / getHeight();
10787	11092	//System.out.println("ratio = " + ratio);
10788	11093
..	..	@@ -10798,7 +11103,7 @@
10798	11103
10799	11104	if (!IsFrozen() && !ambientOcclusion)
10800	11105	{
10801		- DrawSkyBox(gl);
	11106	+ DrawSkyBox(gl, (float)ratio);
10802	11107	}
10803	11108
10804	11109	//if (selection_view == -1)
..	..	@@ -10981,9 +11286,9 @@
10981	11286
10982	11287	gl.glMatrixMode(GL.GL_MODELVIEW);
10983	11288
10984		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10985		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10986		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11289	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11290	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11291	+gl.glEnable(gl.GL_MULTISAMPLE);
10987	11292	} else
10988	11293	{
10989	11294	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10994,7 +11299,7 @@
10994	11299	//System.out.println("BLENDING ON");
10995	11300	gl.glEnable(GL.GL_BLEND);
10996	11301	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10997		-
	11302	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10998	11303	gl.glMatrixMode(gl.GL_PROJECTION);
10999	11304	gl.glLoadIdentity();
11000	11305
..	..	@@ -11084,7 +11389,7 @@
11084	11389
11085	11390	// if (cam != lightCamera)
11086	11391	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11087		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11392	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11088	11393	}
11089	11394
11090	11395	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11243,7 +11548,7 @@
11243	11548	}
11244	11549	}
11245	11550
11246		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11551	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11247	11552	{
11248	11553	//gl.glDepthFunc(GL.GL_LEQUAL);
11249	11554	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11251,24 +11556,21 @@
11251	11556
11252	11557	boolean texon = textureon;
11253	11558
11254		- if (RENDERPROGRAM > 0)
11255		- {
11256		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11257		- textureon = false;
11258		- }
	11559	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11560	+ textureon = false;
	11561	+
11259	11562	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11260	11563	//System.out.println("ALLO");
11261	11564	gl.glColorMask(false, false, false, false);
11262	11565	DrawObject(gl);
11263		- if (RENDERPROGRAM > 0)
11264		- {
11265		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11266		- textureon = texon;
11267		- }
	11566	+
	11567	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11568	+ textureon = texon;
	11569	+
11268	11570	gl.glColorMask(true, true, true, true);
11269	11571
11270	11572	gl.glDepthFunc(GL.GL_EQUAL);
11271		- //gl.glDepthMask(false);
	11573	+ gl.glDepthMask(false);
11272	11574	}
11273	11575
11274	11576	if (false) // DrawMode() == SHADOW)
..	..	@@ -11451,15 +11753,36 @@
11451	11753
11452	11754	static boolean zoomonce = false;
11453	11755
	11756	+ static void CreateSelectedPoint()
	11757	+ {
	11758	+ if (selectedpoint == null)
	11759	+ {
	11760	+ debugpointG = new Sphere();
	11761	+ debugpointP = new Sphere();
	11762	+ debugpointC = new Sphere();
	11763	+ debugpointR = new Sphere();
	11764	+
	11765	+ selectedpoint = new Superellipsoid();
	11766	+
	11767	+ for (int i=0; i<8; i++)
	11768	+ {
	11769	+ debugpoints[i] = new Sphere();
	11770	+ }
	11771	+ }
	11772	+ }
	11773	+
11454	11774	void DrawObject(GL gl, boolean draw)
11455	11775	{
	11776	+ // To clear camera values
	11777	+ ResetOptions();
	11778	+
11456	11779	//System.out.println("DRAW OBJECT " + mouseDown);
11457	11780	// DrawMode() = SELECTION;
11458	11781	//GL gl = getGL();
11459	11782	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11460	11783	{
11461	11784	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11462		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11785	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11463	11786	pingthread.StepToTarget(true); // true);
11464	11787	// zoomonce = false;
11465	11788	}
..	..	@@ -11531,8 +11854,9 @@
11531	11854
11532	11855	if (DrawMode() == DEFAULT)
11533	11856	{
11534		- if (DEBUG)
	11857	+ if (Globals.DEBUG)
11535	11858	{
	11859	+ CreateSelectedPoint();
11536	11860	float radius = 0.05f;
11537	11861	if (selectedpoint.radius != radius)
11538	11862	{
..	..	@@ -11586,20 +11910,32 @@
11586	11910	ReleaseTextures(DEFAULT_TEXTURES);
11587	11911
11588	11912	if (CLEANCACHE)
11589		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11913	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11590	11914	{
11591		- String tex = e.nextElement();
	11915	+ cTexture tex = e.nextElement();
11592	11916
11593	11917	// System.out.println("Texture --------- " + tex);
11594	11918
11595		- if (tex.equals("WHITE_NOISE"))
	11919	+ if (tex.equals("WHITE_NOISE:"))
11596	11920	continue;
11597	11921
11598		- if (!usedtextures.containsKey(tex))
	11922	+ if (!usedtextures.contains(tex))
11599	11923	{
	11924	+ CacheTexture gettex = texturepigment.get(tex);
11600	11925	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11601		- textures.get(tex).texture.dispose();
11602		- textures.remove(tex);
	11926	+ if (gettex != null)
	11927	+ {
	11928	+ gettex.texture.dispose();
	11929	+ texturepigment.remove(tex);
	11930	+ }
	11931	+
	11932	+ gettex = texturebump.get(tex);
	11933	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11934	+ if (gettex != null)
	11935	+ {
	11936	+ gettex.texture.dispose();
	11937	+ texturebump.remove(tex);
	11938	+ }
11603	11939	}
11604	11940	}
11605	11941	}
..	..	@@ -12019,7 +12355,7 @@
12019	12355	for (int i = tp.size(); --i >= 0;)
12020	12356	{
12021	12357	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12022		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12358	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
12023	12359	}
12024	12360
12025	12361
..	..	@@ -12127,8 +12463,76 @@
12127	12463
12128	12464	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12129	12465
12130		- String program =
	12466	+ String programmin =
	12467	+ // Min shader
12131	12468	"!!ARBfp1.0\n" +
	12469	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12470	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12471	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12472	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12473	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12474	+ "PARAM light2cam0 = program.env[10];" +
	12475	+ "PARAM light2cam1 = program.env[11];" +
	12476	+ "PARAM light2cam2 = program.env[12];" +
	12477	+ "TEMP temp;" +
	12478	+ "TEMP light;" +
	12479	+ "TEMP ndotl;" +
	12480	+ "TEMP normal;" +
	12481	+ "TEMP depth;" +
	12482	+ "TEMP eye;" +
	12483	+ "TEMP pos;" +
	12484	+
	12485	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12486	+ Normalize("normal") +
	12487	+ "MOV light, state.light[0].position;" +
	12488	+ "DP3 ndotl.x, light, normal;" +
	12489	+
	12490	+ // shadow
	12491	+ "MOV pos, fragment.texcoord[1];" +
	12492	+ "MOV temp, pos;" +
	12493	+ ShadowTextureFetch("depth", "temp", "1") +
	12494	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12495	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12496	+
	12497	+ // No shadow when out of frustum
	12498	+ //"SGE temp.y, depth.z, zero123.y;" +
	12499	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12500	+
	12501	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12502	+
	12503	+ // Backlit
	12504	+ "MOV pos.w, zero123.y;" +
	12505	+ "DP4 eye.x, pos, light2cam0;" +
	12506	+ "DP4 eye.y, pos, light2cam1;" +
	12507	+ "DP4 eye.z, pos, light2cam2;" +
	12508	+ Normalize("eye") +
	12509	+
	12510	+ "DP3 ndotl.y, -eye, normal;" +
	12511	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12512	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12513	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12514	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12515	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12516	+
	12517	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12518	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12519	+
	12520	+ // Pigment
	12521	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12522	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12523	+ "MUL temp, temp, ndotl.x;" +
	12524	+
	12525	+ "MUL temp, temp, zero123.z;" +
	12526	+
	12527	+ //"MUL temp, temp, ndotl.y;" +
	12528	+
	12529	+ "MOV temp.w, zero123.y;" + // reset alpha
	12530	+ "MOV result.color, temp;" +
	12531	+ "END";
	12532	+
	12533	+ String programmax =
	12534	+ "!!ARBfp1.0\n" +
	12535	+
12132	12536	//"OPTION ARB_fragment_program_shadow;" +
12133	12537	"PARAM light2cam0 = program.env[10];" +
12134	12538	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12243,8 +12647,7 @@
12243	12647	"TEMP shininess;" +
12244	12648	"\n" +
12245	12649	"MOV texSamp, one;" +
12246		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12247		-
	12650	+
12248	12651	"MOV mapgrid.x, one2048th.x;" +
12249	12652	"MOV temp, fragment.texcoord[1];" +
12250	12653	/*
..	..	@@ -12265,20 +12668,20 @@
12265	12668	"MUL temp, floor, mapgrid.x;" +
12266	12669	//"TEX depth0, temp, texture[1], 2D;" +
12267	12670	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12268		- TextureFetch("depth0", "temp", "1") +
	12671	+ ShadowTextureFetch("depth0", "temp", "1") +
12269	12672	"") +
12270	12673	"ADD temp.x, temp.x, mapgrid.x;" +
12271	12674	//"TEX depth1, temp, texture[1], 2D;" +
12272	12675	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12273		- TextureFetch("depth1", "temp", "1") +
	12676	+ ShadowTextureFetch("depth1", "temp", "1") +
12274	12677	"") +
12275	12678	"ADD temp.y, temp.y, mapgrid.x;" +
12276	12679	//"TEX depth2, temp, texture[1], 2D;" +
12277		- TextureFetch("depth2", "temp", "1") +
	12680	+ ShadowTextureFetch("depth2", "temp", "1") +
12278	12681	"SUB temp.x, temp.x, mapgrid.x;" +
12279	12682	//"TEX depth3, temp, texture[1], 2D;" +
12280	12683	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12281		- TextureFetch("depth3", "temp", "1") +
	12684	+ ShadowTextureFetch("depth3", "temp", "1") +
12282	12685	"") +
12283	12686	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12284	12687	//"MOV params, material;" +
..	..	@@ -12649,10 +13052,10 @@
12649	13052	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12650	13053	"") +
12651	13054
12652		- // display shadow only (bump == 0)
	13055	+ // display shadow only (fakedepth == 0)
12653	13056	"SUB temp.x, half.x, shadow.x;" +
12654	13057	"MOV temp.y, -params5.z;" + // params6.x;" +
12655		- "SLT temp.z, temp.y, -one2048th.x;" +
	13058	+ "SLT temp.z, temp.y, -c256i.x;" +
12656	13059	"SUB temp.y, one.x, temp.z;" +
12657	13060	"MUL temp.x, temp.x, temp.y;" +
12658	13061	"KIL temp.x;" +
..	..	@@ -12983,6 +13386,13 @@
12983	13386	//once = true;
12984	13387	}
12985	13388
	13389	+ String program = programmax;
	13390	+
	13391	+ if (Globals.MINSHADER)
	13392	+ {
	13393	+ program = programmin;
	13394	+ }
	13395	+
12986	13396	System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12987	13397	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12988	13398	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
..	..	@@ -13076,25 +13486,26 @@
13076	13486	return out;
13077	13487	}
13078	13488
13079		- String TextureFetch(String dest, String src, String unit)
	13489	+ // Also does frustum culling
	13490	+ String ShadowTextureFetch(String dest, String src, String unit)
13080	13491	{
13081	13492	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13082	13493	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13083	13494	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13495	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13496	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13084	13497	"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;" +
	13498	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13499	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13089	13500	//"SWZ buffer, temp, w,w,w,w;";
13090		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13501	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13091	13502	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13092	13503	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13093	13504	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13094		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13505	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13095	13506
13096		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13097		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13507	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13508	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13098	13509	}
13099	13510
13100	13511	String Shadow(String depth, String shadow)
..	..	@@ -13141,7 +13552,7 @@
13141	13552	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13142	13553	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13143	13554
13144		- // No shadow when out of frustrum
	13555	+ // No shadow when out of frustum
13145	13556	"SGE temp.x, " + depth + ".z, one.z;" +
13146	13557	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13147	13558	"";
..	..	@@ -13289,7 +13700,8 @@
13289	13700	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13290	13701	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13291	13702	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13292		- Object3D.cVector2[] vector2buffer;
	13703	+
	13704	+ //Object3D.cVector2[] vector2buffer;
13293	13705
13294	13706	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13295	13707	// OUT : diff, spec
..	..	@@ -13305,9 +13717,10 @@
13305	13717	"DP3 " + dest + ".z," + "normals," + "eye;" +
13306	13718	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13307	13719	//"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;" +
	13720	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13721	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13722	+
	13723	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13311	13724	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13312	13725	"RCP " + dest + ".w," + dest + ".w;" +
13313	13726	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13812,6 +14225,7 @@
13812	14225	else
13813	14226	if (evt.getSource() == AAtimer)
13814	14227	{
	14228	+ Globals.TIMERRUNNING = false;
13815	14229	if (mouseDown)
13816	14230	{
13817	14231	//new Exception().printStackTrace();
..	..	@@ -13871,7 +14285,7 @@
13871	14285
13872	14286	// fev 2014???
13873	14287	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13874		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14288	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13875	14289	pingthread.StepToTarget(true); // true);
13876	14290	}
13877	14291	// if (!LIVE)
..	..	@@ -13886,6 +14300,7 @@
13886	14300	return;
13887	14301
13888	14302	AAtimer.restart(); //
	14303	+ Globals.TIMERRUNNING = true;
13889	14304
13890	14305	// waslive = LIVE;
13891	14306	// LIVE = false;
..	..	@@ -13935,14 +14350,15 @@
13935	14350	drag = false;
13936	14351	//System.out.println("Mouse DOWN");
13937	14352	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);
	14353	+ //ClickInfo info = new ClickInfo();
	14354	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14355	+ object.clickInfo.pane = this;
	14356	+ object.clickInfo.camera = renderCamera;
	14357	+ object.clickInfo.x = x;
	14358	+ object.clickInfo.y = y;
	14359	+ object.clickInfo.modifiers = modifiersex;
	14360	+ editObj = object.doEditClick(//info,
	14361	+ 0);
13946	14362	if (!editObj)
13947	14363	{
13948	14364	hasMarquee = true;
..	..	@@ -14224,12 +14640,12 @@
14224	14640	void GoDown(int mod)
14225	14641	{
14226	14642	MODIFIERS \|= COMMAND;
14227		- /*
	14643	+ /**/
14228	14644	if((mod&SHIFT) == SHIFT)
14229		- manipCamera.RotatePosition(0, -speed);
	14645	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14230	14646	else
14231		- manipCamera.BackForth(0, -speed*delta, getWidth());
14232		- */
	14647	+ manipCamera.RotatePosition(0, -speed);
	14648	+ /**/
14233	14649	if ((mod & SHIFT) == SHIFT)
14234	14650	{
14235	14651	mouseMode = mouseMode; // VR??
..	..	@@ -14245,12 +14661,12 @@
14245	14661	void GoUp(int mod)
14246	14662	{
14247	14663	MODIFIERS \|= COMMAND;
14248		- /*
	14664	+ /**/
14249	14665	if((mod&SHIFT) == SHIFT)
14250		- manipCamera.RotatePosition(0, speed);
	14666	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14251	14667	else
14252		- manipCamera.BackForth(0, speed*delta, getWidth());
14253		- */
	14668	+ manipCamera.RotatePosition(0, speed);
	14669	+ /**/
14254	14670	if ((mod & SHIFT) == SHIFT)
14255	14671	{
14256	14672	mouseMode = mouseMode;
..	..	@@ -14266,12 +14682,12 @@
14266	14682	void GoLeft(int mod)
14267	14683	{
14268	14684	MODIFIERS \|= COMMAND;
14269		- /*
	14685	+ /**/
14270	14686	if((mod&SHIFT) == SHIFT)
14271		- manipCamera.RotatePosition(speed, 0);
14272		- else
14273	14687	manipCamera.Translate(speed*delta, 0, getWidth());
14274		- */
	14688	+ else
	14689	+ manipCamera.RotatePosition(speed, 0);
	14690	+ /**/
14275	14691	if ((mod & SHIFT) == SHIFT)
14276	14692	{
14277	14693	mouseMode = mouseMode;
..	..	@@ -14287,12 +14703,12 @@
14287	14703	void GoRight(int mod)
14288	14704	{
14289	14705	MODIFIERS \|= COMMAND;
14290		- /*
	14706	+ /**/
14291	14707	if((mod&SHIFT) == SHIFT)
14292		- manipCamera.RotatePosition(-speed, 0);
14293		- else
14294	14708	manipCamera.Translate(-speed*delta, 0, getWidth());
14295		- */
	14709	+ else
	14710	+ manipCamera.RotatePosition(-speed, 0);
	14711	+ /**/
14296	14712	if ((mod & SHIFT) == SHIFT)
14297	14713	{
14298	14714	mouseMode = mouseMode;
..	..	@@ -14342,14 +14758,16 @@
14342	14758	if (editObj)
14343	14759	{
14344	14760	drag = true;
14345		- ClickInfo info = new ClickInfo();
14346		- info.bounds.setBounds(0, 0,
	14761	+ //ClickInfo info = new ClickInfo();
	14762	+ object.clickInfo.bounds.setBounds(0, 0,
14347	14763	(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);
	14764	+ object.clickInfo.pane = this;
	14765	+ object.clickInfo.camera = renderCamera;
	14766	+ object.clickInfo.x = x;
	14767	+ object.clickInfo.y = y;
	14768	+ object //.GetWindow().copy
	14769	+ .doEditDrag(//info,
	14770	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14353	14771	} else
14354	14772	{
14355	14773	if (x < startX)
..	..	@@ -14498,22 +14916,27 @@
14498	14916	}
14499	14917	}
14500	14918
	14919	+// ClickInfo clickInfo = new ClickInfo();
	14920	+
14501	14921	public void mouseMoved(MouseEvent e)
14502	14922	{
14503	14923	//System.out.println("mouseMoved: " + e);
14504	14924	if (isRenderer)
14505	14925	return;
14506	14926
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;
	14927	+ // Mouse cursor feedback
	14928	+ object.clickInfo.x = e.getX();
	14929	+ object.clickInfo.y = e.getY();
	14930	+ object.clickInfo.modifiers = e.getModifiersEx();
	14931	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14932	+ object.clickInfo.pane = this;
	14933	+ object.clickInfo.camera = renderCamera;
14514	14934	if (!isRenderer)
14515	14935	{
14516		- if (object.editWindow.copy.doEditClick(ci, 0))
	14936	+ //ObjEditor editWindow = object.editWindow;
	14937	+ //Object3D copy = editWindow.copy;
	14938	+ if (object.doEditClick(//clickInfo,
	14939	+ 0))
14517	14940	{
14518	14941	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14519	14942	} else
..	..	@@ -14528,7 +14951,8 @@
14528	14951	Globals.MOUSEDRAGGED = false;
14529	14952
14530	14953	movingcamera = false;
14531		- X = Y = 0;
	14954	+ X = 0; // getBounds().width/2;
	14955	+ Y = 0; // getBounds().height/2;
14532	14956	//System.out.println("mouseReleased: " + e);
14533	14957	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14534	14958	}
..	..	@@ -14784,7 +15208,8 @@
14784	15208	// break;
14785	15209	case 'T':
14786	15210	CACHETEXTURE ^= true;
14787		- textures.clear();
	15211	+ texturepigment.clear();
	15212	+ texturebump.clear();
14788	15213	// repaint();
14789	15214	break;
14790	15215	case 'Y':
..	..	@@ -14869,7 +15294,9 @@
14869	15294	case 'E' : COMPACT ^= true;
14870	15295	repaint();
14871	15296	break;
14872		- case 'W' : DEBUGHSB ^= true;
	15297	+ case 'W' : // Wide Window (fullscreen)
	15298	+ //DEBUGHSB ^= true;
	15299	+ ObjEditor.theFrame.ToggleFullScreen();
14873	15300	repaint();
14874	15301	break;
14875	15302	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14894,8 +15321,8 @@
14894	15321	RevertCamera();
14895	15322	repaint();
14896	15323	break;
14897		- case 'L':
14898	15324	case 'l':
	15325	+ //case 'L':
14899	15326	if (lightMode)
14900	15327	{
14901	15328	lightMode = false;
..	..	@@ -14959,20 +15386,24 @@
14959	15386	OCCLUSION_CULLING ^= true;
14960	15387	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14961	15388	break;
14962		- case '0': envyoff ^= true; repaint(); break;
	15389	+ //case '0': envyoff ^= true; repaint(); break;
14963	15390	case '1':
14964	15391	case '2':
14965	15392	case '3':
14966	15393	case '4':
14967	15394	case '5':
14968		- newenvy = Character.getNumericValue(key);
14969		- repaint();
14970		- break;
14971	15395	case '6':
14972	15396	case '7':
14973	15397	case '8':
14974	15398	case '9':
14975		- BGcolor = (key - '6')/3.f;
	15399	+ if (true) // envyoff)
	15400	+ {
	15401	+ BGcolor = (key - '1')/8.f;
	15402	+ }
	15403	+ else
	15404	+ {
	15405	+ //newenvy = Character.getNumericValue(key);
	15406	+ }
14976	15407	repaint();
14977	15408	break;
14978	15409	case '!':
..	..	@@ -15038,9 +15469,9 @@
15038	15469	case '_':
15039	15470	kompactbit = 5;
15040	15471	break;
15041		- case '+':
15042		- kompactbit = 6;
15043		- break;
	15472	+// case '+':
	15473	+// kompactbit = 6;
	15474	+// break;
15044	15475	case ' ':
15045	15476	lightMode ^= true;
15046	15477	Globals.lighttouched = true;
..	..	@@ -15052,6 +15483,7 @@
15052	15483	case ESC:
15053	15484	RENDERPROGRAM += 1;
15054	15485	RENDERPROGRAM %= 3;
	15486	+
15055	15487	repaint();
15056	15488	break;
15057	15489	case 'Z':
..	..	@@ -15091,8 +15523,9 @@
15091	15523	case DELETE:
15092	15524	ClearSelection();
15093	15525	break;
15094		- /*
15095	15526	case '+':
	15527	+
	15528	+ /*
15096	15529	//fontsize += 1;
15097	15530	bbzoom *= 2;
15098	15531	repaint();
..	..	@@ -15109,17 +15542,17 @@
15109	15542	case '=':
15110	15543	IncDepth();
15111	15544	//fontsize += 1;
15112		- object.editWindow.refreshContents(true);
	15545	+ object.GetWindow().refreshContents(true);
15113	15546	maskbit = 6;
15114	15547	break;
15115	15548	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15116	15549	DecDepth();
15117	15550	maskbit = 5;
15118	15551	//if(fontsize > 1) fontsize -= 1;
15119		- if (object.editWindow == null)
15120		- new Exception().printStackTrace();
15121		- else
15122		- object.editWindow.refreshContents(true);
	15552	+// if (object.editWindow == null)
	15553	+// new Exception().printStackTrace();
	15554	+// else
	15555	+ object.GetWindow().refreshContents(true);
15123	15556	break;
15124	15557	case '{':
15125	15558	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15343,7 +15776,7 @@
15343	15776	}
15344	15777	*/
15345	15778
15346		- object.editWindow.EditSelection();
	15779	+ object.GetWindow().EditSelection(false);
15347	15780	}
15348	15781
15349	15782	void SelectParent()
..	..	@@ -15360,10 +15793,10 @@
15360	15793	{
15361	15794	//selectees.remove(i);
15362	15795	System.out.println("select parent of " + elem);
15363		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15796	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15364	15797	} else
15365	15798	{
15366		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15799	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15367	15800	}
15368	15801
15369	15802	first = false;
..	..	@@ -15405,12 +15838,12 @@
15405	15838	for (int j = 0; j < group.children.size(); j++)
15406	15839	{
15407	15840	elem = (Object3D) group.children.elementAt(j);
15408		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15841	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15409	15842	first = false;
15410	15843	}
15411	15844	} else
15412	15845	{
15413		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15846	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15414	15847	}
15415	15848
15416	15849	first = false;
..	..	@@ -15421,21 +15854,21 @@
15421	15854	{
15422	15855	//Composite group = (Composite) object;
15423	15856	Object3D group = object;
15424		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15857	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15425	15858	}
15426	15859
15427	15860	void ResetTransform(int mask)
15428	15861	{
15429	15862	//Composite group = (Composite) object;
15430	15863	Object3D group = object;
15431		- group.editWindow.ResetTransform(mask);
	15864	+ group.GetWindow().ResetTransform(mask);
15432	15865	}
15433	15866
15434	15867	void FlipTransform()
15435	15868	{
15436	15869	//Composite group = (Composite) object;
15437	15870	Object3D group = object;
15438		- group.editWindow.FlipTransform();
	15871	+ group.GetWindow().FlipTransform();
15439	15872	// group.editWindow.ReduceMesh(true);
15440	15873	}
15441	15874
..	..	@@ -15443,7 +15876,7 @@
15443	15876	{
15444	15877	//Composite group = (Composite) object;
15445	15878	Object3D group = object;
15446		- group.editWindow.PrintMemory();
	15879	+ group.GetWindow().PrintMemory();
15447	15880	// group.editWindow.ReduceMesh(true);
15448	15881	}
15449	15882
..	..	@@ -15451,7 +15884,7 @@
15451	15884	{
15452	15885	//Composite group = (Composite) object;
15453	15886	Object3D group = object;
15454		- group.editWindow.ResetCentroid();
	15887	+ group.GetWindow().ResetCentroid();
15455	15888	}
15456	15889
15457	15890	void IncDepth()
..	..	@@ -15533,8 +15966,6 @@
15533	15966
15534	15967	int width = getBounds().width;
15535	15968	int height = getBounds().height;
15536		- ClickInfo info = new ClickInfo();
15537		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15538	15969	//Image img = CreateImage(width, height);
15539	15970	//System.out.println("width = " + width + "; height = " + height + "\n");
15540	15971
..	..	@@ -15611,48 +16042,77 @@
15611	16042	}
15612	16043	if (object != null && !hasMarquee)
15613	16044	{
	16045	+ if (object.clickInfo == null)
	16046	+ object.clickInfo = new ClickInfo();
	16047	+ ClickInfo info = object.clickInfo;
	16048	+ //ClickInfo info = new ClickInfo();
	16049	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16050	+
15614	16051	if (isRenderer)
15615	16052	{
15616		- info.flags++;
	16053	+ object.clickInfo.flags++;
15617	16054	double frameAspect = (double) width / (double) height;
15618	16055	if (frameAspect > renderCamera.aspect)
15619	16056	{
15620	16057	int desired = (int) ((double) height * renderCamera.aspect);
15621		- info.bounds.width -= width - desired;
15622		- info.bounds.x += (width - desired) / 2;
	16058	+ object.clickInfo.bounds.width -= width - desired;
	16059	+ object.clickInfo.bounds.x += (width - desired) / 2;
15623	16060	} else
15624	16061	{
15625	16062	int desired = (int) ((double) width / renderCamera.aspect);
15626		- info.bounds.height -= height - desired;
15627		- info.bounds.y += (height - desired) / 2;
	16063	+ object.clickInfo.bounds.height -= height - desired;
	16064	+ object.clickInfo.bounds.y += (height - desired) / 2;
15628	16065	}
15629	16066	}
15630		- info.g = gr;
15631		- info.camera = renderCamera;
	16067	+
	16068	+ object.clickInfo.g = gr;
	16069	+ object.clickInfo.camera = renderCamera;
15632	16070	/*
15633	16071	// Memory intensive (brep.verticescopy)
15634	16072	if (!(object instanceof Composite))
15635	16073	object.draw(info, 0, false); // SLOW :
15636	16074	*/
15637		- if (!isRenderer)
	16075	+ if (!isRenderer) // && drag)
15638	16076	{
15639		- object.drawEditHandles(info, 0);
15640		-
15641		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16077	+ Grafreed.Assert(object != null);
	16078	+ Grafreed.Assert(object.selection != null);
	16079	+ if (object.selection.Size() > 0)
15642	16080	{
15643		- switch (object.selection.get(0).hitSomething)
	16081	+ int hitSomething = object.selection.get(0).hitSomething;
	16082	+
	16083	+ object.clickInfo.DX = 0;
	16084	+ object.clickInfo.DY = 0;
	16085	+ object.clickInfo.W = 1;
	16086	+ if (hitSomething == Object3D.hitCenter)
15644	16087	{
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;
	16088	+ info.DX = X;
	16089	+ if (X != 0)
	16090	+ info.DX -= info.bounds.width/2;
	16091	+
	16092	+ info.DY = Y;
	16093	+ if (Y != 0)
	16094	+ info.DY -= info.bounds.height/2;
15654	16095	}
15655		-
	16096	+
	16097	+ object.drawEditHandles(//info,
	16098	+ 0);
	16099	+
	16100	+ if (drag && (X != 0 \|\| Y != 0))
	16101	+ {
	16102	+ switch (hitSomething)
	16103	+ {
	16104	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16105	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16106	+ break;
	16107	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16108	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16109	+ break;
	16110	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16111	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16112	+ break;
	16113	+ }
	16114	+
	16115	+ }
15656	16116	}
15657	16117	}
15658	16118	}
..	..	@@ -16134,6 +16594,8 @@
16134	16594	private /static/ boolean firstime;
16135	16595	private /static/ cVector newView = new cVector();
16136	16596	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16597	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16598	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16137	16599	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16138	16600	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16139	16601	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16146,29 +16608,67 @@
16146	16608	{
16147	16609	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16148	16610
	16611	+ int usedsuf = 0;
	16612	+
16149	16613	for (int i = 0; i < suffixes.length; i++)
16150	16614	{
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)
	16615	+ String[] suffixe = suffixes;
	16616	+ String[] fallback = suffixes2;
	16617	+ String[] fallfallback = suffixes3;
	16618	+
	16619	+ for (int c=usedsuf; --c>=0;)
16156	16620	{
16157		- throw new IOException("Unable to load texture " + resourceName);
	16621	+// String[] temp = suffixe;
	16622	+// suffixe = fallback;
	16623	+// fallback = fallfallback;
	16624	+// fallfallback = temp;
16158	16625	}
	16626	+
	16627	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16628	+ TextureData data;
	16629	+
	16630	+ try
	16631	+ {
	16632	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16633	+ mipmapped,
	16634	+ FileUtil.getFileSuffix(resourceName));
	16635	+ }
	16636	+ catch (Exception e)
	16637	+ {
	16638	+ try
	16639	+ {
	16640	+ resourceName = basename + fallback[i] + "." + suffix;
	16641	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16642	+ mipmapped,
	16643	+ FileUtil.getFileSuffix(resourceName));
	16644	+ }
	16645	+ catch (Exception e2)
	16646	+ {
	16647	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16648	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16649	+ mipmapped,
	16650	+ FileUtil.getFileSuffix(resourceName));
	16651	+ }
	16652	+ }
	16653	+
16159	16654	//System.out.println("Target = " + targets[i]);
16160	16655	cubemap.updateImage(data, targets[i]);
16161	16656	}
16162	16657
16163	16658	return cubemap;
16164	16659	}
	16660	+
16165	16661	int bigsphere = -1;
16166	16662
16167	16663	float BGcolor = 0.5f;
16168	16664
16169		- private void DrawSkyBox(GL gl)
	16665	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16666	+
	16667	+ private void DrawSkyBox(GL gl, float ratio)
16170	16668	{
16171		- if (envyoff \|\| cubemap == null)
	16669	+ if (//envyoff \|\|
	16670	+ WIREFRAME \|\|
	16671	+ cubemap == null)
16172	16672	{
16173	16673	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16174	16674	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16183,7 +16683,17 @@
16183	16683	// Compensates for ExaminerViewer's modification of modelview matrix
16184	16684	gl.glMatrixMode(GL.GL_MODELVIEW);
16185	16685	gl.glLoadIdentity();
	16686	+ gl.glScalef(1,ratio,1);
16186	16687
	16688	+// colorV[0] = 2;
	16689	+// colorV[1] = 2;
	16690	+// colorV[2] = 2;
	16691	+// colorV[3] = 1;
	16692	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16693	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16694	+//
	16695	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16696	+
16187	16697	//gl.glActiveTexture(GL.GL_TEXTURE1);
16188	16698	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16189	16699
..	..	@@ -16215,6 +16725,7 @@
16215	16725	{
16216	16726	gl.glScalef(1.0f, -1.0f, 1.0f);
16217	16727	}
	16728	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16218	16729	gl.glMultMatrixd(viewrot_1, 0);
16219	16730	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16220	16731	//viewer.updateInverseRotation(gl);
..	..	@@ -16355,16 +16866,16 @@
16355	16866	cStatic.objectstack[materialdepth++] = checker;
16356	16867	//System.out.println("material " + material);
16357	16868	//Applet3D.tracein(this, selected);
16358		- vector2buffer = checker.projectedVertices;
	16869	+ //vector2buffer = checker.projectedVertices;
16359	16870
16360	16871	//checker.GetMaterial().Draw(this, false); // true);
16361		- DrawMaterial(checker.GetMaterial(), false); // true);
	16872	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16362	16873
16363	16874	materialdepth -= 1;
16364	16875	if (materialdepth > 0)
16365	16876	{
16366		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16367		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16877	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16878	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16368	16879	}
16369	16880	//checker.GetMaterial().opacity = 1f;
16370	16881	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16450,6 +16961,14 @@
16450	16961	}
16451	16962	}
16452	16963
	16964	+ private Object3D GetFolder()
	16965	+ {
	16966	+ Object3D folder = object.GetWindow().copy;
	16967	+ if (object.GetWindow().copy.selection.Size() > 0)
	16968	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16969	+ return folder;
	16970	+ }
	16971	+
16453	16972	class SelectBuffer implements GLEventListener
16454	16973	{
16455	16974
..	..	@@ -16465,7 +16984,7 @@
16465	16984	//new Exception().printStackTrace();
16466	16985	System.out.println("select buffer init");
16467	16986	// Use debug pipeline
16468		- drawable.setGL(new DebugGL(drawable.getGL()));
	16987	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16469	16988
16470	16989	GL gl = drawable.getGL();
16471	16990
..	..	@@ -16529,6 +17048,17 @@
16529	17048
16530	17049	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16531	17050
	17051	+ if (PAINTMODE)
	17052	+ {
	17053	+ if (object.GetWindow().copy.selection.Size() > 0)
	17054	+ {
	17055	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17056	+
	17057	+ // Make what you paint not selectable.
	17058	+ paintobj.ResetSelectable();
	17059	+ }
	17060	+ }
	17061	+
16532	17062	//int tmp = selection_view;
16533	17063	//selection_view = -1;
16534	17064	int temp = DrawMode();
..	..	@@ -16540,6 +17070,17 @@
16540	17070	// temp = DEFAULT; // patch for selection debug
16541	17071	Globals.drawMode = temp; // WARNING
16542	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	+ // Revert.
	17080	+ paintobj.RestoreSelectable();
	17081	+ }
	17082	+ }
	17083	+
16543	17084	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16544	17085
16545	17086	// trying different ways of getting the depth info over
..	..	@@ -16587,6 +17128,8 @@
16587	17128	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16588	17129	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16589	17130	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17131	+
	17132	+ CreateSelectedPoint();
16590	17133
16591	17134	// Will fit the mesh !!!
16592	17135	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16641,29 +17184,31 @@
16641	17184	}
16642	17185
16643	17186	if (!movingcamera && !PAINTMODE)
16644		- object.editWindow.ScreenFitPoint(); // fev 2014
	17187	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16645	17188
16646		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17189	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16647	17190	{
16648		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17191	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16649	17192
16650		- Object3D group = new Object3D("inst" + paintcount++);
	17193	+ if (object.GetWindow().copy.selection.Size() > 0)
	17194	+ {
	17195	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16651	17196
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();
	17197	+ Object3D inst = new Object3D("inst" + paintcount++);
	17198	+
	17199	+ inst.CreateMaterial(); // use a void leaf to select instances
	17200	+
	17201	+ inst.add(paintobj); // link
	17202	+
	17203	+ object.GetWindow().SnapObject(inst);
	17204	+
	17205	+ Object3D folder = paintFolder; // GetFolder();
	17206	+
	17207	+ folder.add(inst);
	17208	+
	17209	+ object.GetWindow().ResetModel();
	17210	+ object.GetWindow().refreshContents();
	17211	+ }
16667	17212	}
16668	17213	else
16669	17214	paintcount = 0;
..	..	@@ -16702,6 +17247,11 @@
16702	17247	//System.out.println("objects[color] = " + objects[color]);
16703	17248	//objects[color].Select();
16704	17249	indexcount = 0;
	17250	+ ObjEditor window = object.GetWindow();
	17251	+ if (window != null && deselect)
	17252	+ {
	17253	+ window.Select(null, deselect, true);
	17254	+ }
16705	17255	object.Select(color, deselect);
16706	17256	}
16707	17257
..	..	@@ -17227,23 +17777,15 @@
17227	17777	int AAbuffersize = 0;
17228	17778
17229	17779	//double[] selectedpoint = new double[3];
17230		- static Superellipsoid selectedpoint = new Superellipsoid();
	17780	+ static Superellipsoid selectedpoint;
17231	17781	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();
	17782	+ static Sphere debugpointG;
	17783	+ static Sphere debugpointP;
	17784	+ static Sphere debugpointC;
	17785	+ static Sphere debugpointR;
17236	17786
17237	17787	static Sphere debugpoints[] = new Sphere[8];
17238	17788
17239		- static
17240		- {
17241		- for (int i=0; i<8; i++)
17242		- {
17243		- debugpoints[i] = new Sphere();
17244		- }
17245		- }
17246		-
17247	17789	static void InitPoints(float radius)
17248	17790	{
17249	17791	for (int i=0; i<8; i++)