~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,15 +532,18 @@
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);
474	544	LA.vecNormalize(obj.v2);
475		- gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	545	+
	546	+ SetGLNormal(gl, (float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
476	547	}
477	548
478	549	// P
..	..	@@ -494,7 +565,7 @@
494	565	y += ny * obj.NORMALPUSH;
495	566	z += nz * obj.NORMALPUSH;
496	567
497		- gl.glNormal3f(nx, ny, nz);
	568	+ SetGLNormal(gl, nx, ny, nz);
498	569	}
499	570	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
500	571	SetColor(obj, pv);
..	..	@@ -526,7 +597,7 @@
526	597	y += ny * obj.NORMALPUSH;
527	598	z += nz * obj.NORMALPUSH;
528	599
529		- gl.glNormal3f(nx, ny, nz);
	600	+ SetGLNormal(gl, nx, ny, nz);
530	601	}
531	602	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
532	603	// boolean locked = false;
..	..	@@ -574,7 +645,7 @@
574	645	y += ny * obj.NORMALPUSH;
575	646	z += nz * obj.NORMALPUSH;
576	647
577		- gl.glNormal3f(nx, ny, nz);
	648	+ SetGLNormal(gl, nx, ny, nz);
578	649	}
579	650
580	651	// if ((dot&4) == 0)
..	..	@@ -1180,10 +1251,10 @@
1180	1251	{
1181	1252	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1182	1253	{
1183		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1254	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1184	1255	} else
1185	1256	{
1186		- gl.glNormal3f(0, 0, 1);
	1257	+ SetGLNormal(gl, 0, 0, 1);
1187	1258	}
1188	1259
1189	1260	if (c != null)
..	..	@@ -1192,10 +1263,12 @@
1192	1263	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1264	}
1194	1265	}
	1266	+
1195	1267	if (flipV)
1196	1268	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1269	else
1198	1270	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1271	+
1199	1272	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1273	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1274
..	..	@@ -1205,20 +1278,22 @@
1205	1278	{
1206	1279	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1207	1280	{
1208		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1281	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1209	1282	} else
1210	1283	{
1211		- gl.glNormal3f(0, 0, 1);
	1284	+ SetGLNormal(gl, 0, 0, 1);
1212	1285	}
1213	1286	if (c != null)
1214	1287	{
1215	1288	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1289	}
1217	1290	}
	1291	+
