~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;
..	..	@@ -56,14 +92,12 @@
56	92	static int CURRENTANTIALIAS = 0; // 1;
57	93	/static/ boolean RENDERSHADOW = true;
58	94	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	95
62	96	boolean DISPLAYTEXT = false;
63	97	//boolean REDUCETEXTURE = true;
64	98	boolean CACHETEXTURE = true;
65	99	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
67	101	boolean COMPRESSTEXTURE = false;
68	102	boolean KOMPACTTEXTURE = false; // true;
69	103	boolean RESIZETEXTURE = false;
..	..	@@ -76,7 +110,11 @@
76	110	//private Mat4f spotlightTransform = new Mat4f();
77	111	//private Mat4f spotlightInverseTransform = new Mat4f();
78	112	static GLContext glcontext = null;
79		- /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	+
80	118	boolean reverseUP = false;
81	119	static boolean frozen = false;
82	120	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -86,7 +124,7 @@
86	124	static boolean FULLSCREEN = false;
87	125	static boolean SUPPORT = true;
88	126	static boolean INERTIA = true;
89		-static boolean FAST = true; // false;
	127	+static boolean FAST = false;
90	128	static boolean SLOWPOSE = false;
91	129	static boolean FOOTCONTACT = true;
92	130
..	..	@@ -108,7 +146,7 @@
108	146	static boolean OEIL = true;
109	147	static boolean OEILONCE = false; // do oeilon then oeiloff
110	148	static boolean LOOKAT = true;
111		-static boolean RANDOM = true; // false;
	149	+static boolean SWITCH = true; // false;
112	150	static boolean HANDLES = false; // selection doesn't work!!
113	151	static boolean PAINTMODE = false;
114	152
..	..	@@ -130,7 +168,7 @@
130	168
131	169
132	170	// OPTIONS
133		- boolean Skinshader = true;
	171	+ boolean Skinshader = false; // true;
134	172	boolean cameraLight = false;
135	173	boolean UVdebug = false;
136	174	boolean Udebug = false;
..	..	@@ -139,7 +177,7 @@
139	177	static boolean doublesided = false; // true; // reversed normals are awful for conformance
140	178	boolean anisotropy = true;
141	179	boolean softshadow = true; // slower but better false;
142		- boolean opacityhalo = false;
	180	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
143	181
144	182	boolean macromode = false;
145	183
..	..	@@ -150,6 +188,21 @@
150	188	defaultcaps.setAccumGreenBits(16);
151	189	defaultcaps.setAccumBlueBits(16);
152	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	+ }
153	206	}
154	207
155	208	void SetAsGLRenderer(boolean b)
..	..	@@ -170,7 +223,8 @@
170	223
171	224	SetCamera(cam);
172	225
173		- SetLight(new Camera(new cVector(10, 10, -20)));
	226	+ // Warning: not used.
	227	+ SetLight(new Camera(new cVector(15, 10, -20)));
174	228
175	229	object = o;
176	230
..	..	@@ -327,7 +381,7 @@
327	381	cStatic.objectstack[materialdepth++] = obj;
328	382	//System.out.println("material " + material);
329	383	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	384	+ //display.vector2buffer = obj.projectedVertices;
331	385	if (obj instanceof Camera)
332	386	{
333	387	display.options1[0] = material.shift;
..	..	@@ -336,14 +390,28 @@
336	390	display.options1[2] = material.shadowbias;
337	391	display.options1[3] = material.aniso;
338	392	display.options1[4] = material.anisoV;
	393	+// System.out.println("display.options1[0] " + display.options1[0]);
	394	+// System.out.println("display.options1[1] " + display.options1[1]);
	395	+// System.out.println("display.options1[2] " + display.options1[2]);
	396	+// System.out.println("display.options1[3] " + display.options1[3]);
	397	+// System.out.println("display.options1[4] " + display.options1[4]);
339	398	display.options2[0] = material.opacity;
340	399	display.options2[1] = material.diffuse;
341	400	display.options2[2] = material.factor;
	401	+// System.out.println("display.options2[0] " + display.options2[0]);
	402	+// System.out.println("display.options2[1] " + display.options2[1]);
	403	+// System.out.println("display.options2[2] " + display.options2[2]);
342	404
343	405	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	406	+// System.out.println("display.options3[0] " + display.options3[0]);
	407	+// System.out.println("display.options3[1] " + display.options3[1]);
	408	+// System.out.println("display.options3[2] " + display.options3[2]);
344	409	display.options4[0] = material.cameralight/0.2f;
345	410	display.options4[1] = material.subsurface;
346	411	display.options4[2] = material.sheen;
	412	+// System.out.println("display.options4[0] " + display.options4[0]);
	413	+// System.out.println("display.options4[1] " + display.options4[1]);
	414	+// System.out.println("display.options4[2] " + display.options4[2]);
347	415
348	416	// if (display.CURRENTANTIALIAS > 0)
349	417	// display.options3[3] /= 4;
..	..	@@ -359,7 +427,7 @@
359	427	/**/
360	428	} else
361	429	{
362		- DrawMaterial(material, selected);
	430	+ DrawMaterial(material, selected, obj.projectedVertices);
363	431	}
364	432	} else
365	433	{
..	..	@@ -383,8 +451,8 @@
383	451	cStatic.objectstack[materialdepth++] = obj;
384	452	//System.out.println("material " + material);
385	453	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	454	+ //display.vector2buffer = obj.projectedVertices;
	455	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	456	}
389	457	}
390	458
..	..	@@ -401,8 +469,8 @@
401	469	materialdepth -= 1;
402	470	if (materialdepth > 0)
403	471	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	472	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	473	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	474	}
407	475	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	476	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +490,8 @@
422	490	materialdepth -= 1;
423	491	if (materialdepth > 0)
424	492	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	493	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	494	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	495	}
428	496	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	497	//else
..	..	@@ -464,10 +532,12 @@
464	532	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	533	{
466	534	//gl.glBegin(gl.GL_TRIANGLES);
467		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	535	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	536	+ // TEST LIVE NORMALS && !obj.dontselect
	537	+ ;
468	538	if (!hasnorm)
469	539	{
470		- // System.out.println("FUCK!!");
	540	+ // System.out.println("Mesh normal");
471	541	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	542	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	543	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1192,10 +1262,12 @@
1192	1262	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1263	}
1194	1264	}
	1265	+
1195	1266	if (flipV)
1196	1267	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1268	else
1198	1269	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1270	+
1199	1271	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1272	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1273
..	..	@@ -1215,10 +1287,12 @@
1215	1287	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1288	}
1217	1289	}
	1290	+
1218	1291	if (flipV)
1219	1292	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1293	else
1221	1294	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1295	+
1222	1296	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1297	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1298
..	..	@@ -1246,8 +1320,10 @@
1246	1320	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1321	else
1248	1322	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1323	+
1249	1324	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1325	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1326	+
1251	1327	count2 += 2;
1252	1328	count3 += 3;
1253	1329	}
..	..	@@ -1426,6 +1502,8 @@
1426	1502	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1427	1503	}
1428	1504
	1505	+ float[] colorV = new float[4];
	1506	+
1429	1507	void SetColor(Object3D obj, Vertex p0)
1430	1508	{
1431	1509	CameraPane display = this;
..	..	@@ -1493,8 +1571,6 @@
1493	1571	{
1494	1572	return;
1495	1573	}
1496		-
1497		- float[] colorV = new float[3];
1498	1574
1499	1575	if (false) // marked)
1500	1576	{
..	..	@@ -1603,7 +1679,7 @@
1603	1679	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1680	}
1605	1681
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1682	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1683	{
1608	1684	CameraPane display = this;
1609	1685	//new Exception().printStackTrace();
..	..	@@ -1630,7 +1706,7 @@
1630	1706
1631	1707	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1632	1708
1633		- float[] colorV = GrafreeD.colorV;
	1709	+ float[] colorV = Grafreed.colorV;
1634	1710
1635	1711	/**/
1636	1712	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1638,7 +1714,7 @@
1638	1714	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1715	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1716	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1717	+ colorV[3] = 1; // material.opacity;
1642	1718
1643	1719	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1720	//System.out.println("Opacity = " + opacity);
..	..	@@ -1743,12 +1819,12 @@
1743	1819
1744	1820	display.modelParams7[0] = 0;
1745	1821	display.modelParams7[1] = 1000;
1746		- display.modelParams7[2] = 0;
	1822	+ display.modelParams7[2] = material.parallax;
1747	1823	display.modelParams7[3] = 0;
1748	1824
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1825	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1826
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1827	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1828	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1829	{
1754	1830	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1890,7 +1966,7 @@
1890	1966	void PushMatrix(double[][] matrix)
1891	1967	{
1892	1968	// GrafreeD.tracein(matrix);
1893		- PushMatrix(matrix,1);
	1969	+ PushMatrix(matrix, 1);
1894	1970	}
1895	1971
1896	1972	void PushMatrix()
..	..	@@ -1976,9 +2052,9 @@
1976	2052	switch(viewcode)
1977	2053	{
1978	2054	case 0: return "main";
1979		- case 1: return "one";
1980		- case 2: return "two";
1981		- case 3: return "three";
	2055	+ case 1: return "Red";
	2056	+ case 2: return "Green";
	2057	+ case 3: return "Blue";
1982	2058	case 4: return "light";
1983	2059	}
1984	2060
..	..	@@ -2044,7 +2120,7 @@
2044	2120	//System.err.println("Oeil on");
2045	2121	OEIL = true;
2046	2122	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2123	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2048	2124	//pingthread.StepToTarget(true);
2049	2125	}
2050	2126
..	..	@@ -2142,7 +2218,7 @@
2142	2218	System.err.println("LIVE = " + Globals.isLIVE());
2143	2219
2144	2220	if (!Globals.isLIVE()) // save sound
2145		- GrafreeD.savesound = true; // wav.save();
	2221	+ Grafreed.savesound = true; // wav.save();
2146	2222	// else
2147	2223	repaint(); // start loop // may 2013
2148	2224	}
..	..	@@ -2259,7 +2335,7 @@
2259	2335
2260	2336	void ToggleDebug()
2261	2337	{
2262		- DEBUG ^= true;
	2338	+ Globals.DEBUG ^= true;
2263	2339	}
2264	2340
2265	2341	void ToggleLookAt()
..	..	@@ -2267,9 +2343,9 @@
2267	2343	LOOKAT ^= true;
2268	2344	}
2269	2345
2270		- void ToggleRandom()
	2346	+ void ToggleSwitch()
2271	2347	{
2272		- RANDOM ^= true;
	2348	+ SWITCH ^= true;
2273	2349	}
2274	2350
2275	2351	void ToggleHandles()
..	..	@@ -2277,10 +2353,17 @@
2277	2353	HANDLES ^= true;
2278	2354	}
2279	2355
	2356	+ Object3D paintFolder;
	2357	+
