~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -37,7 +41,6 @@
37	41	static boolean[] selectedstack = new boolean[65536];
38	42	static int materialdepth = 0;
39	43
40		- static boolean DEBUG = false;
41	44	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	45
43	46	// camera change fix
..	..	@@ -45,6 +48,39 @@
45	48	static boolean ABORTED = false;
46	49
47	50	static int STEP = 1;
	51	+
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	53	+ {
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
	83	+ }
48	84
49	85	/static/ private boolean CULLFACE = false; // true;
50	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -61,7 +97,7 @@
61	97	//boolean REDUCETEXTURE = true;
62	98	boolean CACHETEXTURE = true;
63	99	boolean CLEANCACHE = false; // true;
64		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
65	101	boolean COMPRESSTEXTURE = false;
66	102	boolean KOMPACTTEXTURE = false; // true;
67	103	boolean RESIZETEXTURE = false;
..	..	@@ -74,7 +110,11 @@
74	110	//private Mat4f spotlightTransform = new Mat4f();
75	111	//private Mat4f spotlightInverseTransform = new Mat4f();
76	112	static GLContext glcontext = null;
77		- /static/ com.sun.opengl.util.texture.Texture cubemap;
	113	+ /static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
	114	+ /static/ com.sun.opengl.util.texture.Texture cubemapcustom;
	115	+ /static/ com.sun.opengl.util.texture.Texture cubemaprgb;
	116	+ boolean transformMode;
	117	+
78	118	boolean reverseUP = false;
79	119	static boolean frozen = false;
80	120	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -128,7 +168,7 @@
128	168
129	169
130	170	// OPTIONS
131		- boolean Skinshader = true;
	171	+ boolean Skinshader = false; // true;
132	172	boolean cameraLight = false;
133	173	boolean UVdebug = false;
134	174	boolean Udebug = false;
..	..	@@ -137,7 +177,7 @@
137	177	static boolean doublesided = false; // true; // reversed normals are awful for conformance
138	178	boolean anisotropy = true;
139	179	boolean softshadow = true; // slower but better false;
140		- boolean opacityhalo = false;
	180	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
141	181
142	182	boolean macromode = false;
143	183
..	..	@@ -148,6 +188,21 @@
148	188	defaultcaps.setAccumGreenBits(16);
149	189	defaultcaps.setAccumBlueBits(16);
150	190	defaultcaps.setAccumAlphaBits(16);
	191	+ }
	192	+
	193	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	194	+
	195	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	196	+ {
	197	+ try
	198	+ {
	199	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	200	+ } catch (IOException e)
	201	+ {
	202	+ System.out.println("NAME = " + name);
	203	+ e.printStackTrace(); // throw new RuntimeException(e);
	204	+ return null;
	205	+ }
151	206	}
152	207
153	208	void SetAsGLRenderer(boolean b)
..	..	@@ -168,7 +223,8 @@
168	223
169	224	SetCamera(cam);
170	225
171		- SetLight(new Camera(new cVector(10, 10, -20)));
	226	+ // Warning: not used.
	227	+ SetLight(new Camera(new cVector(15, 10, -20)));
172	228
173	229	object = o;
174	230
..	..	@@ -325,7 +381,7 @@
325	381	cStatic.objectstack[materialdepth++] = obj;
326	382	//System.out.println("material " + material);
327	383	//Applet3D.tracein(this, selected);
328		- display.vector2buffer = obj.projectedVertices;
	384	+ //display.vector2buffer = obj.projectedVertices;
329	385	if (obj instanceof Camera)
330	386	{
331	387	display.options1[0] = material.shift;
..	..	@@ -334,14 +390,28 @@
334	390	display.options1[2] = material.shadowbias;
335	391	display.options1[3] = material.aniso;
336	392	display.options1[4] = material.anisoV;
	393	+// System.out.println("display.options1[0] " + display.options1[0]);
	394	+// System.out.println("display.options1[1] " + display.options1[1]);
	395	+// System.out.println("display.options1[2] " + display.options1[2]);
	396	+// System.out.println("display.options1[3] " + display.options1[3]);
	397	+// System.out.println("display.options1[4] " + display.options1[4]);
337	398	display.options2[0] = material.opacity;
338	399	display.options2[1] = material.diffuse;
339	400	display.options2[2] = material.factor;
	401	+// System.out.println("display.options2[0] " + display.options2[0]);
	402	+// System.out.println("display.options2[1] " + display.options2[1]);
	403	+// System.out.println("display.options2[2] " + display.options2[2]);
340	404
341	405	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	406	+// System.out.println("display.options3[0] " + display.options3[0]);
	407	+// System.out.println("display.options3[1] " + display.options3[1]);
	408	+// System.out.println("display.options3[2] " + display.options3[2]);
342	409	display.options4[0] = material.cameralight/0.2f;
343	410	display.options4[1] = material.subsurface;
344	411	display.options4[2] = material.sheen;
	412	+// System.out.println("display.options4[0] " + display.options4[0]);
	413	+// System.out.println("display.options4[1] " + display.options4[1]);
	414	+// System.out.println("display.options4[2] " + display.options4[2]);
345	415
346	416	// if (display.CURRENTANTIALIAS > 0)
347	417	// display.options3[3] /= 4;
..	..	@@ -357,7 +427,7 @@
357	427	/**/
358	428	} else
359	429	{
360		- DrawMaterial(material, selected);
	430	+ DrawMaterial(material, selected, obj.projectedVertices);
361	431	}
362	432	} else
363	433	{
..	..	@@ -381,8 +451,8 @@
381	451	cStatic.objectstack[materialdepth++] = obj;
382	452	//System.out.println("material " + material);
383	453	//Applet3D.tracein("selected ", selected);
384		- display.vector2buffer = obj.projectedVertices;
385		- display.DrawMaterial(material, selected);
	454	+ //display.vector2buffer = obj.projectedVertices;
	455	+ display.DrawMaterial(material, selected, obj.projectedVertices);
386	456	}
387	457	}
388	458
..	..	@@ -399,8 +469,8 @@
399	469	materialdepth -= 1;
400	470	if (materialdepth > 0)
401	471	{
402		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
403		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	472	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	473	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
404	474	}
405	475	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
406	476	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -420,8 +490,8 @@
420	490	materialdepth -= 1;
421	491	if (materialdepth > 0)
422	492	{
423		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
424		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	493	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	494	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
425	495	}
426	496	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
427	497	//else
..	..	@@ -462,10 +532,12 @@
462	532	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463	533	{
464	534	//gl.glBegin(gl.GL_TRIANGLES);
465		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	535	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	536	+ // TEST LIVE NORMALS && !obj.dontselect
	537	+ ;
466	538	if (!hasnorm)
467	539	{
468		- // System.out.println("FUCK!!");
	540	+ // System.out.println("Mesh normal");
469	541	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
470	542	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
471	543	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1190,10 +1262,12 @@
1190	1262	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1191	1263	}
1192	1264	}
	1265	+
1193	1266	if (flipV)
1194	1267	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1195	1268	else
1196	1269	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1270	+
1197	1271	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1198	1272	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1199	1273
..	..	@@ -1213,10 +1287,12 @@
1213	1287	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1214	1288	}
1215	1289	}
	1290	+
1216	1291	if (flipV)
1217	1292	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1218	1293	else
1219	1294	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1295	+
1220	1296	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1221	1297	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1222	1298
..	..	@@ -1244,8 +1320,10 @@
1244	1320	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1245	1321	else
1246	1322	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1323	+
1247	1324	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1248	1325	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1326	+
1249	1327	count2 += 2;
1250	1328	count3 += 3;
1251	1329	}
..	..	@@ -1424,6 +1502,8 @@
1424	1502	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1425	1503	}
1426	1504
	1505	+ float[] colorV = new float[4];
	1506	+
1427	1507	void SetColor(Object3D obj, Vertex p0)
1428	1508	{
1429	1509	CameraPane display = this;
..	..	@@ -1491,8 +1571,6 @@
1491	1571	{
1492	1572	return;
1493	1573	}
1494		-
1495		- float[] colorV = new float[3];
1496	1574
1497	1575	if (false) // marked)
1498	1576	{
..	..	@@ -1601,7 +1679,7 @@
1601	1679	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1602	1680	}
1603	1681
1604		- void DrawMaterial(cMaterial material, boolean selected)
	1682	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1605	1683	{
1606	1684	CameraPane display = this;
1607	1685	//new Exception().printStackTrace();
..	..	@@ -1636,7 +1714,7 @@
1636	1714	colorV[0] = display.modelParams0[0] * material.diffuse;
1637	1715	colorV[1] = display.modelParams0[1] * material.diffuse;
1638	1716	colorV[2] = display.modelParams0[2] * material.diffuse;
1639		- colorV[3] = material.opacity;
	1717	+ colorV[3] = 1; // material.opacity;
1640	1718
1641	1719	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1642	1720	//System.out.println("Opacity = " + opacity);
..	..	@@ -1741,12 +1819,12 @@
1741	1819
1742	1820	display.modelParams7[0] = 0;
1743	1821	display.modelParams7[1] = 1000;
1744		- display.modelParams7[2] = 0;
	1822	+ display.modelParams7[2] = material.parallax;
1745	1823	display.modelParams7[3] = 0;
1746	1824
1747		- display.modelParams6[0] = 100; // criss de bug de bump
	1825	+ //display.modelParams6[0] = 100; // criss de bug de bump
1748	1826
1749		- Object3D.cVector2[] extparams = display.vector2buffer;
	1827	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1750	1828	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1751	1829	{
1752	1830	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1888,7 +1966,7 @@
1888	1966	void PushMatrix(double[][] matrix)
1889	1967	{
1890	1968	// GrafreeD.tracein(matrix);
1891		- PushMatrix(matrix,1);
	1969	+ PushMatrix(matrix, 1);
1892	1970	}
1893	1971
1894	1972	void PushMatrix()
..	..	@@ -1974,9 +2052,9 @@
1974	2052	switch(viewcode)
1975	2053	{
1976	2054	case 0: return "main";
1977		- case 1: return "one";
1978		- case 2: return "two";
1979		- case 3: return "three";
	2055	+ case 1: return "Red";
	2056	+ case 2: return "Green";
	2057	+ case 3: return "Blue";
1980	2058	case 4: return "light";
1981	2059	}
1982	2060
..	..	@@ -2042,7 +2120,7 @@
2042	2120	//System.err.println("Oeil on");
2043	2121	OEIL = true;
2044	2122	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2045		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2123	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2046	2124	//pingthread.StepToTarget(true);
2047	2125	}
2048	2126
..	..	@@ -2257,7 +2335,7 @@
2257	2335
2258	2336	void ToggleDebug()
2259	2337	{
2260		- DEBUG ^= true;
	2338	+ Globals.DEBUG ^= true;
2261	2339	}
2262	2340
2263	2341	void ToggleLookAt()
..	..	@@ -2265,7 +2343,7 @@
2265	2343	LOOKAT ^= true;
2266	2344	}
2267	2345
2268		- void ToggleRandom()
	2346	+ void ToggleSwitch()
2269	2347	{
2270	2348	SWITCH ^= true;
2271	2349	}
..	..	@@ -2275,10 +2353,17 @@
2275	2353	HANDLES ^= true;
2276	2354	}
2277	2355
	2356	+ Object3D paintFolder;
	2357	+
2278	2358	void TogglePaint()
2279	2359	{
2280	2360	PAINTMODE ^= true;
2281	2361	paintcount = 0;
	2362	+
	2363	+ if (PAINTMODE)
	2364	+ {
	2365	+ paintFolder = GetFolder();
	2366	+ }
2282	2367	}
2283	2368
2284	2369	void SwapCamera(int a, int b)
..	..	@@ -2374,7 +2459,22 @@
2374	2459	{
2375	2460	return currentGL;
2376	2461	}
2377		-
	2462	+
	2463	+ static private BufferedImage CreateBim(TextureData texturedata)
	2464	+ {
	2465	+ Grafreed.Assert(texturedata != null);
	2466	+
	2467	+ int width = texturedata.getWidth();
	2468	+ int height = texturedata.getHeight();
	2469	+
	2470	+ Buffer buffer = texturedata.getBuffer();
	2471	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2472	+
	2473	+ byte[] bytes = bytebuf.array();
	2474	+
	2475	+ return CreateBim(bytes, width, height);
	2476	+ }
	2477	+