1218	1292	if (flipV)
1219	1293	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1294	else
1221	1295	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1296	+
1222	1297	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1298	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1299
..	..	@@ -1231,10 +1306,10 @@
1231	1306	{
1232	1307	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1233	1308	{
1234		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1309	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1235	1310	} else
1236	1311	{
1237		- gl.glNormal3f(0, 0, 1);
	1312	+ SetGLNormal(gl, 0, 0, 1);
1238	1313	}
1239	1314	if (c != null)
1240	1315	{
..	..	@@ -1246,8 +1321,10 @@
1246	1321	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1322	else
1248	1323	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1324	+
1249	1325	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1326	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1327	+
1251	1328	count2 += 2;
1252	1329	count3 += 3;
1253	1330	}
..	..	@@ -1414,7 +1491,7 @@
1414	1491	{
1415	1492	if (!selectmode)
1416	1493	{
1417		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1494	+ SetGLNormal(gl, (float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
1418	1495	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1419	1496
1420	1497	if (flipV)
..	..	@@ -1426,6 +1503,8 @@
1426	1503	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1427	1504	}
1428	1505
	1506	+ float[] colorV = new float[4];
	1507	+
1429	1508	void SetColor(Object3D obj, Vertex p0)
1430	1509	{
1431	1510	CameraPane display = this;
..	..	@@ -1493,8 +1572,6 @@
1493	1572	{
1494	1573	return;
1495	1574	}
1496		-
1497		- float[] colorV = new float[3];
1498	1575
1499	1576	if (false) // marked)
1500	1577	{
..	..	@@ -1603,7 +1680,7 @@
1603	1680	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1681	}
1605	1682
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1683	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1684	{
1608	1685	CameraPane display = this;
1609	1686	//new Exception().printStackTrace();
..	..	@@ -1630,7 +1707,7 @@
1630	1707
1631	1708	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1632	1709
1633		- float[] colorV = GrafreeD.colorV;
	1710	+ float[] colorV = Grafreed.colorV;
1634	1711
1635	1712	/**/
1636	1713	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1638,7 +1715,7 @@
1638	1715	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1716	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1717	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1718	+ colorV[3] = 1; // material.opacity;
1642	1719
1643	1720	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1721	//System.out.println("Opacity = " + opacity);
..	..	@@ -1743,12 +1820,12 @@
1743	1820
1744	1821	display.modelParams7[0] = 0;
1745	1822	display.modelParams7[1] = 1000;
1746		- display.modelParams7[2] = 0;
	1823	+ display.modelParams7[2] = material.parallax;
1747	1824	display.modelParams7[3] = 0;
1748	1825
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1826	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1827
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1828	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1829	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1830	{
1754	1831	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1890,7 +1967,7 @@
1890	1967	void PushMatrix(double[][] matrix)
1891	1968	{
1892	1969	// GrafreeD.tracein(matrix);
1893		- PushMatrix(matrix,1);
	1970	+ PushMatrix(matrix, 1);
1894	1971	}
1895	1972
1896	1973	void PushMatrix()
..	..	@@ -1976,9 +2053,9 @@
1976	2053	switch(viewcode)
1977	2054	{
1978	2055	case 0: return "main";
1979		- case 1: return "one";
1980		- case 2: return "two";
1981		- case 3: return "three";
	2056	+ case 1: return "Red";
	2057	+ case 2: return "Green";
	2058	+ case 3: return "Blue";
1982	2059	case 4: return "light";
1983	2060	}
1984	2061
..	..	@@ -2044,7 +2121,7 @@
2044	2121	//System.err.println("Oeil on");
2045	2122	OEIL = true;
2046	2123	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2124	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2048	2125	//pingthread.StepToTarget(true);
2049	2126	}
2050	2127
..	..	@@ -2142,7 +2219,7 @@
2142	2219	System.err.println("LIVE = " + Globals.isLIVE());
2143	2220
2144	2221	if (!Globals.isLIVE()) // save sound
2145		- GrafreeD.savesound = true; // wav.save();
	2222	+ Grafreed.savesound = true; // wav.save();
2146	2223	// else
2147	2224	repaint(); // start loop // may 2013
2148	2225	}
..	..	@@ -2259,7 +2336,7 @@
2259	2336
2260	2337	void ToggleDebug()
2261	2338	{
2262		- DEBUG ^= true;
	2339	+ Globals.DEBUG ^= true;
2263	2340	}
2264	2341
2265	2342	void ToggleLookAt()
..	..	@@ -2267,9 +2344,9 @@
2267	2344	LOOKAT ^= true;
2268	2345	}
2269	2346
2270		- void ToggleRandom()
	2347	+ void ToggleSwitch()
2271	2348	{
2272		- RANDOM ^= true;
	2349	+ SWITCH ^= true;
2273	2350	}
2274	2351
2275	2352	void ToggleHandles()
..	..	@@ -2277,10 +2354,17 @@
2277	2354	HANDLES ^= true;
2278	2355	}
2279	2356
	2357	+ Object3D paintFolder;
	2358	+
2280	2359	void TogglePaint()
2281	2360	{
2282	2361	PAINTMODE ^= true;
2283	2362	paintcount = 0;
	2363	+
	2364	+ if (PAINTMODE)
	2365	+ {
	2366	+ paintFolder = GetFolder();
	2367	+ }
2284	2368	}
2285	2369
2286	2370	void SwapCamera(int a, int b)
..	..	@@ -2376,7 +2460,34 @@
2376	2460	{
2377	2461	return currentGL;
2378	2462	}
2379		-
	2463	+
	2464	+ static private BufferedImage CreateBim(TextureData texturedata)
	2465	+ {
	2466	+ Grafreed.Assert(texturedata != null);
	2467	+
	2468	+ int width = texturedata.getWidth();
	2469	+ int height = texturedata.getHeight();
	2470	+
	2471	+ Buffer buffer = texturedata.getBuffer();
	2472	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2473	+
	2474	+ byte[] bytes = bytebuf.array();
	2475	+
	2476	+ return CreateBim(bytes, width, height);
	2477	+ }
	2478	+
	2479	+ private void SetGLNormal(javax.media.opengl.GL gl, float nx, float ny, float nz)
	2480	+ {
	2481	+ gl.glNormal3f(nx, ny, nz);
	2482	+
	2483	+ if (ny > 0.9 \|\| ny < -0.9)
	2484	+ // Ground or ceiling
	2485	+ gl.glVertexAttrib3f(4, 1, 0, 0);
	2486	+ else
	2487	+ // Walls
	2488	+ gl.glVertexAttrib3f(4, 0, 1, 0);
	2489	+ }
	2490	+
2380	2491	/**/
2381	2492	class CacheTexture
2382	2493	{
..	..	@@ -2385,28 +2496,31 @@
2385	2496
2386	2497	int resolution;
2387	2498
2388		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2499	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2389	2500	{
2390		- texture = tex;
	2501	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2502	+ texturedata = texdata;
2391	2503	resolution = res;
2392	2504	}
2393	2505	}
2394	2506	/**/
2395	2507
2396	2508	// 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>();
	2509	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2510	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2511	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2512	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2513	+
2400	2514	int pigmentdepth = 0;
2401	2515	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2516	int bumpdepth = 0;
2403	2517	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2404	2518	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2405	2519	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2406		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2520	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2407	2521	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2408	2522
2409		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2523	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2410	2524	{
2411	2525	TextureData texturedata = null;
2412	2526
..	..	@@ -2416,7 +2530,7 @@
2416	2530	com.sun.opengl.util.texture.TextureIO.newTextureData(
2417	2531	getClass().getClassLoader().getResourceAsStream(name),
2418	2532	true,
2419		- com.sun.opengl.util.texture.TextureIO.PNG);
	2533	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2420	2534	} catch (java.io.IOException e)
2421	2535	{
2422	2536	throw new javax.media.opengl.GLException(e);
..	..	@@ -2425,13 +2539,34 @@
2425	2539	if (bump)
2426	2540	texturedata = ConvertBump(texturedata, false);
2427	2541
2428		- com.sun.opengl.util.texture.Texture texture =
2429		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2542	+// com.sun.opengl.util.texture.Texture texture =
	2543	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2430	2544
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);
	2545	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2546	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2433	2547
2434		- return texture;
	2548	+ return texturedata;
	2549	+ }
	2550	+
	2551	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2552	+ {
	2553	+ TextureData texturedata = null;
	2554	+
	2555	+ try
	2556	+ {
	2557	+ texturedata =
	2558	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2559	+ bim,
	2560	+ true);
	2561	+ } catch (Exception e)
	2562	+ {
	2563	+ throw new javax.media.opengl.GLException(e);
	2564	+ }
	2565	+
	2566	+ if (bump)
	2567	+ texturedata = ConvertBump(texturedata, false);
	2568	+
	2569	+ return texturedata;
2435	2570	}
2436	2571
2437	2572	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3504,6 +3639,8 @@
3504	3639
3505	3640	System.out.println("LOADING TEXTURE : " + name);
3506	3641
	3642	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3643	+
3507	3644	//
3508	3645	if (false) // compressbit > 0)
3509	3646	{
..	..	@@ -4208,6 +4345,7 @@
4208	4345
4209	4346	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4210	4347	{
	4348	+ new Exception().printStackTrace();
4211	4349	System.exit(0);
4212	4350	com.sun.opengl.util.texture.Texture texture = null;
4213	4351
..	..	@@ -7901,7 +8039,7 @@
7901	8039	String pigment = Object3D.GetPigment(tex);
7902	8040	String bump = Object3D.GetBump(tex);
7903	8041
7904		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8042	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7905	8043	{
7906	8044	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7907	8045	// System.out.println("; bump = " + bump);
..	..	@@ -7916,11 +8054,69 @@
7916	8054	pigment = null;
7917	8055	}
7918	8056
7919		- ReleaseTexture(bump, true);
7920		- ReleaseTexture(pigment, false);
	8057	+ ReleaseTexture(tex, true);
	8058	+ ReleaseTexture(tex, false);
7921	8059	}
7922	8060
7923		- void ReleaseTexture(String tex, boolean bump)
	8061	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8062	+ {
	8063	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8064	+ {
	8065	+ return;
	8066	+ }
	8067	+
	8068	+ if (tex == null)
	8069	+ {
	8070	+ ReleaseTexture(null, false);
	8071	+ return;
	8072	+ }
	8073	+
	8074	+ String pigment = Object3D.GetPigment(tex);
	8075	+
	8076	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8077	+ {
	8078	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8079	+ // System.out.println("; bump = " + bump);
	8080	+ }
	8081	+
	8082	+ if (pigment.equals(""))
	8083	+ {
	8084	+ pigment = null;
	8085	+ }
	8086	+
	8087	+ ReleaseTexture(tex, false);
	8088	+ }
	8089	+
	8090	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8091	+ {
	8092	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8093	+ {
	8094	+ return;
	8095	+ }
	8096	+
	8097	+ if (tex == null)
	8098	+ {
	8099	+ ReleaseTexture(null, true);
	8100	+ return;
	8101	+ }
	8102	+
	8103	+ String bump = Object3D.GetBump(tex);
	8104	+
	8105	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8106	+ {
	8107	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8108	+ // System.out.println("; bump = " + bump);
	8109	+ }
	8110	+
	8111	+ if (bump.equals(""))
	8112	+ {
	8113	+ bump = null;
	8114	+ }
	8115	+
	8116	+ ReleaseTexture(tex, true);
	8117	+ }
	8118	+
	8119	+ void ReleaseTexture(cTexture tex, boolean bump)
7924	8120	{
7925	8121	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7926	8122	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7931,7 +8127,7 @@
7931	8127	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7932	8128
7933	8129	if (tex != null)
7934		- texture = textures.get(tex);
	8130	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7935	8131
7936	8132	// //assert( texture != null );
7937	8133	// if (texture == null)
..	..	@@ -8023,7 +8219,55 @@
8023	8219	}
8024	8220	}
8025	8221
8026		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8222	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8223	+ {
	8224	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8225	+// ambientOcclusion ) // \|\| !textureon)
	8226	+// {
	8227	+// return; // false;
	8228	+// }
	8229	+//
	8230	+// if (tex == null)
	8231	+// {
	8232	+// BindTexture(null,false,resolution);
	8233	+// BindTexture(null,true,resolution);
	8234	+// return;
	8235	+// }
	8236	+//
	8237	+// String pigment = Object3D.GetPigment(tex);
	8238	+// String bump = Object3D.GetBump(tex);
	8239	+//
	8240	+// usedtextures.add(pigment);
	8241	+// usedtextures.add(bump);
	8242	+//
	8243	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8244	+// {
	8245	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8246	+// // System.out.println("; bump = " + bump);
	8247	+// }
	8248	+//
	8249	+// if (bump.equals(""))
	8250	+// {
	8251	+// bump = null;
	8252	+// }
	8253	+// if (pigment.equals(""))
	8254	+// {
	8255	+// pigment = null;
	8256	+// }
	8257	+//
	8258	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8259	+// BindTexture(pigment, false, resolution);
	8260	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8261	+// BindTexture(bump, true, resolution);
	8262	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8263	+//
	8264	+// return; // true;
	8265	+
	8266	+ BindPigmentTexture(tex, resolution);
	8267	+ BindBumpTexture(tex, resolution);
	8268	+ }
	8269	+
	8270	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8027	8271	{
8028	8272	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8029	8273	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8034,17 +8278,47 @@
8034	8278	if (tex == null)
8035	8279	{
8036	8280	BindTexture(null,false,resolution);
8037		- BindTexture(null,true,resolution);
8038	8281	return;
8039	8282	}
8040	8283
8041	8284	String pigment = Object3D.GetPigment(tex);
	8285	+
	8286	+ usedtextures.add(tex);
	8287	+
	8288	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8289	+ {
	8290	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8291	+ // System.out.println("; bump = " + bump);
	8292	+ }
	8293	+
	8294	+ if (pigment.equals(""))
	8295	+ {
	8296	+ pigment = null;
	8297	+ }
	8298	+
	8299	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8300	+ BindTexture(tex, false, resolution);
	8301	+ }
	8302	+
	8303	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8304	+ {
	8305	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8306	+ ambientOcclusion ) // \|\| !textureon)
	8307	+ {
	8308	+ return; // false;
	8309	+ }
	8310	+
	8311	+ if (tex == null)
	8312	+ {
	8313	+ BindTexture(null,true,resolution);
	8314	+ return;
	8315	+ }
	8316	+
8042	8317	String bump = Object3D.GetBump(tex);
8043	8318
8044		- usedtextures.put(pigment, pigment);
8045		- usedtextures.put(bump, bump);
	8319	+ usedtextures.add(tex);
8046	8320
8047		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8321	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8048	8322	{
8049	8323	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8050	8324	// System.out.println("; bump = " + bump);
..	..	@@ -8054,43 +8328,94 @@
8054	8328	{
8055	8329	bump = null;
8056	8330	}
8057		- if (pigment.equals(""))
8058		- {
8059		- pigment = null;
8060		- }
8061	8331
8062		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8063		- BindTexture(pigment, false, resolution);
8064	8332	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8065		- BindTexture(bump, true, resolution);
	8333	+ BindTexture(tex, true, resolution);
8066	8334	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8067		-
8068		- return; // true;
8069	8335	}
8070	8336
8071		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8337	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8338	+
	8339	+ private boolean FileExists(String tex)
8072	8340	{
8073		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8341	+ if (missingTextures.contains(tex))
	8342	+ {
	8343	+ return false;
	8344	+ }
	8345	+
	8346	+ boolean fileExists = new File(tex).exists();
	8347	+
	8348	+ if (!fileExists)
	8349	+ {
	8350	+ // If file exists, the "new File()" is not executed sgain
	8351	+ missingTextures.add(tex);
	8352	+ }
	8353	+
	8354	+ return fileExists;
	8355	+ }
	8356	+
	8357	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8358	+ {
	8359	+ CacheTexture texturecache = null;
8074	8360
8075	8361	if (tex != null)
8076	8362	{
8077		- String texname = tex;
	8363	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8364	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8078	8365
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;
	8366	+ if (texname.equals("") && texdata == null)
	8367	+ {
	8368	+ return null;
	8369	+ }
	8370	+
	8371	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8372	+
	8373	+// String[] split = tex.split("Textures");
	8374	+// if (split.length > 1)
	8375	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8376	+// else
	8377	+// if (!texname.startsWith("/"))
	8378	+// texname = "/Users/nbriere/Textures/" + texname;
	8379	+ if (!FileExists(texname) && !texname.startsWith("@"))
	8380	+ {
	8381	+ texname = fallbackTextureName;
	8382	+ }
8085	8383
8086	8384	if (CACHETEXTURE)
8087		- texture = textures.get(texname); // TEXTURE CACHE
8088		-
8089		- TextureData texturedata = null;
8090		-
8091		- if (texture == null \|\| texture.resolution < resolution)
8092	8385	{
8093		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8386	+ if (texdata == null)
	8387	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8388	+ else
	8389	+ texturecache = bimtextures.get(texdata);
	8390	+ }
	8391	+
	8392	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8393	+ {
	8394	+ TextureData texturedata = null;
	8395	+
	8396	+ if (texdata != null && textureon)
	8397	+ {
	8398	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8399	+
	8400	+ try
	8401	+ {
	8402	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8403	+ }
	8404	+ catch (Exception e)
	8405	+ {
	8406	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8407	+ }
	8408	+
	8409	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8410	+ bimtextures.put(texdata, texturecache);
	8411	+
	8412	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8413	+
	8414	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8415	+ //bim2 = bim;
	8416	+ }
	8417	+ else
	8418	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8094	8419	{
8095	8420	assert(!bump);
8096	8421	// if (bump)
..	..	@@ -8101,19 +8426,23 @@
8101	8426	// }
8102	8427	// else
8103	8428	// {
8104		- texture = textures.get(tex);
8105		- if (texture == null)
	8429	+ // texturecache = textures.get(texname); // suspicious
	8430	+ if (texturecache == null)
8106	8431	{
8107		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8432	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8108	8433	}
	8434	+ else
	8435	+ new Exception().printStackTrace();
8109	8436	// }
8110	8437	} else
8111		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8438	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8112	8439	{
8113	8440	assert(bump);
8114		- texture = textures.get(tex);
8115		- if (texture == null)
8116		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8441	+ // texturecache = textures.get(texname); // suspicious
	8442	+ if (texturecache == null)
	8443	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8444	+ else
	8445	+ new Exception().printStackTrace();
8117	8446	} else
8118	8447	{
8119	8448	//if (tex.equals("IMMORTAL"))
..	..	@@ -8121,11 +8450,22 @@
8121	8450	// texture = GetResourceTexture("default.png");
8122	8451	//} else
8123	8452	//{
8124		- if (tex.equals("WHITE_NOISE"))
	8453	+ if (texname.endsWith("WHITE_NOISE"))
8125	8454	{
8126		- texture = textures.get(tex);
8127		- if (texture == null)
8128		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8455	+ // texturecache = textures.get(texname); // suspicious
	8456	+ if (texturecache == null)
	8457	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8458	+ else
	8459	+ new Exception().printStackTrace();
	8460	+ } else
	8461	+ {
	8462	+ if (texname.startsWith("@"))
	8463	+ {
	8464	+ // texturecache = textures.get(texname); // suspicious
	8465	+ if (texturecache == null)
	8466	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8467	+ else
	8468	+ new Exception().printStackTrace();
8129	8469	} else
8130	8470	{
8131	8471	if (textureon)
..	..	@@ -8150,7 +8490,7 @@
8150	8490	}
8151	8491
8152	8492	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8153		- if (!new File(cachename).exists())
	8493	+ if (!FileExists(cachename))
8154	8494	cachename = texname;
8155	8495	else
8156	8496	processbump = false; // don't process bump map again
..	..	@@ -8172,7 +8512,7 @@
8172	8512	}
8173	8513
8174	8514	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8175		- if (!new File(cachename).exists())
	8515	+ if (!FileExists(cachename))
8176	8516	cachename = texname;
8177	8517	else
8178	8518	processbump = false; // don't process bump map again
..	..	@@ -8181,20 +8521,23 @@
8181	8521	texturedata = GetFileTexture(cachename, processbump, resolution);
8182	8522
8183	8523
8184		- if (texturedata != null)
8185		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8524	+ if (texturedata == null)
	8525	+ throw new Exception();
	8526	+
	8527	+ texturecache = new CacheTexture(texturedata,resolution);
8186	8528	//texture = GetTexture(tex, bump);
8187	8529	}
	8530	+ }
8188	8531	}
8189	8532	//}
8190	8533	}
8191	8534
8192		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8535	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8193	8536	{
8194	8537	//return false;
8195	8538
8196	8539	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8197		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8540	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8198	8541	{
8199	8542	// String ext = "_highres";
8200	8543	// if (REDUCETEXTURE)
..	..	@@ -8211,52 +8554,17 @@
8211	8554	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8212	8555	if (!cachefile.exists())
8213	8556	{
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))
	8557	+ //if (texturedata.getWidth() == texturedata.getHeight())
8223	8558	{
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);
	8559	+ BufferedImage rendImage = CreateBim(texturedata);
	8560	+
8254	8561	ImageWriter writer = null;
8255	8562	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8256	8563	if (iter.hasNext()) {
8257	8564	writer = (ImageWriter)iter.next();
8258	8565	}
8259		- float compressionQuality = 0.9f;
	8566	+
	8567	+ float compressionQuality = 0.85f;
8260	8568	try
8261	8569	{
8262	8570	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8273,18 +8581,20 @@
8273	8581	}
8274	8582	}
8275	8583	}
8276		-
	8584	+
	8585	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8586	+
8277	8587	//System.out.println("Texture = " + tex);
8278		- if (textures.containsKey(texname))
	8588	+ if (textures.containsKey(tex))
8279	8589	{
8280		- CacheTexture thetex = textures.get(texname);
	8590	+ CacheTexture thetex = textures.get(tex);
8281	8591	thetex.texture.disable();
8282	8592	thetex.texture.dispose();
8283		- textures.remove(texname);
	8593	+ textures.remove(tex);
8284	8594	}
8285	8595
8286		- texture.texturedata = texturedata;
8287		- textures.put(texname, texture);
	8596	+ //texture.texturedata = texturedata;
	8597	+ textures.put(tex, texturecache);
8288	8598
8289	8599	// newtex = true;
8290	8600	}
..	..	@@ -8300,10 +8610,44 @@
8300	8610	}
8301	8611	}
8302	8612
8303		- return texture;
	8613	+ return texturecache;