2280	2358	void TogglePaint()
2281	2359	{
2282	2360	PAINTMODE ^= true;
2283	2361	paintcount = 0;
	2362	+
	2363	+ if (PAINTMODE)
	2364	+ {
	2365	+ paintFolder = GetFolder();
	2366	+ }
2284	2367	}
2285	2368
2286	2369	void SwapCamera(int a, int b)
..	..	@@ -2376,7 +2459,22 @@
2376	2459	{
2377	2460	return currentGL;
2378	2461	}
2379		-
	2462	+
	2463	+ static private BufferedImage CreateBim(TextureData texturedata)
	2464	+ {
	2465	+ Grafreed.Assert(texturedata != null);
	2466	+
	2467	+ int width = texturedata.getWidth();
	2468	+ int height = texturedata.getHeight();
	2469	+
	2470	+ Buffer buffer = texturedata.getBuffer();
	2471	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2472	+
	2473	+ byte[] bytes = bytebuf.array();
	2474	+
	2475	+ return CreateBim(bytes, width, height);
	2476	+ }
	2477	+
2380	2478	/**/
2381	2479	class CacheTexture
2382	2480	{
..	..	@@ -2385,28 +2483,31 @@
2385	2483
2386	2484	int resolution;
2387	2485
2388		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2486	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2389	2487	{
2390		- texture = tex;
	2488	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2489	+ texturedata = texdata;
2391	2490	resolution = res;
2392	2491	}
2393	2492	}
2394	2493	/**/
2395	2494
2396	2495	// TEXTURE static Texture texture;
2397		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2398		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2399		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2496	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2497	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2498	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2499	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2500	+
2400	2501	int pigmentdepth = 0;
2401	2502	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2503	int bumpdepth = 0;
2403	2504	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2404	2505	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2405	2506	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2406		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2507	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2407	2508	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2408	2509
2409		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2510	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2410	2511	{
2411	2512	TextureData texturedata = null;
2412	2513
..	..	@@ -2416,7 +2517,7 @@
2416	2517	com.sun.opengl.util.texture.TextureIO.newTextureData(
2417	2518	getClass().getClassLoader().getResourceAsStream(name),
2418	2519	true,
2419		- com.sun.opengl.util.texture.TextureIO.PNG);
	2520	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2420	2521	} catch (java.io.IOException e)
2421	2522	{
2422	2523	throw new javax.media.opengl.GLException(e);
..	..	@@ -2425,13 +2526,34 @@
2425	2526	if (bump)
2426	2527	texturedata = ConvertBump(texturedata, false);
2427	2528
2428		- com.sun.opengl.util.texture.Texture texture =
2429		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2529	+// com.sun.opengl.util.texture.Texture texture =
	2530	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2430	2531
2431		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2432		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2532	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2533	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2433	2534
2434		- return texture;
	2535	+ return texturedata;
	2536	+ }
	2537	+
	2538	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2539	+ {
	2540	+ TextureData texturedata = null;
	2541	+
	2542	+ try
	2543	+ {
	2544	+ texturedata =
	2545	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2546	+ bim,
	2547	+ true);
	2548	+ } catch (Exception e)
	2549	+ {
	2550	+ throw new javax.media.opengl.GLException(e);
	2551	+ }
	2552	+
	2553	+ if (bump)
	2554	+ texturedata = ConvertBump(texturedata, false);
	2555	+
	2556	+ return texturedata;
2435	2557	}
2436	2558
2437	2559	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3504,6 +3626,8 @@
3504	3626
3505	3627	System.out.println("LOADING TEXTURE : " + name);
3506	3628
	3629	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3630	+
3507	3631	//
3508	3632	if (false) // compressbit > 0)
3509	3633	{
..	..	@@ -4208,6 +4332,7 @@
4208	4332
4209	4333	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4210	4334	{
	4335	+ new Exception().printStackTrace();
4211	4336	System.exit(0);
4212	4337	com.sun.opengl.util.texture.Texture texture = null;
4213	4338
..	..	@@ -7901,7 +8026,7 @@
7901	8026	String pigment = Object3D.GetPigment(tex);
7902	8027	String bump = Object3D.GetBump(tex);
7903	8028
7904		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8029	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7905	8030	{
7906	8031	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7907	8032	// System.out.println("; bump = " + bump);
..	..	@@ -7916,11 +8041,69 @@
7916	8041	pigment = null;
7917	8042	}
7918	8043
7919		- ReleaseTexture(bump, true);
7920		- ReleaseTexture(pigment, false);
	8044	+ ReleaseTexture(tex, true);
	8045	+ ReleaseTexture(tex, false);
7921	8046	}
7922	8047
7923		- 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)
7924	8107	{
7925	8108	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7926	8109	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7931,7 +8114,7 @@
7931	8114	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7932	8115
7933	8116	if (tex != null)
7934		- texture = textures.get(tex);
	8117	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7935	8118
7936	8119	// //assert( texture != null );
7937	8120	// if (texture == null)
..	..	@@ -8023,7 +8206,55 @@
8023	8206	}
8024	8207	}
8025	8208
8026		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8209	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	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
8027	8258	{
8028	8259	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8029	8260	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8034,17 +8265,47 @@
8034	8265	if (tex == null)
8035	8266	{
8036	8267	BindTexture(null,false,resolution);
8037		- BindTexture(null,true,resolution);
8038	8268	return;
8039	8269	}
8040	8270
8041	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	+
8042	8304	String bump = Object3D.GetBump(tex);
8043	8305
8044		- usedtextures.put(pigment, pigment);
8045		- usedtextures.put(bump, bump);
	8306	+ usedtextures.add(tex);
8046	8307
8047		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8308	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8048	8309	{
8049	8310	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8050	8311	// System.out.println("; bump = " + bump);
..	..	@@ -8054,43 +8315,94 @@
8054	8315	{
8055	8316	bump = null;
8056	8317	}
8057		- if (pigment.equals(""))
8058		- {
8059		- pigment = null;
8060		- }
8061	8318
8062		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8063		- BindTexture(pigment, false, resolution);
8064	8319	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8065		- BindTexture(bump, true, resolution);
	8320	+ BindTexture(tex, true, resolution);
8066	8321	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8067		-
8068		- return; // true;
8069	8322	}
8070	8323
8071		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8324	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8325	+
	8326	+ private boolean FileExists(String tex)
8072	8327	{
8073		- 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;
8074	8347
8075	8348	if (tex != null)
8076	8349	{
8077		- String texname = tex;
	8350	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8351	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8078	8352
8079		- String[] split = tex.split("Textures");
8080		- if (split.length > 1)
8081		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8082		- else
8083		- if (!texname.startsWith("/"))
8084		- texname = "/Users/nbriere/Textures/" + texname;
	8353	+ if (texname.equals("") && texdata == null)
	8354	+ {
	8355	+ return null;
	8356	+ }
	8357	+
	8358	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8359	+
	8360	+// String[] split = tex.split("Textures");
	8361	+// if (split.length > 1)
	8362	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8363	+// else
	8364	+// if (!texname.startsWith("/"))
	8365	+// texname = "/Users/nbriere/Textures/" + texname;
	8366	+ if (!FileExists(texname) && !texname.startsWith("@"))
	8367	+ {
	8368	+ texname = fallbackTextureName;
	8369	+ }
8085	8370
8086	8371	if (CACHETEXTURE)
8087		- texture = textures.get(texname); // TEXTURE CACHE
8088		-
8089		- TextureData texturedata = null;
8090		-
8091		- if (texture == null \|\| texture.resolution < resolution)
8092	8372	{
8093		- 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(""))
8094	8406	{
8095	8407	assert(!bump);
8096	8408	// if (bump)
..	..	@@ -8101,19 +8413,23 @@
8101	8413	// }
8102	8414	// else
8103	8415	// {
8104		- texture = textures.get(tex);
8105		- if (texture == null)
	8416	+ // texturecache = textures.get(texname); // suspicious
	8417	+ if (texturecache == null)
8106	8418	{
8107		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8419	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8108	8420	}
	8421	+ else
	8422	+ new Exception().printStackTrace();
8109	8423	// }
8110	8424	} else
8111		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8425	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8112	8426	{
8113	8427	assert(bump);
8114		- texture = textures.get(tex);
8115		- if (texture == null)
8116		- 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();
8117	8433	} else
8118	8434	{
8119	8435	//if (tex.equals("IMMORTAL"))
..	..	@@ -8121,11 +8437,22 @@
8121	8437	// texture = GetResourceTexture("default.png");
8122	8438	//} else
8123	8439	//{
8124		- if (tex.equals("WHITE_NOISE"))
	8440	+ if (texname.endsWith("WHITE_NOISE"))
8125	8441	{
8126		- texture = textures.get(tex);
8127		- if (texture == null)
8128		- 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();
8129	8456	} else
8130	8457	{
8131	8458	if (textureon)
..	..	@@ -8150,7 +8477,7 @@
8150	8477	}
8151	8478
8152	8479	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8153		- if (!new File(cachename).exists())
	8480	+ if (!FileExists(cachename))
8154	8481	cachename = texname;
8155	8482	else
8156	8483	processbump = false; // don't process bump map again
..	..	@@ -8172,7 +8499,7 @@
8172	8499	}
8173	8500
8174	8501	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8175		- if (!new File(cachename).exists())
	8502	+ if (!FileExists(cachename))
8176	8503	cachename = texname;
8177	8504	else
8178	8505	processbump = false; // don't process bump map again
..	..	@@ -8181,20 +8508,23 @@
8181	8508	texturedata = GetFileTexture(cachename, processbump, resolution);
8182	8509
8183	8510
8184		- if (texturedata != null)
8185		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8511	+ if (texturedata == null)
	8512	+ throw new Exception();
	8513	+
	8514	+ texturecache = new CacheTexture(texturedata,resolution);
8186	8515	//texture = GetTexture(tex, bump);
8187	8516	}
	8517	+ }
8188	8518	}
8189	8519	//}
8190	8520	}
8191	8521
8192		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8522	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8193	8523	{
8194	8524	//return false;
8195	8525
8196	8526	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8197		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8527	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8198	8528	{
8199	8529	// String ext = "_highres";
8200	8530	// if (REDUCETEXTURE)
..	..	@@ -8211,52 +8541,17 @@
8211	8541	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8212	8542	if (!cachefile.exists())
8213	8543	{
8214		- // cache to disk
8215		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8216		- //buffers[0].
8217		-
8218		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8219		- int[] pixels = new int[bytebuf.capacity()/3];
8220		-
8221		- // squared size heuristic...
8222		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8544	+ //if (texturedata.getWidth() == texturedata.getHeight())
8223	8545	{
8224		- for (int i=pixels.length; --i>=0;)
8225		- {
8226		- int i3 = i*3;
8227		- pixels[i] = 0xFF;
8228		- pixels[i] <<= 8;
8229		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8230		- pixels[i] <<= 8;
8231		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8232		- pixels[i] <<= 8;
8233		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8234		- }
8235		-
8236		- /*
8237		- int r=0,g=0,b=0,a=0;
8238		- for (int i=0; i<width; i++)
8239		- for (int j=0; j<height; j++)
8240		- {
8241		- int index = j*width+i;
8242		- int p = pixels[index];
8243		- a = ((p>>24) & 0xFF);
8244		- r = ((p>>16) & 0xFF);
8245		- g = ((p>>8) & 0xFF);
8246		- b = (p & 0xFF);
8247		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8248		- }
8249		- /**/
8250		- int width = (int)Math.sqrt(pixels.length); // squared
8251		- int height = width;
8252		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8253		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8546	+ BufferedImage rendImage = CreateBim(texturedata);
	8547	+
8254	8548	ImageWriter writer = null;
8255	8549	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8256	8550	if (iter.hasNext()) {
8257	8551	writer = (ImageWriter)iter.next();
8258	8552	}
8259		- float compressionQuality = 0.9f;
	8553	+
	8554	+ float compressionQuality = 0.85f;
8260	8555	try
8261	8556	{
8262	8557	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8273,18 +8568,20 @@
8273	8568	}
8274	8569	}
8275	8570	}
8276		-
	8571	+
	8572	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8573	+
8277	8574	//System.out.println("Texture = " + tex);
8278		- if (textures.containsKey(texname))
	8575	+ if (textures.containsKey(tex))
8279	8576	{
8280		- CacheTexture thetex = textures.get(texname);
	8577	+ CacheTexture thetex = textures.get(tex);
8281	8578	thetex.texture.disable();
8282	8579	thetex.texture.dispose();
8283		- textures.remove(texname);
	8580	+ textures.remove(tex);
8284	8581	}
8285	8582
8286		- texture.texturedata = texturedata;
8287		- textures.put(texname, texture);
	8583	+ //texture.texturedata = texturedata;
	8584	+ textures.put(tex, texturecache);
8288	8585
8289	8586	// newtex = true;
8290	8587	}
..	..	@@ -8300,10 +8597,44 @@
8300	8597	}
8301	8598	}
8302	8599
8303		- return texture;
	8600	+ return texturecache;
