~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
..	..	@@ -151,6 +192,19 @@
151	192	}
152	193
153	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	+ }
	207	+ }
154	208
155	209	void SetAsGLRenderer(boolean b)
156	210	{
..	..	@@ -168,9 +222,10 @@
168	222	cameras = new Camera[2];
169	223	targetLookAts = new cVector[2];
170	224
171		- SetCamera(cam);
	225	+ SetCamera(cam, true);
172	226
173		- SetLight(new Camera(new cVector(10, 10, -20)));
	227	+ // Warning: not used.
	228	+ //SetLight(new Camera(new cVector(15, 10, -20)));
174	229
175	230	object = o;
176	231
..	..	@@ -195,7 +250,7 @@
195	250
196	251	public javax.media.opengl.GL GetGL0()
197	252	{
198		- return null;
	253	+ return currentGL;
199	254	}
200	255
201	256	public int GenList()
..	..	@@ -327,7 +382,7 @@
327	382	cStatic.objectstack[materialdepth++] = obj;
328	383	//System.out.println("material " + material);
329	384	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	385	+ //display.vector2buffer = obj.projectedVertices;
331	386	if (obj instanceof Camera)
332	387	{
333	388	display.options1[0] = material.shift;
..	..	@@ -336,14 +391,28 @@
336	391	display.options1[2] = material.shadowbias;
337	392	display.options1[3] = material.aniso;
338	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]);
339	399	display.options2[0] = material.opacity;
340	400	display.options2[1] = material.diffuse;
341	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]);
342	405
343	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]);
344	410	display.options4[0] = material.cameralight/0.2f;
345	411	display.options4[1] = material.subsurface;
346	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]);
347	416
348	417	// if (display.CURRENTANTIALIAS > 0)
349	418	// display.options3[3] /= 4;
..	..	@@ -359,7 +428,7 @@
359	428	/**/
360	429	} else
361	430	{
362		- DrawMaterial(material, selected);
	431	+ DrawMaterial(material, selected, obj.projectedVertices);
363	432	}
364	433	} else
365	434	{
..	..	@@ -383,8 +452,8 @@
383	452	cStatic.objectstack[materialdepth++] = obj;
384	453	//System.out.println("material " + material);
385	454	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	455	+ //display.vector2buffer = obj.projectedVertices;
	456	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	457	}
389	458	}
390	459
..	..	@@ -401,8 +470,8 @@
401	470	materialdepth -= 1;
402	471	if (materialdepth > 0)
403	472	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- 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);
406	475	}
407	476	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	477	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +491,8 @@
422	491	materialdepth -= 1;
423	492	if (materialdepth > 0)
424	493	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- 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);
427	496	}
428	497	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	498	//else
..	..	@@ -464,15 +533,18 @@
464	533	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	534	{
466	535	//gl.glBegin(gl.GL_TRIANGLES);
467		- 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	+ ;
468	539	if (!hasnorm)
469	540	{
470		- // System.out.println("FUCK!!");
	541	+ // System.out.println("Mesh normal");
471	542	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	543	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	544	LA.vecCross(obj.v0, obj.v1, obj.v2);
474	545	LA.vecNormalize(obj.v2);
475		- 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);
476	548	}
477	549
478	550	// P
..	..	@@ -494,7 +566,7 @@
494	566	y += ny * obj.NORMALPUSH;
495	567	z += nz * obj.NORMALPUSH;
496	568
497		- gl.glNormal3f(nx, ny, nz);
	569	+ SetGLNormal(gl, nx, ny, nz);
498	570	}
499	571	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
500	572	SetColor(obj, pv);
..	..	@@ -526,7 +598,7 @@
526	598	y += ny * obj.NORMALPUSH;
527	599	z += nz * obj.NORMALPUSH;
528	600
529		- gl.glNormal3f(nx, ny, nz);
	601	+ SetGLNormal(gl, nx, ny, nz);
530	602	}
531	603	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
532	604	// boolean locked = false;
..	..	@@ -574,7 +646,7 @@
574	646	y += ny * obj.NORMALPUSH;
575	647	z += nz * obj.NORMALPUSH;
576	648
577		- gl.glNormal3f(nx, ny, nz);
	649	+ SetGLNormal(gl, nx, ny, nz);
578	650	}
579	651
580	652	// if ((dot&4) == 0)
..	..	@@ -810,7 +882,7 @@
810	882	//// tris.postdraw(this);
811	883	}
812	884
813		- static Camera localcamera = new Camera();
	885	+ static Camera localAOcamera = new Camera();
814	886	static cVector from = new cVector();
815	887	static cVector to = new cVector();
816	888
..	..	@@ -819,7 +891,7 @@
819	891	CameraPane cp = this;
820	892
821	893	Camera keep = cp.RenderCamera();
822		- cp.renderCamera = localcamera;
	894	+ cp.renderCamera = localAOcamera;
823	895
824	896	if (br.trimmed)
825	897	{
..	..	@@ -837,7 +909,7 @@
837	909	br.positions[i3 + 2] + br.normals[i3 + 2]);
838	910	LA.xformPos(from, transform, from);
839	911	LA.xformPos(to, transform, to); // RIGID ONLY
840		- localcamera.setAim(from, to);
	912	+ localAOcamera.setAim(from, to);
841	913
842	914	CameraPane.occlusionbuffer.display();
843	915
..	..	@@ -871,7 +943,7 @@
871	943	to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
872	944	LA.xformPos(from, transform, from);
873	945	LA.xformPos(to, transform, to); // RIGID ONLY
874		- localcamera.setAim(from, to);
	946	+ localAOcamera.setAim(from, to);
875	947
876	948	CameraPane.occlusionbuffer.display();
877	949
..	..	@@ -1180,10 +1252,10 @@
1180	1252	{
1181	1253	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1182	1254	{
1183		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1255	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1184	1256	} else
1185	1257	{
1186		- gl.glNormal3f(0, 0, 1);
	1258	+ SetGLNormal(gl, 0, 0, 1);
1187	1259	}
1188	1260
1189	1261	if (c != null)
..	..	@@ -1192,10 +1264,12 @@
1192	1264	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1265	}
1194	1266	}
	1267	+
1195	1268	if (flipV)
1196	1269	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1270	else
1198	1271	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1272	+
1199	1273	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1274	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1275
..	..	@@ -1205,20 +1279,22 @@
1205	1279	{
1206	1280	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1207	1281	{
1208		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1282	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1209	1283	} else
1210	1284	{
1211		- gl.glNormal3f(0, 0, 1);
	1285	+ SetGLNormal(gl, 0, 0, 1);
1212	1286	}
1213	1287	if (c != null)
1214	1288	{
1215	1289	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1290	}
1217	1291	}
	1292	+
1218	1293	if (flipV)
1219	1294	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1295	else
1221	1296	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1297	+
1222	1298	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1299	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1300
..	..	@@ -1231,10 +1307,10 @@
1231	1307	{
1232	1308	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1233	1309	{
1234		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1310	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1235	1311	} else
1236	1312	{
1237		- gl.glNormal3f(0, 0, 1);
	1313	+ SetGLNormal(gl, 0, 0, 1);
1238	1314	}
1239	1315	if (c != null)
1240	1316	{
..	..	@@ -1246,8 +1322,10 @@
1246	1322	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1323	else
1248	1324	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1325	+
1249	1326	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1327	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1328	+
1251	1329	count2 += 2;
1252	1330	count3 += 3;
1253	1331	}
..	..	@@ -1414,7 +1492,7 @@
1414	1492	{
1415	1493	if (!selectmode)
1416	1494	{
1417		- 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);
1418	1496	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1419	1497
1420	1498	if (flipV)
..	..	@@ -1426,6 +1504,8 @@
1426	1504	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1427	1505	}
1428	1506
	1507	+ float[] colorV = new float[4];
	1508	+
1429	1509	void SetColor(Object3D obj, Vertex p0)
1430	1510	{
1431	1511	CameraPane display = this;
..	..	@@ -1450,7 +1530,7 @@
1450	1530	}
1451	1531	}
1452	1532	float b = 0;
1453		- if (obj.support != null && obj.link2master)
	1533	+ if (obj.support != null && obj.Link2Support())
1454	1534	{
1455	1535	b = 1;
1456	1536	}
..	..	@@ -1493,8 +1573,6 @@
1493	1573	{
1494	1574	return;
1495	1575	}
1496		-
1497		- float[] colorV = new float[3];
1498	1576
1499	1577	if (false) // marked)
1500	1578	{
..	..	@@ -1603,7 +1681,7 @@
1603	1681	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1682	}
1605	1683
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1684	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1685	{
1608	1686	CameraPane display = this;
1609	1687	//new Exception().printStackTrace();
..	..	@@ -1638,7 +1716,7 @@
1638	1716	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1717	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1718	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1719	+ colorV[3] = 1; // material.opacity;
1642	1720
1643	1721	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1722	//System.out.println("Opacity = " + opacity);
..	..	@@ -1743,12 +1821,12 @@
1743	1821
1744	1822	display.modelParams7[0] = 0;
1745	1823	display.modelParams7[1] = 1000;
1746		- display.modelParams7[2] = 0;
	1824	+ display.modelParams7[2] = material.parallax;
1747	1825	display.modelParams7[3] = 0;
1748	1826
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1827	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1828
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1829	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1830	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1831	{
1754	1832	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1976,9 +2054,9 @@
1976	2054	switch(viewcode)
1977	2055	{
1978	2056	case 0: return "main";
1979		- case 1: return "one";
1980		- case 2: return "two";
1981		- case 3: return "three";
	2057	+ case 1: return "Red";
	2058	+ case 2: return "Green";
	2059	+ case 3: return "Blue";
1982	2060	case 4: return "light";
1983	2061	}
1984	2062
..	..	@@ -1987,7 +2065,7 @@
1987	2065
1988	2066	static int camerachangeframe;
1989	2067
1990		- public boolean SetCamera(Camera cam)
	2068	+ public boolean SetCamera(Camera cam, boolean set)
1991	2069	{
1992	2070	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1993	2071	// return false;
..	..	@@ -2005,7 +2083,8 @@
2005	2083
2006	2084	camerachangeframe = Globals.framecount;
2007	2085
2008		- cam.hAspect = -1; // Read only
	2086	+ if (cam != null)
	2087	+ cam.hAspect = -1; // Read only
2009	2088
2010	2089	cameras[0] = cam;
2011	2090	targetLookAts[0] = new cVector(cam.lookAt);
..	..	@@ -2015,11 +2094,14 @@
2015	2094	{
2016	2095	cameras[i] = new Camera(cam.viewCode);
2017	2096	}
2018		-
2019		- cameras[i].setAim(cam.location, cam.lookAt);
2020		- cameras[i].shaper_fovy = cam.shaper_fovy;
2021		- cameras[i].UP.set(cam.UP);
2022		- 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	+ }
2023	2105	}
2024	2106	cameracount = 0;
2025	2107	targetLookAt = targetLookAts[cameracount];
..	..	@@ -2028,7 +2110,7 @@
2028	2110	// Start with free camera
2029	2111	SwitchCameras(true);
2030	2112
2031		- pingthread.jump = true; // optional?
	2113	+// pingthread.jump = true; // optional?
2032	2114
2033	2115	if (TRACKONCE)
2034	2116	{
..	..	@@ -2044,7 +2126,7 @@
2044	2126	//System.err.println("Oeil on");
2045	2127	OEIL = true;
2046	2128	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2129	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2048	2130	//pingthread.StepToTarget(true);
2049	2131	}
2050	2132
..	..	@@ -2215,18 +2297,6 @@
2215	2297	public void ToggleTrack()
2216	2298	{
2217	2299	TRACK ^= true;
2218		- if (TRACK)
2219		- {
2220		- if (object.selection != null &&
2221		- object.selection.size() > 0 &&
2222		- object.selection.elementAt(0) != null &&
2223		- !(object.selection.elementAt(0) instanceof Camera) &&
2224		- !(object.selection.elementAt(0) instanceof ScriptNode))
2225		- {
2226		- trackedobject = object.selection.elementAt(0);
2227		- repaint();
2228		- }
2229		- }
2230	2300
2231	2301	repaint();
2232	2302	}
..	..	@@ -2259,7 +2329,7 @@
2259	2329
2260	2330	void ToggleDebug()
2261	2331	{
2262		- DEBUG ^= true;
	2332	+ Globals.DEBUG ^= true;
2263	2333	}
2264	2334
2265	2335	void ToggleLookAt()
..	..	@@ -2277,10 +2347,17 @@
2277	2347	HANDLES ^= true;
2278	2348	}
2279	2349
	2350	+ Object3D paintFolder;
	2351	+