8304	8614	}
8305	8615
8306		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8616	+ static void EmbedTextures(cTexture tex)
	8617	+ {
	8618	+ if (tex.pigmentdata == null)
	8619	+ {
	8620	+ //String texname = Object3D.GetPigment(tex);
	8621	+
	8622	+ CacheTexture texturecache = texturepigment.get(tex);
	8623	+
	8624	+ if (texturecache != null)
	8625	+ {
	8626	+ tex.pw = texturecache.texturedata.getWidth();
	8627	+ tex.ph = texturecache.texturedata.getHeight();
	8628	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8629	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8630	+ ;
	8631	+ //, tex.pw, tex.ph), 0.5f);
	8632	+ }
	8633	+ }
	8634	+
	8635	+ if (tex.bumpdata == null)
	8636	+ {
	8637	+ //String texname = Object3D.GetBump(tex);
	8638	+
	8639	+ CacheTexture texturecache = texturebump.get(tex);
	8640	+
	8641	+ if (texturecache != null)
	8642	+ {
	8643	+ tex.bw = texturecache.texturedata.getWidth();
	8644	+ tex.bh = texturecache.texturedata.getHeight();
	8645	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8646	+ }
	8647	+ }
	8648	+ }
	8649	+
	8650	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8307	8651	{
8308	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8309	8653
..	..	@@ -8321,21 +8665,21 @@
8321	8665	return texture!=null?texture.texture:null;
8322	8666	}
8323	8667
8324		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8668	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8325	8669	{
8326	8670	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8327	8671
8328	8672	return texture!=null?texture.texturedata:null;
8329	8673	}
8330	8674
8331		- boolean BindTexture(String tex, boolean bump, int resolution)
	8675	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8332	8676	{
8333	8677	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8334	8678	{
8335	8679	return false;
8336	8680	}
8337	8681
8338		- boolean newtex = false;
	8682	+ //boolean newtex = false;
8339	8683
8340	8684	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8341	8685
..	..	@@ -8367,9 +8711,75 @@
8367	8711	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8368	8712	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8369	8713
8370		- return newtex;
	8714	+ return true; // Warning: not used.
8371	8715	}
8372	8716
	8717	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8718	+ {
	8719	+ try
	8720	+ {
	8721	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8722	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8723	+ ImageWriter writer = writers.next();
	8724	+
	8725	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8726	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8727	+ param.setCompressionQuality(quality);
	8728	+
	8729	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8730	+ writer.setOutput(ios);
	8731	+ writer.write(null, new IIOImage(image, null, null), param);
	8732	+
	8733	+ byte[] data = baos.toByteArray();
	8734	+ writer.dispose();
	8735	+ return data;
	8736	+ }
	8737	+ catch (Exception e)
	8738	+ {
	8739	+ e.printStackTrace();
	8740	+ return null;
	8741	+ }
	8742	+ }
	8743	+
	8744	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8745	+ {
	8746	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8747	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8748	+ ImageReader reader = writers.next();
	8749	+
	8750	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8751	+
	8752	+ ImageReadParam param = reader.getDefaultReadParam();
	8753	+ param.setDestination(bim);
	8754	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8755	+
	8756	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8757	+ reader.setInput(ios);
	8758	+ BufferedImage bim2 = reader.read(0, param);
	8759	+ reader.dispose();
	8760	+
	8761	+// WritableRaster raster = bim2.getRaster();
	8762	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8763	+// byte[] bytes = data.getData();
	8764	+//
	8765	+// int[] pixels = new int[bytes.length/3];
	8766	+// for (int i=pixels.length; --i>=0;)
	8767	+// {
	8768	+// int i3 = i*3;
	8769	+// pixels[i] = 0xFF;
	8770	+// pixels[i] <<= 8;
	8771	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8772	+// pixels[i] <<= 8;
	8773	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8774	+// pixels[i] <<= 8;
	8775	+// pixels[i] \|= bytes[i3] & 0xFF;
	8776	+// }
	8777	+//
	8778	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8779	+
	8780	+ return bim;
	8781	+ }
	8782	+
8373	8783	ShadowBuffer shadowPBuf;
8374	8784	AntialiasBuffer antialiasPBuf;
8375	8785	int MAXSTACK;
..	..	@@ -8386,10 +8796,12 @@
8386	8796
8387	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8388	8798	MAXSTACK = temp[0];
8389		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8390	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8391	8802	MAXSTACK = temp[0];
8392		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8393	8805
8394	8806	// Use debug pipeline
8395	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8397,7 +8809,8 @@
8397	8809	gl = drawable.getGL(); //
8398	8810
8399	8811	GL gl3 = getGL();
8400		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8401	8814
8402	8815
8403	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8562,7 +8975,7 @@
8562	8975
8563	8976	if (cubemap == null)
8564	8977	{
8565		- LoadEnvy(5);
	8978	+ //LoadEnvy(1);
8566	8979	}
8567	8980
8568	8981	//cubemap.enable();
..	..	@@ -8838,6 +9251,8 @@
8838	9251
8839	9252	void LoadEnvy(int which)
8840	9253	{
	9254	+ assert(false);
	9255	+
8841	9256	String name;
8842	9257	String ext;
8843	9258
..	..	@@ -8849,37 +9264,58 @@
8849	9264	cubemap = null;
8850	9265	return;
8851	9266	case 1:
8852		- name = "cubemaps/box_";
8853		- ext = "png";
	9267	+ name = "cubemaps/rgb/";
	9268	+ ext = "jpg";
8854	9269	reverseUP = false;
8855	9270	break;
8856	9271	case 2:
8857		- name = "cubemaps/uffizi_";
8858		- ext = "png";
8859		- break; // reverseUP = true; break;
	9272	+ name = "cubemaps/uffizi/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
8860	9276	case 3:
8861		- name = "cubemaps/CloudyHills_";
8862		- ext = "tga";
	9277	+ name = "cubemaps/CloudyHills/";
	9278	+ ext = "jpg";
8863	9279	reverseUP = false;
8864	9280	break;
8865	9281	case 4:
8866		- name = "cubemaps/cornell_";
	9282	+ name = "cubemaps/cornell/";
8867	9283	ext = "png";
8868	9284	reverseUP = false;
8869	9285	break;
	9286	+ case 5:
	9287	+ name = "cubemaps/skycube/";
	9288	+ ext = "jpg";
	9289	+ reverseUP = false;
	9290	+ break;
	9291	+ case 6:
	9292	+ name = "cubemaps/SaintLazarusChurch3/";
	9293	+ ext = "jpg";
	9294	+ reverseUP = false;
	9295	+ break;
	9296	+ case 7:
	9297	+ name = "cubemaps/Sodermalmsallen/";
	9298	+ ext = "jpg";
	9299	+ reverseUP = false;
	9300	+ break;
	9301	+ case 8:
	9302	+ name = "cubemaps/Sodermalmsallen2/";
	9303	+ ext = "jpg";
	9304	+ reverseUP = false;
	9305	+ break;
	9306	+ case 9:
	9307	+ name = "cubemaps/UnionSquare/";
	9308	+ ext = "jpg";
	9309	+ reverseUP = false;
	9310	+ break;
8870	9311	default:
8871		- name = "cubemaps/rgb_";
8872		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9312	+ name = "cubemaps/box/";
	9313	+ ext = "png"; /mipmap = true;/
	9314	+ reverseUP = false;
8873	9315	break;
8874	9316	}
8875		-
8876		- try
8877		- {
8878		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8879		- } catch (IOException e)
8880		- {
8881		- throw new RuntimeException(e);
8882		- }
	9317	+
	9318	+ LoadSkybox(name, ext, mipmap);
8883	9319	}
8884	9320
8885	9321	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8911,8 +9347,12 @@
8911	9347	static double[] model = new double[16];
8912	9348	double[] camera2light = new double[16];
8913	9349	double[] light2camera = new double[16];
8914		- int newenvy = -1;
8915		- boolean envyoff = true; // false;
	9350	+
	9351	+ //int newenvy = -1;
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
	9355	+
8916	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8917	9357	//float[] light0 = { 0,0,0 };
8918	9358	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9205,11 +9645,35 @@
9205	9645	jy8[3] = 0.5f;
9206	9646	}
9207	9647
9208		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9648	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9209	9649	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9210	9650	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9211	9651	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9212	9652
	9653	+ void ResetOptions()
	9654	+ {
	9655	+ options1[0] = 100;
	9656	+ options1[1] = 0.025f;
	9657	+ options1[2] = 0.01f;
	9658	+ options1[3] = 0;
	9659	+ options1[4] = 0;
	9660	+
	9661	+ options2[0] = 0;
	9662	+ options2[1] = 0.75f;
	9663	+ options2[2] = 0;
	9664	+ options2[3] = 0;
	9665	+
	9666	+ options3[0] = 1;
	9667	+ options3[1] = 1;
	9668	+ options3[2] = 1;
	9669	+ options3[3] = 0;
	9670	+
	9671	+ options4[0] = 1;
	9672	+ options4[1] = 0;
	9673	+ options4[2] = 1;
	9674	+ options4[3] = 0;
	9675	+ }
	9676	+
9213	9677	static int imagecount = 0; // movie generation
9214	9678
9215	9679	static int jitter = 0;
..	..	@@ -9305,8 +9769,8 @@
9305	9769	assert (parentcam != renderCamera);
9306	9770
9307	9771	if (renderCamera != lightCamera)
9308		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9309		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9772	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9773	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9310	9774
9311	9775	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9312	9776
..	..	@@ -9321,8 +9785,8 @@
9321	9785	LA.matCopy(renderCamera.fromScreen, matrix);
9322	9786
9323	9787	if (renderCamera != lightCamera)
9324		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9325		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9788	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9789	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9326	9790
9327	9791	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9328	9792
..	..	@@ -9368,10 +9832,12 @@
9368	9832	rati = 1 / rati;
9369	9833	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9370	9834	}
9371		- assert (newenvy == -1);
	9835	+
	9836	+ //assert (newenvy == -1);
	9837	+
9372	9838	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9373	9839	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9374		- DrawSkyBox(gl);
	9840	+ DrawSkyBox(gl, (float)rati);
9375	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9376	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9377	9843	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -9394,7 +9860,7 @@
9394	9860	//gl.glFlush();
9395	9861	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9396	9862
9397		- if (ANIMATION && ABORTED)
	9863	+ if (Globals.ANIMATION && ABORTED)
9398	9864	{
9399	9865	System.err.println(" ABORTED FRAME");
9400	9866	break;
..	..	@@ -9424,7 +9890,7 @@
9424	9890	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9425	9891
9426	9892	// save image
9427		- if (ANIMATION && !ABORTED)
	9893	+ if (Globals.ANIMATION && !ABORTED)
9428	9894	{
9429	9895	VPwidth = viewport[2];
9430	9896	VPheight = viewport[3];
..	..	@@ -9535,11 +10001,11 @@
9535	10001
9536	10002	// imagecount++;
9537	10003
9538		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	10004	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9539	10005
9540	10006	if (!BOXMODE)
9541	10007	{
9542		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	10008	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9543	10009	}
9544	10010
9545	10011	if (!BOXMODE)
..	..	@@ -9577,7 +10043,7 @@
9577	10043	ABORTED = false;
9578	10044	}
9579	10045	else
9580		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10046	+ Grafreed.wav.cursor += 735 * ACSIZE;
9581	10047
9582	10048	if (false)
9583	10049	{
..	..	@@ -10237,14 +10703,23 @@
10237	10703	static boolean init = false;
10238	10704
10239	10705	double[][] matrix = LA.newMatrix();
	10706	+
	10707	+ // This is to refresh the UI of the material panel.
	10708	+ ObjEditor patchMaterial;
10240	10709
10241	10710	public void display(GLAutoDrawable drawable)
10242	10711	{
10243		- if (GrafreeD.savesound && GrafreeD.hassound)
	10712	+ if (patchMaterial.patchMaterial)
10244	10713	{
10245		- GrafreeD.wav.save();
10246		- GrafreeD.savesound = false;
10247		- GrafreeD.hassound = false;
	10714	+ patchMaterial.patchMaterial = false;
	10715	+ patchMaterial.objectPanel.setSelectedIndex(1);
	10716	+ }
	10717	+
	10718	+ if (Grafreed.savesound && Grafreed.hassound)
	10719	+ {
	10720	+ Grafreed.wav.save();
	10721	+ Grafreed.savesound = false;
	10722	+ Grafreed.hassound = false;
10248	10723	}
10249	10724	// if (DEBUG_SELECTION)
10250	10725	// {
..	..	@@ -10320,6 +10795,7 @@
10320	10795	ANTIALIAS = 0;
10321	10796	//System.out.println("RESTART");
10322	10797	AAtimer.restart();
	10798	+ Globals.TIMERRUNNING = true;
10323	10799	}
10324	10800	}
10325	10801	}
..	..	@@ -10374,7 +10850,7 @@
10374	10850	Object3D theobject = object;
10375	10851	Object3D theparent = object.parent;
10376	10852	object.parent = null;
10377		- object = (Object3D)GrafreeD.clone(object);
	10853	+ object = (Object3D)Grafreed.clone(object);