2378	2478	/**/
2379	2479	class CacheTexture
2380	2480	{
..	..	@@ -2383,28 +2483,31 @@
2383	2483
2384	2484	int resolution;
2385	2485
2386		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2486	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2387	2487	{
2388		- texture = tex;
	2488	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2489	+ texturedata = texdata;
2389	2490	resolution = res;
2390	2491	}
2391	2492	}
2392	2493	/**/
2393	2494
2394	2495	// TEXTURE static Texture texture;
2395		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2396		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2397		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2496	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2497	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2498	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2499	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2500	+
2398	2501	int pigmentdepth = 0;
2399	2502	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2400	2503	int bumpdepth = 0;
2401	2504	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2505	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2403	2506	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2404		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2507	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2405	2508	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2406	2509
2407		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2510	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2408	2511	{
2409	2512	TextureData texturedata = null;
2410	2513
..	..	@@ -2414,7 +2517,7 @@
2414	2517	com.sun.opengl.util.texture.TextureIO.newTextureData(
2415	2518	getClass().getClassLoader().getResourceAsStream(name),
2416	2519	true,
2417		- com.sun.opengl.util.texture.TextureIO.PNG);
	2520	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2418	2521	} catch (java.io.IOException e)
2419	2522	{
2420	2523	throw new javax.media.opengl.GLException(e);
..	..	@@ -2423,13 +2526,34 @@
2423	2526	if (bump)
2424	2527	texturedata = ConvertBump(texturedata, false);
2425	2528
2426		- com.sun.opengl.util.texture.Texture texture =
2427		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2529	+// com.sun.opengl.util.texture.Texture texture =
	2530	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2428	2531
2429		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2430		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2532	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2533	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2431	2534
2432		- return texture;
	2535	+ return texturedata;
	2536	+ }
	2537	+
	2538	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2539	+ {
	2540	+ TextureData texturedata = null;
	2541	+
	2542	+ try
	2543	+ {
	2544	+ texturedata =
	2545	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2546	+ bim,
	2547	+ true);
	2548	+ } catch (Exception e)
	2549	+ {
	2550	+ throw new javax.media.opengl.GLException(e);
	2551	+ }
	2552	+
	2553	+ if (bump)
	2554	+ texturedata = ConvertBump(texturedata, false);
	2555	+
	2556	+ return texturedata;
2433	2557	}
2434	2558
2435	2559	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3502,6 +3626,8 @@
3502	3626
3503	3627	System.out.println("LOADING TEXTURE : " + name);
3504	3628
	3629	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3630	+
3505	3631	//
3506	3632	if (false) // compressbit > 0)
3507	3633	{
..	..	@@ -7900,7 +8026,7 @@
7900	8026	String pigment = Object3D.GetPigment(tex);
7901	8027	String bump = Object3D.GetBump(tex);
7902	8028
7903		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8029	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7904	8030	{
7905	8031	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7906	8032	// System.out.println("; bump = " + bump);
..	..	@@ -7915,11 +8041,69 @@
7915	8041	pigment = null;
7916	8042	}
7917	8043
7918		- ReleaseTexture(bump, true);
7919		- ReleaseTexture(pigment, false);
	8044	+ ReleaseTexture(tex, true);
	8045	+ ReleaseTexture(tex, false);
7920	8046	}
7921	8047
7922		- void ReleaseTexture(String tex, boolean bump)
	8048	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8049	+ {
	8050	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8051	+ {
	8052	+ return;
	8053	+ }
	8054	+
	8055	+ if (tex == null)
	8056	+ {
	8057	+ ReleaseTexture(null, false);
	8058	+ return;
	8059	+ }
	8060	+
	8061	+ String pigment = Object3D.GetPigment(tex);
	8062	+
	8063	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8064	+ {
	8065	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8066	+ // System.out.println("; bump = " + bump);
	8067	+ }
	8068	+
	8069	+ if (pigment.equals(""))
	8070	+ {
	8071	+ pigment = null;
	8072	+ }
	8073	+
	8074	+ ReleaseTexture(tex, false);
	8075	+ }
	8076	+
	8077	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8078	+ {
	8079	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8080	+ {
	8081	+ return;
	8082	+ }
	8083	+
	8084	+ if (tex == null)
	8085	+ {
	8086	+ ReleaseTexture(null, true);
	8087	+ return;
	8088	+ }
	8089	+
	8090	+ String bump = Object3D.GetBump(tex);
	8091	+
	8092	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8093	+ {
	8094	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8095	+ // System.out.println("; bump = " + bump);
	8096	+ }
	8097	+
	8098	+ if (bump.equals(""))
	8099	+ {
	8100	+ bump = null;
	8101	+ }
	8102	+
	8103	+ ReleaseTexture(tex, true);
	8104	+ }
	8105	+
	8106	+ void ReleaseTexture(cTexture tex, boolean bump)
7923	8107	{
7924	8108	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7925	8109	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7930,7 +8114,7 @@
7930	8114	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7931	8115
7932	8116	if (tex != null)
7933		- texture = textures.get(tex);
	8117	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7934	8118
7935	8119	// //assert( texture != null );
7936	8120	// if (texture == null)
..	..	@@ -8024,6 +8208,54 @@
8024	8208
8025	8209	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8026	8210	{
	8211	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8212	+// ambientOcclusion ) // \|\| !textureon)
	8213	+// {
	8214	+// return; // false;
	8215	+// }
	8216	+//
	8217	+// if (tex == null)
	8218	+// {
	8219	+// BindTexture(null,false,resolution);
	8220	+// BindTexture(null,true,resolution);
	8221	+// return;
	8222	+// }
	8223	+//
	8224	+// String pigment = Object3D.GetPigment(tex);
	8225	+// String bump = Object3D.GetBump(tex);
	8226	+//
	8227	+// usedtextures.add(pigment);
	8228	+// usedtextures.add(bump);
	8229	+//
	8230	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8231	+// {
	8232	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8233	+// // System.out.println("; bump = " + bump);
	8234	+// }
	8235	+//
	8236	+// if (bump.equals(""))
	8237	+// {
	8238	+// bump = null;
	8239	+// }
	8240	+// if (pigment.equals(""))
	8241	+// {
	8242	+// pigment = null;
	8243	+// }
	8244	+//
	8245	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8246	+// BindTexture(pigment, false, resolution);
	8247	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8248	+// BindTexture(bump, true, resolution);
	8249	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8250	+//
	8251	+// return; // true;
	8252	+
	8253	+ BindPigmentTexture(tex, resolution);
	8254	+ BindBumpTexture(tex, resolution);
	8255	+ }
	8256	+
	8257	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8258	+ {
8027	8259	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8028	8260	ambientOcclusion ) // \|\| !textureon)
8029	8261	{
..	..	@@ -8033,17 +8265,47 @@
8033	8265	if (tex == null)
8034	8266	{
8035	8267	BindTexture(null,false,resolution);
8036		- BindTexture(null,true,resolution);
8037	8268	return;
8038	8269	}
8039	8270
8040	8271	String pigment = Object3D.GetPigment(tex);
	8272	+
	8273	+ usedtextures.add(tex);
	8274	+
	8275	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8276	+ {
	8277	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8278	+ // System.out.println("; bump = " + bump);
	8279	+ }
	8280	+
	8281	+ if (pigment.equals(""))
	8282	+ {
	8283	+ pigment = null;
	8284	+ }
	8285	+
	8286	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8287	+ BindTexture(tex, false, resolution);
	8288	+ }
	8289	+
	8290	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8291	+ {
	8292	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8293	+ ambientOcclusion ) // \|\| !textureon)
	8294	+ {
	8295	+ return; // false;
	8296	+ }
	8297	+
	8298	+ if (tex == null)
	8299	+ {
	8300	+ BindTexture(null,true,resolution);
	8301	+ return;
	8302	+ }
	8303	+
8041	8304	String bump = Object3D.GetBump(tex);
8042	8305
8043		- usedtextures.put(pigment, pigment);
8044		- usedtextures.put(bump, bump);
	8306	+ usedtextures.add(tex);
8045	8307
8046		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8308	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8047	8309	{
8048	8310	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8049	8311	// System.out.println("; bump = " + bump);
..	..	@@ -8053,47 +8315,94 @@
8053	8315	{
8054	8316	bump = null;
8055	8317	}
8056		- if (pigment.equals(""))
8057		- {
8058		- pigment = null;
8059		- }
8060	8318
8061		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8062		- BindTexture(pigment, false, resolution);
8063	8319	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8064		- BindTexture(bump, true, resolution);
	8320	+ BindTexture(tex, true, resolution);
8065	8321	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8066		-
8067		- return; // true;
8068	8322	}
8069	8323
8070		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8324	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8325	+
	8326	+ private boolean FileExists(String tex)
8071	8327	{
8072		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8328	+ if (missingTextures.contains(tex))
	8329	+ {
	8330	+ return false;
	8331	+ }
	8332	+
	8333	+ boolean fileExists = new File(tex).exists();
	8334	+
	8335	+ if (!fileExists)
	8336	+ {
	8337	+ // If file exists, the "new File()" is not executed sgain
	8338	+ missingTextures.add(tex);
	8339	+ }
	8340	+
	8341	+ return fileExists;
	8342	+ }
	8343	+
	8344	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8345	+ {
	8346	+ CacheTexture texturecache = null;
8073	8347
8074	8348	if (tex != null)
8075	8349	{
8076		- String texname = tex;
	8350	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8351	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8077	8352
	8353	+ if (texname.equals("") && texdata == null)
	8354	+ {
	8355	+ return null;
	8356	+ }
	8357	+
	8358	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8359	+
8078	8360	// String[] split = tex.split("Textures");
8079	8361	// if (split.length > 1)
8080	8362	// texname = "/Users/nbriere/Textures" + split[split.length-1];
8081	8363	// else
8082	8364	// if (!texname.startsWith("/"))
8083	8365	// texname = "/Users/nbriere/Textures/" + texname;
8084		- if (!new File(tex).exists())
	8366	+ if (!FileExists(texname) && !texname.startsWith("@"))
8085	8367	{
8086		- texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
	8368	+ texname = fallbackTextureName;
8087	8369	}
8088	8370
8089	8371	if (CACHETEXTURE)
8090		- texture = textures.get(texname); // TEXTURE CACHE
8091		-
8092		- TextureData texturedata = null;
8093		-
8094		- if (texture == null \|\| texture.resolution < resolution)
8095	8372	{
8096		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8373	+ if (texdata == null)
	8374	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8375	+ else
	8376	+ texturecache = bimtextures.get(texdata);
	8377	+ }
	8378	+
	8379	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8380	+ {
	8381	+ TextureData texturedata = null;
	8382	+
	8383	+ if (texdata != null && textureon)
	8384	+ {
	8385	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8386	+
	8387	+ try
	8388	+ {
	8389	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8390	+ }
	8391	+ catch (Exception e)
	8392	+ {
	8393	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8394	+ }
	8395	+
	8396	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8397	+ bimtextures.put(texdata, texturecache);
	8398	+
	8399	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8400	+
	8401	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8402	+ //bim2 = bim;
	8403	+ }
	8404	+ else
	8405	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8097	8406	{
8098	8407	assert(!bump);
8099	8408	// if (bump)
..	..	@@ -8104,19 +8413,23 @@
8104	8413	// }
8105	8414	// else
8106	8415	// {
8107		- texture = textures.get(tex);
8108		- if (texture == null)
	8416	+ // texturecache = textures.get(texname); // suspicious
	8417	+ if (texturecache == null)
8109	8418	{
8110		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8419	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8111	8420	}
	8421	+ else
	8422	+ new Exception().printStackTrace();
8112	8423	// }
8113	8424	} else
8114		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8425	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8115	8426	{
8116	8427	assert(bump);
8117		- texture = textures.get(tex);
8118		- if (texture == null)
8119		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8428	+ // texturecache = textures.get(texname); // suspicious
	8429	+ if (texturecache == null)
	8430	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8431	+ else
	8432	+ new Exception().printStackTrace();
8120	8433	} else
8121	8434	{
8122	8435	//if (tex.equals("IMMORTAL"))
..	..	@@ -8124,11 +8437,22 @@
8124	8437	// texture = GetResourceTexture("default.png");
8125	8438	//} else
8126	8439	//{
8127		- if (tex.equals("WHITE_NOISE"))
	8440	+ if (texname.endsWith("WHITE_NOISE"))
8128	8441	{
8129		- texture = textures.get(tex);
8130		- if (texture == null)
8131		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8442	+ // texturecache = textures.get(texname); // suspicious
	8443	+ if (texturecache == null)
	8444	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8445	+ else
	8446	+ new Exception().printStackTrace();
	8447	+ } else
	8448	+ {
	8449	+ if (texname.startsWith("@"))
	8450	+ {
	8451	+ // texturecache = textures.get(texname); // suspicious
	8452	+ if (texturecache == null)
	8453	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8454	+ else
	8455	+ new Exception().printStackTrace();
8132	8456	} else
8133	8457	{
8134	8458	if (textureon)
..	..	@@ -8153,7 +8477,7 @@
8153	8477	}
8154	8478
8155	8479	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8156		- if (!new File(cachename).exists())
	8480	+ if (!FileExists(cachename))
8157	8481	cachename = texname;
8158	8482	else
8159	8483	processbump = false; // don't process bump map again
..	..	@@ -8175,7 +8499,7 @@
8175	8499	}
8176	8500
8177	8501	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8178		- if (!new File(cachename).exists())
	8502	+ if (!FileExists(cachename))
8179	8503	cachename = texname;
8180	8504	else
8181	8505	processbump = false; // don't process bump map again
..	..	@@ -8187,19 +8511,20 @@
8187	8511	if (texturedata == null)
8188	8512	throw new Exception();
8189	8513
8190		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8514	+ texturecache = new CacheTexture(texturedata,resolution);
8191	8515	//texture = GetTexture(tex, bump);
8192	8516	}
	8517	+ }
8193	8518	}
8194	8519	//}
8195	8520	}
8196	8521
8197		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8522	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8198	8523	{
8199	8524	//return false;
8200	8525
8201	8526	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8202		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8527	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8203	8528	{
8204	8529	// String ext = "_highres";
8205	8530	// if (REDUCETEXTURE)
..	..	@@ -8216,52 +8541,17 @@
8216	8541	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8217	8542	if (!cachefile.exists())
8218	8543	{
8219		- // cache to disk
8220		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8221		- //buffers[0].
8222		-
8223		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8224		- int[] pixels = new int[bytebuf.capacity()/3];
8225		-
8226		- // squared size heuristic...
8227		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8544	+ //if (texturedata.getWidth() == texturedata.getHeight())
8228	8545	{
8229		- for (int i=pixels.length; --i>=0;)
8230		- {
8231		- int i3 = i*3;
8232		- pixels[i] = 0xFF;
8233		- pixels[i] <<= 8;
8234		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8235		- pixels[i] <<= 8;
8236		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8237		- pixels[i] <<= 8;
8238		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8239		- }
8240		-
8241		- /*
8242		- int r=0,g=0,b=0,a=0;
8243		- for (int i=0; i<width; i++)
8244		- for (int j=0; j<height; j++)
8245		- {
8246		- int index = j*width+i;
8247		- int p = pixels[index];
8248		- a = ((p>>24) & 0xFF);
8249		- r = ((p>>16) & 0xFF);
8250		- g = ((p>>8) & 0xFF);
8251		- b = (p & 0xFF);
8252		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8253		- }
8254		- /**/
8255		- int width = (int)Math.sqrt(pixels.length); // squared
8256		- int height = width;
8257		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8258		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8546	+ BufferedImage rendImage = CreateBim(texturedata);
	8547	+
8259	8548	ImageWriter writer = null;
8260	8549	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8261	8550	if (iter.hasNext()) {
8262	8551	writer = (ImageWriter)iter.next();
8263	8552	}
8264		- float compressionQuality = 0.9f;
	8553	+
	8554	+ float compressionQuality = 0.85f;
8265	8555	try
8266	8556	{
8267	8557	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8278,18 +8568,20 @@
8278	8568	}
8279	8569	}
8280	8570	}
8281		-
	8571	+
	8572	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8573	+
8282	8574	//System.out.println("Texture = " + tex);
8283		- if (textures.containsKey(texname))
	8575	+ if (textures.containsKey(tex))
8284	8576	{
8285		- CacheTexture thetex = textures.get(texname);
	8577	+ CacheTexture thetex = textures.get(tex);
8286	8578	thetex.texture.disable();
8287	8579	thetex.texture.dispose();
8288		- textures.remove(texname);
	8580	+ textures.remove(tex);
8289	8581	}
8290	8582
8291		- texture.texturedata = texturedata;
8292		- textures.put(texname, texture);
	8583	+ //texture.texturedata = texturedata;
	8584	+ textures.put(tex, texturecache);
8293	8585
8294	8586	// newtex = true;
8295	8587	}
..	..	@@ -8305,10 +8597,44 @@
8305	8597	}
8306	8598	}
8307	8599
8308		- return texture;
	8600	+ return texturecache;