8304	8601	}
8305	8602
8306		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	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
8307	8638	{
8308	8639	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8309	8640
..	..	@@ -8321,21 +8652,21 @@
8321	8652	return texture!=null?texture.texture:null;
8322	8653	}
8323	8654
8324		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8655	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8325	8656	{
8326	8657	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8327	8658
8328	8659	return texture!=null?texture.texturedata:null;
8329	8660	}
8330	8661
8331		- boolean BindTexture(String tex, boolean bump, int resolution)
	8662	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8332	8663	{
8333	8664	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8334	8665	{
8335	8666	return false;
8336	8667	}
8337	8668
8338		- boolean newtex = false;
	8669	+ //boolean newtex = false;
8339	8670
8340	8671	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8341	8672
..	..	@@ -8367,9 +8698,75 @@
8367	8698	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8368	8699	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8369	8700
8370		- return newtex;
	8701	+ return true; // Warning: not used.
8371	8702	}
8372	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	+
8373	8770	ShadowBuffer shadowPBuf;
8374	8771	AntialiasBuffer antialiasPBuf;
8375	8772	int MAXSTACK;
..	..	@@ -8386,10 +8783,12 @@
8386	8783
8387	8784	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8388	8785	MAXSTACK = temp[0];
8389		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8786	+ if (Globals.DEBUG)
	8787	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8390	8788	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8391	8789	MAXSTACK = temp[0];
8392		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8790	+ if (Globals.DEBUG)
	8791	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8393	8792
8394	8793	// Use debug pipeline
8395	8794	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8397,7 +8796,8 @@
8397	8796	gl = drawable.getGL(); //
8398	8797
8399	8798	GL gl3 = getGL();
8400		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8401	8801
8402	8802
8403	8803	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8562,7 +8962,7 @@
8562	8962
8563	8963	if (cubemap == null)
8564	8964	{
8565		- LoadEnvy(5);
	8965	+ //LoadEnvy(1);
8566	8966	}
8567	8967
8568	8968	//cubemap.enable();
..	..	@@ -8838,6 +9238,8 @@
8838	9238
8839	9239	void LoadEnvy(int which)
8840	9240	{
	9241	+ assert(false);
	9242	+
8841	9243	String name;
8842	9244	String ext;
8843	9245
..	..	@@ -8849,37 +9251,58 @@
8849	9251	cubemap = null;
8850	9252	return;
8851	9253	case 1:
8852		- name = "cubemaps/box_";
8853		- ext = "png";
	9254	+ name = "cubemaps/rgb/";
	9255	+ ext = "jpg";
8854	9256	reverseUP = false;
8855	9257	break;
8856	9258	case 2:
8857		- name = "cubemaps/uffizi_";
8858		- ext = "png";
8859		- break; // reverseUP = true; break;
	9259	+ name = "cubemaps/uffizi/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
8860	9263	case 3:
8861		- name = "cubemaps/CloudyHills_";
8862		- ext = "tga";
	9264	+ name = "cubemaps/CloudyHills/";
	9265	+ ext = "jpg";
8863	9266	reverseUP = false;
8864	9267	break;
8865	9268	case 4:
8866		- name = "cubemaps/cornell_";
	9269	+ name = "cubemaps/cornell/";
8867	9270	ext = "png";
8868	9271	reverseUP = false;
8869	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;
8870	9298	default:
8871		- name = "cubemaps/rgb_";
8872		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9299	+ name = "cubemaps/box/";
	9300	+ ext = "png"; /mipmap = true;/
	9301	+ reverseUP = false;
8873	9302	break;
8874	9303	}
8875		-
8876		- try
8877		- {
8878		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8879		- } catch (IOException e)
8880		- {
8881		- throw new RuntimeException(e);
8882		- }
	9304	+
	9305	+ LoadSkybox(name, ext, mipmap);
8883	9306	}
8884	9307
8885	9308	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8911,8 +9334,12 @@
8911	9334	static double[] model = new double[16];
8912	9335	double[] camera2light = new double[16];
8913	9336	double[] light2camera = new double[16];
8914		- int newenvy = -1;
8915		- boolean envyoff = true; // false;
	9337	+
	9338	+ //int newenvy = -1;
	9339	+ //boolean envyoff = false;
	9340	+
	9341	+ String loadedskyboxname;
	9342	+
8916	9343	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8917	9344	//float[] light0 = { 0,0,0 };
8918	9345	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9205,11 +9632,35 @@
9205	9632	jy8[3] = 0.5f;
9206	9633	}
9207	9634
9208		- 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
9209	9636	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9210	9637	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9211	9638	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9212	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	+
9213	9664	static int imagecount = 0; // movie generation
9214	9665
9215	9666	static int jitter = 0;
..	..	@@ -9305,8 +9756,8 @@
9305	9756	assert (parentcam != renderCamera);
9306	9757
9307	9758	if (renderCamera != lightCamera)
9308		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9309		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9759	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9760	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9310	9761
9311	9762	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9312	9763
..	..	@@ -9321,8 +9772,8 @@
9321	9772	LA.matCopy(renderCamera.fromScreen, matrix);
9322	9773
9323	9774	if (renderCamera != lightCamera)
9324		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9325		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9775	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9776	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9326	9777
9327	9778	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9328	9779
..	..	@@ -9368,10 +9819,12 @@
9368	9819	rati = 1 / rati;
9369	9820	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9370	9821	}
9371		- assert (newenvy == -1);
	9822	+
	9823	+ //assert (newenvy == -1);
	9824	+
9372	9825	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9373	9826	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9374		- DrawSkyBox(gl);
	9827	+ DrawSkyBox(gl, (float)rati);
9375	9828	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9376	9829	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9377	9830	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -9394,7 +9847,7 @@
9394	9847	//gl.glFlush();
9395	9848	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9396	9849
9397		- if (ANIMATION && ABORTED)
	9850	+ if (Globals.ANIMATION && ABORTED)
9398	9851	{
9399	9852	System.err.println(" ABORTED FRAME");
9400	9853	break;
..	..	@@ -9424,7 +9877,7 @@
9424	9877	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9425	9878
9426	9879	// save image
9427		- if (ANIMATION && !ABORTED)
	9880	+ if (Globals.ANIMATION && !ABORTED)
9428	9881	{
9429	9882	VPwidth = viewport[2];
9430	9883	VPheight = viewport[3];
..	..	@@ -9535,11 +9988,11 @@
9535	9988
9536	9989	// imagecount++;
9537	9990
9538		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9991	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9539	9992
9540	9993	if (!BOXMODE)
9541	9994	{
9542		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9995	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9543	9996	}
9544	9997
9545	9998	if (!BOXMODE)
..	..	@@ -9577,7 +10030,7 @@
9577	10030	ABORTED = false;
9578	10031	}
9579	10032	else
9580		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10033	+ Grafreed.wav.cursor += 735 * ACSIZE;
9581	10034
9582	10035	if (false)
9583	10036	{
..	..	@@ -10237,14 +10690,23 @@
10237	10690	static boolean init = false;
10238	10691
10239	10692	double[][] matrix = LA.newMatrix();
	10693	+
	10694	+ // This is to refresh the UI of the material panel.
	10695	+ ObjEditor patchMaterial;
10240	10696
10241	10697	public void display(GLAutoDrawable drawable)
10242	10698	{
10243		- if (GrafreeD.savesound && GrafreeD.hassound)
	10699	+ if (patchMaterial.patchMaterial)
10244	10700	{
10245		- GrafreeD.wav.save();
10246		- GrafreeD.savesound = false;
10247		- GrafreeD.hassound = false;
	10701	+ patchMaterial.patchMaterial = false;
	10702	+ patchMaterial.objectPanel.setSelectedIndex(1);
	10703	+ }
	10704	+
	10705	+ if (Grafreed.savesound && Grafreed.hassound)
	10706	+ {
	10707	+ Grafreed.wav.save();
	10708	+ Grafreed.savesound = false;
	10709	+ Grafreed.hassound = false;
10248	10710	}
10249	10711	// if (DEBUG_SELECTION)
10250	10712	// {
..	..	@@ -10320,6 +10782,7 @@
10320	10782	ANTIALIAS = 0;
10321	10783	//System.out.println("RESTART");
10322	10784	AAtimer.restart();
	10785	+ Globals.TIMERRUNNING = true;
10323	10786	}
10324	10787	}
10325	10788	}
..	..	@@ -10374,7 +10837,7 @@
10374	10837	Object3D theobject = object;
10375	10838	Object3D theparent = object.parent;
10376	10839	object.parent = null;
10377		- object = (Object3D)GrafreeD.clone(object);
	10840	+ object = (Object3D)Grafreed.clone(object);
