~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
..	..	@@ -83,7 +124,7 @@
83	124	static boolean LOCALTRANSFORM = false;
84	125	static boolean FULLSCREEN = false;
85	126	static boolean SUPPORT = true;
86		-static boolean INERTIA = true;
	127	+static boolean INERTIA = false; // true;
87	128	static boolean FAST = false;
88	129	static boolean SLOWPOSE = false;
89	130	static boolean FOOTCONTACT = true;
..	..	@@ -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;
..	..	@@ -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
..	..	@@ -193,7 +250,7 @@
193	250
194	251	public javax.media.opengl.GL GetGL0()
195	252	{
196		- return null;
	253	+ return currentGL;
197	254	}
198	255
199	256	public int GenList()
..	..	@@ -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;
..	..	@@ -1448,7 +1530,7 @@
1448	1530	}
1449	1531	}
1450	1532	float b = 0;
1451		- if (obj.support != null && obj.link2master)
	1533	+ if (obj.support != null && obj.Link2Support())
1452	1534	{
1453	1535	b = 1;
1454	1536	}
..	..	@@ -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();
..	..	@@ -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
..	..	@@ -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,7 +2337,7 @@
2265	2337	LOOKAT ^= true;
2266	2338	}
2267	2339
2268		- void ToggleRandom()
	2340	+ void ToggleSwitch()
2269	2341	{
2270	2342	SWITCH ^= true;
2271	2343	}
..	..	@@ -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)
..	..	@@ -8024,6 +8219,54 @@
8024	8219
8025	8220	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8026	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
	8269	+ {
8027	8270	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8028	8271	ambientOcclusion ) // \|\| !textureon)
8029	8272	{
..	..	@@ -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,47 +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) throws Exception
	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
	8364	+ if (texname.equals("") && texdata == null)
	8365	+ {
	8366	+ return null;
	8367	+ }
	8368	+
	8369	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8370	+
8078	8371	// String[] split = tex.split("Textures");
8079	8372	// if (split.length > 1)
8080	8373	// texname = "/Users/nbriere/Textures" + split[split.length-1];
8081	8374	// else
8082	8375	// if (!texname.startsWith("/"))
8083	8376	// texname = "/Users/nbriere/Textures/" + texname;
8084		- if (!new File(tex).exists())
	8377	+ if (!FileExists(texname) && !texname.startsWith("@"))
8085	8378	{
8086		- texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
	8379	+ texname = fallbackTextureName;
8087	8380	}
8088	8381
8089	8382	if (CACHETEXTURE)
8090		- texture = textures.get(texname); // TEXTURE CACHE
8091		-
8092		- TextureData texturedata = null;
8093		-
8094		- if (texture == null \|\| texture.resolution < resolution)
8095	8383	{
8096		- 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(""))
8097	8417	{
8098	8418	assert(!bump);
8099	8419	// if (bump)
..	..	@@ -8104,19 +8424,23 @@
8104	8424	// }
8105	8425	// else
8106	8426	// {
8107		- texture = textures.get(tex);
8108		- if (texture == null)
	8427	+ // texturecache = textures.get(texname); // suspicious
	8428	+ if (texturecache == null)
8109	8429	{
8110		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8430	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8111	8431	}
	8432	+ else
	8433	+ new Exception().printStackTrace();
8112	8434	// }
8113	8435	} else
8114		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8436	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8115	8437	{
8116	8438	assert(bump);
8117		- texture = textures.get(tex);
8118		- if (texture == null)
8119		- 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();
8120	8444	} else
8121	8445	{
8122	8446	//if (tex.equals("IMMORTAL"))
..	..	@@ -8124,11 +8448,22 @@
8124	8448	// texture = GetResourceTexture("default.png");
8125	8449	//} else
8126	8450	//{
8127		- if (tex.equals("WHITE_NOISE"))
	8451	+ if (texname.endsWith("WHITE_NOISE"))
8128	8452	{
8129		- texture = textures.get(tex);
8130		- if (texture == null)
8131		- 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();
8132	8467	} else
8133	8468	{
8134	8469	if (textureon)
..	..	@@ -8153,7 +8488,7 @@
8153	8488	}
8154	8489
8155	8490	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8156		- if (!new File(cachename).exists())
	8491	+ if (!FileExists(cachename))
8157	8492	cachename = texname;
8158	8493	else
8159	8494	processbump = false; // don't process bump map again
..	..	@@ -8175,7 +8510,7 @@
8175	8510	}
8176	8511
8177	8512	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8178		- if (!new File(cachename).exists())
	8513	+ if (!FileExists(cachename))
8179	8514	cachename = texname;
8180	8515	else
8181	8516	processbump = false; // don't process bump map again
..	..	@@ -8187,19 +8522,20 @@
8187	8522	if (texturedata == null)
8188	8523	throw new Exception();
8189	8524
8190		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8525	+ texturecache = new CacheTexture(texturedata,resolution);
8191	8526	//texture = GetTexture(tex, bump);
8192	8527	}
	8528	+ }
8193	8529	}
8194	8530	//}
8195	8531	}
8196	8532
8197		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8533	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8198	8534	{
8199	8535	//return false;
8200	8536
8201	8537	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8202		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8538	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8203	8539	{
8204	8540	// String ext = "_highres";
8205	8541	// if (REDUCETEXTURE)
..	..	@@ -8216,52 +8552,17 @@
8216	8552	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8217	8553	if (!cachefile.exists())
8218	8554	{
8219		- // cache to disk
8220		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8221		- //buffers[0].
8222		-
8223		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8224		- int[] pixels = new int[bytebuf.capacity()/3];
8225		-
8226		- // squared size heuristic...
8227		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8555	+ //if (texturedata.getWidth() == texturedata.getHeight())
8228	8556	{
8229		- for (int i=pixels.length; --i>=0;)
8230		- {
8231		- int i3 = i*3;
8232		- pixels[i] = 0xFF;
8233		- pixels[i] <<= 8;
8234		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8235		- pixels[i] <<= 8;
8236		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8237		- pixels[i] <<= 8;
8238		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8239		- }
8240		-
8241		- /*
8242		- int r=0,g=0,b=0,a=0;
8243		- for (int i=0; i<width; i++)
8244		- for (int j=0; j<height; j++)
8245		- {
8246		- int index = j*width+i;
8247		- int p = pixels[index];
8248		- a = ((p>>24) & 0xFF);
8249		- r = ((p>>16) & 0xFF);
8250		- g = ((p>>8) & 0xFF);
8251		- b = (p & 0xFF);
8252		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8253		- }
8254		- /**/
8255		- int width = (int)Math.sqrt(pixels.length); // squared
8256		- int height = width;
8257		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8258		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8557	+ BufferedImage rendImage = CreateBim(texturedata);
	8558	+
8259	8559	ImageWriter writer = null;
8260	8560	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8261	8561	if (iter.hasNext()) {
8262	8562	writer = (ImageWriter)iter.next();
8263	8563	}
8264		- float compressionQuality = 0.9f;
	8564	+
	8565	+ float compressionQuality = 0.85f;
8265	8566	try
8266	8567	{
8267	8568	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8278,18 +8579,20 @@
8278	8579	}
8279	8580	}
8280	8581	}
8281		-
	8582	+
	8583	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8584	+
8282	8585	//System.out.println("Texture = " + tex);
8283		- if (textures.containsKey(texname))
	8586	+ if (textures.containsKey(tex))
8284	8587	{
8285		- CacheTexture thetex = textures.get(texname);
	8588	+ CacheTexture thetex = textures.get(tex);
8286	8589	thetex.texture.disable();
8287	8590	thetex.texture.dispose();
8288		- textures.remove(texname);
	8591	+ textures.remove(tex);
8289	8592	}
8290	8593
8291		- texture.texturedata = texturedata;
8292		- textures.put(texname, texture);
	8594	+ //texture.texturedata = texturedata;
	8595	+ textures.put(tex, texturecache);
8293	8596
8294	8597	// newtex = true;
8295	8598	}
..	..	@@ -8305,10 +8608,46 @@
8305	8608	}
8306	8609	}
8307	8610
8308		- return texture;
	8611	+ return texturecache;
8309	8612	}
8310	8613
8311		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	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
8312	8651	{
8313	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8314	8653
..	..	@@ -8326,21 +8665,21 @@
8326	8665	return texture!=null?texture.texture:null;
8327	8666	}
8328	8667
8329		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8668	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8330	8669	{
8331	8670	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8332	8671
8333	8672	return texture!=null?texture.texturedata:null;
8334	8673	}
8335	8674
8336		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8675	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8337	8676	{
8338	8677	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8339	8678	{
8340	8679	return false;
8341	8680	}
8342	8681
8343		- boolean newtex = false;
	8682	+ //boolean newtex = false;
8344	8683
8345	8684	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8346	8685
..	..	@@ -8372,9 +8711,75 @@
8372	8711	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8373	8712	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8374	8713
8375		- return newtex;
	8714	+ return true; // Warning: not used.
8376	8715	}
8377	8716
	8717	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8718	+ {
	8719	+ try
	8720	+ {
	8721	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8722	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8723	+ ImageWriter writer = writers.next();
	8724	+
	8725	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8726	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8727	+ param.setCompressionQuality(quality);
	8728	+
	8729	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8730	+ writer.setOutput(ios);
	8731	+ writer.write(null, new IIOImage(image, null, null), param);
	8732	+
	8733	+ byte[] data = baos.toByteArray();
	8734	+ writer.dispose();
	8735	+ return data;
	8736	+ }
	8737	+ catch (Exception e)
	8738	+ {
	8739	+ e.printStackTrace();
	8740	+ return null;
	8741	+ }
	8742	+ }
	8743	+
	8744	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8745	+ {
	8746	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8747	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8748	+ ImageReader reader = writers.next();
	8749	+
	8750	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8751	+
	8752	+ ImageReadParam param = reader.getDefaultReadParam();
	8753	+ param.setDestination(bim);
	8754	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8755	+
	8756	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8757	+ reader.setInput(ios);
	8758	+ BufferedImage bim2 = reader.read(0, param);
	8759	+ reader.dispose();
	8760	+
	8761	+// WritableRaster raster = bim2.getRaster();
	8762	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8763	+// byte[] bytes = data.getData();
	8764	+//
	8765	+// int[] pixels = new int[bytes.length/3];
	8766	+// for (int i=pixels.length; --i>=0;)
	8767	+// {
	8768	+// int i3 = i*3;
	8769	+// pixels[i] = 0xFF;
	8770	+// pixels[i] <<= 8;
	8771	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8772	+// pixels[i] <<= 8;
	8773	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8774	+// pixels[i] <<= 8;
	8775	+// pixels[i] \|= bytes[i3] & 0xFF;
	8776	+// }
	8777	+//
	8778	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8779	+
	8780	+ return bim;
	8781	+ }
	8782	+
8378	8783	ShadowBuffer shadowPBuf;
8379	8784	AntialiasBuffer antialiasPBuf;
8380	8785	int MAXSTACK;
..	..	@@ -8391,10 +8796,12 @@
8391	8796
8392	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8393	8798	MAXSTACK = temp[0];
8394		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8395	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8396	8802	MAXSTACK = temp[0];
8397		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8398	8805
8399	8806	// Use debug pipeline
8400	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8402,7 +8809,8 @@
8402	8809	gl = drawable.getGL(); //
8403	8810
8404	8811	GL gl3 = getGL();
8405		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8406	8814
8407	8815
8408	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8567,7 +8975,7 @@
8567	8975
8568	8976	if (cubemap == null)
8569	8977	{
8570		- LoadEnvy(5);
	8978	+ //LoadEnvy(1);
8571	8979	}
8572	8980
8573	8981	//cubemap.enable();
..	..	@@ -8843,6 +9251,8 @@
8843	9251
8844	9252	void LoadEnvy(int which)
8845	9253	{
	9254	+ assert(false);
	9255	+
8846	9256	String name;
8847	9257	String ext;
8848	9258
..	..	@@ -8854,37 +9264,58 @@
8854	9264	cubemap = null;
8855	9265	return;
8856	9266	case 1:
8857		- name = "cubemaps/box_";
8858		- ext = "png";
	9267	+ name = "cubemaps/rgb/";
	9268	+ ext = "jpg";
8859	9269	reverseUP = false;
8860	9270	break;
8861	9271	case 2:
8862		- name = "cubemaps/uffizi_";
8863		- ext = "png";
8864		- break; // reverseUP = true; break;
	9272	+ name = "cubemaps/uffizi/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
8865	9276	case 3:
8866		- name = "cubemaps/CloudyHills_";
8867		- ext = "tga";
	9277	+ name = "cubemaps/CloudyHills/";
	9278	+ ext = "jpg";
8868	9279	reverseUP = false;
8869	9280	break;
8870	9281	case 4:
8871		- name = "cubemaps/cornell_";
	9282	+ name = "cubemaps/cornell/";
8872	9283	ext = "png";
8873	9284	reverseUP = false;
8874	9285	break;
	9286	+ case 5:
	9287	+ name = "cubemaps/skycube/";
	9288	+ ext = "jpg";
	9289	+ reverseUP = false;
	9290	+ break;
	9291	+ case 6:
	9292	+ name = "cubemaps/SaintLazarusChurch3/";
	9293	+ ext = "jpg";
	9294	+ reverseUP = false;
	9295	+ break;
	9296	+ case 7:
	9297	+ name = "cubemaps/Sodermalmsallen/";
	9298	+ ext = "jpg";
	9299	+ reverseUP = false;
	9300	+ break;
	9301	+ case 8:
	9302	+ name = "cubemaps/Sodermalmsallen2/";
	9303	+ ext = "jpg";
	9304	+ reverseUP = false;
	9305	+ break;
	9306	+ case 9:
	9307	+ name = "cubemaps/UnionSquare/";
	9308	+ ext = "jpg";
	9309	+ reverseUP = false;
	9310	+ break;
8875	9311	default:
8876		- name = "cubemaps/rgb_";
8877		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9312	+ name = "cubemaps/box/";
	9313	+ ext = "png"; /mipmap = true;/
	9314	+ reverseUP = false;
8878	9315	break;
8879	9316	}
8880		-
8881		- try
8882		- {
8883		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8884		- } catch (IOException e)
8885		- {
8886		- throw new RuntimeException(e);
8887		- }
	9317	+
	9318	+ LoadSkybox(name, ext, mipmap);