8309	8601	}
8310	8602
8311		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8603	+ static void EmbedTextures(cTexture tex)
	8604	+ {
	8605	+ if (tex.pigmentdata == null)
	8606	+ {
	8607	+ //String texname = Object3D.GetPigment(tex);
	8608	+
	8609	+ CacheTexture texturecache = texturepigment.get(tex);
	8610	+
	8611	+ if (texturecache != null)
	8612	+ {
	8613	+ tex.pw = texturecache.texturedata.getWidth();
	8614	+ tex.ph = texturecache.texturedata.getHeight();
	8615	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8616	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8617	+ ;
	8618	+ //, tex.pw, tex.ph), 0.5f);
	8619	+ }
	8620	+ }
	8621	+
	8622	+ if (tex.bumpdata == null)
	8623	+ {
	8624	+ //String texname = Object3D.GetBump(tex);
	8625	+
	8626	+ CacheTexture texturecache = texturebump.get(tex);
	8627	+
	8628	+ if (texturecache != null)
	8629	+ {
	8630	+ tex.bw = texturecache.texturedata.getWidth();
	8631	+ tex.bh = texturecache.texturedata.getHeight();
	8632	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8633	+ }
	8634	+ }
	8635	+ }
	8636	+
	8637	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8312	8638	{
8313	8639	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8314	8640
..	..	@@ -8326,21 +8652,21 @@
8326	8652	return texture!=null?texture.texture:null;
8327	8653	}
8328	8654
8329		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8655	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8330	8656	{
8331	8657	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8332	8658
8333	8659	return texture!=null?texture.texturedata:null;
8334	8660	}
8335	8661
8336		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8662	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8337	8663	{
8338	8664	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8339	8665	{
8340	8666	return false;
8341	8667	}
8342	8668
8343		- boolean newtex = false;
	8669	+ //boolean newtex = false;
8344	8670
8345	8671	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8346	8672
..	..	@@ -8372,9 +8698,75 @@
8372	8698	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8373	8699	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8374	8700
8375		- return newtex;
	8701	+ return true; // Warning: not used.
8376	8702	}
8377	8703
	8704	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8705	+ {
	8706	+ try
	8707	+ {
	8708	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8709	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8710	+ ImageWriter writer = writers.next();
	8711	+
	8712	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8713	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8714	+ param.setCompressionQuality(quality);
	8715	+
	8716	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8717	+ writer.setOutput(ios);
	8718	+ writer.write(null, new IIOImage(image, null, null), param);
	8719	+
	8720	+ byte[] data = baos.toByteArray();
	8721	+ writer.dispose();
	8722	+ return data;
	8723	+ }
	8724	+ catch (Exception e)
	8725	+ {
	8726	+ e.printStackTrace();
	8727	+ return null;
	8728	+ }
	8729	+ }
	8730	+
	8731	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8732	+ {
	8733	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8734	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8735	+ ImageReader reader = writers.next();
	8736	+
	8737	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8738	+
	8739	+ ImageReadParam param = reader.getDefaultReadParam();
	8740	+ param.setDestination(bim);
	8741	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8742	+
	8743	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8744	+ reader.setInput(ios);
	8745	+ BufferedImage bim2 = reader.read(0, param);
	8746	+ reader.dispose();
	8747	+
	8748	+// WritableRaster raster = bim2.getRaster();
	8749	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8750	+// byte[] bytes = data.getData();
	8751	+//
	8752	+// int[] pixels = new int[bytes.length/3];
	8753	+// for (int i=pixels.length; --i>=0;)
	8754	+// {
	8755	+// int i3 = i*3;
	8756	+// pixels[i] = 0xFF;
	8757	+// pixels[i] <<= 8;
	8758	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8759	+// pixels[i] <<= 8;
	8760	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8761	+// pixels[i] <<= 8;
	8762	+// pixels[i] \|= bytes[i3] & 0xFF;
	8763	+// }
	8764	+//
	8765	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8766	+
	8767	+ return bim;
	8768	+ }
	8769	+
8378	8770	ShadowBuffer shadowPBuf;
8379	8771	AntialiasBuffer antialiasPBuf;
8380	8772	int MAXSTACK;
..	..	@@ -8391,10 +8783,12 @@
8391	8783
8392	8784	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8393	8785	MAXSTACK = temp[0];
8394		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8786	+ if (Globals.DEBUG)
	8787	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8395	8788	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8396	8789	MAXSTACK = temp[0];
8397		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8790	+ if (Globals.DEBUG)
	8791	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8398	8792
8399	8793	// Use debug pipeline
8400	8794	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8402,7 +8796,8 @@
8402	8796	gl = drawable.getGL(); //
8403	8797
8404	8798	GL gl3 = getGL();
8405		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8406	8801
8407	8802
8408	8803	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8567,7 +8962,7 @@
8567	8962
8568	8963	if (cubemap == null)
8569	8964	{
8570		- LoadEnvy(5);
	8965	+ //LoadEnvy(1);
8571	8966	}
8572	8967
8573	8968	//cubemap.enable();
..	..	@@ -8843,6 +9238,8 @@
8843	9238
8844	9239	void LoadEnvy(int which)
8845	9240	{
	9241	+ assert(false);
	9242	+
8846	9243	String name;
8847	9244	String ext;
8848	9245
..	..	@@ -8854,37 +9251,58 @@
8854	9251	cubemap = null;
8855	9252	return;
8856	9253	case 1:
8857		- name = "cubemaps/box_";
8858		- ext = "png";
	9254	+ name = "cubemaps/rgb/";
	9255	+ ext = "jpg";
8859	9256	reverseUP = false;
8860	9257	break;
8861	9258	case 2:
8862		- name = "cubemaps/uffizi_";
8863		- ext = "png";
8864		- break; // reverseUP = true; break;
	9259	+ name = "cubemaps/uffizi/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
8865	9263	case 3:
8866		- name = "cubemaps/CloudyHills_";
8867		- ext = "tga";
	9264	+ name = "cubemaps/CloudyHills/";
	9265	+ ext = "jpg";
8868	9266	reverseUP = false;
8869	9267	break;
8870	9268	case 4:
8871		- name = "cubemaps/cornell_";
	9269	+ name = "cubemaps/cornell/";
8872	9270	ext = "png";
8873	9271	reverseUP = false;
8874	9272	break;
	9273	+ case 5:
	9274	+ name = "cubemaps/skycube/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
	9278	+ case 6:
	9279	+ name = "cubemaps/SaintLazarusChurch3/";
	9280	+ ext = "jpg";
	9281	+ reverseUP = false;
	9282	+ break;
	9283	+ case 7:
	9284	+ name = "cubemaps/Sodermalmsallen/";
	9285	+ ext = "jpg";
	9286	+ reverseUP = false;
	9287	+ break;
	9288	+ case 8:
	9289	+ name = "cubemaps/Sodermalmsallen2/";
	9290	+ ext = "jpg";
	9291	+ reverseUP = false;
	9292	+ break;
	9293	+ case 9:
	9294	+ name = "cubemaps/UnionSquare/";
	9295	+ ext = "jpg";
	9296	+ reverseUP = false;
	9297	+ break;
8875	9298	default:
8876		- name = "cubemaps/rgb_";
8877		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9299	+ name = "cubemaps/box/";
	9300	+ ext = "png"; /mipmap = true;/
	9301	+ reverseUP = false;
8878	9302	break;
8879	9303	}
8880		-
8881		- try
8882		- {
8883		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8884		- } catch (IOException e)
8885		- {
8886		- throw new RuntimeException(e);
8887		- }
	9304	+
	9305	+ LoadSkybox(name, ext, mipmap);