10378	10841	object.Stripify();
10379	10842	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10380	10843	theobject.PreprocessOcclusion(this);
..	..	@@ -10387,13 +10850,14 @@
10387	10850	ambientOcclusion = false;
10388	10851	}
10389	10852
10390		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10853	+ if (//Globals.lighttouched &&
	10854	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10391	10855	{
10392	10856	//if (RENDERSHADOW) // ?
10393	10857	if (!IsFrozen())
10394	10858	{
10395	10859	// dec 2012
10396		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10860	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10397	10861	{
10398	10862	Globals.framecount++;
10399	10863	shadowbuffer.display();
..	..	@@ -10406,7 +10870,7 @@
10406	10870
10407	10871	if (wait)
10408	10872	{
10409		- Sleep(500);
	10873	+ Sleep(200); // blocks everything
10410	10874
10411	10875	wait = false;
10412	10876	}
..	..	@@ -10520,8 +10984,8 @@
10520	10984
10521	10985	// if (parentcam != renderCamera) // not a light
10522	10986	if (cam != lightCamera)
10523		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10524		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10987	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10988	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10525	10989
10526	10990	for (int j = 0; j < 4; j++)
10527	10991	{
..	..	@@ -10535,8 +10999,8 @@
10535	10999
10536	11000	// if (parentcam != renderCamera) // not a light
10537	11001	if (cam != lightCamera)
10538		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10539		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	11002	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11003	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10540	11004
10541	11005	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10542	11006
..	..	@@ -10622,13 +11086,43 @@
10622	11086	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10623	11087	}
10624	11088
10625		- 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"))
10626	11097	{
10627		- LoadEnvy(newenvy);
	11098	+ if (cubemaprgb == null)
	11099	+ {
	11100	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11101	+ }
	11102	+
	11103	+ cubemap = cubemaprgb;
10628	11104	}
10629		-
10630		- newenvy = -1;
10631		-
	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	+
10632	11126	ratio = ((double) getWidth()) / getHeight();
10633	11127	//System.out.println("ratio = " + ratio);
10634	11128
..	..	@@ -10644,7 +11138,7 @@
10644	11138
10645	11139	if (!IsFrozen() && !ambientOcclusion)
10646	11140	{
10647		- DrawSkyBox(gl);
	11141	+ DrawSkyBox(gl, (float)ratio);
10648	11142	}
10649	11143
10650	11144	//if (selection_view == -1)
..	..	@@ -10795,7 +11289,16 @@
10795	11289	// Bump noise
10796	11290	gl.glActiveTexture(GL.GL_TEXTURE6);
10797	11291	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10798		- BindTexture(NOISE_TEXTURE, false, 2);
	11292	+
	11293	+ try
	11294	+ {
	11295	+ BindTexture(NOISE_TEXTURE, false, 2);
	11296	+ }
	11297	+ catch (Exception e)
	11298	+ {
	11299	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11300	+ }
	11301	+
10799	11302
10800	11303	gl.glActiveTexture(GL.GL_TEXTURE0);
10801	11304	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10818,9 +11321,9 @@
10818	11321
10819	11322	gl.glMatrixMode(GL.GL_MODELVIEW);
10820	11323
10821		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10822		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10823		-//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);
10824	11327	} else
10825	11328	{
10826	11329	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10831,7 +11334,7 @@
10831	11334	//System.out.println("BLENDING ON");
10832	11335	gl.glEnable(GL.GL_BLEND);
10833	11336	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10834		-
	11337	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10835	11338	gl.glMatrixMode(gl.GL_PROJECTION);
10836	11339	gl.glLoadIdentity();
10837	11340
..	..	@@ -10920,8 +11423,8 @@
10920	11423	System.err.println("parentcam != renderCamera");
10921	11424
10922	11425	// if (cam != lightCamera)
10923		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10924		- 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
10925	11428	}
10926	11429
10927	11430	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10942,8 +11445,8 @@
10942	11445	if (true) // TODO
10943	11446	{
10944	11447	if (cam != lightCamera)
10945		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10946		- 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
10947	11450	}
10948	11451
10949	11452	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11080,7 +11583,7 @@
11080	11583	}
11081	11584	}
11082	11585
11083		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11586	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11084	11587	{
11085	11588	//gl.glDepthFunc(GL.GL_LEQUAL);
11086	11589	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11088,24 +11591,21 @@
11088	11591
11089	11592	boolean texon = textureon;
11090	11593
11091		- if (RENDERPROGRAM > 0)
11092		- {
11093		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11094		- textureon = false;
11095		- }
	11594	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11595	+ textureon = false;
	11596	+
11096	11597	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11097	11598	//System.out.println("ALLO");
11098	11599	gl.glColorMask(false, false, false, false);
11099	11600	DrawObject(gl);
11100		- if (RENDERPROGRAM > 0)
11101		- {
11102		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11103		- textureon = texon;
11104		- }
	11601	+
	11602	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11603	+ textureon = texon;
	11604	+
11105	11605	gl.glColorMask(true, true, true, true);
11106	11606
11107	11607	gl.glDepthFunc(GL.GL_EQUAL);
11108		- //gl.glDepthMask(false);
	11608	+ gl.glDepthMask(false);
11109	11609	}
11110	11610
11111	11611	if (false) // DrawMode() == SHADOW)
..	..	@@ -11259,8 +11759,14 @@
11259	11759	{
11260	11760	renderpass++;
11261	11761	// System.out.println("Draw object... ");
	11762	+ STEP = 1;
11262	11763	if (FAST) // in case there is no script
11263		- STEP = 16;
	11764	+ STEP = 8;
	11765	+
	11766	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11767	+ {
	11768	+ STEP *= 4;
	11769	+ }
11264	11770
11265	11771	//object.FullInvariants();
11266	11772
..	..	@@ -11274,23 +11780,44 @@
11274	11780	e.printStackTrace();
11275	11781	}
11276	11782
11277		- if (GrafreeD.RENDERME > 0)
11278		- GrafreeD.RENDERME--; // mechante magouille
	11783	+ if (Grafreed.RENDERME > 0)
	11784	+ Grafreed.RENDERME--; // mechante magouille
11279	11785
11280	11786	Globals.ONESTEP = false;
11281	11787	}
11282	11788
11283	11789	static boolean zoomonce = false;
11284	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	+
11285	11809	void DrawObject(GL gl, boolean draw)
11286	11810	{
	11811	+ // To clear camera values
	11812	+ ResetOptions();
	11813	+
11287	11814	//System.out.println("DRAW OBJECT " + mouseDown);
11288	11815	// DrawMode() = SELECTION;
11289	11816	//GL gl = getGL();
11290	11817	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11291	11818	{
11292	11819	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11293		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11820	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11294	11821	pingthread.StepToTarget(true); // true);
11295	11822	// zoomonce = false;
11296	11823	}
..	..	@@ -11345,7 +11872,14 @@
11345	11872
11346	11873	usedtextures.clear();
11347	11874
11348		- BindTextures(DEFAULT_TEXTURES, 2);
	11875	+ try
	11876	+ {
	11877	+ BindTextures(DEFAULT_TEXTURES, 2);
	11878	+ }
	11879	+ catch (Exception e)
	11880	+ {
	11881	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11882	+ }
11349	11883	}
11350	11884	//System.out.println("--> " + stackdepth);
11351	11885	// GrafreeD.traceon();
..	..	@@ -11355,8 +11889,9 @@
11355	11889
11356	11890	if (DrawMode() == DEFAULT)
11357	11891	{
11358		- if (DEBUG)
	11892	+ if (Globals.DEBUG)
11359	11893	{
	11894	+ CreateSelectedPoint();
11360	11895	float radius = 0.05f;
11361	11896	if (selectedpoint.radius != radius)
11362	11897	{
..	..	@@ -11410,20 +11945,32 @@
11410	11945	ReleaseTextures(DEFAULT_TEXTURES);
11411	11946
11412	11947	if (CLEANCACHE)
11413		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11948	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11414	11949	{
11415		- String tex = e.nextElement();
	11950	+ cTexture tex = e.nextElement();
11416	11951
11417	11952	// System.out.println("Texture --------- " + tex);
11418	11953
11419		- if (tex.equals("WHITE_NOISE"))
	11954	+ if (tex.equals("WHITE_NOISE:"))
11420	11955	continue;
11421	11956
11422		- if (!usedtextures.containsKey(tex))
	11957	+ if (!usedtextures.contains(tex))
11423	11958	{
	11959	+ CacheTexture gettex = texturepigment.get(tex);
11424	11960	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11425		- textures.get(tex).texture.dispose();
11426		- 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	+ }
11427	11974	}
11428	11975	}
11429	11976	}
..	..	@@ -11436,7 +11983,14 @@
11436	11983	if (checker != null && DrawMode() == DEFAULT)
11437	11984	{
11438	11985	//BindTexture(IMMORTAL_TEXTURE);
11439		- BindTextures(checker.GetTextures(), checker.texres);
	11986	+ try
	11987	+ {
	11988	+ BindTextures(checker.GetTextures(), checker.texres);
	11989	+ }
	11990	+ catch (Exception e)
	11991	+ {
	11992	+ System.err.println("FAILED: " + checker.GetTextures());
	11993	+ }
11440	11994	// NEAREST
11441	11995	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11442	11996	DrawChecker(gl);
..	..	@@ -11518,7 +12072,7 @@
11518	12072	return;
11519	12073	}
11520	12074
11521		- String string = obj.GetToolTip();
	12075	+ String string = obj.toString(); //.GetToolTip();
11522	12076
11523	12077	GL gl = GetGL();
11524	12078
..	..	@@ -11835,8 +12389,8 @@
11835	12389	//obj.TransformToWorld(light, light);
11836	12390	for (int i = tp.size(); --i >= 0;)
11837	12391	{
11838		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11839		- 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);
11840	12394	}
11841	12395
11842	12396
..	..	@@ -11853,8 +12407,8 @@
11853	12407	parentcam = cameras[0];
11854	12408	}
11855	12409
11856		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11857		- 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
11858	12412
11859	12413	LA.xformPos(light, renderCamera.toScreen, light);
11860	12414
..	..	@@ -11944,8 +12498,76 @@
11944	12498
11945	12499	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11946	12500
11947		- String program =
	12501	+ String programmin =
	12502	+ // Min shader
11948	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	+
11949	12571	//"OPTION ARB_fragment_program_shadow;" +
11950	12572	"PARAM light2cam0 = program.env[10];" +
11951	12573	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -11971,7 +12593,7 @@
11971	12593	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
11972	12594	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
11973	12595	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
11974		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12596	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
11975	12597	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
11976	12598	"PARAM options1 = program.env[62];" + // fog rgb color
11977	12599	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12060,8 +12682,7 @@
12060	12682	"TEMP shininess;" +
12061	12683	"\n" +
12062	12684	"MOV texSamp, one;" +
12063		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12064		-
	12685	+