10378	10854	object.Stripify();
10379	10855	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10380	10856	theobject.PreprocessOcclusion(this);
..	..	@@ -10387,13 +10863,14 @@
10387	10863	ambientOcclusion = false;
10388	10864	}
10389	10865
10390		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10866	+ if (//Globals.lighttouched &&
	10867	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10391	10868	{
10392	10869	//if (RENDERSHADOW) // ?
10393	10870	if (!IsFrozen())
10394	10871	{
10395	10872	// dec 2012
10396		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10873	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10397	10874	{
10398	10875	Globals.framecount++;
10399	10876	shadowbuffer.display();
..	..	@@ -10406,7 +10883,7 @@
10406	10883
10407	10884	if (wait)
10408	10885	{
10409		- Sleep(500);
	10886	+ Sleep(200); // blocks everything
10410	10887
10411	10888	wait = false;
10412	10889	}
..	..	@@ -10520,8 +10997,8 @@
10520	10997
10521	10998	// if (parentcam != renderCamera) // not a light
10522	10999	if (cam != lightCamera)
10523		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10524		- LA.matConcat(matrix, parentcam.toParent, matrix);
	11000	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11001	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10525	11002
10526	11003	for (int j = 0; j < 4; j++)
10527	11004	{
..	..	@@ -10535,8 +11012,8 @@
10535	11012
10536	11013	// if (parentcam != renderCamera) // not a light
10537	11014	if (cam != lightCamera)
10538		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10539		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	11015	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11016	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10540	11017
10541	11018	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10542	11019
..	..	@@ -10622,13 +11099,43 @@
10622	11099	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10623	11100	}
10624	11101
10625		- if (newenvy > -1)
	11102	+// if (newenvy > -1)
	11103	+// {
	11104	+// LoadEnvy(newenvy);
	11105	+// }
	11106	+//
	11107	+// newenvy = -1;
	11108	+
	11109	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10626	11110	{
10627		- LoadEnvy(newenvy);
	11111	+ if (cubemaprgb == null)
	11112	+ {
	11113	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11114	+ }
	11115	+
	11116	+ cubemap = cubemaprgb;
10628	11117	}
10629		-
10630		- newenvy = -1;
10631		-
	11118	+ else
	11119	+ {
	11120	+ if (object.skyboxname != null)
	11121	+ {
	11122	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11123	+ {
	11124	+ if (cubemap != null && cubemap != cubemaprgb)
	11125	+ cubemap.dispose();
	11126	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11127	+ loadedskyboxname = object.skyboxname;
	11128	+ }
	11129	+ }
	11130	+ else
	11131	+ {
	11132	+ cubemapcustom = null;
	11133	+ loadedskyboxname = null;
	11134	+ }
	11135	+
	11136	+ cubemap = cubemapcustom;
	11137	+ }
	11138	+
10632	11139	ratio = ((double) getWidth()) / getHeight();
10633	11140	//System.out.println("ratio = " + ratio);
10634	11141
..	..	@@ -10644,7 +11151,7 @@
10644	11151
10645	11152	if (!IsFrozen() && !ambientOcclusion)
10646	11153	{
10647		- DrawSkyBox(gl);
	11154	+ DrawSkyBox(gl, (float)ratio);
10648	11155	}
10649	11156
10650	11157	//if (selection_view == -1)
..	..	@@ -10795,7 +11302,16 @@
10795	11302	// Bump noise
10796	11303	gl.glActiveTexture(GL.GL_TEXTURE6);
10797	11304	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10798		- BindTexture(NOISE_TEXTURE, false, 2);
	11305	+
	11306	+ try
	11307	+ {
	11308	+ BindTexture(NOISE_TEXTURE, false, 2);
	11309	+ }
	11310	+ catch (Exception e)
	11311	+ {
	11312	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11313	+ }
	11314	+
10799	11315
10800	11316	gl.glActiveTexture(GL.GL_TEXTURE0);
10801	11317	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10818,9 +11334,9 @@
10818	11334
10819	11335	gl.glMatrixMode(GL.GL_MODELVIEW);
10820	11336
10821		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10822		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10823		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11337	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11338	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11339	+gl.glEnable(gl.GL_MULTISAMPLE);
10824	11340	} else
10825	11341	{
10826	11342	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10831,7 +11347,7 @@
10831	11347	//System.out.println("BLENDING ON");
10832	11348	gl.glEnable(GL.GL_BLEND);
10833	11349	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10834		-
	11350	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10835	11351	gl.glMatrixMode(gl.GL_PROJECTION);
10836	11352	gl.glLoadIdentity();
10837	11353
..	..	@@ -10920,8 +11436,8 @@
10920	11436	System.err.println("parentcam != renderCamera");
10921	11437
10922	11438	// if (cam != lightCamera)
10923		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10924		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11439	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11440	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10925	11441	}
10926	11442
10927	11443	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10942,8 +11458,8 @@
10942	11458	if (true) // TODO
10943	11459	{
10944	11460	if (cam != lightCamera)
10945		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10946		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11461	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11462	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10947	11463	}
10948	11464
10949	11465	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11080,7 +11596,7 @@
11080	11596	}
11081	11597	}
11082	11598
11083		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11599	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11084	11600	{
11085	11601	//gl.glDepthFunc(GL.GL_LEQUAL);
11086	11602	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11088,24 +11604,21 @@
11088	11604
11089	11605	boolean texon = textureon;
11090	11606
11091		- if (RENDERPROGRAM > 0)
11092		- {
11093		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11094		- textureon = false;
11095		- }
	11607	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11608	+ textureon = false;
	11609	+
11096	11610	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11097	11611	//System.out.println("ALLO");
11098	11612	gl.glColorMask(false, false, false, false);
11099	11613	DrawObject(gl);
11100		- if (RENDERPROGRAM > 0)
11101		- {
11102		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11103		- textureon = texon;
11104		- }
	11614	+
	11615	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11616	+ textureon = texon;
	11617	+
11105	11618	gl.glColorMask(true, true, true, true);
11106	11619
11107	11620	gl.glDepthFunc(GL.GL_EQUAL);
11108		- //gl.glDepthMask(false);
	11621	+ gl.glDepthMask(false);
11109	11622	}
11110	11623
11111	11624	if (false) // DrawMode() == SHADOW)
..	..	@@ -11259,8 +11772,14 @@
11259	11772	{
11260	11773	renderpass++;
11261	11774	// System.out.println("Draw object... ");
	11775	+ STEP = 1;
11262	11776	if (FAST) // in case there is no script
11263		- STEP = 16;
	11777	+ STEP = 8;
	11778	+
	11779	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11780	+ {
	11781	+ STEP *= 4;
	11782	+ }
11264	11783
11265	11784	//object.FullInvariants();
11266	11785
..	..	@@ -11274,23 +11793,44 @@
11274	11793	e.printStackTrace();
11275	11794	}
11276	11795
11277		- if (GrafreeD.RENDERME > 0)
11278		- GrafreeD.RENDERME--; // mechante magouille
	11796	+ if (Grafreed.RENDERME > 0)
	11797	+ Grafreed.RENDERME--; // mechante magouille
11279	11798
11280	11799	Globals.ONESTEP = false;
11281	11800	}
11282	11801
11283	11802	static boolean zoomonce = false;
11284	11803
	11804	+ static void CreateSelectedPoint()
	11805	+ {
	11806	+ if (selectedpoint == null)
	11807	+ {
	11808	+ debugpointG = new Sphere();
	11809	+ debugpointP = new Sphere();
	11810	+ debugpointC = new Sphere();
	11811	+ debugpointR = new Sphere();
	11812	+
	11813	+ selectedpoint = new Superellipsoid();
	11814	+
	11815	+ for (int i=0; i<8; i++)
	11816	+ {
	11817	+ debugpoints[i] = new Sphere();
	11818	+ }
	11819	+ }
	11820	+ }
	11821	+
11285	11822	void DrawObject(GL gl, boolean draw)
11286	11823	{
	11824	+ // To clear camera values
	11825	+ ResetOptions();
	11826	+
11287	11827	//System.out.println("DRAW OBJECT " + mouseDown);
11288	11828	// DrawMode() = SELECTION;
11289	11829	//GL gl = getGL();
11290	11830	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11291	11831	{
11292	11832	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11293		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11833	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11294	11834	pingthread.StepToTarget(true); // true);
11295	11835	// zoomonce = false;
11296	11836	}
..	..	@@ -11345,7 +11885,14 @@
11345	11885
11346	11886	usedtextures.clear();
11347	11887
11348		- BindTextures(DEFAULT_TEXTURES, 2);
	11888	+ try
	11889	+ {
	11890	+ BindTextures(DEFAULT_TEXTURES, 2);
	11891	+ }
	11892	+ catch (Exception e)
	11893	+ {
	11894	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11895	+ }
11349	11896	}
11350	11897	//System.out.println("--> " + stackdepth);
11351	11898	// GrafreeD.traceon();
..	..	@@ -11355,8 +11902,9 @@
11355	11902
11356	11903	if (DrawMode() == DEFAULT)
11357	11904	{
11358		- if (DEBUG)
	11905	+ if (Globals.DEBUG)
11359	11906	{
	11907	+ CreateSelectedPoint();
11360	11908	float radius = 0.05f;
11361	11909	if (selectedpoint.radius != radius)
11362	11910	{
..	..	@@ -11410,20 +11958,32 @@
11410	11958	ReleaseTextures(DEFAULT_TEXTURES);
11411	11959
11412	11960	if (CLEANCACHE)
11413		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11961	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11414	11962	{
11415		- String tex = e.nextElement();
	11963	+ cTexture tex = e.nextElement();
11416	11964
11417	11965	// System.out.println("Texture --------- " + tex);
11418	11966
11419		- if (tex.equals("WHITE_NOISE"))
	11967	+ if (tex.equals("WHITE_NOISE:"))
11420	11968	continue;
11421	11969
11422		- if (!usedtextures.containsKey(tex))
	11970	+ if (!usedtextures.contains(tex))
11423	11971	{
	11972	+ CacheTexture gettex = texturepigment.get(tex);
11424	11973	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11425		- textures.get(tex).texture.dispose();
11426		- textures.remove(tex);
	11974	+ if (gettex != null)
	11975	+ {
	11976	+ gettex.texture.dispose();
	11977	+ texturepigment.remove(tex);
	11978	+ }
	11979	+
	11980	+ gettex = texturebump.get(tex);
	11981	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11982	+ if (gettex != null)
	11983	+ {
	11984	+ gettex.texture.dispose();
	11985	+ texturebump.remove(tex);
	11986	+ }
11427	11987	}
11428	11988	}
11429	11989	}
..	..	@@ -11436,7 +11996,14 @@
11436	11996	if (checker != null && DrawMode() == DEFAULT)
11437	11997	{
11438	11998	//BindTexture(IMMORTAL_TEXTURE);
11439		- BindTextures(checker.GetTextures(), checker.texres);
	11999	+ try
	12000	+ {
	12001	+ BindTextures(checker.GetTextures(), checker.texres);
	12002	+ }
	12003	+ catch (Exception e)
	12004	+ {
	12005	+ System.err.println("FAILED: " + checker.GetTextures());
	12006	+ }
11440	12007	// NEAREST
11441	12008	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11442	12009	DrawChecker(gl);
..	..	@@ -11518,7 +12085,7 @@
11518	12085	return;
11519	12086	}
11520	12087
11521		- String string = obj.GetToolTip();
	12088	+ String string = obj.toString(); //.GetToolTip();
11522	12089
11523	12090	GL gl = GetGL();
11524	12091
..	..	@@ -11835,8 +12402,8 @@
11835	12402	//obj.TransformToWorld(light, light);
11836	12403	for (int i = tp.size(); --i >= 0;)
11837	12404	{
11838		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11839		- LA.xformPos(light, tp.get(i).toParent, light);
	12405	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12406	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11840	12407	}
11841	12408
11842	12409
..	..	@@ -11853,8 +12420,8 @@
11853	12420	parentcam = cameras[0];
11854	12421	}
11855	12422
11856		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11857		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12423	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12424	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11858	12425
11859	12426	LA.xformPos(light, renderCamera.toScreen, light);
11860	12427
..	..	@@ -11944,8 +12511,76 @@
11944	12511
11945	12512	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11946	12513
11947		- String program =
	12514	+ String programmin =
	12515	+ // Min shader
11948	12516	"!!ARBfp1.0\n" +
	12517	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12518	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12519	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12520	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12521	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12522	+ "PARAM light2cam0 = program.env[10];" +
	12523	+ "PARAM light2cam1 = program.env[11];" +
	12524	+ "PARAM light2cam2 = program.env[12];" +
	12525	+ "TEMP temp;" +
	12526	+ "TEMP light;" +
	12527	+ "TEMP ndotl;" +
	12528	+ "TEMP normal;" +
	12529	+ "TEMP depth;" +
	12530	+ "TEMP eye;" +
	12531	+ "TEMP pos;" +
	12532	+
	12533	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12534	+ Normalize("normal") +
	12535	+ "MOV light, state.light[0].position;" +
	12536	+ "DP3 ndotl.x, light, normal;" +
	12537	+
	12538	+ // shadow
	12539	+ "MOV pos, fragment.texcoord[1];" +
	12540	+ "MOV temp, pos;" +
	12541	+ ShadowTextureFetch("depth", "temp", "1") +
	12542	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12543	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12544	+
	12545	+ // No shadow when out of frustum
	12546	+ //"SGE temp.y, depth.z, zero123.y;" +
	12547	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12548	+
	12549	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12550	+
	12551	+ // Backlit
	12552	+ "MOV pos.w, zero123.y;" +
	12553	+ "DP4 eye.x, pos, light2cam0;" +
	12554	+ "DP4 eye.y, pos, light2cam1;" +
	12555	+ "DP4 eye.z, pos, light2cam2;" +
	12556	+ Normalize("eye") +
	12557	+
	12558	+ "DP3 ndotl.y, -eye, normal;" +
	12559	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12560	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12561	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12562	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12563	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12564	+
	12565	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12566	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12567	+
	12568	+ // Pigment
	12569	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12570	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12571	+ "MUL temp, temp, ndotl.x;" +
	12572	+
	12573	+ "MUL temp, temp, zero123.z;" +
	12574	+
	12575	+ //"MUL temp, temp, ndotl.y;" +
	12576	+
	12577	+ "MOV temp.w, zero123.y;" + // reset alpha
	12578	+ "MOV result.color, temp;" +
	12579	+ "END";
	12580	+
	12581	+ String programmax =
	12582	+ "!!ARBfp1.0\n" +
	12583	+
11949	12584	//"OPTION ARB_fragment_program_shadow;" +
11950	12585	"PARAM light2cam0 = program.env[10];" +
11951	12586	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -11971,7 +12606,7 @@
11971	12606	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
11972	12607	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
11973	12608	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
11974		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12609	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
11975	12610	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
11976	12611	"PARAM options1 = program.env[62];" + // fog rgb color
11977	12612	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12060,8 +12695,7 @@
12060	12695	"TEMP shininess;" +
12061	12696	"\n" +
12062	12697	"MOV texSamp, one;" +
12063		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12064		-
	12698	+
12065	12699	"MOV mapgrid.x, one2048th.x;" +
12066	12700	"MOV temp, fragment.texcoord[1];" +
12067	12701	/*
..	..	@@ -12082,20 +12716,20 @@
12082	12716	"MUL temp, floor, mapgrid.x;" +
12083	12717	//"TEX depth0, temp, texture[1], 2D;" +
12084	12718	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12085		- TextureFetch("depth0", "temp", "1") +
	12719	+ ShadowTextureFetch("depth0", "temp", "1") +
12086	12720	"") +
12087	12721	"ADD temp.x, temp.x, mapgrid.x;" +
12088	12722	//"TEX depth1, temp, texture[1], 2D;" +
12089	12723	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12090		- TextureFetch("depth1", "temp", "1") +
	12724	+ ShadowTextureFetch("depth1", "temp", "1") +
12091	12725	"") +
12092	12726	"ADD temp.y, temp.y, mapgrid.x;" +
12093	12727	//"TEX depth2, temp, texture[1], 2D;" +
12094		- TextureFetch("depth2", "temp", "1") +
	12728	+ ShadowTextureFetch("depth2", "temp", "1") +
12095	12729	"SUB temp.x, temp.x, mapgrid.x;" +
12096	12730	//"TEX depth3, temp, texture[1], 2D;" +
12097	12731	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12098		- TextureFetch("depth3", "temp", "1") +
	12732	+ ShadowTextureFetch("depth3", "temp", "1") +
12099	12733	"") +
12100	12734	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12101	12735	//"MOV params, material;" +
..	..	@@ -12217,7 +12851,7 @@
12217	12851	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12218	12852	// mar 2013 ??? "KIL alpha.a;" +
12219	12853	"MOV alpha, texSamp.aaaa;" + // y;" +
12220		- "KIL alpha.a;" +
	12854	+ "KIL alpha.a;" + // not sure with parallax mapping
12221	12855	/*
12222	12856	"MUL temp.xy, temp, two;" +
12223	12857	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12303,11 +12937,6 @@
12303	12937	"SUB bump0, bump0, half;" +
12304	12938	"ADD bump, bump, bump0;" +
12305	12939
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	12940	// double-sided
12312	12941	/**/
12313	12942	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12324,19 +12953,62 @@
12324	12953	"MOV normald, normal;" +
12325	12954	"MOV normals, normal;" +
12326	12955
	12956	+ "MOV temp, fragment.texcoord[4];" +
	12957	+
12327	12958	// UV base
12328	12959	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12329	12960	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12330	12961	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12331		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12332		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12333		- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
	12962	+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
	12963	+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
	12964	+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
	12965	+ Normalize("UP") +
	12966	+
12334	12967	"XPD V, normal, UP;" +
12335	12968	Normalize("V") +
12336	12969	"XPD U, V, normal;" +
12337	12970	Normalize("U") +
12338	12971
12339	12972	// parallax mapping
	12973	+
	12974	+ "DP3 temp2.x, V, eye;" +
	12975	+ "DP3 temp2.y, U, eye;" +
	12976	+ "DP3 temp2.z, normal, eye;" +
	12977	+ "RCP temp2.z, temp2.z;" +
	12978	+
	12979	+ "DP3 temp2.w, texSamp, texSamp;" + // Height
	12980	+ "RSQ temp2.w, temp2.w;" +
	12981	+ "RCP temp2.w, temp2.w;" +
	12982	+
	12983	+ "SUB temp2.w, temp2.w, half;" +
	12984	+// "SGE temp.x, temp2.w, eps.x;" +
	12985	+// "MUL temp2.w, temp2.w, temp.x;" +
	12986	+
	12987	+ //"MOV texSamp, U;" +
	12988	+
	12989	+ "MUL temp2.z, temp2.z, temp2.w;" +
	12990	+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
	12991	+
	12992	+ "MUL temp2, temp2, temp2.z;" +
	12993	+
	12994	+ "MOV temp, fragment.texcoord[0];" +
	12995	+
	12996	+ "SUB temp, temp, temp2;" +
	12997	+
	12998	+ "TEX temp, temp, texture[0], 2D;" +
	12999	+ "POW temp.a, temp.a, params6.w;" + // punch through
	13000	+
	13001	+ "ADD texSamp, temp, texSamp;" +
	13002	+ "MUL texSamp.xyz, half, texSamp;" +
	13003	+
	13004	+ "MOV alpha, texSamp.aaaa;" +
	13005	+
	13006	+// parallax mapping
	13007	+
	13008	+ "MOV temp.x, texSamp.a;" +
	13009	+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
	13010	+ //"LRP texSamp0, params5.x, texSamp0, one;" +
	13011	+ "MOV texSamp.a, temp.x;" +
12340	13012
12341	13013	//"MOV temp, fragment.texcoord[0];" +
12342	13014	//
..	..	@@ -12466,10 +13138,10 @@
12466	13138	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12467	13139	"") +
12468	13140
12469		- // display shadow only (bump == 0)
	13141	+ // display shadow only (fakedepth == 0)
