~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -1,4 +1,5 @@
1	1
	2	+import com.bulletphysics.dynamics.RigidBody;
2	3	import java.awt.*;
3	4	import java.awt.event.*;
4	5	import java.awt.image.*;
..	..	@@ -18,7 +19,10 @@
18	19	import javax.imageio.ImageIO;
19	20	import javax.imageio.ImageWriteParam;
20	21	import javax.imageio.ImageWriter;
	22	+import javax.imageio.ImageReadParam;
	23	+import javax.imageio.ImageReader;
21	24	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	25	+import javax.imageio.stream.ImageInputStream;
22	26	import javax.imageio.stream.ImageOutputStream;
23	27	import javax.imageio.ImageWriteParam;
24	28
..	..	@@ -30,6 +34,7 @@
30	34	import java.nio.*;
31	35
32	36	import gleem.linalg.Mat4f;
	37	+import javax.imageio.ImageTypeSpecifier;
33	38
34	39	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	40	{
..	..	@@ -37,7 +42,6 @@
37	42	static boolean[] selectedstack = new boolean[65536];
38	43	static int materialdepth = 0;
39	44
40		- static boolean DEBUG = false;
41	45	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	46
43	47	// camera change fix
..	..	@@ -45,6 +49,39 @@
45	49	static boolean ABORTED = false;
46	50
47	51	static int STEP = 1;
	52	+
	53	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	54	+ {
	55	+ int[] pixels = new int[bytes.length/3];
	56	+ for (int i=pixels.length; --i>=0;)
	57	+ {
	58	+ int i3 = i*3;
	59	+ pixels[i] = 0xFF;
	60	+ pixels[i] <<= 8;
	61	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	62	+ pixels[i] <<= 8;
	63	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	64	+ pixels[i] <<= 8;
	65	+ pixels[i] \|= bytes[i3] & 0xFF;
	66	+ }
	67	+ /*
	68	+ int r=0,g=0,b=0,a=0;
	69	+ for (int i=0; i<width; i++)
	70	+ for (int j=0; j<height; j++)
	71	+ {
	72	+ int index = j*width+i;
	73	+ int p = pixels[index];
	74	+ a = ((p>>24) & 0xFF);
	75	+ r = ((p>>16) & 0xFF);
	76	+ g = ((p>>8) & 0xFF);
	77	+ b = (p & 0xFF);
	78	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	79	+ }
	80	+ /**/
	81	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	82	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	83	+ return rendImage;
	84	+ }
48	85
49	86	/static/ private boolean CULLFACE = false; // true;
50	87	/static/ boolean NEAREST = false; // true;
..	..	@@ -61,7 +98,7 @@
61	98	//boolean REDUCETEXTURE = true;
62	99	boolean CACHETEXTURE = true;
63	100	boolean CLEANCACHE = false; // true;
64		- boolean MIPMAP = false; // true;
	101	+ boolean MIPMAP = false; // true; // never works...
65	102	boolean COMPRESSTEXTURE = false;
66	103	boolean KOMPACTTEXTURE = false; // true;
67	104	boolean RESIZETEXTURE = false;
..	..	@@ -74,7 +111,11 @@
74	111	//private Mat4f spotlightTransform = new Mat4f();
75	112	//private Mat4f spotlightInverseTransform = new Mat4f();
76	113	static GLContext glcontext = null;
77		- /static/ com.sun.opengl.util.texture.Texture cubemap;
	114	+ /static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
	115	+ /static/ com.sun.opengl.util.texture.Texture cubemapcustom;
	116	+ /static/ com.sun.opengl.util.texture.Texture cubemaprgb;
	117	+ boolean transformMode;
	118	+
78	119	boolean reverseUP = false;
79	120	static boolean frozen = false;
80	121	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -94,7 +135,7 @@
94	135	static boolean ZOOMBOXMODE = false;
95	136	static boolean BOXMODE = false;
96	137	static boolean IMAGEFLIP = false;
97		-static boolean SMOOTHFOCUS = false;
	138	+static boolean SMOOTHFOCUS = true; // false;
98	139	static boolean SPEAKERMOCAP = true; // jan 2014 false;
99	140	static boolean SPEAKERCAMERA = false;
100	141	static boolean SPEAKERFOCUS = false;
..	..	@@ -106,7 +147,7 @@
106	147	static boolean OEIL = true;
107	148	static boolean OEILONCE = false; // do oeilon then oeiloff
108	149	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	150	+static boolean SWITCH = true; // false;
110	151	static boolean HANDLES = false; // selection doesn't work!!
111	152	static boolean PAINTMODE = false;
112	153
..	..	@@ -128,16 +169,16 @@
128	169
129	170
130	171	// OPTIONS
131		- boolean Skinshader = true;
	172	+ boolean Skinshader = false; // true;
132	173	boolean cameraLight = false;
133	174	boolean UVdebug = false;
134	175	boolean Udebug = false;
135	176	boolean Vdebug = false;
136	177	boolean NORMALdebug = false;
137		- static boolean doublesided = false; // true; // reversed normals are awful for conformance
	178	+ static boolean doublesided = true; // false; // reversed normals are awful for conformance
138	179	boolean anisotropy = true;
139	180	boolean softshadow = true; // slower but better false;
140		- boolean opacityhalo = false;
	181	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
141	182
142	183	boolean macromode = false;
143	184
..	..	@@ -148,6 +189,21 @@
148	189	defaultcaps.setAccumGreenBits(16);
149	190	defaultcaps.setAccumBlueBits(16);
150	191	defaultcaps.setAccumAlphaBits(16);
	192	+ }
	193	+
	194	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	195	+
	196	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	197	+ {
	198	+ try
	199	+ {
	200	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	201	+ } catch (IOException e)
	202	+ {
	203	+ System.out.println("NAME = " + name);
	204	+ e.printStackTrace(); // throw new RuntimeException(e);
	205	+ return null;
	206	+ }
151	207	}
152	208
153	209	void SetAsGLRenderer(boolean b)
..	..	@@ -166,9 +222,10 @@
166	222	cameras = new Camera[2];
167	223	targetLookAts = new cVector[2];
168	224
169		- SetCamera(cam);
	225	+ SetCamera(cam, true);
170	226
171		- SetLight(new Camera(new cVector(10, 10, -20)));
	227	+ // Warning: not used.
	228	+ //SetLight(new Camera(new cVector(15, 10, -20)));
172	229
173	230	object = o;
174	231
..	..	@@ -325,7 +382,7 @@
325	382	cStatic.objectstack[materialdepth++] = obj;
326	383	//System.out.println("material " + material);
327	384	//Applet3D.tracein(this, selected);
328		- display.vector2buffer = obj.projectedVertices;
	385	+ //display.vector2buffer = obj.projectedVertices;
329	386	if (obj instanceof Camera)
330	387	{
331	388	display.options1[0] = material.shift;
..	..	@@ -334,14 +391,28 @@
334	391	display.options1[2] = material.shadowbias;
335	392	display.options1[3] = material.aniso;
336	393	display.options1[4] = material.anisoV;
	394	+// System.out.println("display.options1[0] " + display.options1[0]);
	395	+// System.out.println("display.options1[1] " + display.options1[1]);
	396	+// System.out.println("display.options1[2] " + display.options1[2]);
	397	+// System.out.println("display.options1[3] " + display.options1[3]);
	398	+// System.out.println("display.options1[4] " + display.options1[4]);
337	399	display.options2[0] = material.opacity;
338	400	display.options2[1] = material.diffuse;
339	401	display.options2[2] = material.factor;
	402	+// System.out.println("display.options2[0] " + display.options2[0]);
	403	+// System.out.println("display.options2[1] " + display.options2[1]);
	404	+// System.out.println("display.options2[2] " + display.options2[2]);
340	405
341	406	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	407	+// System.out.println("display.options3[0] " + display.options3[0]);
	408	+// System.out.println("display.options3[1] " + display.options3[1]);
	409	+// System.out.println("display.options3[2] " + display.options3[2]);
342	410	display.options4[0] = material.cameralight/0.2f;
343	411	display.options4[1] = material.subsurface;
344	412	display.options4[2] = material.sheen;
	413	+// System.out.println("display.options4[0] " + display.options4[0]);
	414	+// System.out.println("display.options4[1] " + display.options4[1]);
	415	+// System.out.println("display.options4[2] " + display.options4[2]);
345	416
346	417	// if (display.CURRENTANTIALIAS > 0)
347	418	// display.options3[3] /= 4;
..	..	@@ -357,7 +428,7 @@
357	428	/**/
358	429	} else
359	430	{
360		- DrawMaterial(material, selected);
	431	+ DrawMaterial(material, selected, obj.projectedVertices);
361	432	}
362	433	} else
363	434	{
..	..	@@ -381,8 +452,8 @@
381	452	cStatic.objectstack[materialdepth++] = obj;
382	453	//System.out.println("material " + material);
383	454	//Applet3D.tracein("selected ", selected);
384		- display.vector2buffer = obj.projectedVertices;
385		- display.DrawMaterial(material, selected);
	455	+ //display.vector2buffer = obj.projectedVertices;
	456	+ display.DrawMaterial(material, selected, obj.projectedVertices);
386	457	}
387	458	}
388	459
..	..	@@ -399,8 +470,8 @@
399	470	materialdepth -= 1;
400	471	if (materialdepth > 0)
401	472	{
402		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
403		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	473	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	474	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
404	475	}
405	476	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
406	477	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -420,8 +491,8 @@
420	491	materialdepth -= 1;
421	492	if (materialdepth > 0)
422	493	{
423		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
424		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	494	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	495	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
425	496	}
426	497	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
427	498	//else
..	..	@@ -462,15 +533,18 @@
462	533	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463	534	{
464	535	//gl.glBegin(gl.GL_TRIANGLES);
465		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	536	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	537	+ // TEST LIVE NORMALS && !obj.dontselect
	538	+ ;
466	539	if (!hasnorm)
467	540	{
468		- // System.out.println("FUCK!!");
	541	+ // System.out.println("Mesh normal");
469	542	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
470	543	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
471	544	LA.vecCross(obj.v0, obj.v1, obj.v2);
472	545	LA.vecNormalize(obj.v2);
473		- gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	546	+
	547	+ SetGLNormal(gl, (float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
474	548	}
475	549
476	550	// P
..	..	@@ -492,7 +566,7 @@
492	566	y += ny * obj.NORMALPUSH;
493	567	z += nz * obj.NORMALPUSH;
494	568
495		- gl.glNormal3f(nx, ny, nz);
	569	+ SetGLNormal(gl, nx, ny, nz);
496	570	}
497	571	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
498	572	SetColor(obj, pv);
..	..	@@ -524,7 +598,7 @@
524	598	y += ny * obj.NORMALPUSH;
525	599	z += nz * obj.NORMALPUSH;
526	600
527		- gl.glNormal3f(nx, ny, nz);
	601	+ SetGLNormal(gl, nx, ny, nz);
528	602	}
529	603	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
530	604	// boolean locked = false;
..	..	@@ -572,7 +646,7 @@
572	646	y += ny * obj.NORMALPUSH;
573	647	z += nz * obj.NORMALPUSH;
574	648
575		- gl.glNormal3f(nx, ny, nz);
	649	+ SetGLNormal(gl, nx, ny, nz);
576	650	}
577	651
578	652	// if ((dot&4) == 0)
..	..	@@ -808,7 +882,7 @@
808	882	//// tris.postdraw(this);
809	883	}
810	884
811		- static Camera localcamera = new Camera();
	885	+ static Camera localAOcamera = new Camera();
812	886	static cVector from = new cVector();
813	887	static cVector to = new cVector();
814	888
..	..	@@ -817,7 +891,7 @@
817	891	CameraPane cp = this;
818	892
819	893	Camera keep = cp.RenderCamera();
820		- cp.renderCamera = localcamera;
	894	+ cp.renderCamera = localAOcamera;
821	895
822	896	if (br.trimmed)
823	897	{
..	..	@@ -835,7 +909,7 @@
835	909	br.positions[i3 + 2] + br.normals[i3 + 2]);
836	910	LA.xformPos(from, transform, from);
837	911	LA.xformPos(to, transform, to); // RIGID ONLY
838		- localcamera.setAim(from, to);
	912	+ localAOcamera.setAim(from, to);
839	913
840	914	CameraPane.occlusionbuffer.display();
841	915
..	..	@@ -869,7 +943,7 @@
869	943	to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
870	944	LA.xformPos(from, transform, from);
871	945	LA.xformPos(to, transform, to); // RIGID ONLY
872		- localcamera.setAim(from, to);
	946	+ localAOcamera.setAim(from, to);
873	947
874	948	CameraPane.occlusionbuffer.display();
875	949
..	..	@@ -1178,10 +1252,10 @@
1178	1252	{
1179	1253	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1180	1254	{
1181		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1255	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1182	1256	} else
1183	1257	{
1184		- gl.glNormal3f(0, 0, 1);
	1258	+ SetGLNormal(gl, 0, 0, 1);
1185	1259	}
1186	1260
1187	1261	if (c != null)
..	..	@@ -1190,10 +1264,12 @@
1190	1264	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1191	1265	}
1192	1266	}
	1267	+
1193	1268	if (flipV)
1194	1269	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1195	1270	else
1196	1271	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1272	+
1197	1273	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1198	1274	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1199	1275
..	..	@@ -1203,20 +1279,22 @@
1203	1279	{
1204	1280	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1205	1281	{
1206		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1282	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1207	1283	} else
1208	1284	{
1209		- gl.glNormal3f(0, 0, 1);
	1285	+ SetGLNormal(gl, 0, 0, 1);
1210	1286	}
1211	1287	if (c != null)
1212	1288	{
1213	1289	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1214	1290	}
1215	1291	}
	1292	+
