~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -37,7 +41,6 @@
37	41	static boolean[] selectedstack = new boolean[65536];
38	42	static int materialdepth = 0;
39	43
40		- static boolean DEBUG = false;
41	44	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	45
43	46	// camera change fix
..	..	@@ -45,6 +48,39 @@
45	48	static boolean ABORTED = false;
46	49
47	50	static int STEP = 1;
	51	+
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	53	+ {
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
	83	+ }
48	84
49	85	/static/ private boolean CULLFACE = false; // true;
50	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -61,7 +97,7 @@
61	97	//boolean REDUCETEXTURE = true;
62	98	boolean CACHETEXTURE = true;
63	99	boolean CLEANCACHE = false; // true;
64		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
65	101	boolean COMPRESSTEXTURE = false;
66	102	boolean KOMPACTTEXTURE = false; // true;
67	103	boolean RESIZETEXTURE = false;
..	..	@@ -74,7 +110,11 @@
74	110	//private Mat4f spotlightTransform = new Mat4f();
75	111	//private Mat4f spotlightInverseTransform = new Mat4f();
76	112	static GLContext glcontext = null;
77		- /static/ com.sun.opengl.util.texture.Texture cubemap;
	113	+ /static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
	114	+ /static/ com.sun.opengl.util.texture.Texture cubemapcustom;
	115	+ /static/ com.sun.opengl.util.texture.Texture cubemaprgb;
	116	+ boolean transformMode;
	117	+
78	118	boolean reverseUP = false;
79	119	static boolean frozen = false;
80	120	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -128,7 +168,7 @@
128	168
129	169
130	170	// OPTIONS
131		- boolean Skinshader = true;
	171	+ boolean Skinshader = false; // true;
132	172	boolean cameraLight = false;
133	173	boolean UVdebug = false;
134	174	boolean Udebug = false;
..	..	@@ -137,7 +177,7 @@
137	177	static boolean doublesided = false; // true; // reversed normals are awful for conformance
138	178	boolean anisotropy = true;
139	179	boolean softshadow = true; // slower but better false;
140		- boolean opacityhalo = false;
	180	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
141	181
142	182	boolean macromode = false;
143	183
..	..	@@ -148,6 +188,21 @@
148	188	defaultcaps.setAccumGreenBits(16);
149	189	defaultcaps.setAccumBlueBits(16);
150	190	defaultcaps.setAccumAlphaBits(16);
	191	+ }
	192	+
	193	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	194	+
	195	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	196	+ {
	197	+ try
	198	+ {
	199	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	200	+ } catch (IOException e)
	201	+ {
	202	+ System.out.println("NAME = " + name);
	203	+ e.printStackTrace(); // throw new RuntimeException(e);
	204	+ return null;
	205	+ }
151	206	}
152	207
153	208	void SetAsGLRenderer(boolean b)
..	..	@@ -168,7 +223,8 @@
168	223
169	224	SetCamera(cam);
170	225
171		- SetLight(new Camera(new cVector(10, 10, -20)));
	226	+ // Warning: not used.
	227	+ SetLight(new Camera(new cVector(15, 10, -20)));
172	228
173	229	object = o;
174	230
..	..	@@ -325,7 +381,7 @@
325	381	cStatic.objectstack[materialdepth++] = obj;
326	382	//System.out.println("material " + material);
327	383	//Applet3D.tracein(this, selected);
328		- display.vector2buffer = obj.projectedVertices;
	384	+ //display.vector2buffer = obj.projectedVertices;
329	385	if (obj instanceof Camera)
330	386	{
331	387	display.options1[0] = material.shift;
..	..	@@ -334,14 +390,28 @@
334	390	display.options1[2] = material.shadowbias;
335	391	display.options1[3] = material.aniso;
336	392	display.options1[4] = material.anisoV;
	393	+// System.out.println("display.options1[0] " + display.options1[0]);
	394	+// System.out.println("display.options1[1] " + display.options1[1]);
	395	+// System.out.println("display.options1[2] " + display.options1[2]);
	396	+// System.out.println("display.options1[3] " + display.options1[3]);
	397	+// System.out.println("display.options1[4] " + display.options1[4]);
337	398	display.options2[0] = material.opacity;
338	399	display.options2[1] = material.diffuse;
339	400	display.options2[2] = material.factor;
	401	+// System.out.println("display.options2[0] " + display.options2[0]);
	402	+// System.out.println("display.options2[1] " + display.options2[1]);
	403	+// System.out.println("display.options2[2] " + display.options2[2]);
340	404
341	405	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	406	+// System.out.println("display.options3[0] " + display.options3[0]);
	407	+// System.out.println("display.options3[1] " + display.options3[1]);
	408	+// System.out.println("display.options3[2] " + display.options3[2]);
342	409	display.options4[0] = material.cameralight/0.2f;
343	410	display.options4[1] = material.subsurface;
344	411	display.options4[2] = material.sheen;
	412	+// System.out.println("display.options4[0] " + display.options4[0]);
	413	+// System.out.println("display.options4[1] " + display.options4[1]);
	414	+// System.out.println("display.options4[2] " + display.options4[2]);
345	415
346	416	// if (display.CURRENTANTIALIAS > 0)
347	417	// display.options3[3] /= 4;
..	..	@@ -357,7 +427,7 @@
357	427	/**/
358	428	} else
359	429	{
360		- DrawMaterial(material, selected);
	430	+ DrawMaterial(material, selected, obj.projectedVertices);
361	431	}
362	432	} else
363	433	{
..	..	@@ -381,8 +451,8 @@
381	451	cStatic.objectstack[materialdepth++] = obj;
382	452	//System.out.println("material " + material);
383	453	//Applet3D.tracein("selected ", selected);
384		- display.vector2buffer = obj.projectedVertices;
385		- display.DrawMaterial(material, selected);
	454	+ //display.vector2buffer = obj.projectedVertices;
	455	+ display.DrawMaterial(material, selected, obj.projectedVertices);
386	456	}
387	457	}
388	458
..	..	@@ -399,8 +469,8 @@
399	469	materialdepth -= 1;
400	470	if (materialdepth > 0)
401	471	{
402		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
403		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	472	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	473	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
404	474	}
405	475	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
406	476	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -420,8 +490,8 @@
420	490	materialdepth -= 1;
421	491	if (materialdepth > 0)
422	492	{
423		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
424		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	493	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	494	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
425	495	}
426	496	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
427	497	//else
..	..	@@ -462,15 +532,18 @@
462	532	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463	533	{
464	534	//gl.glBegin(gl.GL_TRIANGLES);
465		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	535	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	536	+ // TEST LIVE NORMALS && !obj.dontselect
	537	+ ;
466	538	if (!hasnorm)
467	539	{
468		- // System.out.println("FUCK!!");
	540	+ // System.out.println("Mesh normal");
469	541	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
470	542	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
471	543	LA.vecCross(obj.v0, obj.v1, obj.v2);
472	544	LA.vecNormalize(obj.v2);
473		- 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);
474	547	}
475	548
476	549	// P
..	..	@@ -492,7 +565,7 @@
492	565	y += ny * obj.NORMALPUSH;
493	566	z += nz * obj.NORMALPUSH;
494	567
495		- gl.glNormal3f(nx, ny, nz);
	568	+ SetGLNormal(gl, nx, ny, nz);
496	569	}
497	570	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
498	571	SetColor(obj, pv);
..	..	@@ -524,7 +597,7 @@
524	597	y += ny * obj.NORMALPUSH;
525	598	z += nz * obj.NORMALPUSH;
526	599
527		- gl.glNormal3f(nx, ny, nz);
	600	+ SetGLNormal(gl, nx, ny, nz);
528	601	}
529	602	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
530	603	// boolean locked = false;
..	..	@@ -572,7 +645,7 @@
572	645	y += ny * obj.NORMALPUSH;
573	646	z += nz * obj.NORMALPUSH;
574	647
575		- gl.glNormal3f(nx, ny, nz);
	648	+ SetGLNormal(gl, nx, ny, nz);
576	649	}
577	650
578	651	// if ((dot&4) == 0)
..	..	@@ -1178,10 +1251,10 @@
1178	1251	{
1179	1252	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1180	1253	{
1181		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1254	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1182	1255	} else
1183	1256	{
1184		- gl.glNormal3f(0, 0, 1);
	1257	+ SetGLNormal(gl, 0, 0, 1);
1185	1258	}
1186	1259
1187	1260	if (c != null)
..	..	@@ -1190,10 +1263,12 @@
1190	1263	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1191	1264	}
1192	1265	}
	1266	+
1193	1267	if (flipV)
1194	1268	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1195	1269	else
1196	1270	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1271	+
1197	1272	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1198	1273	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1199	1274
..	..	@@ -1203,20 +1278,22 @@
1203	1278	{
1204	1279	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1205	1280	{
1206		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1281	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1207	1282	} else
1208	1283	{
1209		- gl.glNormal3f(0, 0, 1);
	1284	+ SetGLNormal(gl, 0, 0, 1);
1210	1285	}
1211	1286	if (c != null)
1212	1287	{
1213	1288	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1214	1289	}
1215	1290	}
	1291	+