12470	13142	"SUB temp.x, half.x, shadow.x;" +
12471		- "MOV temp.y, -params6.x;" +
12472		- "SLT temp.z, temp.y, zero.x;" +
	13143	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13144	+ "SLT temp.z, temp.y, -c256i.x;" +
12473	13145	"SUB temp.y, one.x, temp.z;" +
12474	13146	"MUL temp.x, temp.x, temp.y;" +
12475	13147	"KIL temp.x;" +
..	..	@@ -12598,8 +13270,10 @@
12598	13270	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12599	13271
12600	13272	"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
	13273	+ // Tuning for default skin
	13274	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13275	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13276	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12603	13277	"MUL temp.x, temp.x, temp.y;" +
12604	13278
12605	13279	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12798,8 +13472,19 @@
12798	13472	//once = true;
12799	13473	}
12800	13474
12801		- System.out.print("Program #" + mode + "; length = " + program.length());
12802		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13475	+ String program = programmax;
	13476	+
	13477	+ if (Globals.MINSHADER)
	13478	+ {
	13479	+ program = programmin;
	13480	+ }
	13481	+
	13482	+ if (Globals.DEBUG)
	13483	+ {
	13484	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13485	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13486	+ }
	13487	+
12803	13488	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12804	13489
12805	13490	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12846,7 +13531,8 @@
12846	13531	"\n" +
12847	13532	"END\n";
12848	13533
12849		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13534	+ if (Globals.DEBUG)
	13535	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
12850	13536	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12851	13537
12852	13538	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12891,25 +13577,26 @@
12891	13577	return out;
12892	13578	}
12893	13579
12894		- String TextureFetch(String dest, String src, String unit)
	13580	+ // Also does frustum culling
	13581	+ String ShadowTextureFetch(String dest, String src, String unit)
12895	13582	{
12896	13583	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12897	13584	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12898	13585	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13586	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13587	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12899	13588	"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;" +
	13589	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13590	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12904	13591	//"SWZ buffer, temp, w,w,w,w;";
12905		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13592	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12906	13593	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12907	13594	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12908	13595	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12909		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13596	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12910	13597
12911		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12912		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13598	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13599	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12913	13600	}
12914	13601
12915	13602	String Shadow(String depth, String shadow)
..	..	@@ -12931,12 +13618,16 @@
12931	13618
12932	13619	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12933	13620	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13621	+
	13622	+ // Compare fragment depth in light space with shadowmap.
12934	13623	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12935	13624	"SGE temp.y, temp.x, zero.x;" +
12936		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13625	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13626	+
	13627	+ // Reverse comparison
12937	13628	"SUB temp.x, one.x, temp.x;" +
12938	13629	"MUL " + shadow + ".x, temp.x, temp.y;" +
12939		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13630	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12940	13631	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12941	13632
12942	13633	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12950,6 +13641,10 @@
12950	13641	// No shadow for backface
12951	13642	"DP3 temp.x, normal, lightd;" +
12952	13643	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13644	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13645	+
	13646	+ // No shadow when out of frustum
	13647	+ "SGE temp.x, " + depth + ".z, one.z;" +
12953	13648	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12954	13649	"";
12955	13650	}
..	..	@@ -13095,8 +13790,9 @@
13095	13790	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13096	13791	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13097	13792	/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;
	13793	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
	13794	+
	13795	+ //Object3D.cVector2[] vector2buffer;
13100	13796
13101	13797	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13102	13798	// OUT : diff, spec
..	..	@@ -13112,9 +13808,10 @@
13112	13808	"DP3 " + dest + ".z," + "normals," + "eye;" +
13113	13809	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13114	13810	//"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;" +
	13811	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13812	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13813	+
	13814	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13118	13815	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13119	13816	"RCP " + dest + ".w," + dest + ".w;" +
13120	13817	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13260,7 +13957,7 @@
13260	13957	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13261	13958	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13262	13959	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13263		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	13960	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13264	13961	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13265	13962	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13266	13963	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13321,7 +14018,7 @@
13321	14018	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13322	14019	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13323	14020	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13324		- //"MOV result.texcoord, vertex.texcoord;" +
	14021	+ //"MOV result.texcoord, vertex.fogcoord;" +
13325	14022	"MOV result.texcoord, temp;" +
13326	14023	// border fade
13327	14024	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13368,7 +14065,9 @@
13368	14065
13369	14066	//"ADD temp.z, temp.z, one;" +
13370	14067
13371		- "MOV result.color, temp;"
	14068	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14069	+
	14070	+ "MOV result.color, temp;" // Normal