8888	9319	}
8889	9320
8890	9321	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8916,8 +9347,12 @@
8916	9347	static double[] model = new double[16];
8917	9348	double[] camera2light = new double[16];
8918	9349	double[] light2camera = new double[16];
8919		- int newenvy = -1;
8920		- boolean envyoff = true; // false;
	9350	+
	9351	+ //int newenvy = -1;
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
	9355	+
8921	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8922	9357	//float[] light0 = { 0,0,0 };
8923	9358	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9210,11 +9645,35 @@
9210	9645	jy8[3] = 0.5f;
9211	9646	}
9212	9647
9213		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9648	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9214	9649	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9215	9650	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9216	9651	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9217	9652
	9653	+ void ResetOptions()
	9654	+ {
	9655	+ options1[0] = 100;
	9656	+ options1[1] = 0.025f;
	9657	+ options1[2] = 0.01f;
	9658	+ options1[3] = 0;
	9659	+ options1[4] = 0;
	9660	+
	9661	+ options2[0] = 0;
	9662	+ options2[1] = 0.75f;
	9663	+ options2[2] = 0;
	9664	+ options2[3] = 0;
	9665	+
	9666	+ options3[0] = 1;
	9667	+ options3[1] = 1;
	9668	+ options3[2] = 1;
	9669	+ options3[3] = 0;
	9670	+
	9671	+ options4[0] = 1;
	9672	+ options4[1] = 0;
	9673	+ options4[2] = 1;
	9674	+ options4[3] = 0;
	9675	+ }
	9676	+
9218	9677	static int imagecount = 0; // movie generation
9219	9678
9220	9679	static int jitter = 0;
..	..	@@ -9310,8 +9769,8 @@
9310	9769	assert (parentcam != renderCamera);
9311	9770
9312	9771	if (renderCamera != lightCamera)
9313		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9314		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9772	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9773	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9315	9774
9316	9775	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9317	9776
..	..	@@ -9326,8 +9785,8 @@
9326	9785	LA.matCopy(renderCamera.fromScreen, matrix);
9327	9786
9328	9787	if (renderCamera != lightCamera)
9329		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9330		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9788	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9789	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9331	9790
9332	9791	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9333	9792
..	..	@@ -9373,13 +9832,18 @@
9373	9832	rati = 1 / rati;
9374	9833	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9375	9834	}
9376		- assert (newenvy == -1);
	9835	+
	9836	+ //assert (newenvy == -1);
	9837	+
9377	9838	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9378	9839	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9379		- DrawSkyBox(gl);
	9840	+ DrawSkyBox(gl, (float)rati);
9380	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9381	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9382		- accPerspective(gl, renderCamera.shaper_fovy / ratio,
	9843	+
	9844	+ boolean vr = capsLocked && !lightMode;
	9845	+
	9846	+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
9383	9847	ratio,
9384	9848	//near_plane, far_plane,
9385	9849	renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..	..	@@ -10242,9 +10706,18 @@
10242	10706	static boolean init = false;
10243	10707
10244	10708	double[][] matrix = LA.newMatrix();
	10709	+
	10710	+ // This is to refresh the UI of the material panel.
	10711	+ ObjEditor patchMaterial;
10245	10712
10246	10713	public void display(GLAutoDrawable drawable)
10247	10714	{
	10715	+ if (patchMaterial.patchMaterial)
	10716	+ {
	10717	+ patchMaterial.patchMaterial = false;
	10718	+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
	10719	+ }
	10720	+
10248	10721	if (Grafreed.savesound && Grafreed.hassound)
10249	10722	{
10250	10723	Grafreed.wav.save();
..	..	@@ -10288,7 +10761,9 @@
10288	10761	}
10289	10762	/**/
10290	10763
10291		- if (selection)
	10764	+ boolean control = ((modifiers & CTRL) != 0);
	10765	+
	10766	+ if (selection && (!Globals.isLIVE() \|\| control))
10292	10767	{
10293	10768	selectbuffer.display();
10294	10769	return;
..	..	@@ -10325,6 +10800,7 @@
10325	10800	ANTIALIAS = 0;
10326	10801	//System.out.println("RESTART");
10327	10802	AAtimer.restart();
	10803	+ Globals.TIMERRUNNING = true;
10328	10804	}
10329	10805	}
10330	10806	}
..	..	@@ -10339,6 +10815,112 @@
10339	10815
10340	10816	if (DrawMode() == DEFAULT)
10341	10817	{
	10818	+ if (manipCamera == lightCamera)
	10819	+ {
	10820	+// switch (e.getKeyCode())
	10821	+// {
	10822	+// case DOWN_ARROW:
	10823	+// lightCamera.DECAL /= 2;
	10824	+// repaint();
	10825	+// break;
	10826	+// case UP_ARROW:
	10827	+// lightCamera.DECAL *= 2;
	10828	+// repaint();
	10829	+// break;
	10830	+// case LEFT_ARROW:
	10831	+// lightCamera.SCALE /= 2;
	10832	+// repaint();
	10833	+// break;
	10834	+// case RIGHT_ARROW:
	10835	+// lightCamera.SCALE *= 2;
	10836	+// repaint();
	10837	+// break;
	10838	+// default:
	10839	+// break;
	10840	+ if (keys[DOWN_ARROW])
	10841	+ {
	10842	+ lightCamera.DECAL /= 2;
	10843	+ }
	10844	+
	10845	+ if (keys[UP_ARROW])
	10846	+ {
	10847	+ lightCamera.DECAL *= 2;
	10848	+ }
	10849	+
	10850	+ if (keys[LEFT_ARROW])
	10851	+ {
	10852	+ lightCamera.SCALE /= 2;
	10853	+ }
	10854	+
	10855	+ if (keys[RIGHT_ARROW])
	10856	+ {
	10857	+ lightCamera.SCALE *= 2;
	10858	+ }
	10859	+ }
	10860	+ else
	10861	+ {
	10862	+ //pingthread.mute = true;
	10863	+
	10864	+ boolean keyon = false;
	10865	+
	10866	+ if (keys[DOWN_ARROW])
	10867	+ {
	10868	+ speed = ++speedkey[DOWN_ARROW];
	10869	+ if (speed > 20)
	10870	+ speed = 20;
	10871	+ GoDown(modifiers);
	10872	+ keyon = true;
	10873	+ }
	10874	+ else
	10875	+ speedkey[DOWN_ARROW] = 0;
	10876	+
	10877	+ if (keys[UP_ARROW])
	10878	+ {
	10879	+ speed = ++speedkey[UP_ARROW];
	10880	+ if (speed > 20)
	10881	+ speed = 20;
	10882	+ GoUp(modifiers);
	10883	+ keyon = true;
	10884	+ }
	10885	+ else
	10886	+ speedkey[UP_ARROW] = 0;
	10887	+
	10888	+ if (keys[LEFT_ARROW])
	10889	+ {
	10890	+ speed = ++speedkey[LEFT_ARROW];
	10891	+ if (speed > 20)
	10892	+ speed = 20;
	10893	+ GoLeft(modifiers);
	10894	+ keyon = true;
	10895	+ }
	10896	+ else
	10897	+ speedkey[LEFT_ARROW] = 0;
	10898	+
	10899	+ if (keys[RIGHT_ARROW])
	10900	+ {
	10901	+ speed = ++speedkey[RIGHT_ARROW];
	10902	+ if (speed > 20)
	10903	+ speed = 20;
	10904	+ GoRight(modifiers);
	10905	+ keyon = true;
	10906	+ }
	10907	+ else
	10908	+ speedkey[RIGHT_ARROW] = 0;
	10909	+
	10910	+ if (Globals.WALK && capsLocked)
	10911	+ {
	10912	+ Walk();
	10913	+ keyon = true;
	10914	+ }
	10915	+
	10916	+ if (keyon)
	10917	+ {
	10918	+ repaint();
	10919	+ }
	10920	+
	10921	+ //pingthread.mute = false;
	10922	+ }
	10923	+
10342	10924	currentlydrawing = true;
10343	10925	}
10344	10926
..	..	@@ -10392,13 +10974,14 @@
10392	10974	ambientOcclusion = false;
10393	10975	}
10394	10976
10395		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10977	+ if (//Globals.lighttouched &&
	10978	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10396	10979	{
10397	10980	//if (RENDERSHADOW) // ?
10398	10981	if (!IsFrozen())
10399	10982	{
10400	10983	// dec 2012
10401		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10984	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10402	10985	{
10403	10986	Globals.framecount++;
10404	10987	shadowbuffer.display();
..	..	@@ -10411,7 +10994,7 @@
10411	10994
10412	10995	if (wait)
10413	10996	{
10414		- Sleep(500);
	10997	+ Sleep(200); // blocks everything
10415	10998
10416	10999	wait = false;
10417	11000	}
..	..	@@ -10525,8 +11108,8 @@
10525	11108
10526	11109	// if (parentcam != renderCamera) // not a light
10527	11110	if (cam != lightCamera)
10528		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10529		- LA.matConcat(matrix, parentcam.toParent, matrix);
	11111	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11112	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10530	11113
10531	11114	for (int j = 0; j < 4; j++)
10532	11115	{
..	..	@@ -10540,8 +11123,8 @@
10540	11123
10541	11124	// if (parentcam != renderCamera) // not a light
10542	11125	if (cam != lightCamera)
10543		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10544		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	11126	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11127	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10545	11128
10546	11129	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10547	11130
..	..	@@ -10627,13 +11210,43 @@
10627	11210	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10628	11211	}
10629	11212
10630		- if (newenvy > -1)
	11213	+// if (newenvy > -1)
	11214	+// {
	11215	+// LoadEnvy(newenvy);
	11216	+// }
	11217	+//
	11218	+// newenvy = -1;
	11219	+
	11220	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10631	11221	{
10632		- LoadEnvy(newenvy);
	11222	+ if (cubemaprgb == null)
	11223	+ {
	11224	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11225	+ }
	11226	+
	11227	+ cubemap = cubemaprgb;
10633	11228	}
10634		-
10635		- newenvy = -1;
10636		-
	11229	+ else
	11230	+ {
	11231	+ if (object.skyboxname != null)
	11232	+ {
	11233	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11234	+ {
	11235	+ if (cubemap != null && cubemap != cubemaprgb)
	11236	+ cubemap.dispose();
	11237	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11238	+ loadedskyboxname = object.skyboxname;
	11239	+ }
	11240	+ }
	11241	+ else
	11242	+ {
	11243	+ cubemapcustom = null;
	11244	+ loadedskyboxname = null;
	11245	+ }
	11246	+
	11247	+ cubemap = cubemapcustom;
	11248	+ }
	11249	+
10637	11250	ratio = ((double) getWidth()) / getHeight();
10638	11251	//System.out.println("ratio = " + ratio);
10639	11252
..	..	@@ -10649,7 +11262,7 @@
10649	11262
10650	11263	if (!IsFrozen() && !ambientOcclusion)
10651	11264	{
10652		- DrawSkyBox(gl);
	11265	+ DrawSkyBox(gl, (float)ratio);
10653	11266	}
10654	11267
10655	11268	//if (selection_view == -1)
..	..	@@ -10832,8 +11445,8 @@
10832	11445
10833	11446	gl.glMatrixMode(GL.GL_MODELVIEW);
10834	11447
10835		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10836	11448	//gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11449	+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10837	11450	//gl.glEnable(gl.GL_MULTISAMPLE);
10838	11451	} else
10839	11452	{
..	..	@@ -10845,7 +11458,7 @@
10845	11458	//System.out.println("BLENDING ON");
10846	11459	gl.glEnable(GL.GL_BLEND);
10847	11460	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10848		-
	11461	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10849	11462	gl.glMatrixMode(gl.GL_PROJECTION);
10850	11463	gl.glLoadIdentity();
10851	11464
..	..	@@ -10895,7 +11508,10 @@
10895	11508	//gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
10896	11509	} else
10897	11510	{
10898		- glu.gluPerspective(cam.shaper_fovy / ratio, ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
	11511	+ boolean vr = capsLocked && !lightMode;
	11512	+
	11513	+ glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1),
	11514	+ ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
10899	11515	}
10900	11516	}
10901	11517
..	..	@@ -10934,8 +11550,8 @@
10934	11550	System.err.println("parentcam != renderCamera");
10935	11551
10936	11552	// if (cam != lightCamera)
10937		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10938		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11553	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11554	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10939	11555	}
10940	11556
10941	11557	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10956,8 +11572,8 @@
10956	11572	if (true) // TODO
10957	11573	{
10958	11574	if (cam != lightCamera)
10959		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10960		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11575	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11576	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10961	11577	}
10962	11578
10963	11579	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11094,7 +11710,7 @@
11094	11710	}
11095	11711	}
11096	11712
11097		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11713	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11098	11714	{
11099	11715	//gl.glDepthFunc(GL.GL_LEQUAL);
11100	11716	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11102,24 +11718,21 @@
11102	11718
11103	11719	boolean texon = textureon;
11104	11720
11105		- if (RENDERPROGRAM > 0)
11106		- {
11107		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11108		- textureon = false;
11109		- }
	11721	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11722	+ textureon = false;
	11723	+
11110	11724	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11111	11725	//System.out.println("ALLO");
11112	11726	gl.glColorMask(false, false, false, false);
11113	11727	DrawObject(gl);
11114		- if (RENDERPROGRAM > 0)
11115		- {
11116		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11117		- textureon = texon;
11118		- }
	11728	+
	11729	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11730	+ textureon = texon;
	11731	+
11119	11732	gl.glColorMask(true, true, true, true);
11120	11733
11121	11734	gl.glDepthFunc(GL.GL_EQUAL);
11122		- //gl.glDepthMask(false);
	11735	+ gl.glDepthMask(false);
11123	11736	}
11124	11737
11125	11738	if (false) // DrawMode() == SHADOW)
..	..	@@ -11254,8 +11867,11 @@
11254	11867	repaint();
11255	11868	}
11256	11869
11257		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11870	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11871	+ {
	11872	+ renderCamera.computeTransform();
11258	11873	repaint();
	11874	+ }