1216	1292	if (flipV)
1217	1293	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1218	1294	else
1219	1295	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1296	+
1220	1297	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1221	1298	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1222	1299
..	..	@@ -1229,10 +1306,10 @@
1229	1306	{
1230	1307	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1231	1308	{
1232		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1309	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1233	1310	} else
1234	1311	{
1235		- gl.glNormal3f(0, 0, 1);
	1312	+ SetGLNormal(gl, 0, 0, 1);
1236	1313	}
1237	1314	if (c != null)
1238	1315	{
..	..	@@ -1244,8 +1321,10 @@
1244	1321	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1245	1322	else
1246	1323	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1324	+
1247	1325	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1248	1326	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1327	+
1249	1328	count2 += 2;
1250	1329	count3 += 3;
1251	1330	}
..	..	@@ -1412,7 +1491,7 @@
1412	1491	{
1413	1492	if (!selectmode)
1414	1493	{
1415		- 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);
1416	1495	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1417	1496
1418	1497	if (flipV)
..	..	@@ -1424,6 +1503,8 @@
1424	1503	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1425	1504	}
1426	1505
	1506	+ float[] colorV = new float[4];
	1507	+
1427	1508	void SetColor(Object3D obj, Vertex p0)
1428	1509	{
1429	1510	CameraPane display = this;
..	..	@@ -1491,8 +1572,6 @@
1491	1572	{
1492	1573	return;
1493	1574	}
1494		-
1495		- float[] colorV = new float[3];
1496	1575
1497	1576	if (false) // marked)
1498	1577	{
..	..	@@ -1601,7 +1680,7 @@
1601	1680	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1602	1681	}
1603	1682
1604		- void DrawMaterial(cMaterial material, boolean selected)
	1683	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1605	1684	{
1606	1685	CameraPane display = this;
1607	1686	//new Exception().printStackTrace();
..	..	@@ -1636,7 +1715,7 @@
1636	1715	colorV[0] = display.modelParams0[0] * material.diffuse;
1637	1716	colorV[1] = display.modelParams0[1] * material.diffuse;
1638	1717	colorV[2] = display.modelParams0[2] * material.diffuse;
1639		- colorV[3] = material.opacity;
	1718	+ colorV[3] = 1; // material.opacity;
1640	1719
1641	1720	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1642	1721	//System.out.println("Opacity = " + opacity);
..	..	@@ -1741,12 +1820,12 @@
1741	1820
1742	1821	display.modelParams7[0] = 0;
1743	1822	display.modelParams7[1] = 1000;
1744		- display.modelParams7[2] = 0;
	1823	+ display.modelParams7[2] = material.parallax;
1745	1824	display.modelParams7[3] = 0;
1746	1825
1747		- display.modelParams6[0] = 100; // criss de bug de bump
	1826	+ //display.modelParams6[0] = 100; // criss de bug de bump
1748	1827
1749		- Object3D.cVector2[] extparams = display.vector2buffer;
	1828	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1750	1829	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1751	1830	{
1752	1831	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1888,7 +1967,7 @@
1888	1967	void PushMatrix(double[][] matrix)
1889	1968	{
1890	1969	// GrafreeD.tracein(matrix);
1891		- PushMatrix(matrix,1);
	1970	+ PushMatrix(matrix, 1);
1892	1971	}
1893	1972
1894	1973	void PushMatrix()
..	..	@@ -1974,9 +2053,9 @@
1974	2053	switch(viewcode)
1975	2054	{
1976	2055	case 0: return "main";
1977		- case 1: return "one";
1978		- case 2: return "two";
1979		- case 3: return "three";
	2056	+ case 1: return "Red";
	2057	+ case 2: return "Green";
	2058	+ case 3: return "Blue";
1980	2059	case 4: return "light";
1981	2060	}
1982	2061
..	..	@@ -2042,7 +2121,7 @@
2042	2121	//System.err.println("Oeil on");
2043	2122	OEIL = true;
2044	2123	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2045		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2124	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2046	2125	//pingthread.StepToTarget(true);
2047	2126	}
2048	2127
..	..	@@ -2257,7 +2336,7 @@
2257	2336
2258	2337	void ToggleDebug()
2259	2338	{
2260		- DEBUG ^= true;
	2339	+ Globals.DEBUG ^= true;
2261	2340	}
2262	2341
2263	2342	void ToggleLookAt()
..	..	@@ -2265,7 +2344,7 @@
2265	2344	LOOKAT ^= true;
2266	2345	}
2267	2346
2268		- void ToggleRandom()
	2347	+ void ToggleSwitch()
2269	2348	{
2270	2349	SWITCH ^= true;
2271	2350	}
..	..	@@ -2275,10 +2354,17 @@
2275	2354	HANDLES ^= true;
2276	2355	}
2277	2356
	2357	+ Object3D paintFolder;
	2358	+
2278	2359	void TogglePaint()
2279	2360	{
2280	2361	PAINTMODE ^= true;
2281	2362	paintcount = 0;
	2363	+
	2364	+ if (PAINTMODE)
	2365	+ {
	2366	+ paintFolder = GetFolder();
	2367	+ }
2282	2368	}
2283	2369
2284	2370	void SwapCamera(int a, int b)
..	..	@@ -2374,7 +2460,34 @@
2374	2460	{
2375	2461	return currentGL;
2376	2462	}
2377		-
	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	+
2378	2491	/**/
2379	2492	class CacheTexture
2380	2493	{
..	..	@@ -2383,28 +2496,31 @@
2383	2496
2384	2497	int resolution;
2385	2498
2386		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2499	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2387	2500	{
2388		- texture = tex;
	2501	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2502	+ texturedata = texdata;
2389	2503	resolution = res;
2390	2504	}
2391	2505	}
2392	2506	/**/
2393	2507
2394	2508	// TEXTURE static Texture texture;
2395		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2396		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2397		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	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	+
2398	2514	int pigmentdepth = 0;
2399	2515	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2400	2516	int bumpdepth = 0;
2401	2517	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2518	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2403	2519	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2404		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2520	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2405	2521	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2406	2522
2407		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2523	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2408	2524	{
2409	2525	TextureData texturedata = null;
2410	2526
..	..	@@ -2414,7 +2530,7 @@
2414	2530	com.sun.opengl.util.texture.TextureIO.newTextureData(
2415	2531	getClass().getClassLoader().getResourceAsStream(name),
2416	2532	true,
2417		- com.sun.opengl.util.texture.TextureIO.PNG);
	2533	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2418	2534	} catch (java.io.IOException e)
2419	2535	{
2420	2536	throw new javax.media.opengl.GLException(e);
..	..	@@ -2423,13 +2539,34 @@
2423	2539	if (bump)
2424	2540	texturedata = ConvertBump(texturedata, false);
2425	2541
2426		- com.sun.opengl.util.texture.Texture texture =
2427		- 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);
2428	2544
2429		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2430		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	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);
2431	2547
2432		- 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;
2433	2570	}
2434	2571
2435	2572	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3502,6 +3639,8 @@
3502	3639
3503	3640	System.out.println("LOADING TEXTURE : " + name);
3504	3641
	3642	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3643	+