1216	1293	if (flipV)
1217	1294	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1218	1295	else
1219	1296	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1297	+
1220	1298	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1221	1299	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1222	1300
..	..	@@ -1229,10 +1307,10 @@
1229	1307	{
1230	1308	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1231	1309	{
1232		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1310	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1233	1311	} else
1234	1312	{
1235		- gl.glNormal3f(0, 0, 1);
	1313	+ SetGLNormal(gl, 0, 0, 1);
1236	1314	}
1237	1315	if (c != null)
1238	1316	{
..	..	@@ -1244,8 +1322,10 @@
1244	1322	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1245	1323	else
1246	1324	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1325	+
1247	1326	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1248	1327	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1328	+
1249	1329	count2 += 2;
1250	1330	count3 += 3;
1251	1331	}
..	..	@@ -1412,7 +1492,7 @@
1412	1492	{
1413	1493	if (!selectmode)
1414	1494	{
1415		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1495	+ SetGLNormal(gl, (float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
1416	1496	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1417	1497
1418	1498	if (flipV)
..	..	@@ -1424,6 +1504,8 @@
1424	1504	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1425	1505	}
1426	1506
	1507	+ float[] colorV = new float[4];
	1508	+
1427	1509	void SetColor(Object3D obj, Vertex p0)
1428	1510	{
1429	1511	CameraPane display = this;
..	..	@@ -1491,8 +1573,6 @@
1491	1573	{
1492	1574	return;
1493	1575	}
1494		-
1495		- float[] colorV = new float[3];
1496	1576
1497	1577	if (false) // marked)
1498	1578	{
..	..	@@ -1601,7 +1681,7 @@
1601	1681	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1602	1682	}
1603	1683
1604		- void DrawMaterial(cMaterial material, boolean selected)
	1684	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1605	1685	{
1606	1686	CameraPane display = this;
1607	1687	//new Exception().printStackTrace();
..	..	@@ -1628,7 +1708,7 @@
1628	1708
1629	1709	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1630	1710
1631		- float[] colorV = GrafreeD.colorV;
	1711	+ float[] colorV = Grafreed.colorV;
1632	1712
1633	1713	/**/
1634	1714	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1636,7 +1716,7 @@
1636	1716	colorV[0] = display.modelParams0[0] * material.diffuse;
1637	1717	colorV[1] = display.modelParams0[1] * material.diffuse;
1638	1718	colorV[2] = display.modelParams0[2] * material.diffuse;
1639		- colorV[3] = material.opacity;
	1719	+ colorV[3] = 1; // material.opacity;
1640	1720
1641	1721	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1642	1722	//System.out.println("Opacity = " + opacity);
..	..	@@ -1741,12 +1821,12 @@
1741	1821
1742	1822	display.modelParams7[0] = 0;
1743	1823	display.modelParams7[1] = 1000;
1744		- display.modelParams7[2] = 0;
	1824	+ display.modelParams7[2] = material.parallax;
1745	1825	display.modelParams7[3] = 0;
1746	1826
1747		- display.modelParams6[0] = 100; // criss de bug de bump
	1827	+ //display.modelParams6[0] = 100; // criss de bug de bump
1748	1828
1749		- Object3D.cVector2[] extparams = display.vector2buffer;
	1829	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1750	1830	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1751	1831	{
1752	1832	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1888,7 +1968,7 @@
1888	1968	void PushMatrix(double[][] matrix)
1889	1969	{
1890	1970	// GrafreeD.tracein(matrix);
1891		- PushMatrix(matrix,1);
	1971	+ PushMatrix(matrix, 1);
1892	1972	}
1893	1973
1894	1974	void PushMatrix()
..	..	@@ -1974,9 +2054,9 @@
1974	2054	switch(viewcode)
1975	2055	{
1976	2056	case 0: return "main";
1977		- case 1: return "one";
1978		- case 2: return "two";
1979		- case 3: return "three";
	2057	+ case 1: return "Red";
	2058	+ case 2: return "Green";
	2059	+ case 3: return "Blue";
1980	2060	case 4: return "light";
1981	2061	}
1982	2062
..	..	@@ -1985,7 +2065,7 @@
1985	2065
1986	2066	static int camerachangeframe;
1987	2067
1988		- public boolean SetCamera(Camera cam)
	2068	+ public boolean SetCamera(Camera cam, boolean set)
1989	2069	{
1990	2070	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1991	2071	// return false;
..	..	@@ -2003,7 +2083,8 @@
2003	2083
2004	2084	camerachangeframe = Globals.framecount;
2005	2085
2006		- cam.hAspect = -1; // Read only
	2086	+ if (cam != null)
	2087	+ cam.hAspect = -1; // Read only
2007	2088
2008	2089	cameras[0] = cam;
2009	2090	targetLookAts[0] = new cVector(cam.lookAt);
..	..	@@ -2013,11 +2094,14 @@
2013	2094	{
2014	2095	cameras[i] = new Camera(cam.viewCode);
2015	2096	}
2016		-
2017		- cameras[i].setAim(cam.location, cam.lookAt);
2018		- cameras[i].shaper_fovy = cam.shaper_fovy;
2019		- cameras[i].UP.set(cam.UP);
2020		- targetLookAts[i] = new cVector(cameras[i].lookAt);
	2097	+
	2098	+ if (set)
	2099	+ {
	2100	+ cameras[i].setAim(cam.location, cam.lookAt);
	2101	+ cameras[i].shaper_fovy = cam.shaper_fovy;
	2102	+ cameras[i].UP.set(cam.UP);
	2103	+ targetLookAts[i] = new cVector(cameras[i].lookAt);
	2104	+ }
2021	2105	}
2022	2106	cameracount = 0;
2023	2107	targetLookAt = targetLookAts[cameracount];
..	..	@@ -2026,7 +2110,7 @@
2026	2110	// Start with free camera
2027	2111	SwitchCameras(true);
2028	2112
2029		- pingthread.jump = true; // optional?
	2113	+// pingthread.jump = true; // optional?
2030	2114
2031	2115	if (TRACKONCE)
2032	2116	{
..	..	@@ -2042,7 +2126,7 @@
2042	2126	//System.err.println("Oeil on");
2043	2127	OEIL = true;
2044	2128	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2045		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2129	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2046	2130	//pingthread.StepToTarget(true);
2047	2131	}
2048	2132
..	..	@@ -2140,7 +2224,7 @@
2140	2224	System.err.println("LIVE = " + Globals.isLIVE());
2141	2225
2142	2226	if (!Globals.isLIVE()) // save sound
2143		- GrafreeD.savesound = true; // wav.save();
	2227	+ Grafreed.savesound = true; // wav.save();
2144	2228	// else
2145	2229	repaint(); // start loop // may 2013
2146	2230	}
..	..	@@ -2213,18 +2297,6 @@
2213	2297	public void ToggleTrack()
2214	2298	{
2215	2299	TRACK ^= true;
2216		- if (TRACK)
2217		- {
2218		- if (object.selection != null &&
2219		- object.selection.size() > 0 &&
2220		- object.selection.elementAt(0) != null &&
2221		- !(object.selection.elementAt(0) instanceof Camera) &&
2222		- !(object.selection.elementAt(0) instanceof ScriptNode))
2223		- {
2224		- trackedobject = object.selection.elementAt(0);
2225		- repaint();
2226		- }
2227		- }
2228	2300
2229	2301	repaint();
2230	2302	}
..	..	@@ -2257,7 +2329,7 @@
2257	2329
2258	2330	void ToggleDebug()
2259	2331	{
2260		- DEBUG ^= true;
	2332	+ Globals.DEBUG ^= true;
2261	2333	}
2262	2334
2263	2335	void ToggleLookAt()
..	..	@@ -2265,9 +2337,9 @@
2265	2337	LOOKAT ^= true;
2266	2338	}
2267	2339
2268		- void ToggleRandom()
	2340	+ void ToggleSwitch()
2269	2341	{
2270		- RANDOM ^= true;
	2342	+ SWITCH ^= true;
2271	2343	}
2272	2344
2273	2345	void ToggleHandles()
..	..	@@ -2275,10 +2347,17 @@
2275	2347	HANDLES ^= true;
2276	2348	}
2277	2349
	2350	+ Object3D paintFolder;
	2351	+
2278	2352	void TogglePaint()
2279	2353	{
2280	2354	PAINTMODE ^= true;
2281	2355	paintcount = 0;
	2356	+
	2357	+ if (PAINTMODE)
	2358	+ {
	2359	+ paintFolder = GetFolder();
	2360	+ }
2282	2361	}
2283	2362
2284	2363	void SwapCamera(int a, int b)
..	..	@@ -2309,7 +2388,8 @@
2309	2388	{
2310	2389	//System.out.println("PROTECTION = " + cam.hAspect);
2311	2390	//assert (cam.hAspect == 0);
2312		- cam.hAspect = 0;
	2391	+ if (cam != null)
	2392	+ cam.hAspect = 0;
2313	2393	lightCamera = cam;
2314	2394	}
2315	2395
..	..	@@ -2374,7 +2454,34 @@
2374	2454	{
2375	2455	return currentGL;
2376	2456	}
2377		-
	2457	+
	2458	+ static private BufferedImage CreateBim(TextureData texturedata)
	2459	+ {
	2460	+ Grafreed.Assert(texturedata != null);
	2461	+
	2462	+ int width = texturedata.getWidth();
	2463	+ int height = texturedata.getHeight();
	2464	+
	2465	+ Buffer buffer = texturedata.getBuffer();
	2466	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2467	+
	2468	+ byte[] bytes = bytebuf.array();
	2469	+
	2470	+ return CreateBim(bytes, width, height);
	2471	+ }
	2472	+
	2473	+ private void SetGLNormal(javax.media.opengl.GL gl, float nx, float ny, float nz)
	2474	+ {
	2475	+ gl.glNormal3f(nx, ny, nz);
	2476	+
	2477	+ if (ny > 0.9 \|\| ny < -0.9)
	2478	+ // Ground or ceiling
	2479	+ gl.glVertexAttrib3f(4, 1, 0, 0);
	2480	+ else
	2481	+ // Walls
	2482	+ gl.glVertexAttrib3f(4, 0, 1, 0);
	2483	+ }
	2484	+
2378	2485	/**/
2379	2486	class CacheTexture
2380	2487	{
..	..	@@ -2383,28 +2490,31 @@
2383	2490
2384	2491	int resolution;
2385	2492
2386		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2493	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2387	2494	{
2388		- texture = tex;
	2495	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2496	+ texturedata = texdata;
2389	2497	resolution = res;
2390	2498	}
2391	2499	}
2392	2500	/**/
2393	2501
2394	2502	// 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>();
	2503	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2504	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2505	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2506	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2507	+
2398	2508	int pigmentdepth = 0;
2399	2509	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2400	2510	int bumpdepth = 0;
2401	2511	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2512	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2403	2513	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2404		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2514	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2405	2515	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2406	2516
2407		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2517	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2408	2518	{
2409	2519	TextureData texturedata = null;
2410	2520
..	..	@@ -2414,7 +2524,7 @@
2414	2524	com.sun.opengl.util.texture.TextureIO.newTextureData(
2415	2525	getClass().getClassLoader().getResourceAsStream(name),
2416	2526	true,
2417		- com.sun.opengl.util.texture.TextureIO.PNG);
	2527	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2418	2528	} catch (java.io.IOException e)
2419	2529	{
2420	2530	throw new javax.media.opengl.GLException(e);
..	..	@@ -2423,13 +2533,34 @@
2423	2533	if (bump)
2424	2534	texturedata = ConvertBump(texturedata, false);
2425	2535
2426		- com.sun.opengl.util.texture.Texture texture =
2427		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2536	+// com.sun.opengl.util.texture.Texture texture =
	2537	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2428	2538
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);
	2539	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2540	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2431	2541
2432		- return texture;
	2542	+ return texturedata;
	2543	+ }
	2544	+
	2545	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2546	+ {
	2547	+ TextureData texturedata = null;
	2548	+
	2549	+ try
	2550	+ {
	2551	+ texturedata =
	2552	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2553	+ bim,
	2554	+ true);
	2555	+ } catch (Exception e)
	2556	+ {
	2557	+ throw new javax.media.opengl.GLException(e);
	2558	+ }
	2559	+
	2560	+ if (bump)
	2561	+ texturedata = ConvertBump(texturedata, false);
	2562	+
	2563	+ return texturedata;
2433	2564	}
2434	2565
2435	2566	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3459,6 +3590,8 @@
3459	3590	};
3460	3591	/**/
3461	3592
	3593	+ static Object3D lastObject;
	3594	+
3462	3595	//com.sun.opengl.util.texture.Texture
3463	3596	TextureData
3464	3597	GetFileTexture(String name, boolean bump, int resolution)
..	..	@@ -3495,6 +3628,8 @@
3495	3628	// return null;
3496	3629	//if (i == 2)
3497	3630	// return null;
	3631	+ // TIFF issue sept 2019
	3632	+ System.err.println("lastObject = " + lastObject);
3498	3633	e.printStackTrace();
3499	3634	name = name.split("\\.tif")[0] + ".jpg";
3500	3635	}
..	..	@@ -3502,6 +3637,8 @@
3502	3637
3503	3638	System.out.println("LOADING TEXTURE : " + name);
3504	3639
	3640	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3641	+
3505	3642	//
3506	3643	if (false) // compressbit > 0)
3507	3644	{
..	..	@@ -6825,30 +6962,30 @@
6825	6962	short residu = 0;
6826	6963
6827	6964	// wraparound workarounds
6828		- short fuck = (short) (buffer[i] & 0xFF);
	6965	+ short ww = (short) (buffer[i] & 0xFF);
6829	6966	/*
6830		- residu += (fuck%2);
6831		- if(fuck/2 < 256-residu/2)
	6967	+ residu += (ww%2);
	6968	+ if(ww/2 < 256-residu/2)
6832	6969	{
6833		- fuck = (short)((fuck/2) + residu/2);
	6970	+ ww = (short)((ww/2) + residu/2);
6834	6971	if(residu == 2)
6835	6972	residu = 0;
6836	6973	}
6837	6974	else
6838	6975	{
6839	6976	residu = 0;
6840		- fuck /= 2;
	6977	+ ww /= 2;
6841	6978	}
6842	6979	*/
6843		- if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| fuck >= 254)
	6980	+ if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| ww >= 254)
6844	6981	{
6845		- fuck /= 2;
	6982	+ ww /= 2;
6846	6983	} else
6847	6984	{
6848		- fuck = (short) ((fuck / 2) + fuck % 2);
	6985	+ ww = (short) ((ww / 2) + ww % 2);
6849	6986	}
6850	6987
6851		- buffer[i] = (byte) fuck;
	6988	+ buffer[i] = (byte) ww;
6852	6989	}
6853	6990	//System.out.print(bytes[i] + " ");
6854	6991	//if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
..	..	@@ -7900,7 +8037,7 @@
7900	8037	String pigment = Object3D.GetPigment(tex);
7901	8038	String bump = Object3D.GetBump(tex);
7902	8039
7903		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8040	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7904	8041	{
7905	8042	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7906	8043	// System.out.println("; bump = " + bump);
..	..	@@ -7915,11 +8052,69 @@
7915	8052	pigment = null;
7916	8053	}
7917	8054
7918		- ReleaseTexture(bump, true);
7919		- ReleaseTexture(pigment, false);
	8055	+ ReleaseTexture(tex, true);
	8056	+ ReleaseTexture(tex, false);
7920	8057	}
7921	8058
7922		- void ReleaseTexture(String tex, boolean bump)
	8059	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8060	+ {
	8061	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8062	+ {
	8063	+ return;
	8064	+ }
	8065	+
	8066	+ if (tex == null)
	8067	+ {
	8068	+ ReleaseTexture(null, false);
	8069	+ return;
	8070	+ }
	8071	+
	8072	+ String pigment = Object3D.GetPigment(tex);
	8073	+
	8074	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8075	+ {
	8076	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8077	+ // System.out.println("; bump = " + bump);
	8078	+ }
	8079	+
	8080	+ if (pigment.equals(""))
	8081	+ {
	8082	+ pigment = null;
	8083	+ }
	8084	+
	8085	+ ReleaseTexture(tex, false);
	8086	+ }
	8087	+
	8088	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8089	+ {
	8090	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8091	+ {
	8092	+ return;
	8093	+ }
	8094	+
	8095	+ if (tex == null)
	8096	+ {
	8097	+ ReleaseTexture(null, true);
	8098	+ return;
	8099	+ }
	8100	+
	8101	+ String bump = Object3D.GetBump(tex);
	8102	+
	8103	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8104	+ {
	8105	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8106	+ // System.out.println("; bump = " + bump);
	8107	+ }
	8108	+
	8109	+ if (bump.equals(""))
	8110	+ {
	8111	+ bump = null;
	8112	+ }
	8113	+
	8114	+ ReleaseTexture(tex, true);
	8115	+ }
	8116	+
	8117	+ void ReleaseTexture(cTexture tex, boolean bump)
7923	8118	{
7924	8119	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7925	8120	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7930,7 +8125,7 @@
7930	8125	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7931	8126
7932	8127	if (tex != null)
7933		- texture = textures.get(tex);
	8128	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7934	8129
7935	8130	// //assert( texture != null );
7936	8131	// if (texture == null)
..	..	@@ -8022,7 +8217,55 @@
8022	8217	}
8023	8218	}
8024	8219
8025		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8220	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8221	+ {
	8222	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8223	+// ambientOcclusion ) // \|\| !textureon)
	8224	+// {
	8225	+// return; // false;
	8226	+// }
	8227	+//
	8228	+// if (tex == null)
	8229	+// {
	8230	+// BindTexture(null,false,resolution);
	8231	+// BindTexture(null,true,resolution);
	8232	+// return;
	8233	+// }
	8234	+//
	8235	+// String pigment = Object3D.GetPigment(tex);
	8236	+// String bump = Object3D.GetBump(tex);
	8237	+//
	8238	+// usedtextures.add(pigment);
	8239	+// usedtextures.add(bump);
	8240	+//
	8241	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8242	+// {
	8243	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8244	+// // System.out.println("; bump = " + bump);
	8245	+// }
	8246	+//
	8247	+// if (bump.equals(""))
	8248	+// {
	8249	+// bump = null;
	8250	+// }
	8251	+// if (pigment.equals(""))
	8252	+// {
	8253	+// pigment = null;
	8254	+// }
	8255	+//
	8256	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8257	+// BindTexture(pigment, false, resolution);
	8258	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8259	+// BindTexture(bump, true, resolution);
	8260	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8261	+//
	8262	+// return; // true;
	8263	+
	8264	+ BindPigmentTexture(tex, resolution);
	8265	+ BindBumpTexture(tex, resolution);
	8266	+ }
	8267	+
	8268	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8026	8269	{
8027	8270	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8028	8271	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8033,17 +8276,47 @@
8033	8276	if (tex == null)
8034	8277	{
8035	8278	BindTexture(null,false,resolution);
8036		- BindTexture(null,true,resolution);
8037	8279	return;
8038	8280	}
8039	8281
8040	8282	String pigment = Object3D.GetPigment(tex);
	8283	+
	8284	+ usedtextures.add(tex);
	8285	+
	8286	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8287	+ {
	8288	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8289	+ // System.out.println("; bump = " + bump);
	8290	+ }
	8291	+
	8292	+ if (pigment.equals(""))
	8293	+ {
	8294	+ pigment = null;
	8295	+ }
	8296	+
	8297	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8298	+ BindTexture(tex, false, resolution);
	8299	+ }
	8300	+
	8301	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8302	+ {
	8303	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8304	+ ambientOcclusion ) // \|\| !textureon)
	8305	+ {
	8306	+ return; // false;
	8307	+ }
	8308	+
	8309	+ if (tex == null)
	8310	+ {
	8311	+ BindTexture(null,true,resolution);
	8312	+ return;
	8313	+ }
	8314	+
8041	8315	String bump = Object3D.GetBump(tex);
8042	8316
8043		- usedtextures.put(pigment, pigment);
8044		- usedtextures.put(bump, bump);
	8317	+ usedtextures.add(tex);
8045	8318
8046		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8319	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8047	8320	{
8048	8321	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8049	8322	// System.out.println("; bump = " + bump);
..	..	@@ -8053,43 +8326,94 @@
8053	8326	{
8054	8327	bump = null;
8055	8328	}
8056		- if (pigment.equals(""))
8057		- {
8058		- pigment = null;
8059		- }
8060	8329
8061		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8062		- BindTexture(pigment, false, resolution);
8063	8330	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8064		- BindTexture(bump, true, resolution);
	8331	+ BindTexture(tex, true, resolution);
8065	8332	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8066		-
8067		- return; // true;
8068	8333	}
8069	8334
8070		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8335	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8336	+
	8337	+ private boolean FileExists(String tex)