11259	11875
11260	11876	displaydone = true;
11261	11877	}
..	..	@@ -11302,16 +11918,51 @@
11302	11918
11303	11919	static boolean zoomonce = false;
11304	11920
	11921	+ static void CreateSelectedPoint()
	11922	+ {
	11923	+ if (selectedpoint == null)
	11924	+ {
	11925	+ debugpointG = new Sphere();
	11926	+ debugpointP = new Sphere();
	11927	+ debugpointC = new Sphere();
	11928	+ debugpointR = new Sphere();
	11929	+
	11930	+ selectedpoint = new Superellipsoid();
	11931	+
	11932	+ for (int i=0; i<8; i++)
	11933	+ {
	11934	+ debugpoints[i] = new Sphere();
	11935	+ }
	11936	+ }
	11937	+ }
	11938	+
11305	11939	void DrawObject(GL gl, boolean draw)
11306	11940	{
	11941	+ // To clear camera values
	11942	+ ResetOptions();
	11943	+
11307	11944	//System.out.println("DRAW OBJECT " + mouseDown);
11308	11945	// DrawMode() = SELECTION;
11309	11946	//GL gl = getGL();
11310	11947	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11311	11948	{
	11949	+ if (TRACK)
	11950	+ {
	11951	+ if (object.selection != null &&
	11952	+ object.selection.size() > 0 &&
	11953	+ object.selection.elementAt(0) != null &&
	11954	+ !(object.selection.elementAt(0) instanceof Camera) &&
	11955	+ !(object.selection.elementAt(0) instanceof ScriptNode))
	11956	+ {
	11957	+ trackedobject = object.selection.elementAt(0);
	11958	+ //repaint();
	11959	+ }
	11960	+ else
	11961	+ trackedobject = null;
	11962	+ }
11312	11963	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11313		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11314		- pingthread.StepToTarget(true); // true);
	11964	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11965	+ pingthread.StepToTarget(); // true);
11315	11966	// zoomonce = false;
11316	11967	}
11317	11968
..	..	@@ -11382,8 +12033,9 @@
11382	12033
11383	12034	if (DrawMode() == DEFAULT)
11384	12035	{
11385		- if (DEBUG)
	12036	+ if (Globals.DEBUG)
11386	12037	{
	12038	+ CreateSelectedPoint();
11387	12039	float radius = 0.05f;
11388	12040	if (selectedpoint.radius != radius)
11389	12041	{
..	..	@@ -11437,20 +12089,32 @@
11437	12089	ReleaseTextures(DEFAULT_TEXTURES);
11438	12090
11439	12091	if (CLEANCACHE)
11440		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	12092	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11441	12093	{
11442		- String tex = e.nextElement();
	12094	+ cTexture tex = e.nextElement();
11443	12095
11444	12096	// System.out.println("Texture --------- " + tex);
11445	12097
11446		- if (tex.equals("WHITE_NOISE"))
	12098	+ if (tex.equals("WHITE_NOISE:"))
11447	12099	continue;
11448	12100
11449		- if (!usedtextures.containsKey(tex))
	12101	+ if (!usedtextures.contains(tex))
11450	12102	{
	12103	+ CacheTexture gettex = texturepigment.get(tex);
11451	12104	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11452		- textures.get(tex).texture.dispose();
11453		- textures.remove(tex);
	12105	+ if (gettex != null)
	12106	+ {
	12107	+ gettex.texture.dispose();
	12108	+ texturepigment.remove(tex);
	12109	+ }
	12110	+
	12111	+ gettex = texturebump.get(tex);
	12112	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	12113	+ if (gettex != null)
	12114	+ {
	12115	+ gettex.texture.dispose();
	12116	+ texturebump.remove(tex);
	12117	+ }
11454	12118	}
11455	12119	}
11456	12120	}
..	..	@@ -11552,7 +12216,7 @@
11552	12216	return;
11553	12217	}
11554	12218
11555		- String string = obj.GetToolTip();
	12219	+ String string = obj.toString(); //.GetToolTip();
11556	12220
11557	12221	GL gl = GetGL();
11558	12222
..	..	@@ -11869,8 +12533,8 @@
11869	12533	//obj.TransformToWorld(light, light);
11870	12534	for (int i = tp.size(); --i >= 0;)
11871	12535	{
11872		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11873		- LA.xformPos(light, tp.get(i).toParent, light);
	12536	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12537	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11874	12538	}
11875	12539
11876	12540
..	..	@@ -11887,8 +12551,8 @@
11887	12551	parentcam = cameras[0];
11888	12552	}
11889	12553
11890		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11891		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12554	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12555	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11892	12556
11893	12557	LA.xformPos(light, renderCamera.toScreen, light);
11894	12558
..	..	@@ -11978,8 +12642,82 @@
11978	12642
11979	12643	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11980	12644
11981		- String program =
	12645	+ String programmin =
	12646	+ // Min shader
11982	12647	"!!ARBfp1.0\n" +
	12648	+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
	12649	+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12650	+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
	12651	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12652	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12653	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12654	+ "PARAM light2cam0 = program.env[10];" +
	12655	+ "PARAM light2cam1 = program.env[11];" +
	12656	+ "PARAM light2cam2 = program.env[12];" +
	12657	+ "TEMP temp;" +
	12658	+ "TEMP light;" +
	12659	+ "TEMP ndotl;" +
	12660	+ "TEMP normal;" +
	12661	+ "TEMP depth;" +
	12662	+ "TEMP eye;" +
	12663	+ "TEMP pos;" +
	12664	+
	12665	+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
	12666	+ Normalize("normal") +
	12667	+ "MOV light, state.light[0].position;" +
	12668	+ "DP3 ndotl.x, light, normal;" +
	12669	+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
	12670	+
	12671	+ // shadow
	12672	+ "MOV pos, fragment.texcoord[1];" +
	12673	+ "MOV temp, pos;" +
	12674	+ ShadowTextureFetch("depth", "temp", "1") +
	12675	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12676	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12677	+
	12678	+ // No shadow when out of frustum
	12679	+ //"SGE temp.y, depth.z, zero123.y;" +
	12680	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12681	+
	12682	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12683	+
	12684	+ // Backlit
	12685	+ "MOV pos.w, zero12t.y;" + // one
	12686	+ "DP4 eye.x, pos, light2cam0;" +
	12687	+ "DP4 eye.y, pos, light2cam1;" +
	12688	+ "DP4 eye.z, pos, light2cam2;" +
	12689	+ Normalize("eye") +
	12690	+
	12691	+ "DP3 ndotl.y, -eye, normal;" +
	12692	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12693	+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
	12694	+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
	12695	+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12696	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12697	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12698	+ "ADD ndotl.y, ndotl.y, one.x;" +
	12699	+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
	12700	+
	12701	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12702	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12703	+
	12704	+ // Pigment
	12705	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12706	+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
	12707	+ "MUL temp, temp, zero12t.w;" + // Times x
	12708	+
	12709	+ //"MUL temp, temp, ndotl.y;" +
	12710	+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
	12711	+
	12712	+ "MUL temp, temp, ndotl.x;" + // lambert
	12713	+
	12714	+ "MOV temp.w, zero12t.y;" + // reset alpha
	12715	+ "MOV result.color, temp;" +
	12716	+ "END";
	12717	+
	12718	+ String programmax =
	12719	+ "!!ARBfp1.0\n" +
	12720	+
11983	12721	//"OPTION ARB_fragment_program_shadow;" +
11984	12722	"PARAM light2cam0 = program.env[10];" +
11985	12723	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12005,7 +12743,7 @@
12005	12743	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12006	12744	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12007	12745	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12008		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12746	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12009	12747	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12010	12748	"PARAM options1 = program.env[62];" + // fog rgb color
12011	12749	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12094,8 +12832,7 @@
12094	12832	"TEMP shininess;" +
12095	12833	"\n" +
12096	12834	"MOV texSamp, one;" +
12097		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12098		-
	12835	+
12099	12836	"MOV mapgrid.x, one2048th.x;" +
12100	12837	"MOV temp, fragment.texcoord[1];" +
12101	12838	/*
..	..	@@ -12116,20 +12853,20 @@
12116	12853	"MUL temp, floor, mapgrid.x;" +
12117	12854	//"TEX depth0, temp, texture[1], 2D;" +
12118	12855	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12119		- TextureFetch("depth0", "temp", "1") +
	12856	+ ShadowTextureFetch("depth0", "temp", "1") +
12120	12857	"") +
12121	12858	"ADD temp.x, temp.x, mapgrid.x;" +
12122	12859	//"TEX depth1, temp, texture[1], 2D;" +
12123	12860	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12124		- TextureFetch("depth1", "temp", "1") +
	12861	+ ShadowTextureFetch("depth1", "temp", "1") +
12125	12862	"") +
12126	12863	"ADD temp.y, temp.y, mapgrid.x;" +
12127	12864	//"TEX depth2, temp, texture[1], 2D;" +
12128		- TextureFetch("depth2", "temp", "1") +
	12865	+ ShadowTextureFetch("depth2", "temp", "1") +
12129	12866	"SUB temp.x, temp.x, mapgrid.x;" +
12130	12867	//"TEX depth3, temp, texture[1], 2D;" +
12131	12868	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12132		- TextureFetch("depth3", "temp", "1") +
	12869	+ ShadowTextureFetch("depth3", "temp", "1") +
12133	12870	"") +
12134	12871	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12135	12872	//"MOV params, material;" +
..	..	@@ -12251,7 +12988,7 @@
12251	12988	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12252	12989	// mar 2013 ??? "KIL alpha.a;" +
12253	12990	"MOV alpha, texSamp.aaaa;" + // y;" +
12254		- "KIL alpha.a;" +
	12991	+ "KIL alpha.a;" + // not sure with parallax mapping
12255	12992	/*
12256	12993	"MUL temp.xy, temp, two;" +
12257	12994	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12337,11 +13074,6 @@
12337	13074	"SUB bump0, bump0, half;" +
12338	13075	"ADD bump, bump, bump0;" +
12339	13076
12340		- "MOV temp.x, texSamp.a;" +
12341		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12342		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12343		- "MOV texSamp.a, temp.x;" +
12344		-
12345	13077	// double-sided
12346	13078	/**/
12347	13079	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12351,26 +13083,73 @@
12351	13083	"ADD temp.x, temp.x, one.x;" +
12352	13084	"MUL normal, normal, temp.xxxx;":""
12353	13085	) +
12354		- /**/
12355		-//// Normalize("normal") +
12356		-//// "MAX normal.z, eps.x, normal.z;" +
12357		-// Normalize("normal") +
12358		- "MOV normald, normal;" +
12359		- "MOV normals, normal;" +
	13086	+ /**/
	13087	+
	13088	+ "MOV temp, fragment.texcoord[4];" +