2280	2352	void TogglePaint()
2281	2353	{
2282	2354	PAINTMODE ^= true;
2283	2355	paintcount = 0;
	2356	+
	2357	+ if (PAINTMODE)
	2358	+ {
	2359	+ paintFolder = GetFolder();
	2360	+ }
2284	2361	}
2285	2362
2286	2363	void SwapCamera(int a, int b)
..	..	@@ -2311,7 +2388,8 @@
2311	2388	{
2312	2389	//System.out.println("PROTECTION = " + cam.hAspect);
2313	2390	//assert (cam.hAspect == 0);
2314		- cam.hAspect = 0;
	2391	+ if (cam != null)
	2392	+ cam.hAspect = 0;
2315	2393	lightCamera = cam;
2316	2394	}
2317	2395
..	..	@@ -2377,6 +2455,33 @@
2377	2455	return currentGL;
2378	2456	}
2379	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	+
2380	2485	/**/
2381	2486	class CacheTexture
2382	2487	{
..	..	@@ -2385,28 +2490,31 @@
2385	2490
2386	2491	int resolution;
2387	2492
2388		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2493	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2389	2494	{
2390		- texture = tex;
	2495	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2496	+ texturedata = texdata;
2391	2497	resolution = res;
2392	2498	}
2393	2499	}
2394	2500	/**/
2395	2501
2396	2502	// TEXTURE static Texture texture;
2397		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2398		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2399		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	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	+
2400	2508	int pigmentdepth = 0;
2401	2509	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2510	int bumpdepth = 0;
2403	2511	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2404	2512	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2405	2513	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2406		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2514	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2407	2515	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2408	2516
2409		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2517	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2410	2518	{
2411	2519	TextureData texturedata = null;
2412	2520
..	..	@@ -2416,7 +2524,7 @@
2416	2524	com.sun.opengl.util.texture.TextureIO.newTextureData(
2417	2525	getClass().getClassLoader().getResourceAsStream(name),
2418	2526	true,
2419		- com.sun.opengl.util.texture.TextureIO.PNG);
	2527	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2420	2528	} catch (java.io.IOException e)
2421	2529	{
2422	2530	throw new javax.media.opengl.GLException(e);
..	..	@@ -2425,13 +2533,34 @@
2425	2533	if (bump)
2426	2534	texturedata = ConvertBump(texturedata, false);
2427	2535
2428		- com.sun.opengl.util.texture.Texture texture =
2429		- 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);
2430	2538
2431		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2432		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	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);
2433	2541
2434		- 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;
2435	2564	}
2436	2565
2437	2566	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3461,6 +3590,8 @@
3461	3590	};
3462	3591	/**/
3463	3592
	3593	+ static Object3D lastObject;
	3594	+
3464	3595	//com.sun.opengl.util.texture.Texture
3465	3596	TextureData
3466	3597	GetFileTexture(String name, boolean bump, int resolution)
..	..	@@ -3497,6 +3628,8 @@
3497	3628	// return null;
3498	3629	//if (i == 2)
3499	3630	// return null;
	3631	+ // TIFF issue sept 2019
	3632	+ System.err.println("lastObject = " + lastObject);
3500	3633	e.printStackTrace();
3501	3634	name = name.split("\\.tif")[0] + ".jpg";
3502	3635	}
..	..	@@ -3504,6 +3637,8 @@
3504	3637
3505	3638	System.out.println("LOADING TEXTURE : " + name);
3506	3639
	3640	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3641	+
3507	3642	//
3508	3643	if (false) // compressbit > 0)
3509	3644	{
..	..	@@ -6827,30 +6962,30 @@
6827	6962	short residu = 0;
6828	6963
6829	6964	// wraparound workarounds
6830		- short fuck = (short) (buffer[i] & 0xFF);
	6965	+ short ww = (short) (buffer[i] & 0xFF);
6831	6966	/*
6832		- residu += (fuck%2);
6833		- if(fuck/2 < 256-residu/2)
	6967	+ residu += (ww%2);
	6968	+ if(ww/2 < 256-residu/2)
6834	6969	{
6835		- fuck = (short)((fuck/2) + residu/2);
	6970	+ ww = (short)((ww/2) + residu/2);
6836	6971	if(residu == 2)
6837	6972	residu = 0;
6838	6973	}
6839	6974	else
6840	6975	{
6841	6976	residu = 0;
6842		- fuck /= 2;
	6977	+ ww /= 2;
6843	6978	}
6844	6979	*/
6845		- if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| fuck >= 254)
	6980	+ if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| ww >= 254)
6846	6981	{
6847		- fuck /= 2;
	6982	+ ww /= 2;
6848	6983	} else
6849	6984	{
6850		- fuck = (short) ((fuck / 2) + fuck % 2);
	6985	+ ww = (short) ((ww / 2) + ww % 2);
6851	6986	}
6852	6987
6853		- buffer[i] = (byte) fuck;
	6988	+ buffer[i] = (byte) ww;
6854	6989	}
6855	6990	//System.out.print(bytes[i] + " ");
6856	6991	//if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
..	..	@@ -7902,7 +8037,7 @@
7902	8037	String pigment = Object3D.GetPigment(tex);
7903	8038	String bump = Object3D.GetBump(tex);
7904	8039
7905		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8040	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7906	8041	{
7907	8042	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7908	8043	// System.out.println("; bump = " + bump);
..	..	@@ -7917,11 +8052,69 @@
7917	8052	pigment = null;
7918	8053	}
7919	8054
7920		- ReleaseTexture(bump, true);
7921		- ReleaseTexture(pigment, false);
	8055	+ ReleaseTexture(tex, true);
	8056	+ ReleaseTexture(tex, false);
7922	8057	}
7923	8058
7924		- 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)
7925	8118	{
7926	8119	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7927	8120	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7932,7 +8125,7 @@
7932	8125	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7933	8126
7934	8127	if (tex != null)
7935		- texture = textures.get(tex);
	8128	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7936	8129
7937	8130	// //assert( texture != null );
7938	8131	// if (texture == null)
..	..	@@ -8026,6 +8219,54 @@
8026	8219
8027	8220	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8028	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	+ {
8029	8270	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8030	8271	ambientOcclusion ) // \|\| !textureon)
8031	8272	{
..	..	@@ -8035,17 +8276,47 @@
8035	8276	if (tex == null)
8036	8277	{
8037	8278	BindTexture(null,false,resolution);
8038		- BindTexture(null,true,resolution);
8039	8279	return;
8040	8280	}
8041	8281
8042	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	+
8043	8315	String bump = Object3D.GetBump(tex);
8044	8316
8045		- usedtextures.put(pigment, pigment);
8046		- usedtextures.put(bump, bump);
	8317	+ usedtextures.add(tex);
8047	8318
8048		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8319	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8049	8320	{
8050	8321	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8051	8322	// System.out.println("; bump = " + bump);
..	..	@@ -8055,18 +8326,10 @@
8055	8326	{
8056	8327	bump = null;
8057	8328	}
8058		- if (pigment.equals(""))
8059		- {
8060		- pigment = null;
8061		- }
8062	8329
8063		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8064		- BindTexture(pigment, false, resolution);
8065	8330	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8066		- BindTexture(bump, true, resolution);
	8331	+ BindTexture(tex, true, resolution);
8067	8332	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8068		-
8069		- return; // true;
8070	8333	}
8071	8334
8072	8335	java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
..	..	@@ -8089,13 +8352,19 @@
8089	8352	return fileExists;
8090	8353	}
8091	8354
8092		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8355	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8093	8356	{
8094		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8357	+ CacheTexture texturecache = null;
8095	8358
8096	8359	if (tex != null)
8097	8360	{
8098		- String texname = tex;
	8361	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8362	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8363	+
	8364	+ if (texname.equals("") && texdata == null)
	8365	+ {
	8366	+ return null;
	8367	+ }
8099	8368
8100	8369	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8101	8370
..	..	@@ -8105,19 +8374,46 @@
8105	8374	// else
8106	8375	// if (!texname.startsWith("/"))
8107	8376	// texname = "/Users/nbriere/Textures/" + texname;
8108		- if (!FileExists(tex))
	8377	+ if (!FileExists(texname) && !texname.startsWith("@"))
8109	8378	{
8110	8379	texname = fallbackTextureName;
8111	8380	}
8112	8381
8113	8382	if (CACHETEXTURE)
8114		- texture = textures.get(texname); // TEXTURE CACHE
8115		-
8116		- TextureData texturedata = null;
8117		-
8118		- if (texture == null \|\| texture.resolution < resolution)
8119	8383	{
8120		- 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(""))
8121	8417	{
8122	8418	assert(!bump);
8123	8419	// if (bump)
..	..	@@ -8128,19 +8424,23 @@
8128	8424	// }
8129	8425	// else
8130	8426	// {
8131		- texture = textures.get(tex);
8132		- if (texture == null)
	8427	+ // texturecache = textures.get(texname); // suspicious
	8428	+ if (texturecache == null)
8133	8429	{
8134		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8430	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8135	8431	}
	8432	+ else
	8433	+ new Exception().printStackTrace();
8136	8434	// }
8137	8435	} else
8138		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8436	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8139	8437	{
8140	8438	assert(bump);
8141		- texture = textures.get(tex);
8142		- if (texture == null)
8143		- 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();
8144	8444	} else
8145	8445	{
8146	8446	//if (tex.equals("IMMORTAL"))
..	..	@@ -8148,11 +8448,22 @@
8148	8448	// texture = GetResourceTexture("default.png");
8149	8449	//} else
8150	8450	//{
8151		- if (tex.equals("WHITE_NOISE"))
	8451	+ if (texname.endsWith("WHITE_NOISE"))
8152	8452	{
8153		- texture = textures.get(tex);
8154		- if (texture == null)
8155		- 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();
8156	8467	} else
8157	8468	{
8158	8469	if (textureon)
..	..	@@ -8211,19 +8522,20 @@
8211	8522	if (texturedata == null)
8212	8523	throw new Exception();
8213	8524
8214		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8525	+ texturecache = new CacheTexture(texturedata,resolution);
8215	8526	//texture = GetTexture(tex, bump);
8216	8527	}
	8528	+ }
8217	8529	}
8218	8530	//}
8219	8531	}
8220	8532
8221		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8533	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8222	8534	{
8223	8535	//return false;
8224	8536
8225	8537	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8226		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8538	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8227	8539	{
8228	8540	// String ext = "_highres";
8229	8541	// if (REDUCETEXTURE)
..	..	@@ -8240,52 +8552,17 @@
8240	8552	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8241	8553	if (!cachefile.exists())
8242	8554	{
8243		- // cache to disk
8244		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8245		- //buffers[0].
8246		-
8247		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8248		- int[] pixels = new int[bytebuf.capacity()/3];
8249		-
8250		- // squared size heuristic...
8251		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8555	+ //if (texturedata.getWidth() == texturedata.getHeight())
8252	8556	{
8253		- for (int i=pixels.length; --i>=0;)
8254		- {
8255		- int i3 = i*3;
8256		- pixels[i] = 0xFF;
8257		- pixels[i] <<= 8;
8258		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8259		- pixels[i] <<= 8;
8260		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8261		- pixels[i] <<= 8;
8262		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8263		- }
8264		-
8265		- /*
8266		- int r=0,g=0,b=0,a=0;
8267		- for (int i=0; i<width; i++)
8268		- for (int j=0; j<height; j++)
8269		- {
8270		- int index = j*width+i;
8271		- int p = pixels[index];
8272		- a = ((p>>24) & 0xFF);
8273		- r = ((p>>16) & 0xFF);
8274		- g = ((p>>8) & 0xFF);
8275		- b = (p & 0xFF);
8276		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8277		- }
8278		- /**/
8279		- int width = (int)Math.sqrt(pixels.length); // squared
8280		- int height = width;
8281		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8282		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8557	+ BufferedImage rendImage = CreateBim(texturedata);
	8558	+
8283	8559	ImageWriter writer = null;
8284	8560	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8285	8561	if (iter.hasNext()) {
8286	8562	writer = (ImageWriter)iter.next();
8287	8563	}
8288		- float compressionQuality = 0.9f;
	8564	+
	8565	+ float compressionQuality = 0.85f;
8289	8566	try
8290	8567	{
8291	8568	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8302,18 +8579,20 @@
8302	8579	}
8303	8580	}
8304	8581	}
8305		-
	8582	+
	8583	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8584	+
8306	8585	//System.out.println("Texture = " + tex);
8307		- if (textures.containsKey(texname))
	8586	+ if (textures.containsKey(tex))
8308	8587	{
8309		- CacheTexture thetex = textures.get(texname);
	8588	+ CacheTexture thetex = textures.get(tex);
8310	8589	thetex.texture.disable();
8311	8590	thetex.texture.dispose();
8312		- textures.remove(texname);
	8591	+ textures.remove(tex);
8313	8592	}
8314	8593
8315		- texture.texturedata = texturedata;
8316		- textures.put(texname, texture);
	8594	+ //texture.texturedata = texturedata;
	8595	+ textures.put(tex, texturecache);
8317	8596
8318	8597	// newtex = true;
8319	8598	}
..	..	@@ -8329,10 +8608,46 @@
8329	8608	}
8330	8609	}
8331	8610
8332		- return texture;
	8611	+ return texturecache;