3505	3644	//
3506	3645	if (false) // compressbit > 0)
3507	3646	{
..	..	@@ -7900,7 +8039,7 @@
7900	8039	String pigment = Object3D.GetPigment(tex);
7901	8040	String bump = Object3D.GetBump(tex);
7902	8041
7903		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8042	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7904	8043	{
7905	8044	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7906	8045	// System.out.println("; bump = " + bump);
..	..	@@ -7915,11 +8054,69 @@
7915	8054	pigment = null;
7916	8055	}
7917	8056
7918		- ReleaseTexture(bump, true);
7919		- ReleaseTexture(pigment, false);
	8057	+ ReleaseTexture(tex, true);
	8058	+ ReleaseTexture(tex, false);
7920	8059	}
7921	8060
7922		- 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)
7923	8120	{
7924	8121	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7925	8122	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7930,7 +8127,7 @@
7930	8127	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7931	8128
7932	8129	if (tex != null)
7933		- texture = textures.get(tex);
	8130	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7934	8131
7935	8132	// //assert( texture != null );
7936	8133	// if (texture == null)
..	..	@@ -8024,6 +8221,54 @@
8024	8221
8025	8222	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8026	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
	8271	+ {
8027	8272	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8028	8273	ambientOcclusion ) // \|\| !textureon)
8029	8274	{
..	..	@@ -8033,17 +8278,47 @@
8033	8278	if (tex == null)
8034	8279	{
8035	8280	BindTexture(null,false,resolution);
8036		- BindTexture(null,true,resolution);
8037	8281	return;
8038	8282	}
8039	8283
8040	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	+
8041	8317	String bump = Object3D.GetBump(tex);
8042	8318
8043		- usedtextures.put(pigment, pigment);
8044		- usedtextures.put(bump, bump);
	8319	+ usedtextures.add(tex);
8045	8320
8046		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8321	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8047	8322	{
8048	8323	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8049	8324	// System.out.println("; bump = " + bump);
..	..	@@ -8053,47 +8328,94 @@
8053	8328	{
8054	8329	bump = null;
8055	8330	}
8056		- if (pigment.equals(""))
8057		- {
8058		- pigment = null;
8059		- }
8060	8331
8061		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8062		- BindTexture(pigment, false, resolution);
8063	8332	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8064		- BindTexture(bump, true, resolution);
	8333	+ BindTexture(tex, true, resolution);
8065	8334	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8066		-
8067		- return; // true;
8068	8335	}
8069	8336
8070		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8337	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8338	+
	8339	+ private boolean FileExists(String tex)
8071	8340	{
8072		- 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;
8073	8360
8074	8361	if (tex != null)
8075	8362	{
8076		- String texname = tex;
	8363	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8364	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8077	8365
	8366	+ if (texname.equals("") && texdata == null)
	8367	+ {
	8368	+ return null;
	8369	+ }
	8370	+
	8371	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8372	+
8078	8373	// String[] split = tex.split("Textures");
8079	8374	// if (split.length > 1)
8080	8375	// texname = "/Users/nbriere/Textures" + split[split.length-1];
8081	8376	// else
8082	8377	// if (!texname.startsWith("/"))
8083	8378	// texname = "/Users/nbriere/Textures/" + texname;
8084		- if (!new File(tex).exists())
	8379	+ if (!FileExists(texname) && !texname.startsWith("@"))
8085	8380	{
8086		- texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
	8381	+ texname = fallbackTextureName;
8087	8382	}
8088	8383
8089	8384	if (CACHETEXTURE)
8090		- texture = textures.get(texname); // TEXTURE CACHE
8091		-
8092		- TextureData texturedata = null;
8093		-
8094		- if (texture == null \|\| texture.resolution < resolution)
8095	8385	{
8096		- 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(""))
8097	8419	{
8098	8420	assert(!bump);
8099	8421	// if (bump)
..	..	@@ -8104,19 +8426,23 @@
8104	8426	// }
8105	8427	// else
8106	8428	// {
8107		- texture = textures.get(tex);
8108		- if (texture == null)
	8429	+ // texturecache = textures.get(texname); // suspicious
	8430	+ if (texturecache == null)
8109	8431	{
8110		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8432	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8111	8433	}
	8434	+ else
	8435	+ new Exception().printStackTrace();
8112	8436	// }
8113	8437	} else
8114		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8438	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8115	8439	{
8116	8440	assert(bump);
8117		- texture = textures.get(tex);
8118		- if (texture == null)
8119		- 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();
8120	8446	} else
8121	8447	{
8122	8448	//if (tex.equals("IMMORTAL"))
..	..	@@ -8124,11 +8450,22 @@
8124	8450	// texture = GetResourceTexture("default.png");
8125	8451	//} else
8126	8452	//{
8127		- if (tex.equals("WHITE_NOISE"))
	8453	+ if (texname.endsWith("WHITE_NOISE"))
8128	8454	{
8129		- texture = textures.get(tex);
8130		- if (texture == null)
8131		- 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();
8132	8469	} else
8133	8470	{
8134	8471	if (textureon)
..	..	@@ -8153,7 +8490,7 @@
8153	8490	}
8154	8491
8155	8492	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8156		- if (!new File(cachename).exists())
	8493	+ if (!FileExists(cachename))
8157	8494	cachename = texname;
8158	8495	else
8159	8496	processbump = false; // don't process bump map again
..	..	@@ -8175,7 +8512,7 @@
8175	8512	}
8176	8513
8177	8514	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8178		- if (!new File(cachename).exists())
	8515	+ if (!FileExists(cachename))
8179	8516	cachename = texname;
8180	8517	else
8181	8518	processbump = false; // don't process bump map again
..	..	@@ -8187,19 +8524,20 @@
8187	8524	if (texturedata == null)
8188	8525	throw new Exception();
8189	8526
8190		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8527	+ texturecache = new CacheTexture(texturedata,resolution);
8191	8528	//texture = GetTexture(tex, bump);
8192	8529	}
	8530	+ }
8193	8531	}
8194	8532	//}
8195	8533	}
8196	8534
8197		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8535	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8198	8536	{
8199	8537	//return false;
8200	8538
8201	8539	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8202		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8540	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8203	8541	{
8204	8542	// String ext = "_highres";
8205	8543	// if (REDUCETEXTURE)
..	..	@@ -8216,52 +8554,17 @@
8216	8554	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8217	8555	if (!cachefile.exists())
8218	8556	{
8219		- // cache to disk
8220		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8221		- //buffers[0].
8222		-
8223		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8224		- int[] pixels = new int[bytebuf.capacity()/3];
8225		-
8226		- // squared size heuristic...
8227		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8557	+ //if (texturedata.getWidth() == texturedata.getHeight())
8228	8558	{
8229		- for (int i=pixels.length; --i>=0;)
8230		- {
8231		- int i3 = i*3;
8232		- pixels[i] = 0xFF;
8233		- pixels[i] <<= 8;
8234		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8235		- pixels[i] <<= 8;
8236		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8237		- pixels[i] <<= 8;
8238		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8239		- }
8240		-
8241		- /*
8242		- int r=0,g=0,b=0,a=0;
8243		- for (int i=0; i<width; i++)
8244		- for (int j=0; j<height; j++)
8245		- {
8246		- int index = j*width+i;
8247		- int p = pixels[index];
8248		- a = ((p>>24) & 0xFF);
8249		- r = ((p>>16) & 0xFF);
8250		- g = ((p>>8) & 0xFF);
8251		- b = (p & 0xFF);
8252		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8253		- }
8254		- /**/
8255		- int width = (int)Math.sqrt(pixels.length); // squared
8256		- int height = width;
8257		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8258		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8559	+ BufferedImage rendImage = CreateBim(texturedata);
	8560	+
8259	8561	ImageWriter writer = null;
8260	8562	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8261	8563	if (iter.hasNext()) {
8262	8564	writer = (ImageWriter)iter.next();
8263	8565	}
8264		- float compressionQuality = 0.9f;
	8566	+
	8567	+ float compressionQuality = 0.85f;
8265	8568	try
8266	8569	{
8267	8570	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8278,18 +8581,20 @@
8278	8581	}
8279	8582	}
8280	8583	}
8281		-
	8584	+
	8585	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8586	+
8282	8587	//System.out.println("Texture = " + tex);
8283		- if (textures.containsKey(texname))
	8588	+ if (textures.containsKey(tex))
8284	8589	{
8285		- CacheTexture thetex = textures.get(texname);
	8590	+ CacheTexture thetex = textures.get(tex);
8286	8591	thetex.texture.disable();
8287	8592	thetex.texture.dispose();
8288		- textures.remove(texname);
	8593	+ textures.remove(tex);
8289	8594	}
8290	8595
8291		- texture.texturedata = texturedata;
8292		- textures.put(texname, texture);
	8596	+ //texture.texturedata = texturedata;
	8597	+ textures.put(tex, texturecache);
8293	8598
8294	8599	// newtex = true;
8295	8600	}
..	..	@@ -8305,10 +8610,44 @@
8305	8610	}
8306	8611	}
8307	8612
8308		- return texture;
	8613	+ return texturecache;
8309	8614	}
8310	8615
8311		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	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
8312	8651	{
8313	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8314	8653
..	..	@@ -8326,21 +8665,21 @@
8326	8665	return texture!=null?texture.texture:null;
8327	8666	}
8328	8667
8329		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8668	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8330	8669	{
8331	8670	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8332	8671
8333	8672	return texture!=null?texture.texturedata:null;
8334	8673	}
8335	8674
8336		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8675	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8337	8676	{
8338	8677	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8339	8678	{
8340	8679	return false;
8341	8680	}
8342	8681
8343		- boolean newtex = false;
	8682	+ //boolean newtex = false;
8344	8683
8345	8684	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8346	8685
..	..	@@ -8372,9 +8711,75 @@
8372	8711	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8373	8712	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8374	8713
8375		- return newtex;
	8714	+ return true; // Warning: not used.
8376	8715	}
8377	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	+
8378	8783	ShadowBuffer shadowPBuf;
8379	8784	AntialiasBuffer antialiasPBuf;
8380	8785	int MAXSTACK;
..	..	@@ -8391,10 +8796,12 @@
8391	8796
8392	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8393	8798	MAXSTACK = temp[0];
8394		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8395	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8396	8802	MAXSTACK = temp[0];
8397		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8398	8805
8399	8806	// Use debug pipeline
8400	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8402,7 +8809,8 @@
8402	8809	gl = drawable.getGL(); //
8403	8810
8404	8811	GL gl3 = getGL();
8405		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8406	8814
8407	8815
8408	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8567,7 +8975,7 @@
8567	8975
8568	8976	if (cubemap == null)
8569	8977	{
8570		- LoadEnvy(5);
	8978	+ //LoadEnvy(1);
8571	8979	}
8572	8980
8573	8981	//cubemap.enable();
..	..	@@ -8843,6 +9251,8 @@
8843	9251
8844	9252	void LoadEnvy(int which)
8845	9253	{
	9254	+ assert(false);
	9255	+
8846	9256	String name;
8847	9257	String ext;
8848	9258
..	..	@@ -8854,37 +9264,58 @@
8854	9264	cubemap = null;
8855	9265	return;
8856	9266	case 1:
8857		- name = "cubemaps/box_";
8858		- ext = "png";
	9267	+ name = "cubemaps/rgb/";
	9268	+ ext = "jpg";
8859	9269	reverseUP = false;
8860	9270	break;
8861	9271	case 2:
8862		- name = "cubemaps/uffizi_";
8863		- ext = "png";
8864		- break; // reverseUP = true; break;
	9272	+ name = "cubemaps/uffizi/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
8865	9276	case 3:
8866		- name = "cubemaps/CloudyHills_";
8867		- ext = "tga";
	9277	+ name = "cubemaps/CloudyHills/";
	9278	+ ext = "jpg";
8868	9279	reverseUP = false;
8869	9280	break;
8870	9281	case 4:
8871		- name = "cubemaps/cornell_";
	9282	+ name = "cubemaps/cornell/";
8872	9283	ext = "png";
8873	9284	reverseUP = false;
8874	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;
8875	9311	default:
8876		- name = "cubemaps/rgb_";
8877		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9312	+ name = "cubemaps/box/";
	9313	+ ext = "png"; /mipmap = true;/
	9314	+ reverseUP = false;
8878	9315	break;
8879	9316	}
8880		-
8881		- try
8882		- {
8883		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8884		- } catch (IOException e)
8885		- {
8886		- throw new RuntimeException(e);
8887		- }
	9317	+
	9318	+ LoadSkybox(name, ext, mipmap);