8071	8338	{
8072		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8339	+ if (missingTextures.contains(tex))
	8340	+ {
	8341	+ return false;
	8342	+ }
	8343	+
	8344	+ boolean fileExists = new File(tex).exists();
	8345	+
	8346	+ if (!fileExists)
	8347	+ {
	8348	+ // If file exists, the "new File()" is not executed sgain
	8349	+ missingTextures.add(tex);
	8350	+ }
	8351	+
	8352	+ return fileExists;
	8353	+ }
	8354	+
	8355	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8356	+ {
	8357	+ CacheTexture texturecache = null;
8073	8358
8074	8359	if (tex != null)
8075	8360	{
8076		- String texname = tex;
	8361	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8362	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8077	8363
8078		- String[] split = tex.split("Textures");
8079		- if (split.length > 1)
8080		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8081		- else
8082		- if (!texname.startsWith("/"))
8083		- texname = "/Users/nbriere/Textures/" + texname;
	8364	+ if (texname.equals("") && texdata == null)
	8365	+ {
	8366	+ return null;
	8367	+ }
	8368	+
	8369	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8370	+
	8371	+// String[] split = tex.split("Textures");
	8372	+// if (split.length > 1)
	8373	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8374	+// else
	8375	+// if (!texname.startsWith("/"))
	8376	+// texname = "/Users/nbriere/Textures/" + texname;
	8377	+ if (!FileExists(texname) && !texname.startsWith("@"))
	8378	+ {
	8379	+ texname = fallbackTextureName;
	8380	+ }
8084	8381
8085	8382	if (CACHETEXTURE)
8086		- texture = textures.get(texname); // TEXTURE CACHE
8087		-
8088		- TextureData texturedata = null;
8089		-
8090		- if (texture == null \|\| texture.resolution < resolution)
8091	8383	{
8092		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8384	+ if (texdata == null)
	8385	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8386	+ else
	8387	+ texturecache = bimtextures.get(texdata);
	8388	+ }
	8389	+
	8390	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8391	+ {
	8392	+ TextureData texturedata = null;
	8393	+
	8394	+ if (texdata != null && textureon)
	8395	+ {
	8396	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8397	+
	8398	+ try
	8399	+ {
	8400	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8401	+ }
	8402	+ catch (Exception e)
	8403	+ {
	8404	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8405	+ }
	8406	+
	8407	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8408	+ bimtextures.put(texdata, texturecache);
	8409	+
	8410	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8411	+
	8412	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8413	+ //bim2 = bim;
	8414	+ }
	8415	+ else
	8416	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8093	8417	{
8094	8418	assert(!bump);
8095	8419	// if (bump)
..	..	@@ -8100,19 +8424,23 @@
8100	8424	// }
8101	8425	// else
8102	8426	// {
8103		- texture = textures.get(tex);
8104		- if (texture == null)
	8427	+ // texturecache = textures.get(texname); // suspicious
	8428	+ if (texturecache == null)
8105	8429	{
8106		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8430	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8107	8431	}
	8432	+ else
	8433	+ new Exception().printStackTrace();
8108	8434	// }
8109	8435	} else
8110		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8436	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8111	8437	{
8112	8438	assert(bump);
8113		- texture = textures.get(tex);
8114		- if (texture == null)
8115		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8439	+ // texturecache = textures.get(texname); // suspicious
	8440	+ if (texturecache == null)
	8441	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8442	+ else
	8443	+ new Exception().printStackTrace();
8116	8444	} else
8117	8445	{
8118	8446	//if (tex.equals("IMMORTAL"))
..	..	@@ -8120,11 +8448,22 @@
8120	8448	// texture = GetResourceTexture("default.png");
8121	8449	//} else
8122	8450	//{
8123		- if (tex.equals("WHITE_NOISE"))
	8451	+ if (texname.endsWith("WHITE_NOISE"))
8124	8452	{
8125		- texture = textures.get(tex);
8126		- if (texture == null)
8127		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8453	+ // texturecache = textures.get(texname); // suspicious
	8454	+ if (texturecache == null)
	8455	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.jpg", bump),resolution);
	8456	+ else
	8457	+ new Exception().printStackTrace();
	8458	+ } else
	8459	+ {
	8460	+ if (texname.startsWith("@") && textureon)
	8461	+ {
	8462	+ // texturecache = textures.get(texname); // suspicious
	8463	+ if (texturecache == null)
	8464	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8465	+ else
	8466	+ new Exception().printStackTrace();
8128	8467	} else
8129	8468	{
8130	8469	if (textureon)
..	..	@@ -8149,7 +8488,7 @@
8149	8488	}
8150	8489
8151	8490	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8152		- if (!new File(cachename).exists())
	8491	+ if (!FileExists(cachename))
8153	8492	cachename = texname;
8154	8493	else
8155	8494	processbump = false; // don't process bump map again
..	..	@@ -8171,7 +8510,7 @@
8171	8510	}
8172	8511
8173	8512	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8174		- if (!new File(cachename).exists())
	8513	+ if (!FileExists(cachename))
8175	8514	cachename = texname;
8176	8515	else
8177	8516	processbump = false; // don't process bump map again
..	..	@@ -8180,20 +8519,23 @@
8180	8519	texturedata = GetFileTexture(cachename, processbump, resolution);
8181	8520
8182	8521
8183		- if (texturedata != null)
8184		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8522	+ if (texturedata == null)
	8523	+ throw new Exception();
	8524	+
	8525	+ texturecache = new CacheTexture(texturedata,resolution);
8185	8526	//texture = GetTexture(tex, bump);
8186	8527	}
	8528	+ }
8187	8529	}
8188	8530	//}
8189	8531	}
8190	8532
8191		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8533	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8192	8534	{
8193	8535	//return false;
8194	8536
8195	8537	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8196		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8538	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8197	8539	{
8198	8540	// String ext = "_highres";
8199	8541	// if (REDUCETEXTURE)
..	..	@@ -8210,52 +8552,17 @@
8210	8552	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8211	8553	if (!cachefile.exists())
8212	8554	{
8213		- // cache to disk
8214		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8215		- //buffers[0].
8216		-
8217		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8218		- int[] pixels = new int[bytebuf.capacity()/3];
8219		-
8220		- // squared size heuristic...
8221		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8555	+ //if (texturedata.getWidth() == texturedata.getHeight())
8222	8556	{
8223		- for (int i=pixels.length; --i>=0;)
8224		- {
8225		- int i3 = i*3;
8226		- pixels[i] = 0xFF;
8227		- pixels[i] <<= 8;
8228		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8229		- pixels[i] <<= 8;
8230		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8231		- pixels[i] <<= 8;
8232		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8233		- }
8234		-
8235		- /*
8236		- int r=0,g=0,b=0,a=0;
8237		- for (int i=0; i<width; i++)
8238		- for (int j=0; j<height; j++)
8239		- {
8240		- int index = j*width+i;
8241		- int p = pixels[index];
8242		- a = ((p>>24) & 0xFF);
8243		- r = ((p>>16) & 0xFF);
8244		- g = ((p>>8) & 0xFF);
8245		- b = (p & 0xFF);
8246		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8247		- }
8248		- /**/
8249		- int width = (int)Math.sqrt(pixels.length); // squared
8250		- int height = width;
8251		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8252		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8557	+ BufferedImage rendImage = CreateBim(texturedata);
	8558	+
8253	8559	ImageWriter writer = null;
8254	8560	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8255	8561	if (iter.hasNext()) {
8256	8562	writer = (ImageWriter)iter.next();
8257	8563	}
8258		- float compressionQuality = 0.9f;
	8564	+
	8565	+ float compressionQuality = 0.85f;
8259	8566	try
8260	8567	{
8261	8568	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8272,18 +8579,20 @@
8272	8579	}
8273	8580	}
8274	8581	}
8275		-
	8582	+
	8583	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8584	+
8276	8585	//System.out.println("Texture = " + tex);
8277		- if (textures.containsKey(texname))
	8586	+ if (textures.containsKey(tex))
8278	8587	{
8279		- CacheTexture thetex = textures.get(texname);
	8588	+ CacheTexture thetex = textures.get(tex);
8280	8589	thetex.texture.disable();
8281	8590	thetex.texture.dispose();
8282		- textures.remove(texname);
	8591	+ textures.remove(tex);
8283	8592	}
8284	8593
8285		- texture.texturedata = texturedata;
8286		- textures.put(texname, texture);
	8594	+ //texture.texturedata = texturedata;
	8595	+ textures.put(tex, texturecache);
8287	8596
8288	8597	// newtex = true;
8289	8598	}
..	..	@@ -8299,10 +8608,46 @@
8299	8608	}
8300	8609	}
8301	8610
8302		- return texture;
	8611	+ return texturecache;
8303	8612	}
8304	8613
8305		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8614	+ static void EmbedTextures(cTexture tex)
	8615	+ {
	8616	+ if (tex.pigmentdata == null)
	8617	+ {
	8618	+ //String texname = Object3D.GetPigment(tex);
	8619	+
	8620	+ CacheTexture texturecache = texturepigment.get(tex);
	8621	+
	8622	+ if (texturecache != null)
	8623	+ {
	8624	+ tex.pw = texturecache.texturedata.getWidth();
	8625	+ tex.ph = texturecache.texturedata.getHeight();
	8626	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8627	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8628	+ ;
	8629	+ //, tex.pw, tex.ph), 0.5f);
	8630	+ }
	8631	+ }
	8632	+
	8633	+ if (tex.bumpdata == null)
	8634	+ {
	8635	+ //String texname = Object3D.GetBump(tex);
	8636	+
	8637	+ CacheTexture texturecache = texturebump.get(tex);
	8638	+
	8639	+ if (texturecache != null)
	8640	+ {
	8641	+ tex.bw = texturecache.texturedata.getWidth();
	8642	+ tex.bh = texturecache.texturedata.getHeight();
	8643	+ tex.bumpdata = //CompressJPEG(CreateBim(
	8644	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
	8645	+ //, 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
8306	8651	{
8307	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8308	8653
..	..	@@ -8320,21 +8665,21 @@
8320	8665	return texture!=null?texture.texture:null;
8321	8666	}
8322	8667
8323		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8668	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8324	8669	{
8325	8670	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8326	8671
8327	8672	return texture!=null?texture.texturedata:null;
8328	8673	}
8329	8674
8330		- boolean BindTexture(String tex, boolean bump, int resolution)
	8675	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8331	8676	{
8332	8677	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8333	8678	{
8334	8679	return false;
8335	8680	}
8336	8681
8337		- boolean newtex = false;
	8682	+ //boolean newtex = false;
8338	8683
8339	8684	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8340	8685
..	..	@@ -8366,9 +8711,75 @@
8366	8711	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8367	8712	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8368	8713
8369		- return newtex;
	8714	+ return true; // Warning: not used.
8370	8715	}
8371	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	+
8372	8783	ShadowBuffer shadowPBuf;
8373	8784	AntialiasBuffer antialiasPBuf;
8374	8785	int MAXSTACK;
..	..	@@ -8385,10 +8796,12 @@
8385	8796
8386	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8387	8798	MAXSTACK = temp[0];
8388		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8389	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8390	8802	MAXSTACK = temp[0];
8391		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8392	8805
8393	8806	// Use debug pipeline
8394	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8396,7 +8809,8 @@
8396	8809	gl = drawable.getGL(); //
8397	8810
8398	8811	GL gl3 = getGL();
8399		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8400	8814
8401	8815
8402	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8561,7 +8975,7 @@
8561	8975
8562	8976	if (cubemap == null)
8563	8977	{
8564		- LoadEnvy(5);
	8978	+ //LoadEnvy(1);
8565	8979	}
8566	8980
8567	8981	//cubemap.enable();
..	..	@@ -8837,6 +9251,8 @@
8837	9251
8838	9252	void LoadEnvy(int which)
8839	9253	{
	9254	+ assert(false);
	9255	+
8840	9256	String name;
8841	9257	String ext;
8842	9258
..	..	@@ -8848,37 +9264,58 @@
8848	9264	cubemap = null;
8849	9265	return;
8850	9266	case 1:
8851		- name = "cubemaps/box_";
8852		- ext = "png";
	9267	+ name = "cubemaps/rgb/";
	9268	+ ext = "jpg";
8853	9269	reverseUP = false;
8854	9270	break;
8855	9271	case 2:
8856		- name = "cubemaps/uffizi_";
8857		- ext = "png";
8858		- break; // reverseUP = true; break;
	9272	+ name = "cubemaps/uffizi/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
8859	9276	case 3:
8860		- name = "cubemaps/CloudyHills_";
8861		- ext = "tga";
	9277	+ name = "cubemaps/CloudyHills/";
	9278	+ ext = "jpg";
8862	9279	reverseUP = false;
8863	9280	break;
8864	9281	case 4:
8865		- name = "cubemaps/cornell_";
	9282	+ name = "cubemaps/cornell/";
8866	9283	ext = "png";
8867	9284	reverseUP = false;
8868	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;
8869	9311	default:
8870		- name = "cubemaps/rgb_";
8871		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9312	+ name = "cubemaps/box/";
	9313	+ ext = "png"; /mipmap = true;/
	9314	+ reverseUP = false;
8872	9315	break;
8873	9316	}
8874		-
8875		- try
8876		- {
8877		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8878		- } catch (IOException e)
8879		- {
8880		- throw new RuntimeException(e);
8881		- }
	9317	+
	9318	+ LoadSkybox(name, ext, mipmap);
8882	9319	}
8883	9320
8884	9321	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8910,8 +9347,12 @@
8910	9347	static double[] model = new double[16];
8911	9348	double[] camera2light = new double[16];
8912	9349	double[] light2camera = new double[16];
8913		- int newenvy = -1;
8914		- boolean envyoff = true; // false;
	9350	+
	9351	+ //int newenvy = -1;
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
	9355	+
8915	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8916	9357	//float[] light0 = { 0,0,0 };
8917	9358	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9204,11 +9645,35 @@
9204	9645	jy8[3] = 0.5f;
9205	9646	}
9206	9647
9207		- 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
9208	9649	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9209	9650	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9210	9651	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9211	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	+
9212	9677	static int imagecount = 0; // movie generation
9213	9678
9214	9679	static int jitter = 0;
..	..	@@ -9304,8 +9769,8 @@
9304	9769	assert (parentcam != renderCamera);
9305	9770
9306	9771	if (renderCamera != lightCamera)
9307		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9308		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9772	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9773	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9309	9774
9310	9775	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9311	9776
..	..	@@ -9320,8 +9785,8 @@
9320	9785	LA.matCopy(renderCamera.fromScreen, matrix);
9321	9786
9322	9787	if (renderCamera != lightCamera)
9323		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9324		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9788	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9789	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9325	9790
9326	9791	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9327	9792
..	..	@@ -9367,13 +9832,18 @@
9367	9832	rati = 1 / rati;
9368	9833	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9369	9834	}
9370		- assert (newenvy == -1);
	9835	+
	9836	+ //assert (newenvy == -1);
	9837	+
9371	9838	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9372	9839	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9373		- DrawSkyBox(gl);
	9840	+ DrawSkyBox(gl, (float)rati);
9374	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9375	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9376		- accPerspective(gl, renderCamera.shaper_fovy / ratio,
	9843	+
	9844	+ boolean vr = capsLocked && !lightMode;
	9845	+
	9846	+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
9377	9847	ratio,
9378	9848	//near_plane, far_plane,
9379	9849	renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..	..	@@ -9538,7 +10008,7 @@
9538	10008
9539	10009	if (!BOXMODE)
9540	10010	{
9541		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	10011	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9542	10012	}
9543	10013
9544	10014	if (!BOXMODE)
..	..	@@ -9576,7 +10046,7 @@
9576	10046	ABORTED = false;
9577	10047	}
9578	10048	else
9579		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10049	+ Grafreed.wav.cursor += 735 * ACSIZE;
9580	10050
9581	10051	if (false)
9582	10052	{
..	..	@@ -10236,14 +10706,23 @@
10236	10706	static boolean init = false;
10237	10707
10238	10708	double[][] matrix = LA.newMatrix();
	10709	+
	10710	+ // This is to refresh the UI of the material panel.
	10711	+ ObjEditor patchMaterial;
10239	10712
10240	10713	public void display(GLAutoDrawable drawable)
10241	10714	{
10242		- if (GrafreeD.savesound && GrafreeD.hassound)
	10715	+ if (patchMaterial.patchMaterial)
10243	10716	{
10244		- GrafreeD.wav.save();
10245		- GrafreeD.savesound = false;
10246		- GrafreeD.hassound = false;
	10717	+ patchMaterial.patchMaterial = false;
	10718	+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
	10719	+ }
	10720	+
	10721	+ if (Grafreed.savesound && Grafreed.hassound)
	10722	+ {
	10723	+ Grafreed.wav.save();
	10724	+ Grafreed.savesound = false;
	10725	+ Grafreed.hassound = false;
10247	10726	}
10248	10727	// if (DEBUG_SELECTION)
10249	10728	// {
..	..	@@ -10319,6 +10798,7 @@
10319	10798	ANTIALIAS = 0;
10320	10799	//System.out.println("RESTART");
10321	10800	AAtimer.restart();
	10801	+ Globals.TIMERRUNNING = true;
10322	10802	}
10323	10803	}
10324	10804	}
..	..	@@ -10333,6 +10813,112 @@
10333	10813
10334	10814	if (DrawMode() == DEFAULT)
10335	10815	{
	10816	+ if (manipCamera == lightCamera)
	10817	+ {
	10818	+// switch (e.getKeyCode())
	10819	+// {
	10820	+// case DOWN_ARROW:
	10821	+// lightCamera.DECAL /= 2;
	10822	+// repaint();
	10823	+// break;
	10824	+// case UP_ARROW:
	10825	+// lightCamera.DECAL *= 2;
	10826	+// repaint();
	10827	+// break;
	10828	+// case LEFT_ARROW:
	10829	+// lightCamera.SCALE /= 2;
	10830	+// repaint();
	10831	+// break;
	10832	+// case RIGHT_ARROW:
	10833	+// lightCamera.SCALE *= 2;
	10834	+// repaint();
	10835	+// break;
	10836	+// default:
	10837	+// break;
	10838	+ if (keys[DOWN_ARROW])
	10839	+ {
	10840	+ lightCamera.DECAL /= 2;
	10841	+ }
	10842	+
	10843	+ if (keys[UP_ARROW])
	10844	+ {
	10845	+ lightCamera.DECAL *= 2;
	10846	+ }
	10847	+
	10848	+ if (keys[LEFT_ARROW])
	10849	+ {
	10850	+ lightCamera.SCALE /= 2;
	10851	+ }
	10852	+
	10853	+ if (keys[RIGHT_ARROW])
	10854	+ {
	10855	+ lightCamera.SCALE *= 2;
	10856	+ }
	10857	+ }
	10858	+ else
	10859	+ {
	10860	+ //pingthread.mute = true;
	10861	+
	10862	+ boolean keyon = false;
	10863	+
	10864	+ if (keys[DOWN_ARROW])
	10865	+ {
	10866	+ speed = ++speedkey[DOWN_ARROW];
	10867	+ if (speed > 20)
	10868	+ speed = 20;
	10869	+ GoDown(modifiers);
	10870	+ keyon = true;
	10871	+ }
	10872	+ else
	10873	+ speedkey[DOWN_ARROW] = 0;
	10874	+
	10875	+ if (keys[UP_ARROW])
	10876	+ {
	10877	+ speed = ++speedkey[UP_ARROW];
	10878	+ if (speed > 20)
	10879	+ speed = 20;
	10880	+ GoUp(modifiers);
	10881	+ keyon = true;
	10882	+ }
	10883	+ else
	10884	+ speedkey[UP_ARROW] = 0;
	10885	+
	10886	+ if (keys[LEFT_ARROW])
	10887	+ {
	10888	+ speed = ++speedkey[LEFT_ARROW];
	10889	+ if (speed > 20)
	10890	+ speed = 20;
	10891	+ GoLeft(modifiers);
	10892	+ keyon = true;
	10893	+ }
	10894	+ else
	10895	+ speedkey[LEFT_ARROW] = 0;
	10896	+
	10897	+ if (keys[RIGHT_ARROW])
	10898	+ {
	10899	+ speed = ++speedkey[RIGHT_ARROW];
	10900	+ if (speed > 20)
	10901	+ speed = 20;
	10902	+ GoRight(modifiers);
	10903	+ keyon = true;
	10904	+ }
	10905	+ else
	10906	+ speedkey[RIGHT_ARROW] = 0;
	10907	+
	10908	+ if (Globals.WALK && capsLocked)
	10909	+ {
	10910	+ Walk();
	10911	+ keyon = true;
	10912	+ }
	10913	+
	10914	+ if (keyon)
	10915	+ {
	10916	+ repaint();
	10917	+ }
	10918	+
	10919	+ //pingthread.mute = false;
	10920	+ }
	10921	+
10336	10922	currentlydrawing = true;
10337	10923	}
10338	10924
..	..	@@ -10373,7 +10959,7 @@
10373	10959	Object3D theobject = object;
10374	10960	Object3D theparent = object.parent;
10375	10961	object.parent = null;
10376		- object = (Object3D)GrafreeD.clone(object);
	10962	+ object = (Object3D)Grafreed.clone(object);