12065	12686	"MOV mapgrid.x, one2048th.x;" +
12066	12687	"MOV temp, fragment.texcoord[1];" +
12067	12688	/*
..	..	@@ -12082,20 +12703,20 @@
12082	12703	"MUL temp, floor, mapgrid.x;" +
12083	12704	//"TEX depth0, temp, texture[1], 2D;" +
12084	12705	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12085		- TextureFetch("depth0", "temp", "1") +
	12706	+ ShadowTextureFetch("depth0", "temp", "1") +
12086	12707	"") +
12087	12708	"ADD temp.x, temp.x, mapgrid.x;" +
12088	12709	//"TEX depth1, temp, texture[1], 2D;" +
12089	12710	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12090		- TextureFetch("depth1", "temp", "1") +
	12711	+ ShadowTextureFetch("depth1", "temp", "1") +
12091	12712	"") +
12092	12713	"ADD temp.y, temp.y, mapgrid.x;" +
12093	12714	//"TEX depth2, temp, texture[1], 2D;" +
12094		- TextureFetch("depth2", "temp", "1") +
	12715	+ ShadowTextureFetch("depth2", "temp", "1") +
12095	12716	"SUB temp.x, temp.x, mapgrid.x;" +
12096	12717	//"TEX depth3, temp, texture[1], 2D;" +
12097	12718	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12098		- TextureFetch("depth3", "temp", "1") +
	12719	+ ShadowTextureFetch("depth3", "temp", "1") +
12099	12720	"") +
12100	12721	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12101	12722	//"MOV params, material;" +
..	..	@@ -12217,7 +12838,7 @@
12217	12838	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12218	12839	// mar 2013 ??? "KIL alpha.a;" +
12219	12840	"MOV alpha, texSamp.aaaa;" + // y;" +
12220		- "KIL alpha.a;" +
	12841	+ "KIL alpha.a;" + // not sure with parallax mapping
12221	12842	/*
12222	12843	"MUL temp.xy, temp, two;" +
12223	12844	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12303,11 +12924,6 @@
12303	12924	"SUB bump0, bump0, half;" +
12304	12925	"ADD bump, bump, bump0;" +
12305	12926
12306		- "MOV temp.x, texSamp.a;" +
12307		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12308		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12309		- "MOV texSamp.a, temp.x;" +
12310		-
12311	12927	// double-sided
12312	12928	/**/
12313	12929	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12337,6 +12953,41 @@
12337	12953	Normalize("U") +
12338	12954
12339	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;" +
12340	12991
12341	12992	//"MOV temp, fragment.texcoord[0];" +
12342	12993	//
..	..	@@ -12466,10 +13117,10 @@
12466	13117	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12467	13118	"") +
12468	13119
12469		- // display shadow only (bump == 0)
	13120	+ // display shadow only (fakedepth == 0)
12470	13121	"SUB temp.x, half.x, shadow.x;" +
12471		- "MOV temp.y, -params6.x;" +
12472		- "SLT temp.z, temp.y, zero.x;" +
	13122	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13123	+ "SLT temp.z, temp.y, -c256i.x;" +
12473	13124	"SUB temp.y, one.x, temp.z;" +
12474	13125	"MUL temp.x, temp.x, temp.y;" +
12475	13126	"KIL temp.x;" +
..	..	@@ -12598,8 +13249,10 @@
12598	13249	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12599	13250
12600	13251	"SUB temp.x, one.x, ndotl.x;" +
12601		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12602		- "ADD temp.y, one.y, options2.y;" + // sursurface
	13252	+ // Tuning for default skin
	13253	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13254	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13255	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12603	13256	"MUL temp.x, temp.x, temp.y;" +
12604	13257
12605	13258	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12747,7 +13400,7 @@
12747	13400	"MUL final.y, fragment.texcoord[0].x, c256;" +
12748	13401	"FLR final.x, final.y;" +
12749	13402	"SUB final.y, final.y, final.x;" +
12750		- //"MUL final.x, final.x, c256i;" +
	13403	+ "MUL final.x, final.x, c256i;" +
12751	13404	"MOV final.z, zero.x;" +
12752	13405	"MOV final.a, one.w;":""
12753	13406	) +
..	..	@@ -12755,7 +13408,7 @@
12755	13408	"MUL final.y, fragment.texcoord[0].y, c256;" +
12756	13409	"FLR final.x, final.y;" +
12757	13410	"SUB final.y, final.y, final.x;" +
12758		- //"MUL final.x, final.x, c256i;" +
	13411	+ "MUL final.x, final.x, c256i;" +
12759	13412	"MOV final.z, zero.x;" +
12760	13413	"MOV final.a, one.w;":""
12761	13414	) +
..	..	@@ -12798,8 +13451,19 @@
12798	13451	//once = true;
12799	13452	}
12800	13453
12801		- System.out.print("Program #" + mode + "; length = " + program.length());
12802		- 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	+
12803	13467	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12804	13468
12805	13469	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12846,7 +13510,8 @@
12846	13510	"\n" +
12847	13511	"END\n";
12848	13512
12849		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13513	+ if (Globals.DEBUG)
	13514	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
12850	13515	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12851	13516
12852	13517	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12891,25 +13556,26 @@
12891	13556	return out;
12892	13557	}
12893	13558
12894		- String TextureFetch(String dest, String src, String unit)
	13559	+ // Also does frustum culling
	13560	+ String ShadowTextureFetch(String dest, String src, String unit)
12895	13561	{
12896	13562	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12897	13563	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12898	13564	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13565	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13566	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12899	13567	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12900		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12901		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12902		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12903		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13568	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13569	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12904	13570	//"SWZ buffer, temp, w,w,w,w;";
12905		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13571	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12906	13572	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12907	13573	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12908	13574	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12909		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13575	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12910	13576
12911		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12912		- //"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;";
12913	13579	}
12914	13580
12915	13581	String Shadow(String depth, String shadow)
..	..	@@ -12931,12 +13597,16 @@
12931	13597
12932	13598	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12933	13599	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13600	+
	13601	+ // Compare fragment depth in light space with shadowmap.
12934	13602	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12935	13603	"SGE temp.y, temp.x, zero.x;" +
12936		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13604	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13605	+
	13606	+ // Reverse comparison
12937	13607	"SUB temp.x, one.x, temp.x;" +
12938	13608	"MUL " + shadow + ".x, temp.x, temp.y;" +
12939		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13609	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12940	13610	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12941	13611
12942	13612	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12950,6 +13620,10 @@
12950	13620	// No shadow for backface
12951	13621	"DP3 temp.x, normal, lightd;" +
12952	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;" +
12953	13627	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12954	13628	"";
12955	13629	}
..	..	@@ -13095,8 +13769,9 @@
13095	13769	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13096	13770	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13097	13771	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13098		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13099		- Object3D.cVector2[] vector2buffer;
	13772	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
	13773	+
	13774	+ //Object3D.cVector2[] vector2buffer;