8888	9319	}
8889	9320
8890	9321	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8916,8 +9347,12 @@
8916	9347	static double[] model = new double[16];
8917	9348	double[] camera2light = new double[16];
8918	9349	double[] light2camera = new double[16];
8919		- int newenvy = -1;
8920		- boolean envyoff = true; // false;
	9350	+
	9351	+ //int newenvy = -1;
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
	9355	+
8921	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8922	9357	//float[] light0 = { 0,0,0 };
8923	9358	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9210,11 +9645,35 @@
9210	9645	jy8[3] = 0.5f;
9211	9646	}
9212	9647
9213		- 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
9214	9649	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9215	9650	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9216	9651	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9217	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	+
9218	9677	static int imagecount = 0; // movie generation
9219	9678
9220	9679	static int jitter = 0;
..	..	@@ -9310,8 +9769,8 @@
9310	9769	assert (parentcam != renderCamera);
9311	9770
9312	9771	if (renderCamera != lightCamera)
9313		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9314		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9772	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9773	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9315	9774
9316	9775	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9317	9776
..	..	@@ -9326,8 +9785,8 @@
9326	9785	LA.matCopy(renderCamera.fromScreen, matrix);
9327	9786
9328	9787	if (renderCamera != lightCamera)
9329		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9330		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9788	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9789	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9331	9790
9332	9791	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9333	9792
..	..	@@ -9373,10 +9832,12 @@
9373	9832	rati = 1 / rati;
9374	9833	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9375	9834	}
9376		- assert (newenvy == -1);
	9835	+
	9836	+ //assert (newenvy == -1);
	9837	+
9377	9838	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9378	9839	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9379		- DrawSkyBox(gl);
	9840	+ DrawSkyBox(gl, (float)rati);
9380	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9381	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9382	9843	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10242,9 +10703,18 @@
10242	10703	static boolean init = false;
10243	10704
10244	10705	double[][] matrix = LA.newMatrix();
	10706	+
	10707	+ // This is to refresh the UI of the material panel.
	10708	+ ObjEditor patchMaterial;
10245	10709
10246	10710	public void display(GLAutoDrawable drawable)
10247	10711	{
	10712	+ if (patchMaterial.patchMaterial)
	10713	+ {
	10714	+ patchMaterial.patchMaterial = false;
	10715	+ patchMaterial.objectPanel.setSelectedIndex(1);
	10716	+ }
	10717	+
10248	10718	if (Grafreed.savesound && Grafreed.hassound)
10249	10719	{
10250	10720	Grafreed.wav.save();
..	..	@@ -10325,6 +10795,7 @@
10325	10795	ANTIALIAS = 0;
10326	10796	//System.out.println("RESTART");
10327	10797	AAtimer.restart();
	10798	+ Globals.TIMERRUNNING = true;
10328	10799	}
10329	10800	}
10330	10801	}
..	..	@@ -10392,13 +10863,14 @@
10392	10863	ambientOcclusion = false;
10393	10864	}
10394	10865
10395		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10866	+ if (//Globals.lighttouched &&
	10867	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10396	10868	{
10397	10869	//if (RENDERSHADOW) // ?
10398	10870	if (!IsFrozen())
10399	10871	{
10400	10872	// dec 2012
10401		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10873	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10402	10874	{
10403	10875	Globals.framecount++;
10404	10876	shadowbuffer.display();
..	..	@@ -10411,7 +10883,7 @@
10411	10883
10412	10884	if (wait)
10413	10885	{
10414		- Sleep(500);
	10886	+ Sleep(200); // blocks everything
10415	10887
10416	10888	wait = false;
10417	10889	}
..	..	@@ -10525,8 +10997,8 @@
10525	10997
10526	10998	// if (parentcam != renderCamera) // not a light
10527	10999	if (cam != lightCamera)
10528		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10529		- LA.matConcat(matrix, parentcam.toParent, matrix);
	11000	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11001	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10530	11002
10531	11003	for (int j = 0; j < 4; j++)
10532	11004	{
..	..	@@ -10540,8 +11012,8 @@
10540	11012
10541	11013	// if (parentcam != renderCamera) // not a light
10542	11014	if (cam != lightCamera)
10543		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10544		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	11015	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11016	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10545	11017
10546	11018	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10547	11019
..	..	@@ -10627,13 +11099,43 @@
10627	11099	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10628	11100	}
10629	11101
10630		- 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"))
10631	11110	{
10632		- LoadEnvy(newenvy);
	11111	+ if (cubemaprgb == null)
	11112	+ {
	11113	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11114	+ }
	11115	+
	11116	+ cubemap = cubemaprgb;
10633	11117	}
10634		-
10635		- newenvy = -1;
10636		-
	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	+
10637	11139	ratio = ((double) getWidth()) / getHeight();
10638	11140	//System.out.println("ratio = " + ratio);
10639	11141
..	..	@@ -10649,7 +11151,7 @@
10649	11151
10650	11152	if (!IsFrozen() && !ambientOcclusion)
10651	11153	{
10652		- DrawSkyBox(gl);
	11154	+ DrawSkyBox(gl, (float)ratio);
10653	11155	}
10654	11156
10655	11157	//if (selection_view == -1)
..	..	@@ -10832,9 +11334,9 @@
10832	11334
10833	11335	gl.glMatrixMode(GL.GL_MODELVIEW);
10834	11336
10835		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10836		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10837		-//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);
10838	11340	} else
10839	11341	{
10840	11342	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10845,7 +11347,7 @@
10845	11347	//System.out.println("BLENDING ON");
10846	11348	gl.glEnable(GL.GL_BLEND);
10847	11349	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10848		-
	11350	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10849	11351	gl.glMatrixMode(gl.GL_PROJECTION);
10850	11352	gl.glLoadIdentity();
10851	11353
..	..	@@ -10934,8 +11436,8 @@
10934	11436	System.err.println("parentcam != renderCamera");
10935	11437
10936	11438	// if (cam != lightCamera)
10937		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10938		- 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
10939	11441	}
10940	11442
10941	11443	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10956,8 +11458,8 @@
10956	11458	if (true) // TODO
10957	11459	{
10958	11460	if (cam != lightCamera)
10959		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10960		- 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
10961	11463	}
10962	11464
10963	11465	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11094,7 +11596,7 @@
11094	11596	}
11095	11597	}
11096	11598
11097		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11599	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11098	11600	{
11099	11601	//gl.glDepthFunc(GL.GL_LEQUAL);
11100	11602	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11102,24 +11604,21 @@
11102	11604
11103	11605	boolean texon = textureon;
11104	11606
11105		- if (RENDERPROGRAM > 0)
11106		- {
11107		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11108		- textureon = false;
11109		- }
	11607	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11608	+ textureon = false;
	11609	+
11110	11610	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11111	11611	//System.out.println("ALLO");
11112	11612	gl.glColorMask(false, false, false, false);
11113	11613	DrawObject(gl);
11114		- if (RENDERPROGRAM > 0)
11115		- {
11116		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11117		- textureon = texon;
11118		- }
	11614	+
	11615	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11616	+ textureon = texon;
	11617	+
11119	11618	gl.glColorMask(true, true, true, true);
11120	11619
11121	11620	gl.glDepthFunc(GL.GL_EQUAL);
11122		- //gl.glDepthMask(false);
	11621	+ gl.glDepthMask(false);
11123	11622	}
11124	11623
11125	11624	if (false) // DrawMode() == SHADOW)
..	..	@@ -11302,15 +11801,36 @@
11302	11801
11303	11802	static boolean zoomonce = false;
11304	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	+
11305	11822	void DrawObject(GL gl, boolean draw)
11306	11823	{
	11824	+ // To clear camera values
	11825	+ ResetOptions();
	11826	+
11307	11827	//System.out.println("DRAW OBJECT " + mouseDown);
11308	11828	// DrawMode() = SELECTION;
11309	11829	//GL gl = getGL();
11310	11830	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11311	11831	{
11312	11832	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11313		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11833	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11314	11834	pingthread.StepToTarget(true); // true);
11315	11835	// zoomonce = false;
11316	11836	}
..	..	@@ -11382,8 +11902,9 @@
11382	11902
11383	11903	if (DrawMode() == DEFAULT)
11384	11904	{
11385		- if (DEBUG)
	11905	+ if (Globals.DEBUG)
11386	11906	{
	11907	+ CreateSelectedPoint();
11387	11908	float radius = 0.05f;
11388	11909	if (selectedpoint.radius != radius)
11389	11910	{
..	..	@@ -11437,20 +11958,32 @@
11437	11958	ReleaseTextures(DEFAULT_TEXTURES);
11438	11959
11439	11960	if (CLEANCACHE)
11440		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11961	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11441	11962	{
11442		- String tex = e.nextElement();
	11963	+ cTexture tex = e.nextElement();
11443	11964
11444	11965	// System.out.println("Texture --------- " + tex);
11445	11966
11446		- if (tex.equals("WHITE_NOISE"))
	11967	+ if (tex.equals("WHITE_NOISE:"))
11447	11968	continue;
11448	11969
11449		- if (!usedtextures.containsKey(tex))
	11970	+ if (!usedtextures.contains(tex))
11450	11971	{
	11972	+ CacheTexture gettex = texturepigment.get(tex);
11451	11973	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11452		- textures.get(tex).texture.dispose();
11453		- 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	+ }
11454	11987	}
11455	11988	}
11456	11989	}
..	..	@@ -11552,7 +12085,7 @@
11552	12085	return;
11553	12086	}
11554	12087
11555		- String string = obj.GetToolTip();
	12088	+ String string = obj.toString(); //.GetToolTip();
11556	12089
11557	12090	GL gl = GetGL();
11558	12091
..	..	@@ -11869,8 +12402,8 @@
11869	12402	//obj.TransformToWorld(light, light);
11870	12403	for (int i = tp.size(); --i >= 0;)
11871	12404	{
11872		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11873		- 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);
11874	12407	}
11875	12408
11876	12409
..	..	@@ -11887,8 +12420,8 @@
11887	12420	parentcam = cameras[0];
11888	12421	}
11889	12422
11890		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11891		- 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
11892	12425
11893	12426	LA.xformPos(light, renderCamera.toScreen, light);
11894	12427
..	..	@@ -11978,8 +12511,76 @@
11978	12511
11979	12512	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11980	12513
11981		- String program =
	12514	+ String programmin =
	12515	+ // Min shader