8333	8612	}
8334	8613
8335		- 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
8336	8651	{
8337	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8338	8653
..	..	@@ -8350,21 +8665,21 @@
8350	8665	return texture!=null?texture.texture:null;
8351	8666	}
8352	8667
8353		- 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
8354	8669	{
8355	8670	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8356	8671
8357	8672	return texture!=null?texture.texturedata:null;
8358	8673	}
8359	8674
8360		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8675	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8361	8676	{
8362	8677	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8363	8678	{
8364	8679	return false;
8365	8680	}
8366	8681
8367		- boolean newtex = false;
	8682	+ //boolean newtex = false;
8368	8683
8369	8684	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8370	8685
..	..	@@ -8396,9 +8711,75 @@
8396	8711	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8397	8712	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8398	8713
8399		- return newtex;
	8714	+ return true; // Warning: not used.
8400	8715	}
8401	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	+
8402	8783	ShadowBuffer shadowPBuf;
8403	8784	AntialiasBuffer antialiasPBuf;
8404	8785	int MAXSTACK;
..	..	@@ -8415,10 +8796,12 @@
8415	8796
8416	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8417	8798	MAXSTACK = temp[0];
8418		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8419	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8420	8802	MAXSTACK = temp[0];
8421		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8422	8805
8423	8806	// Use debug pipeline
8424	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8426,7 +8809,8 @@
8426	8809	gl = drawable.getGL(); //
8427	8810
8428	8811	GL gl3 = getGL();
8429		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8430	8814
8431	8815
8432	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8591,7 +8975,7 @@
8591	8975
8592	8976	if (cubemap == null)
8593	8977	{
8594		- LoadEnvy(5);
	8978	+ //LoadEnvy(1);
8595	8979	}
8596	8980
8597	8981	//cubemap.enable();
..	..	@@ -8867,6 +9251,8 @@
8867	9251
8868	9252	void LoadEnvy(int which)
8869	9253	{
	9254	+ assert(false);
	9255	+
8870	9256	String name;
8871	9257	String ext;
8872	9258
..	..	@@ -8878,37 +9264,58 @@
8878	9264	cubemap = null;
8879	9265	return;
8880	9266	case 1:
8881		- name = "cubemaps/box_";
8882		- ext = "png";
	9267	+ name = "cubemaps/rgb/";
	9268	+ ext = "jpg";
8883	9269	reverseUP = false;
8884	9270	break;
8885	9271	case 2:
8886		- name = "cubemaps/uffizi_";
8887		- ext = "png";
8888		- break; // reverseUP = true; break;
	9272	+ name = "cubemaps/uffizi/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
8889	9276	case 3:
8890		- name = "cubemaps/CloudyHills_";
8891		- ext = "tga";
	9277	+ name = "cubemaps/CloudyHills/";
	9278	+ ext = "jpg";
8892	9279	reverseUP = false;
8893	9280	break;
8894	9281	case 4:
8895		- name = "cubemaps/cornell_";
	9282	+ name = "cubemaps/cornell/";
8896	9283	ext = "png";
8897	9284	reverseUP = false;
8898	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;
8899	9311	default:
8900		- name = "cubemaps/rgb_";
8901		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9312	+ name = "cubemaps/box/";
	9313	+ ext = "png"; /mipmap = true;/
	9314	+ reverseUP = false;
8902	9315	break;
8903	9316	}
8904		-
8905		- try
8906		- {
8907		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8908		- } catch (IOException e)
8909		- {
8910		- throw new RuntimeException(e);
8911		- }
	9317	+
	9318	+ LoadSkybox(name, ext, mipmap);
8912	9319	}
8913	9320
8914	9321	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8940,8 +9347,12 @@
8940	9347	static double[] model = new double[16];
8941	9348	double[] camera2light = new double[16];
8942	9349	double[] light2camera = new double[16];
8943		- int newenvy = -1;
8944		- boolean envyoff = true; // false;
	9350	+
	9351	+ //int newenvy = -1;
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
	9355	+
8945	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8946	9357	//float[] light0 = { 0,0,0 };
8947	9358	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9234,11 +9645,35 @@
9234	9645	jy8[3] = 0.5f;
9235	9646	}
9236	9647
9237		- 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
9238	9649	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9239	9650	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9240	9651	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9241	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	+
9242	9677	static int imagecount = 0; // movie generation
9243	9678
9244	9679	static int jitter = 0;
..	..	@@ -9335,7 +9770,7 @@
9335	9770
9336	9771	if (renderCamera != lightCamera)
9337	9772	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9338		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9773	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9339	9774
9340	9775	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9341	9776
..	..	@@ -9351,7 +9786,7 @@
9351	9786
9352	9787	if (renderCamera != lightCamera)
9353	9788	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9354		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9789	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9355	9790
9356	9791	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9357	9792
..	..	@@ -9397,13 +9832,18 @@
9397	9832	rati = 1 / rati;
9398	9833	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9399	9834	}
9400		- assert (newenvy == -1);
	9835	+
	9836	+ //assert (newenvy == -1);
	9837	+
9401	9838	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9402	9839	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9403		- DrawSkyBox(gl);
	9840	+ DrawSkyBox(gl, (float)rati);