8888	9306	}
8889	9307
8890	9308	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8916,8 +9334,12 @@
8916	9334	static double[] model = new double[16];
8917	9335	double[] camera2light = new double[16];
8918	9336	double[] light2camera = new double[16];
8919		- int newenvy = -1;
8920		- boolean envyoff = true; // false;
	9337	+
	9338	+ //int newenvy = -1;
	9339	+ //boolean envyoff = false;
	9340	+
	9341	+ String loadedskyboxname;
	9342	+
8921	9343	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8922	9344	//float[] light0 = { 0,0,0 };
8923	9345	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9210,11 +9632,35 @@
9210	9632	jy8[3] = 0.5f;
9211	9633	}
9212	9634
9213		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9635	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9214	9636	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9215	9637	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9216	9638	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9217	9639
	9640	+ void ResetOptions()
	9641	+ {
	9642	+ options1[0] = 100;
	9643	+ options1[1] = 0.025f;
	9644	+ options1[2] = 0.01f;
	9645	+ options1[3] = 0;
	9646	+ options1[4] = 0;
	9647	+
	9648	+ options2[0] = 0;
	9649	+ options2[1] = 0.75f;
	9650	+ options2[2] = 0;
	9651	+ options2[3] = 0;
	9652	+
	9653	+ options3[0] = 1;
	9654	+ options3[1] = 1;
	9655	+ options3[2] = 1;
	9656	+ options3[3] = 0;
	9657	+
	9658	+ options4[0] = 1;
	9659	+ options4[1] = 0;
	9660	+ options4[2] = 1;
	9661	+ options4[3] = 0;
	9662	+ }
	9663	+
9218	9664	static int imagecount = 0; // movie generation
9219	9665
9220	9666	static int jitter = 0;
..	..	@@ -9310,8 +9756,8 @@
9310	9756	assert (parentcam != renderCamera);
9311	9757
9312	9758	if (renderCamera != lightCamera)
9313		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9314		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9759	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9760	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9315	9761
9316	9762	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9317	9763
..	..	@@ -9326,8 +9772,8 @@
9326	9772	LA.matCopy(renderCamera.fromScreen, matrix);
9327	9773
9328	9774	if (renderCamera != lightCamera)
9329		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9330		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9775	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9776	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9331	9777
9332	9778	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9333	9779
..	..	@@ -9373,10 +9819,12 @@
9373	9819	rati = 1 / rati;
9374	9820	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9375	9821	}
9376		- assert (newenvy == -1);
	9822	+
	9823	+ //assert (newenvy == -1);
	9824	+
9377	9825	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9378	9826	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9379		- DrawSkyBox(gl);
	9827	+ DrawSkyBox(gl, (float)rati);
9380	9828	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9381	9829	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9382	9830	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10242,9 +10690,18 @@
10242	10690	static boolean init = false;
10243	10691
10244	10692	double[][] matrix = LA.newMatrix();
	10693	+
	10694	+ // This is to refresh the UI of the material panel.
	10695	+ ObjEditor patchMaterial;