11982	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	+
11983	12584	//"OPTION ARB_fragment_program_shadow;" +
11984	12585	"PARAM light2cam0 = program.env[10];" +
11985	12586	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12005,7 +12606,7 @@
12005	12606	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12006	12607	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12007	12608	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12008		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12609	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12009	12610	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12010	12611	"PARAM options1 = program.env[62];" + // fog rgb color
12011	12612	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12094,8 +12695,7 @@
12094	12695	"TEMP shininess;" +
12095	12696	"\n" +
12096	12697	"MOV texSamp, one;" +
12097		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12098		-
	12698	+
12099	12699	"MOV mapgrid.x, one2048th.x;" +
12100	12700	"MOV temp, fragment.texcoord[1];" +
12101	12701	/*
..	..	@@ -12116,20 +12716,20 @@
12116	12716	"MUL temp, floor, mapgrid.x;" +
12117	12717	//"TEX depth0, temp, texture[1], 2D;" +
12118	12718	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12119		- TextureFetch("depth0", "temp", "1") +
	12719	+ ShadowTextureFetch("depth0", "temp", "1") +
12120	12720	"") +
12121	12721	"ADD temp.x, temp.x, mapgrid.x;" +
12122	12722	//"TEX depth1, temp, texture[1], 2D;" +
12123	12723	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12124		- TextureFetch("depth1", "temp", "1") +
	12724	+ ShadowTextureFetch("depth1", "temp", "1") +
12125	12725	"") +
12126	12726	"ADD temp.y, temp.y, mapgrid.x;" +
12127	12727	//"TEX depth2, temp, texture[1], 2D;" +
12128		- TextureFetch("depth2", "temp", "1") +
	12728	+ ShadowTextureFetch("depth2", "temp", "1") +
12129	12729	"SUB temp.x, temp.x, mapgrid.x;" +
12130	12730	//"TEX depth3, temp, texture[1], 2D;" +
12131	12731	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12132		- TextureFetch("depth3", "temp", "1") +
	12732	+ ShadowTextureFetch("depth3", "temp", "1") +
12133	12733	"") +
12134	12734	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12135	12735	//"MOV params, material;" +
..	..	@@ -12251,7 +12851,7 @@
12251	12851	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12252	12852	// mar 2013 ??? "KIL alpha.a;" +
12253	12853	"MOV alpha, texSamp.aaaa;" + // y;" +
12254		- "KIL alpha.a;" +
	12854	+ "KIL alpha.a;" + // not sure with parallax mapping
12255	12855	/*
12256	12856	"MUL temp.xy, temp, two;" +
12257	12857	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12337,11 +12937,6 @@
12337	12937	"SUB bump0, bump0, half;" +
12338	12938	"ADD bump, bump, bump0;" +
12339	12939
12340		- "MOV temp.x, texSamp.a;" +
12341		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12342		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12343		- "MOV texSamp.a, temp.x;" +
12344		-
12345	12940	// double-sided
12346	12941	/**/
12347	12942	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12358,19 +12953,62 @@
12358	12953	"MOV normald, normal;" +
12359	12954	"MOV normals, normal;" +
12360	12955
	12956	+ "MOV temp, fragment.texcoord[4];" +
	12957	+
12361	12958	// UV base
12362	12959	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12363	12960	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12364	12961	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12365		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12366		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12367		- "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	+
12368	12967	"XPD V, normal, UP;" +
12369	12968	Normalize("V") +
12370	12969	"XPD U, V, normal;" +
12371	12970	Normalize("U") +
12372	12971
12373	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;" +
12374	13012
12375	13013	//"MOV temp, fragment.texcoord[0];" +
12376	13014	//
..	..	@@ -12500,10 +13138,10 @@
12500	13138	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12501	13139	"") +
12502	13140
12503		- // display shadow only (bump == 0)
	13141	+ // display shadow only (fakedepth == 0)
12504	13142	"SUB temp.x, half.x, shadow.x;" +
12505	13143	"MOV temp.y, -params5.z;" + // params6.x;" +
12506		- "SLT temp.z, temp.y, -one2048th.x;" +
	13144	+ "SLT temp.z, temp.y, -c256i.x;" +
12507	13145	"SUB temp.y, one.x, temp.z;" +
12508	13146	"MUL temp.x, temp.x, temp.y;" +
12509	13147	"KIL temp.x;" +
..	..	@@ -12834,8 +13472,19 @@
12834	13472	//once = true;
12835	13473	}
12836	13474
12837		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12838		- 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	+
12839	13488	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12840	13489
12841	13490	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12882,7 +13531,8 @@
12882	13531	"\n" +
12883	13532	"END\n";
12884	13533
12885		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13534	+ if (Globals.DEBUG)
	13535	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
12886	13536	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12887	13537
12888	13538	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12927,25 +13577,26 @@
12927	13577	return out;
12928	13578	}
12929	13579
12930		- String TextureFetch(String dest, String src, String unit)
	13580	+ // Also does frustum culling
	13581	+ String ShadowTextureFetch(String dest, String src, String unit)
12931	13582	{
12932	13583	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12933	13584	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12934	13585	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13586	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13587	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12935	13588	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12936		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12937		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12938		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12939		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13589	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13590	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12940	13591	//"SWZ buffer, temp, w,w,w,w;";
12941		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13592	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12942	13593	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12943	13594	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12944	13595	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12945		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13596	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12946	13597
12947		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12948		- //"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;";
12949	13600	}
12950	13601
12951	13602	String Shadow(String depth, String shadow)
..	..	@@ -12992,7 +13643,7 @@
12992	13643	"SLT temp.x, temp.x, zero.x;" + // shadoweps
12993	13644	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12994	13645
12995		- // No shadow when out of frustrum
	13646	+ // No shadow when out of frustum
12996	13647	"SGE temp.x, " + depth + ".z, one.z;" +
12997	13648	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12998	13649	"";
..	..	@@ -13139,8 +13790,9 @@
13139	13790	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13140	13791	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13141	13792	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13142		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13143		- Object3D.cVector2[] vector2buffer;
	13793	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
	13794	+
	13795	+ //Object3D.cVector2[] vector2buffer;
13144	13796
13145	13797	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13146	13798	// OUT : diff, spec
..	..	@@ -13156,9 +13808,10 @@
13156	13808	"DP3 " + dest + ".z," + "normals," + "eye;" +
13157	13809	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13158	13810	//"MOV " + dest + ".w," + "normal.z;" +
13159		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13160		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13161		- //"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
13162	13815	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13163	13816	"RCP " + dest + ".w," + dest + ".w;" +
13164	13817	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13304,7 +13957,7 @@
13304	13957	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13305	13958	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13306	13959	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13307		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	13960	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13308	13961	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13309	13962	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13310	13963	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13365,7 +14018,7 @@
13365	14018	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13366	14019	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13367	14020	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13368		- //"MOV result.texcoord, vertex.texcoord;" +
	14021	+ //"MOV result.texcoord, vertex.fogcoord;" +
13369	14022	"MOV result.texcoord, temp;" +
13370	14023	// border fade
13371	14024	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13412,7 +14065,9 @@
13412	14065
13413	14066	//"ADD temp.z, temp.z, one;" +
13414	14067
13415		- "MOV result.color, temp;"
	14068	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14069	+
	14070	+ "MOV result.color, temp;" // Normal