9404	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9405	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9406		- accPerspective(gl, renderCamera.shaper_fovy / ratio,
	9843	+
	9844	+ boolean vr = capsLocked && !lightMode;
	9845	+
	9846	+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
9407	9847	ratio,
9408	9848	//near_plane, far_plane,
9409	9849	renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..	..	@@ -10266,9 +10706,18 @@
10266	10706	static boolean init = false;
10267	10707
10268	10708	double[][] matrix = LA.newMatrix();
	10709	+
	10710	+ // This is to refresh the UI of the material panel.
	10711	+ ObjEditor patchMaterial;
10269	10712
10270	10713	public void display(GLAutoDrawable drawable)
10271	10714	{
	10715	+ if (patchMaterial.patchMaterial)
	10716	+ {
	10717	+ patchMaterial.patchMaterial = false;
	10718	+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
	10719	+ }
	10720	+
10272	10721	if (Grafreed.savesound && Grafreed.hassound)
10273	10722	{
10274	10723	Grafreed.wav.save();
..	..	@@ -10312,7 +10761,9 @@
10312	10761	}
10313	10762	/**/
10314	10763
10315		- if (selection)
	10764	+ boolean control = ((modifiers & CTRL) != 0);
	10765	+
	10766	+ if (selection && (!Globals.isLIVE() \|\| control))
10316	10767	{
10317	10768	selectbuffer.display();
10318	10769	return;
..	..	@@ -10349,6 +10800,7 @@
10349	10800	ANTIALIAS = 0;
10350	10801	//System.out.println("RESTART");
10351	10802	AAtimer.restart();
	10803	+ Globals.TIMERRUNNING = true;
10352	10804	}
10353	10805	}
10354	10806	}
..	..	@@ -10363,6 +10815,112 @@
10363	10815
10364	10816	if (DrawMode() == DEFAULT)
10365	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	+
10366	10924	currentlydrawing = true;
10367	10925	}
10368	10926
..	..	@@ -10416,7 +10974,8 @@
10416	10974	ambientOcclusion = false;
10417	10975	}
10418	10976
10419		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10977	+ if (//Globals.lighttouched &&
	10978	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10420	10979	{
10421	10980	//if (RENDERSHADOW) // ?
10422	10981	if (!IsFrozen())
..	..	@@ -10435,7 +10994,7 @@
10435	10994
10436	10995	if (wait)
10437	10996	{
10438		- Sleep(500);
	10997	+ Sleep(200); // blocks everything
10439	10998
10440	10999	wait = false;
10441	11000	}
..	..	@@ -10550,7 +11109,7 @@
10550	11109	// if (parentcam != renderCamera) // not a light
10551	11110	if (cam != lightCamera)
10552	11111	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10553		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	11112	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10554	11113
10555	11114	for (int j = 0; j < 4; j++)
10556	11115	{
..	..	@@ -10565,7 +11124,7 @@
10565	11124	// if (parentcam != renderCamera) // not a light
10566	11125	if (cam != lightCamera)
10567	11126	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10568		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	11127	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10569	11128
10570	11129	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10571	11130
..	..	@@ -10651,13 +11210,43 @@
10651	11210	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10652	11211	}
10653	11212
10654		- 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"))
10655	11221	{
10656		- LoadEnvy(newenvy);
	11222	+ if (cubemaprgb == null)
	11223	+ {
	11224	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11225	+ }
	11226	+
	11227	+ cubemap = cubemaprgb;
10657	11228	}
10658		-
10659		- newenvy = -1;
10660		-
	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	+
10661	11250	ratio = ((double) getWidth()) / getHeight();
10662	11251	//System.out.println("ratio = " + ratio);
10663	11252
..	..	@@ -10673,7 +11262,7 @@
10673	11262
10674	11263	if (!IsFrozen() && !ambientOcclusion)
10675	11264	{
10676		- DrawSkyBox(gl);
	11265	+ DrawSkyBox(gl, (float)ratio);
10677	11266	}
10678	11267
10679	11268	//if (selection_view == -1)
..	..	@@ -10856,8 +11445,8 @@
10856	11445
10857	11446	gl.glMatrixMode(GL.GL_MODELVIEW);
10858	11447
10859		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10860	11448	//gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11449	+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10861	11450	//gl.glEnable(gl.GL_MULTISAMPLE);
10862	11451	} else
10863	11452	{
..	..	@@ -10869,7 +11458,7 @@
10869	11458	//System.out.println("BLENDING ON");
10870	11459	gl.glEnable(GL.GL_BLEND);
10871	11460	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10872		-
	11461	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10873	11462	gl.glMatrixMode(gl.GL_PROJECTION);
10874	11463	gl.glLoadIdentity();
10875	11464
..	..	@@ -10919,7 +11508,10 @@
10919	11508	//gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
10920	11509	} else
10921	11510	{
10922		- 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());
10923	11515	}
10924	11516	}
10925	11517
..	..	@@ -10959,7 +11551,7 @@
10959	11551
10960	11552	// if (cam != lightCamera)
10961	11553	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10962		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11554	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10963	11555	}
10964	11556
10965	11557	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11118,7 +11710,7 @@
11118	11710	}
11119	11711	}
11120	11712
11121		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11713	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11122	11714	{
11123	11715	//gl.glDepthFunc(GL.GL_LEQUAL);
11124	11716	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11126,24 +11718,21 @@
11126	11718
11127	11719	boolean texon = textureon;
11128	11720
11129		- if (RENDERPROGRAM > 0)
11130		- {
11131		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11132		- textureon = false;
11133		- }
	11721	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11722	+ textureon = false;
	11723	+
11134	11724	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11135	11725	//System.out.println("ALLO");
11136	11726	gl.glColorMask(false, false, false, false);
11137	11727	DrawObject(gl);
11138		- if (RENDERPROGRAM > 0)
11139		- {
11140		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11141		- textureon = texon;
11142		- }
	11728	+
	11729	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11730	+ textureon = texon;
	11731	+
11143	11732	gl.glColorMask(true, true, true, true);
11144	11733
11145	11734	gl.glDepthFunc(GL.GL_EQUAL);
11146		- //gl.glDepthMask(false);
	11735	+ gl.glDepthMask(false);
11147	11736	}
11148	11737
11149	11738	if (false) // DrawMode() == SHADOW)
..	..	@@ -11278,8 +11867,11 @@
11278	11867	repaint();
11279	11868	}
11280	11869
11281		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11870	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11871	+ {
	11872	+ renderCamera.computeTransform();
11282	11873	repaint();
	11874	+ }
11283	11875
11284	11876	displaydone = true;
11285	11877	}
..	..	@@ -11326,16 +11918,51 @@
11326	11918
11327	11919	static boolean zoomonce = false;
11328	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	+
11329	11939	void DrawObject(GL gl, boolean draw)
11330	11940	{
	11941	+ // To clear camera values
	11942	+ ResetOptions();
	11943	+
11331	11944	//System.out.println("DRAW OBJECT " + mouseDown);
11332	11945	// DrawMode() = SELECTION;
11333	11946	//GL gl = getGL();
11334	11947	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11335	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	+ }
11336	11963	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11337		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11338		- pingthread.StepToTarget(true); // true);
	11964	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11965	+ pingthread.StepToTarget(); // true);
11339	11966	// zoomonce = false;
11340	11967	}
11341	11968
..	..	@@ -11406,8 +12033,9 @@
11406	12033
11407	12034	if (DrawMode() == DEFAULT)
11408	12035	{
11409		- if (DEBUG)
	12036	+ if (Globals.DEBUG)
11410	12037	{
	12038	+ CreateSelectedPoint();
11411	12039	float radius = 0.05f;
11412	12040	if (selectedpoint.radius != radius)
11413	12041	{
..	..	@@ -11461,20 +12089,32 @@
11461	12089	ReleaseTextures(DEFAULT_TEXTURES);
11462	12090
11463	12091	if (CLEANCACHE)
11464		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	12092	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11465	12093	{
11466		- String tex = e.nextElement();
	12094	+ cTexture tex = e.nextElement();
11467	12095
11468	12096	// System.out.println("Texture --------- " + tex);
11469	12097
11470		- if (tex.equals("WHITE_NOISE"))
	12098	+ if (tex.equals("WHITE_NOISE:"))
11471	12099	continue;
11472	12100
11473		- if (!usedtextures.containsKey(tex))
	12101	+ if (!usedtextures.contains(tex))
11474	12102	{
	12103	+ CacheTexture gettex = texturepigment.get(tex);
11475	12104	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11476		- textures.get(tex).texture.dispose();
11477		- 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	+ }
11478	12118	}
11479	12119	}
11480	12120	}
..	..	@@ -11894,7 +12534,7 @@
11894	12534	for (int i = tp.size(); --i >= 0;)
11895	12535	{
11896	12536	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11897		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12537	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11898	12538	}
11899	12539
11900	12540
..	..	@@ -12002,8 +12642,82 @@
12002	12642
12003	12643	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12004	12644
12005		- String program =
	12645	+ String programmin =
	12646	+ // Min shader
12006	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	+
12007	12721	//"OPTION ARB_fragment_program_shadow;" +
12008	12722	"PARAM light2cam0 = program.env[10];" +
12009	12723	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12029,7 +12743,7 @@
12029	12743	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12030	12744	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12031	12745	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12032		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12746	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12033	12747	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12034	12748	"PARAM options1 = program.env[62];" + // fog rgb color
12035	12749	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12118,8 +12832,7 @@
12118	12832	"TEMP shininess;" +
12119	12833	"\n" +
12120	12834	"MOV texSamp, one;" +
12121		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12122		-
	12835	+
12123	12836	"MOV mapgrid.x, one2048th.x;" +
12124	12837	"MOV temp, fragment.texcoord[1];" +
12125	12838	/*
..	..	@@ -12140,20 +12853,20 @@
12140	12853	"MUL temp, floor, mapgrid.x;" +
12141	12854	//"TEX depth0, temp, texture[1], 2D;" +
12142	12855	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12143		- TextureFetch("depth0", "temp", "1") +
	12856	+ ShadowTextureFetch("depth0", "temp", "1") +
12144	12857	"") +
12145	12858	"ADD temp.x, temp.x, mapgrid.x;" +
12146	12859	//"TEX depth1, temp, texture[1], 2D;" +
12147	12860	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12148		- TextureFetch("depth1", "temp", "1") +
	12861	+ ShadowTextureFetch("depth1", "temp", "1") +
12149	12862	"") +
12150	12863	"ADD temp.y, temp.y, mapgrid.x;" +
12151	12864	//"TEX depth2, temp, texture[1], 2D;" +
12152		- TextureFetch("depth2", "temp", "1") +
	12865	+ ShadowTextureFetch("depth2", "temp", "1") +
12153	12866	"SUB temp.x, temp.x, mapgrid.x;" +
12154	12867	//"TEX depth3, temp, texture[1], 2D;" +
12155	12868	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12156		- TextureFetch("depth3", "temp", "1") +
	12869	+ ShadowTextureFetch("depth3", "temp", "1") +
12157	12870	"") +
12158	12871	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12159	12872	//"MOV params, material;" +
..	..	@@ -12275,7 +12988,7 @@
12275	12988	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12276	12989	// mar 2013 ??? "KIL alpha.a;" +
12277	12990	"MOV alpha, texSamp.aaaa;" + // y;" +
12278		- "KIL alpha.a;" +
	12991	+ "KIL alpha.a;" + // not sure with parallax mapping
12279	12992	/*
12280	12993	"MUL temp.xy, temp, two;" +
12281	12994	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12361,11 +13074,6 @@
12361	13074	"SUB bump0, bump0, half;" +
12362	13075	"ADD bump, bump, bump0;" +
12363	13076
12364		- "MOV temp.x, texSamp.a;" +
12365		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12366		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12367		- "MOV texSamp.a, temp.x;" +
12368		-
12369	13077	// double-sided
12370	13078	/**/
12371	13079	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12375,26 +13083,73 @@
12375	13083	"ADD temp.x, temp.x, one.x;" +
12376	13084	"MUL normal, normal, temp.xxxx;":""
12377	13085	) +
12378		- /**/
12379		-//// Normalize("normal") +
12380		-//// "MAX normal.z, eps.x, normal.z;" +
12381		-// Normalize("normal") +
12382		- "MOV normald, normal;" +
12383		- "MOV normals, normal;" +
	13086	+ /**/
	13087	+
	13088	+ "MOV temp, fragment.texcoord[4];" +
12384	13089
12385	13090	// UV base
12386	13091	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12387	13092	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12388	13093	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12389		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12390		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12391		- "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	+
12392	13099	"XPD V, normal, UP;" +
12393	13100	Normalize("V") +
12394	13101	"XPD U, V, normal;" +
12395	13102	Normalize("U") +
12396	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	+
12397	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;" +
12398	13153
12399	13154	//"MOV temp, fragment.texcoord[0];" +
12400	13155	//
..	..	@@ -12524,10 +13279,10 @@
12524	13279	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12525	13280	"") +
12526	13281
12527		- // display shadow only (bump == 0)
	13282	+ // display shadow only (fakedepth == 0)
12528	13283	"SUB temp.x, half.x, shadow.x;" +
12529	13284	"MOV temp.y, -params5.z;" + // params6.x;" +
12530		- "SLT temp.z, temp.y, -one2048th.x;" +
	13285	+ "SLT temp.z, temp.y, -c256i.x;" +