10245	10696
10246	10697	public void display(GLAutoDrawable drawable)
10247	10698	{
	10699	+ if (patchMaterial.patchMaterial)
	10700	+ {
	10701	+ patchMaterial.patchMaterial = false;
	10702	+ patchMaterial.objectPanel.setSelectedIndex(1);
	10703	+ }
	10704	+
10248	10705	if (Grafreed.savesound && Grafreed.hassound)
10249	10706	{
10250	10707	Grafreed.wav.save();
..	..	@@ -10325,6 +10782,7 @@
10325	10782	ANTIALIAS = 0;
10326	10783	//System.out.println("RESTART");
10327	10784	AAtimer.restart();
	10785	+ Globals.TIMERRUNNING = true;
10328	10786	}
10329	10787	}
10330	10788	}
..	..	@@ -10392,13 +10850,14 @@
10392	10850	ambientOcclusion = false;
10393	10851	}
10394	10852
10395		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10853	+ if (//Globals.lighttouched &&
	10854	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10396	10855	{
10397	10856	//if (RENDERSHADOW) // ?
10398	10857	if (!IsFrozen())
10399	10858	{
10400	10859	// dec 2012
10401		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10860	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10402	10861	{
10403	10862	Globals.framecount++;
10404	10863	shadowbuffer.display();
..	..	@@ -10411,7 +10870,7 @@
10411	10870
10412	10871	if (wait)
10413	10872	{
10414		- Sleep(500);
	10873	+ Sleep(200); // blocks everything
10415	10874
10416	10875	wait = false;
10417	10876	}
..	..	@@ -10525,8 +10984,8 @@
10525	10984
10526	10985	// if (parentcam != renderCamera) // not a light
10527	10986	if (cam != lightCamera)
10528		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10529		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10987	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10988	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10530	10989
10531	10990	for (int j = 0; j < 4; j++)
10532	10991	{
..	..	@@ -10540,8 +10999,8 @@
10540	10999
10541	11000	// if (parentcam != renderCamera) // not a light
10542	11001	if (cam != lightCamera)
10543		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10544		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	11002	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11003	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10545	11004
10546	11005	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10547	11006
..	..	@@ -10627,13 +11086,43 @@
10627	11086	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10628	11087	}
10629	11088
10630		- if (newenvy > -1)
	11089	+// if (newenvy > -1)
	11090	+// {
	11091	+// LoadEnvy(newenvy);
	11092	+// }
	11093	+//
	11094	+// newenvy = -1;
	11095	+
	11096	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10631	11097	{
10632		- LoadEnvy(newenvy);
	11098	+ if (cubemaprgb == null)
	11099	+ {
	11100	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11101	+ }
	11102	+
	11103	+ cubemap = cubemaprgb;
10633	11104	}
10634		-
10635		- newenvy = -1;
10636		-
	11105	+ else
	11106	+ {
	11107	+ if (object.skyboxname != null)
	11108	+ {
	11109	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11110	+ {
	11111	+ if (cubemap != null && cubemap != cubemaprgb)
	11112	+ cubemap.dispose();
	11113	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11114	+ loadedskyboxname = object.skyboxname;
	11115	+ }
	11116	+ }
	11117	+ else
	11118	+ {
	11119	+ cubemapcustom = null;
	11120	+ loadedskyboxname = null;
	11121	+ }
	11122	+
	11123	+ cubemap = cubemapcustom;
	11124	+ }
	11125	+
10637	11126	ratio = ((double) getWidth()) / getHeight();
10638	11127	//System.out.println("ratio = " + ratio);
10639	11128
..	..	@@ -10649,7 +11138,7 @@
10649	11138
10650	11139	if (!IsFrozen() && !ambientOcclusion)
10651	11140	{
10652		- DrawSkyBox(gl);
	11141	+ DrawSkyBox(gl, (float)ratio);
10653	11142	}
10654	11143
10655	11144	//if (selection_view == -1)
..	..	@@ -10832,9 +11321,9 @@
10832	11321
10833	11322	gl.glMatrixMode(GL.GL_MODELVIEW);
10834	11323
10835		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10836		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10837		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11324	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11325	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11326	+gl.glEnable(gl.GL_MULTISAMPLE);
10838	11327	} else
10839	11328	{
10840	11329	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10845,7 +11334,7 @@
10845	11334	//System.out.println("BLENDING ON");
10846	11335	gl.glEnable(GL.GL_BLEND);
10847	11336	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10848		-
	11337	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10849	11338	gl.glMatrixMode(gl.GL_PROJECTION);
10850	11339	gl.glLoadIdentity();
10851	11340
..	..	@@ -10934,8 +11423,8 @@
10934	11423	System.err.println("parentcam != renderCamera");
10935	11424
10936	11425	// if (cam != lightCamera)
10937		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10938		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11426	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11427	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10939	11428	}
10940	11429
10941	11430	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10956,8 +11445,8 @@
10956	11445	if (true) // TODO
10957	11446	{
10958	11447	if (cam != lightCamera)
10959		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10960		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11448	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11449	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10961	11450	}
10962	11451
10963	11452	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11094,7 +11583,7 @@
11094	11583	}
11095	11584	}
11096	11585
11097		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11586	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11098	11587	{
11099	11588	//gl.glDepthFunc(GL.GL_LEQUAL);
11100	11589	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11102,24 +11591,21 @@
11102	11591
11103	11592	boolean texon = textureon;
11104	11593
11105		- if (RENDERPROGRAM > 0)
11106		- {
11107		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11108		- textureon = false;
11109		- }
	11594	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11595	+ textureon = false;
	11596	+
11110	11597	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11111	11598	//System.out.println("ALLO");
11112	11599	gl.glColorMask(false, false, false, false);
11113	11600	DrawObject(gl);
11114		- if (RENDERPROGRAM > 0)
11115		- {
11116		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11117		- textureon = texon;
11118		- }
	11601	+
	11602	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11603	+ textureon = texon;
	11604	+
11119	11605	gl.glColorMask(true, true, true, true);
11120	11606
11121	11607	gl.glDepthFunc(GL.GL_EQUAL);
11122		- //gl.glDepthMask(false);
	11608	+ gl.glDepthMask(false);
11123	11609	}
11124	11610
11125	11611	if (false) // DrawMode() == SHADOW)
..	..	@@ -11302,15 +11788,36 @@
11302	11788
11303	11789	static boolean zoomonce = false;
11304	11790
	11791	+ static void CreateSelectedPoint()
	11792	+ {
	11793	+ if (selectedpoint == null)
	11794	+ {
	11795	+ debugpointG = new Sphere();
	11796	+ debugpointP = new Sphere();
	11797	+ debugpointC = new Sphere();
	11798	+ debugpointR = new Sphere();
	11799	+
	11800	+ selectedpoint = new Superellipsoid();
	11801	+
	11802	+ for (int i=0; i<8; i++)
	11803	+ {
	11804	+ debugpoints[i] = new Sphere();
	11805	+ }
	11806	+ }
	11807	+ }
	11808	+
11305	11809	void DrawObject(GL gl, boolean draw)
11306	11810	{
	11811	+ // To clear camera values
	11812	+ ResetOptions();
	11813	+
11307	11814	//System.out.println("DRAW OBJECT " + mouseDown);
11308	11815	// DrawMode() = SELECTION;
11309	11816	//GL gl = getGL();
11310	11817	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11311	11818	{
11312	11819	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11313		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11820	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11314	11821	pingthread.StepToTarget(true); // true);
11315	11822	// zoomonce = false;
11316	11823	}
..	..	@@ -11382,8 +11889,9 @@
11382	11889
11383	11890	if (DrawMode() == DEFAULT)
11384	11891	{
11385		- if (DEBUG)
	11892	+ if (Globals.DEBUG)
11386	11893	{
	11894	+ CreateSelectedPoint();
11387	11895	float radius = 0.05f;
11388	11896	if (selectedpoint.radius != radius)
11389	11897	{
..	..	@@ -11437,20 +11945,32 @@
11437	11945	ReleaseTextures(DEFAULT_TEXTURES);
11438	11946
11439	11947	if (CLEANCACHE)
11440		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11948	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11441	11949	{
11442		- String tex = e.nextElement();
	11950	+ cTexture tex = e.nextElement();
11443	11951
11444	11952	// System.out.println("Texture --------- " + tex);
11445	11953
11446		- if (tex.equals("WHITE_NOISE"))
	11954	+ if (tex.equals("WHITE_NOISE:"))
11447	11955	continue;
11448	11956
11449		- if (!usedtextures.containsKey(tex))
	11957	+ if (!usedtextures.contains(tex))
11450	11958	{
	11959	+ CacheTexture gettex = texturepigment.get(tex);
11451	11960	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11452		- textures.get(tex).texture.dispose();
11453		- textures.remove(tex);
	11961	+ if (gettex != null)
	11962	+ {
	11963	+ gettex.texture.dispose();
	11964	+ texturepigment.remove(tex);
	11965	+ }
	11966	+
	11967	+ gettex = texturebump.get(tex);
	11968	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11969	+ if (gettex != null)
	11970	+ {
	11971	+ gettex.texture.dispose();
	11972	+ texturebump.remove(tex);
	11973	+ }
11454	11974	}
11455	11975	}
11456	11976	}
..	..	@@ -11552,7 +12072,7 @@
11552	12072	return;
11553	12073	}
11554	12074
11555		- String string = obj.GetToolTip();
	12075	+ String string = obj.toString(); //.GetToolTip();
11556	12076
11557	12077	GL gl = GetGL();
11558	12078
..	..	@@ -11869,8 +12389,8 @@
11869	12389	//obj.TransformToWorld(light, light);
11870	12390	for (int i = tp.size(); --i >= 0;)
11871	12391	{
11872		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11873		- LA.xformPos(light, tp.get(i).toParent, light);
	12392	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12393	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11874	12394	}
11875	12395
11876	12396
..	..	@@ -11887,8 +12407,8 @@
11887	12407	parentcam = cameras[0];
11888	12408	}
11889	12409
11890		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11891		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12410	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12411	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11892	12412
11893	12413	LA.xformPos(light, renderCamera.toScreen, light);
11894	12414
..	..	@@ -11978,8 +12498,76 @@
11978	12498
11979	12499	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11980	12500
11981		- String program =
	12501	+ String programmin =
	12502	+ // Min shader
11982	12503	"!!ARBfp1.0\n" +
	12504	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12505	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12506	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12507	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12508	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12509	+ "PARAM light2cam0 = program.env[10];" +
	12510	+ "PARAM light2cam1 = program.env[11];" +
	12511	+ "PARAM light2cam2 = program.env[12];" +
	12512	+ "TEMP temp;" +
	12513	+ "TEMP light;" +
	12514	+ "TEMP ndotl;" +
	12515	+ "TEMP normal;" +
	12516	+ "TEMP depth;" +
	12517	+ "TEMP eye;" +
	12518	+ "TEMP pos;" +
	12519	+
	12520	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12521	+ Normalize("normal") +
	12522	+ "MOV light, state.light[0].position;" +
	12523	+ "DP3 ndotl.x, light, normal;" +
	12524	+
	12525	+ // shadow
	12526	+ "MOV pos, fragment.texcoord[1];" +
	12527	+ "MOV temp, pos;" +
	12528	+ ShadowTextureFetch("depth", "temp", "1") +
	12529	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12530	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12531	+
	12532	+ // No shadow when out of frustum
	12533	+ //"SGE temp.y, depth.z, zero123.y;" +
	12534	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12535	+
	12536	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12537	+
	12538	+ // Backlit
	12539	+ "MOV pos.w, zero123.y;" +
	12540	+ "DP4 eye.x, pos, light2cam0;" +
	12541	+ "DP4 eye.y, pos, light2cam1;" +
	12542	+ "DP4 eye.z, pos, light2cam2;" +
	12543	+ Normalize("eye") +
	12544	+
	12545	+ "DP3 ndotl.y, -eye, normal;" +
	12546	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12547	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12548	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12549	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12550	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12551	+
	12552	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12553	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12554	+
	12555	+ // Pigment
	12556	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12557	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12558	+ "MUL temp, temp, ndotl.x;" +
	12559	+
	12560	+ "MUL temp, temp, zero123.z;" +
	12561	+
	12562	+ //"MUL temp, temp, ndotl.y;" +
	12563	+
	12564	+ "MOV temp.w, zero123.y;" + // reset alpha
	12565	+ "MOV result.color, temp;" +
	12566	+ "END";
	12567	+
	12568	+ String programmax =
	12569	+ "!!ARBfp1.0\n" +
	12570	+
11983	12571	//"OPTION ARB_fragment_program_shadow;" +
11984	12572	"PARAM light2cam0 = program.env[10];" +
11985	12573	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12005,7 +12593,7 @@
12005	12593	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12006	12594	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12007	12595	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12008		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12596	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12009	12597	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12010	12598	"PARAM options1 = program.env[62];" + // fog rgb color
12011	12599	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12094,8 +12682,7 @@
12094	12682	"TEMP shininess;" +
12095	12683	"\n" +
12096	12684	"MOV texSamp, one;" +
12097		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12098		-
	12685	+
12099	12686	"MOV mapgrid.x, one2048th.x;" +
12100	12687	"MOV temp, fragment.texcoord[1];" +
12101	12688	/*
..	..	@@ -12116,20 +12703,20 @@
12116	12703	"MUL temp, floor, mapgrid.x;" +
12117	12704	//"TEX depth0, temp, texture[1], 2D;" +
12118	12705	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12119		- TextureFetch("depth0", "temp", "1") +
	12706	+ ShadowTextureFetch("depth0", "temp", "1") +
12120	12707	"") +
12121	12708	"ADD temp.x, temp.x, mapgrid.x;" +
12122	12709	//"TEX depth1, temp, texture[1], 2D;" +
12123	12710	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12124		- TextureFetch("depth1", "temp", "1") +
	12711	+ ShadowTextureFetch("depth1", "temp", "1") +
12125	12712	"") +
12126	12713	"ADD temp.y, temp.y, mapgrid.x;" +
12127	12714	//"TEX depth2, temp, texture[1], 2D;" +
12128		- TextureFetch("depth2", "temp", "1") +
	12715	+ ShadowTextureFetch("depth2", "temp", "1") +
12129	12716	"SUB temp.x, temp.x, mapgrid.x;" +
12130	12717	//"TEX depth3, temp, texture[1], 2D;" +
12131	12718	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12132		- TextureFetch("depth3", "temp", "1") +
	12719	+ ShadowTextureFetch("depth3", "temp", "1") +
12133	12720	"") +
12134	12721	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12135	12722	//"MOV params, material;" +
..	..	@@ -12251,7 +12838,7 @@
12251	12838	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12252	12839	// mar 2013 ??? "KIL alpha.a;" +
12253	12840	"MOV alpha, texSamp.aaaa;" + // y;" +
12254		- "KIL alpha.a;" +
	12841	+ "KIL alpha.a;" + // not sure with parallax mapping
12255	12842	/*
12256	12843	"MUL temp.xy, temp, two;" +
12257	12844	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12337,11 +12924,6 @@
12337	12924	"SUB bump0, bump0, half;" +
12338	12925	"ADD bump, bump, bump0;" +
12339	12926
12340		- "MOV temp.x, texSamp.a;" +
12341		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12342		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12343		- "MOV texSamp.a, temp.x;" +
12344		-
12345	12927	// double-sided
12346	12928	/**/
12347	12929	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12371,6 +12953,41 @@
12371	12953	Normalize("U") +
12372	12954
12373	12955	// parallax mapping
	12956	+
	12957	+ "DP3 temp2.x, V, eye;" +
	12958	+ "DP3 temp2.y, U, eye;" +
	12959	+ "DP3 temp2.z, normal, eye;" +
	12960	+ "RCP temp2.z, temp2.z;" +
	12961	+
	12962	+ "DP3 temp2.w, texSamp, texSamp;" + // Height
	12963	+ "RSQ temp2.w, temp2.w;" +
	12964	+ "RCP temp2.w, temp2.w;" +
	12965	+
	12966	+ "SUB temp2.w, temp2.w, half;" +
	12967	+// "SGE temp.x, temp2.w, eps.x;" +
	12968	+// "MUL temp2.w, temp2.w, temp.x;" +
	12969	+
	12970	+ //"MOV texSamp, U;" +
	12971	+
	12972	+ "MUL temp2.z, temp2.z, temp2.w;" +
	12973	+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
	12974	+
	12975	+ "MUL temp2, temp2, temp2.z;" +
	12976	+
	12977	+ "MOV temp, fragment.texcoord[0];" +
	12978	+
	12979	+ "SUB temp, temp, temp2;" +
	12980	+
	12981	+ "TEX texSamp, temp, texture[0], 2D;" +
	12982	+ "POW texSamp.a, texSamp.a, params6.w;" + // punch through
	12983	+ "MOV alpha, texSamp.aaaa;" +
	12984	+
	12985	+// parallax mapping
	12986	+
	12987	+ "MOV temp.x, texSamp.a;" +
	12988	+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
	12989	+ //"LRP texSamp0, params5.x, texSamp0, one;" +
	12990	+ "MOV texSamp.a, temp.x;" +
12374	12991
12375	12992	//"MOV temp, fragment.texcoord[0];" +
12376	12993	//
..	..	@@ -12500,10 +13117,10 @@
12500	13117	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12501	13118	"") +
12502	13119
12503		- // display shadow only (bump == 0)
	13120	+ // display shadow only (fakedepth == 0)
12504	13121	"SUB temp.x, half.x, shadow.x;" +
12505		- "MOV temp.y, -params6.x;" +
12506		- "SLT temp.z, temp.y, zero.x;" +
	13122	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13123	+ "SLT temp.z, temp.y, -c256i.x;" +
12507	13124	"SUB temp.y, one.x, temp.z;" +
12508	13125	"MUL temp.x, temp.x, temp.y;" +
12509	13126	"KIL temp.x;" +
..	..	@@ -12834,8 +13451,19 @@
12834	13451	//once = true;
12835	13452	}
12836	13453
12837		- System.out.print("Program #" + mode + "; length = " + program.length());
12838		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13454	+ String program = programmax;
	13455	+
	13456	+ if (Globals.MINSHADER)
	13457	+ {
	13458	+ program = programmin;
	13459	+ }
	13460	+
	13461	+ if (Globals.DEBUG)
	13462	+ {
	13463	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13464	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13465	+ }
	13466	+
12839	13467	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12840	13468
12841	13469	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12882,7 +13510,8 @@
12882	13510	"\n" +
12883	13511	"END\n";
12884	13512
12885		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13513	+ if (Globals.DEBUG)
	13514	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
12886	13515	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12887	13516
12888	13517	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12927,25 +13556,26 @@
12927	13556	return out;
12928	13557	}
12929	13558
12930		- String TextureFetch(String dest, String src, String unit)
	13559	+ // Also does frustum culling
	13560	+ String ShadowTextureFetch(String dest, String src, String unit)
12931	13561	{
12932	13562	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12933	13563	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12934	13564	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13565	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13566	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12935	13567	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12936		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12937		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12938		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12939		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13568	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13569	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12940	13570	//"SWZ buffer, temp, w,w,w,w;";
12941		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13571	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12942	13572	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12943	13573	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12944	13574	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12945		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13575	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12946	13576
12947		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12948		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13577	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13578	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12949	13579	}
12950	13580
12951	13581	String Shadow(String depth, String shadow)
..	..	@@ -12967,12 +13597,16 @@
12967	13597
12968	13598	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12969	13599	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13600	+
	13601	+ // Compare fragment depth in light space with shadowmap.