13416	14071	: "MOV result.color, vertex.color;") +
13417	14072	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13418	14073	: "") +
..	..	@@ -13663,6 +14318,7 @@
13663	14318	else
13664	14319	if (evt.getSource() == AAtimer)
13665	14320	{
	14321	+ Globals.TIMERRUNNING = false;
13666	14322	if (mouseDown)
13667	14323	{
13668	14324	//new Exception().printStackTrace();
..	..	@@ -13722,7 +14378,7 @@
13722	14378
13723	14379	// fev 2014???
13724	14380	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13725		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14381	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13726	14382	pingthread.StepToTarget(true); // true);
13727	14383	}
13728	14384	// if (!LIVE)
..	..	@@ -13737,6 +14393,7 @@
13737	14393	return;
13738	14394
13739	14395	AAtimer.restart(); //
	14396	+ Globals.TIMERRUNNING = true;
13740	14397
13741	14398	// waslive = LIVE;
13742	14399	// LIVE = false;
..	..	@@ -13786,14 +14443,15 @@
13786	14443	drag = false;
13787	14444	//System.out.println("Mouse DOWN");
13788	14445	editObj = false;
13789		- ClickInfo info = new ClickInfo();
13790		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13791		- info.pane = this;
13792		- info.camera = renderCamera;
13793		- info.x = x;
13794		- info.y = y;
13795		- info.modifiers = modifiersex;
13796		- 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);
13797	14455	if (!editObj)
13798	14456	{
13799	14457	hasMarquee = true;
..	..	@@ -13809,9 +14467,12 @@
13809	14467
13810	14468	public void mouseDragged(MouseEvent e)
13811	14469	{
	14470	+ Globals.MOUSEDRAGGED = true;
	14471	+
13812	14472	//System.out.println("mouseDragged: " + e);
13813	14473	if (isRenderer)
13814	14474	movingcamera = true;
	14475	+
13815	14476	//if (drawing)
13816	14477	//return;
13817	14478	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -14072,12 +14733,18 @@
14072	14733	void GoDown(int mod)
14073	14734	{
14074	14735	MODIFIERS \|= COMMAND;
14075		- /*
	14736	+ boolean isVR = (mouseMode&VR)!=0;
	14737	+ /**/
14076	14738	if((mod&SHIFT) == SHIFT)
14077		- manipCamera.RotatePosition(0, -speed);
	14739	+ {
	14740	+ if (isVR)
	14741	+ manipCamera.RotateInterest(0, -speed);
	14742	+ else
	14743	+ manipCamera.RotatePosition(0, -speed);
	14744	+ }
14078	14745	else
14079		- manipCamera.BackForth(0, -speed*delta, getWidth());
14080		- */
	14746	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	14747	+ /**/
14081	14748	if ((mod & SHIFT) == SHIFT)
14082	14749	{
14083	14750	mouseMode = mouseMode; // VR??
..	..	@@ -14086,6 +14753,8 @@
14086	14753	mouseMode \|= BACKFORTH;
14087	14754	}
14088	14755
	14756	+ targetLookAt.set(manipCamera.lookAt);
	14757	+
14089	14758	//prevX = X = anchorX;
14090	14759	prevY = Y = anchorY - (int) (renderCamera.Distance());
14091	14760	}
..	..	@@ -14093,12 +14762,19 @@
14093	14762	void GoUp(int mod)
14094	14763	{
14095	14764	MODIFIERS \|= COMMAND;
14096		- /*
	14765	+ /**/
	14766	+ boolean isVR = (mouseMode&VR)!=0;
	14767	+
14097	14768	if((mod&SHIFT) == SHIFT)
14098		- manipCamera.RotatePosition(0, speed);
	14769	+ {
	14770	+ if (isVR)
	14771	+ manipCamera.RotateInterest(0, speed);
	14772	+ else
	14773	+ manipCamera.RotatePosition(0, speed);
	14774	+ }
14099	14775	else
14100		- manipCamera.BackForth(0, speed*delta, getWidth());
14101		- */
	14776	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	14777	+ /**/
14102	14778	if ((mod & SHIFT) == SHIFT)
14103	14779	{
14104	14780	mouseMode = mouseMode;
..	..	@@ -14107,6 +14783,8 @@
14107	14783	mouseMode \|= BACKFORTH;
14108	14784	}
14109	14785
	14786	+ targetLookAt.set(manipCamera.lookAt);
	14787	+
14110	14788	//prevX = X = anchorX;
14111	14789	prevY = Y = anchorY + (int) (renderCamera.Distance());
14112	14790	}
..	..	@@ -14114,12 +14792,17 @@
14114	14792	void GoLeft(int mod)
14115	14793	{
14116	14794	MODIFIERS \|= COMMAND;
14117		- /*
	14795	+ /**/
14118	14796	if((mod&SHIFT) == SHIFT)
14119		- manipCamera.RotatePosition(speed, 0);
	14797	+ manipCamera.Translate(speed*delta, 0, getWidth());
14120	14798	else
14121		- manipCamera.Translate(speed*delta, 0, getWidth());
14122		- */
	14799	+ {
	14800	+ if ((mouseMode&VR)!=0)
	14801	+ manipCamera.RotateInterest(-speed, 0);
	14802	+ else
	14803	+ manipCamera.RotatePosition(speed, 0);
	14804	+ }
	14805	+ /**/
14123	14806	if ((mod & SHIFT) == SHIFT)
14124	14807	{
14125	14808	mouseMode = mouseMode;
..	..	@@ -14128,6 +14811,8 @@
14128	14811	mouseMode \|= ROTATE;
14129	14812	} // TRANSLATE;
14130	14813
	14814	+ targetLookAt.set(manipCamera.lookAt);
	14815	+
14131	14816	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14132	14817	prevY = Y = anchorY;
14133	14818	}
..	..	@@ -14135,12 +14820,18 @@
14135	14820	void GoRight(int mod)
14136	14821	{
14137	14822	MODIFIERS \|= COMMAND;
14138		- /*
	14823	+ /**/
14139	14824	if((mod&SHIFT) == SHIFT)
14140		- manipCamera.RotatePosition(-speed, 0);
	14825	+ manipCamera.Translate(-speed*delta, 0, getWidth());
14141	14826	else
14142		- manipCamera.Translate(-speed*delta, 0, getWidth());
14143		- */
	14827	+ {
	14828	+ if ((mouseMode&VR)!=0)
	14829	+ manipCamera.RotateInterest(speed, 0);
	14830	+ else
	14831	+ manipCamera.RotatePosition(-speed, 0);
	14832	+ }
	14833	+
	14834	+ /**/
14144	14835	if ((mod & SHIFT) == SHIFT)
14145	14836	{
14146	14837	mouseMode = mouseMode;
..	..	@@ -14149,6 +14840,8 @@
14149	14840	mouseMode \|= ROTATE;
14150	14841	} // TRANSLATE;
14151	14842
	14843	+ targetLookAt.set(manipCamera.lookAt);
	14844	+
14152	14845	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14153	14846	prevY = Y = anchorY;
14154	14847	}
..	..	@@ -14190,14 +14883,16 @@
14190	14883	if (editObj)
14191	14884	{
14192	14885	drag = true;
14193		- ClickInfo info = new ClickInfo();
14194		- info.bounds.setBounds(0, 0,
	14886	+ //ClickInfo info = new ClickInfo();
	14887	+ object.clickInfo.bounds.setBounds(0, 0,
14195	14888	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14196		- info.pane = this;
14197		- info.camera = renderCamera;
14198		- info.x = x;
14199		- info.y = y;
14200		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	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);
14201	14896	} else
14202	14897	{
14203	14898	if (x < startX)
..	..	@@ -14346,22 +15041,27 @@
14346	15041	}
14347	15042	}
14348	15043
	15044	+// ClickInfo clickInfo = new ClickInfo();
	15045	+
14349	15046	public void mouseMoved(MouseEvent e)
14350	15047	{
14351	15048	//System.out.println("mouseMoved: " + e);
14352	15049	if (isRenderer)
14353	15050	return;
14354	15051
14355		- ClickInfo ci = new ClickInfo();
14356		- ci.x = e.getX();
14357		- ci.y = e.getY();
14358		- ci.modifiers = e.getModifiersEx();
14359		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14360		- ci.pane = this;
14361		- 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;
14362	15059	if (!isRenderer)
14363	15060	{
14364		- if (object.editWindow.copy.doEditClick(ci, 0))
	15061	+ //ObjEditor editWindow = object.editWindow;
	15062	+ //Object3D copy = editWindow.copy;
	15063	+ if (object.doEditClick(//clickInfo,
	15064	+ 0))
14365	15065	{
14366	15066	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14367	15067	} else
..	..	@@ -14373,8 +15073,11 @@
14373	15073
14374	15074	public void mouseReleased(MouseEvent e)
14375	15075	{
	15076	+ Globals.MOUSEDRAGGED = false;
	15077	+
14376	15078	movingcamera = false;
14377		- X = Y = 0;
	15079	+ X = 0; // getBounds().width/2;
	15080	+ Y = 0; // getBounds().height/2;
14378	15081	//System.out.println("mouseReleased: " + e);
14379	15082	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14380	15083	}
..	..	@@ -14630,7 +15333,8 @@
14630	15333	// break;
14631	15334	case 'T':
14632	15335	CACHETEXTURE ^= true;
14633		- textures.clear();
	15336	+ texturepigment.clear();
	15337	+ texturebump.clear();
14634	15338	// repaint();
14635	15339	break;
14636	15340	case 'Y':
..	..	@@ -14640,8 +15344,8 @@
14640	15344	case 'K':
14641	15345	KOMPACTTEXTURE ^= true;
14642	15346	//textures.clear();
14643		- break;
14644		- case 'P': // Texture Projection macros
	15347	+ // break;
	15348	+ //case 'P': // Texture Projection macros
14645	15349	// SAVETEXTURE ^= true;
14646	15350	macromode = true;
14647	15351	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -14715,7 +15419,9 @@
14715	15419	case 'E' : COMPACT ^= true;
14716	15420	repaint();
14717	15421	break;
14718		- case 'W' : DEBUGHSB ^= true;
	15422	+ case 'W' : // Wide Window (fullscreen)
	15423	+ //DEBUGHSB ^= true;
	15424	+ ObjEditor.theFrame.ToggleFullScreen();
14719	15425	repaint();
14720	15426	break;
14721	15427	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14740,8 +15446,8 @@
14740	15446	RevertCamera();
14741	15447	repaint();
14742	15448	break;
14743		- case 'L':
14744	15449	case 'l':
	15450	+ //case 'L':
14745	15451	if (lightMode)
14746	15452	{
14747	15453	lightMode = false;
..	..	@@ -14760,7 +15466,7 @@
14760	15466	targetLookAt.set(manipCamera.lookAt);
14761	15467	repaint();
14762	15468	break;
14763		- case 'p':
	15469	+ case 'P': // p':
14764	15470	// c'est quoi ca au juste? spherical ^= true;
14765	15471	Skinshader ^= true; programInitialized = false;
14766	15472	repaint();
..	..	@@ -14805,20 +15511,24 @@
14805	15511	OCCLUSION_CULLING ^= true;
14806	15512	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14807	15513	break;
14808		- case '0': envyoff ^= true; repaint(); break;
	15514	+ //case '0': envyoff ^= true; repaint(); break;
14809	15515	case '1':
14810	15516	case '2':
14811	15517	case '3':
14812	15518	case '4':
14813	15519	case '5':
14814		- newenvy = Character.getNumericValue(key);
14815		- repaint();
14816		- break;
14817	15520	case '6':
14818	15521	case '7':
14819	15522	case '8':
14820	15523	case '9':
14821		- 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	+ }
14822	15532	repaint();
14823	15533	break;
14824	15534	case '!':
..	..	@@ -14884,9 +15594,9 @@
14884	15594	case '_':
14885	15595	kompactbit = 5;
14886	15596	break;
14887		- case '+':
14888		- kompactbit = 6;
14889		- break;
	15597	+// case '+':
	15598	+// kompactbit = 6;
	15599	+// break;
14890	15600	case ' ':
14891	15601	lightMode ^= true;
14892	15602	Globals.lighttouched = true;
..	..	@@ -14898,6 +15608,7 @@
14898	15608	case ESC:
14899	15609	RENDERPROGRAM += 1;
14900	15610	RENDERPROGRAM %= 3;
	15611	+
14901	15612	repaint();
14902	15613	break;
14903	15614	case 'Z':
..	..	@@ -14937,8 +15648,9 @@
14937	15648	case DELETE:
14938	15649	ClearSelection();
14939	15650	break;
14940		- /*
14941	15651	case '+':
	15652	+
	15653	+ /*
14942	15654	//fontsize += 1;
14943	15655	bbzoom *= 2;
14944	15656	repaint();
..	..	@@ -14955,17 +15667,17 @@
14955	15667	case '=':
14956	15668	IncDepth();
14957	15669	//fontsize += 1;
14958		- object.editWindow.refreshContents(true);
	15670	+ object.GetWindow().refreshContents(true);
14959	15671	maskbit = 6;
14960	15672	break;
14961	15673	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14962	15674	DecDepth();
14963	15675	maskbit = 5;
14964	15676	//if(fontsize > 1) fontsize -= 1;
14965		- if (object.editWindow == null)
14966		- new Exception().printStackTrace();
14967		- else
14968		- object.editWindow.refreshContents(true);
	15677	+// if (object.editWindow == null)
	15678	+// new Exception().printStackTrace();
	15679	+// else
	15680	+ object.GetWindow().refreshContents(true);
14969	15681	break;
14970	15682	case '{':
14971	15683	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15189,7 +15901,7 @@
15189	15901	}
15190	15902	*/
15191	15903
15192		- object.editWindow.EditSelection();
	15904	+ object.GetWindow().EditSelection(false);
15193	15905	}
15194	15906
15195	15907	void SelectParent()
..	..	@@ -15206,10 +15918,10 @@
15206	15918	{
15207	15919	//selectees.remove(i);
15208	15920	System.out.println("select parent of " + elem);
15209		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15921	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15210	15922	} else
15211	15923	{
15212		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15924	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15213	15925	}
15214	15926
15215	15927	first = false;
..	..	@@ -15251,12 +15963,12 @@
15251	15963	for (int j = 0; j < group.children.size(); j++)
15252	15964	{
15253	15965	elem = (Object3D) group.children.elementAt(j);
15254		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15966	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15255	15967	first = false;
15256	15968	}
15257	15969	} else
15258	15970	{
15259		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15971	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15260	15972	}
15261	15973
15262	15974	first = false;
..	..	@@ -15267,21 +15979,21 @@
15267	15979	{
15268	15980	//Composite group = (Composite) object;
15269	15981	Object3D group = object;
15270		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15982	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15271	15983	}
15272	15984
15273	15985	void ResetTransform(int mask)
15274	15986	{
15275	15987	//Composite group = (Composite) object;
15276	15988	Object3D group = object;
15277		- group.editWindow.ResetTransform(mask);
	15989	+ group.GetWindow().ResetTransform(mask);
15278	15990	}
15279	15991
15280	15992	void FlipTransform()
15281	15993	{
15282	15994	//Composite group = (Composite) object;
15283	15995	Object3D group = object;
15284		- group.editWindow.FlipTransform();
	15996	+ group.GetWindow().FlipTransform();
15285	15997	// group.editWindow.ReduceMesh(true);
15286	15998	}
15287	15999
..	..	@@ -15289,7 +16001,7 @@
15289	16001	{
15290	16002	//Composite group = (Composite) object;
15291	16003	Object3D group = object;
15292		- group.editWindow.PrintMemory();
	16004	+ group.GetWindow().PrintMemory();
15293	16005	// group.editWindow.ReduceMesh(true);
15294	16006	}
15295	16007
..	..	@@ -15297,7 +16009,7 @@
15297	16009	{
15298	16010	//Composite group = (Composite) object;
15299	16011	Object3D group = object;
15300		- group.editWindow.ResetCentroid();
	16012	+ group.GetWindow().ResetCentroid();
15301	16013	}
15302	16014
15303	16015	void IncDepth()
..	..	@@ -15379,8 +16091,6 @@
15379	16091
15380	16092	int width = getBounds().width;
15381	16093	int height = getBounds().height;
15382		- ClickInfo info = new ClickInfo();
15383		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15384	16094	//Image img = CreateImage(width, height);
15385	16095	//System.out.println("width = " + width + "; height = " + height + "\n");
15386	16096
..	..	@@ -15457,43 +16167,77 @@
15457	16167	}
15458	16168	if (object != null && !hasMarquee)
15459	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	+
15460	16176	if (isRenderer)
15461	16177	{
15462		- info.flags++;
	16178	+ object.clickInfo.flags++;
15463	16179	double frameAspect = (double) width / (double) height;
15464	16180	if (frameAspect > renderCamera.aspect)
15465	16181	{
15466	16182	int desired = (int) ((double) height * renderCamera.aspect);
15467		- info.bounds.width -= width - desired;
15468		- info.bounds.x += (width - desired) / 2;
	16183	+ object.clickInfo.bounds.width -= width - desired;
	16184	+ object.clickInfo.bounds.x += (width - desired) / 2;
15469	16185	} else
15470	16186	{
15471	16187	int desired = (int) ((double) width / renderCamera.aspect);
15472		- info.bounds.height -= height - desired;
15473		- info.bounds.y += (height - desired) / 2;
	16188	+ object.clickInfo.bounds.height -= height - desired;
	16189	+ object.clickInfo.bounds.y += (height - desired) / 2;
15474	16190	}
15475	16191	}
15476		- info.g = gr;
15477		- info.camera = renderCamera;
	16192	+
	16193	+ object.clickInfo.g = gr;
	16194	+ object.clickInfo.camera = renderCamera;
15478	16195	/*
15479	16196	// Memory intensive (brep.verticescopy)
15480	16197	if (!(object instanceof Composite))
15481	16198	object.draw(info, 0, false); // SLOW :
15482	16199	*/
15483		- if (!isRenderer)
	16200	+ if (!isRenderer) // && drag)
15484	16201	{
15485		- object.drawEditHandles(info, 0);
15486		-
15487		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16202	+ Grafreed.Assert(object != null);
	16203	+ Grafreed.Assert(object.selection != null);
	16204	+ if (object.selection.Size() > 0)
15488	16205	{
15489		- switch (object.selection.get(0).hitSomething)
	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)
15490	16212	{
15491		- case Object3D.hitCenter: gr.setColor(Color.pink); break;
15492		- case Object3D.hitRotate: gr.setColor(Color.green); break;
15493		- case Object3D.hitScale: gr.setColor(Color.cyan); break;
	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;
15494	16220	}
15495		-
15496		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	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	+ }
15497	16241	}
15498	16242	}
15499	16243	}
..	..	@@ -15508,7 +16252,7 @@
15508	16252	if (hasMarquee)
15509	16253	{
15510	16254	gr.setXORMode(Color.white);
15511		- gr.setColor(Color.red);
	16255	+ gr.setColor(Color.white);
15512	16256	if (!firstime)
15513	16257	{
15514	16258	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -15911,7 +16655,7 @@
15911	16655	Object3D object;
15912	16656	static Object3D trackedobject;
15913	16657	Camera renderCamera; // Light or Eye (or Occlusion)
15914		- /static/ Camera manipCamera; // Light or Eye
	16658	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15915	16659	/static/ Camera eyeCamera;
15916	16660	/static/ Camera lightCamera;
15917	16661	int cameracount;
..	..	@@ -15975,6 +16719,8 @@
15975	16719	private /static/ boolean firstime;
15976	16720	private /static/ cVector newView = new cVector();
15977	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"};
15978	16724	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15979	16725	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15980	16726	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15987,29 +16733,67 @@
15987	16733	{
15988	16734	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15989	16735
	16736	+ int usedsuf = 0;
	16737	+
15990	16738	for (int i = 0; i < suffixes.length; i++)
15991	16739	{
15992		- String resourceName = basename + suffixes[i] + "." + suffix;
15993		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15994		- mipmapped,
15995		- FileUtil.getFileSuffix(resourceName));
15996		- if (data == null)
	16740	+ String[] suffixe = suffixes;
	16741	+ String[] fallback = suffixes2;
	16742	+ String[] fallfallback = suffixes3;
	16743	+
	16744	+ for (int c=usedsuf; --c>=0;)
15997	16745	{
15998		- throw new IOException("Unable to load texture " + resourceName);
	16746	+// String[] temp = suffixe;
	16747	+// suffixe = fallback;
	16748	+// fallback = fallfallback;
	16749	+// fallfallback = temp;
15999	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	+
16000	16779	//System.out.println("Target = " + targets[i]);
16001	16780	cubemap.updateImage(data, targets[i]);
16002	16781	}
16003	16782
16004	16783	return cubemap;
16005	16784	}
	16785	+
16006	16786	int bigsphere = -1;
16007	16787
16008	16788	float BGcolor = 0.5f;
16009	16789
16010		- private void DrawSkyBox(GL gl)
	16790	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16791	+
	16792	+ private void DrawSkyBox(GL gl, float ratio)
16011	16793	{
16012		- if (envyoff \|\| cubemap == null)
	16794	+ if (//envyoff \|\|
	16795	+ WIREFRAME \|\|
	16796	+ cubemap == null)
16013	16797	{
16014	16798	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16015	16799	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16024,7 +16808,17 @@
16024	16808	// Compensates for ExaminerViewer's modification of modelview matrix
16025	16809	gl.glMatrixMode(GL.GL_MODELVIEW);
16026	16810	gl.glLoadIdentity();
	16811	+ gl.glScalef(1,ratio,1);
16027	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	+
16028	16822	//gl.glActiveTexture(GL.GL_TEXTURE1);
16029	16823	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16030	16824
..	..	@@ -16056,6 +16850,7 @@
16056	16850	{
16057	16851	gl.glScalef(1.0f, -1.0f, 1.0f);
16058	16852	}
	16853	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16059	16854	gl.glMultMatrixd(viewrot_1, 0);
16060	16855	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16061	16856	//viewer.updateInverseRotation(gl);
..	..	@@ -16096,7 +16891,8 @@
16096	16891	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16097	16892
16098	16893	cubemap.disable();
16099		- ////cubemap.unbind();
	16894	+ //cubemap.dispose();
	16895	+
16100	16896	if (CULLFACE)
16101	16897	{
16102	16898	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16152,7 +16948,7 @@
16152	16948	gl.glScalef(1.0f, -1.0f, 1.0f);
16153	16949	}
16154	16950
16155		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	16951	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16156	16952
16157	16953	float step = 2; // 0.1666f; //0.25f;
16158	16954	float stepv = 2; // step * 1652 / 998;
..	..	@@ -16196,16 +16992,16 @@
16196	16992	cStatic.objectstack[materialdepth++] = checker;
16197	16993	//System.out.println("material " + material);
16198	16994	//Applet3D.tracein(this, selected);
16199		- vector2buffer = checker.projectedVertices;
	16995	+ //vector2buffer = checker.projectedVertices;
16200	16996
16201	16997	//checker.GetMaterial().Draw(this, false); // true);
16202		- DrawMaterial(checker.GetMaterial(), false); // true);
	16998	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16203	16999
16204	17000	materialdepth -= 1;
16205	17001	if (materialdepth > 0)
16206	17002	{
16207		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16208		- 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);
16209	17005	}
16210	17006	//checker.GetMaterial().opacity = 1f;
16211	17007	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16291,6 +17087,14 @@
16291	17087	}
16292	17088	}
16293	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	+
16294	17098	class SelectBuffer implements GLEventListener
16295	17099	{
16296	17100
..	..	@@ -16306,7 +17110,7 @@
16306	17110	//new Exception().printStackTrace();
16307	17111	System.out.println("select buffer init");
16308	17112	// Use debug pipeline
16309		- drawable.setGL(new DebugGL(drawable.getGL()));
	17113	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16310	17114
16311	17115	GL gl = drawable.getGL();
16312	17116
..	..	@@ -16370,6 +17174,17 @@
16370	17174
16371	17175	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16372	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	+
16373	17188	//int tmp = selection_view;
16374	17189	//selection_view = -1;
16375	17190	int temp = DrawMode();
..	..	@@ -16381,6 +17196,17 @@
16381	17196	// temp = DEFAULT; // patch for selection debug
16382	17197	Globals.drawMode = temp; // WARNING
16383	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	+
16384	17210	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16385	17211
16386	17212	// trying different ways of getting the depth info over
..	..	@@ -16428,6 +17254,8 @@
16428	17254	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16429	17255	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16430	17256	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17257	+
	17258	+ CreateSelectedPoint();
16431	17259
16432	17260	// Will fit the mesh !!!
16433	17261	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16482,29 +17310,31 @@
16482	17310	}
16483	17311
16484	17312	if (!movingcamera && !PAINTMODE)
16485		- object.editWindow.ScreenFitPoint(); // fev 2014
	17313	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16486	17314
16487		- 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)
16488	17316	{
16489		- 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);
16490	17318
16491		- Object3D group = new Object3D("inst" + paintcount++);
	17319	+ if (object.GetWindow().copy.selection.Size() > 0)
	17320	+ {
	17321	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16492	17322
16493		- group.CreateMaterial(); // use a void leaf to select instances
16494		-
16495		- group.add(paintobj); // link
16496		-
16497		- object.editWindow.SnapObject(group);
16498		-
16499		- Object3D folder = object.editWindow.copy;
16500		-
16501		- if (object.editWindow.copy.selection.Size() > 0)
16502		- folder = object.editWindow.copy.selection.elementAt(0);
16503		-
16504		- folder.add(group);
16505		-
16506		- object.editWindow.ResetModel();
16507		- 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	+ }
16508	17338	}
16509	17339	else
16510	17340	paintcount = 0;
..	..	@@ -16543,6 +17373,11 @@
16543	17373	//System.out.println("objects[color] = " + objects[color]);
16544	17374	//objects[color].Select();
16545	17375	indexcount = 0;
	17376	+ ObjEditor window = object.GetWindow();
	17377	+ if (window != null && deselect)
	17378	+ {
	17379	+ window.Select(null, deselect, true);
	17380	+ }