13100	13775
13101	13776	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13102	13777	// OUT : diff, spec
..	..	@@ -13112,9 +13787,10 @@
13112	13787	"DP3 " + dest + ".z," + "normals," + "eye;" +
13113	13788	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13114	13789	//"MOV " + dest + ".w," + "normal.z;" +
13115		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13116		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13117		- //"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
13118	13794	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13119	13795	"RCP " + dest + ".w," + dest + ".w;" +
13120	13796	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13508,7 +14184,7 @@
13508	14184	public void mousePressed(MouseEvent e)
13509	14185	{
13510	14186	//System.out.println("mousePressed: " + e);
13511		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14187	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13512	14188	}
13513	14189
13514	14190	static long prevtime = 0;
..	..	@@ -13584,8 +14260,8 @@
13584	14260	// mode \|= META;
13585	14261	//}
13586	14262
13587		- SetMouseMode(WHEEL \| e.getModifiersEx());
13588		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14263	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14264	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13589	14265	anchorX = ax;
13590	14266	anchorY = ay;
13591	14267	prevX = px;
..	..	@@ -13619,6 +14295,7 @@
13619	14295	else
13620	14296	if (evt.getSource() == AAtimer)
13621	14297	{
	14298	+ Globals.TIMERRUNNING = false;
13622	14299	if (mouseDown)
13623	14300	{
13624	14301	//new Exception().printStackTrace();
..	..	@@ -13644,6 +14321,10 @@
13644	14321	// LIVE = waslive;
13645	14322	// wasliveok = true;
13646	14323	// waslive = false;
	14324	+
	14325	+ // May 2019 Forget it:
	14326	+ if (true)
	14327	+ return;
13647	14328
13648	14329	// source == timer
13649	14330	if (mouseDown)
..	..	@@ -13674,7 +14355,7 @@
13674	14355
13675	14356	// fev 2014???
13676	14357	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13677		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14358	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13678	14359	pingthread.StepToTarget(true); // true);
13679	14360	}
13680	14361	// if (!LIVE)
..	..	@@ -13683,12 +14364,13 @@
13683	14364
13684	14365	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13685	14366
13686		- void clickStart(int x, int y, int modifiers)
	14367	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13687	14368	{
13688	14369	if (!wasliveok)
13689	14370	return;
13690	14371
13691	14372	AAtimer.restart(); //
	14373	+ Globals.TIMERRUNNING = true;
13692	14374
13693	14375	// waslive = LIVE;
13694	14376	// LIVE = false;
..	..	@@ -13700,7 +14382,7 @@
13700	14382	// touched = true; // main DL
13701	14383	if (isRenderer)
13702	14384	{
13703		- SetMouseMode(modifiers);
	14385	+ SetMouseMode(modifiers, modifiersex);
13704	14386	}
13705	14387
13706	14388	selectX = anchorX = x;
..	..	@@ -13713,7 +14395,7 @@
13713	14395	clicked = true;
13714	14396	hold = false;
13715	14397
13716		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14398	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13717	14399	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13718	14400	{
13719	14401	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13738,14 +14420,15 @@
13738	14420	drag = false;
13739	14421	//System.out.println("Mouse DOWN");
13740	14422	editObj = false;
13741		- ClickInfo info = new ClickInfo();
13742		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13743		- info.pane = this;
13744		- info.camera = renderCamera;
13745		- info.x = x;
13746		- info.y = y;
13747		- info.modifiers = modifiers;
13748		- 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);
13749	14432	if (!editObj)
13750	14433	{
13751	14434	hasMarquee = true;
..	..	@@ -13761,9 +14444,12 @@
13761	14444
13762	14445	public void mouseDragged(MouseEvent e)
13763	14446	{
	14447	+ Globals.MOUSEDRAGGED = true;
	14448	+
13764	14449	//System.out.println("mouseDragged: " + e);
13765	14450	if (isRenderer)
13766	14451	movingcamera = true;
	14452	+
13767	14453	//if (drawing)
13768	14454	//return;
13769	14455	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13773,7 +14459,7 @@
13773	14459	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13774	14460	}
13775	14461	else
13776		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14462	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13777	14463
13778	14464	//try { Thread.sleep(1); } catch (Exception ex) {}
13779	14465	}
..	..	@@ -13946,6 +14632,7 @@
13946	14632
13947	14633	public void run()
13948	14634	{
	14635	+ new Exception().printStackTrace();
13949	14636	System.exit(0);
13950	14637	for (;;)
13951	14638	{
..	..	@@ -14009,7 +14696,7 @@
14009	14696	{
14010	14697	Globals.lighttouched = true;
14011	14698	}
14012		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14699	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14013	14700	}
14014	14701	//else
14015	14702	}
..	..	@@ -14023,12 +14710,18 @@
14023	14710	void GoDown(int mod)
14024	14711	{
14025	14712	MODIFIERS \|= COMMAND;
14026		- /*
	14713	+ boolean isVR = (mouseMode&VR)!=0;
	14714	+ /**/
14027	14715	if((mod&SHIFT) == SHIFT)
14028		- manipCamera.RotatePosition(0, -speed);
	14716	+ {
	14717	+ if (isVR)
	14718	+ manipCamera.RotateInterest(0, -speed);
	14719	+ else
	14720	+ manipCamera.RotatePosition(0, -speed);
	14721	+ }
14029	14722	else
14030		- manipCamera.BackForth(0, -speed*delta, getWidth());
14031		- */
	14723	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	14724	+ /**/
14032	14725	if ((mod & SHIFT) == SHIFT)
14033	14726	{
14034	14727	mouseMode = mouseMode; // VR??
..	..	@@ -14037,6 +14730,8 @@
14037	14730	mouseMode \|= BACKFORTH;
14038	14731	}
14039	14732
	14733	+ targetLookAt.set(manipCamera.lookAt);
	14734	+
14040	14735	//prevX = X = anchorX;
14041	14736	prevY = Y = anchorY - (int) (renderCamera.Distance());
14042	14737	}
..	..	@@ -14044,12 +14739,19 @@
14044	14739	void GoUp(int mod)
14045	14740	{
14046	14741	MODIFIERS \|= COMMAND;
14047		- /*
	14742	+ /**/
	14743	+ boolean isVR = (mouseMode&VR)!=0;
	14744	+
14048	14745	if((mod&SHIFT) == SHIFT)
14049		- manipCamera.RotatePosition(0, speed);
	14746	+ {
	14747	+ if (isVR)
	14748	+ manipCamera.RotateInterest(0, speed);
	14749	+ else
	14750	+ manipCamera.RotatePosition(0, speed);
	14751	+ }
14050	14752	else
14051		- manipCamera.BackForth(0, speed*delta, getWidth());
14052		- */
	14753	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	14754	+ /**/
14053	14755	if ((mod & SHIFT) == SHIFT)
14054	14756	{
14055	14757	mouseMode = mouseMode;
..	..	@@ -14058,6 +14760,8 @@
14058	14760	mouseMode \|= BACKFORTH;
14059	14761	}
14060	14762
	14763	+ targetLookAt.set(manipCamera.lookAt);
	14764	+
14061	14765	//prevX = X = anchorX;
14062	14766	prevY = Y = anchorY + (int) (renderCamera.Distance());
14063	14767	}
..	..	@@ -14065,12 +14769,17 @@
14065	14769	void GoLeft(int mod)
14066	14770	{
14067	14771	MODIFIERS \|= COMMAND;
14068		- /*
	14772	+ /**/
14069	14773	if((mod&SHIFT) == SHIFT)
14070		- manipCamera.RotatePosition(speed, 0);
	14774	+ manipCamera.Translate(speed*delta, 0, getWidth());
14071	14775	else
14072		- manipCamera.Translate(speed*delta, 0, getWidth());
14073		- */
	14776	+ {
	14777	+ if ((mouseMode&VR)!=0)
	14778	+ manipCamera.RotateInterest(-speed, 0);
	14779	+ else
	14780	+ manipCamera.RotatePosition(speed, 0);
	14781	+ }
	14782	+ /**/
14074	14783	if ((mod & SHIFT) == SHIFT)
14075	14784	{
14076	14785	mouseMode = mouseMode;
..	..	@@ -14079,6 +14788,8 @@
14079	14788	mouseMode \|= ROTATE;
14080	14789	} // TRANSLATE;
14081	14790
	14791	+ targetLookAt.set(manipCamera.lookAt);
	14792	+
14082	14793	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14083	14794	prevY = Y = anchorY;
14084	14795	}
..	..	@@ -14086,12 +14797,18 @@
14086	14797	void GoRight(int mod)
14087	14798	{
14088	14799	MODIFIERS \|= COMMAND;
14089		- /*
	14800	+ /**/
14090	14801	if((mod&SHIFT) == SHIFT)
14091		- manipCamera.RotatePosition(-speed, 0);
	14802	+ manipCamera.Translate(-speed*delta, 0, getWidth());
14092	14803	else
14093		- manipCamera.Translate(-speed*delta, 0, getWidth());
14094		- */
	14804	+ {
	14805	+ if ((mouseMode&VR)!=0)
	14806	+ manipCamera.RotateInterest(speed, 0);
	14807	+ else
	14808	+ manipCamera.RotatePosition(-speed, 0);
	14809	+ }
	14810	+
	14811	+ /**/
14095	14812	if ((mod & SHIFT) == SHIFT)
14096	14813	{
14097	14814	mouseMode = mouseMode;
..	..	@@ -14100,6 +14817,8 @@
14100	14817	mouseMode \|= ROTATE;
14101	14818	} // TRANSLATE;
14102	14819
	14820	+ targetLookAt.set(manipCamera.lookAt);
	14821	+
14103	14822	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14104	14823	prevY = Y = anchorY;
14105	14824	}
..	..	@@ -14109,7 +14828,7 @@
14109	14828	int X, Y;
14110	14829	boolean SX, SY;
14111	14830
14112		- void drag(int x, int y, int modifiers)
	14831	+ void drag(int x, int y, int modifiers, int modifiersex)
14113	14832	{
14114	14833	if (IsFrozen())
14115	14834	{
..	..	@@ -14118,17 +14837,17 @@
14118	14837
14119	14838	drag = true; // NEW
14120	14839
14121		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14840	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14122	14841
14123	14842	X = x;
14124	14843	Y = y;
14125	14844	// floating state for animation
14126		- MODIFIERS = modifiers;
14127		- modifiers &= ~1024;
	14845	+ MODIFIERS = modifiersex;
	14846	+ modifiersex &= ~1024;
14128	14847	if (false) // modifiers != 0)
14129	14848	{
14130	14849	//new Exception().printStackTrace();
14131		- System.out.println("mouseDragged: " + modifiers);
	14850	+ System.out.println("mouseDragged: " + modifiersex);
14132	14851	System.out.println("SHIFT = " + SHIFT);
14133	14852	System.out.println("CONTROL = " + COMMAND);
14134	14853	System.out.println("META = " + META);
..	..	@@ -14141,14 +14860,16 @@
14141	14860	if (editObj)
14142	14861	{
14143	14862	drag = true;
14144		- ClickInfo info = new ClickInfo();
14145		- info.bounds.setBounds(0, 0,
	14863	+ //ClickInfo info = new ClickInfo();
	14864	+ object.clickInfo.bounds.setBounds(0, 0,
14146	14865	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14147		- info.pane = this;
14148		- info.camera = renderCamera;
14149		- info.x = x;
14150		- info.y = y;
14151		- object.editWindow.copy.doEditDrag(info);
	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);
14152	14873	} else
14153	14874	{
14154	14875	if (x < startX)
..	..	@@ -14297,22 +15018,27 @@
14297	15018	}
14298	15019	}
14299	15020
	15021	+// ClickInfo clickInfo = new ClickInfo();
	15022	+
14300	15023	public void mouseMoved(MouseEvent e)
14301	15024	{
14302	15025	//System.out.println("mouseMoved: " + e);
14303	15026	if (isRenderer)
14304	15027	return;
14305	15028
14306		- ClickInfo ci = new ClickInfo();
14307		- ci.x = e.getX();
14308		- ci.y = e.getY();
14309		- ci.modifiers = e.getModifiersEx();
14310		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14311		- ci.pane = this;
14312		- 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;
14313	15036	if (!isRenderer)
14314	15037	{
14315		- if (object.editWindow.copy.doEditClick(ci, 0))
	15038	+ //ObjEditor editWindow = object.editWindow;
	15039	+ //Object3D copy = editWindow.copy;
	15040	+ if (object.doEditClick(//clickInfo,
	15041	+ 0))
14316	15042	{
14317	15043	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14318	15044	} else
..	..	@@ -14324,7 +15050,11 @@
14324	15050
14325	15051	public void mouseReleased(MouseEvent e)
14326	15052	{
	15053	+ Globals.MOUSEDRAGGED = false;
	15054	+
14327	15055	movingcamera = false;
	15056	+ X = 0; // getBounds().width/2;
	15057	+ Y = 0; // getBounds().height/2;
14328	15058	//System.out.println("mouseReleased: " + e);
14329	15059	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14330	15060	}
..	..	@@ -14347,9 +15077,9 @@
14347	15077	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14348	15078	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14349	15079
14350		- if (control \|\| command \|\| IsFrozen())
	15080	+// No delay if (control \|\| command \|\| IsFrozen())
14351	15081	timeout = true;
14352		- else
	15082	+// ?? May 2019 else
14353	15083	// timer.setDelay((modifiers & 128) != 0?0:350);
14354	15084	mouseDown = false;
14355	15085	if (!control && !command) // june 2013
..	..	@@ -14459,7 +15189,7 @@
14459	15189	System.out.println("keyReleased: " + e);
14460	15190	}
14461	15191
14462		- void SetMouseMode(int modifiers)
	15192	+ void SetMouseMode(int modifiers, int modifiersex)
14463	15193	{
14464	15194	//System.out.println("SetMouseMode = " + modifiers);
14465	15195	//modifiers &= ~1024;
..	..	@@ -14471,25 +15201,25 @@
14471	15201	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14472	15202	// return;
14473	15203	//System.out.println("SetMode = " + modifiers);
14474		- if ((modifiers & WHEEL) == WHEEL)
	15204	+ if ((modifiersex & WHEEL) == WHEEL)
14475	15205	{
14476	15206	mouseMode \|= ZOOM;
14477	15207	}
14478	15208
14479	15209	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14480		- if (capsLocked \|\| (modifiers & META) == META)
	15210	+ if (capsLocked) // \|\| (modifiers & META) == META)
14481	15211	{
14482	15212	mouseMode \|= VR; // BACKFORTH;
14483	15213	}
14484		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15214	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14485	15215	{
14486	15216	mouseMode \|= SELECT;
14487	15217	}
14488		- if ((modifiers & COMMAND) == COMMAND)
	15218	+ if ((modifiersex & COMMAND) == COMMAND)
14489	15219	{
14490	15220	mouseMode \|= SELECT;
14491	15221	}
14492		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15222	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14493	15223	{
14494	15224	mouseMode &= ~VR;
14495	15225	mouseMode \|= TRANSLATE;
..	..	@@ -14518,7 +15248,7 @@
14518	15248
14519	15249	if (isRenderer) //
14520	15250	{
14521		- SetMouseMode(modifiers);
	15251	+ SetMouseMode(0, modifiers);
14522	15252	}
14523	15253
14524	15254	Globals.theRenderer.keyPressed(key);
..	..	@@ -14580,7 +15310,8 @@
14580	15310	// break;
14581	15311	case 'T':
14582	15312	CACHETEXTURE ^= true;
14583		- textures.clear();
	15313	+ texturepigment.clear();
	15314	+ texturebump.clear();
14584	15315	// repaint();
14585	15316	break;
14586	15317	case 'Y':
..	..	@@ -14590,8 +15321,8 @@
14590	15321	case 'K':
14591	15322	KOMPACTTEXTURE ^= true;
14592	15323	//textures.clear();
14593		- break;
14594		- case 'P': // Texture Projection macros
	15324	+ // break;
	15325	+ //case 'P': // Texture Projection macros
14595	15326	// SAVETEXTURE ^= true;
14596	15327	macromode = true;
14597	15328	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -14665,7 +15396,9 @@
14665	15396	case 'E' : COMPACT ^= true;
14666	15397	repaint();
14667	15398	break;
14668		- case 'W' : DEBUGHSB ^= true;
	15399	+ case 'W' : // Wide Window (fullscreen)
	15400	+ //DEBUGHSB ^= true;
	15401	+ ObjEditor.theFrame.ToggleFullScreen();
14669	15402	repaint();
14670	15403	break;
14671	15404	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14690,8 +15423,8 @@
14690	15423	RevertCamera();
14691	15424	repaint();
14692	15425	break;
14693		- case 'L':
14694	15426	case 'l':
	15427	+ //case 'L':
14695	15428	if (lightMode)
14696	15429	{
14697	15430	lightMode = false;
..	..	@@ -14710,7 +15443,7 @@
14710	15443	targetLookAt.set(manipCamera.lookAt);
14711	15444	repaint();
14712	15445	break;
14713		- case 'p':
	15446	+ case 'P': // p':
14714	15447	// c'est quoi ca au juste? spherical ^= true;
14715	15448	Skinshader ^= true; programInitialized = false;
14716	15449	repaint();
..	..	@@ -14755,20 +15488,24 @@
14755	15488	OCCLUSION_CULLING ^= true;
14756	15489	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14757	15490	break;
14758		- case '0': envyoff ^= true; repaint(); break;
	15491	+ //case '0': envyoff ^= true; repaint(); break;
14759	15492	case '1':
14760	15493	case '2':
14761	15494	case '3':
14762	15495	case '4':
14763	15496	case '5':
14764		- newenvy = Character.getNumericValue(key);
14765		- repaint();
14766		- break;
14767	15497	case '6':
14768	15498	case '7':
14769	15499	case '8':
14770	15500	case '9':
14771		- 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	+ }
14772	15509	repaint();
14773	15510	break;
14774	15511	case '!':
..	..	@@ -14834,9 +15571,9 @@
14834	15571	case '_':
14835	15572	kompactbit = 5;
14836	15573	break;
14837		- case '+':
14838		- kompactbit = 6;
14839		- break;
	15574	+// case '+':
	15575	+// kompactbit = 6;
	15576	+// break;
14840	15577	case ' ':
14841	15578	lightMode ^= true;
14842	15579	Globals.lighttouched = true;
..	..	@@ -14848,13 +15585,14 @@
14848	15585	case ESC:
14849	15586	RENDERPROGRAM += 1;
14850	15587	RENDERPROGRAM %= 3;
	15588	+
14851	15589	repaint();
14852	15590	break;
14853	15591	case 'Z':
14854	15592	//RESIZETEXTURE ^= true;
14855	15593	//break;
14856	15594	case 'z':
14857		- RENDERSHADOW ^= true;
	15595	+ Globals.RENDERSHADOW ^= true;
14858	15596	Globals.lighttouched = true;
14859	15597	repaint();
14860	15598	break;
..	..	@@ -14887,8 +15625,9 @@
14887	15625	case DELETE:
14888	15626	ClearSelection();
14889	15627	break;
14890		- /*
14891	15628	case '+':
	15629	+
	15630	+ /*
14892	15631	//fontsize += 1;
14893	15632	bbzoom *= 2;
14894	15633	repaint();
..	..	@@ -14905,17 +15644,17 @@
14905	15644	case '=':
14906	15645	IncDepth();
14907	15646	//fontsize += 1;
14908		- object.editWindow.refreshContents(true);
	15647	+ object.GetWindow().refreshContents(true);
14909	15648	maskbit = 6;
14910	15649	break;
14911	15650	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14912	15651	DecDepth();
14913	15652	maskbit = 5;
14914	15653	//if(fontsize > 1) fontsize -= 1;
14915		- if (object.editWindow == null)
14916		- new Exception().printStackTrace();
14917		- else
14918		- object.editWindow.refreshContents(true);
	15654	+// if (object.editWindow == null)
	15655	+// new Exception().printStackTrace();
	15656	+// else
	15657	+ object.GetWindow().refreshContents(true);
14919	15658	break;
14920	15659	case '{':
14921	15660	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14978,7 +15717,7 @@
14978	15717	//mode = ROTATE;
14979	15718	if ((MODIFIERS & COMMAND) == 0) // VR??
14980	15719	{
14981		- SetMouseMode(modifiers);
	15720	+ SetMouseMode(0, modifiers);
14982	15721	}
14983	15722	}
14984	15723
..	..	@@ -15114,7 +15853,7 @@
15114	15853	{
15115	15854	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15116	15855	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15117		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15856	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15118	15857	{
15119	15858	mouseMoved(e);
15120	15859	} else
..	..	@@ -15139,11 +15878,12 @@
15139	15878	}
15140	15879	*/
15141	15880
15142		- object.editWindow.EditSelection();
	15881	+ object.GetWindow().EditSelection(false);
15143	15882	}
15144	15883
15145	15884	void SelectParent()
15146	15885	{
	15886	+ new Exception().printStackTrace();
15147	15887	System.exit(0);
15148	15888	Composite group = (Composite) object;
15149	15889	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15155,10 +15895,10 @@
15155	15895	{
15156	15896	//selectees.remove(i);
15157	15897	System.out.println("select parent of " + elem);
15158		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15898	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15159	15899	} else
15160	15900	{
15161		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15901	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15162	15902	}
15163	15903
15164	15904	first = false;
..	..	@@ -15167,6 +15907,7 @@
15167	15907
15168	15908	void SelectChildren()
15169	15909	{
	15910	+ new Exception().printStackTrace();
15170	15911	System.exit(0);
15171	15912	/*
15172	15913	Composite group = (Composite) object;
..	..	@@ -15199,12 +15940,12 @@
15199	15940	for (int j = 0; j < group.children.size(); j++)
15200	15941	{
15201	15942	elem = (Object3D) group.children.elementAt(j);
15202		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15943	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15203	15944	first = false;
15204	15945	}
15205	15946	} else
15206	15947	{
15207		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15948	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15208	15949	}
15209	15950
15210	15951	first = false;
..	..	@@ -15215,21 +15956,21 @@
15215	15956	{
15216	15957	//Composite group = (Composite) object;
15217	15958	Object3D group = object;
15218		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15959	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15219	15960	}
15220	15961
15221	15962	void ResetTransform(int mask)
15222	15963	{
15223	15964	//Composite group = (Composite) object;
15224	15965	Object3D group = object;
15225		- group.editWindow.ResetTransform(mask);
	15966	+ group.GetWindow().ResetTransform(mask);
15226	15967	}
15227	15968
15228	15969	void FlipTransform()
15229	15970	{
15230	15971	//Composite group = (Composite) object;
15231	15972	Object3D group = object;
15232		- group.editWindow.FlipTransform();
	15973	+ group.GetWindow().FlipTransform();
15233	15974	// group.editWindow.ReduceMesh(true);
15234	15975	}
15235	15976
..	..	@@ -15237,7 +15978,7 @@
15237	15978	{
15238	15979	//Composite group = (Composite) object;
15239	15980	Object3D group = object;
15240		- group.editWindow.PrintMemory();
	15981	+ group.GetWindow().PrintMemory();
15241	15982	// group.editWindow.ReduceMesh(true);
15242	15983	}
15243	15984
..	..	@@ -15245,7 +15986,7 @@
15245	15986	{
15246	15987	//Composite group = (Composite) object;
15247	15988	Object3D group = object;
15248		- group.editWindow.ResetCentroid();
	15989	+ group.GetWindow().ResetCentroid();
15249	15990	}
15250	15991
15251	15992	void IncDepth()
..	..	@@ -15327,11 +16068,11 @@
15327	16068
15328	16069	int width = getBounds().width;
15329	16070	int height = getBounds().height;
15330		- ClickInfo info = new ClickInfo();
15331		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15332	16071	//Image img = CreateImage(width, height);
15333	16072	//System.out.println("width = " + width + "; height = " + height + "\n");
	16073	+
15334	16074	Graphics gr = g; // img.getGraphics();
	16075	+
15335	16076	if (!hasMarquee)
15336	16077	{
15337	16078	if (Xmin < Xmax) // !locked)
..	..	@@ -15403,44 +16144,92 @@
15403	16144	}
15404	16145	if (object != null && !hasMarquee)
15405	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	+
15406	16153	if (isRenderer)
15407	16154	{
15408		- info.flags++;
	16155	+ object.clickInfo.flags++;
15409	16156	double frameAspect = (double) width / (double) height;
15410	16157	if (frameAspect > renderCamera.aspect)
15411	16158	{
15412	16159	int desired = (int) ((double) height * renderCamera.aspect);
15413		- info.bounds.width -= width - desired;
15414		- info.bounds.x += (width - desired) / 2;
	16160	+ object.clickInfo.bounds.width -= width - desired;
	16161	+ object.clickInfo.bounds.x += (width - desired) / 2;
15415	16162	} else
15416	16163	{
15417	16164	int desired = (int) ((double) width / renderCamera.aspect);
15418		- info.bounds.height -= height - desired;
15419		- info.bounds.y += (height - desired) / 2;
	16165	+ object.clickInfo.bounds.height -= height - desired;
	16166	+ object.clickInfo.bounds.y += (height - desired) / 2;
15420	16167	}
15421	16168	}
15422		- info.g = gr;
15423		- info.camera = renderCamera;
	16169	+
	16170	+ object.clickInfo.g = gr;
	16171	+ object.clickInfo.camera = renderCamera;
15424	16172	/*
15425	16173	// Memory intensive (brep.verticescopy)
15426	16174	if (!(object instanceof Composite))
15427	16175	object.draw(info, 0, false); // SLOW :
15428	16176	*/
15429		- if (!isRenderer)
	16177	+ if (!isRenderer) // && drag)
15430	16178	{
15431		- 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	+ }
15432	16219	}
15433	16220	}
	16221	+
15434	16222	if (isRenderer)
15435	16223	{
15436	16224	//gr.setColor(Color.black);
15437	16225	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15438	16226	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15439	16227	}
	16228	+
15440	16229	if (hasMarquee)
15441	16230	{
15442	16231	gr.setXORMode(Color.white);
15443		- gr.setColor(Color.red);
	16232	+ gr.setColor(Color.white);
15444	16233	if (!firstime)
15445	16234	{
15446	16235	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -15549,6 +16338,7 @@
15549	16338	public boolean mouseDown(Event evt, int x, int y)
15550	16339	{
15551	16340	System.out.println("mouseDown: " + evt);
	16341	+ System.exit(0);
15552	16342	/*
15553	16343	locked = true;
15554	16344	drag = false;
..	..	@@ -15592,7 +16382,7 @@
15592	16382	{
15593	16383	keyPressed(0, modifiers);
15594	16384	}
15595		- clickStart(x, y, modifiers);
	16385	+ // clickStart(x, y, modifiers);
15596	16386	return true;
15597	16387	}
15598	16388
..	..	@@ -15710,7 +16500,7 @@
15710	16500	{
15711	16501	keyReleased(0, 0);
15712	16502	}
15713		- drag(x, y, modifiers);
	16503	+ drag(x, y, 0, modifiers);
15714	16504	return true;
15715	16505	}
15716	16506
..	..	@@ -15842,7 +16632,7 @@
15842	16632	Object3D object;
15843	16633	static Object3D trackedobject;
15844	16634	Camera renderCamera; // Light or Eye (or Occlusion)
15845		- /static/ Camera manipCamera; // Light or Eye
	16635	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15846	16636	/static/ Camera eyeCamera;
15847	16637	/static/ Camera lightCamera;
15848	16638	int cameracount;
..	..	@@ -15906,6 +16696,8 @@
15906	16696	private /static/ boolean firstime;
15907	16697	private /static/ cVector newView = new cVector();
15908	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"};
15909	16701	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15910	16702	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15911	16703	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15918,29 +16710,67 @@
15918	16710	{
15919	16711	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15920	16712
	16713	+ int usedsuf = 0;
	16714	+
15921	16715	for (int i = 0; i < suffixes.length; i++)
15922	16716	{
15923		- String resourceName = basename + suffixes[i] + "." + suffix;
15924		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15925		- mipmapped,
15926		- FileUtil.getFileSuffix(resourceName));
15927		- if (data == null)
	16717	+ String[] suffixe = suffixes;
	16718	+ String[] fallback = suffixes2;
	16719	+ String[] fallfallback = suffixes3;
	16720	+
	16721	+ for (int c=usedsuf; --c>=0;)
15928	16722	{
15929		- throw new IOException("Unable to load texture " + resourceName);
	16723	+// String[] temp = suffixe;
	16724	+// suffixe = fallback;
	16725	+// fallback = fallfallback;
	16726	+// fallfallback = temp;
15930	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	+
15931	16756	//System.out.println("Target = " + targets[i]);
15932	16757	cubemap.updateImage(data, targets[i]);
15933	16758	}
15934	16759
15935	16760	return cubemap;
15936	16761	}
	16762	+
15937	16763	int bigsphere = -1;
15938	16764
15939	16765	float BGcolor = 0.5f;
15940	16766
15941		- private void DrawSkyBox(GL gl)
	16767	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16768	+
	16769	+ private void DrawSkyBox(GL gl, float ratio)
15942	16770	{
15943		- if (envyoff \|\| cubemap == null)
	16771	+ if (//envyoff \|\|
	16772	+ WIREFRAME \|\|
	16773	+ cubemap == null)
15944	16774	{
15945	16775	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15946	16776	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15955,7 +16785,17 @@
15955	16785	// Compensates for ExaminerViewer's modification of modelview matrix
15956	16786	gl.glMatrixMode(GL.GL_MODELVIEW);
15957	16787	gl.glLoadIdentity();
	16788	+ gl.glScalef(1,ratio,1);
15958	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	+
15959	16799	//gl.glActiveTexture(GL.GL_TEXTURE1);
15960	16800	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15961	16801
..	..	@@ -15987,6 +16827,7 @@
15987	16827	{
15988	16828	gl.glScalef(1.0f, -1.0f, 1.0f);
15989	16829	}
	16830	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
15990	16831	gl.glMultMatrixd(viewrot_1, 0);
15991	16832	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
15992	16833	//viewer.updateInverseRotation(gl);
..	..	@@ -16027,7 +16868,8 @@
16027	16868	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16028	16869
16029	16870	cubemap.disable();
16030		- ////cubemap.unbind();
	16871	+ //cubemap.dispose();
	16872	+
16031	16873	if (CULLFACE)
16032	16874	{
16033	16875	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16127,16 +16969,16 @@
16127	16969	cStatic.objectstack[materialdepth++] = checker;
16128	16970	//System.out.println("material " + material);
16129	16971	//Applet3D.tracein(this, selected);
16130		- vector2buffer = checker.projectedVertices;
	16972	+ //vector2buffer = checker.projectedVertices;
16131	16973
16132	16974	//checker.GetMaterial().Draw(this, false); // true);
16133		- DrawMaterial(checker.GetMaterial(), false); // true);
	16975	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16134	16976
16135	16977	materialdepth -= 1;
16136	16978	if (materialdepth > 0)
16137	16979	{
16138		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16139		- 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);
16140	16982	}
16141	16983	//checker.GetMaterial().opacity = 1f;
16142	16984	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16222,6 +17064,14 @@
16222	17064	}
16223	17065	}
16224	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	+
16225	17075	class SelectBuffer implements GLEventListener
16226	17076	{
16227	17077
..	..	@@ -16237,7 +17087,7 @@
16237	17087	//new Exception().printStackTrace();
16238	17088	System.out.println("select buffer init");
16239	17089	// Use debug pipeline
16240		- drawable.setGL(new DebugGL(drawable.getGL()));
	17090	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16241	17091
16242	17092	GL gl = drawable.getGL();
16243	17093
..	..	@@ -16280,6 +17130,7 @@
16280	17130	{
16281	17131	if (!selection)
16282	17132	{
	17133	+ new Exception().printStackTrace();
16283	17134	System.exit(0);
16284	17135	return;
16285	17136	}
..	..	@@ -16300,6 +17151,17 @@
16300	17151
16301	17152	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16302	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	+
16303	17165	//int tmp = selection_view;
16304	17166	//selection_view = -1;
16305	17167	int temp = DrawMode();
..	..	@@ -16311,6 +17173,17 @@
16311	17173	// temp = DEFAULT; // patch for selection debug
16312	17174	Globals.drawMode = temp; // WARNING
16313	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	+
16314	17187	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16315	17188
16316	17189	// trying different ways of getting the depth info over
..	..	@@ -16358,6 +17231,8 @@
16358	17231	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16359	17232	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16360	17233	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17234	+
	17235	+ CreateSelectedPoint();
16361	17236
16362	17237	// Will fit the mesh !!!
16363	17238	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16407,34 +17282,36 @@
16407	17282	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
16408	17283	}
16409	17284
16410		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17285	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16411	17286	}
16412	17287	}
16413	17288
16414	17289	if (!movingcamera && !PAINTMODE)
16415		- object.editWindow.ScreenFitPoint(); // fev 2014
	17290	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16416	17291
16417		- 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)
16418	17293	{
16419		- 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);
16420	17295
16421		- Object3D group = new Object3D("inst" + paintcount++);
	17296	+ if (object.GetWindow().copy.selection.Size() > 0)
	17297	+ {
	17298	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16422	17299
16423		- group.CreateMaterial(); // use a void leaf to select instances
16424		-
16425		- group.add(paintobj); // link
16426		-
16427		- object.editWindow.SnapObject(group);
16428		-
16429		- Object3D folder = object.editWindow.copy;
16430		-
16431		- if (object.editWindow.copy.selection.Size() > 0)
16432		- folder = object.editWindow.copy.selection.elementAt(0);
16433		-
16434		- folder.add(group);
16435		-
16436		- object.editWindow.ResetModel();
16437		- 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	+ }
16438	17315	}
16439	17316	else
16440	17317	paintcount = 0;
..	..	@@ -16473,6 +17350,11 @@
16473	17350	//System.out.println("objects[color] = " + objects[color]);
16474	17351	//objects[color].Select();
16475	17352	indexcount = 0;
	17353	+ ObjEditor window = object.GetWindow();
	17354	+ if (window != null && deselect)
	17355	+ {
	17356	+ window.Select(null, deselect, true);
	17357	+ }
16476	17358	object.Select(color, deselect);
16477	17359	}
16478	17360
..	..	@@ -16523,6 +17405,7 @@
16523	17405
16524	17406	public void init(GLAutoDrawable drawable)
16525	17407	{
	17408	+ if (Globals.DEBUG)
16526	17409	System.out.println("shadow buffer init");
16527	17410
16528	17411	GL gl = drawable.getGL();
..	..	@@ -16572,7 +17455,7 @@
16572	17455	gl.glDisable(gl.GL_CULL_FACE);
16573	17456	}
16574	17457
16575		- if (!RENDERSHADOW)
	17458	+ if (!Globals.RENDERSHADOW)
16576	17459	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16577	17460
16578	17461	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16582,7 +17465,7 @@
16582	17465	//gl.glColorMask(false, false, false, false);
16583	17466
16584	17467	//render_scene_from_light_view(gl, drawable, 0, 0);
16585		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17468	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16586	17469	{
16587	17470	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16588	17471
..	..	@@ -16751,10 +17634,14 @@
16751	17634	gl.glFlush();
16752	17635
16753	17636	/**/
16754		- 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);
16755	17638
16756		- float[] pixels = occlusionsizebuffer.array();
	17639	+ float[] depths = occlusiondepthbuffer.array();
16757	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	+
16758	17645	double r = 0, g = 0, b = 0;
16759	17646
16760	17647	double count = 0;
..	..	@@ -16765,7 +17652,7 @@
16765	17652
16766	17653	double FACTOR = 1;
16767	17654
16768		- for (int i = 0; i < pixels.length; i++)
	17655	+ for (int i = 0; i < depths.length; i++)
16769	17656	{
16770	17657	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
16771	17658	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -16848,7 +17735,7 @@
16848	17735
16849	17736	double scale = ray.z; // 1; // cos
16850	17737
16851		- float depth = pixels[newindex];
	17738	+ float depth = depths[newindex];
16852	17739
16853	17740	/*
16854	17741	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -16998,23 +17885,15 @@
16998	17885	int AAbuffersize = 0;
16999	17886
17000	17887	//double[] selectedpoint = new double[3];
17001		- static Superellipsoid selectedpoint = new Superellipsoid();
	17888	+ static Superellipsoid selectedpoint;
17002	17889	static Sphere previousselectedpoint = null;
17003		- static Sphere debugpointG = new Sphere();
17004		- static Sphere debugpointP = new Sphere();
17005		- static Sphere debugpointC = new Sphere();
17006		- static Sphere debugpointR = new Sphere();
	17890	+ static Sphere debugpointG;
	17891	+ static Sphere debugpointP;
	17892	+ static Sphere debugpointC;
	17893	+ static Sphere debugpointR;
17007	17894
17008	17895	static Sphere debugpoints[] = new Sphere[8];
17009	17896
17010		- static
17011		- {
17012		- for (int i=0; i<8; i++)
17013		- {
17014		- debugpoints[i] = new Sphere();
17015		- }
17016		- }
17017		-
17018	17897	static void InitPoints(float radius)
17019	17898	{
17020	17899	for (int i=0; i<8; i++)
..	..	@@ -17053,11 +17932,14 @@
17053	17932	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17054	17933	static IntBuffer bigAAbuffer;
17055	17934	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17056		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17935	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17057	17936	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17058	17937	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17059	17938	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17060		- 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	+
17061	17943	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17062	17944	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17063	17945	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();