12970	13602	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12971	13603	"SGE temp.y, temp.x, zero.x;" +
12972		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13604	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13605	+
	13606	+ // Reverse comparison
12973	13607	"SUB temp.x, one.x, temp.x;" +
12974	13608	"MUL " + shadow + ".x, temp.x, temp.y;" +
12975		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13609	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12976	13610	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12977	13611
12978	13612	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12986,6 +13620,10 @@
12986	13620	// No shadow for backface
12987	13621	"DP3 temp.x, normal, lightd;" +
12988	13622	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13623	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13624	+
	13625	+ // No shadow when out of frustum
	13626	+ "SGE temp.x, " + depth + ".z, one.z;" +
12989	13627	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12990	13628	"";
12991	13629	}
..	..	@@ -13131,8 +13769,9 @@
13131	13769	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13132	13770	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13133	13771	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13134		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13135		- Object3D.cVector2[] vector2buffer;
	13772	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
	13773	+
	13774	+ //Object3D.cVector2[] vector2buffer;
13136	13775
13137	13776	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13138	13777	// OUT : diff, spec
..	..	@@ -13148,9 +13787,10 @@
13148	13787	"DP3 " + dest + ".z," + "normals," + "eye;" +
13149	13788	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13150	13789	//"MOV " + dest + ".w," + "normal.z;" +
13151		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13152		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13153		- //"MOV " + dest + ".z," + "params2.w;" +
	13790	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13791	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13792	+
	13793	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13154	13794	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13155	13795	"RCP " + dest + ".w," + dest + ".w;" +