10377	10963	object.Stripify();
10378	10964	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10379	10965	theobject.PreprocessOcclusion(this);
..	..	@@ -10386,13 +10972,14 @@
10386	10972	ambientOcclusion = false;
10387	10973	}
10388	10974
10389		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10975	+ if (//Globals.lighttouched &&
	10976	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10390	10977	{
10391	10978	//if (RENDERSHADOW) // ?
10392	10979	if (!IsFrozen())
10393	10980	{
10394	10981	// dec 2012
10395		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10982	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10396	10983	{
10397	10984	Globals.framecount++;
10398	10985	shadowbuffer.display();
..	..	@@ -10405,7 +10992,7 @@
10405	10992
10406	10993	if (wait)
10407	10994	{
10408		- Sleep(500);
	10995	+ Sleep(200); // blocks everything
10409	10996
10410	10997	wait = false;
10411	10998	}
..	..	@@ -10519,8 +11106,8 @@
10519	11106
10520	11107	// if (parentcam != renderCamera) // not a light
10521	11108	if (cam != lightCamera)
10522		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10523		- LA.matConcat(matrix, parentcam.toParent, matrix);
	11109	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11110	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10524	11111
10525	11112	for (int j = 0; j < 4; j++)
10526	11113	{
..	..	@@ -10534,8 +11121,8 @@
10534	11121
10535	11122	// if (parentcam != renderCamera) // not a light
10536	11123	if (cam != lightCamera)
10537		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10538		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	11124	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11125	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10539	11126
10540	11127	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10541	11128
..	..	@@ -10621,13 +11208,43 @@
10621	11208	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10622	11209	}
10623	11210
10624		- if (newenvy > -1)
	11211	+// if (newenvy > -1)
	11212	+// {
	11213	+// LoadEnvy(newenvy);
	11214	+// }
	11215	+//
	11216	+// newenvy = -1;
	11217	+
	11218	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10625	11219	{
10626		- LoadEnvy(newenvy);
	11220	+ if (cubemaprgb == null)
	11221	+ {
	11222	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11223	+ }
	11224	+
	11225	+ cubemap = cubemaprgb;
10627	11226	}
10628		-
10629		- newenvy = -1;
10630		-
	11227	+ else
	11228	+ {
	11229	+ if (object.skyboxname != null)
	11230	+ {
	11231	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11232	+ {
	11233	+ if (cubemap != null && cubemap != cubemaprgb)
	11234	+ cubemap.dispose();
	11235	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11236	+ loadedskyboxname = object.skyboxname;
	11237	+ }
	11238	+ }
	11239	+ else
	11240	+ {
	11241	+ cubemapcustom = null;
	11242	+ loadedskyboxname = null;
	11243	+ }
	11244	+
	11245	+ cubemap = cubemapcustom;
	11246	+ }
	11247	+
10631	11248	ratio = ((double) getWidth()) / getHeight();
10632	11249	//System.out.println("ratio = " + ratio);
10633	11250
..	..	@@ -10643,7 +11260,7 @@
10643	11260
10644	11261	if (!IsFrozen() && !ambientOcclusion)
10645	11262	{
10646		- DrawSkyBox(gl);
	11263	+ DrawSkyBox(gl, (float)ratio);
10647	11264	}
10648	11265
10649	11266	//if (selection_view == -1)
..	..	@@ -10794,7 +11411,16 @@
10794	11411	// Bump noise
10795	11412	gl.glActiveTexture(GL.GL_TEXTURE6);
10796	11413	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10797		- BindTexture(NOISE_TEXTURE, false, 2);
	11414	+
	11415	+ try
	11416	+ {
	11417	+ BindTexture(NOISE_TEXTURE, false, 2);
	11418	+ }
	11419	+ catch (Exception e)
	11420	+ {
	11421	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11422	+ }
	11423	+
10798	11424
10799	11425	gl.glActiveTexture(GL.GL_TEXTURE0);
10800	11426	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10817,8 +11443,8 @@
10817	11443
10818	11444	gl.glMatrixMode(GL.GL_MODELVIEW);
10819	11445
10820		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10821	11446	//gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11447	+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10822	11448	//gl.glEnable(gl.GL_MULTISAMPLE);
10823	11449	} else
10824	11450	{
..	..	@@ -10830,7 +11456,7 @@
10830	11456	//System.out.println("BLENDING ON");
10831	11457	gl.glEnable(GL.GL_BLEND);
10832	11458	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10833		-
	11459	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10834	11460	gl.glMatrixMode(gl.GL_PROJECTION);
10835	11461	gl.glLoadIdentity();
10836	11462
..	..	@@ -10880,7 +11506,10 @@
10880	11506	//gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
10881	11507	} else
10882	11508	{
10883		- glu.gluPerspective(cam.shaper_fovy / ratio, ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
	11509	+ boolean vr = capsLocked && !lightMode;
	11510	+
	11511	+ glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1),
	11512	+ ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
10884	11513	}
10885	11514	}
10886	11515
..	..	@@ -10919,8 +11548,8 @@
10919	11548	System.err.println("parentcam != renderCamera");
10920	11549
10921	11550	// if (cam != lightCamera)
10922		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10923		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11551	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11552	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10924	11553	}
10925	11554
10926	11555	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10941,8 +11570,8 @@
10941	11570	if (true) // TODO
10942	11571	{
10943	11572	if (cam != lightCamera)
10944		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10945		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11573	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11574	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10946	11575	}
10947	11576
10948	11577	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11079,7 +11708,7 @@
11079	11708	}
11080	11709	}
11081	11710
11082		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11711	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11083	11712	{
11084	11713	//gl.glDepthFunc(GL.GL_LEQUAL);
11085	11714	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11087,24 +11716,21 @@
11087	11716
11088	11717	boolean texon = textureon;
11089	11718
11090		- if (RENDERPROGRAM > 0)
11091		- {
11092		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11093		- textureon = false;
11094		- }
	11719	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11720	+ textureon = false;
	11721	+
11095	11722	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11096	11723	//System.out.println("ALLO");
11097	11724	gl.glColorMask(false, false, false, false);
11098	11725	DrawObject(gl);
11099		- if (RENDERPROGRAM > 0)
11100		- {
11101		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11102		- textureon = texon;
11103		- }
	11726	+
	11727	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11728	+ textureon = texon;
	11729	+
11104	11730	gl.glColorMask(true, true, true, true);
11105	11731
11106	11732	gl.glDepthFunc(GL.GL_EQUAL);
11107		- //gl.glDepthMask(false);
	11733	+ gl.glDepthMask(false);
11108	11734	}
11109	11735
11110	11736	if (false) // DrawMode() == SHADOW)
..	..	@@ -11239,8 +11865,11 @@
11239	11865	repaint();
11240	11866	}
11241	11867
11242		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11868	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11869	+ {
	11870	+ renderCamera.computeTransform();
11243	11871	repaint();
	11872	+ }
11244	11873
11245	11874	displaydone = true;
11246	11875	}
..	..	@@ -11279,24 +11908,59 @@
11279	11908	e.printStackTrace();
11280	11909	}
11281	11910
11282		- if (GrafreeD.RENDERME > 0)
11283		- GrafreeD.RENDERME--; // mechante magouille
	11911	+ if (Grafreed.RENDERME > 0)
	11912	+ Grafreed.RENDERME--; // mechante magouille
11284	11913
11285	11914	Globals.ONESTEP = false;
11286	11915	}
11287	11916
11288	11917	static boolean zoomonce = false;
11289	11918
	11919	+ static void CreateSelectedPoint()
	11920	+ {
	11921	+ if (selectedpoint == null)
	11922	+ {
	11923	+ debugpointG = new Sphere();
	11924	+ debugpointP = new Sphere();
	11925	+ debugpointC = new Sphere();
	11926	+ debugpointR = new Sphere();
	11927	+
	11928	+ selectedpoint = new Superellipsoid();
	11929	+
	11930	+ for (int i=0; i<8; i++)
	11931	+ {
	11932	+ debugpoints[i] = new Sphere();
	11933	+ }
	11934	+ }
	11935	+ }
	11936	+
11290	11937	void DrawObject(GL gl, boolean draw)
11291	11938	{
	11939	+ // To clear camera values
	11940	+ ResetOptions();
	11941	+
11292	11942	//System.out.println("DRAW OBJECT " + mouseDown);
11293	11943	// DrawMode() = SELECTION;
11294	11944	//GL gl = getGL();
11295	11945	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11296	11946	{
	11947	+ if (TRACK)
	11948	+ {
	11949	+ if (object.selection != null &&
	11950	+ object.selection.size() > 0 &&
	11951	+ object.selection.elementAt(0) != null &&
	11952	+ !(object.selection.elementAt(0) instanceof Camera) &&
	11953	+ !(object.selection.elementAt(0) instanceof ScriptNode))
	11954	+ {
	11955	+ trackedobject = object.selection.elementAt(0);
	11956	+ //repaint();
	11957	+ }
	11958	+ else
	11959	+ trackedobject = null;
	11960	+ }
11297	11961	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11298		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11299		- pingthread.StepToTarget(true); // true);
	11962	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11963	+ pingthread.StepToTarget(); // true);
11300	11964	// zoomonce = false;
11301	11965	}
11302	11966
..	..	@@ -11350,7 +12014,14 @@
11350	12014
11351	12015	usedtextures.clear();
11352	12016
11353		- BindTextures(DEFAULT_TEXTURES, 2);
	12017	+ try
	12018	+ {
	12019	+ BindTextures(DEFAULT_TEXTURES, 2);
	12020	+ }
	12021	+ catch (Exception e)
	12022	+ {
	12023	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	12024	+ }
11354	12025	}
11355	12026	//System.out.println("--> " + stackdepth);
11356	12027	// GrafreeD.traceon();
..	..	@@ -11360,8 +12031,9 @@
11360	12031
11361	12032	if (DrawMode() == DEFAULT)
11362	12033	{
11363		- if (DEBUG)
	12034	+ if (Globals.DEBUG)
11364	12035	{
	12036	+ CreateSelectedPoint();
11365	12037	float radius = 0.05f;
11366	12038	if (selectedpoint.radius != radius)
11367	12039	{
..	..	@@ -11415,20 +12087,32 @@
11415	12087	ReleaseTextures(DEFAULT_TEXTURES);
11416	12088
11417	12089	if (CLEANCACHE)
11418		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	12090	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11419	12091	{
11420		- String tex = e.nextElement();
	12092	+ cTexture tex = e.nextElement();
11421	12093
11422	12094	// System.out.println("Texture --------- " + tex);
11423	12095
11424		- if (tex.equals("WHITE_NOISE"))
	12096	+ if (tex.equals("WHITE_NOISE:"))
11425	12097	continue;
11426	12098
11427		- if (!usedtextures.containsKey(tex))
	12099	+ if (!usedtextures.contains(tex))
11428	12100	{
	12101	+ CacheTexture gettex = texturepigment.get(tex);
11429	12102	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11430		- textures.get(tex).texture.dispose();
11431		- textures.remove(tex);
	12103	+ if (gettex != null)
	12104	+ {
	12105	+ gettex.texture.dispose();
	12106	+ texturepigment.remove(tex);
	12107	+ }
	12108	+
	12109	+ gettex = texturebump.get(tex);
	12110	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	12111	+ if (gettex != null)
	12112	+ {
	12113	+ gettex.texture.dispose();
	12114	+ texturebump.remove(tex);
	12115	+ }
11432	12116	}
11433	12117	}
11434	12118	}
..	..	@@ -11441,7 +12125,14 @@
11441	12125	if (checker != null && DrawMode() == DEFAULT)
11442	12126	{
11443	12127	//BindTexture(IMMORTAL_TEXTURE);
11444		- BindTextures(checker.GetTextures(), checker.texres);
	12128	+ try
	12129	+ {
	12130	+ BindTextures(checker.GetTextures(), checker.texres);
	12131	+ }
	12132	+ catch (Exception e)
	12133	+ {
	12134	+ System.err.println("FAILED: " + checker.GetTextures());
	12135	+ }
11445	12136	// NEAREST
11446	12137	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11447	12138	DrawChecker(gl);
..	..	@@ -11523,7 +12214,7 @@
11523	12214	return;
11524	12215	}
11525	12216
11526		- String string = obj.GetToolTip();
	12217	+ String string = obj.toString(); //.GetToolTip();
11527	12218
11528	12219	GL gl = GetGL();
11529	12220
..	..	@@ -11840,8 +12531,8 @@
11840	12531	//obj.TransformToWorld(light, light);
11841	12532	for (int i = tp.size(); --i >= 0;)
11842	12533	{
11843		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11844		- LA.xformPos(light, tp.get(i).toParent, light);
	12534	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12535	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11845	12536	}
11846	12537
11847	12538
..	..	@@ -11858,8 +12549,8 @@
11858	12549	parentcam = cameras[0];
11859	12550	}
11860	12551
11861		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11862		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12552	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12553	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11863	12554
11864	12555	LA.xformPos(light, renderCamera.toScreen, light);
11865	12556
..	..	@@ -11949,8 +12640,82 @@
11949	12640
11950	12641	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11951	12642
11952		- String program =
	12643	+ String programmin =
	12644	+ // Min shader
11953	12645	"!!ARBfp1.0\n" +
	12646	+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
	12647	+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12648	+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
	12649	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12650	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12651	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12652	+ "PARAM light2cam0 = program.env[10];" +
	12653	+ "PARAM light2cam1 = program.env[11];" +
	12654	+ "PARAM light2cam2 = program.env[12];" +
	12655	+ "TEMP temp;" +
	12656	+ "TEMP light;" +
	12657	+ "TEMP ndotl;" +
	12658	+ "TEMP normal;" +
	12659	+ "TEMP depth;" +
	12660	+ "TEMP eye;" +
	12661	+ "TEMP pos;" +
	12662	+
	12663	+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
	12664	+ Normalize("normal") +
	12665	+ "MOV light, state.light[0].position;" +
	12666	+ "DP3 ndotl.x, light, normal;" +
	12667	+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
	12668	+
	12669	+ // shadow
	12670	+ "MOV pos, fragment.texcoord[1];" +
	12671	+ "MOV temp, pos;" +
	12672	+ ShadowTextureFetch("depth", "temp", "1") +
	12673	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12674	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12675	+
	12676	+ // No shadow when out of frustum
	12677	+ //"SGE temp.y, depth.z, zero123.y;" +
	12678	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12679	+
	12680	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12681	+
	12682	+ // Backlit
	12683	+ "MOV pos.w, zero12t.y;" + // one
	12684	+ "DP4 eye.x, pos, light2cam0;" +
	12685	+ "DP4 eye.y, pos, light2cam1;" +
	12686	+ "DP4 eye.z, pos, light2cam2;" +
	12687	+ Normalize("eye") +
	12688	+
	12689	+ "DP3 ndotl.y, -eye, normal;" +
	12690	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12691	+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
	12692	+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
	12693	+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12694	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12695	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12696	+ "ADD ndotl.y, ndotl.y, one.x;" +
	12697	+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
	12698	+
	12699	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12700	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12701	+
	12702	+ // Pigment
	12703	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12704	+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
	12705	+ "MUL temp, temp, zero12t.w;" + // Times x
	12706	+
	12707	+ //"MUL temp, temp, ndotl.y;" +
	12708	+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
	12709	+
	12710	+ "MUL temp, temp, ndotl.x;" + // lambert
	12711	+
	12712	+ "MOV temp.w, zero12t.y;" + // reset alpha
	12713	+ "MOV result.color, temp;" +
	12714	+ "END";
	12715	+
	12716	+ String programmax =
	12717	+ "!!ARBfp1.0\n" +
	12718	+
11954	12719	//"OPTION ARB_fragment_program_shadow;" +
11955	12720	"PARAM light2cam0 = program.env[10];" +
11956	12721	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -11976,7 +12741,7 @@
11976	12741	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
11977	12742	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
11978	12743	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
11979		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12744	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
11980	12745	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
11981	12746	"PARAM options1 = program.env[62];" + // fog rgb color
11982	12747	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12065,8 +12830,7 @@
12065	12830	"TEMP shininess;" +
12066	12831	"\n" +
12067	12832	"MOV texSamp, one;" +
12068		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12069		-
	12833	+
12070	12834	"MOV mapgrid.x, one2048th.x;" +
12071	12835	"MOV temp, fragment.texcoord[1];" +
12072	12836	/*
..	..	@@ -12087,20 +12851,20 @@
12087	12851	"MUL temp, floor, mapgrid.x;" +
12088	12852	//"TEX depth0, temp, texture[1], 2D;" +
12089	12853	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12090		- TextureFetch("depth0", "temp", "1") +
	12854	+ ShadowTextureFetch("depth0", "temp", "1") +
12091	12855	"") +
12092	12856	"ADD temp.x, temp.x, mapgrid.x;" +
12093	12857	//"TEX depth1, temp, texture[1], 2D;" +
12094	12858	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12095		- TextureFetch("depth1", "temp", "1") +
	12859	+ ShadowTextureFetch("depth1", "temp", "1") +
12096	12860	"") +
12097	12861	"ADD temp.y, temp.y, mapgrid.x;" +
12098	12862	//"TEX depth2, temp, texture[1], 2D;" +
12099		- TextureFetch("depth2", "temp", "1") +
	12863	+ ShadowTextureFetch("depth2", "temp", "1") +
12100	12864	"SUB temp.x, temp.x, mapgrid.x;" +
12101	12865	//"TEX depth3, temp, texture[1], 2D;" +
12102	12866	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12103		- TextureFetch("depth3", "temp", "1") +
	12867	+ ShadowTextureFetch("depth3", "temp", "1") +
12104	12868	"") +
12105	12869	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12106	12870	//"MOV params, material;" +
..	..	@@ -12222,7 +12986,7 @@
12222	12986	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12223	12987	// mar 2013 ??? "KIL alpha.a;" +
12224	12988	"MOV alpha, texSamp.aaaa;" + // y;" +
12225		- "KIL alpha.a;" +
	12989	+ "KIL alpha.a;" + // not sure with parallax mapping
12226	12990	/*
12227	12991	"MUL temp.xy, temp, two;" +
12228	12992	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12308,11 +13072,6 @@
12308	13072	"SUB bump0, bump0, half;" +
12309	13073	"ADD bump, bump, bump0;" +
12310	13074
12311		- "MOV temp.x, texSamp.a;" +
12312		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12313		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12314		- "MOV texSamp.a, temp.x;" +
12315		-
12316	13075	// double-sided
12317	13076	/**/
12318	13077	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12322,26 +13081,73 @@
12322	13081	"ADD temp.x, temp.x, one.x;" +
12323	13082	"MUL normal, normal, temp.xxxx;":""
12324	13083	) +
12325		- /**/
12326		-//// Normalize("normal") +
12327		-//// "MAX normal.z, eps.x, normal.z;" +
12328		-// Normalize("normal") +
12329		- "MOV normald, normal;" +
12330		- "MOV normals, normal;" +
	13084	+ /**/
	13085	+
	13086	+ "MOV temp, fragment.texcoord[4];" +