13372	14071	: "MOV result.color, vertex.color;") +
13373	14072	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13374	14073	: "") +
..	..	@@ -13508,7 +14207,7 @@
13508	14207	public void mousePressed(MouseEvent e)
13509	14208	{
13510	14209	//System.out.println("mousePressed: " + e);
13511		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14210	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13512	14211	}
13513	14212
13514	14213	static long prevtime = 0;
..	..	@@ -13584,8 +14283,8 @@
13584	14283	// mode \|= META;
13585	14284	//}
13586	14285
13587		- SetMouseMode(WHEEL \| e.getModifiersEx());
13588		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14286	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14287	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13589	14288	anchorX = ax;
13590	14289	anchorY = ay;
13591	14290	prevX = px;
..	..	@@ -13619,6 +14318,7 @@
13619	14318	else
13620	14319	if (evt.getSource() == AAtimer)
13621	14320	{
	14321	+ Globals.TIMERRUNNING = false;
13622	14322	if (mouseDown)
13623	14323	{
13624	14324	//new Exception().printStackTrace();
..	..	@@ -13644,6 +14344,10 @@
13644	14344	// LIVE = waslive;
13645	14345	// wasliveok = true;
13646	14346	// waslive = false;
	14347	+
	14348	+ // May 2019 Forget it:
	14349	+ if (true)
	14350	+ return;
13647	14351
13648	14352	// source == timer
13649	14353	if (mouseDown)
..	..	@@ -13674,7 +14378,7 @@
13674	14378
13675	14379	// fev 2014???
13676	14380	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13677		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14381	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13678	14382	pingthread.StepToTarget(true); // true);
13679	14383	}
13680	14384	// if (!LIVE)
..	..	@@ -13683,12 +14387,13 @@
13683	14387
13684	14388	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13685	14389
13686		- void clickStart(int x, int y, int modifiers)
	14390	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13687	14391	{
13688	14392	if (!wasliveok)
13689	14393	return;
13690	14394
13691	14395	AAtimer.restart(); //
	14396	+ Globals.TIMERRUNNING = true;
13692	14397
13693	14398	// waslive = LIVE;
13694	14399	// LIVE = false;
..	..	@@ -13700,7 +14405,7 @@
13700	14405	// touched = true; // main DL
13701	14406	if (isRenderer)
13702	14407	{
13703		- SetMouseMode(modifiers);
	14408	+ SetMouseMode(modifiers, modifiersex);
13704	14409	}
13705	14410
13706	14411	selectX = anchorX = x;
..	..	@@ -13713,7 +14418,7 @@
13713	14418	clicked = true;
13714	14419	hold = false;
13715	14420
13716		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14421	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13717	14422	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13718	14423	{
13719	14424	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13738,14 +14443,15 @@
13738	14443	drag = false;
13739	14444	//System.out.println("Mouse DOWN");
13740	14445	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);
	14446	+ //ClickInfo info = new ClickInfo();
	14447	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14448	+ object.clickInfo.pane = this;
	14449	+ object.clickInfo.camera = renderCamera;
	14450	+ object.clickInfo.x = x;
	14451	+ object.clickInfo.y = y;
	14452	+ object.clickInfo.modifiers = modifiersex;
	14453	+ editObj = object.doEditClick(//info,
	14454	+ 0);
13749	14455	if (!editObj)
13750	14456	{
13751	14457	hasMarquee = true;
..	..	@@ -13761,9 +14467,12 @@
13761	14467
13762	14468	public void mouseDragged(MouseEvent e)
13763	14469	{
	14470	+ Globals.MOUSEDRAGGED = true;
	14471	+
13764	14472	//System.out.println("mouseDragged: " + e);
13765	14473	if (isRenderer)
13766	14474	movingcamera = true;
	14475	+
13767	14476	//if (drawing)
13768	14477	//return;
13769	14478	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13773,7 +14482,7 @@
13773	14482	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13774	14483	}
13775	14484	else
13776		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14485	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13777	14486
13778	14487	//try { Thread.sleep(1); } catch (Exception ex) {}
13779	14488	}
..	..	@@ -13946,6 +14655,7 @@
13946	14655
13947	14656	public void run()
13948	14657	{
	14658	+ new Exception().printStackTrace();
13949	14659	System.exit(0);
13950	14660	for (;;)
13951	14661	{
..	..	@@ -14009,7 +14719,7 @@
14009	14719	{
14010	14720	Globals.lighttouched = true;
14011	14721	}
14012		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14722	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14013	14723	}
14014	14724	//else
14015	14725	}
..	..	@@ -14023,12 +14733,18 @@
14023	14733	void GoDown(int mod)
14024	14734	{
14025	14735	MODIFIERS \|= COMMAND;
14026		- /*
	14736	+ boolean isVR = (mouseMode&VR)!=0;
	14737	+ /**/
14027	14738	if((mod&SHIFT) == SHIFT)
14028		- manipCamera.RotatePosition(0, -speed);
	14739	+ {
	14740	+ if (isVR)
	14741	+ manipCamera.RotateInterest(0, -speed);
	14742	+ else
	14743	+ manipCamera.RotatePosition(0, -speed);
	14744	+ }
14029	14745	else
14030		- manipCamera.BackForth(0, -speed*delta, getWidth());
14031		- */
	14746	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	14747	+ /**/
14032	14748	if ((mod & SHIFT) == SHIFT)
14033	14749	{
14034	14750	mouseMode = mouseMode; // VR??
..	..	@@ -14037,6 +14753,8 @@
14037	14753	mouseMode \|= BACKFORTH;
14038	14754	}
14039	14755
	14756	+ targetLookAt.set(manipCamera.lookAt);
	14757	+
14040	14758	//prevX = X = anchorX;
14041	14759	prevY = Y = anchorY - (int) (renderCamera.Distance());
14042	14760	}
..	..	@@ -14044,12 +14762,19 @@
14044	14762	void GoUp(int mod)
14045	14763	{
14046	14764	MODIFIERS \|= COMMAND;
14047		- /*
	14765	+ /**/
	14766	+ boolean isVR = (mouseMode&VR)!=0;
	14767	+
14048	14768	if((mod&SHIFT) == SHIFT)
14049		- manipCamera.RotatePosition(0, speed);
	14769	+ {
	14770	+ if (isVR)
	14771	+ manipCamera.RotateInterest(0, speed);
	14772	+ else
	14773	+ manipCamera.RotatePosition(0, speed);
	14774	+ }
14050	14775	else
14051		- manipCamera.BackForth(0, speed*delta, getWidth());
14052		- */
	14776	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	14777	+ /**/
14053	14778	if ((mod & SHIFT) == SHIFT)
14054	14779	{
14055	14780	mouseMode = mouseMode;
..	..	@@ -14058,6 +14783,8 @@
14058	14783	mouseMode \|= BACKFORTH;
14059	14784	}
14060	14785
	14786	+ targetLookAt.set(manipCamera.lookAt);
	14787	+
14061	14788	//prevX = X = anchorX;
14062	14789	prevY = Y = anchorY + (int) (renderCamera.Distance());
14063	14790	}
..	..	@@ -14065,12 +14792,17 @@
14065	14792	void GoLeft(int mod)
14066	14793	{
14067	14794	MODIFIERS \|= COMMAND;
14068		- /*
	14795	+ /**/
14069	14796	if((mod&SHIFT) == SHIFT)
14070		- manipCamera.RotatePosition(speed, 0);
	14797	+ manipCamera.Translate(speed*delta, 0, getWidth());
14071	14798	else
14072		- manipCamera.Translate(speed*delta, 0, getWidth());
14073		- */
	14799	+ {
	14800	+ if ((mouseMode&VR)!=0)
	14801	+ manipCamera.RotateInterest(-speed, 0);
	14802	+ else
	14803	+ manipCamera.RotatePosition(speed, 0);
	14804	+ }
	14805	+ /**/
14074	14806	if ((mod & SHIFT) == SHIFT)
14075	14807	{
14076	14808	mouseMode = mouseMode;
..	..	@@ -14079,6 +14811,8 @@
14079	14811	mouseMode \|= ROTATE;
14080	14812	} // TRANSLATE;
14081	14813
	14814	+ targetLookAt.set(manipCamera.lookAt);
	14815	+
14082	14816	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14083	14817	prevY = Y = anchorY;
14084	14818	}
..	..	@@ -14086,12 +14820,18 @@
14086	14820	void GoRight(int mod)
14087	14821	{
14088	14822	MODIFIERS \|= COMMAND;
14089		- /*
	14823	+ /**/
14090	14824	if((mod&SHIFT) == SHIFT)
14091		- manipCamera.RotatePosition(-speed, 0);
	14825	+ manipCamera.Translate(-speed*delta, 0, getWidth());
14092	14826	else
14093		- manipCamera.Translate(-speed*delta, 0, getWidth());
14094		- */
	14827	+ {
	14828	+ if ((mouseMode&VR)!=0)
	14829	+ manipCamera.RotateInterest(speed, 0);
	14830	+ else
	14831	+ manipCamera.RotatePosition(-speed, 0);
	14832	+ }
	14833	+
	14834	+ /**/
14095	14835	if ((mod & SHIFT) == SHIFT)
14096	14836	{
14097	14837	mouseMode = mouseMode;
..	..	@@ -14100,6 +14840,8 @@
14100	14840	mouseMode \|= ROTATE;
14101	14841	} // TRANSLATE;
14102	14842
	14843	+ targetLookAt.set(manipCamera.lookAt);
	14844	+
14103	14845	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14104	14846	prevY = Y = anchorY;
14105	14847	}
..	..	@@ -14109,7 +14851,7 @@
14109	14851	int X, Y;
14110	14852	boolean SX, SY;
14111	14853
14112		- void drag(int x, int y, int modifiers)
	14854	+ void drag(int x, int y, int modifiers, int modifiersex)
14113	14855	{
14114	14856	if (IsFrozen())
14115	14857	{
..	..	@@ -14118,17 +14860,17 @@
14118	14860
14119	14861	drag = true; // NEW
14120	14862
14121		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14863	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14122	14864
14123	14865	X = x;
14124	14866	Y = y;
14125	14867	// floating state for animation
14126		- MODIFIERS = modifiers;
14127		- modifiers &= ~1024;
	14868	+ MODIFIERS = modifiersex;
	14869	+ modifiersex &= ~1024;
14128	14870	if (false) // modifiers != 0)
14129	14871	{
14130	14872	//new Exception().printStackTrace();
14131		- System.out.println("mouseDragged: " + modifiers);
	14873	+ System.out.println("mouseDragged: " + modifiersex);
14132	14874	System.out.println("SHIFT = " + SHIFT);
14133	14875	System.out.println("CONTROL = " + COMMAND);
14134	14876	System.out.println("META = " + META);
..	..	@@ -14141,14 +14883,16 @@
14141	14883	if (editObj)
14142	14884	{
14143	14885	drag = true;
14144		- ClickInfo info = new ClickInfo();
14145		- info.bounds.setBounds(0, 0,
	14886	+ //ClickInfo info = new ClickInfo();
	14887	+ object.clickInfo.bounds.setBounds(0, 0,
14146	14888	(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);
	14889	+ object.clickInfo.pane = this;
	14890	+ object.clickInfo.camera = renderCamera;
	14891	+ object.clickInfo.x = x;
	14892	+ object.clickInfo.y = y;
	14893	+ object //.GetWindow().copy
	14894	+ .doEditDrag(//info,
	14895	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14152	14896	} else
14153	14897	{
14154	14898	if (x < startX)
..	..	@@ -14297,22 +15041,27 @@
14297	15041	}
14298	15042	}
14299	15043
	15044	+// ClickInfo clickInfo = new ClickInfo();
	15045	+
14300	15046	public void mouseMoved(MouseEvent e)
14301	15047	{
14302	15048	//System.out.println("mouseMoved: " + e);
14303	15049	if (isRenderer)
14304	15050	return;
14305	15051
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;
	15052	+ // Mouse cursor feedback
	15053	+ object.clickInfo.x = e.getX();
	15054	+ object.clickInfo.y = e.getY();
	15055	+ object.clickInfo.modifiers = e.getModifiersEx();
	15056	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15057	+ object.clickInfo.pane = this;
	15058	+ object.clickInfo.camera = renderCamera;
14313	15059	if (!isRenderer)
14314	15060	{
14315		- if (object.editWindow.copy.doEditClick(ci, 0))
	15061	+ //ObjEditor editWindow = object.editWindow;
	15062	+ //Object3D copy = editWindow.copy;
	15063	+ if (object.doEditClick(//clickInfo,
	15064	+ 0))
14316	15065	{
14317	15066	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14318	15067	} else
..	..	@@ -14324,7 +15073,11 @@
14324	15073
14325	15074	public void mouseReleased(MouseEvent e)
14326	15075	{
	15076	+ Globals.MOUSEDRAGGED = false;
	15077	+
14327	15078	movingcamera = false;
	15079	+ X = 0; // getBounds().width/2;
	15080	+ Y = 0; // getBounds().height/2;
14328	15081	//System.out.println("mouseReleased: " + e);
14329	15082	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14330	15083	}
..	..	@@ -14347,9 +15100,9 @@
14347	15100	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14348	15101	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14349	15102
14350		- if (control \|\| command \|\| IsFrozen())
	15103	+// No delay if (control \|\| command \|\| IsFrozen())
14351	15104	timeout = true;
14352		- else
	15105	+// ?? May 2019 else
14353	15106	// timer.setDelay((modifiers & 128) != 0?0:350);
14354	15107	mouseDown = false;
14355	15108	if (!control && !command) // june 2013
..	..	@@ -14459,7 +15212,7 @@
14459	15212	System.out.println("keyReleased: " + e);
14460	15213	}
14461	15214
14462		- void SetMouseMode(int modifiers)
	15215	+ void SetMouseMode(int modifiers, int modifiersex)
14463	15216	{
14464	15217	//System.out.println("SetMouseMode = " + modifiers);
14465	15218	//modifiers &= ~1024;
..	..	@@ -14471,25 +15224,25 @@
14471	15224	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14472	15225	// return;
14473	15226	//System.out.println("SetMode = " + modifiers);
14474		- if ((modifiers & WHEEL) == WHEEL)
	15227	+ if ((modifiersex & WHEEL) == WHEEL)
14475	15228	{
14476	15229	mouseMode \|= ZOOM;
14477	15230	}
14478	15231
14479	15232	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14480		- if (capsLocked \|\| (modifiers & META) == META)
	15233	+ if (capsLocked) // \|\| (modifiers & META) == META)
14481	15234	{
14482	15235	mouseMode \|= VR; // BACKFORTH;
14483	15236	}
14484		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15237	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14485	15238	{
14486	15239	mouseMode \|= SELECT;
14487	15240	}
14488		- if ((modifiers & COMMAND) == COMMAND)
	15241	+ if ((modifiersex & COMMAND) == COMMAND)
14489	15242	{
14490	15243	mouseMode \|= SELECT;
14491	15244	}
14492		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15245	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14493	15246	{
14494	15247	mouseMode &= ~VR;
14495	15248	mouseMode \|= TRANSLATE;
..	..	@@ -14518,7 +15271,7 @@
14518	15271
14519	15272	if (isRenderer) //
14520	15273	{
14521		- SetMouseMode(modifiers);
	15274	+ SetMouseMode(0, modifiers);
14522	15275	}
14523	15276
14524	15277	Globals.theRenderer.keyPressed(key);
..	..	@@ -14580,7 +15333,8 @@
14580	15333	// break;
14581	15334	case 'T':
14582	15335	CACHETEXTURE ^= true;
14583		- textures.clear();
	15336	+ texturepigment.clear();
	15337	+ texturebump.clear();
14584	15338	// repaint();
14585	15339	break;
14586	15340	case 'Y':
..	..	@@ -14590,8 +15344,8 @@
14590	15344	case 'K':
14591	15345	KOMPACTTEXTURE ^= true;
14592	15346	//textures.clear();
14593		- break;
14594		- case 'P': // Texture Projection macros
	15347	+ // break;
	15348	+ //case 'P': // Texture Projection macros
14595	15349	// SAVETEXTURE ^= true;
14596	15350	macromode = true;
14597	15351	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -14665,7 +15419,9 @@
14665	15419	case 'E' : COMPACT ^= true;
14666	15420	repaint();
14667	15421	break;
14668		- case 'W' : DEBUGHSB ^= true;
	15422	+ case 'W' : // Wide Window (fullscreen)
	15423	+ //DEBUGHSB ^= true;
	15424	+ ObjEditor.theFrame.ToggleFullScreen();
14669	15425	repaint();
14670	15426	break;
14671	15427	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14690,8 +15446,8 @@
14690	15446	RevertCamera();
14691	15447	repaint();
14692	15448	break;
14693		- case 'L':
14694	15449	case 'l':
	15450	+ //case 'L':
14695	15451	if (lightMode)
14696	15452	{
14697	15453	lightMode = false;
..	..	@@ -14710,7 +15466,7 @@
14710	15466	targetLookAt.set(manipCamera.lookAt);
14711	15467	repaint();
14712	15468	break;
14713		- case 'p':
	15469	+ case 'P': // p':
14714	15470	// c'est quoi ca au juste? spherical ^= true;
14715	15471	Skinshader ^= true; programInitialized = false;
14716	15472	repaint();
..	..	@@ -14755,20 +15511,24 @@
14755	15511	OCCLUSION_CULLING ^= true;
14756	15512	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14757	15513	break;
14758		- case '0': envyoff ^= true; repaint(); break;
	15514	+ //case '0': envyoff ^= true; repaint(); break;
14759	15515	case '1':
14760	15516	case '2':
14761	15517	case '3':
14762	15518	case '4':
14763	15519	case '5':
14764		- newenvy = Character.getNumericValue(key);
14765		- repaint();
14766		- break;
14767	15520	case '6':
14768	15521	case '7':
14769	15522	case '8':
14770	15523	case '9':
14771		- BGcolor = (key - '6')/3.f;
	15524	+ if (true) // envyoff)
	15525	+ {
	15526	+ BGcolor = (key - '1')/8.f;
	15527	+ }
	15528	+ else
	15529	+ {
	15530	+ //newenvy = Character.getNumericValue(key);
	15531	+ }
14772	15532	repaint();
14773	15533	break;
14774	15534	case '!':
..	..	@@ -14834,9 +15594,9 @@
14834	15594	case '_':
14835	15595	kompactbit = 5;
14836	15596	break;
14837		- case '+':
14838		- kompactbit = 6;
14839		- break;
	15597	+// case '+':
	15598	+// kompactbit = 6;
	15599	+// break;
14840	15600	case ' ':
14841	15601	lightMode ^= true;
14842	15602	Globals.lighttouched = true;
..	..	@@ -14848,13 +15608,14 @@
14848	15608	case ESC:
14849	15609	RENDERPROGRAM += 1;
14850	15610	RENDERPROGRAM %= 3;
	15611	+
14851	15612	repaint();
14852	15613	break;
14853	15614	case 'Z':
14854	15615	//RESIZETEXTURE ^= true;
14855	15616	//break;
14856	15617	case 'z':
14857		- RENDERSHADOW ^= true;
	15618	+ Globals.RENDERSHADOW ^= true;
14858	15619	Globals.lighttouched = true;
14859	15620	repaint();
14860	15621	break;
..	..	@@ -14887,8 +15648,9 @@
14887	15648	case DELETE:
14888	15649	ClearSelection();
14889	15650	break;
14890		- /*
14891	15651	case '+':
	15652	+
	15653	+ /*
14892	15654	//fontsize += 1;
14893	15655	bbzoom *= 2;
14894	15656	repaint();
..	..	@@ -14905,17 +15667,17 @@
14905	15667	case '=':
14906	15668	IncDepth();
14907	15669	//fontsize += 1;
14908		- object.editWindow.refreshContents(true);
	15670	+ object.GetWindow().refreshContents(true);
14909	15671	maskbit = 6;
14910	15672	break;
14911	15673	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14912	15674	DecDepth();
14913	15675	maskbit = 5;
14914	15676	//if(fontsize > 1) fontsize -= 1;
14915		- if (object.editWindow == null)
14916		- new Exception().printStackTrace();
14917		- else
14918		- object.editWindow.refreshContents(true);
	15677	+// if (object.editWindow == null)
	15678	+// new Exception().printStackTrace();
	15679	+// else
	15680	+ object.GetWindow().refreshContents(true);
14919	15681	break;
14920	15682	case '{':
14921	15683	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14978,7 +15740,7 @@
14978	15740	//mode = ROTATE;
14979	15741	if ((MODIFIERS & COMMAND) == 0) // VR??
14980	15742	{
14981		- SetMouseMode(modifiers);
	15743	+ SetMouseMode(0, modifiers);
14982	15744	}
14983	15745	}
14984	15746
..	..	@@ -15114,7 +15876,7 @@
15114	15876	{
15115	15877	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15116	15878	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15117		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15879	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15118	15880	{
15119	15881	mouseMoved(e);
15120	15882	} else
..	..	@@ -15139,11 +15901,12 @@
15139	15901	}
15140	15902	*/
15141	15903
15142		- object.editWindow.EditSelection();
	15904	+ object.GetWindow().EditSelection(false);
15143	15905	}
15144	15906
15145	15907	void SelectParent()
15146	15908	{
	15909	+ new Exception().printStackTrace();
15147	15910	System.exit(0);
15148	15911	Composite group = (Composite) object;
15149	15912	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15155,10 +15918,10 @@
15155	15918	{
15156	15919	//selectees.remove(i);
15157	15920	System.out.println("select parent of " + elem);
15158		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15921	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15159	15922	} else
15160	15923	{
15161		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15924	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15162	15925	}
15163	15926
15164	15927	first = false;
..	..	@@ -15167,6 +15930,7 @@
15167	15930
15168	15931	void SelectChildren()
15169	15932	{
	15933	+ new Exception().printStackTrace();
15170	15934	System.exit(0);
15171	15935	/*
15172	15936	Composite group = (Composite) object;
..	..	@@ -15199,12 +15963,12 @@
15199	15963	for (int j = 0; j < group.children.size(); j++)
15200	15964	{
15201	15965	elem = (Object3D) group.children.elementAt(j);
15202		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15966	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15203	15967	first = false;
15204	15968	}
15205	15969	} else
15206	15970	{
15207		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15971	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15208	15972	}
15209	15973
15210	15974	first = false;
..	..	@@ -15215,21 +15979,21 @@
15215	15979	{
15216	15980	//Composite group = (Composite) object;
15217	15981	Object3D group = object;
15218		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15982	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15219	15983	}
15220	15984
15221	15985	void ResetTransform(int mask)
15222	15986	{
15223	15987	//Composite group = (Composite) object;
15224	15988	Object3D group = object;
15225		- group.editWindow.ResetTransform(mask);
	15989	+ group.GetWindow().ResetTransform(mask);
15226	15990	}
15227	15991
15228	15992	void FlipTransform()
15229	15993	{
15230	15994	//Composite group = (Composite) object;
15231	15995	Object3D group = object;
15232		- group.editWindow.FlipTransform();
	15996	+ group.GetWindow().FlipTransform();
15233	15997	// group.editWindow.ReduceMesh(true);
15234	15998	}
15235	15999
..	..	@@ -15237,7 +16001,7 @@
15237	16001	{
15238	16002	//Composite group = (Composite) object;
15239	16003	Object3D group = object;
15240		- group.editWindow.PrintMemory();
	16004	+ group.GetWindow().PrintMemory();
15241	16005	// group.editWindow.ReduceMesh(true);
15242	16006	}
15243	16007
..	..	@@ -15245,7 +16009,7 @@
15245	16009	{
15246	16010	//Composite group = (Composite) object;
15247	16011	Object3D group = object;
15248		- group.editWindow.ResetCentroid();
	16012	+ group.GetWindow().ResetCentroid();
15249	16013	}
15250	16014
15251	16015	void IncDepth()
..	..	@@ -15327,11 +16091,11 @@
15327	16091
15328	16092	int width = getBounds().width;
15329	16093	int height = getBounds().height;
15330		- ClickInfo info = new ClickInfo();
15331		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15332	16094	//Image img = CreateImage(width, height);
15333	16095	//System.out.println("width = " + width + "; height = " + height + "\n");
	16096	+
15334	16097	Graphics gr = g; // img.getGraphics();
	16098	+
15335	16099	if (!hasMarquee)
15336	16100	{
15337	16101	if (Xmin < Xmax) // !locked)
..	..	@@ -15403,44 +16167,92 @@
15403	16167	}
15404	16168	if (object != null && !hasMarquee)
15405	16169	{
	16170	+ if (object.clickInfo == null)
	16171	+ object.clickInfo = new ClickInfo();
	16172	+ ClickInfo info = object.clickInfo;
	16173	+ //ClickInfo info = new ClickInfo();
	16174	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16175	+
15406	16176	if (isRenderer)
15407	16177	{
15408		- info.flags++;
	16178	+ object.clickInfo.flags++;
15409	16179	double frameAspect = (double) width / (double) height;
15410	16180	if (frameAspect > renderCamera.aspect)
15411	16181	{
15412	16182	int desired = (int) ((double) height * renderCamera.aspect);
15413		- info.bounds.width -= width - desired;
15414		- info.bounds.x += (width - desired) / 2;
	16183	+ object.clickInfo.bounds.width -= width - desired;
	16184	+ object.clickInfo.bounds.x += (width - desired) / 2;
15415	16185	} else
15416	16186	{
15417	16187	int desired = (int) ((double) width / renderCamera.aspect);
15418		- info.bounds.height -= height - desired;
15419		- info.bounds.y += (height - desired) / 2;
	16188	+ object.clickInfo.bounds.height -= height - desired;
	16189	+ object.clickInfo.bounds.y += (height - desired) / 2;
15420	16190	}
15421	16191	}
15422		- info.g = gr;
15423		- info.camera = renderCamera;
	16192	+
	16193	+ object.clickInfo.g = gr;
	16194	+ object.clickInfo.camera = renderCamera;
15424	16195	/*
15425	16196	// Memory intensive (brep.verticescopy)
15426	16197	if (!(object instanceof Composite))
15427	16198	object.draw(info, 0, false); // SLOW :
15428	16199	*/
15429		- if (!isRenderer)
	16200	+ if (!isRenderer) // && drag)
15430	16201	{
15431		- object.drawEditHandles(info, 0);
	16202	+ Grafreed.Assert(object != null);
	16203	+ Grafreed.Assert(object.selection != null);
	16204	+ if (object.selection.Size() > 0)
	16205	+ {
	16206	+ int hitSomething = object.selection.get(0).hitSomething;
	16207	+
	16208	+ object.clickInfo.DX = 0;
	16209	+ object.clickInfo.DY = 0;
	16210	+ object.clickInfo.W = 1;
	16211	+ if (hitSomething == Object3D.hitCenter)
	16212	+ {
	16213	+ info.DX = X;
	16214	+ if (X != 0)
	16215	+ info.DX -= info.bounds.width/2;
	16216	+
	16217	+ info.DY = Y;
	16218	+ if (Y != 0)
	16219	+ info.DY -= info.bounds.height/2;
	16220	+ }
	16221	+
	16222	+ object.drawEditHandles(//info,
	16223	+ 0);
	16224	+
	16225	+ if (drag && (X != 0 \|\| Y != 0))
	16226	+ {
	16227	+ switch (hitSomething)
	16228	+ {
	16229	+ case Object3D.hitCenter: gr.setColor(Color.white);
	16230	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16231	+ break;
	16232	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16233	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16234	+ break;
	16235	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16236	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16237	+ break;
	16238	+ }
	16239	+
	16240	+ }
	16241	+ }
15432	16242	}
15433	16243	}
	16244	+
15434	16245	if (isRenderer)
15435	16246	{
15436	16247	//gr.setColor(Color.black);
15437	16248	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15438	16249	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15439	16250	}
	16251	+
15440	16252	if (hasMarquee)
15441	16253	{
15442	16254	gr.setXORMode(Color.white);
15443		- gr.setColor(Color.red);
	16255	+ gr.setColor(Color.white);
15444	16256	if (!firstime)
15445	16257	{
15446	16258	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -15549,6 +16361,7 @@
15549	16361	public boolean mouseDown(Event evt, int x, int y)
15550	16362	{
15551	16363	System.out.println("mouseDown: " + evt);
	16364	+ System.exit(0);
15552	16365	/*
15553	16366	locked = true;
15554	16367	drag = false;
..	..	@@ -15592,7 +16405,7 @@
15592	16405	{
15593	16406	keyPressed(0, modifiers);
15594	16407	}
15595		- clickStart(x, y, modifiers);
	16408	+ // clickStart(x, y, modifiers);
15596	16409	return true;
15597	16410	}
15598	16411
..	..	@@ -15710,7 +16523,7 @@
15710	16523	{
15711	16524	keyReleased(0, 0);
15712	16525	}
15713		- drag(x, y, modifiers);
	16526	+ drag(x, y, 0, modifiers);
15714	16527	return true;
15715	16528	}
15716	16529
..	..	@@ -15842,7 +16655,7 @@
15842	16655	Object3D object;
15843	16656	static Object3D trackedobject;
15844	16657	Camera renderCamera; // Light or Eye (or Occlusion)
15845		- /static/ Camera manipCamera; // Light or Eye
	16658	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15846	16659	/static/ Camera eyeCamera;
15847	16660	/static/ Camera lightCamera;
15848	16661	int cameracount;
..	..	@@ -15906,6 +16719,8 @@
15906	16719	private /static/ boolean firstime;
15907	16720	private /static/ cVector newView = new cVector();
15908	16721	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16722	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16723	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15909	16724	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15910	16725	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15911	16726	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15918,29 +16733,67 @@
15918	16733	{
15919	16734	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15920	16735
	16736	+ int usedsuf = 0;
	16737	+
15921	16738	for (int i = 0; i < suffixes.length; i++)
15922	16739	{
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)
	16740	+ String[] suffixe = suffixes;
	16741	+ String[] fallback = suffixes2;
	16742	+ String[] fallfallback = suffixes3;
	16743	+
	16744	+ for (int c=usedsuf; --c>=0;)
15928	16745	{
15929		- throw new IOException("Unable to load texture " + resourceName);
	16746	+// String[] temp = suffixe;
	16747	+// suffixe = fallback;
	16748	+// fallback = fallfallback;
	16749	+// fallfallback = temp;
15930	16750	}
	16751	+
	16752	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16753	+ TextureData data;
	16754	+
	16755	+ try
	16756	+ {
	16757	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16758	+ mipmapped,
	16759	+ FileUtil.getFileSuffix(resourceName));
	16760	+ }
	16761	+ catch (Exception e)
	16762	+ {
	16763	+ try
	16764	+ {
	16765	+ resourceName = basename + fallback[i] + "." + suffix;
	16766	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16767	+ mipmapped,
	16768	+ FileUtil.getFileSuffix(resourceName));
	16769	+ }
	16770	+ catch (Exception e2)
	16771	+ {
	16772	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16773	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16774	+ mipmapped,
	16775	+ FileUtil.getFileSuffix(resourceName));
	16776	+ }
	16777	+ }
	16778	+
15931	16779	//System.out.println("Target = " + targets[i]);
15932	16780	cubemap.updateImage(data, targets[i]);
15933	16781	}
15934	16782
15935	16783	return cubemap;
15936	16784	}
	16785	+
15937	16786	int bigsphere = -1;
15938	16787
15939	16788	float BGcolor = 0.5f;
15940	16789
15941		- private void DrawSkyBox(GL gl)
	16790	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16791	+
	16792	+ private void DrawSkyBox(GL gl, float ratio)
15942	16793	{
15943		- if (envyoff \|\| cubemap == null)
	16794	+ if (//envyoff \|\|
	16795	+ WIREFRAME \|\|
	16796	+ cubemap == null)
15944	16797	{
15945	16798	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15946	16799	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15955,7 +16808,17 @@
15955	16808	// Compensates for ExaminerViewer's modification of modelview matrix
15956	16809	gl.glMatrixMode(GL.GL_MODELVIEW);
15957	16810	gl.glLoadIdentity();
	16811	+ gl.glScalef(1,ratio,1);
15958	16812
	16813	+// colorV[0] = 2;
	16814	+// colorV[1] = 2;
	16815	+// colorV[2] = 2;
	16816	+// colorV[3] = 1;
	16817	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16818	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16819	+//
	16820	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16821	+
15959	16822	//gl.glActiveTexture(GL.GL_TEXTURE1);
15960	16823	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15961	16824
..	..	@@ -15987,6 +16850,7 @@
15987	16850	{
15988	16851	gl.glScalef(1.0f, -1.0f, 1.0f);
15989	16852	}
	16853	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
15990	16854	gl.glMultMatrixd(viewrot_1, 0);
15991	16855	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
15992	16856	//viewer.updateInverseRotation(gl);
..	..	@@ -16027,7 +16891,8 @@
16027	16891	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16028	16892
16029	16893	cubemap.disable();
16030		- ////cubemap.unbind();
	16894	+ //cubemap.dispose();
	16895	+
16031	16896	if (CULLFACE)
16032	16897	{
16033	16898	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16083,7 +16948,7 @@
16083	16948	gl.glScalef(1.0f, -1.0f, 1.0f);
16084	16949	}
16085	16950
16086		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	16951	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16087	16952
16088	16953	float step = 2; // 0.1666f; //0.25f;
16089	16954	float stepv = 2; // step * 1652 / 998;
..	..	@@ -16127,16 +16992,16 @@
16127	16992	cStatic.objectstack[materialdepth++] = checker;
16128	16993	//System.out.println("material " + material);
16129	16994	//Applet3D.tracein(this, selected);
16130		- vector2buffer = checker.projectedVertices;
	16995	+ //vector2buffer = checker.projectedVertices;
16131	16996
16132	16997	//checker.GetMaterial().Draw(this, false); // true);
16133		- DrawMaterial(checker.GetMaterial(), false); // true);
	16998	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16134	16999
16135	17000	materialdepth -= 1;
16136	17001	if (materialdepth > 0)
16137	17002	{
16138		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16139		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	17003	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	17004	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16140	17005	}
16141	17006	//checker.GetMaterial().opacity = 1f;
16142	17007	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16222,6 +17087,14 @@
16222	17087	}
16223	17088	}
16224	17089
	17090	+ private Object3D GetFolder()
	17091	+ {
	17092	+ Object3D folder = object.GetWindow().copy;
	17093	+ if (object.GetWindow().copy.selection.Size() > 0)
	17094	+ folder = object.GetWindow().copy.selection.elementAt(0);
	17095	+ return folder;
	17096	+ }
	17097	+
16225	17098	class SelectBuffer implements GLEventListener
16226	17099	{
16227	17100
..	..	@@ -16237,7 +17110,7 @@
16237	17110	//new Exception().printStackTrace();
16238	17111	System.out.println("select buffer init");
16239	17112	// Use debug pipeline
16240		- drawable.setGL(new DebugGL(drawable.getGL()));
	17113	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16241	17114
16242	17115	GL gl = drawable.getGL();
16243	17116
..	..	@@ -16280,6 +17153,7 @@
16280	17153	{
16281	17154	if (!selection)
16282	17155	{
	17156	+ new Exception().printStackTrace();
16283	17157	System.exit(0);
16284	17158	return;
16285	17159	}
..	..	@@ -16300,6 +17174,17 @@
16300	17174
16301	17175	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16302	17176
	17177	+ if (PAINTMODE)
	17178	+ {
	17179	+ if (object.GetWindow().copy.selection.Size() > 0)
	17180	+ {
	17181	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17182	+
	17183	+ // Make what you paint not selectable.
	17184	+ paintobj.ResetSelectable();
	17185	+ }
	17186	+ }
	17187	+
16303	17188	//int tmp = selection_view;
16304	17189	//selection_view = -1;
16305	17190	int temp = DrawMode();
..	..	@@ -16311,6 +17196,17 @@
16311	17196	// temp = DEFAULT; // patch for selection debug
16312	17197	Globals.drawMode = temp; // WARNING
16313	17198
	17199	+ if (PAINTMODE)
	17200	+ {
	17201	+ if (object.GetWindow().copy.selection.Size() > 0)
	17202	+ {
	17203	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17204	+
	17205	+ // Revert.
	17206	+ paintobj.RestoreSelectable();
	17207	+ }
	17208	+ }
	17209	+
16314	17210	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16315	17211
16316	17212	// trying different ways of getting the depth info over
..	..	@@ -16358,6 +17254,8 @@
16358	17254	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16359	17255	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16360	17256	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17257	+
	17258	+ CreateSelectedPoint();
16361	17259
16362	17260	// Will fit the mesh !!!
16363	17261	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16407,34 +17305,36 @@
16407	17305	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	17306	}
16409	17307
16410		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17308	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16411	17309	}
16412	17310	}
16413	17311
16414	17312	if (!movingcamera && !PAINTMODE)
16415		- object.editWindow.ScreenFitPoint(); // fev 2014
	17313	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16416	17314
16417		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17315	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16418	17316	{
16419		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17317	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16420	17318
16421		- Object3D group = new Object3D("inst" + paintcount++);
	17319	+ if (object.GetWindow().copy.selection.Size() > 0)
	17320	+ {
	17321	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16422	17322
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();
	17323	+ Object3D inst = new Object3D("inst" + paintcount++);
	17324	+
	17325	+ inst.CreateMaterial(); // use a void leaf to select instances
	17326	+
	17327	+ inst.add(paintobj); // link
	17328	+
	17329	+ object.GetWindow().SnapObject(inst);
	17330	+
	17331	+ Object3D folder = paintFolder; // GetFolder();
	17332	+
	17333	+ folder.add(inst);
	17334	+
	17335	+ object.GetWindow().ResetModel();
	17336	+ object.GetWindow().refreshContents();
	17337	+ }
16438	17338	}
16439	17339	else
16440	17340	paintcount = 0;
..	..	@@ -16473,6 +17373,11 @@
16473	17373	//System.out.println("objects[color] = " + objects[color]);
16474	17374	//objects[color].Select();
16475	17375	indexcount = 0;
	17376	+ ObjEditor window = object.GetWindow();
	17377	+ if (window != null && deselect)
	17378	+ {
	17379	+ window.Select(null, deselect, true);
	17380	+ }
16476	17381	object.Select(color, deselect);
16477	17382	}
16478	17383
..	..	@@ -16523,6 +17428,7 @@
16523	17428
16524	17429	public void init(GLAutoDrawable drawable)
16525	17430	{
	17431	+ if (Globals.DEBUG)
16526	17432	System.out.println("shadow buffer init");
16527	17433
16528	17434	GL gl = drawable.getGL();
..	..	@@ -16572,7 +17478,7 @@
16572	17478	gl.glDisable(gl.GL_CULL_FACE);
16573	17479	}
16574	17480
16575		- if (!RENDERSHADOW)
	17481	+ if (!Globals.RENDERSHADOW)
16576	17482	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16577	17483
16578	17484	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16582,7 +17488,7 @@
16582	17488	//gl.glColorMask(false, false, false, false);
16583	17489
16584	17490	//render_scene_from_light_view(gl, drawable, 0, 0);
16585		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17491	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16586	17492	{
16587	17493	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16588	17494
..	..	@@ -16751,10 +17657,14 @@
16751	17657	gl.glFlush();
16752	17658
16753	17659	/**/
16754		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17660	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
16755	17661
16756		- float[] pixels = occlusionsizebuffer.array();
	17662	+ float[] depths = occlusiondepthbuffer.array();
16757	17663
	17664	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17665	+
	17666	+ int[] pixels = selectsizebuffer.array();
	17667	+
16758	17668	double r = 0, g = 0, b = 0;
16759	17669
16760	17670	double count = 0;
..	..	@@ -16765,7 +17675,7 @@
16765	17675
16766	17676	double FACTOR = 1;
16767	17677
16768		- for (int i = 0; i < pixels.length; i++)
	17678	+ for (int i = 0; i < depths.length; i++)
16769	17679	{
16770	17680	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
16771	17681	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -16848,7 +17758,7 @@
16848	17758
16849	17759	double scale = ray.z; // 1; // cos
16850	17760
16851		- float depth = pixels[newindex];
	17761	+ float depth = depths[newindex];
16852	17762
16853	17763	/*
16854	17764	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -16998,23 +17908,15 @@
16998	17908	int AAbuffersize = 0;
16999	17909
17000	17910	//double[] selectedpoint = new double[3];
17001		- static Superellipsoid selectedpoint = new Superellipsoid();
	17911	+ static Superellipsoid selectedpoint;
17002	17912	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();
	17913	+ static Sphere debugpointG;
	17914	+ static Sphere debugpointP;
	17915	+ static Sphere debugpointC;
	17916	+ static Sphere debugpointR;
17007	17917
17008	17918	static Sphere debugpoints[] = new Sphere[8];
17009	17919
17010		- static
17011		- {
17012		- for (int i=0; i<8; i++)
17013		- {
17014		- debugpoints[i] = new Sphere();
17015		- }
17016		- }
17017		-
17018	17920	static void InitPoints(float radius)
17019	17921	{
17020	17922	for (int i=0; i<8; i++)
..	..	@@ -17053,11 +17955,14 @@
17053	17955	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17054	17956	static IntBuffer bigAAbuffer;
17055	17957	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17056		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17958	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17057	17959	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17058	17960	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17059	17961	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17060		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17962	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17963	+
	17964	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17965	+
17061	17966	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17062	17967	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17063	17968	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();