12360	13089
12361	13090	// UV base
12362	13091	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12363	13092	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12364	13093	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12365		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12366		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12367		- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
	13094	+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
	13095	+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
	13096	+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
	13097	+ Normalize("UP") +
	13098	+
12368	13099	"XPD V, normal, UP;" +
12369	13100	Normalize("V") +
12370	13101	"XPD U, V, normal;" +
12371	13102	Normalize("U") +
12372	13103
	13104	+ "MOV temp, fragment.texcoord[0];" +
	13105	+
	13106	+// "MAD normal, -temp.x, U, normal;" +
	13107	+// "MAD normal, -temp.y, V, normal;" +
	13108	+// Normalize("normal") +
	13109	+
	13110	+//// "MAX normal.z, eps.x, normal.z;" +
	13111	+// Normalize("normal") +
	13112	+ "MOV normald, normal;" +
	13113	+ "MOV normals, normal;" +
	13114	+
12373	13115	// parallax mapping
	13116	+
	13117	+ "DP3 temp2.x, V, eye;" +
	13118	+ "DP3 temp2.y, U, eye;" +
	13119	+ "DP3 temp2.z, normal, eye;" +
	13120	+ "RCP temp2.z, temp2.z;" +
	13121	+
	13122	+ "DP3 temp2.w, texSamp, texSamp;" + // Height
	13123	+ "RSQ temp2.w, temp2.w;" +
	13124	+ "RCP temp2.w, temp2.w;" +
	13125	+
	13126	+ "SUB temp2.w, temp2.w, half;" +
	13127	+ // "SGE temp.x, temp2.w, eps.x;" +
	13128	+ // "MUL temp2.w, temp2.w, temp.x;" +
	13129	+
	13130	+ // "MOV texSamp, U;" +
	13131	+
	13132	+ "MUL temp2.z, temp2.z, temp2.w;" +
	13133	+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
	13134	+
	13135	+ "MUL temp2, temp2, temp2.z;" +
	13136	+
	13137	+ "SUB temp, temp, temp2;" +
	13138	+
	13139	+ "TEX temp, temp, texture[0], 2D;" +
	13140	+ "POW temp.a, temp.a, params6.w;" + // punch through
	13141	+
	13142	+ "ADD texSamp, temp, texSamp;" +
	13143	+ "MUL texSamp.xyz, half, texSamp;" +
	13144	+
	13145	+ "MOV alpha, texSamp.aaaa;" +
	13146	+
	13147	+// parallax mapping
	13148	+
	13149	+ "MOV temp.x, texSamp.a;" +
	13150	+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
	13151	+ //"LRP texSamp0, params5.x, texSamp0, one;" +
	13152	+ "MOV texSamp.a, temp.x;" +
12374	13153
12375	13154	//"MOV temp, fragment.texcoord[0];" +
12376	13155	//
..	..	@@ -12500,10 +13279,10 @@
12500	13279	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12501	13280	"") +
12502	13281
12503		- // display shadow only (bump == 0)
	13282	+ // display shadow only (fakedepth == 0)
12504	13283	"SUB temp.x, half.x, shadow.x;" +
12505	13284	"MOV temp.y, -params5.z;" + // params6.x;" +
12506		- "SLT temp.z, temp.y, -one2048th.x;" +
	13285	+ "SLT temp.z, temp.y, -c256i.x;" +
12507	13286	"SUB temp.y, one.x, temp.z;" +
12508	13287	"MUL temp.x, temp.x, temp.y;" +
12509	13288	"KIL temp.x;" +
..	..	@@ -12834,8 +13613,19 @@
12834	13613	//once = true;
12835	13614	}
12836	13615
12837		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12838		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13616	+ String program = programmax;
	13617	+
	13618	+ if (Globals.MINSHADER)
	13619	+ {
	13620	+ program = programmin;
	13621	+ }
	13622	+
	13623	+ if (Globals.DEBUG)
	13624	+ {
	13625	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13626	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13627	+ }
	13628	+
12839	13629	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12840	13630
12841	13631	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12882,7 +13672,8 @@
12882	13672	"\n" +
12883	13673	"END\n";
12884	13674
12885		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13675	+ if (Globals.DEBUG)
	13676	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
12886	13677	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12887	13678
12888	13679	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12927,25 +13718,26 @@
12927	13718	return out;
12928	13719	}
12929	13720
12930		- String TextureFetch(String dest, String src, String unit)
	13721	+ // Also does frustum culling
	13722	+ String ShadowTextureFetch(String dest, String src, String unit)
12931	13723	{
12932	13724	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12933	13725	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12934	13726	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13727	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13728	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12935	13729	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12936		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12937		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12938		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12939		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13730	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13731	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12940	13732	//"SWZ buffer, temp, w,w,w,w;";
12941		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13733	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12942	13734	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12943	13735	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12944	13736	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12945		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13737	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12946	13738
12947		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12948		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13739	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13740	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12949	13741	}
12950	13742
12951	13743	String Shadow(String depth, String shadow)
..	..	@@ -12992,7 +13784,7 @@
12992	13784	"SLT temp.x, temp.x, zero.x;" + // shadoweps
12993	13785	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12994	13786
12995		- // No shadow when out of frustrum
	13787	+ // No shadow when out of frustum
12996	13788	"SGE temp.x, " + depth + ".z, one.z;" +
12997	13789	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12998	13790	"";
..	..	@@ -13139,8 +13931,9 @@
13139	13931	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13140	13932	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13141	13933	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13142		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13143		- Object3D.cVector2[] vector2buffer;
	13934	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
	13935	+
	13936	+ //Object3D.cVector2[] vector2buffer;
13144	13937
13145	13938	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13146	13939	// OUT : diff, spec
..	..	@@ -13156,9 +13949,10 @@
13156	13949	"DP3 " + dest + ".z," + "normals," + "eye;" +
13157	13950	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13158	13951	//"MOV " + dest + ".w," + "normal.z;" +
13159		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13160		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13161		- //"MOV " + dest + ".z," + "params2.w;" +
	13952	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13953	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13954	+
	13955	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13162	13956	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13163	13957	"RCP " + dest + ".w," + dest + ".w;" +
13164	13958	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13304,7 +14098,7 @@
13304	14098	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13305	14099	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13306	14100	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13307		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	14101	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13308	14102	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13309	14103	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13310	14104	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13365,7 +14159,7 @@
13365	14159	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13366	14160	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13367	14161	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13368		- //"MOV result.texcoord, vertex.texcoord;" +
	14162	+ //"MOV result.texcoord, vertex.fogcoord;" +
13369	14163	"MOV result.texcoord, temp;" +
13370	14164	// border fade
13371	14165	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13412,7 +14206,9 @@
13412	14206
13413	14207	//"ADD temp.z, temp.z, one;" +
13414	14208
13415		- "MOV result.color, temp;"
	14209	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14210	+
	14211	+ "MOV result.color, temp;" // Normal
13416	14212	: "MOV result.color, vertex.color;") +
13417	14213	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13418	14214	: "") +
..	..	@@ -13547,6 +14343,7 @@
13547	14343	public void mouseClicked(MouseEvent e)
13548	14344	{
13549	14345	System.out.println("mouseClicked: " + e);
	14346	+ System.exit(0);
13550	14347	}
13551	14348
13552	14349	public void mousePressed(MouseEvent e)
..	..	@@ -13585,10 +14382,12 @@
13585	14382	return;
13586	14383	}
13587	14384
13588		- 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;
13589	14388
13590	14389	// TIMER
13591		- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14390	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
13592	14391	{
13593	14392	keepboxmode = BOXMODE;
13594	14393	keepsupport = SUPPORT;
..	..	@@ -13629,7 +14428,7 @@
13629	14428	//}
13630	14429
13631	14430	SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
13632		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
	14431	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
13633	14432	anchorX = ax;
13634	14433	anchorY = ay;
13635	14434	prevX = px;
..	..	@@ -13663,6 +14462,7 @@
13663	14462	else
13664	14463	if (evt.getSource() == AAtimer)
13665	14464	{
	14465	+ Globals.TIMERRUNNING = false;
13666	14466	if (mouseDown)
13667	14467	{
13668	14468	//new Exception().printStackTrace();
..	..	@@ -13722,9 +14522,10 @@
13722	14522
13723	14523	// fev 2014???
13724	14524	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13725		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13726		- pingthread.StepToTarget(true); // true);
	14525	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14526	+ pingthread.StepToTarget(); // true);
13727	14527	}
	14528	+
13728	14529	// if (!LIVE)
13729	14530	super.repaint();
13730	14531	}
..	..	@@ -13737,6 +14538,7 @@
13737	14538	return;
13738	14539
13739	14540	AAtimer.restart(); //
	14541	+ Globals.TIMERRUNNING = true;
13740	14542
13741	14543	// waslive = LIVE;
13742	14544	// LIVE = false;
..	..	@@ -13786,14 +14588,15 @@
13786	14588	drag = false;
13787	14589	//System.out.println("Mouse DOWN");
13788	14590	editObj = false;
13789		- ClickInfo info = new ClickInfo();
13790		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13791		- info.pane = this;
13792		- info.camera = renderCamera;
13793		- info.x = x;
13794		- info.y = y;
13795		- info.modifiers = modifiersex;
13796		- editObj = object.doEditClick(info, 0);
	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);
13797	14600	if (!editObj)
13798	14601	{
13799	14602	hasMarquee = true;
..	..	@@ -13809,13 +14612,16 @@
13809	14612
13810	14613	public void mouseDragged(MouseEvent e)
13811	14614	{
	14615	+ Globals.MOUSEDRAGGED = true;
	14616	+
13812	14617	//System.out.println("mouseDragged: " + e);
13813	14618	if (isRenderer)
13814	14619	movingcamera = true;
	14620	+
13815	14621	//if (drawing)
13816	14622	//return;
13817		- if ((e.getModifiersEx() & CTRL) != 0
13818		- \|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
	14623	+ if ((e.getModifiersEx() & CTRL) != 0 \|\|
	14624	+ (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13819	14625	{
13820	14626	//System.out.println("mouseDragged: " + e);
13821	14627	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
..	..	@@ -13839,9 +14645,17 @@
13839	14645	return targetLookAt;
13840	14646	}
13841	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	+
13842	14653	class PingThread extends Thread
13843	14654	{
13844	14655	boolean jump;
	14656	+ boolean live;
	14657	+
	14658	+ boolean mute = false;
13845	14659
13846	14660	// void JumpToTarget()
13847	14661	// {
..	..	@@ -13857,6 +14671,95 @@
13857	14671	// only one thread!? synchronized
13858	14672	void StepToTarget(boolean jump)
13859	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	+ // System.err.println("selected point = " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][1]) + " " + Trunk(selectedpoint.toParent[3][2]));
	14683	+ CreateSelectedPoint();
	14684	+
	14685	+ RigidBody.pos.x = (float)selectedpoint.toParent[3][0];
	14686	+ RigidBody.pos.y = (float)selectedpoint.toParent[3][1];
	14687	+ RigidBody.pos.z = (float)selectedpoint.toParent[3][2];
	14688	+
	14689	+ RigidBody.wind.set(RigidBody.pos);
	14690	+ RigidBody.wind.x -= (float)manipCamera.location.x;
	14691	+ RigidBody.wind.y -= (float)manipCamera.location.y;
	14692	+ RigidBody.wind.z -= (float)manipCamera.location.z;
	14693	+ RigidBody.wind.normalize();
	14694	+ }
	14695	+
	14696	+ if (mute)
	14697	+ return;
	14698	+
	14699	+ if (capsLocked && manipCamera.viewCode == 0)
	14700	+ {
	14701	+ eye.x = manipCamera.location.x;
	14702	+ eye.y = manipCamera.location.y + 0.25;
	14703	+ eye.z = manipCamera.location.z;
	14704	+
	14705	+ dir.y = -1;
	14706	+
	14707	+ Ray ray = new Ray(eye, dir);
	14708	+
	14709	+ IntersectResult res = new IntersectResult();
	14710	+ res.t = Double.POSITIVE_INFINITY;
	14711	+
	14712	+ tmp.set(targetLookAt);
	14713	+ tmp.sub(manipCamera.location);
	14714	+
	14715	+ double dist = tmp.length();
	14716	+
	14717	+ tmp.normalize();
	14718	+
	14719	+ eye2.x = manipCamera.location.x + tmp.x * 0.25;
	14720	+ eye2.y = manipCamera.location.y + 0.25;
	14721	+ eye2.z = manipCamera.location.z + tmp.z * 0.25;
	14722	+
	14723	+ Ray ray2 = new Ray(eye2, dir);
	14724	+
	14725	+ IntersectResult res2 = new IntersectResult();
	14726	+ res2.t = Double.POSITIVE_INFINITY;
	14727	+
	14728	+ if (object.intersect(ray, res) && object.intersect(ray2, res2) && Math.abs(res.t - res2.t) < 0.25)
	14729	+ {
	14730	+ //tmp.set(manipCamera.location);
	14731	+
	14732	+ manipCamera.location.x = ray.eyePoint.x + ray.viewDirection.x * res.t;
	14733	+ manipCamera.location.y = ray.eyePoint.y + ray.viewDirection.y * res.t + 0.5;
	14734	+ manipCamera.location.z = ray.eyePoint.z + ray.viewDirection.z * res.t;
	14735	+
	14736	+ //tmp.sub(manipCamera.location);
	14737	+
	14738	+ targetLookAt.x = ray2.eyePoint.x + ray2.viewDirection.x * res2.t;
	14739	+ targetLookAt.y = ray2.eyePoint.y + ray2.viewDirection.y * res2.t + 0.5;
	14740	+ targetLookAt.z = ray2.eyePoint.z + ray2.viewDirection.z * res2.t;
	14741	+
	14742	+ targetLookAt.sub(manipCamera.location);
	14743	+ targetLookAt.normalize();
	14744	+ targetLookAt.mul(dist);
	14745	+ targetLookAt.add(manipCamera.location);
	14746	+
	14747	+ //if (tmp.dot(tmp) > 0.000001)
	14748	+ // System.out.println("INTERSECTION " + manipCamera.location);
	14749	+
	14750	+ manipCamera.lookAt.set(targetLookAt);
	14751	+
	14752	+ tmp.x = res.n.x;
	14753	+ tmp.y = res.n.y;
	14754	+ tmp.z = res.n.z;
	14755	+ tmp.x += res2.n.x;
	14756	+ tmp.y += res2.n.y;
	14757	+ tmp.z += res2.n.z;
	14758	+ tmp.normalize();
	14759	+ manipCamera.UP.set(tmp);
	14760	+ }
	14761	+ }
	14762	+
13860	14763	tmp.set(targetLookAt);
13861	14764	tmp.sub(manipCamera.lookAt); // june 2014
13862	14765
..	..	@@ -13894,7 +14797,7 @@
13894	14797
13895	14798	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
13896	14799	{
13897		- jump = true; // step = 1;
	14800	+ // sep 2019 jump = true; // step = 1;
13898	14801	}
13899	14802
13900	14803	if (OEILONCE && OEIL)
..	..	@@ -13929,7 +14832,10 @@
13929	14832	if (tmp.dot(tmp) < 0.00001)
13930	14833	{
13931	14834	zoomonce = false;
	14835	+ live = false;
13932	14836	}
	14837	+ else
	14838	+ live = true;
13933	14839
13934	14840	tmp.mul(step > step2 ? step : step2);
13935	14841	}
..	..	@@ -13956,7 +14862,7 @@
13956	14862	{
13957	14863	if (LOOKAT)
13958	14864	manipCamera.lookAt.add(tmp);
13959		- if (OEIL)
	14865	+ if (OEIL && !capsLocked)
13960	14866	manipCamera.location.add(tmp);
13961	14867
13962	14868	{
..	..	@@ -13971,7 +14877,10 @@
13971	14877	lightCamera.computeTransform();
13972	14878	}
13973	14879	}
13974		- manipCamera.computeTransform();
	14880	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14881	+ {
	14882	+ manipCamera.computeTransform();
	14883	+ }
13975	14884	}
13976	14885	// ?????? mouseDown = true;
13977	14886	//System.out.println("---------------- ---------- Paint " + tmp.length2());
..	..	@@ -14064,49 +14973,107 @@
14064	14973	}
14065	14974	}
14066	14975	}
	14976	+