12531	13286	"SUB temp.y, one.x, temp.z;" +
12532	13287	"MUL temp.x, temp.x, temp.y;" +
12533	13288	"KIL temp.x;" +
..	..	@@ -12858,8 +13613,19 @@
12858	13613	//once = true;
12859	13614	}
12860	13615
12861		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12862		- 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	+
12863	13629	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12864	13630
12865	13631	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12906,7 +13672,8 @@
12906	13672	"\n" +
12907	13673	"END\n";
12908	13674
12909		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13675	+ if (Globals.DEBUG)
	13676	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
12910	13677	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12911	13678
12912	13679	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12951,25 +13718,26 @@
12951	13718	return out;
12952	13719	}
12953	13720
12954		- String TextureFetch(String dest, String src, String unit)
	13721	+ // Also does frustum culling
	13722	+ String ShadowTextureFetch(String dest, String src, String unit)
12955	13723	{
12956	13724	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12957	13725	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12958	13726	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13727	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13728	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12959	13729	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12960		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12961		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12962		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12963		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13730	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13731	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12964	13732	//"SWZ buffer, temp, w,w,w,w;";
12965		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13733	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12966	13734	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12967	13735	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12968	13736	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12969		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13737	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12970	13738
12971		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12972		- //"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;";
12973	13741	}
12974	13742
12975	13743	String Shadow(String depth, String shadow)
..	..	@@ -13016,7 +13784,7 @@
13016	13784	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13017	13785	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13018	13786
13019		- // No shadow when out of frustrum
	13787	+ // No shadow when out of frustum
13020	13788	"SGE temp.x, " + depth + ".z, one.z;" +
13021	13789	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13022	13790	"";
..	..	@@ -13163,8 +13931,9 @@
13163	13931	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13164	13932	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13165	13933	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13166		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13167		- Object3D.cVector2[] vector2buffer;
	13934	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
	13935	+
	13936	+ //Object3D.cVector2[] vector2buffer;
13168	13937
13169	13938	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13170	13939	// OUT : diff, spec
..	..	@@ -13180,9 +13949,10 @@
13180	13949	"DP3 " + dest + ".z," + "normals," + "eye;" +
13181	13950	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13182	13951	//"MOV " + dest + ".w," + "normal.z;" +
13183		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13184		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13185		- //"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
13186	13956	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13187	13957	"RCP " + dest + ".w," + dest + ".w;" +
13188	13958	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13328,7 +14098,7 @@
13328	14098	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13329	14099	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13330	14100	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13331		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	14101	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13332	14102	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13333	14103	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13334	14104	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13389,7 +14159,7 @@
13389	14159	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13390	14160	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13391	14161	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13392		- //"MOV result.texcoord, vertex.texcoord;" +
	14162	+ //"MOV result.texcoord, vertex.fogcoord;" +
13393	14163	"MOV result.texcoord, temp;" +
13394	14164	// border fade
13395	14165	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13436,7 +14206,9 @@
13436	14206
13437	14207	//"ADD temp.z, temp.z, one;" +
13438	14208
13439		- "MOV result.color, temp;"
	14209	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14210	+
	14211	+ "MOV result.color, temp;" // Normal
13440	14212	: "MOV result.color, vertex.color;") +
13441	14213	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13442	14214	: "") +
..	..	@@ -13571,6 +14343,7 @@
13571	14343	public void mouseClicked(MouseEvent e)
13572	14344	{
13573	14345	System.out.println("mouseClicked: " + e);
	14346	+ System.exit(0);
13574	14347	}
13575	14348
13576	14349	public void mousePressed(MouseEvent e)
..	..	@@ -13609,10 +14382,12 @@
13609	14382	return;
13610	14383	}
13611	14384
13612		- 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;
13613	14388
13614	14389	// TIMER
13615		- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14390	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
13616	14391	{
13617	14392	keepboxmode = BOXMODE;
13618	14393	keepsupport = SUPPORT;
..	..	@@ -13653,7 +14428,7 @@
13653	14428	//}
13654	14429
13655	14430	SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
13656		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
	14431	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
13657	14432	anchorX = ax;
13658	14433	anchorY = ay;
13659	14434	prevX = px;
..	..	@@ -13687,6 +14462,7 @@
13687	14462	else
13688	14463	if (evt.getSource() == AAtimer)
13689	14464	{
	14465	+ Globals.TIMERRUNNING = false;
13690	14466	if (mouseDown)
13691	14467	{
13692	14468	//new Exception().printStackTrace();
..	..	@@ -13746,9 +14522,10 @@
13746	14522
13747	14523	// fev 2014???
13748	14524	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13749		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13750		- pingthread.StepToTarget(true); // true);
	14525	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14526	+ pingthread.StepToTarget(); // true);
13751	14527	}
	14528	+
13752	14529	// if (!LIVE)
13753	14530	super.repaint();
13754	14531	}
..	..	@@ -13761,6 +14538,7 @@
13761	14538	return;
13762	14539
13763	14540	AAtimer.restart(); //
	14541	+ Globals.TIMERRUNNING = true;
13764	14542
13765	14543	// waslive = LIVE;
13766	14544	// LIVE = false;
..	..	@@ -13810,14 +14588,15 @@
13810	14588	drag = false;
13811	14589	//System.out.println("Mouse DOWN");
13812	14590	editObj = false;
13813		- ClickInfo info = new ClickInfo();
13814		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13815		- info.pane = this;
13816		- info.camera = renderCamera;
13817		- info.x = x;
13818		- info.y = y;
13819		- info.modifiers = modifiersex;
13820		- 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);
13821	14600	if (!editObj)
13822	14601	{
13823	14602	hasMarquee = true;
..	..	@@ -13841,8 +14620,8 @@
13841	14620
13842	14621	//if (drawing)
13843	14622	//return;
13844		- if ((e.getModifiersEx() & CTRL) != 0
13845		- \|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
	14623	+ if ((e.getModifiersEx() & CTRL) != 0 \|\|
	14624	+ (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13846	14625	{
13847	14626	//System.out.println("mouseDragged: " + e);
13848	14627	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
..	..	@@ -13866,9 +14645,17 @@
13866	14645	return targetLookAt;
13867	14646	}
13868	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	+
13869	14653	class PingThread extends Thread
13870	14654	{
13871	14655	boolean jump;
	14656	+ boolean live;
	14657	+
	14658	+ boolean mute = false;
13872	14659
13873	14660	// void JumpToTarget()
13874	14661	// {
..	..	@@ -13884,6 +14671,95 @@
13884	14671	// only one thread!? synchronized
13885	14672	void StepToTarget(boolean jump)
13886	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	+
13887	14763	tmp.set(targetLookAt);
13888	14764	tmp.sub(manipCamera.lookAt); // june 2014
13889	14765
..	..	@@ -13921,7 +14797,7 @@
13921	14797
13922	14798	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
13923	14799	{
13924		- jump = true; // step = 1;
	14800	+ // sep 2019 jump = true; // step = 1;
13925	14801	}
13926	14802
13927	14803	if (OEILONCE && OEIL)
..	..	@@ -13956,7 +14832,10 @@
13956	14832	if (tmp.dot(tmp) < 0.00001)
13957	14833	{
13958	14834	zoomonce = false;
	14835	+ live = false;
13959	14836	}
	14837	+ else
	14838	+ live = true;
13960	14839
13961	14840	tmp.mul(step > step2 ? step : step2);
13962	14841	}
..	..	@@ -13983,7 +14862,7 @@
13983	14862	{
13984	14863	if (LOOKAT)
13985	14864	manipCamera.lookAt.add(tmp);
13986		- if (OEIL)
	14865	+ if (OEIL && !capsLocked)
13987	14866	manipCamera.location.add(tmp);
13988	14867
13989	14868	{
..	..	@@ -13998,7 +14877,10 @@
13998	14877	lightCamera.computeTransform();
13999	14878	}
14000	14879	}
14001		- manipCamera.computeTransform();
	14880	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14881	+ {
	14882	+ manipCamera.computeTransform();
	14883	+ }
14002	14884	}
14003	14885	// ?????? mouseDown = true;
14004	14886	//System.out.println("---------------- ---------- Paint " + tmp.length2());
..	..	@@ -14091,49 +14973,107 @@
14091	14973	}
14092	14974	}
14093	14975	}
	14976	+
14094	14977	PingThread pingthread = new PingThread();
14095		- int delta = 5;
14096		- int speed = 5;
	14978	+ int delta = 1;
	14979	+ int speed = 1;
	14980	+ int walk = 8;