12331	13087
12332	13088	// UV base
12333	13089	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12334	13090	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12335	13091	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12336		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12337		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12338		- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
	13092	+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
	13093	+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
	13094	+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
	13095	+ Normalize("UP") +
	13096	+
12339	13097	"XPD V, normal, UP;" +
12340	13098	Normalize("V") +
12341	13099	"XPD U, V, normal;" +
12342	13100	Normalize("U") +
12343	13101
	13102	+ "MOV temp, fragment.texcoord[0];" +
	13103	+
	13104	+// "MAD normal, -temp.x, U, normal;" +
	13105	+// "MAD normal, -temp.y, V, normal;" +
	13106	+// Normalize("normal") +
	13107	+
	13108	+//// "MAX normal.z, eps.x, normal.z;" +
	13109	+// Normalize("normal") +
	13110	+ "MOV normald, normal;" +
	13111	+ "MOV normals, normal;" +
	13112	+
12344	13113	// parallax mapping
	13114	+
	13115	+ "DP3 temp2.x, V, eye;" +
	13116	+ "DP3 temp2.y, U, eye;" +
	13117	+ "DP3 temp2.z, normal, eye;" +
	13118	+ "RCP temp2.z, temp2.z;" +
	13119	+
	13120	+ "DP3 temp2.w, texSamp, texSamp;" + // Height
	13121	+ "RSQ temp2.w, temp2.w;" +
	13122	+ "RCP temp2.w, temp2.w;" +
	13123	+
	13124	+ "SUB temp2.w, temp2.w, half;" +
	13125	+ // "SGE temp.x, temp2.w, eps.x;" +
	13126	+ // "MUL temp2.w, temp2.w, temp.x;" +
	13127	+
	13128	+ // "MOV texSamp, U;" +
	13129	+
	13130	+ "MUL temp2.z, temp2.z, temp2.w;" +
	13131	+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
	13132	+
	13133	+ "MUL temp2, temp2, temp2.z;" +
	13134	+
	13135	+ "SUB temp, temp, temp2;" +
	13136	+
	13137	+ "TEX temp, temp, texture[0], 2D;" +
	13138	+ "POW temp.a, temp.a, params6.w;" + // punch through
	13139	+
	13140	+ "ADD texSamp, temp, texSamp;" +
	13141	+ "MUL texSamp.xyz, half, texSamp;" +
	13142	+
	13143	+ "MOV alpha, texSamp.aaaa;" +
	13144	+
	13145	+// parallax mapping
	13146	+
	13147	+ "MOV temp.x, texSamp.a;" +
	13148	+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
	13149	+ //"LRP texSamp0, params5.x, texSamp0, one;" +
	13150	+ "MOV texSamp.a, temp.x;" +
12345	13151
12346	13152	//"MOV temp, fragment.texcoord[0];" +
12347	13153	//
..	..	@@ -12471,10 +13277,10 @@
12471	13277	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12472	13278	"") +
12473	13279
12474		- // display shadow only (bump == 0)
	13280	+ // display shadow only (fakedepth == 0)
12475	13281	"SUB temp.x, half.x, shadow.x;" +
12476		- "MOV temp.y, -params6.x;" +
12477		- "SLT temp.z, temp.y, zero.x;" +
	13282	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13283	+ "SLT temp.z, temp.y, -c256i.x;" +
12478	13284	"SUB temp.y, one.x, temp.z;" +
12479	13285	"MUL temp.x, temp.x, temp.y;" +
12480	13286	"KIL temp.x;" +
..	..	@@ -12603,8 +13409,10 @@
12603	13409	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12604	13410
12605	13411	"SUB temp.x, one.x, ndotl.x;" +
12606		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12607		- "ADD temp.y, one.y, options2.y;" + // sursurface
	13412	+ // Tuning for default skin
	13413	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13414	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13415	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12608	13416	"MUL temp.x, temp.x, temp.y;" +
12609	13417
12610	13418	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12752,7 +13560,7 @@
12752	13560	"MUL final.y, fragment.texcoord[0].x, c256;" +
12753	13561	"FLR final.x, final.y;" +
12754	13562	"SUB final.y, final.y, final.x;" +
12755		- //"MUL final.x, final.x, c256i;" +
	13563	+ "MUL final.x, final.x, c256i;" +
12756	13564	"MOV final.z, zero.x;" +
12757	13565	"MOV final.a, one.w;":""
12758	13566	) +
..	..	@@ -12760,7 +13568,7 @@
12760	13568	"MUL final.y, fragment.texcoord[0].y, c256;" +
12761	13569	"FLR final.x, final.y;" +
12762	13570	"SUB final.y, final.y, final.x;" +
12763		- //"MUL final.x, final.x, c256i;" +
	13571	+ "MUL final.x, final.x, c256i;" +
12764	13572	"MOV final.z, zero.x;" +
12765	13573	"MOV final.a, one.w;":""
12766	13574	) +
..	..	@@ -12803,8 +13611,19 @@
12803	13611	//once = true;
12804	13612	}
12805	13613
12806		- System.out.print("Program #" + mode + "; length = " + program.length());
12807		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13614	+ String program = programmax;
	13615	+
	13616	+ if (Globals.MINSHADER)
	13617	+ {
	13618	+ program = programmin;
	13619	+ }
	13620	+
	13621	+ if (Globals.DEBUG)
	13622	+ {
	13623	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13624	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13625	+ }
	13626	+
12808	13627	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12809	13628
12810	13629	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12851,7 +13670,8 @@
12851	13670	"\n" +
12852	13671	"END\n";
12853	13672
12854		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13673	+ if (Globals.DEBUG)
	13674	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
12855	13675	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12856	13676
12857	13677	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12896,25 +13716,26 @@
12896	13716	return out;
12897	13717	}
12898	13718
12899		- String TextureFetch(String dest, String src, String unit)
	13719	+ // Also does frustum culling
	13720	+ String ShadowTextureFetch(String dest, String src, String unit)
12900	13721	{
12901	13722	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12902	13723	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12903	13724	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13725	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13726	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12904	13727	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12905		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12906		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12907		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12908		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13728	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13729	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12909	13730	//"SWZ buffer, temp, w,w,w,w;";
12910		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13731	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12911	13732	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12912	13733	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12913	13734	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12914		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13735	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12915	13736
12916		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12917		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13737	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13738	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12918	13739	}
12919	13740
12920	13741	String Shadow(String depth, String shadow)
..	..	@@ -12936,12 +13757,16 @@
12936	13757
12937	13758	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12938	13759	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13760	+
	13761	+ // Compare fragment depth in light space with shadowmap.
12939	13762	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12940	13763	"SGE temp.y, temp.x, zero.x;" +
12941		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13764	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13765	+
	13766	+ // Reverse comparison
12942	13767	"SUB temp.x, one.x, temp.x;" +
12943	13768	"MUL " + shadow + ".x, temp.x, temp.y;" +
12944		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13769	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12945	13770	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12946	13771
12947	13772	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12955,6 +13780,10 @@
12955	13780	// No shadow for backface
12956	13781	"DP3 temp.x, normal, lightd;" +
12957	13782	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13783	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13784	+
	13785	+ // No shadow when out of frustum
	13786	+ "SGE temp.x, " + depth + ".z, one.z;" +
12958	13787	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12959	13788	"";
12960	13789	}
..	..	@@ -13100,8 +13929,9 @@
13100	13929	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13101	13930	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13102	13931	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13103		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13104		- Object3D.cVector2[] vector2buffer;
	13932	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
	13933	+
	13934	+ //Object3D.cVector2[] vector2buffer;
13105	13935
13106	13936	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13107	13937	// OUT : diff, spec
..	..	@@ -13117,9 +13947,10 @@
13117	13947	"DP3 " + dest + ".z," + "normals," + "eye;" +
13118	13948	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13119	13949	//"MOV " + dest + ".w," + "normal.z;" +
13120		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13121		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13122		- //"MOV " + dest + ".z," + "params2.w;" +
	13950	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13951	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13952	+
	13953	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13123	13954	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13124	13955	"RCP " + dest + ".w," + dest + ".w;" +
13125	13956	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13265,7 +14096,7 @@
13265	14096	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13266	14097	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13267	14098	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13268		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	14099	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13269	14100	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13270	14101	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13271	14102	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13326,7 +14157,7 @@
13326	14157	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13327	14158	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13328	14159	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13329		- //"MOV result.texcoord, vertex.texcoord;" +
	14160	+ //"MOV result.texcoord, vertex.fogcoord;" +
13330	14161	"MOV result.texcoord, temp;" +
13331	14162	// border fade
13332	14163	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13373,7 +14204,9 @@
13373	14204
13374	14205	//"ADD temp.z, temp.z, one;" +
13375	14206
13376		- "MOV result.color, temp;"
	14207	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14208	+
	14209	+ "MOV result.color, temp;" // Normal
13377	14210	: "MOV result.color, vertex.color;") +
13378	14211	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13379	14212	: "") +
..	..	@@ -13508,12 +14341,15 @@
13508	14341	public void mouseClicked(MouseEvent e)
13509	14342	{
13510	14343	System.out.println("mouseClicked: " + e);
	14344	+ System.exit(0);
13511	14345	}
13512	14346
13513	14347	public void mousePressed(MouseEvent e)
13514	14348	{
	14349	+ RigidBody.justclicked = true;
	14350	+ System.out.println("justclicked: " + e);
13515	14351	//System.out.println("mousePressed: " + e);
13516		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14352	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13517	14353	}
13518	14354
13519	14355	static long prevtime = 0;
..	..	@@ -13546,10 +14382,12 @@
13546	14382	return;
13547	14383	}
13548	14384
13549		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	14385	+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	14386	+
	14387	+ boolean vr = capsLocked && !lightMode;