16546	17381	object.Select(color, deselect);
16547	17382	}
16548	17383
..	..	@@ -16593,6 +17428,7 @@
16593	17428
16594	17429	public void init(GLAutoDrawable drawable)
16595	17430	{
	17431	+ if (Globals.DEBUG)
16596	17432	System.out.println("shadow buffer init");
16597	17433
16598	17434	GL gl = drawable.getGL();
..	..	@@ -16821,10 +17657,14 @@
16821	17657	gl.glFlush();
16822	17658
16823	17659	/**/
16824		- 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);
16825	17661
16826		- float[] pixels = occlusionsizebuffer.array();
	17662	+ float[] depths = occlusiondepthbuffer.array();
16827	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	+
16828	17668	double r = 0, g = 0, b = 0;
16829	17669
16830	17670	double count = 0;
..	..	@@ -16835,7 +17675,7 @@
16835	17675
16836	17676	double FACTOR = 1;
16837	17677
16838		- for (int i = 0; i < pixels.length; i++)
	17678	+ for (int i = 0; i < depths.length; i++)
16839	17679	{
16840	17680	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
16841	17681	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -16918,7 +17758,7 @@
16918	17758
16919	17759	double scale = ray.z; // 1; // cos
16920	17760
16921		- float depth = pixels[newindex];
	17761	+ float depth = depths[newindex];
16922	17762
16923	17763	/*
16924	17764	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17068,23 +17908,15 @@
17068	17908	int AAbuffersize = 0;
17069	17909
17070	17910	//double[] selectedpoint = new double[3];
17071		- static Superellipsoid selectedpoint = new Superellipsoid();
	17911	+ static Superellipsoid selectedpoint;
17072	17912	static Sphere previousselectedpoint = null;
17073		- static Sphere debugpointG = new Sphere();
17074		- static Sphere debugpointP = new Sphere();
17075		- static Sphere debugpointC = new Sphere();
17076		- static Sphere debugpointR = new Sphere();
	17913	+ static Sphere debugpointG;
	17914	+ static Sphere debugpointP;
	17915	+ static Sphere debugpointC;
	17916	+ static Sphere debugpointR;
17077	17917
17078	17918	static Sphere debugpoints[] = new Sphere[8];
17079	17919
17080		- static
17081		- {
17082		- for (int i=0; i<8; i++)
17083		- {
17084		- debugpoints[i] = new Sphere();
17085		- }
17086		- }
17087		-
17088	17920	static void InitPoints(float radius)
17089	17921	{
17090	17922	for (int i=0; i<8; i++)
..	..	@@ -17123,11 +17955,14 @@
17123	17955	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17124	17956	static IntBuffer bigAAbuffer;
17125	17957	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17126		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17958	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17127	17959	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17128	17960	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17129	17961	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17130		- 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	+
17131	17966	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17132	17967	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17133	17968	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();