14067	14977	PingThread pingthread = new PingThread();
14068		- int delta = 5;
14069		- int speed = 5;
	14978	+ int delta = 1;
	14979	+ int speed = 1;
	14980	+ int walk = 8;
14070	14981	boolean autorepeat = false;
14071	14982
	14983	+ void Walk()
	14984	+ {
	14985	+ manipCamera.BackForth(0, walk, 1000);
	14986	+
	14987	+ targetLookAt.set(manipCamera.lookAt);
	14988	+ }
	14989	+
	14990	+ void ViewAngle(float dy)
	14991	+ {
	14992	+ double factor = Math.exp(-dy/300.0); // (1 + dy/100);
	14993	+
	14994	+ if (manipCamera.shaper_fovy * factor > 1 &&
	14995	+ manipCamera.shaper_fovy * factor < 150)
	14996	+ {
	14997	+ manipCamera.shaper_fovy *= factor;
	14998	+ //System.out.println("fovy = " + shaper_fovy);
	14999	+ }
	15000	+ }
	15001	+
14072	15002	void GoDown(int mod)
14073	15003	{
14074	15004	MODIFIERS \|= COMMAND;
14075		- /*
	15005	+ boolean isVR = (mouseMode&VR)!=0;
	15006	+ /**/
14076	15007	if((mod&SHIFT) == SHIFT)
14077		- manipCamera.RotatePosition(0, -speed);
14078		- else
14079		- manipCamera.BackForth(0, -speed*delta, getWidth());
14080		- */
14081		- if ((mod & SHIFT) == SHIFT)
14082	15008	{
14083		- mouseMode = mouseMode; // VR??
14084		- } else
14085		- {
14086		- mouseMode \|= BACKFORTH;
	15009	+// if (isVR)
	15010	+// manipCamera.RotateInterest(0, speed);
	15011	+// else
	15012	+ if (isVR)
	15013	+ ViewAngle(-speed*delta);
	15014	+ else
	15015	+ manipCamera.Translate(0, -speed*delta, getWidth());
14087	15016	}
	15017	+ else
	15018	+ {
	15019	+ if (isVR)
	15020	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	15021	+ else
	15022	+ manipCamera.RotatePosition(0, -speed);
	15023	+ }
	15024	+
	15025	+ /**/
	15026	+// if ((mod & SHIFT) == SHIFT)
	15027	+// {
	15028	+// mouseMode = mouseMode; // VR??
	15029	+// } else
	15030	+// {
	15031	+// mouseMode \|= BACKFORTH;
	15032	+// }
14088	15033
	15034	+ targetLookAt.set(manipCamera.lookAt);
	15035	+
14089	15036	//prevX = X = anchorX;
14090	15037	prevY = Y = anchorY - (int) (renderCamera.Distance());
14091	15038	}
14092	15039
14093	15040	void GoUp(int mod)
14094	15041	{
	15042	+ RigidBody.justclicked = true;
	15043	+
14095	15044	MODIFIERS \|= COMMAND;
14096		- /*
	15045	+ /**/
	15046	+ boolean isVR = (mouseMode&VR)!=0;
	15047	+
14097	15048	if((mod&SHIFT) == SHIFT)
14098		- manipCamera.RotatePosition(0, speed);
14099		- else
14100		- manipCamera.BackForth(0, speed*delta, getWidth());
14101		- */
14102		- if ((mod & SHIFT) == SHIFT)
14103	15049	{
14104		- mouseMode = mouseMode;
14105		- } else
14106		- {
14107		- mouseMode \|= BACKFORTH;
	15050	+// if (isVR)
	15051	+// manipCamera.RotateInterest(0, -speed);
	15052	+// else
	15053	+ if (isVR)
	15054	+ ViewAngle(speed*delta);
	15055	+ else
	15056	+ manipCamera.Translate(0, speed*delta, getWidth());
14108	15057	}
	15058	+ else
	15059	+ {
	15060	+ if (isVR)
	15061	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	15062	+ else
	15063	+ manipCamera.RotatePosition(0, speed);
	15064	+ }
	15065	+
	15066	+ /**/
	15067	+// if ((mod & SHIFT) == SHIFT)
	15068	+// {
	15069	+// mouseMode = mouseMode;
	15070	+// } else
	15071	+// {
	15072	+// mouseMode \|= BACKFORTH;
	15073	+// }
14109	15074
	15075	+ targetLookAt.set(manipCamera.lookAt);
	15076	+
14110	15077	//prevX = X = anchorX;
14111	15078	prevY = Y = anchorY + (int) (renderCamera.Distance());
14112	15079	}
..	..	@@ -14114,20 +15081,31 @@
14114	15081	void GoLeft(int mod)
14115	15082	{
14116	15083	MODIFIERS \|= COMMAND;
14117		- /*
	15084	+ /**/
14118	15085	if((mod&SHIFT) == SHIFT)
14119		- manipCamera.RotatePosition(speed, 0);
	15086	+ manipCamera.Translate(speed, 0, getWidth());
14120	15087	else
14121		- manipCamera.Translate(speed*delta, 0, getWidth());
14122		- */
14123		- if ((mod & SHIFT) == SHIFT)
14124	15088	{
14125		- mouseMode = mouseMode;
14126		- } else
14127		- {
14128		- mouseMode \|= ROTATE;
14129		- } // TRANSLATE;
	15089	+ if ((mouseMode&VR)!=0)
	15090	+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
	15091	+ else
	15092	+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
	15093	+ }
	15094	+
	15095	+ /**/
	15096	+// if ((mod & SHIFT) == SHIFT)
	15097	+// {
	15098	+// mouseMode = mouseMode;
	15099	+// } else
	15100	+// {
	15101	+// mouseMode \|= ROTATE;
	15102	+// } // TRANSLATE;
14130	15103
	15104	+ //System.err.println("lookAt = " + manipCamera.lookAt);
	15105	+ //System.err.println("location = " + manipCamera.location);
	15106	+
	15107	+ targetLookAt.set(manipCamera.lookAt);
	15108	+
14131	15109	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14132	15110	prevY = Y = anchorY;
14133	15111	}
..	..	@@ -14135,20 +15113,28 @@
14135	15113	void GoRight(int mod)
14136	15114	{
14137	15115	MODIFIERS \|= COMMAND;
14138		- /*
	15116	+ /**/
14139	15117	if((mod&SHIFT) == SHIFT)
14140		- manipCamera.RotatePosition(-speed, 0);
	15118	+ manipCamera.Translate(-speed, 0, getWidth());
14141	15119	else
14142		- manipCamera.Translate(-speed*delta, 0, getWidth());
14143		- */
14144		- if ((mod & SHIFT) == SHIFT)
14145	15120	{
14146		- mouseMode = mouseMode;
14147		- } else
14148		- {
14149		- mouseMode \|= ROTATE;
14150		- } // TRANSLATE;
	15121	+ if ((mouseMode&VR)!=0)
	15122	+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
	15123	+ else
	15124	+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
	15125	+ }
	15126	+
	15127	+ /**/
	15128	+// if ((mod & SHIFT) == SHIFT)
	15129	+// {
	15130	+// mouseMode = mouseMode;
	15131	+// } else
	15132	+// {
	15133	+// mouseMode \|= ROTATE;
	15134	+// } // TRANSLATE;
14151	15135
	15136	+ targetLookAt.set(manipCamera.lookAt);
	15137	+