14097	14981	boolean autorepeat = false;
14098	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	+
14099	15002	void GoDown(int mod)
14100	15003	{
14101	15004	MODIFIERS \|= COMMAND;
14102		- /*
	15005	+ boolean isVR = (mouseMode&VR)!=0;
	15006	+ /**/
14103	15007	if((mod&SHIFT) == SHIFT)
14104		- manipCamera.RotatePosition(0, -speed);
14105		- else
14106		- manipCamera.BackForth(0, -speed*delta, getWidth());
14107		- */
14108		- if ((mod & SHIFT) == SHIFT)
14109	15008	{
14110		- mouseMode = mouseMode; // VR??
14111		- } else
14112		- {
14113		- 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());
14114	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	+// }
14115	15033
	15034	+ targetLookAt.set(manipCamera.lookAt);
	15035	+
14116	15036	//prevX = X = anchorX;
14117	15037	prevY = Y = anchorY - (int) (renderCamera.Distance());
14118	15038	}
14119	15039
14120	15040	void GoUp(int mod)
14121	15041	{
	15042	+ RigidBody.justclicked = true;
	15043	+
14122	15044	MODIFIERS \|= COMMAND;
14123		- /*
	15045	+ /**/
	15046	+ boolean isVR = (mouseMode&VR)!=0;
	15047	+
14124	15048	if((mod&SHIFT) == SHIFT)
14125		- manipCamera.RotatePosition(0, speed);
14126		- else
14127		- manipCamera.BackForth(0, speed*delta, getWidth());
14128		- */
14129		- if ((mod & SHIFT) == SHIFT)
14130	15049	{
14131		- mouseMode = mouseMode;
14132		- } else
14133		- {
14134		- 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());
14135	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	+// }
14136	15074
	15075	+ targetLookAt.set(manipCamera.lookAt);
	15076	+
14137	15077	//prevX = X = anchorX;
14138	15078	prevY = Y = anchorY + (int) (renderCamera.Distance());
14139	15079	}
..	..	@@ -14141,20 +15081,31 @@
14141	15081	void GoLeft(int mod)
14142	15082	{
14143	15083	MODIFIERS \|= COMMAND;
14144		- /*
	15084	+ /**/
14145	15085	if((mod&SHIFT) == SHIFT)
14146		- manipCamera.RotatePosition(speed, 0);
	15086	+ manipCamera.Translate(speed, 0, getWidth());
14147	15087	else
14148		- manipCamera.Translate(speed*delta, 0, getWidth());
14149		- */
14150		- if ((mod & SHIFT) == SHIFT)
14151	15088	{
14152		- mouseMode = mouseMode;
14153		- } else
14154		- {
14155		- mouseMode \|= ROTATE;
14156		- } // 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;
14157	15103
	15104	+ //System.err.println("lookAt = " + manipCamera.lookAt);
	15105	+ //System.err.println("location = " + manipCamera.location);
	15106	+
	15107	+ targetLookAt.set(manipCamera.lookAt);
	15108	+
14158	15109	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14159	15110	prevY = Y = anchorY;
14160	15111	}
..	..	@@ -14162,20 +15113,28 @@
14162	15113	void GoRight(int mod)
14163	15114	{
14164	15115	MODIFIERS \|= COMMAND;
14165		- /*
	15116	+ /**/
14166	15117	if((mod&SHIFT) == SHIFT)
14167		- manipCamera.RotatePosition(-speed, 0);
	15118	+ manipCamera.Translate(-speed, 0, getWidth());
14168	15119	else
14169		- manipCamera.Translate(-speed*delta, 0, getWidth());
14170		- */
14171		- if ((mod & SHIFT) == SHIFT)
14172	15120	{
14173		- mouseMode = mouseMode;
14174		- } else
14175		- {
14176		- mouseMode \|= ROTATE;
14177		- } // 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;
14178	15135
	15136	+ targetLookAt.set(manipCamera.lookAt);
	15137	+
14179	15138	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14180	15139	prevY = Y = anchorY;
14181	15140	}
..	..	@@ -14217,14 +15176,16 @@
14217	15176	if (editObj)
14218	15177	{
14219	15178	drag = true;
14220		- ClickInfo info = new ClickInfo();
14221		- info.bounds.setBounds(0, 0,
	15179	+ //ClickInfo info = new ClickInfo();
	15180	+ object.clickInfo.bounds.setBounds(0, 0,
14222	15181	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14223		- info.pane = this;
14224		- info.camera = renderCamera;
14225		- info.x = x;
14226		- info.y = y;
14227		- 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);
14228	15189	} else
14229	15190	{
14230	15191	if (x < startX)
..	..	@@ -14307,6 +15268,11 @@
14307	15268	if ((mouseMode & ZOOM) != 0)
14308	15269	{
14309	15270	//if ((mouseMode & BACKFORTH) != 0)
	15271	+ if ((modifiersex & SHIFT) == SHIFT)
	15272	+ {
	15273	+ ViewAngle(dy);
	15274	+ }
	15275	+ else
14310	15276	if ((mouseMode & VR) != 0)
14311	15277	manipCamera.BackForth(dx, dy, getWidth());
14312	15278	else
..	..	@@ -14373,22 +15339,30 @@
14373	15339	}
14374	15340	}
14375	15341
	15342	+// ClickInfo clickInfo = new ClickInfo();
	15343	+
14376	15344	public void mouseMoved(MouseEvent e)
14377	15345	{
	15346	+//object.editWindow.frame.
	15347	+ setCursor(Cursor.getDefaultCursor());
	15348	+
14378	15349	//System.out.println("mouseMoved: " + e);
14379	15350	if (isRenderer)
14380	15351	return;
14381	15352
14382		- ClickInfo ci = new ClickInfo();
14383		- ci.x = e.getX();
14384		- ci.y = e.getY();
14385		- ci.modifiers = e.getModifiersEx();
14386		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14387		- ci.pane = this;
14388		- 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;
14389	15360	if (!isRenderer)
14390	15361	{
14391		- if (object.editWindow.copy.doEditClick(ci, 0))
	15362	+ //ObjEditor editWindow = object.editWindow;
	15363	+ //Object3D copy = editWindow.copy;
	15364	+ if (object.doEditClick(//clickInfo,
	15365	+ 0))
14392	15366	{
14393	15367	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14394	15368	} else
..	..	@@ -14400,10 +15374,17 @@
14400	15374
14401	15375	public void mouseReleased(MouseEvent e)
14402	15376	{
	15377	+ if (isRenderer && !movingcamera)
	15378	+ {
	15379	+ RigidBody.justclicked = true;
	15380	+ System.out.println("justclicked: " + e);
	15381	+ }
	15382	+
14403	15383	Globals.MOUSEDRAGGED = false;
14404	15384
14405	15385	movingcamera = false;
14406		- X = Y = 0;
	15386	+ X = 0; // getBounds().width/2;
	15387	+ Y = 0; // getBounds().height/2;
14407	15388	//System.out.println("mouseReleased: " + e);
14408	15389	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14409	15390	}
..	..	@@ -14555,8 +15536,10 @@
14555	15536	mouseMode \|= ZOOM;
14556	15537	}
14557	15538
14558		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14559		- 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)
14560	15543	{
14561	15544	mouseMode \|= VR; // BACKFORTH;
14562	15545	}
..	..	@@ -14568,7 +15551,8 @@
14568	15551	{
14569	15552	mouseMode \|= SELECT;
14570	15553	}
14571		- if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	15554	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15555	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14572	15556	{
14573	15557	mouseMode &= ~VR;
14574	15558	mouseMode \|= TRANSLATE;
..	..	@@ -14612,8 +15596,18 @@
14612	15596	float SATPOW = 1; // 2; // 0.5f;
14613	15597	float BRIPOW = 1; // 0.5f; // 0.5f;
14614	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	+
14615	15605	public void keyPressed(int key)
14616	15606	{
	15607	+// Set the blank cursor to the JFrame.
	15608	+//object.editWindow.frame.
	15609	+ setCursor(blankCursor);
	15610	+
14617	15611	if (key >= '0' && key <= '5')
14618	15612	clampbit = (key-'0');
14619	15613
..	..	@@ -14659,7 +15653,8 @@
14659	15653	// break;
14660	15654	case 'T':
14661	15655	CACHETEXTURE ^= true;
14662		- textures.clear();
	15656	+ texturepigment.clear();
	15657	+ texturebump.clear();
14663	15658	// repaint();
14664	15659	break;
14665	15660	case 'Y':
..	..	@@ -14669,8 +15664,8 @@
14669	15664	case 'K':
14670	15665	KOMPACTTEXTURE ^= true;
14671	15666	//textures.clear();
14672		- break;
14673		- case 'P': // Texture Projection macros
	15667	+ // break;
	15668	+ //case 'P': // Texture Projection macros
14674	15669	// SAVETEXTURE ^= true;
14675	15670	macromode = true;
14676	15671	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -14744,7 +15739,9 @@
14744	15739	case 'E' : COMPACT ^= true;
14745	15740	repaint();
14746	15741	break;
14747		- case 'W' : DEBUGHSB ^= true;
	15742	+ case 'W' : // Wide Window (fullscreen)
	15743	+ //DEBUGHSB ^= true;
	15744	+ ObjEditor.theFrame.ToggleFullScreen();
14748	15745	repaint();
14749	15746	break;
14750	15747	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14769,8 +15766,8 @@
14769	15766	RevertCamera();
14770	15767	repaint();
14771	15768	break;
	15769	+ //case 'l':
14772	15770	case 'L':
14773		- case 'l':
14774	15771	if (lightMode)
14775	15772	{
14776	15773	lightMode = false;
..	..	@@ -14789,7 +15786,7 @@
14789	15786	targetLookAt.set(manipCamera.lookAt);
14790	15787	repaint();
14791	15788	break;
14792		- case 'p':
	15789	+ case 'P': // p':
14793	15790	// c'est quoi ca au juste? spherical ^= true;
14794	15791	Skinshader ^= true; programInitialized = false;
14795	15792	repaint();
..	..	@@ -14800,7 +15797,8 @@
14800	15797	break;
14801	15798	case 'm':
14802	15799	{
14803		- PrintMemory();
	15800	+ //PrintMemory();
	15801	+ ToggleImageFlip();
14804	15802	break;
14805	15803	}
14806	15804	case 'M':
..	..	@@ -14827,27 +15825,31 @@
14827	15825	repaint();
14828	15826	break;
14829	15827	case 'O':
14830		- Globals.drawMode = OCCLUSION; // WARNING
14831		- repaint();
14832		- break;
	15828	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
	15829	+ //repaint();
	15830	+ //break;
14833	15831	case 'o':
14834	15832	OCCLUSION_CULLING ^= true;
14835	15833	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14836	15834	break;
14837		- case '0': envyoff ^= true; repaint(); break;
	15835	+ //case '0': envyoff ^= true; repaint(); break;
14838	15836	case '1':
14839	15837	case '2':
14840	15838	case '3':
14841	15839	case '4':
14842	15840	case '5':
14843		- newenvy = Character.getNumericValue(key);
14844		- repaint();
14845		- break;
14846	15841	case '6':
14847	15842	case '7':
14848	15843	case '8':
14849	15844	case '9':
14850		- 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	+ }
14851	15853	repaint();
14852	15854	break;
14853	15855	case '!':
..	..	@@ -14913,11 +15915,25 @@
14913	15915	case '_':
14914	15916	kompactbit = 5;
14915	15917	break;
14916		- case '+':
14917		- kompactbit = 6;
14918		- break;
	15918	+// case '+':
	15919	+// kompactbit = 6;
	15920	+// break;
14919	15921	case ' ':
	15922	+ capsLocked ^= true;
	15923	+ repaint();
	15924	+ break;
	15925	+ case 'l':
14920	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	+
14921	15937	Globals.lighttouched = true;
14922	15938	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14923	15939	targetLookAt.set(manipCamera.lookAt);
..	..	@@ -14925,8 +15941,13 @@
14925	15941	break;
14926	15942	//case '`' :
14927	15943	case ESC:
	15944	+ if (FULLSCREEN)
	15945	+ object.editWindow.ToggleFullScreen();
	15946	+ break;
	15947	+ case 'p':
14928	15948	RENDERPROGRAM += 1;
14929	15949	RENDERPROGRAM %= 3;
	15950	+
14930	15951	repaint();
14931	15952	break;
14932	15953	case 'Z':
..	..	@@ -14962,12 +15983,17 @@
14962	15983	case ENTER:
14963	15984	// object.editWindow.ScreenFit(); // Edit();
14964	15985	ToggleLive();
	15986	+ if (capsLocked)
	15987	+ {
	15988	+ Globals.WALK ^= true;
	15989	+ }
14965	15990	break;
14966	15991	case DELETE:
14967	15992	ClearSelection();
14968	15993	break;
14969		- /*
14970	15994	case '+':
	15995	+
	15996	+ /*
14971	15997	//fontsize += 1;
14972	15998	bbzoom *= 2;
14973	15999	repaint();
..	..	@@ -14984,30 +16010,36 @@
14984	16010	case '=':
14985	16011	IncDepth();
14986	16012	//fontsize += 1;
14987		- object.editWindow.refreshContents(true);
	16013	+ object.GetWindow().refreshContents(true);
14988	16014	maskbit = 6;
14989	16015	break;
14990	16016	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14991	16017	DecDepth();
14992	16018	maskbit = 5;
14993	16019	//if(fontsize > 1) fontsize -= 1;
14994		- if (object.editWindow == null)
14995		- new Exception().printStackTrace();
14996		- else
14997		- object.editWindow.refreshContents(true);
	16020	+// if (object.editWindow == null)
	16021	+// new Exception().printStackTrace();
	16022	+// else
	16023	+ object.GetWindow().refreshContents(true);
14998	16024	break;
14999	16025	case '{':
15000		- manipCamera.shaper_fovy /= 1.1;
	16026	+ double factor = 1.1;
	16027	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16028	+ manipCamera.shaper_fovy /= factor;
15001	16029	System.out.println("FOV = " + manipCamera.shaper_fovy);
15002	16030	repaint();
15003	16031	break;
15004	16032	case '}':
15005		- manipCamera.shaper_fovy *= 1.1;
	16033	+ factor = 1.1;
	16034	+ if (manipCamera.shaper_fovy * factor < 150)
	16035	+ manipCamera.shaper_fovy *= factor;
15006	16036	System.out.println("FOV = " + manipCamera.shaper_fovy);
15007	16037	repaint();
15008	16038	break;
15009	16039	case '[':
15010		- manipCamera.shaper_fovy /= 1.01;
	16040	+ factor = 1.01;
	16041	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16042	+ manipCamera.shaper_fovy /= factor;
15011	16043	if (false) //manipCamera.hAspect == 0)
15012	16044	{
15013	16045	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15023,7 +16055,9 @@
15023	16055	break;
15024	16056	case ']':
15025	16057	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15026		- manipCamera.shaper_fovy *= 1.01;
	16058	+ factor = 1.01;
	16059	+ if (manipCamera.shaper_fovy * factor < 150)
	16060	+ manipCamera.shaper_fovy *= factor;
15027	16061	if (false) //manipCamera.hAspect == 0)
15028	16062	{
15029	16063	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15061,98 +16095,113 @@
15061	16095	}
15062	16096	}
15063	16097
	16098	+ boolean keys[] = new boolean[256];
	16099	+ int speedkey[] = new int[256];
	16100	+ int modifiers = 0;
	16101	+
15064	16102	public void processKeyEvent(KeyEvent e)
15065	16103	{
15066	16104	switch (e.getID())
15067	16105	{
15068	16106	case KeyEvent.KEY_PRESSED:
15069		- if (!autorepeat)
15070		- {
15071		- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15072		- keyPressed(e.getKeyChar(), e.getModifiersEx());
15073		- }
15074		- if (manipCamera == lightCamera)
15075		- {
15076		- switch (e.getKeyCode())
15077		- {
15078		- case DOWN_ARROW:
15079		- lightCamera.DECAL /= 2;
15080		- repaint();
15081		- break;
15082		- case UP_ARROW:
15083		- lightCamera.DECAL *= 2;
15084		- repaint();
15085		- break;
15086		- case LEFT_ARROW:
15087		- lightCamera.SCALE /= 2;
15088		- repaint();
15089		- break;
15090		- case RIGHT_ARROW:
15091		- lightCamera.SCALE *= 2;
15092		- repaint();
15093		- break;
15094		- default:
15095		- break;
15096		- }
15097		-
15098		- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15099		- } else
15100		- {
15101		- if (true) // !autorepeat)
15102		- {
15103		- boolean reset = true;
15104		-
15105		- switch (e.getKeyCode())
15106		- {
15107		- case DOWN_ARROW:
15108		- GoDown(e.getModifiersEx());
15109		- repaint();
15110		- break;
15111		- case UP_ARROW:
15112		- GoUp(e.getModifiersEx());
15113		- repaint();
15114		- break;
15115		- case LEFT_ARROW:
15116		- GoLeft(e.getModifiersEx());
15117		- repaint();
15118		- break;
15119		- case RIGHT_ARROW:
15120		- GoRight(e.getModifiersEx());
15121		- repaint();
15122		- break;
15123		- default:
15124		- reset = false;
15125		- break;
15126		- }
15127		-
15128		- if (reset)
15129		- {
15130		- autorepeat = true;
15131		-
15132		- targetLookAt.set(manipCamera.lookAt);
15133		- }
15134		- }
15135		- }
	16107	+ keys[e.getKeyCode()] = true;
	16108	+ modifiers = e.getModifiersEx();
	16109	+ keyPressed(e.getKeyChar(), modifiers);
	16110	+ //Globals.theRenderer.keyPressed(e.getKeyChar());
	16111	+ repaint();
15136	16112	break;
15137		- case KeyEvent.KEY_TYPED:
15138		- 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;
15139	16183	case KeyEvent.KEY_RELEASED:
15140		- {
15141		- switch (e.getKeyCode())
15142		- {
15143		- case DOWN_ARROW:
15144		- case UP_ARROW:
15145		- case LEFT_ARROW:
15146		- case RIGHT_ARROW:
15147		- MODIFIERS &= ~COMMAND;
15148		- autorepeat = false;
15149		- break;
15150		- default:
15151		- break;
15152		- }
	16184	+ keys[e.getKeyCode()] = false;
	16185	+ modifiers = e.getModifiersEx();
15153	16186	keyReleased(e.getKeyChar(), e.getModifiersEx());
	16187	+ repaint();
15154	16188	break;
15155		- }
	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	+// }
15156	16205	default:
15157	16206	break;
15158	16207	}
..	..	@@ -15218,7 +16267,7 @@
15218	16267	}
15219	16268	*/
15220	16269
15221		- object.editWindow.EditSelection();
	16270	+ object.GetWindow().EditSelection(false);
15222	16271	}
15223	16272
15224	16273	void SelectParent()
..	..	@@ -15235,10 +16284,10 @@
15235	16284	{
15236	16285	//selectees.remove(i);
15237	16286	System.out.println("select parent of " + elem);
15238		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	16287	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15239	16288	} else
15240	16289	{
15241		- group.editWindow.Select(elem.GetTreePath(), first, true);
	16290	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15242	16291	}
15243	16292
15244	16293	first = false;
..	..	@@ -15280,12 +16329,12 @@
15280	16329	for (int j = 0; j < group.children.size(); j++)
15281	16330	{
15282	16331	elem = (Object3D) group.children.elementAt(j);
15283		- object.editWindow.Select(elem.GetTreePath(), first, true);
	16332	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15284	16333	first = false;
15285	16334	}
15286	16335	} else
15287	16336	{
15288		- object.editWindow.Select(elem.GetTreePath(), first, true);
	16337	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15289	16338	}
15290	16339
15291	16340	first = false;
..	..	@@ -15296,21 +16345,21 @@
15296	16345	{
15297	16346	//Composite group = (Composite) object;
15298	16347	Object3D group = object;
15299		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	16348	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15300	16349	}
15301	16350
15302	16351	void ResetTransform(int mask)
15303	16352	{
15304	16353	//Composite group = (Composite) object;
15305	16354	Object3D group = object;
15306		- group.editWindow.ResetTransform(mask);
	16355	+ group.GetWindow().ResetTransform(mask);
15307	16356	}
15308	16357
15309	16358	void FlipTransform()
15310	16359	{
15311	16360	//Composite group = (Composite) object;
15312	16361	Object3D group = object;
15313		- group.editWindow.FlipTransform();
	16362	+ group.GetWindow().FlipTransform();
15314	16363	// group.editWindow.ReduceMesh(true);
15315	16364	}
15316	16365
..	..	@@ -15318,7 +16367,7 @@
15318	16367	{
15319	16368	//Composite group = (Composite) object;
15320	16369	Object3D group = object;
15321		- group.editWindow.PrintMemory();
	16370	+ group.GetWindow().PrintMemory();
15322	16371	// group.editWindow.ReduceMesh(true);
15323	16372	}
15324	16373
..	..	@@ -15326,7 +16375,7 @@
15326	16375	{
15327	16376	//Composite group = (Composite) object;
15328	16377	Object3D group = object;
15329		- group.editWindow.ResetCentroid();
	16378	+ group.GetWindow().ResetCentroid();
15330	16379	}
15331	16380
15332	16381	void IncDepth()
..	..	@@ -15408,8 +16457,6 @@
15408	16457
15409	16458	int width = getBounds().width;
15410	16459	int height = getBounds().height;
15411		- ClickInfo info = new ClickInfo();
15412		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15413	16460	//Image img = CreateImage(width, height);
15414	16461	//System.out.println("width = " + width + "; height = " + height + "\n");
15415	16462
..	..	@@ -15486,48 +16533,77 @@
15486	16533	}
15487	16534	if (object != null && !hasMarquee)
15488	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	+
15489	16542	if (isRenderer)
15490	16543	{
15491		- info.flags++;
	16544	+ object.clickInfo.flags++;
15492	16545	double frameAspect = (double) width / (double) height;
15493	16546	if (frameAspect > renderCamera.aspect)
15494	16547	{
15495	16548	int desired = (int) ((double) height * renderCamera.aspect);
15496		- info.bounds.width -= width - desired;
15497		- info.bounds.x += (width - desired) / 2;
	16549	+ object.clickInfo.bounds.width -= width - desired;
	16550	+ object.clickInfo.bounds.x += (width - desired) / 2;
15498	16551	} else
15499	16552	{
15500	16553	int desired = (int) ((double) width / renderCamera.aspect);
15501		- info.bounds.height -= height - desired;
15502		- info.bounds.y += (height - desired) / 2;
	16554	+ object.clickInfo.bounds.height -= height - desired;
	16555	+ object.clickInfo.bounds.y += (height - desired) / 2;
15503	16556	}
15504	16557	}
15505		- info.g = gr;
15506		- info.camera = renderCamera;
	16558	+
	16559	+ object.clickInfo.g = gr;
	16560	+ object.clickInfo.camera = renderCamera;