13550	14388
13551	14389	// TIMER
13552		- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14390	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
13553	14391	{
13554	14392	keepboxmode = BOXMODE;
13555	14393	keepsupport = SUPPORT;
..	..	@@ -13589,8 +14427,8 @@
13589	14427	// mode \|= META;
13590	14428	//}
13591	14429
13592		- SetMouseMode(WHEEL \| e.getModifiersEx());
13593		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14430	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14431	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
13594	14432	anchorX = ax;
13595	14433	anchorY = ay;
13596	14434	prevX = px;
..	..	@@ -13624,6 +14462,7 @@
13624	14462	else
13625	14463	if (evt.getSource() == AAtimer)
13626	14464	{
	14465	+ Globals.TIMERRUNNING = false;
13627	14466	if (mouseDown)
13628	14467	{
13629	14468	//new Exception().printStackTrace();
..	..	@@ -13649,6 +14488,10 @@
13649	14488	// LIVE = waslive;
13650	14489	// wasliveok = true;
13651	14490	// waslive = false;
	14491	+
	14492	+ // May 2019 Forget it:
	14493	+ if (true)
	14494	+ return;
13652	14495
13653	14496	// source == timer
13654	14497	if (mouseDown)
..	..	@@ -13679,21 +14522,23 @@
13679	14522
13680	14523	// fev 2014???
13681	14524	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13682		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13683		- pingthread.StepToTarget(true); // true);
	14525	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14526	+ pingthread.StepToTarget(); // true);
13684	14527	}
	14528	+
13685	14529	// if (!LIVE)
13686	14530	super.repaint();
13687	14531	}
13688	14532
13689	14533	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13690	14534
13691		- void clickStart(int x, int y, int modifiers)
	14535	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13692	14536	{
13693	14537	if (!wasliveok)
13694	14538	return;
13695	14539
13696	14540	AAtimer.restart(); //
	14541	+ Globals.TIMERRUNNING = true;
13697	14542
13698	14543	// waslive = LIVE;
13699	14544	// LIVE = false;
..	..	@@ -13705,7 +14550,7 @@
13705	14550	// touched = true; // main DL
13706	14551	if (isRenderer)
13707	14552	{
13708		- SetMouseMode(modifiers);
	14553	+ SetMouseMode(modifiers, modifiersex);
13709	14554	}
13710	14555
13711	14556	selectX = anchorX = x;
..	..	@@ -13718,7 +14563,7 @@
13718	14563	clicked = true;
13719	14564	hold = false;
13720	14565
13721		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14566	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13722	14567	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13723	14568	{
13724	14569	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13743,14 +14588,15 @@
13743	14588	drag = false;
13744	14589	//System.out.println("Mouse DOWN");
13745	14590	editObj = false;
13746		- ClickInfo info = new ClickInfo();
13747		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13748		- info.pane = this;
13749		- info.camera = renderCamera;
13750		- info.x = x;
13751		- info.y = y;
13752		- info.modifiers = modifiers;
13753		- editObj = object.doEditClick(info, 0);
	14591	+ //ClickInfo info = new ClickInfo();
	14592	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14593	+ object.clickInfo.pane = this;
	14594	+ object.clickInfo.camera = renderCamera;
	14595	+ object.clickInfo.x = x;
	14596	+ object.clickInfo.y = y;
	14597	+ object.clickInfo.modifiers = modifiersex;
	14598	+ editObj = object.doEditClick(//info,
	14599	+ 0);
13754	14600	if (!editObj)
13755	14601	{
13756	14602	hasMarquee = true;
..	..	@@ -13766,19 +14612,22 @@
13766	14612
13767	14613	public void mouseDragged(MouseEvent e)
13768	14614	{
	14615	+ Globals.MOUSEDRAGGED = true;
	14616	+
13769	14617	//System.out.println("mouseDragged: " + e);
13770	14618	if (isRenderer)
13771	14619	movingcamera = true;
	14620	+
13772	14621	//if (drawing)
13773	14622	//return;
13774		- if ((e.getModifiersEx() & CTRL) != 0
13775		- \|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
	14623	+ if ((e.getModifiersEx() & CTRL) != 0 \|\|
	14624	+ (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13776	14625	{
13777	14626	//System.out.println("mouseDragged: " + e);
13778	14627	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13779	14628	}
13780	14629	else
13781		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14630	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13782	14631
13783	14632	//try { Thread.sleep(1); } catch (Exception ex) {}
13784	14633	}
..	..	@@ -13796,9 +14645,17 @@
13796	14645	return targetLookAt;
13797	14646	}
13798	14647
	14648	+ javax.vecmath.Point3d eye = new javax.vecmath.Point3d();
	14649	+ javax.vecmath.Point3d eye2 = new javax.vecmath.Point3d();
	14650	+ javax.vecmath.Vector3d dir = new javax.vecmath.Vector3d();
	14651	+
	14652	+
13799	14653	class PingThread extends Thread
13800	14654	{
13801	14655	boolean jump;
	14656	+ boolean live;
	14657	+
	14658	+ boolean mute;
13802	14659
13803	14660	// void JumpToTarget()
13804	14661	// {
..	..	@@ -13814,6 +14671,88 @@
13814	14671	// only one thread!? synchronized
13815	14672	void StepToTarget(boolean jump)
13816	14673	{
	14674	+ RigidBody.pos.x = 0;
	14675	+ RigidBody.pos.y = 0;
	14676	+ RigidBody.pos.z = 0;
	14677	+ if (RigidBody.justclicked)
	14678	+ {
	14679	+ RigidBody.pos.x = (float)manipCamera.lookAt.x;
	14680	+ RigidBody.pos.y = (float)manipCamera.lookAt.y;
	14681	+ RigidBody.pos.z = (float)manipCamera.lookAt.z;
	14682	+ RigidBody.wind.set(RigidBody.pos);
	14683	+ RigidBody.wind.x -= (float)manipCamera.location.x;
	14684	+ RigidBody.wind.y -= (float)manipCamera.location.y;
	14685	+ RigidBody.wind.z -= (float)manipCamera.location.z;
	14686	+ RigidBody.wind.normalize();
	14687	+ }
	14688	+
	14689	+ if (mute)
	14690	+ return;
	14691	+
	14692	+ if (capsLocked && manipCamera.viewCode == 0)
	14693	+ {
	14694	+ eye.x = manipCamera.location.x;
	14695	+ eye.y = manipCamera.location.y + 0.25;
	14696	+ eye.z = manipCamera.location.z;
	14697	+
	14698	+ dir.y = -1;
	14699	+
	14700	+ Ray ray = new Ray(eye, dir);
	14701	+
	14702	+ IntersectResult res = new IntersectResult();
	14703	+ res.t = Double.POSITIVE_INFINITY;
	14704	+
	14705	+ tmp.set(targetLookAt);
	14706	+ tmp.sub(manipCamera.location);
	14707	+
	14708	+ double dist = tmp.length();
	14709	+
	14710	+ tmp.normalize();
	14711	+
	14712	+ eye2.x = manipCamera.location.x + tmp.x * 0.25;
	14713	+ eye2.y = manipCamera.location.y + 0.25;
	14714	+ eye2.z = manipCamera.location.z + tmp.z * 0.25;
	14715	+
	14716	+ Ray ray2 = new Ray(eye2, dir);
	14717	+
	14718	+ IntersectResult res2 = new IntersectResult();
	14719	+ res2.t = Double.POSITIVE_INFINITY;
	14720	+
	14721	+ if (object.intersect(ray, res) && object.intersect(ray2, res2) && Math.abs(res.t - res2.t) < 0.25)
	14722	+ {
	14723	+ //tmp.set(manipCamera.location);
	14724	+
	14725	+ manipCamera.location.x = ray.eyePoint.x + ray.viewDirection.x * res.t;
	14726	+ manipCamera.location.y = ray.eyePoint.y + ray.viewDirection.y * res.t + 0.5;
	14727	+ manipCamera.location.z = ray.eyePoint.z + ray.viewDirection.z * res.t;
	14728	+
	14729	+ //tmp.sub(manipCamera.location);
	14730	+
	14731	+ targetLookAt.x = ray2.eyePoint.x + ray2.viewDirection.x * res2.t;
	14732	+ targetLookAt.y = ray2.eyePoint.y + ray2.viewDirection.y * res2.t + 0.5;
	14733	+ targetLookAt.z = ray2.eyePoint.z + ray2.viewDirection.z * res2.t;
	14734	+
	14735	+ targetLookAt.sub(manipCamera.location);
	14736	+ targetLookAt.normalize();
	14737	+ targetLookAt.mul(dist);
	14738	+ targetLookAt.add(manipCamera.location);
	14739	+
	14740	+ //if (tmp.dot(tmp) > 0.000001)
	14741	+ // System.out.println("INTERSECTION " + manipCamera.location);
	14742	+
	14743	+ manipCamera.lookAt.set(targetLookAt);
	14744	+
	14745	+ tmp.x = res.n.x;
	14746	+ tmp.y = res.n.y;
	14747	+ tmp.z = res.n.z;
	14748	+ tmp.x += res2.n.x;
	14749	+ tmp.y += res2.n.y;
	14750	+ tmp.z += res2.n.z;
	14751	+ tmp.normalize();
	14752	+ manipCamera.UP.set(tmp);
	14753	+ }
	14754	+ }
	14755	+
13817	14756	tmp.set(targetLookAt);
13818	14757	tmp.sub(manipCamera.lookAt); // june 2014
13819	14758
..	..	@@ -13851,7 +14790,7 @@
13851	14790
13852	14791	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
13853	14792	{
13854		- jump = true; // step = 1;
	14793	+ // sep 2019 jump = true; // step = 1;
13855	14794	}
13856	14795
13857	14796	if (OEILONCE && OEIL)
..	..	@@ -13886,7 +14825,10 @@
13886	14825	if (tmp.dot(tmp) < 0.00001)
13887	14826	{
13888	14827	zoomonce = false;
	14828	+ live = false;
13889	14829	}
	14830	+ else
	14831	+ live = true;
13890	14832
13891	14833	tmp.mul(step > step2 ? step : step2);
13892	14834	}
..	..	@@ -13913,7 +14855,7 @@
13913	14855	{
13914	14856	if (LOOKAT)
13915	14857	manipCamera.lookAt.add(tmp);
13916		- if (OEIL)
	14858	+ if (OEIL && !capsLocked)
13917	14859	manipCamera.location.add(tmp);
13918	14860
13919	14861	{
..	..	@@ -13928,7 +14870,10 @@
13928	14870	lightCamera.computeTransform();
13929	14871	}
13930	14872	}
13931		- manipCamera.computeTransform();
	14873	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14874	+ {
	14875	+ manipCamera.computeTransform();
	14876	+ }
13932	14877	}
13933	14878	// ?????? mouseDown = true;
13934	14879	//System.out.println("---------------- ---------- Paint " + tmp.length2());
..	..	@@ -14015,55 +14960,113 @@
14015	14960	{
14016	14961	Globals.lighttouched = true;
14017	14962	}
14018		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14963	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14019	14964	}
14020	14965	//else
14021	14966	}
14022	14967	}
14023	14968	}
	14969	+
14024	14970	PingThread pingthread = new PingThread();
14025		- int delta = 5;
14026		- int speed = 5;
	14971	+ int delta = 1;
	14972	+ int speed = 1;
	14973	+ int walk = 8;
14027	14974	boolean autorepeat = false;
14028	14975
	14976	+ void Walk()
	14977	+ {
	14978	+ manipCamera.BackForth(0, walk, 1000);
	14979	+
	14980	+ targetLookAt.set(manipCamera.lookAt);
	14981	+ }
	14982	+
	14983	+ void ViewAngle(float dy)
	14984	+ {
	14985	+ double factor = Math.exp(-dy/300.0); // (1 + dy/100);
	14986	+
	14987	+ if (manipCamera.shaper_fovy * factor > 1 &&
	14988	+ manipCamera.shaper_fovy * factor < 150)
	14989	+ {
	14990	+ manipCamera.shaper_fovy *= factor;
	14991	+ //System.out.println("fovy = " + shaper_fovy);
	14992	+ }
	14993	+ }
	14994	+
14029	14995	void GoDown(int mod)
14030	14996	{
14031	14997	MODIFIERS \|= COMMAND;
14032		- /*
	14998	+ boolean isVR = (mouseMode&VR)!=0;
	14999	+ /**/
14033	15000	if((mod&SHIFT) == SHIFT)
14034		- manipCamera.RotatePosition(0, -speed);
14035		- else
14036		- manipCamera.BackForth(0, -speed*delta, getWidth());
14037		- */
14038		- if ((mod & SHIFT) == SHIFT)
14039	15001	{
14040		- mouseMode = mouseMode; // VR??
14041		- } else
14042		- {
14043		- mouseMode \|= BACKFORTH;
	15002	+// if (isVR)
	15003	+// manipCamera.RotateInterest(0, speed);
	15004	+// else
	15005	+ if (isVR)
	15006	+ ViewAngle(-speed*delta);
	15007	+ else
	15008	+ manipCamera.Translate(0, -speed*delta, getWidth());
14044	15009	}
	15010	+ else
	15011	+ {
	15012	+ if (isVR)
	15013	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	15014	+ else
	15015	+ manipCamera.RotatePosition(0, -speed);
	15016	+ }
	15017	+
	15018	+ /**/
	15019	+// if ((mod & SHIFT) == SHIFT)
	15020	+// {
	15021	+// mouseMode = mouseMode; // VR??
	15022	+// } else
	15023	+// {
	15024	+// mouseMode \|= BACKFORTH;
	15025	+// }
14045	15026
	15027	+ targetLookAt.set(manipCamera.lookAt);
	15028	+
14046	15029	//prevX = X = anchorX;
14047	15030	prevY = Y = anchorY - (int) (renderCamera.Distance());
14048	15031	}
14049	15032
14050	15033	void GoUp(int mod)
14051	15034	{
	15035	+ RigidBody.justclicked = true;
	15036	+
14052	15037	MODIFIERS \|= COMMAND;
14053		- /*
	15038	+ /**/
	15039	+ boolean isVR = (mouseMode&VR)!=0;
	15040	+
14054	15041	if((mod&SHIFT) == SHIFT)
14055		- manipCamera.RotatePosition(0, speed);
14056		- else
14057		- manipCamera.BackForth(0, speed*delta, getWidth());
14058		- */
14059		- if ((mod & SHIFT) == SHIFT)
14060	15042	{
14061		- mouseMode = mouseMode;
14062		- } else
14063		- {
14064		- mouseMode \|= BACKFORTH;
	15043	+// if (isVR)
	15044	+// manipCamera.RotateInterest(0, -speed);
	15045	+// else
	15046	+ if (isVR)
	15047	+ ViewAngle(speed*delta);
	15048	+ else
	15049	+ manipCamera.Translate(0, speed*delta, getWidth());
14065	15050	}
	15051	+ else
	15052	+ {
	15053	+ if (isVR)
	15054	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	15055	+ else
	15056	+ manipCamera.RotatePosition(0, speed);
	15057	+ }
	15058	+
	15059	+ /**/
	15060	+// if ((mod & SHIFT) == SHIFT)
	15061	+// {
	15062	+// mouseMode = mouseMode;
	15063	+// } else
	15064	+// {
	15065	+// mouseMode \|= BACKFORTH;
	15066	+// }
14066	15067
	15068	+ targetLookAt.set(manipCamera.lookAt);
	15069	+
14067	15070	//prevX = X = anchorX;
14068	15071	prevY = Y = anchorY + (int) (renderCamera.Distance());
14069	15072	}
..	..	@@ -14071,20 +15074,31 @@
14071	15074	void GoLeft(int mod)
14072	15075	{
14073	15076	MODIFIERS \|= COMMAND;
14074		- /*
	15077	+ /**/
14075	15078	if((mod&SHIFT) == SHIFT)
14076		- manipCamera.RotatePosition(speed, 0);
	15079	+ manipCamera.Translate(speed, 0, getWidth());
14077	15080	else
14078		- manipCamera.Translate(speed*delta, 0, getWidth());
14079		- */
14080		- if ((mod & SHIFT) == SHIFT)
14081	15081	{
14082		- mouseMode = mouseMode;
14083		- } else
14084		- {
14085		- mouseMode \|= ROTATE;
14086		- } // TRANSLATE;
	15082	+ if ((mouseMode&VR)!=0)
	15083	+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
	15084	+ else
	15085	+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
	15086	+ }
	15087	+
	15088	+ /**/
	15089	+// if ((mod & SHIFT) == SHIFT)
	15090	+// {
	15091	+// mouseMode = mouseMode;
	15092	+// } else
	15093	+// {
	15094	+// mouseMode \|= ROTATE;
	15095	+// } // TRANSLATE;
14087	15096
	15097	+ //System.err.println("lookAt = " + manipCamera.lookAt);
	15098	+ //System.err.println("location = " + manipCamera.location);
	15099	+
	15100	+ targetLookAt.set(manipCamera.lookAt);
	15101	+
14088	15102	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14089	15103	prevY = Y = anchorY;
14090	15104	}
..	..	@@ -14092,20 +15106,28 @@
14092	15106	void GoRight(int mod)
14093	15107	{
14094	15108	MODIFIERS \|= COMMAND;
14095		- /*
	15109	+ /**/
14096	15110	if((mod&SHIFT) == SHIFT)
14097		- manipCamera.RotatePosition(-speed, 0);
	15111	+ manipCamera.Translate(-speed, 0, getWidth());
14098	15112	else
14099		- manipCamera.Translate(-speed*delta, 0, getWidth());
14100		- */
14101		- if ((mod & SHIFT) == SHIFT)
14102	15113	{
14103		- mouseMode = mouseMode;
14104		- } else
14105		- {
14106		- mouseMode \|= ROTATE;
14107		- } // TRANSLATE;
	15114	+ if ((mouseMode&VR)!=0)
	15115	+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
	15116	+ else
	15117	+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
	15118	+ }
	15119	+
	15120	+ /**/
	15121	+// if ((mod & SHIFT) == SHIFT)
	15122	+// {
	15123	+// mouseMode = mouseMode;
	15124	+// } else
	15125	+// {
	15126	+// mouseMode \|= ROTATE;
	15127	+// } // TRANSLATE;
14108	15128
	15129	+ targetLookAt.set(manipCamera.lookAt);
	15130	+
14109	15131	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14110	15132	prevY = Y = anchorY;
14111	15133	}
..	..	@@ -14115,7 +15137,7 @@
14115	15137	int X, Y;
14116	15138	boolean SX, SY;
14117	15139
14118		- void drag(int x, int y, int modifiers)
	15140	+ void drag(int x, int y, int modifiers, int modifiersex)