14152	15138	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14153	15139	prevY = Y = anchorY;
14154	15140	}
..	..	@@ -14190,14 +15176,16 @@
14190	15176	if (editObj)
14191	15177	{
14192	15178	drag = true;
14193		- ClickInfo info = new ClickInfo();
14194		- info.bounds.setBounds(0, 0,
	15179	+ //ClickInfo info = new ClickInfo();
	15180	+ object.clickInfo.bounds.setBounds(0, 0,
14195	15181	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14196		- info.pane = this;
14197		- info.camera = renderCamera;
14198		- info.x = x;
14199		- info.y = y;
14200		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	15182	+ object.clickInfo.pane = this;
	15183	+ object.clickInfo.camera = renderCamera;
	15184	+ object.clickInfo.x = x;
	15185	+ object.clickInfo.y = y;
	15186	+ object //.GetWindow().copy
	15187	+ .doEditDrag(//info,
	15188	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14201	15189	} else
14202	15190	{
14203	15191	if (x < startX)
..	..	@@ -14280,6 +15268,11 @@
14280	15268	if ((mouseMode & ZOOM) != 0)
14281	15269	{
14282	15270	//if ((mouseMode & BACKFORTH) != 0)
	15271	+ if ((modifiersex & SHIFT) == SHIFT)
	15272	+ {
	15273	+ ViewAngle(dy);
	15274	+ }
	15275	+ else
14283	15276	if ((mouseMode & VR) != 0)
14284	15277	manipCamera.BackForth(dx, dy, getWidth());
14285	15278	else
..	..	@@ -14346,22 +15339,30 @@
14346	15339	}
14347	15340	}
14348	15341
	15342	+// ClickInfo clickInfo = new ClickInfo();
	15343	+
14349	15344	public void mouseMoved(MouseEvent e)
14350	15345	{
	15346	+//object.editWindow.frame.
	15347	+ setCursor(Cursor.getDefaultCursor());
	15348	+
14351	15349	//System.out.println("mouseMoved: " + e);
14352	15350	if (isRenderer)
14353	15351	return;
14354	15352
14355		- ClickInfo ci = new ClickInfo();
14356		- ci.x = e.getX();
14357		- ci.y = e.getY();
14358		- ci.modifiers = e.getModifiersEx();
14359		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14360		- ci.pane = this;
14361		- ci.camera = renderCamera;
	15353	+ // Mouse cursor feedback
	15354	+ object.clickInfo.x = e.getX();
	15355	+ object.clickInfo.y = e.getY();
	15356	+ object.clickInfo.modifiers = e.getModifiersEx();
	15357	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15358	+ object.clickInfo.pane = this;
	15359	+ object.clickInfo.camera = renderCamera;
14362	15360	if (!isRenderer)
14363	15361	{
14364		- if (object.editWindow.copy.doEditClick(ci, 0))
	15362	+ //ObjEditor editWindow = object.editWindow;
	15363	+ //Object3D copy = editWindow.copy;
	15364	+ if (object.doEditClick(//clickInfo,
	15365	+ 0))
14365	15366	{
14366	15367	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14367	15368	} else
..	..	@@ -14373,8 +15374,17 @@
14373	15374
14374	15375	public void mouseReleased(MouseEvent e)
14375	15376	{
	15377	+ if (isRenderer && !movingcamera)
	15378	+ {
	15379	+ RigidBody.justclicked = true;
	15380	+ System.out.println("justclicked: " + e);
	15381	+ }
	15382	+
	15383	+ Globals.MOUSEDRAGGED = false;
	15384	+
14376	15385	movingcamera = false;
14377		- X = Y = 0;
	15386	+ X = 0; // getBounds().width/2;
	15387	+ Y = 0; // getBounds().height/2;
14378	15388	//System.out.println("mouseReleased: " + e);
14379	15389	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14380	15390	}
..	..	@@ -14526,8 +15536,10 @@
14526	15536	mouseMode \|= ZOOM;
14527	15537	}
14528	15538
14529		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14530		- if (capsLocked) // \|\| (modifiers & META) == META)
	15539	+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	15540	+ boolean vr = capsLocked && !lightMode;
	15541	+
	15542	+ if (vr) // \|\| (modifiers & META) == META)
14531	15543	{
14532	15544	mouseMode \|= VR; // BACKFORTH;
14533	15545	}
..	..	@@ -14539,7 +15551,8 @@
14539	15551	{
14540	15552	mouseMode \|= SELECT;
14541	15553	}
14542		- if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	15554	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15555	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14543	15556	{
14544	15557	mouseMode &= ~VR;
14545	15558	mouseMode \|= TRANSLATE;
..	..	@@ -14583,8 +15596,18 @@
14583	15596	float SATPOW = 1; // 2; // 0.5f;
14584	15597	float BRIPOW = 1; // 0.5f; // 0.5f;
14585	15598
	15599	+static BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
	15600	+
	15601	+// Create a new blank cursor.
	15602	+static Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
	15603	+ cursorImg, new Point(0, 0), "blank cursor");
	15604	+
14586	15605	public void keyPressed(int key)
14587	15606	{
	15607	+// Set the blank cursor to the JFrame.
	15608	+//object.editWindow.frame.
	15609	+ setCursor(blankCursor);
	15610	+
14588	15611	if (key >= '0' && key <= '5')
14589	15612	clampbit = (key-'0');
14590	15613
..	..	@@ -14630,7 +15653,8 @@
14630	15653	// break;
14631	15654	case 'T':
14632	15655	CACHETEXTURE ^= true;
14633		- textures.clear();
	15656	+ texturepigment.clear();
	15657	+ texturebump.clear();
14634	15658	// repaint();
14635	15659	break;
14636	15660	case 'Y':
..	..	@@ -14640,8 +15664,8 @@
14640	15664	case 'K':
14641	15665	KOMPACTTEXTURE ^= true;
14642	15666	//textures.clear();
14643		- break;
14644		- case 'P': // Texture Projection macros
	15667	+ // break;
	15668	+ //case 'P': // Texture Projection macros
14645	15669	// SAVETEXTURE ^= true;
14646	15670	macromode = true;
14647	15671	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -14715,7 +15739,9 @@
14715	15739	case 'E' : COMPACT ^= true;
14716	15740	repaint();
14717	15741	break;
14718		- case 'W' : DEBUGHSB ^= true;
	15742	+ case 'W' : // Wide Window (fullscreen)
	15743	+ //DEBUGHSB ^= true;
	15744	+ ObjEditor.theFrame.ToggleFullScreen();
14719	15745	repaint();
14720	15746	break;
14721	15747	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14740,8 +15766,8 @@
14740	15766	RevertCamera();
14741	15767	repaint();
14742	15768	break;
	15769	+ //case 'l':
14743	15770	case 'L':
14744		- case 'l':
14745	15771	if (lightMode)
14746	15772	{
14747	15773	lightMode = false;
..	..	@@ -14760,7 +15786,7 @@
14760	15786	targetLookAt.set(manipCamera.lookAt);
14761	15787	repaint();
14762	15788	break;
14763		- case 'p':
	15789	+ case 'P': // p':
14764	15790	// c'est quoi ca au juste? spherical ^= true;
14765	15791	Skinshader ^= true; programInitialized = false;
14766	15792	repaint();
..	..	@@ -14771,7 +15797,8 @@
14771	15797	break;
14772	15798	case 'm':
14773	15799	{
14774		- PrintMemory();
	15800	+ //PrintMemory();
	15801	+ ToggleImageFlip();
14775	15802	break;
14776	15803	}
14777	15804	case 'M':
..	..	@@ -14798,27 +15825,31 @@
14798	15825	repaint();
14799	15826	break;
14800	15827	case 'O':
14801		- Globals.drawMode = OCCLUSION; // WARNING
14802		- repaint();
14803		- break;
	15828	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
	15829	+ //repaint();
	15830	+ //break;
14804	15831	case 'o':
14805	15832	OCCLUSION_CULLING ^= true;
14806	15833	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14807	15834	break;
14808		- case '0': envyoff ^= true; repaint(); break;
	15835	+ //case '0': envyoff ^= true; repaint(); break;
14809	15836	case '1':
14810	15837	case '2':
14811	15838	case '3':
14812	15839	case '4':
14813	15840	case '5':
14814		- newenvy = Character.getNumericValue(key);
14815		- repaint();
14816		- break;
14817	15841	case '6':
14818	15842	case '7':
14819	15843	case '8':
14820	15844	case '9':
14821		- BGcolor = (key - '6')/3.f;
	15845	+ if (true) // envyoff)
	15846	+ {
	15847	+ BGcolor = (key - '1')/8.f;
	15848	+ }
	15849	+ else
	15850	+ {
	15851	+ //newenvy = Character.getNumericValue(key);
	15852	+ }
14822	15853	repaint();
14823	15854	break;
14824	15855	case '!':
..	..	@@ -14884,11 +15915,25 @@
14884	15915	case '_':
14885	15916	kompactbit = 5;
14886	15917	break;
14887		- case '+':
14888		- kompactbit = 6;
14889		- break;
	15918	+// case '+':
	15919	+// kompactbit = 6;
	15920	+// break;
14890	15921	case ' ':
	15922	+ capsLocked ^= true;
	15923	+ repaint();
	15924	+ break;
	15925	+ case 'l':
14891	15926	lightMode ^= true;
	15927	+ if (lightMode)
	15928	+ {
	15929	+ keepshadow = Globals.RENDERSHADOW;
	15930	+ Globals.RENDERSHADOW = false;
	15931	+ }
	15932	+ else
	15933	+ {
	15934	+ Globals.RENDERSHADOW = keepshadow;
	15935	+ }
	15936	+
14892	15937	Globals.lighttouched = true;
14893	15938	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14894	15939	targetLookAt.set(manipCamera.lookAt);
..	..	@@ -14896,8 +15941,13 @@
14896	15941	break;
14897	15942	//case '`' :
14898	15943	case ESC:
	15944	+ if (FULLSCREEN)
	15945	+ object.editWindow.ToggleFullScreen();
	15946	+ break;
	15947	+ case 'p':
14899	15948	RENDERPROGRAM += 1;
14900	15949	RENDERPROGRAM %= 3;
	15950	+
14901	15951	repaint();
14902	15952	break;
14903	15953	case 'Z':
..	..	@@ -14933,12 +15983,17 @@
14933	15983	case ENTER:
14934	15984	// object.editWindow.ScreenFit(); // Edit();
14935	15985	ToggleLive();
	15986	+ if (capsLocked)
	15987	+ {
	15988	+ Globals.WALK ^= true;
	15989	+ }
14936	15990	break;
14937	15991	case DELETE:
14938	15992	ClearSelection();
14939	15993	break;
14940		- /*
14941	15994	case '+':
	15995	+
	15996	+ /*
14942	15997	//fontsize += 1;
14943	15998	bbzoom *= 2;
14944	15999	repaint();
..	..	@@ -14955,30 +16010,36 @@
14955	16010	case '=':
14956	16011	IncDepth();
14957	16012	//fontsize += 1;
14958		- object.editWindow.refreshContents(true);
	16013	+ object.GetWindow().refreshContents(true);
14959	16014	maskbit = 6;
14960	16015	break;
14961	16016	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14962	16017	DecDepth();
14963	16018	maskbit = 5;
14964	16019	//if(fontsize > 1) fontsize -= 1;
14965		- if (object.editWindow == null)
14966		- new Exception().printStackTrace();
14967		- else
14968		- object.editWindow.refreshContents(true);
	16020	+// if (object.editWindow == null)
	16021	+// new Exception().printStackTrace();
	16022	+// else
	16023	+ object.GetWindow().refreshContents(true);
14969	16024	break;
14970	16025	case '{':
14971		- manipCamera.shaper_fovy /= 1.1;
	16026	+ double factor = 1.1;
	16027	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16028	+ manipCamera.shaper_fovy /= factor;
14972	16029	System.out.println("FOV = " + manipCamera.shaper_fovy);
14973	16030	repaint();
14974	16031	break;
14975	16032	case '}':
14976		- manipCamera.shaper_fovy *= 1.1;
	16033	+ factor = 1.1;
	16034	+ if (manipCamera.shaper_fovy * factor < 150)
	16035	+ manipCamera.shaper_fovy *= factor;
14977	16036	System.out.println("FOV = " + manipCamera.shaper_fovy);
14978	16037	repaint();
14979	16038	break;
14980	16039	case '[':
14981		- manipCamera.shaper_fovy /= 1.01;
	16040	+ factor = 1.01;
	16041	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16042	+ manipCamera.shaper_fovy /= factor;
14982	16043	if (false) //manipCamera.hAspect == 0)
14983	16044	{
14984	16045	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -14994,7 +16055,9 @@
14994	16055	break;
14995	16056	case ']':
14996	16057	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
14997		- manipCamera.shaper_fovy *= 1.01;
	16058	+ factor = 1.01;
	16059	+ if (manipCamera.shaper_fovy * factor < 150)
	16060	+ manipCamera.shaper_fovy *= factor;
14998	16061	if (false) //manipCamera.hAspect == 0)
14999	16062	{
15000	16063	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15032,98 +16095,113 @@
15032	16095	}
15033	16096	}
15034	16097
	16098	+ boolean keys[] = new boolean[256];
	16099	+ int speedkey[] = new int[256];
	16100	+ int modifiers = 0;
	16101	+
15035	16102	public void processKeyEvent(KeyEvent e)
15036	16103	{
15037	16104	switch (e.getID())
15038	16105	{
15039	16106	case KeyEvent.KEY_PRESSED:
15040		- if (!autorepeat)
15041		- {
15042		- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15043		- keyPressed(e.getKeyChar(), e.getModifiersEx());
15044		- }
15045		- if (manipCamera == lightCamera)
15046		- {
15047		- switch (e.getKeyCode())
15048		- {
15049		- case DOWN_ARROW:
15050		- lightCamera.DECAL /= 2;
15051		- repaint();
15052		- break;
15053		- case UP_ARROW:
15054		- lightCamera.DECAL *= 2;
15055		- repaint();
15056		- break;
15057		- case LEFT_ARROW:
15058		- lightCamera.SCALE /= 2;
15059		- repaint();
15060		- break;
15061		- case RIGHT_ARROW:
15062		- lightCamera.SCALE *= 2;
15063		- repaint();
15064		- break;
15065		- default:
15066		- break;
15067		- }
15068		-
15069		- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15070		- } else
15071		- {
15072		- if (true) // !autorepeat)
15073		- {
15074		- boolean reset = true;
15075		-
15076		- switch (e.getKeyCode())
15077		- {
15078		- case DOWN_ARROW:
15079		- GoDown(e.getModifiersEx());
15080		- repaint();
15081		- break;
15082		- case UP_ARROW:
15083		- GoUp(e.getModifiersEx());
15084		- repaint();
15085		- break;
15086		- case LEFT_ARROW:
15087		- GoLeft(e.getModifiersEx());
15088		- repaint();
15089		- break;
15090		- case RIGHT_ARROW:
15091		- GoRight(e.getModifiersEx());
15092		- repaint();
15093		- break;
15094		- default:
15095		- reset = false;
15096		- break;
15097		- }
15098		-
15099		- if (reset)
15100		- {
15101		- autorepeat = true;
15102		-
15103		- targetLookAt.set(manipCamera.lookAt);
15104		- }
15105		- }
15106		- }
	16107	+ keys[e.getKeyCode()] = true;
	16108	+ modifiers = e.getModifiersEx();
	16109	+ keyPressed(e.getKeyChar(), modifiers);
	16110	+ //Globals.theRenderer.keyPressed(e.getKeyChar());
	16111	+ repaint();
15107	16112	break;
15108		- case KeyEvent.KEY_TYPED:
15109		- break;
	16113	+// if (!autorepeat)
	16114	+// {
	16115	+// //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
	16116	+// keyPressed(e.getKeyChar(), e.getModifiersEx());
	16117	+// }
	16118	+// if (manipCamera == lightCamera)
	16119	+// {
	16120	+// switch (e.getKeyCode())
	16121	+// {
	16122	+// case DOWN_ARROW:
	16123	+// lightCamera.DECAL /= 2;
	16124	+// repaint();
	16125	+// break;
	16126	+// case UP_ARROW:
	16127	+// lightCamera.DECAL *= 2;
	16128	+// repaint();
	16129	+// break;
	16130	+// case LEFT_ARROW:
	16131	+// lightCamera.SCALE /= 2;
	16132	+// repaint();
	16133	+// break;
	16134	+// case RIGHT_ARROW:
	16135	+// lightCamera.SCALE *= 2;
	16136	+// repaint();
	16137	+// break;
	16138	+// default:
	16139	+// break;
	16140	+// }
	16141	+//
	16142	+// System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
	16143	+// } else
	16144	+// {
	16145	+// if (true) // !autorepeat)
	16146	+// {
	16147	+// boolean reset = true;
	16148	+//
	16149	+// switch (e.getKeyCode())
	16150	+// {
	16151	+// case DOWN_ARROW:
	16152	+// GoDown(e.getModifiersEx());
	16153	+// repaint();
	16154	+// break;
	16155	+// case UP_ARROW:
	16156	+// GoUp(e.getModifiersEx());
	16157	+// repaint();
	16158	+// break;
	16159	+// case LEFT_ARROW:
	16160	+// GoLeft(e.getModifiersEx());
	16161	+// repaint();
	16162	+// break;
	16163	+// case RIGHT_ARROW:
	16164	+// GoRight(e.getModifiersEx());
	16165	+// repaint();
	16166	+// break;
	16167	+// default:
	16168	+// reset = false;
	16169	+// break;
	16170	+// }
	16171	+//
	16172	+// if (reset)
	16173	+// {
	16174	+// autorepeat = true;
	16175	+//
	16176	+// targetLookAt.set(manipCamera.lookAt);
	16177	+// }
	16178	+// }
	16179	+// }
	16180	+// break;
	16181	+// case KeyEvent.KEY_TYPED:
	16182	+// break;
15110	16183	case KeyEvent.KEY_RELEASED:
15111		- {
15112		- switch (e.getKeyCode())
15113		- {
15114		- case DOWN_ARROW:
15115		- case UP_ARROW:
15116		- case LEFT_ARROW:
15117		- case RIGHT_ARROW:
15118		- MODIFIERS &= ~COMMAND;
15119		- autorepeat = false;
15120		- break;
15121		- default:
15122		- break;
15123		- }
	16184	+ keys[e.getKeyCode()] = false;
	16185	+ modifiers = e.getModifiersEx();
15124	16186	keyReleased(e.getKeyChar(), e.getModifiersEx());
	16187	+ repaint();
15125	16188	break;
15126		- }
	16189	+// {
	16190	+// switch (e.getKeyCode())
	16191	+// {
	16192	+// case DOWN_ARROW:
	16193	+// case UP_ARROW:
	16194	+// case LEFT_ARROW:
	16195	+// case RIGHT_ARROW:
	16196	+// MODIFIERS &= ~COMMAND;
	16197	+// autorepeat = false;
	16198	+// break;
	16199	+// default:
	16200	+// break;
	16201	+// }
	16202	+// keyReleased(e.getKeyChar(), e.getModifiersEx());
	16203	+// break;
	16204	+// }
15127	16205	default:
15128	16206	break;
15129	16207	}
..	..	@@ -15189,7 +16267,7 @@
15189	16267	}
15190	16268	*/
15191	16269
15192		- object.editWindow.EditSelection();
	16270	+ object.GetWindow().EditSelection(false);
15193	16271	}
15194	16272
15195	16273	void SelectParent()
..	..	@@ -15206,10 +16284,10 @@
15206	16284	{
15207	16285	//selectees.remove(i);
15208	16286	System.out.println("select parent of " + elem);
15209		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	16287	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15210	16288	} else
15211	16289	{
15212		- group.editWindow.Select(elem.GetTreePath(), first, true);
	16290	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15213	16291	}
15214	16292
15215	16293	first = false;
..	..	@@ -15251,12 +16329,12 @@
15251	16329	for (int j = 0; j < group.children.size(); j++)
15252	16330	{
15253	16331	elem = (Object3D) group.children.elementAt(j);
15254		- object.editWindow.Select(elem.GetTreePath(), first, true);
	16332	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15255	16333	first = false;
15256	16334	}
15257	16335	} else
15258	16336	{
15259		- object.editWindow.Select(elem.GetTreePath(), first, true);
	16337	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15260	16338	}
15261	16339
15262	16340	first = false;
..	..	@@ -15267,21 +16345,21 @@
15267	16345	{
15268	16346	//Composite group = (Composite) object;
15269	16347	Object3D group = object;
15270		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	16348	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15271	16349	}
15272	16350
15273	16351	void ResetTransform(int mask)
15274	16352	{
15275	16353	//Composite group = (Composite) object;
15276	16354	Object3D group = object;
15277		- group.editWindow.ResetTransform(mask);
	16355	+ group.GetWindow().ResetTransform(mask);
15278	16356	}
15279	16357
15280	16358	void FlipTransform()
15281	16359	{
15282	16360	//Composite group = (Composite) object;
15283	16361	Object3D group = object;
15284		- group.editWindow.FlipTransform();
	16362	+ group.GetWindow().FlipTransform();
15285	16363	// group.editWindow.ReduceMesh(true);
15286	16364	}
15287	16365
..	..	@@ -15289,7 +16367,7 @@
15289	16367	{
15290	16368	//Composite group = (Composite) object;
15291	16369	Object3D group = object;
15292		- group.editWindow.PrintMemory();
	16370	+ group.GetWindow().PrintMemory();
15293	16371	// group.editWindow.ReduceMesh(true);
15294	16372	}
15295	16373
..	..	@@ -15297,7 +16375,7 @@
15297	16375	{
15298	16376	//Composite group = (Composite) object;
15299	16377	Object3D group = object;
15300		- group.editWindow.ResetCentroid();
	16378	+ group.GetWindow().ResetCentroid();
15301	16379	}
15302	16380
15303	16381	void IncDepth()
..	..	@@ -15379,8 +16457,6 @@
15379	16457
15380	16458	int width = getBounds().width;
15381	16459	int height = getBounds().height;
15382		- ClickInfo info = new ClickInfo();
15383		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15384	16460	//Image img = CreateImage(width, height);
15385	16461	//System.out.println("width = " + width + "; height = " + height + "\n");
15386	16462
..	..	@@ -15457,43 +16533,77 @@
15457	16533	}
15458	16534	if (object != null && !hasMarquee)
15459	16535	{
	16536	+ if (object.clickInfo == null)
	16537	+ object.clickInfo = new ClickInfo();
	16538	+ ClickInfo info = object.clickInfo;
	16539	+ //ClickInfo info = new ClickInfo();
	16540	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16541	+
15460	16542	if (isRenderer)
15461	16543	{
15462		- info.flags++;
	16544	+ object.clickInfo.flags++;
15463	16545	double frameAspect = (double) width / (double) height;
15464	16546	if (frameAspect > renderCamera.aspect)
15465	16547	{
15466	16548	int desired = (int) ((double) height * renderCamera.aspect);
15467		- info.bounds.width -= width - desired;
15468		- info.bounds.x += (width - desired) / 2;
	16549	+ object.clickInfo.bounds.width -= width - desired;
	16550	+ object.clickInfo.bounds.x += (width - desired) / 2;
15469	16551	} else
15470	16552	{
15471	16553	int desired = (int) ((double) width / renderCamera.aspect);
15472		- info.bounds.height -= height - desired;
15473		- info.bounds.y += (height - desired) / 2;
	16554	+ object.clickInfo.bounds.height -= height - desired;
	16555	+ object.clickInfo.bounds.y += (height - desired) / 2;
15474	16556	}
15475	16557	}
15476		- info.g = gr;
15477		- info.camera = renderCamera;
	16558	+
	16559	+ object.clickInfo.g = gr;
	16560	+ object.clickInfo.camera = renderCamera;
15478	16561	/*
15479	16562	// Memory intensive (brep.verticescopy)
15480	16563	if (!(object instanceof Composite))
15481	16564	object.draw(info, 0, false); // SLOW :
15482	16565	*/
15483		- if (!isRenderer)
	16566	+ if (!isRenderer) // && drag)
15484	16567	{
15485		- object.drawEditHandles(info, 0);
15486		-
15487		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16568	+ Grafreed.Assert(object != null);
	16569	+ Grafreed.Assert(object.selection != null);
	16570	+ if (object.selection.Size() > 0)
15488	16571	{
15489		- switch (object.selection.get(0).hitSomething)
	16572	+ int hitSomething = object.selection.get(0).hitSomething;
	16573	+
	16574	+ object.clickInfo.DX = 0;
	16575	+ object.clickInfo.DY = 0;
	16576	+ object.clickInfo.W = 1;
	16577	+ if (hitSomething == Object3D.hitCenter)
15490	16578	{
15491		- case Object3D.hitCenter: gr.setColor(Color.pink); break;
15492		- case Object3D.hitRotate: gr.setColor(Color.green); break;
15493		- case Object3D.hitScale: gr.setColor(Color.cyan); break;
	16579	+ info.DX = X;
	16580	+ if (X != 0)
	16581	+ info.DX -= info.bounds.width/2;
	16582	+
	16583	+ info.DY = Y;
	16584	+ if (Y != 0)
	16585	+ info.DY -= info.bounds.height/2;
15494	16586	}
15495		-
15496		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16587	+
	16588	+ object.drawEditHandles(//info,
	16589	+ 0);
	16590	+
	16591	+ if (drag && (X != 0 \|\| Y != 0))
	16592	+ {
	16593	+ switch (hitSomething)
	16594	+ {
	16595	+ case Object3D.hitCenter: gr.setColor(Color.white);
	16596	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16597	+ break;
	16598	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16599	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16600	+ break;
	16601	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16602	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16603	+ break;
	16604	+ }
	16605	+
	16606	+ }
15497	16607	}
15498	16608	}
15499	16609	}
..	..	@@ -15508,7 +16618,7 @@
15508	16618	if (hasMarquee)
15509	16619	{
15510	16620	gr.setXORMode(Color.white);
15511		- gr.setColor(Color.red);
	16621	+ gr.setColor(Color.white);
15512	16622	if (!firstime)
15513	16623	{
15514	16624	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -15667,7 +16777,8 @@
15667	16777
15668	16778	public boolean mouseDrag(Event evt, int x, int y)
15669	16779	{
15670		- //System.out.println("mouseDrag: " + evt);
	16780	+ System.out.println("mouseDrag: " + evt);
	16781	+ System.exit(0);
15671	16782	/*
15672	16783	drag = true;
15673	16784	//System.out.println("Mouse DRAG");
..	..	@@ -15786,6 +16897,7 @@
15786	16897	public boolean mouseUp(Event evt, int x, int y)
15787	16898	{
15788	16899	System.out.println("mouseUp: " + evt);
	16900	+ System.exit(0);
15789	16901	/*
15790	16902	locked = false;
15791	16903	if (isRenderer)
..	..	@@ -15911,7 +17023,7 @@
15911	17023	Object3D object;
15912	17024	static Object3D trackedobject;
15913	17025	Camera renderCamera; // Light or Eye (or Occlusion)
15914		- /static/ Camera manipCamera; // Light or Eye
	17026	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15915	17027	/static/ Camera eyeCamera;
15916	17028	/static/ Camera lightCamera;
15917	17029	int cameracount;
..	..	@@ -15975,6 +17087,8 @@
15975	17087	private /static/ boolean firstime;
15976	17088	private /static/ cVector newView = new cVector();
15977	17089	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	17090	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	17091	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15978	17092	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15979	17093	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15980	17094	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15987,36 +17101,74 @@
15987	17101	{
15988	17102	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15989	17103
	17104	+ int usedsuf = 0;
	17105	+
15990	17106	for (int i = 0; i < suffixes.length; i++)
15991	17107	{
15992		- String resourceName = basename + suffixes[i] + "." + suffix;
15993		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15994		- mipmapped,
15995		- FileUtil.getFileSuffix(resourceName));
15996		- if (data == null)
	17108	+ String[] suffixe = suffixes;
	17109	+ String[] fallback = suffixes2;
	17110	+ String[] fallfallback = suffixes3;
	17111	+
	17112	+ for (int c=usedsuf; --c>=0;)
15997	17113	{
15998		- throw new IOException("Unable to load texture " + resourceName);
	17114	+// String[] temp = suffixe;
	17115	+// suffixe = fallback;
	17116	+// fallback = fallfallback;
	17117	+// fallfallback = temp;
15999	17118	}
	17119	+
	17120	+ String resourceName = basename + suffixe[i] + "." + suffix;
	17121	+ TextureData data;
	17122	+
	17123	+ try
	17124	+ {
	17125	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17126	+ mipmapped,
	17127	+ FileUtil.getFileSuffix(resourceName));
	17128	+ }
	17129	+ catch (Exception e)
	17130	+ {
	17131	+ try
	17132	+ {
	17133	+ resourceName = basename + fallback[i] + "." + suffix;
	17134	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17135	+ mipmapped,
	17136	+ FileUtil.getFileSuffix(resourceName));
	17137	+ }
	17138	+ catch (Exception e2)
	17139	+ {
	17140	+ resourceName = basename + fallfallback[i] + "." + suffix;
	17141	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17142	+ mipmapped,
	17143	+ FileUtil.getFileSuffix(resourceName));
	17144	+ }
	17145	+ }
	17146	+
16000	17147	//System.out.println("Target = " + targets[i]);
16001	17148	cubemap.updateImage(data, targets[i]);
16002	17149	}
16003	17150
16004	17151	return cubemap;
16005	17152	}
	17153	+
16006	17154	int bigsphere = -1;
16007	17155
16008	17156	float BGcolor = 0.5f;
16009	17157
16010		- private void DrawSkyBox(GL gl)
	17158	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	17159	+
	17160	+ private void DrawSkyBox(GL gl, float ratio)
16011	17161	{
16012		- if (envyoff \|\| cubemap == null)
	17162	+ if (//envyoff \|\|
	17163	+ WIREFRAME \|\|
	17164	+ cubemap == null)
16013	17165	{
16014	17166	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16015	17167	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
16016	17168	return;
16017	17169	}
16018	17170
16019		- if (WIREFRAME)
	17171	+ //if (WIREFRAME)
16020	17172	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
16021	17173
16022	17174	gl.glDisable(gl.GL_CULL_FACE);
..	..	@@ -16024,7 +17176,17 @@
16024	17176	// Compensates for ExaminerViewer's modification of modelview matrix
16025	17177	gl.glMatrixMode(GL.GL_MODELVIEW);
16026	17178	gl.glLoadIdentity();
	17179	+ gl.glScalef(1,ratio,1);
16027	17180
	17181	+// colorV[0] = 2;
	17182	+// colorV[1] = 2;
	17183	+// colorV[2] = 2;
	17184	+// colorV[3] = 1;
	17185	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	17186	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	17187	+//
	17188	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	17189	+
16028	17190	//gl.glActiveTexture(GL.GL_TEXTURE1);
16029	17191	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16030	17192
..	..	@@ -16056,6 +17218,7 @@
16056	17218	{
16057	17219	gl.glScalef(1.0f, -1.0f, 1.0f);
16058	17220	}
	17221	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16059	17222	gl.glMultMatrixd(viewrot_1, 0);
16060	17223	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16061	17224	//viewer.updateInverseRotation(gl);
..	..	@@ -16096,7 +17259,8 @@
16096	17259	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16097	17260
16098	17261	cubemap.disable();
16099		- ////cubemap.unbind();
	17262	+ //cubemap.dispose();
	17263	+
16100	17264	if (CULLFACE)
16101	17265	{
16102	17266	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16104,6 +17268,8 @@
16104	17268
16105	17269	if (WIREFRAME)
16106	17270	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_LINE);
	17271	+ else
	17272	+ gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
16107	17273	}
16108	17274
16109	17275	private void DrawChecker(GL gl)
..	..	@@ -16152,7 +17318,7 @@
16152	17318	gl.glScalef(1.0f, -1.0f, 1.0f);
16153	17319	}
16154	17320
16155		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	17321	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16156	17322
16157	17323	float step = 2; // 0.1666f; //0.25f;
16158	17324	float stepv = 2; // step * 1652 / 998;
..	..	@@ -16196,16 +17362,16 @@
16196	17362	cStatic.objectstack[materialdepth++] = checker;
16197	17363	//System.out.println("material " + material);
16198	17364	//Applet3D.tracein(this, selected);
16199		- vector2buffer = checker.projectedVertices;
	17365	+ //vector2buffer = checker.projectedVertices;
16200	17366
16201	17367	//checker.GetMaterial().Draw(this, false); // true);
16202		- DrawMaterial(checker.GetMaterial(), false); // true);
	17368	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16203	17369
16204	17370	materialdepth -= 1;
16205	17371	if (materialdepth > 0)
16206	17372	{
16207		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16208		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	17373	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	17374	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16209	17375	}
16210	17376	//checker.GetMaterial().opacity = 1f;
16211	17377	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16291,6 +17457,14 @@
16291	17457	}
16292	17458	}
16293	17459
	17460	+ private Object3D GetFolder()
	17461	+ {
	17462	+ Object3D folder = object.GetWindow().copy;
	17463	+ if (object.GetWindow().copy.selection.Size() > 0)
	17464	+ folder = object.GetWindow().copy.selection.elementAt(0);
	17465	+ return folder;
	17466	+ }
	17467	+
16294	17468	class SelectBuffer implements GLEventListener
16295	17469	{
16296	17470
..	..	@@ -16306,7 +17480,7 @@
16306	17480	//new Exception().printStackTrace();
16307	17481	System.out.println("select buffer init");
16308	17482	// Use debug pipeline
16309		- drawable.setGL(new DebugGL(drawable.getGL()));
	17483	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16310	17484
16311	17485	GL gl = drawable.getGL();
16312	17486
..	..	@@ -16370,6 +17544,17 @@
16370	17544
16371	17545	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16372	17546
	17547	+ if (PAINTMODE)
	17548	+ {
	17549	+ if (object.GetWindow().copy.selection.Size() > 0)
	17550	+ {
	17551	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17552	+
	17553	+ // Make what you paint not selectable.
	17554	+ paintobj.ResetSelectable();
	17555	+ }
	17556	+ }
	17557	+
16373	17558	//int tmp = selection_view;
16374	17559	//selection_view = -1;
16375	17560	int temp = DrawMode();
..	..	@@ -16381,6 +17566,17 @@
16381	17566	// temp = DEFAULT; // patch for selection debug
16382	17567	Globals.drawMode = temp; // WARNING
16383	17568
	17569	+ if (PAINTMODE)
	17570	+ {
	17571	+ if (object.GetWindow().copy.selection.Size() > 0)
	17572	+ {
	17573	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17574	+
	17575	+ // Revert.
	17576	+ paintobj.RestoreSelectable();
	17577	+ }
	17578	+ }
	17579	+
16384	17580	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16385	17581
16386	17582	// trying different ways of getting the depth info over
..	..	@@ -16411,7 +17607,7 @@
16411	17607
16412	17608	float depth = depths[y * TEX_SIZE + x];
16413	17609
16414		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17610	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
16415	17611	{
16416	17612	pointselection = false;
16417	17613
..	..	@@ -16428,6 +17624,8 @@
16428	17624	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16429	17625	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16430	17626	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17627	+
	17628	+ CreateSelectedPoint();
16431	17629
16432	17630	// Will fit the mesh !!!
16433	17631	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16482,29 +17680,31 @@
16482	17680	}
16483	17681
16484	17682	if (!movingcamera && !PAINTMODE)
16485		- object.editWindow.ScreenFitPoint(); // fev 2014
	17683	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16486	17684
16487		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17685	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16488	17686	{
16489		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17687	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16490	17688
16491		- Object3D group = new Object3D("inst" + paintcount++);
	17689	+ if (object.GetWindow().copy.selection.Size() > 0)
	17690	+ {
	17691	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16492	17692
16493		- group.CreateMaterial(); // use a void leaf to select instances
16494		-
16495		- group.add(paintobj); // link
16496		-
16497		- object.editWindow.SnapObject(group);
16498		-
16499		- Object3D folder = object.editWindow.copy;
16500		-
16501		- if (object.editWindow.copy.selection.Size() > 0)
16502		- folder = object.editWindow.copy.selection.elementAt(0);
16503		-
16504		- folder.add(group);
16505		-
16506		- object.editWindow.ResetModel();
16507		- object.editWindow.refreshContents();
	17693	+ Object3D inst = new Object3D("inst" + paintcount++);
	17694	+
	17695	+ inst.CreateMaterial(); // use a void leaf to select instances
	17696	+
	17697	+ inst.add(paintobj); // link
	17698	+
	17699	+ object.GetWindow().SnapObject(inst);
	17700	+
	17701	+ Object3D folder = paintFolder; // GetFolder();
	17702	+
	17703	+ folder.add(inst);
	17704	+
	17705	+ object.GetWindow().ResetModel();
	17706	+ object.GetWindow().refreshContents();
	17707	+ }
16508	17708	}
16509	17709	else
16510	17710	paintcount = 0;
..	..	@@ -16543,6 +17743,11 @@
16543	17743	//System.out.println("objects[color] = " + objects[color]);
16544	17744	//objects[color].Select();
16545	17745	indexcount = 0;
	17746	+ ObjEditor window = object.GetWindow();
	17747	+ if (window != null && deselect)
	17748	+ {
	17749	+ window.Select(null, deselect, true);
	17750	+ }
16546	17751	object.Select(color, deselect);
16547	17752	}
16548	17753
..	..	@@ -16593,6 +17798,7 @@
16593	17798
16594	17799	public void init(GLAutoDrawable drawable)
16595	17800	{
	17801	+ if (Globals.DEBUG)
16596	17802	System.out.println("shadow buffer init");
16597	17803
16598	17804	GL gl = drawable.getGL();
..	..	@@ -16821,10 +18027,14 @@
16821	18027	gl.glFlush();
16822	18028
16823	18029	/**/
16824		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	18030	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
16825	18031
16826		- float[] pixels = occlusionsizebuffer.array();
	18032	+ float[] depths = occlusiondepthbuffer.array();
16827	18033
	18034	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	18035	+
	18036	+ int[] pixels = selectsizebuffer.array();
	18037	+
16828	18038	double r = 0, g = 0, b = 0;
16829	18039
16830	18040	double count = 0;
..	..	@@ -16835,7 +18045,7 @@
16835	18045
16836	18046	double FACTOR = 1;
16837	18047
16838		- for (int i = 0; i < pixels.length; i++)
	18048	+ for (int i = 0; i < depths.length; i++)
16839	18049	{
16840	18050	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
16841	18051	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -16918,7 +18128,7 @@
16918	18128
16919	18129	double scale = ray.z; // 1; // cos
16920	18130
16921		- float depth = pixels[newindex];
	18131	+ float depth = depths[newindex];
16922	18132
16923	18133	/*
16924	18134	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17061,6 +18271,11 @@
17061	18271	static boolean DEBUG_SELECTION = false;
17062	18272	boolean OCCLUSION_CULLING = false; //true;
17063	18273	public boolean lightMode = false;
	18274	+
	18275	+ private boolean keepshadow;
	18276	+
	18277	+ static public boolean capsLocked = false; // VR
	18278	+
17064	18279	static public int indexcount = 0;
17065	18280	/static/ cColor vertexOcclusion = new cColor();
17066	18281	//private int selection_view = -1;
..	..	@@ -17068,23 +18283,15 @@
17068	18283	int AAbuffersize = 0;
17069	18284
17070	18285	//double[] selectedpoint = new double[3];
17071		- static Superellipsoid selectedpoint = new Superellipsoid();
	18286	+ static Superellipsoid selectedpoint;
17072	18287	static Sphere previousselectedpoint = null;
17073		- static Sphere debugpointG = new Sphere();
17074		- static Sphere debugpointP = new Sphere();
17075		- static Sphere debugpointC = new Sphere();
17076		- static Sphere debugpointR = new Sphere();
	18288	+ static Sphere debugpointG;
	18289	+ static Sphere debugpointP;
	18290	+ static Sphere debugpointC;
	18291	+ static Sphere debugpointR;
17077	18292
17078	18293	static Sphere debugpoints[] = new Sphere[8];
17079	18294
17080		- static
17081		- {
17082		- for (int i=0; i<8; i++)
17083		- {
17084		- debugpoints[i] = new Sphere();
17085		- }
17086		- }
17087		-
17088	18295	static void InitPoints(float radius)
17089	18296	{
17090	18297	for (int i=0; i<8; i++)
..	..	@@ -17123,11 +18330,14 @@
17123	18330	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17124	18331	static IntBuffer bigAAbuffer;
17125	18332	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17126		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	18333	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17127	18334	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17128	18335	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17129	18336	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17130		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18337	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18338	+
	18339	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18340	+
17131	18341	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17132	18342	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17133	18343	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();