15507	16561	/*
15508	16562	// Memory intensive (brep.verticescopy)
15509	16563	if (!(object instanceof Composite))
15510	16564	object.draw(info, 0, false); // SLOW :
15511	16565	*/
15512		- if (!isRenderer)
	16566	+ if (!isRenderer) // && drag)
15513	16567	{
15514		- object.drawEditHandles(info, 0);
15515		-
15516		- 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)
15517	16571	{
15518		- 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)
15519	16578	{
15520		- case Object3D.hitCenter: gr.setColor(Color.pink);
15521		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15522		- break;
15523		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15524		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15525		- break;
15526		- case Object3D.hitScale: gr.setColor(Color.cyan);
15527		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15528		- 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;
15529	16586	}
15530		-
	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	+ }
15531	16607	}
15532	16608	}
15533	16609	}
..	..	@@ -15542,7 +16618,7 @@
15542	16618	if (hasMarquee)
15543	16619	{
15544	16620	gr.setXORMode(Color.white);
15545		- gr.setColor(Color.red);
	16621	+ gr.setColor(Color.white);
15546	16622	if (!firstime)
15547	16623	{
15548	16624	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -15701,7 +16777,8 @@
15701	16777
15702	16778	public boolean mouseDrag(Event evt, int x, int y)
15703	16779	{
15704		- //System.out.println("mouseDrag: " + evt);
	16780	+ System.out.println("mouseDrag: " + evt);
	16781	+ System.exit(0);
15705	16782	/*
15706	16783	drag = true;
15707	16784	//System.out.println("Mouse DRAG");
..	..	@@ -15820,6 +16897,7 @@
15820	16897	public boolean mouseUp(Event evt, int x, int y)
15821	16898	{
15822	16899	System.out.println("mouseUp: " + evt);
	16900	+ System.exit(0);
15823	16901	/*
15824	16902	locked = false;
15825	16903	if (isRenderer)
..	..	@@ -16009,6 +17087,8 @@
16009	17087	private /static/ boolean firstime;
16010	17088	private /static/ cVector newView = new cVector();
16011	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"};
16012	17092	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16013	17093	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16014	17094	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16021,36 +17101,74 @@
16021	17101	{
16022	17102	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16023	17103
	17104	+ int usedsuf = 0;
	17105	+
16024	17106	for (int i = 0; i < suffixes.length; i++)
16025	17107	{
16026		- String resourceName = basename + suffixes[i] + "." + suffix;
16027		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16028		- mipmapped,
16029		- FileUtil.getFileSuffix(resourceName));
16030		- if (data == null)
	17108	+ String[] suffixe = suffixes;
	17109	+ String[] fallback = suffixes2;
	17110	+ String[] fallfallback = suffixes3;
	17111	+
	17112	+ for (int c=usedsuf; --c>=0;)
16031	17113	{
16032		- throw new IOException("Unable to load texture " + resourceName);
	17114	+// String[] temp = suffixe;
	17115	+// suffixe = fallback;
	17116	+// fallback = fallfallback;
	17117	+// fallfallback = temp;
16033	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	+
16034	17147	//System.out.println("Target = " + targets[i]);
16035	17148	cubemap.updateImage(data, targets[i]);
16036	17149	}
16037	17150
16038	17151	return cubemap;
16039	17152	}
	17153	+
16040	17154	int bigsphere = -1;
16041	17155
16042	17156	float BGcolor = 0.5f;
16043	17157
16044		- private void DrawSkyBox(GL gl)
	17158	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	17159	+
	17160	+ private void DrawSkyBox(GL gl, float ratio)
16045	17161	{
16046		- if (envyoff \|\| cubemap == null)
	17162	+ if (//envyoff \|\|
	17163	+ WIREFRAME \|\|
	17164	+ cubemap == null)
16047	17165	{
16048	17166	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16049	17167	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
16050	17168	return;
16051	17169	}
16052	17170
16053		- if (WIREFRAME)
	17171	+ //if (WIREFRAME)
16054	17172	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
16055	17173
16056	17174	gl.glDisable(gl.GL_CULL_FACE);
..	..	@@ -16058,7 +17176,17 @@
16058	17176	// Compensates for ExaminerViewer's modification of modelview matrix
16059	17177	gl.glMatrixMode(GL.GL_MODELVIEW);
16060	17178	gl.glLoadIdentity();
	17179	+ gl.glScalef(1,ratio,1);
16061	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	+
16062	17190	//gl.glActiveTexture(GL.GL_TEXTURE1);
16063	17191	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16064	17192
..	..	@@ -16090,6 +17218,7 @@
16090	17218	{
16091	17219	gl.glScalef(1.0f, -1.0f, 1.0f);
16092	17220	}
	17221	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16093	17222	gl.glMultMatrixd(viewrot_1, 0);
16094	17223	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16095	17224	//viewer.updateInverseRotation(gl);
..	..	@@ -16130,7 +17259,8 @@
16130	17259	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16131	17260
16132	17261	cubemap.disable();
16133		- ////cubemap.unbind();
	17262	+ //cubemap.dispose();
	17263	+
16134	17264	if (CULLFACE)
16135	17265	{
16136	17266	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16138,6 +17268,8 @@
16138	17268
16139	17269	if (WIREFRAME)
16140	17270	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_LINE);
	17271	+ else
	17272	+ gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
16141	17273	}
16142	17274
16143	17275	private void DrawChecker(GL gl)
..	..	@@ -16186,7 +17318,7 @@
16186	17318	gl.glScalef(1.0f, -1.0f, 1.0f);
16187	17319	}
16188	17320
16189		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	17321	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16190	17322
16191	17323	float step = 2; // 0.1666f; //0.25f;
16192	17324	float stepv = 2; // step * 1652 / 998;
..	..	@@ -16230,16 +17362,16 @@
16230	17362	cStatic.objectstack[materialdepth++] = checker;
16231	17363	//System.out.println("material " + material);
16232	17364	//Applet3D.tracein(this, selected);
16233		- vector2buffer = checker.projectedVertices;
	17365	+ //vector2buffer = checker.projectedVertices;
16234	17366
16235	17367	//checker.GetMaterial().Draw(this, false); // true);
16236		- DrawMaterial(checker.GetMaterial(), false); // true);
	17368	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16237	17369
16238	17370	materialdepth -= 1;
16239	17371	if (materialdepth > 0)
16240	17372	{
16241		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16242		- 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);
16243	17375	}
16244	17376	//checker.GetMaterial().opacity = 1f;
16245	17377	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16325,6 +17457,14 @@
16325	17457	}
16326	17458	}
16327	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	+
16328	17468	class SelectBuffer implements GLEventListener
16329	17469	{
16330	17470
..	..	@@ -16340,7 +17480,7 @@
16340	17480	//new Exception().printStackTrace();
16341	17481	System.out.println("select buffer init");
16342	17482	// Use debug pipeline
16343		- drawable.setGL(new DebugGL(drawable.getGL()));
	17483	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16344	17484
16345	17485	GL gl = drawable.getGL();
16346	17486
..	..	@@ -16404,6 +17544,17 @@
16404	17544
16405	17545	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16406	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	+
16407	17558	//int tmp = selection_view;
16408	17559	//selection_view = -1;
16409	17560	int temp = DrawMode();
..	..	@@ -16415,6 +17566,17 @@
16415	17566	// temp = DEFAULT; // patch for selection debug
16416	17567	Globals.drawMode = temp; // WARNING
16417	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	+
16418	17580	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16419	17581
16420	17582	// trying different ways of getting the depth info over
..	..	@@ -16445,7 +17607,7 @@
16445	17607
16446	17608	float depth = depths[y * TEX_SIZE + x];
16447	17609
16448		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17610	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
16449	17611	{
16450	17612	pointselection = false;
16451	17613
..	..	@@ -16462,6 +17624,8 @@
16462	17624	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16463	17625	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16464	17626	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17627	+
	17628	+ CreateSelectedPoint();
16465	17629
16466	17630	// Will fit the mesh !!!
16467	17631	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16516,29 +17680,31 @@
16516	17680	}
16517	17681
16518	17682	if (!movingcamera && !PAINTMODE)
16519		- object.editWindow.ScreenFitPoint(); // fev 2014
	17683	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16520	17684
16521		- 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)
16522	17686	{
16523		- 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);
16524	17688
16525		- Object3D group = new Object3D("inst" + paintcount++);
	17689	+ if (object.GetWindow().copy.selection.Size() > 0)
	17690	+ {
	17691	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16526	17692
16527		- group.CreateMaterial(); // use a void leaf to select instances
16528		-
16529		- group.add(paintobj); // link
16530		-
16531		- object.editWindow.SnapObject(group);
16532		-
16533		- Object3D folder = object.editWindow.copy;
16534		-
16535		- if (object.editWindow.copy.selection.Size() > 0)
16536		- folder = object.editWindow.copy.selection.elementAt(0);
16537		-
16538		- folder.add(group);
16539		-
16540		- object.editWindow.ResetModel();
16541		- 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	+ }
16542	17708	}
16543	17709	else
16544	17710	paintcount = 0;
..	..	@@ -16577,6 +17743,11 @@
16577	17743	//System.out.println("objects[color] = " + objects[color]);
16578	17744	//objects[color].Select();
16579	17745	indexcount = 0;
	17746	+ ObjEditor window = object.GetWindow();
	17747	+ if (window != null && deselect)
	17748	+ {
	17749	+ window.Select(null, deselect, true);
	17750	+ }
16580	17751	object.Select(color, deselect);
16581	17752	}
16582	17753
..	..	@@ -16627,6 +17798,7 @@
16627	17798
16628	17799	public void init(GLAutoDrawable drawable)
16629	17800	{
	17801	+ if (Globals.DEBUG)
16630	17802	System.out.println("shadow buffer init");
16631	17803
16632	17804	GL gl = drawable.getGL();
..	..	@@ -16855,10 +18027,14 @@
16855	18027	gl.glFlush();
16856	18028
16857	18029	/**/
16858		- 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);
16859	18031
16860		- float[] pixels = occlusionsizebuffer.array();
	18032	+ float[] depths = occlusiondepthbuffer.array();
16861	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	+
16862	18038	double r = 0, g = 0, b = 0;
16863	18039
16864	18040	double count = 0;
..	..	@@ -16869,7 +18045,7 @@
16869	18045
16870	18046	double FACTOR = 1;
16871	18047
16872		- for (int i = 0; i < pixels.length; i++)
	18048	+ for (int i = 0; i < depths.length; i++)
16873	18049	{
16874	18050	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
16875	18051	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -16952,7 +18128,7 @@
16952	18128
16953	18129	double scale = ray.z; // 1; // cos
16954	18130
16955		- float depth = pixels[newindex];
	18131	+ float depth = depths[newindex];
16956	18132
16957	18133	/*
16958	18134	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17095,6 +18271,11 @@
17095	18271	static boolean DEBUG_SELECTION = false;
17096	18272	boolean OCCLUSION_CULLING = false; //true;
17097	18273	public boolean lightMode = false;
	18274	+
	18275	+ private boolean keepshadow;
	18276	+
	18277	+ static public boolean capsLocked = false; // VR
	18278	+
17098	18279	static public int indexcount = 0;
17099	18280	/static/ cColor vertexOcclusion = new cColor();
17100	18281	//private int selection_view = -1;
..	..	@@ -17102,23 +18283,15 @@
17102	18283	int AAbuffersize = 0;
17103	18284
17104	18285	//double[] selectedpoint = new double[3];
17105		- static Superellipsoid selectedpoint = new Superellipsoid();
	18286	+ static Superellipsoid selectedpoint;
17106	18287	static Sphere previousselectedpoint = null;
17107		- static Sphere debugpointG = new Sphere();
17108		- static Sphere debugpointP = new Sphere();
17109		- static Sphere debugpointC = new Sphere();
17110		- static Sphere debugpointR = new Sphere();
	18288	+ static Sphere debugpointG;
	18289	+ static Sphere debugpointP;
	18290	+ static Sphere debugpointC;
	18291	+ static Sphere debugpointR;
17111	18292
17112	18293	static Sphere debugpoints[] = new Sphere[8];
17113	18294
17114		- static
17115		- {
17116		- for (int i=0; i<8; i++)
17117		- {
17118		- debugpoints[i] = new Sphere();
17119		- }
17120		- }
17121		-
17122	18295	static void InitPoints(float radius)
17123	18296	{
17124	18297	for (int i=0; i<8; i++)
..	..	@@ -17157,11 +18330,14 @@
17157	18330	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17158	18331	static IntBuffer bigAAbuffer;
17159	18332	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17160		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	18333	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17161	18334	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17162	18335	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17163	18336	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17164		- 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	+
17165	18341	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17166	18342	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17167	18343	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();