14119	15141	{
14120	15142	if (IsFrozen())
14121	15143	{
..	..	@@ -14124,17 +15146,17 @@
14124	15146
14125	15147	drag = true; // NEW
14126	15148
14127		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	15149	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14128	15150
14129	15151	X = x;
14130	15152	Y = y;
14131	15153	// floating state for animation
14132		- MODIFIERS = modifiers;
14133		- modifiers &= ~1024;
	15154	+ MODIFIERS = modifiersex;
	15155	+ modifiersex &= ~1024;
14134	15156	if (false) // modifiers != 0)
14135	15157	{
14136	15158	//new Exception().printStackTrace();
14137		- System.out.println("mouseDragged: " + modifiers);
	15159	+ System.out.println("mouseDragged: " + modifiersex);
14138	15160	System.out.println("SHIFT = " + SHIFT);
14139	15161	System.out.println("CONTROL = " + COMMAND);
14140	15162	System.out.println("META = " + META);
..	..	@@ -14147,14 +15169,16 @@
14147	15169	if (editObj)
14148	15170	{
14149	15171	drag = true;
14150		- ClickInfo info = new ClickInfo();
14151		- info.bounds.setBounds(0, 0,
	15172	+ //ClickInfo info = new ClickInfo();
	15173	+ object.clickInfo.bounds.setBounds(0, 0,
14152	15174	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14153		- info.pane = this;
14154		- info.camera = renderCamera;
14155		- info.x = x;
14156		- info.y = y;
14157		- object.editWindow.copy.doEditDrag(info);
	15175	+ object.clickInfo.pane = this;
	15176	+ object.clickInfo.camera = renderCamera;
	15177	+ object.clickInfo.x = x;
	15178	+ object.clickInfo.y = y;
	15179	+ object //.GetWindow().copy
	15180	+ .doEditDrag(//info,
	15181	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14158	15182	} else
14159	15183	{
14160	15184	if (x < startX)
..	..	@@ -14237,6 +15261,11 @@
14237	15261	if ((mouseMode & ZOOM) != 0)
14238	15262	{
14239	15263	//if ((mouseMode & BACKFORTH) != 0)
	15264	+ if ((modifiersex & SHIFT) == SHIFT)
	15265	+ {
	15266	+ ViewAngle(dy);
	15267	+ }
	15268	+ else
14240	15269	if ((mouseMode & VR) != 0)
14241	15270	manipCamera.BackForth(dx, dy, getWidth());
14242	15271	else
..	..	@@ -14303,22 +15332,30 @@
14303	15332	}
14304	15333	}
14305	15334
	15335	+// ClickInfo clickInfo = new ClickInfo();
	15336	+
14306	15337	public void mouseMoved(MouseEvent e)
14307	15338	{
	15339	+//object.editWindow.frame.
	15340	+ setCursor(Cursor.getDefaultCursor());
	15341	+
14308	15342	//System.out.println("mouseMoved: " + e);
14309	15343	if (isRenderer)
14310	15344	return;
14311	15345
14312		- ClickInfo ci = new ClickInfo();
14313		- ci.x = e.getX();
14314		- ci.y = e.getY();
14315		- ci.modifiers = e.getModifiersEx();
14316		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14317		- ci.pane = this;
14318		- ci.camera = renderCamera;
	15346	+ // Mouse cursor feedback
	15347	+ object.clickInfo.x = e.getX();
	15348	+ object.clickInfo.y = e.getY();
	15349	+ object.clickInfo.modifiers = e.getModifiersEx();
	15350	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15351	+ object.clickInfo.pane = this;
	15352	+ object.clickInfo.camera = renderCamera;
14319	15353	if (!isRenderer)
14320	15354	{
14321		- if (object.editWindow.copy.doEditClick(ci, 0))
	15355	+ //ObjEditor editWindow = object.editWindow;
	15356	+ //Object3D copy = editWindow.copy;
	15357	+ if (object.doEditClick(//clickInfo,
	15358	+ 0))
14322	15359	{
14323	15360	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14324	15361	} else
..	..	@@ -14330,7 +15367,11 @@
14330	15367
14331	15368	public void mouseReleased(MouseEvent e)
14332	15369	{
	15370	+ Globals.MOUSEDRAGGED = false;
	15371	+
14333	15372	movingcamera = false;
	15373	+ X = 0; // getBounds().width/2;
	15374	+ Y = 0; // getBounds().height/2;
14334	15375	//System.out.println("mouseReleased: " + e);
14335	15376	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14336	15377	}
..	..	@@ -14353,9 +15394,9 @@
14353	15394	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14354	15395	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14355	15396
14356		- if (control \|\| command \|\| IsFrozen())
	15397	+// No delay if (control \|\| command \|\| IsFrozen())
14357	15398	timeout = true;
14358		- else
	15399	+// ?? May 2019 else
14359	15400	// timer.setDelay((modifiers & 128) != 0?0:350);
14360	15401	mouseDown = false;
14361	15402	if (!control && !command) // june 2013
..	..	@@ -14465,7 +15506,7 @@
14465	15506	System.out.println("keyReleased: " + e);
14466	15507	}
14467	15508
14468		- void SetMouseMode(int modifiers)
	15509	+ void SetMouseMode(int modifiers, int modifiersex)
14469	15510	{
14470	15511	//System.out.println("SetMouseMode = " + modifiers);
14471	15512	//modifiers &= ~1024;
..	..	@@ -14477,25 +15518,28 @@
14477	15518	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14478	15519	// return;
14479	15520	//System.out.println("SetMode = " + modifiers);
14480		- if ((modifiers & WHEEL) == WHEEL)
	15521	+ if ((modifiersex & WHEEL) == WHEEL)
14481	15522	{
14482	15523	mouseMode \|= ZOOM;
14483	15524	}
14484	15525
14485		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14486		- if (capsLocked \|\| (modifiers & META) == META)
	15526	+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	15527	+ boolean vr = capsLocked && !lightMode;
	15528	+
	15529	+ if (vr) // \|\| (modifiers & META) == META)
14487	15530	{
14488	15531	mouseMode \|= VR; // BACKFORTH;
14489	15532	}
14490		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15533	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14491	15534	{
14492	15535	mouseMode \|= SELECT;
14493	15536	}
14494		- if ((modifiers & COMMAND) == COMMAND)
	15537	+ if ((modifiersex & COMMAND) == COMMAND)
14495	15538	{
14496	15539	mouseMode \|= SELECT;
14497	15540	}
14498		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15541	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15542	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14499	15543	{
14500	15544	mouseMode &= ~VR;
14501	15545	mouseMode \|= TRANSLATE;
..	..	@@ -14524,7 +15568,7 @@
14524	15568
14525	15569	if (isRenderer) //
14526	15570	{
14527		- SetMouseMode(modifiers);
	15571	+ SetMouseMode(0, modifiers);
14528	15572	}
14529	15573
14530	15574	Globals.theRenderer.keyPressed(key);
..	..	@@ -14539,8 +15583,18 @@
14539	15583	float SATPOW = 1; // 2; // 0.5f;
14540	15584	float BRIPOW = 1; // 0.5f; // 0.5f;
14541	15585
	15586	+static BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
	15587	+
	15588	+// Create a new blank cursor.
	15589	+static Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
	15590	+ cursorImg, new Point(0, 0), "blank cursor");
	15591	+
14542	15592	public void keyPressed(int key)
14543	15593	{
	15594	+// Set the blank cursor to the JFrame.
	15595	+//object.editWindow.frame.
	15596	+ setCursor(blankCursor);
	15597	+
14544	15598	if (key >= '0' && key <= '5')
14545	15599	clampbit = (key-'0');
14546	15600
..	..	@@ -14586,7 +15640,8 @@
14586	15640	// break;
14587	15641	case 'T':
14588	15642	CACHETEXTURE ^= true;
14589		- textures.clear();
	15643	+ texturepigment.clear();
	15644	+ texturebump.clear();
14590	15645	// repaint();
14591	15646	break;
14592	15647	case 'Y':
..	..	@@ -14596,8 +15651,8 @@
14596	15651	case 'K':
14597	15652	KOMPACTTEXTURE ^= true;
14598	15653	//textures.clear();
14599		- break;
14600		- case 'P': // Texture Projection macros
	15654	+ // break;
	15655	+ //case 'P': // Texture Projection macros
14601	15656	// SAVETEXTURE ^= true;
14602	15657	macromode = true;
14603	15658	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -14671,7 +15726,9 @@
14671	15726	case 'E' : COMPACT ^= true;
14672	15727	repaint();
14673	15728	break;
14674		- case 'W' : DEBUGHSB ^= true;
	15729	+ case 'W' : // Wide Window (fullscreen)
	15730	+ //DEBUGHSB ^= true;
	15731	+ ObjEditor.theFrame.ToggleFullScreen();
14675	15732	repaint();
14676	15733	break;
14677	15734	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14696,8 +15753,8 @@
14696	15753	RevertCamera();
14697	15754	repaint();
14698	15755	break;
	15756	+ //case 'l':
14699	15757	case 'L':
14700		- case 'l':
14701	15758	if (lightMode)
14702	15759	{
14703	15760	lightMode = false;
..	..	@@ -14716,7 +15773,7 @@
14716	15773	targetLookAt.set(manipCamera.lookAt);
14717	15774	repaint();
14718	15775	break;
14719		- case 'p':
	15776	+ case 'P': // p':
14720	15777	// c'est quoi ca au juste? spherical ^= true;
14721	15778	Skinshader ^= true; programInitialized = false;
14722	15779	repaint();
..	..	@@ -14727,7 +15784,8 @@
14727	15784	break;
14728	15785	case 'm':
14729	15786	{
14730		- PrintMemory();
	15787	+ //PrintMemory();
	15788	+ ToggleImageFlip();
14731	15789	break;
14732	15790	}
14733	15791	case 'M':
..	..	@@ -14754,27 +15812,31 @@
14754	15812	repaint();
14755	15813	break;
14756	15814	case 'O':
14757		- Globals.drawMode = OCCLUSION; // WARNING
14758		- repaint();
14759		- break;
	15815	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
	15816	+ //repaint();
	15817	+ //break;
14760	15818	case 'o':
14761	15819	OCCLUSION_CULLING ^= true;
14762	15820	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14763	15821	break;
14764		- case '0': envyoff ^= true; repaint(); break;
	15822	+ //case '0': envyoff ^= true; repaint(); break;
14765	15823	case '1':
14766	15824	case '2':
14767	15825	case '3':
14768	15826	case '4':
14769	15827	case '5':
14770		- newenvy = Character.getNumericValue(key);
14771		- repaint();
14772		- break;
14773	15828	case '6':
14774	15829	case '7':
14775	15830	case '8':
14776	15831	case '9':
14777		- BGcolor = (key - '6')/3.f;
	15832	+ if (true) // envyoff)
	15833	+ {
	15834	+ BGcolor = (key - '1')/8.f;
	15835	+ }
	15836	+ else
	15837	+ {
	15838	+ //newenvy = Character.getNumericValue(key);
	15839	+ }
14778	15840	repaint();
14779	15841	break;
14780	15842	case '!':
..	..	@@ -14840,11 +15902,25 @@
14840	15902	case '_':
14841	15903	kompactbit = 5;
14842	15904	break;
14843		- case '+':
14844		- kompactbit = 6;
14845		- break;
	15905	+// case '+':
	15906	+// kompactbit = 6;
	15907	+// break;
14846	15908	case ' ':
	15909	+ capsLocked ^= true;
	15910	+ repaint();
	15911	+ break;
	15912	+ case 'l':
14847	15913	lightMode ^= true;
	15914	+ if (lightMode)
	15915	+ {
	15916	+ keepshadow = Globals.RENDERSHADOW;
	15917	+ Globals.RENDERSHADOW = false;
	15918	+ }
	15919	+ else
	15920	+ {
	15921	+ Globals.RENDERSHADOW = keepshadow;
	15922	+ }
	15923	+
14848	15924	Globals.lighttouched = true;
14849	15925	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14850	15926	targetLookAt.set(manipCamera.lookAt);
..	..	@@ -14852,15 +15928,20 @@
14852	15928	break;
14853	15929	//case '`' :
14854	15930	case ESC:
	15931	+ if (FULLSCREEN)
	15932	+ object.editWindow.ToggleFullScreen();
	15933	+ break;
	15934	+ case 'p':
14855	15935	RENDERPROGRAM += 1;
14856	15936	RENDERPROGRAM %= 3;
	15937	+
14857	15938	repaint();
14858	15939	break;
14859	15940	case 'Z':
14860	15941	//RESIZETEXTURE ^= true;
14861	15942	//break;
14862	15943	case 'z':
14863		- RENDERSHADOW ^= true;
	15944	+ Globals.RENDERSHADOW ^= true;
14864	15945	Globals.lighttouched = true;
14865	15946	repaint();
14866	15947	break;
..	..	@@ -14889,12 +15970,17 @@
14889	15970	case ENTER:
14890	15971	// object.editWindow.ScreenFit(); // Edit();
14891	15972	ToggleLive();
	15973	+ if (capsLocked)
	15974	+ {
	15975	+ Globals.WALK ^= true;
	15976	+ }
14892	15977	break;
14893	15978	case DELETE:
14894	15979	ClearSelection();
14895	15980	break;
14896		- /*
14897	15981	case '+':
	15982	+
	15983	+ /*
14898	15984	//fontsize += 1;
14899	15985	bbzoom *= 2;
14900	15986	repaint();
..	..	@@ -14911,30 +15997,36 @@
14911	15997	case '=':
14912	15998	IncDepth();
14913	15999	//fontsize += 1;
14914		- object.editWindow.refreshContents(true);
	16000	+ object.GetWindow().refreshContents(true);
14915	16001	maskbit = 6;
14916	16002	break;
14917	16003	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14918	16004	DecDepth();
14919	16005	maskbit = 5;
14920	16006	//if(fontsize > 1) fontsize -= 1;
14921		- if (object.editWindow == null)
14922		- new Exception().printStackTrace();
14923		- else
14924		- object.editWindow.refreshContents(true);
	16007	+// if (object.editWindow == null)
	16008	+// new Exception().printStackTrace();
	16009	+// else
	16010	+ object.GetWindow().refreshContents(true);
14925	16011	break;
14926	16012	case '{':
14927		- manipCamera.shaper_fovy /= 1.1;
	16013	+ double factor = 1.1;
	16014	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16015	+ manipCamera.shaper_fovy /= factor;
14928	16016	System.out.println("FOV = " + manipCamera.shaper_fovy);
14929	16017	repaint();
14930	16018	break;
14931	16019	case '}':
14932		- manipCamera.shaper_fovy *= 1.1;
	16020	+ factor = 1.1;
	16021	+ if (manipCamera.shaper_fovy * factor < 150)
	16022	+ manipCamera.shaper_fovy *= factor;
14933	16023	System.out.println("FOV = " + manipCamera.shaper_fovy);
14934	16024	repaint();
14935	16025	break;
14936	16026	case '[':
14937		- manipCamera.shaper_fovy /= 1.01;
	16027	+ factor = 1.01;
	16028	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16029	+ manipCamera.shaper_fovy /= factor;
14938	16030	if (false) //manipCamera.hAspect == 0)
14939	16031	{
14940	16032	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -14950,7 +16042,9 @@
14950	16042	break;
14951	16043	case ']':
14952	16044	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
14953		- manipCamera.shaper_fovy *= 1.01;
	16045	+ factor = 1.01;
	16046	+ if (manipCamera.shaper_fovy * factor < 150)
	16047	+ manipCamera.shaper_fovy *= factor;
14954	16048	if (false) //manipCamera.hAspect == 0)
14955	16049	{
14956	16050	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -14984,102 +16078,117 @@
14984	16078	//mode = ROTATE;
14985	16079	if ((MODIFIERS & COMMAND) == 0) // VR??
14986	16080	{
14987		- SetMouseMode(modifiers);
	16081	+ SetMouseMode(0, modifiers);
14988	16082	}
14989	16083	}
14990	16084
	16085	+ boolean keys[] = new boolean[256];
	16086	+ int speedkey[] = new int[256];
	16087	+ int modifiers = 0;
	16088	+
14991	16089	public void processKeyEvent(KeyEvent e)
14992	16090	{
14993	16091	switch (e.getID())
14994	16092	{
14995	16093	case KeyEvent.KEY_PRESSED:
14996		- if (!autorepeat)
14997		- {
14998		- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
14999		- keyPressed(e.getKeyChar(), e.getModifiersEx());
15000		- }
15001		- if (manipCamera == lightCamera)
15002		- {
15003		- switch (e.getKeyCode())
15004		- {
15005		- case DOWN_ARROW:
15006		- lightCamera.DECAL /= 2;
15007		- repaint();
15008		- break;
15009		- case UP_ARROW:
15010		- lightCamera.DECAL *= 2;
15011		- repaint();
15012		- break;
15013		- case LEFT_ARROW:
15014		- lightCamera.SCALE /= 2;
15015		- repaint();
15016		- break;
15017		- case RIGHT_ARROW:
15018		- lightCamera.SCALE *= 2;
15019		- repaint();
15020		- break;
15021		- default:
15022		- break;
15023		- }
15024		-
15025		- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15026		- } else
15027		- {
15028		- if (true) // !autorepeat)
15029		- {
15030		- boolean reset = true;
15031		-
15032		- switch (e.getKeyCode())
15033		- {
15034		- case DOWN_ARROW:
15035		- GoDown(e.getModifiersEx());
15036		- repaint();
15037		- break;
15038		- case UP_ARROW:
15039		- GoUp(e.getModifiersEx());
15040		- repaint();
15041		- break;
15042		- case LEFT_ARROW:
15043		- GoLeft(e.getModifiersEx());
15044		- repaint();
15045		- break;
15046		- case RIGHT_ARROW:
15047		- GoRight(e.getModifiersEx());
15048		- repaint();
15049		- break;
15050		- default:
15051		- reset = false;
15052		- break;
15053		- }
15054		-
15055		- if (reset)
15056		- {
15057		- autorepeat = true;
15058		-
15059		- targetLookAt.set(manipCamera.lookAt);
15060		- }
15061		- }
15062		- }
	16094	+ keys[e.getKeyCode()] = true;
	16095	+ modifiers = e.getModifiersEx();
	16096	+ keyPressed(e.getKeyChar(), modifiers);
	16097	+ //Globals.theRenderer.keyPressed(e.getKeyChar());
	16098	+ repaint();
15063	16099	break;
15064		- case KeyEvent.KEY_TYPED:
15065		- break;
	16100	+// if (!autorepeat)
	16101	+// {
	16102	+// //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
	16103	+// keyPressed(e.getKeyChar(), e.getModifiersEx());
	16104	+// }
	16105	+// if (manipCamera == lightCamera)
	16106	+// {
	16107	+// switch (e.getKeyCode())
	16108	+// {
	16109	+// case DOWN_ARROW:
	16110	+// lightCamera.DECAL /= 2;
	16111	+// repaint();
	16112	+// break;
	16113	+// case UP_ARROW:
	16114	+// lightCamera.DECAL *= 2;
	16115	+// repaint();
	16116	+// break;
	16117	+// case LEFT_ARROW:
	16118	+// lightCamera.SCALE /= 2;
	16119	+// repaint();
	16120	+// break;
	16121	+// case RIGHT_ARROW:
	16122	+// lightCamera.SCALE *= 2;
	16123	+// repaint();
	16124	+// break;
	16125	+// default:
	16126	+// break;
	16127	+// }
	16128	+//
	16129	+// System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
	16130	+// } else
	16131	+// {
	16132	+// if (true) // !autorepeat)
	16133	+// {
	16134	+// boolean reset = true;
	16135	+//
	16136	+// switch (e.getKeyCode())
	16137	+// {
	16138	+// case DOWN_ARROW:
	16139	+// GoDown(e.getModifiersEx());
	16140	+// repaint();
	16141	+// break;
	16142	+// case UP_ARROW:
	16143	+// GoUp(e.getModifiersEx());
	16144	+// repaint();
	16145	+// break;
	16146	+// case LEFT_ARROW:
	16147	+// GoLeft(e.getModifiersEx());
	16148	+// repaint();
	16149	+// break;
	16150	+// case RIGHT_ARROW:
	16151	+// GoRight(e.getModifiersEx());
	16152	+// repaint();
	16153	+// break;
	16154	+// default:
	16155	+// reset = false;
	16156	+// break;
	16157	+// }
	16158	+//
	16159	+// if (reset)
	16160	+// {
	16161	+// autorepeat = true;
	16162	+//
	16163	+// targetLookAt.set(manipCamera.lookAt);
	16164	+// }
	16165	+// }
	16166	+// }
	16167	+// break;
	16168	+// case KeyEvent.KEY_TYPED:
	16169	+// break;
15066	16170	case KeyEvent.KEY_RELEASED:
15067		- {
15068		- switch (e.getKeyCode())
15069		- {
15070		- case DOWN_ARROW:
15071		- case UP_ARROW:
15072		- case LEFT_ARROW:
15073		- case RIGHT_ARROW:
15074		- MODIFIERS &= ~COMMAND;
15075		- autorepeat = false;
15076		- break;
15077		- default:
15078		- break;
15079		- }
	16171	+ keys[e.getKeyCode()] = false;
	16172	+ modifiers = e.getModifiersEx();
15080	16173	keyReleased(e.getKeyChar(), e.getModifiersEx());
	16174	+ repaint();
15081	16175	break;
15082		- }
	16176	+// {
	16177	+// switch (e.getKeyCode())
	16178	+// {
	16179	+// case DOWN_ARROW:
	16180	+// case UP_ARROW:
	16181	+// case LEFT_ARROW:
	16182	+// case RIGHT_ARROW:
	16183	+// MODIFIERS &= ~COMMAND;
	16184	+// autorepeat = false;
	16185	+// break;
	16186	+// default:
	16187	+// break;
	16188	+// }
	16189	+// keyReleased(e.getKeyChar(), e.getModifiersEx());
	16190	+// break;
	16191	+// }
15083	16192	default:
15084	16193	break;
15085	16194	}
..	..	@@ -15120,7 +16229,7 @@
15120	16229	{
15121	16230	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15122	16231	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15123		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	16232	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15124	16233	{
15125	16234	mouseMoved(e);
15126	16235	} else
..	..	@@ -15145,7 +16254,7 @@
15145	16254	}
15146	16255	*/
15147	16256
15148		- object.editWindow.EditSelection();
	16257	+ object.GetWindow().EditSelection(false);
15149	16258	}
15150	16259
15151	16260	void SelectParent()
..	..	@@ -15162,10 +16271,10 @@
15162	16271	{
15163	16272	//selectees.remove(i);
15164	16273	System.out.println("select parent of " + elem);
15165		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	16274	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15166	16275	} else
15167	16276	{
15168		- group.editWindow.Select(elem.GetTreePath(), first, true);
	16277	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15169	16278	}
15170	16279
15171	16280	first = false;
..	..	@@ -15207,12 +16316,12 @@
15207	16316	for (int j = 0; j < group.children.size(); j++)
15208	16317	{
15209	16318	elem = (Object3D) group.children.elementAt(j);
15210		- object.editWindow.Select(elem.GetTreePath(), first, true);
	16319	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15211	16320	first = false;
15212	16321	}
15213	16322	} else
15214	16323	{
15215		- object.editWindow.Select(elem.GetTreePath(), first, true);
	16324	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15216	16325	}
15217	16326
15218	16327	first = false;
..	..	@@ -15223,21 +16332,21 @@
15223	16332	{
15224	16333	//Composite group = (Composite) object;
15225	16334	Object3D group = object;
15226		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	16335	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15227	16336	}
15228	16337
15229	16338	void ResetTransform(int mask)
15230	16339	{
15231	16340	//Composite group = (Composite) object;
15232	16341	Object3D group = object;
15233		- group.editWindow.ResetTransform(mask);
	16342	+ group.GetWindow().ResetTransform(mask);
15234	16343	}
15235	16344
15236	16345	void FlipTransform()
15237	16346	{
15238	16347	//Composite group = (Composite) object;
15239	16348	Object3D group = object;
15240		- group.editWindow.FlipTransform();
	16349	+ group.GetWindow().FlipTransform();
15241	16350	// group.editWindow.ReduceMesh(true);
15242	16351	}
15243	16352
..	..	@@ -15245,7 +16354,7 @@
15245	16354	{
15246	16355	//Composite group = (Composite) object;
15247	16356	Object3D group = object;
15248		- group.editWindow.PrintMemory();
	16357	+ group.GetWindow().PrintMemory();
15249	16358	// group.editWindow.ReduceMesh(true);
15250	16359	}
15251	16360
..	..	@@ -15253,7 +16362,7 @@
15253	16362	{
15254	16363	//Composite group = (Composite) object;
15255	16364	Object3D group = object;
15256		- group.editWindow.ResetCentroid();
	16365	+ group.GetWindow().ResetCentroid();
15257	16366	}
15258	16367
15259	16368	void IncDepth()
..	..	@@ -15335,11 +16444,11 @@
15335	16444
15336	16445	int width = getBounds().width;
15337	16446	int height = getBounds().height;
15338		- ClickInfo info = new ClickInfo();
15339		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15340	16447	//Image img = CreateImage(width, height);
15341	16448	//System.out.println("width = " + width + "; height = " + height + "\n");
	16449	+
15342	16450	Graphics gr = g; // img.getGraphics();
	16451	+
15343	16452	if (!hasMarquee)
15344	16453	{
15345	16454	if (Xmin < Xmax) // !locked)
..	..	@@ -15411,44 +16520,92 @@
15411	16520	}
15412	16521	if (object != null && !hasMarquee)
15413	16522	{
	16523	+ if (object.clickInfo == null)
	16524	+ object.clickInfo = new ClickInfo();
	16525	+ ClickInfo info = object.clickInfo;
	16526	+ //ClickInfo info = new ClickInfo();
	16527	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16528	+
15414	16529	if (isRenderer)
15415	16530	{
15416		- info.flags++;
	16531	+ object.clickInfo.flags++;
15417	16532	double frameAspect = (double) width / (double) height;
15418	16533	if (frameAspect > renderCamera.aspect)
15419	16534	{
15420	16535	int desired = (int) ((double) height * renderCamera.aspect);
15421		- info.bounds.width -= width - desired;
15422		- info.bounds.x += (width - desired) / 2;
	16536	+ object.clickInfo.bounds.width -= width - desired;
	16537	+ object.clickInfo.bounds.x += (width - desired) / 2;
15423	16538	} else
15424	16539	{
15425	16540	int desired = (int) ((double) width / renderCamera.aspect);
15426		- info.bounds.height -= height - desired;
15427		- info.bounds.y += (height - desired) / 2;
	16541	+ object.clickInfo.bounds.height -= height - desired;
	16542	+ object.clickInfo.bounds.y += (height - desired) / 2;
15428	16543	}
15429	16544	}
15430		- info.g = gr;
15431		- info.camera = renderCamera;
	16545	+
	16546	+ object.clickInfo.g = gr;
	16547	+ object.clickInfo.camera = renderCamera;
15432	16548	/*
15433	16549	// Memory intensive (brep.verticescopy)
15434	16550	if (!(object instanceof Composite))
15435	16551	object.draw(info, 0, false); // SLOW :
15436	16552	*/
15437		- if (!isRenderer)
	16553	+ if (!isRenderer) // && drag)
15438	16554	{
15439		- object.drawEditHandles(info, 0);
	16555	+ Grafreed.Assert(object != null);
	16556	+ Grafreed.Assert(object.selection != null);
	16557	+ if (object.selection.Size() > 0)
	16558	+ {
	16559	+ int hitSomething = object.selection.get(0).hitSomething;
	16560	+
	16561	+ object.clickInfo.DX = 0;
	16562	+ object.clickInfo.DY = 0;
	16563	+ object.clickInfo.W = 1;
	16564	+ if (hitSomething == Object3D.hitCenter)
	16565	+ {
	16566	+ info.DX = X;
	16567	+ if (X != 0)
	16568	+ info.DX -= info.bounds.width/2;
	16569	+
	16570	+ info.DY = Y;
	16571	+ if (Y != 0)
	16572	+ info.DY -= info.bounds.height/2;
	16573	+ }
	16574	+
	16575	+ object.drawEditHandles(//info,
	16576	+ 0);
	16577	+
	16578	+ if (drag && (X != 0 \|\| Y != 0))
	16579	+ {
	16580	+ switch (hitSomething)
	16581	+ {
	16582	+ case Object3D.hitCenter: gr.setColor(Color.white);
	16583	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16584	+ break;
	16585	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16586	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16587	+ break;
	16588	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16589	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16590	+ break;
	16591	+ }
	16592	+
	16593	+ }
	16594	+ }
15440	16595	}
15441	16596	}
	16597	+
15442	16598	if (isRenderer)
15443	16599	{
15444	16600	//gr.setColor(Color.black);
15445	16601	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15446	16602	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15447	16603	}
	16604	+
15448	16605	if (hasMarquee)
15449	16606	{
15450	16607	gr.setXORMode(Color.white);
15451		- gr.setColor(Color.red);
	16608	+ gr.setColor(Color.white);
15452	16609	if (!firstime)
15453	16610	{
15454	16611	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -15557,6 +16714,7 @@
15557	16714	public boolean mouseDown(Event evt, int x, int y)
15558	16715	{
15559	16716	System.out.println("mouseDown: " + evt);
	16717	+ System.exit(0);
15560	16718	/*
15561	16719	locked = true;
15562	16720	drag = false;
..	..	@@ -15600,13 +16758,14 @@
15600	16758	{
15601	16759	keyPressed(0, modifiers);
15602	16760	}
15603		- clickStart(x, y, modifiers);
	16761	+ // clickStart(x, y, modifiers);
15604	16762	return true;
15605	16763	}
15606	16764
15607	16765	public boolean mouseDrag(Event evt, int x, int y)
15608	16766	{
15609		- //System.out.println("mouseDrag: " + evt);
	16767	+ System.out.println("mouseDrag: " + evt);
	16768	+ System.exit(0);
15610	16769	/*
15611	16770	drag = true;
15612	16771	//System.out.println("Mouse DRAG");
..	..	@@ -15718,13 +16877,14 @@
15718	16877	{
15719	16878	keyReleased(0, 0);
15720	16879	}
15721		- drag(x, y, modifiers);
	16880	+ drag(x, y, 0, modifiers);
15722	16881	return true;
15723	16882	}
15724	16883
15725	16884	public boolean mouseUp(Event evt, int x, int y)
15726	16885	{
15727	16886	System.out.println("mouseUp: " + evt);
	16887	+ System.exit(0);
15728	16888	/*
15729	16889	locked = false;
15730	16890	if (isRenderer)
..	..	@@ -15850,7 +17010,7 @@
15850	17010	Object3D object;
15851	17011	static Object3D trackedobject;
15852	17012	Camera renderCamera; // Light or Eye (or Occlusion)
15853		- /static/ Camera manipCamera; // Light or Eye
	17013	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15854	17014	/static/ Camera eyeCamera;
15855	17015	/static/ Camera lightCamera;
15856	17016	int cameracount;
..	..	@@ -15914,6 +17074,8 @@
15914	17074	private /static/ boolean firstime;
15915	17075	private /static/ cVector newView = new cVector();
15916	17076	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	17077	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	17078	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15917	17079	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15918	17080	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15919	17081	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15926,29 +17088,67 @@
15926	17088	{
15927	17089	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15928	17090
	17091	+ int usedsuf = 0;
	17092	+
15929	17093	for (int i = 0; i < suffixes.length; i++)
15930	17094	{
15931		- String resourceName = basename + suffixes[i] + "." + suffix;
15932		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15933		- mipmapped,
15934		- FileUtil.getFileSuffix(resourceName));
15935		- if (data == null)
	17095	+ String[] suffixe = suffixes;
	17096	+ String[] fallback = suffixes2;
	17097	+ String[] fallfallback = suffixes3;
	17098	+
	17099	+ for (int c=usedsuf; --c>=0;)
15936	17100	{
15937		- throw new IOException("Unable to load texture " + resourceName);
	17101	+// String[] temp = suffixe;
	17102	+// suffixe = fallback;
	17103	+// fallback = fallfallback;
	17104	+// fallfallback = temp;
15938	17105	}
	17106	+
	17107	+ String resourceName = basename + suffixe[i] + "." + suffix;
	17108	+ TextureData data;
	17109	+
	17110	+ try
	17111	+ {
	17112	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17113	+ mipmapped,
	17114	+ FileUtil.getFileSuffix(resourceName));
	17115	+ }
	17116	+ catch (Exception e)
	17117	+ {
	17118	+ try
	17119	+ {
	17120	+ resourceName = basename + fallback[i] + "." + suffix;
	17121	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17122	+ mipmapped,
	17123	+ FileUtil.getFileSuffix(resourceName));
	17124	+ }
	17125	+ catch (Exception e2)
	17126	+ {
	17127	+ resourceName = basename + fallfallback[i] + "." + suffix;
	17128	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17129	+ mipmapped,
	17130	+ FileUtil.getFileSuffix(resourceName));
	17131	+ }
	17132	+ }
	17133	+
15939	17134	//System.out.println("Target = " + targets[i]);
15940	17135	cubemap.updateImage(data, targets[i]);
15941	17136	}
15942	17137
15943	17138	return cubemap;
15944	17139	}
	17140	+
15945	17141	int bigsphere = -1;
15946	17142
15947	17143	float BGcolor = 0.5f;
15948	17144
15949		- private void DrawSkyBox(GL gl)
	17145	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	17146	+
	17147	+ private void DrawSkyBox(GL gl, float ratio)
15950	17148	{
15951		- if (envyoff \|\| cubemap == null)
	17149	+ if (//envyoff \|\|
	17150	+ WIREFRAME \|\|
	17151	+ cubemap == null)
15952	17152	{
15953	17153	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15954	17154	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15963,7 +17163,17 @@
15963	17163	// Compensates for ExaminerViewer's modification of modelview matrix
15964	17164	gl.glMatrixMode(GL.GL_MODELVIEW);
15965	17165	gl.glLoadIdentity();
	17166	+ gl.glScalef(1,ratio,1);
15966	17167
	17168	+// colorV[0] = 2;
	17169	+// colorV[1] = 2;
	17170	+// colorV[2] = 2;
	17171	+// colorV[3] = 1;
	17172	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	17173	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	17174	+//
	17175	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	17176	+
15967	17177	//gl.glActiveTexture(GL.GL_TEXTURE1);
15968	17178	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15969	17179
..	..	@@ -15995,6 +17205,7 @@
15995	17205	{
15996	17206	gl.glScalef(1.0f, -1.0f, 1.0f);
15997	17207	}
	17208	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
15998	17209	gl.glMultMatrixd(viewrot_1, 0);
15999	17210	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16000	17211	//viewer.updateInverseRotation(gl);
..	..	@@ -16035,7 +17246,8 @@
16035	17246	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16036	17247
16037	17248	cubemap.disable();
16038		- ////cubemap.unbind();
	17249	+ //cubemap.dispose();
	17250	+
16039	17251	if (CULLFACE)
16040	17252	{
16041	17253	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16091,7 +17303,7 @@
16091	17303	gl.glScalef(1.0f, -1.0f, 1.0f);
16092	17304	}
16093	17305
16094		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	17306	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16095	17307
16096	17308	float step = 2; // 0.1666f; //0.25f;
16097	17309	float stepv = 2; // step * 1652 / 998;
..	..	@@ -16135,16 +17347,16 @@
16135	17347	cStatic.objectstack[materialdepth++] = checker;
16136	17348	//System.out.println("material " + material);
16137	17349	//Applet3D.tracein(this, selected);
16138		- vector2buffer = checker.projectedVertices;
	17350	+ //vector2buffer = checker.projectedVertices;
16139	17351
16140	17352	//checker.GetMaterial().Draw(this, false); // true);
16141		- DrawMaterial(checker.GetMaterial(), false); // true);
	17353	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16142	17354
16143	17355	materialdepth -= 1;
16144	17356	if (materialdepth > 0)
16145	17357	{
16146		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16147		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	17358	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	17359	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16148	17360	}
16149	17361	//checker.GetMaterial().opacity = 1f;
16150	17362	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16230,6 +17442,14 @@
16230	17442	}
16231	17443	}
16232	17444
	17445	+ private Object3D GetFolder()
	17446	+ {
	17447	+ Object3D folder = object.GetWindow().copy;
	17448	+ if (object.GetWindow().copy.selection.Size() > 0)
	17449	+ folder = object.GetWindow().copy.selection.elementAt(0);
	17450	+ return folder;
	17451	+ }
	17452	+
16233	17453	class SelectBuffer implements GLEventListener
16234	17454	{
16235	17455
..	..	@@ -16245,7 +17465,7 @@
16245	17465	//new Exception().printStackTrace();
16246	17466	System.out.println("select buffer init");
16247	17467	// Use debug pipeline
16248		- drawable.setGL(new DebugGL(drawable.getGL()));
	17468	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16249	17469
16250	17470	GL gl = drawable.getGL();
16251	17471
..	..	@@ -16309,6 +17529,17 @@
16309	17529
16310	17530	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16311	17531
	17532	+ if (PAINTMODE)
	17533	+ {
	17534	+ if (object.GetWindow().copy.selection.Size() > 0)
	17535	+ {
	17536	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17537	+
	17538	+ // Make what you paint not selectable.
	17539	+ paintobj.ResetSelectable();
	17540	+ }
	17541	+ }
	17542	+
16312	17543	//int tmp = selection_view;
16313	17544	//selection_view = -1;
16314	17545	int temp = DrawMode();
..	..	@@ -16320,6 +17551,17 @@
16320	17551	// temp = DEFAULT; // patch for selection debug
16321	17552	Globals.drawMode = temp; // WARNING
16322	17553
	17554	+ if (PAINTMODE)
	17555	+ {
	17556	+ if (object.GetWindow().copy.selection.Size() > 0)
	17557	+ {
	17558	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17559	+
	17560	+ // Revert.
	17561	+ paintobj.RestoreSelectable();
	17562	+ }
	17563	+ }
	17564	+
16323	17565	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16324	17566
16325	17567	// trying different ways of getting the depth info over
..	..	@@ -16350,7 +17592,7 @@
16350	17592
16351	17593	float depth = depths[y * TEX_SIZE + x];
16352	17594
16353		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17595	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
16354	17596	{
16355	17597	pointselection = false;
16356	17598
..	..	@@ -16367,6 +17609,8 @@
16367	17609	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16368	17610	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16369	17611	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17612	+
	17613	+ CreateSelectedPoint();
16370	17614
16371	17615	// Will fit the mesh !!!
16372	17616	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16416,34 +17660,36 @@
16416	17660	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
16417	17661	}
16418	17662
16419		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17663	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16420	17664	}
16421	17665	}
16422	17666
16423	17667	if (!movingcamera && !PAINTMODE)
16424		- object.editWindow.ScreenFitPoint(); // fev 2014
	17668	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16425	17669
16426		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17670	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16427	17671	{
16428		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17672	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16429	17673
16430		- Object3D group = new Object3D("inst" + paintcount++);
	17674	+ if (object.GetWindow().copy.selection.Size() > 0)
	17675	+ {
	17676	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16431	17677
16432		- group.CreateMaterial(); // use a void leaf to select instances
16433		-
16434		- group.add(paintobj); // link
16435		-
16436		- object.editWindow.SnapObject(group);
16437		-
16438		- Object3D folder = object.editWindow.copy;
16439		-
16440		- if (object.editWindow.copy.selection.Size() > 0)
16441		- folder = object.editWindow.copy.selection.elementAt(0);
16442		-
16443		- folder.add(group);
16444		-
16445		- object.editWindow.ResetModel();
16446		- object.editWindow.refreshContents();
	17678	+ Object3D inst = new Object3D("inst" + paintcount++);
	17679	+
	17680	+ inst.CreateMaterial(); // use a void leaf to select instances
	17681	+
	17682	+ inst.add(paintobj); // link
	17683	+
	17684	+ object.GetWindow().SnapObject(inst);
	17685	+
	17686	+ Object3D folder = paintFolder; // GetFolder();
	17687	+
	17688	+ folder.add(inst);
	17689	+
	17690	+ object.GetWindow().ResetModel();
	17691	+ object.GetWindow().refreshContents();
	17692	+ }
16447	17693	}
16448	17694	else
16449	17695	paintcount = 0;
..	..	@@ -16482,6 +17728,11 @@
16482	17728	//System.out.println("objects[color] = " + objects[color]);
16483	17729	//objects[color].Select();
16484	17730	indexcount = 0;
	17731	+ ObjEditor window = object.GetWindow();
	17732	+ if (window != null && deselect)
	17733	+ {
	17734	+ window.Select(null, deselect, true);
	17735	+ }
16485	17736	object.Select(color, deselect);
16486	17737	}
16487	17738
..	..	@@ -16532,6 +17783,7 @@
16532	17783
16533	17784	public void init(GLAutoDrawable drawable)
16534	17785	{
	17786	+ if (Globals.DEBUG)
16535	17787	System.out.println("shadow buffer init");
16536	17788
16537	17789	GL gl = drawable.getGL();
..	..	@@ -16581,7 +17833,7 @@
16581	17833	gl.glDisable(gl.GL_CULL_FACE);
16582	17834	}
16583	17835
16584		- if (!RENDERSHADOW)
	17836	+ if (!Globals.RENDERSHADOW)
16585	17837	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16586	17838
16587	17839	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16591,7 +17843,7 @@
16591	17843	//gl.glColorMask(false, false, false, false);
16592	17844
16593	17845	//render_scene_from_light_view(gl, drawable, 0, 0);
16594		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17846	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16595	17847	{
16596	17848	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16597	17849
..	..	@@ -16760,10 +18012,14 @@
16760	18012	gl.glFlush();
16761	18013
16762	18014	/**/
16763		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	18015	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
16764	18016
16765		- float[] pixels = occlusionsizebuffer.array();
	18017	+ float[] depths = occlusiondepthbuffer.array();
16766	18018
	18019	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	18020	+
	18021	+ int[] pixels = selectsizebuffer.array();
	18022	+
16767	18023	double r = 0, g = 0, b = 0;
16768	18024
16769	18025	double count = 0;
..	..	@@ -16774,7 +18030,7 @@
16774	18030
16775	18031	double FACTOR = 1;
16776	18032
16777		- for (int i = 0; i < pixels.length; i++)
	18033	+ for (int i = 0; i < depths.length; i++)
16778	18034	{
16779	18035	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
16780	18036	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -16857,7 +18113,7 @@
16857	18113
16858	18114	double scale = ray.z; // 1; // cos
16859	18115
16860		- float depth = pixels[newindex];
	18116	+ float depth = depths[newindex];
16861	18117
16862	18118	/*
16863	18119	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17000,6 +18256,11 @@
17000	18256	static boolean DEBUG_SELECTION = false;
17001	18257	boolean OCCLUSION_CULLING = false; //true;
17002	18258	public boolean lightMode = false;
	18259	+
	18260	+ private boolean keepshadow;
	18261	+
	18262	+ static public boolean capsLocked = false; // VR
	18263	+
17003	18264	static public int indexcount = 0;
17004	18265	/static/ cColor vertexOcclusion = new cColor();
17005	18266	//private int selection_view = -1;
..	..	@@ -17007,23 +18268,15 @@
17007	18268	int AAbuffersize = 0;
17008	18269
17009	18270	//double[] selectedpoint = new double[3];
17010		- static Superellipsoid selectedpoint = new Superellipsoid();
	18271	+ static Superellipsoid selectedpoint;
17011	18272	static Sphere previousselectedpoint = null;
17012		- static Sphere debugpointG = new Sphere();
17013		- static Sphere debugpointP = new Sphere();
17014		- static Sphere debugpointC = new Sphere();
17015		- static Sphere debugpointR = new Sphere();
	18273	+ static Sphere debugpointG;
	18274	+ static Sphere debugpointP;
	18275	+ static Sphere debugpointC;
	18276	+ static Sphere debugpointR;
17016	18277
17017	18278	static Sphere debugpoints[] = new Sphere[8];
17018	18279
17019		- static
17020		- {
17021		- for (int i=0; i<8; i++)
17022		- {
17023		- debugpoints[i] = new Sphere();
17024		- }
17025		- }
17026		-
17027	18280	static void InitPoints(float radius)
17028	18281	{
17029	18282	for (int i=0; i<8; i++)
..	..	@@ -17062,11 +18315,14 @@
17062	18315	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17063	18316	static IntBuffer bigAAbuffer;
17064	18317	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17065		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	18318	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17066	18319	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17067	18320	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17068	18321	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17069		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18322	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18323	+
	18324	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18325	+
17070	18326	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17071	18327	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17072	18328	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();