13156	13796	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13655,6 +14295,7 @@
13655	14295	else
13656	14296	if (evt.getSource() == AAtimer)
13657	14297	{
	14298	+ Globals.TIMERRUNNING = false;
13658	14299	if (mouseDown)
13659	14300	{
13660	14301	//new Exception().printStackTrace();
..	..	@@ -13714,7 +14355,7 @@
13714	14355
13715	14356	// fev 2014???
13716	14357	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13717		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14358	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13718	14359	pingthread.StepToTarget(true); // true);
13719	14360	}
13720	14361	// if (!LIVE)
..	..	@@ -13729,6 +14370,7 @@
13729	14370	return;
13730	14371
13731	14372	AAtimer.restart(); //
	14373	+ Globals.TIMERRUNNING = true;
13732	14374
13733	14375	// waslive = LIVE;
13734	14376	// LIVE = false;
..	..	@@ -13778,14 +14420,15 @@
13778	14420	drag = false;
13779	14421	//System.out.println("Mouse DOWN");
13780	14422	editObj = false;
13781		- ClickInfo info = new ClickInfo();
13782		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13783		- info.pane = this;
13784		- info.camera = renderCamera;
13785		- info.x = x;
13786		- info.y = y;
13787		- info.modifiers = modifiersex;
13788		- editObj = object.doEditClick(info, 0);
	14423	+ //ClickInfo info = new ClickInfo();
	14424	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14425	+ object.clickInfo.pane = this;
	14426	+ object.clickInfo.camera = renderCamera;
	14427	+ object.clickInfo.x = x;
	14428	+ object.clickInfo.y = y;
	14429	+ object.clickInfo.modifiers = modifiersex;
	14430	+ editObj = object.doEditClick(//info,
	14431	+ 0);
13789	14432	if (!editObj)
13790	14433	{
13791	14434	hasMarquee = true;
..	..	@@ -13801,9 +14444,12 @@
13801	14444
13802	14445	public void mouseDragged(MouseEvent e)
13803	14446	{
	14447	+ Globals.MOUSEDRAGGED = true;
	14448	+
13804	14449	//System.out.println("mouseDragged: " + e);
13805	14450	if (isRenderer)
13806	14451	movingcamera = true;
	14452	+
13807	14453	//if (drawing)
13808	14454	//return;
13809	14455	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -14064,12 +14710,18 @@
14064	14710	void GoDown(int mod)
14065	14711	{
14066	14712	MODIFIERS \|= COMMAND;
14067		- /*
	14713	+ boolean isVR = (mouseMode&VR)!=0;
	14714	+ /**/
14068	14715	if((mod&SHIFT) == SHIFT)
14069		- manipCamera.RotatePosition(0, -speed);
	14716	+ {
	14717	+ if (isVR)
	14718	+ manipCamera.RotateInterest(0, -speed);
	14719	+ else
	14720	+ manipCamera.RotatePosition(0, -speed);
	14721	+ }
14070	14722	else
14071		- manipCamera.BackForth(0, -speed*delta, getWidth());
14072		- */
	14723	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	14724	+ /**/
14073	14725	if ((mod & SHIFT) == SHIFT)
14074	14726	{
14075	14727	mouseMode = mouseMode; // VR??
..	..	@@ -14078,6 +14730,8 @@
14078	14730	mouseMode \|= BACKFORTH;
14079	14731	}
14080	14732
	14733	+ targetLookAt.set(manipCamera.lookAt);
	14734	+
14081	14735	//prevX = X = anchorX;
14082	14736	prevY = Y = anchorY - (int) (renderCamera.Distance());
14083	14737	}
..	..	@@ -14085,12 +14739,19 @@
14085	14739	void GoUp(int mod)
14086	14740	{
14087	14741	MODIFIERS \|= COMMAND;
14088		- /*
	14742	+ /**/
	14743	+ boolean isVR = (mouseMode&VR)!=0;
	14744	+
14089	14745	if((mod&SHIFT) == SHIFT)
14090		- manipCamera.RotatePosition(0, speed);
	14746	+ {
	14747	+ if (isVR)
	14748	+ manipCamera.RotateInterest(0, speed);
	14749	+ else
	14750	+ manipCamera.RotatePosition(0, speed);
	14751	+ }
14091	14752	else
14092		- manipCamera.BackForth(0, speed*delta, getWidth());
14093		- */
	14753	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	14754	+ /**/
14094	14755	if ((mod & SHIFT) == SHIFT)
14095	14756	{
14096	14757	mouseMode = mouseMode;
..	..	@@ -14099,6 +14760,8 @@
14099	14760	mouseMode \|= BACKFORTH;
14100	14761	}
14101	14762
	14763	+ targetLookAt.set(manipCamera.lookAt);
	14764	+
14102	14765	//prevX = X = anchorX;
14103	14766	prevY = Y = anchorY + (int) (renderCamera.Distance());
14104	14767	}
..	..	@@ -14106,12 +14769,17 @@
14106	14769	void GoLeft(int mod)
14107	14770	{
14108	14771	MODIFIERS \|= COMMAND;
14109		- /*
	14772	+ /**/
14110	14773	if((mod&SHIFT) == SHIFT)
14111		- manipCamera.RotatePosition(speed, 0);
	14774	+ manipCamera.Translate(speed*delta, 0, getWidth());
14112	14775	else
14113		- manipCamera.Translate(speed*delta, 0, getWidth());
14114		- */
	14776	+ {
	14777	+ if ((mouseMode&VR)!=0)
	14778	+ manipCamera.RotateInterest(-speed, 0);
	14779	+ else
	14780	+ manipCamera.RotatePosition(speed, 0);
	14781	+ }
	14782	+ /**/
14115	14783	if ((mod & SHIFT) == SHIFT)
14116	14784	{
14117	14785	mouseMode = mouseMode;
..	..	@@ -14120,6 +14788,8 @@
14120	14788	mouseMode \|= ROTATE;
14121	14789	} // TRANSLATE;
14122	14790
	14791	+ targetLookAt.set(manipCamera.lookAt);
	14792	+
14123	14793	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14124	14794	prevY = Y = anchorY;
14125	14795	}
..	..	@@ -14127,12 +14797,18 @@
14127	14797	void GoRight(int mod)
14128	14798	{
14129	14799	MODIFIERS \|= COMMAND;
14130		- /*
	14800	+ /**/
14131	14801	if((mod&SHIFT) == SHIFT)
14132		- manipCamera.RotatePosition(-speed, 0);
	14802	+ manipCamera.Translate(-speed*delta, 0, getWidth());
14133	14803	else
14134		- manipCamera.Translate(-speed*delta, 0, getWidth());
14135		- */
	14804	+ {
	14805	+ if ((mouseMode&VR)!=0)
	14806	+ manipCamera.RotateInterest(speed, 0);
	14807	+ else
	14808	+ manipCamera.RotatePosition(-speed, 0);
	14809	+ }
	14810	+
	14811	+ /**/
14136	14812	if ((mod & SHIFT) == SHIFT)
14137	14813	{
14138	14814	mouseMode = mouseMode;
..	..	@@ -14141,6 +14817,8 @@
14141	14817	mouseMode \|= ROTATE;
14142	14818	} // TRANSLATE;
14143	14819
	14820	+ targetLookAt.set(manipCamera.lookAt);
	14821	+
14144	14822	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14145	14823	prevY = Y = anchorY;
14146	14824	}
..	..	@@ -14182,14 +14860,16 @@
14182	14860	if (editObj)
14183	14861	{
14184	14862	drag = true;
14185		- ClickInfo info = new ClickInfo();
14186		- info.bounds.setBounds(0, 0,
	14863	+ //ClickInfo info = new ClickInfo();
	14864	+ object.clickInfo.bounds.setBounds(0, 0,
14187	14865	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14188		- info.pane = this;
14189		- info.camera = renderCamera;
14190		- info.x = x;
14191		- info.y = y;
14192		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14866	+ object.clickInfo.pane = this;
	14867	+ object.clickInfo.camera = renderCamera;
	14868	+ object.clickInfo.x = x;
	14869	+ object.clickInfo.y = y;
	14870	+ object //.GetWindow().copy
	14871	+ .doEditDrag(//info,
	14872	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14193	14873	} else
14194	14874	{
14195	14875	if (x < startX)
..	..	@@ -14338,22 +15018,27 @@
14338	15018	}
14339	15019	}
14340	15020
	15021	+// ClickInfo clickInfo = new ClickInfo();
	15022	+
14341	15023	public void mouseMoved(MouseEvent e)
14342	15024	{
14343	15025	//System.out.println("mouseMoved: " + e);
14344	15026	if (isRenderer)
14345	15027	return;
14346	15028
14347		- ClickInfo ci = new ClickInfo();
14348		- ci.x = e.getX();
14349		- ci.y = e.getY();
14350		- ci.modifiers = e.getModifiersEx();
14351		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14352		- ci.pane = this;
14353		- ci.camera = renderCamera;
	15029	+ // Mouse cursor feedback
	15030	+ object.clickInfo.x = e.getX();
	15031	+ object.clickInfo.y = e.getY();
	15032	+ object.clickInfo.modifiers = e.getModifiersEx();
	15033	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15034	+ object.clickInfo.pane = this;
	15035	+ object.clickInfo.camera = renderCamera;
14354	15036	if (!isRenderer)
14355	15037	{
14356		- if (object.editWindow.copy.doEditClick(ci, 0))
	15038	+ //ObjEditor editWindow = object.editWindow;
	15039	+ //Object3D copy = editWindow.copy;
	15040	+ if (object.doEditClick(//clickInfo,
	15041	+ 0))
14357	15042	{
14358	15043	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14359	15044	} else
..	..	@@ -14365,7 +15050,11 @@
14365	15050
14366	15051	public void mouseReleased(MouseEvent e)
14367	15052	{
	15053	+ Globals.MOUSEDRAGGED = false;
	15054	+
14368	15055	movingcamera = false;
	15056	+ X = 0; // getBounds().width/2;
	15057	+ Y = 0; // getBounds().height/2;
14369	15058	//System.out.println("mouseReleased: " + e);
14370	15059	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14371	15060	}
..	..	@@ -14621,7 +15310,8 @@
14621	15310	// break;
14622	15311	case 'T':
14623	15312	CACHETEXTURE ^= true;
14624		- textures.clear();
	15313	+ texturepigment.clear();
	15314	+ texturebump.clear();
14625	15315	// repaint();
14626	15316	break;
14627	15317	case 'Y':
..	..	@@ -14631,8 +15321,8 @@
14631	15321	case 'K':
14632	15322	KOMPACTTEXTURE ^= true;
14633	15323	//textures.clear();
14634		- break;
14635		- case 'P': // Texture Projection macros
	15324	+ // break;
	15325	+ //case 'P': // Texture Projection macros
14636	15326	// SAVETEXTURE ^= true;
14637	15327	macromode = true;
14638	15328	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -14706,7 +15396,9 @@
14706	15396	case 'E' : COMPACT ^= true;
14707	15397	repaint();
14708	15398	break;
14709		- case 'W' : DEBUGHSB ^= true;
	15399	+ case 'W' : // Wide Window (fullscreen)
	15400	+ //DEBUGHSB ^= true;
	15401	+ ObjEditor.theFrame.ToggleFullScreen();
14710	15402	repaint();
14711	15403	break;
14712	15404	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14731,8 +15423,8 @@
14731	15423	RevertCamera();
14732	15424	repaint();
14733	15425	break;
14734		- case 'L':
14735	15426	case 'l':
	15427	+ //case 'L':
14736	15428	if (lightMode)
14737	15429	{
14738	15430	lightMode = false;
..	..	@@ -14751,7 +15443,7 @@
14751	15443	targetLookAt.set(manipCamera.lookAt);
14752	15444	repaint();
14753	15445	break;
14754		- case 'p':
	15446	+ case 'P': // p':
14755	15447	// c'est quoi ca au juste? spherical ^= true;
14756	15448	Skinshader ^= true; programInitialized = false;
14757	15449	repaint();
..	..	@@ -14796,20 +15488,24 @@
14796	15488	OCCLUSION_CULLING ^= true;
14797	15489	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14798	15490	break;
14799		- case '0': envyoff ^= true; repaint(); break;
	15491	+ //case '0': envyoff ^= true; repaint(); break;
14800	15492	case '1':
14801	15493	case '2':
14802	15494	case '3':
14803	15495	case '4':
14804	15496	case '5':
14805		- newenvy = Character.getNumericValue(key);
14806		- repaint();
14807		- break;
14808	15497	case '6':
14809	15498	case '7':
14810	15499	case '8':
14811	15500	case '9':
14812		- BGcolor = (key - '6')/3.f;
	15501	+ if (true) // envyoff)
	15502	+ {
	15503	+ BGcolor = (key - '1')/8.f;
	15504	+ }
	15505	+ else
	15506	+ {
	15507	+ //newenvy = Character.getNumericValue(key);
	15508	+ }
14813	15509	repaint();
14814	15510	break;
14815	15511	case '!':
..	..	@@ -14875,9 +15571,9 @@
14875	15571	case '_':
14876	15572	kompactbit = 5;
14877	15573	break;
14878		- case '+':
14879		- kompactbit = 6;
14880		- break;
	15574	+// case '+':
	15575	+// kompactbit = 6;
	15576	+// break;
14881	15577	case ' ':
14882	15578	lightMode ^= true;
14883	15579	Globals.lighttouched = true;
..	..	@@ -14889,6 +15585,7 @@
14889	15585	case ESC:
14890	15586	RENDERPROGRAM += 1;
14891	15587	RENDERPROGRAM %= 3;
	15588	+
14892	15589	repaint();
14893	15590	break;
14894	15591	case 'Z':
..	..	@@ -14928,8 +15625,9 @@
14928	15625	case DELETE:
14929	15626	ClearSelection();
14930	15627	break;
14931		- /*
14932	15628	case '+':
	15629	+
	15630	+ /*
14933	15631	//fontsize += 1;
14934	15632	bbzoom *= 2;
14935	15633	repaint();
..	..	@@ -14946,17 +15644,17 @@
14946	15644	case '=':
14947	15645	IncDepth();
14948	15646	//fontsize += 1;
14949		- object.editWindow.refreshContents(true);
	15647	+ object.GetWindow().refreshContents(true);
14950	15648	maskbit = 6;
14951	15649	break;
14952	15650	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14953	15651	DecDepth();
14954	15652	maskbit = 5;
14955	15653	//if(fontsize > 1) fontsize -= 1;
14956		- if (object.editWindow == null)
14957		- new Exception().printStackTrace();
14958		- else
14959		- object.editWindow.refreshContents(true);
	15654	+// if (object.editWindow == null)
	15655	+// new Exception().printStackTrace();
	15656	+// else
	15657	+ object.GetWindow().refreshContents(true);
14960	15658	break;
14961	15659	case '{':
14962	15660	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15180,7 +15878,7 @@
15180	15878	}
15181	15879	*/
15182	15880
15183		- object.editWindow.EditSelection();
	15881	+ object.GetWindow().EditSelection(false);
15184	15882	}
15185	15883
15186	15884	void SelectParent()
..	..	@@ -15197,10 +15895,10 @@
15197	15895	{
15198	15896	//selectees.remove(i);
15199	15897	System.out.println("select parent of " + elem);
15200		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15898	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15201	15899	} else
15202	15900	{
15203		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15901	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15204	15902	}
15205	15903
15206	15904	first = false;
..	..	@@ -15242,12 +15940,12 @@
15242	15940	for (int j = 0; j < group.children.size(); j++)
15243	15941	{
15244	15942	elem = (Object3D) group.children.elementAt(j);
15245		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15943	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15246	15944	first = false;
15247	15945	}
15248	15946	} else
15249	15947	{
15250		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15948	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15251	15949	}
15252	15950
15253	15951	first = false;
..	..	@@ -15258,21 +15956,21 @@
15258	15956	{
15259	15957	//Composite group = (Composite) object;
15260	15958	Object3D group = object;
15261		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15959	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15262	15960	}
15263	15961
15264	15962	void ResetTransform(int mask)
15265	15963	{
15266	15964	//Composite group = (Composite) object;
15267	15965	Object3D group = object;
15268		- group.editWindow.ResetTransform(mask);
	15966	+ group.GetWindow().ResetTransform(mask);
15269	15967	}
15270	15968
15271	15969	void FlipTransform()
15272	15970	{
15273	15971	//Composite group = (Composite) object;
15274	15972	Object3D group = object;
15275		- group.editWindow.FlipTransform();
	15973	+ group.GetWindow().FlipTransform();
15276	15974	// group.editWindow.ReduceMesh(true);
15277	15975	}
15278	15976
..	..	@@ -15280,7 +15978,7 @@
15280	15978	{
15281	15979	//Composite group = (Composite) object;
15282	15980	Object3D group = object;
15283		- group.editWindow.PrintMemory();
	15981	+ group.GetWindow().PrintMemory();
15284	15982	// group.editWindow.ReduceMesh(true);
15285	15983	}
15286	15984
..	..	@@ -15288,7 +15986,7 @@
15288	15986	{
15289	15987	//Composite group = (Composite) object;
15290	15988	Object3D group = object;
15291		- group.editWindow.ResetCentroid();
	15989	+ group.GetWindow().ResetCentroid();
15292	15990	}
15293	15991
15294	15992	void IncDepth()
..	..	@@ -15370,11 +16068,11 @@
15370	16068
15371	16069	int width = getBounds().width;
15372	16070	int height = getBounds().height;
15373		- ClickInfo info = new ClickInfo();
15374		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15375	16071	//Image img = CreateImage(width, height);
15376	16072	//System.out.println("width = " + width + "; height = " + height + "\n");
	16073	+
15377	16074	Graphics gr = g; // img.getGraphics();
	16075	+
15378	16076	if (!hasMarquee)
15379	16077	{
15380	16078	if (Xmin < Xmax) // !locked)
..	..	@@ -15446,44 +16144,92 @@
15446	16144	}
15447	16145	if (object != null && !hasMarquee)
15448	16146	{
	16147	+ if (object.clickInfo == null)
	16148	+ object.clickInfo = new ClickInfo();
	16149	+ ClickInfo info = object.clickInfo;
	16150	+ //ClickInfo info = new ClickInfo();
	16151	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16152	+
15449	16153	if (isRenderer)
15450	16154	{
15451		- info.flags++;
	16155	+ object.clickInfo.flags++;
15452	16156	double frameAspect = (double) width / (double) height;
15453	16157	if (frameAspect > renderCamera.aspect)
15454	16158	{
15455	16159	int desired = (int) ((double) height * renderCamera.aspect);
15456		- info.bounds.width -= width - desired;
15457		- info.bounds.x += (width - desired) / 2;
	16160	+ object.clickInfo.bounds.width -= width - desired;
	16161	+ object.clickInfo.bounds.x += (width - desired) / 2;
15458	16162	} else
15459	16163	{
15460	16164	int desired = (int) ((double) width / renderCamera.aspect);
15461		- info.bounds.height -= height - desired;
15462		- info.bounds.y += (height - desired) / 2;
	16165	+ object.clickInfo.bounds.height -= height - desired;
	16166	+ object.clickInfo.bounds.y += (height - desired) / 2;
15463	16167	}
15464	16168	}
15465		- info.g = gr;
15466		- info.camera = renderCamera;
	16169	+
	16170	+ object.clickInfo.g = gr;
	16171	+ object.clickInfo.camera = renderCamera;
15467	16172	/*
15468	16173	// Memory intensive (brep.verticescopy)
15469	16174	if (!(object instanceof Composite))
15470	16175	object.draw(info, 0, false); // SLOW :
15471	16176	*/
15472		- if (!isRenderer)
	16177	+ if (!isRenderer) // && drag)
15473	16178	{
15474		- object.drawEditHandles(info, 0);
	16179	+ Grafreed.Assert(object != null);
	16180	+ Grafreed.Assert(object.selection != null);
	16181	+ if (object.selection.Size() > 0)
	16182	+ {
	16183	+ int hitSomething = object.selection.get(0).hitSomething;
	16184	+
	16185	+ object.clickInfo.DX = 0;
	16186	+ object.clickInfo.DY = 0;
	16187	+ object.clickInfo.W = 1;
	16188	+ if (hitSomething == Object3D.hitCenter)
	16189	+ {
	16190	+ info.DX = X;
	16191	+ if (X != 0)
	16192	+ info.DX -= info.bounds.width/2;
	16193	+
	16194	+ info.DY = Y;
	16195	+ if (Y != 0)
	16196	+ info.DY -= info.bounds.height/2;
	16197	+ }
	16198	+
	16199	+ object.drawEditHandles(//info,
	16200	+ 0);
	16201	+
	16202	+ if (drag && (X != 0 \|\| Y != 0))
	16203	+ {
	16204	+ switch (hitSomething)
	16205	+ {
	16206	+ case Object3D.hitCenter: gr.setColor(Color.white);
	16207	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16208	+ break;
	16209	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16210	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16211	+ break;
	16212	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16213	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16214	+ break;
	16215	+ }
	16216	+
	16217	+ }
	16218	+ }
15475	16219	}
15476	16220	}
	16221	+
15477	16222	if (isRenderer)
15478	16223	{
15479	16224	//gr.setColor(Color.black);
15480	16225	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15481	16226	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15482	16227	}
	16228	+
15483	16229	if (hasMarquee)
15484	16230	{
15485	16231	gr.setXORMode(Color.white);
15486		- gr.setColor(Color.red);
	16232	+ gr.setColor(Color.white);
15487	16233	if (!firstime)
15488	16234	{
15489	16235	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -15886,7 +16632,7 @@
15886	16632	Object3D object;
15887	16633	static Object3D trackedobject;
15888	16634	Camera renderCamera; // Light or Eye (or Occlusion)
15889		- /static/ Camera manipCamera; // Light or Eye
	16635	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15890	16636	/static/ Camera eyeCamera;
15891	16637	/static/ Camera lightCamera;
15892	16638	int cameracount;
..	..	@@ -15950,6 +16696,8 @@
15950	16696	private /static/ boolean firstime;
15951	16697	private /static/ cVector newView = new cVector();
15952	16698	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16699	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16700	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15953	16701	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15954	16702	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15955	16703	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15962,29 +16710,67 @@
15962	16710	{
15963	16711	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15964	16712
	16713	+ int usedsuf = 0;
	16714	+
15965	16715	for (int i = 0; i < suffixes.length; i++)
15966	16716	{
15967		- String resourceName = basename + suffixes[i] + "." + suffix;
15968		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15969		- mipmapped,
15970		- FileUtil.getFileSuffix(resourceName));
15971		- if (data == null)
	16717	+ String[] suffixe = suffixes;
	16718	+ String[] fallback = suffixes2;
	16719	+ String[] fallfallback = suffixes3;
	16720	+
	16721	+ for (int c=usedsuf; --c>=0;)
15972	16722	{
15973		- throw new IOException("Unable to load texture " + resourceName);
	16723	+// String[] temp = suffixe;
	16724	+// suffixe = fallback;
	16725	+// fallback = fallfallback;
	16726	+// fallfallback = temp;
15974	16727	}
	16728	+
	16729	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16730	+ TextureData data;
	16731	+
	16732	+ try
	16733	+ {
	16734	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16735	+ mipmapped,
	16736	+ FileUtil.getFileSuffix(resourceName));
	16737	+ }
	16738	+ catch (Exception e)
	16739	+ {
	16740	+ try
	16741	+ {
	16742	+ resourceName = basename + fallback[i] + "." + suffix;
	16743	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16744	+ mipmapped,
	16745	+ FileUtil.getFileSuffix(resourceName));
	16746	+ }
	16747	+ catch (Exception e2)
	16748	+ {
	16749	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16750	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16751	+ mipmapped,
	16752	+ FileUtil.getFileSuffix(resourceName));
	16753	+ }
	16754	+ }
	16755	+
15975	16756	//System.out.println("Target = " + targets[i]);
15976	16757	cubemap.updateImage(data, targets[i]);
15977	16758	}
15978	16759
15979	16760	return cubemap;
15980	16761	}
	16762	+
15981	16763	int bigsphere = -1;
15982	16764
15983	16765	float BGcolor = 0.5f;
15984	16766
15985		- private void DrawSkyBox(GL gl)
	16767	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16768	+
	16769	+ private void DrawSkyBox(GL gl, float ratio)
15986	16770	{
15987		- if (envyoff \|\| cubemap == null)
	16771	+ if (//envyoff \|\|
	16772	+ WIREFRAME \|\|
	16773	+ cubemap == null)
15988	16774	{
15989	16775	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15990	16776	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15999,7 +16785,17 @@
15999	16785	// Compensates for ExaminerViewer's modification of modelview matrix
16000	16786	gl.glMatrixMode(GL.GL_MODELVIEW);
16001	16787	gl.glLoadIdentity();
	16788	+ gl.glScalef(1,ratio,1);
16002	16789
	16790	+// colorV[0] = 2;
	16791	+// colorV[1] = 2;
	16792	+// colorV[2] = 2;
	16793	+// colorV[3] = 1;
	16794	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16795	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16796	+//
	16797	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16798	+
16003	16799	//gl.glActiveTexture(GL.GL_TEXTURE1);
16004	16800	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16005	16801
..	..	@@ -16031,6 +16827,7 @@
16031	16827	{
16032	16828	gl.glScalef(1.0f, -1.0f, 1.0f);
16033	16829	}
	16830	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16034	16831	gl.glMultMatrixd(viewrot_1, 0);
16035	16832	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16036	16833	//viewer.updateInverseRotation(gl);
..	..	@@ -16071,7 +16868,8 @@
16071	16868	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16072	16869
16073	16870	cubemap.disable();
16074		- ////cubemap.unbind();
	16871	+ //cubemap.dispose();
	16872	+
16075	16873	if (CULLFACE)
16076	16874	{
16077	16875	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16171,16 +16969,16 @@
16171	16969	cStatic.objectstack[materialdepth++] = checker;
16172	16970	//System.out.println("material " + material);
16173	16971	//Applet3D.tracein(this, selected);
16174		- vector2buffer = checker.projectedVertices;
	16972	+ //vector2buffer = checker.projectedVertices;
16175	16973
16176	16974	//checker.GetMaterial().Draw(this, false); // true);
16177		- DrawMaterial(checker.GetMaterial(), false); // true);
	16975	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16178	16976
16179	16977	materialdepth -= 1;
16180	16978	if (materialdepth > 0)
16181	16979	{
16182		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16183		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16980	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16981	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16184	16982	}
16185	16983	//checker.GetMaterial().opacity = 1f;
16186	16984	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16266,6 +17064,14 @@
16266	17064	}
16267	17065	}
16268	17066
	17067	+ private Object3D GetFolder()
	17068	+ {
	17069	+ Object3D folder = object.GetWindow().copy;
	17070	+ if (object.GetWindow().copy.selection.Size() > 0)
	17071	+ folder = object.GetWindow().copy.selection.elementAt(0);
	17072	+ return folder;
	17073	+ }
	17074	+
16269	17075	class SelectBuffer implements GLEventListener
16270	17076	{
16271	17077
..	..	@@ -16281,7 +17087,7 @@
16281	17087	//new Exception().printStackTrace();
16282	17088	System.out.println("select buffer init");
16283	17089	// Use debug pipeline
16284		- drawable.setGL(new DebugGL(drawable.getGL()));
	17090	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16285	17091
16286	17092	GL gl = drawable.getGL();
16287	17093
..	..	@@ -16345,6 +17151,17 @@
16345	17151
16346	17152	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16347	17153
	17154	+ if (PAINTMODE)
	17155	+ {
	17156	+ if (object.GetWindow().copy.selection.Size() > 0)
	17157	+ {
	17158	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17159	+
	17160	+ // Make what you paint not selectable.
	17161	+ paintobj.ResetSelectable();
	17162	+ }
	17163	+ }
	17164	+
16348	17165	//int tmp = selection_view;
16349	17166	//selection_view = -1;
16350	17167	int temp = DrawMode();
..	..	@@ -16356,6 +17173,17 @@
16356	17173	// temp = DEFAULT; // patch for selection debug
16357	17174	Globals.drawMode = temp; // WARNING
16358	17175
	17176	+ if (PAINTMODE)
	17177	+ {
	17178	+ if (object.GetWindow().copy.selection.Size() > 0)
	17179	+ {
	17180	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17181	+
	17182	+ // Revert.
	17183	+ paintobj.RestoreSelectable();
	17184	+ }
	17185	+ }
	17186	+
16359	17187	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16360	17188
16361	17189	// trying different ways of getting the depth info over
..	..	@@ -16403,6 +17231,8 @@
16403	17231	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16404	17232	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16405	17233	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17234	+
	17235	+ CreateSelectedPoint();
16406	17236
16407	17237	// Will fit the mesh !!!
16408	17238	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16457,29 +17287,31 @@
16457	17287	}
16458	17288
16459	17289	if (!movingcamera && !PAINTMODE)
16460		- object.editWindow.ScreenFitPoint(); // fev 2014
	17290	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16461	17291
16462		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17292	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16463	17293	{
16464		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17294	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16465	17295
16466		- Object3D group = new Object3D("inst" + paintcount++);
	17296	+ if (object.GetWindow().copy.selection.Size() > 0)
	17297	+ {
	17298	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16467	17299
16468		- group.CreateMaterial(); // use a void leaf to select instances
16469		-
16470		- group.add(paintobj); // link
16471		-
16472		- object.editWindow.SnapObject(group);
16473		-
16474		- Object3D folder = object.editWindow.copy;
16475		-
16476		- if (object.editWindow.copy.selection.Size() > 0)
16477		- folder = object.editWindow.copy.selection.elementAt(0);
16478		-
16479		- folder.add(group);
16480		-
16481		- object.editWindow.ResetModel();
16482		- object.editWindow.refreshContents();
	17300	+ Object3D inst = new Object3D("inst" + paintcount++);
	17301	+
	17302	+ inst.CreateMaterial(); // use a void leaf to select instances
	17303	+
	17304	+ inst.add(paintobj); // link
	17305	+
	17306	+ object.GetWindow().SnapObject(inst);
	17307	+
	17308	+ Object3D folder = paintFolder; // GetFolder();
	17309	+
	17310	+ folder.add(inst);
	17311	+
	17312	+ object.GetWindow().ResetModel();
	17313	+ object.GetWindow().refreshContents();
	17314	+ }
16483	17315	}
16484	17316	else
16485	17317	paintcount = 0;
..	..	@@ -16518,6 +17350,11 @@
16518	17350	//System.out.println("objects[color] = " + objects[color]);
16519	17351	//objects[color].Select();
16520	17352	indexcount = 0;
	17353	+ ObjEditor window = object.GetWindow();
	17354	+ if (window != null && deselect)
	17355	+ {
	17356	+ window.Select(null, deselect, true);
	17357	+ }
16521	17358	object.Select(color, deselect);
16522	17359	}
16523	17360
..	..	@@ -16568,6 +17405,7 @@
16568	17405
16569	17406	public void init(GLAutoDrawable drawable)
16570	17407	{
	17408	+ if (Globals.DEBUG)
16571	17409	System.out.println("shadow buffer init");
16572	17410
16573	17411	GL gl = drawable.getGL();
..	..	@@ -16796,10 +17634,14 @@
16796	17634	gl.glFlush();
16797	17635
16798	17636	/**/
16799		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17637	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
16800	17638
16801		- float[] pixels = occlusionsizebuffer.array();
	17639	+ float[] depths = occlusiondepthbuffer.array();
16802	17640
	17641	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17642	+
	17643	+ int[] pixels = selectsizebuffer.array();
	17644	+
16803	17645	double r = 0, g = 0, b = 0;
16804	17646
16805	17647	double count = 0;
..	..	@@ -16810,7 +17652,7 @@
16810	17652
16811	17653	double FACTOR = 1;
16812	17654
16813		- for (int i = 0; i < pixels.length; i++)
	17655	+ for (int i = 0; i < depths.length; i++)
16814	17656	{
16815	17657	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
16816	17658	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -16893,7 +17735,7 @@
16893	17735
16894	17736	double scale = ray.z; // 1; // cos
16895	17737
16896		- float depth = pixels[newindex];
	17738	+ float depth = depths[newindex];
16897	17739
16898	17740	/*
16899	17741	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17043,23 +17885,15 @@
17043	17885	int AAbuffersize = 0;
17044	17886
17045	17887	//double[] selectedpoint = new double[3];
17046		- static Superellipsoid selectedpoint = new Superellipsoid();
	17888	+ static Superellipsoid selectedpoint;
17047	17889	static Sphere previousselectedpoint = null;
17048		- static Sphere debugpointG = new Sphere();
17049		- static Sphere debugpointP = new Sphere();
17050		- static Sphere debugpointC = new Sphere();
17051		- static Sphere debugpointR = new Sphere();
	17890	+ static Sphere debugpointG;
	17891	+ static Sphere debugpointP;
	17892	+ static Sphere debugpointC;
	17893	+ static Sphere debugpointR;
17052	17894
17053	17895	static Sphere debugpoints[] = new Sphere[8];
17054	17896
17055		- static
17056		- {
17057		- for (int i=0; i<8; i++)
17058		- {
17059		- debugpoints[i] = new Sphere();
17060		- }
17061		- }
17062		-
17063	17897	static void InitPoints(float radius)
17064	17898	{
17065	17899	for (int i=0; i<8; i++)
..	..	@@ -17098,11 +17932,14 @@
17098	17932	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17099	17933	static IntBuffer bigAAbuffer;
17100	17934	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17101		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17935	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17102	17936	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17103	17937	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17104	17938	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17105		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17939	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17940	+
	17941	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17942	+
17106	17943	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17107	17944	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17108	17945	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();