~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,8 +8052,8 @@
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	8059	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7936,7 +8071,7 @@
7936	8071
7937	8072	String pigment = Object3D.GetPigment(tex);
7938	8073
7939		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8074	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7940	8075	{
7941	8076	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7942	8077	// System.out.println("; bump = " + bump);
..	..	@@ -7947,7 +8082,7 @@
7947	8082	pigment = null;
7948	8083	}
7949	8084
7950		- ReleaseTexture(pigment, false);
	8085	+ ReleaseTexture(tex, false);
7951	8086	}
7952	8087
7953	8088	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -7965,7 +8100,7 @@
7965	8100
7966	8101	String bump = Object3D.GetBump(tex);
7967	8102
7968		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8103	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7969	8104	{
7970	8105	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7971	8106	// System.out.println("; bump = " + bump);
..	..	@@ -7976,10 +8111,10 @@
7976	8111	bump = null;
7977	8112	}
7978	8113
7979		- ReleaseTexture(bump, true);
	8114	+ ReleaseTexture(tex, true);
7980	8115	}
7981	8116
7982		- void ReleaseTexture(String tex, boolean bump)
	8117	+ void ReleaseTexture(cTexture tex, boolean bump)
7983	8118	{
7984	8119	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7985	8120	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7990,7 +8125,7 @@
7990	8125	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7991	8126
7992	8127	if (tex != null)
7993		- texture = textures.get(tex);
	8128	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7994	8129
7995	8130	// //assert( texture != null );
7996	8131	// if (texture == null)
..	..	@@ -8084,47 +8219,50 @@
8084	8219
8085	8220	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8086	8221	{
8087		- if (// DrawMode() != 0 \|\| /tex == null \|\|/
8088		- ambientOcclusion ) // \|\| !textureon)
8089		- {
8090		- return; // false;
8091		- }
8092		-
8093		- if (tex == null)
8094		- {
8095		- BindTexture(null,false,resolution);
8096		- BindTexture(null,true,resolution);
8097		- return;
8098		- }
	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;
8099	8263
8100		- String pigment = Object3D.GetPigment(tex);
8101		- String bump = Object3D.GetBump(tex);
8102		-
8103		- usedtextures.put(pigment, pigment);
8104		- usedtextures.put(bump, bump);
8105		-
8106		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8107		- {
8108		- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8109		- // System.out.println("; bump = " + bump);
8110		- }
8111		-
8112		- if (bump.equals(""))
8113		- {
8114		- bump = null;
8115		- }
8116		- if (pigment.equals(""))
8117		- {
8118		- pigment = null;
8119		- }
8120		-
8121		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8122		- BindTexture(pigment, false, resolution);
8123		- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8124		- BindTexture(bump, true, resolution);
8125		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8126		-
8127		- return; // true;
	8264	+ BindPigmentTexture(tex, resolution);
	8265	+ BindBumpTexture(tex, resolution);
8128	8266	}
8129	8267
8130	8268	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8143,9 +8281,9 @@
8143	8281
8144	8282	String pigment = Object3D.GetPigment(tex);
8145	8283
8146		- usedtextures.put(pigment, pigment);
	8284	+ usedtextures.add(tex);
8147	8285
8148		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8286	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8149	8287	{
8150	8288	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8151	8289	// System.out.println("; bump = " + bump);
..	..	@@ -8157,7 +8295,7 @@
8157	8295	}
8158	8296
8159	8297	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8160		- BindTexture(pigment, false, resolution);
	8298	+ BindTexture(tex, false, resolution);
8161	8299	}
8162	8300
8163	8301	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8176,9 +8314,9 @@
8176	8314
8177	8315	String bump = Object3D.GetBump(tex);
8178	8316
8179		- usedtextures.put(bump, bump);
	8317	+ usedtextures.add(tex);
8180	8318
8181		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8319	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8182	8320	{
8183	8321	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8184	8322	// System.out.println("; bump = " + bump);
..	..	@@ -8190,7 +8328,7 @@
8190	8328	}
8191	8329
8192	8330	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8193		- BindTexture(bump, true, resolution);
	8331	+ BindTexture(tex, true, resolution);
8194	8332	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8195	8333	}
8196	8334
..	..	@@ -8214,13 +8352,19 @@
8214	8352	return fileExists;
8215	8353	}
8216	8354
8217		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8355	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8218	8356	{
8219		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8357	+ CacheTexture texturecache = null;
8220	8358
8221	8359	if (tex != null)
8222	8360	{
8223		- 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	+ }
8224	8368
8225	8369	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8226	8370
..	..	@@ -8230,19 +8374,46 @@
8230	8374	// else
8231	8375	// if (!texname.startsWith("/"))
8232	8376	// texname = "/Users/nbriere/Textures/" + texname;
8233		- if (!FileExists(tex))
	8377	+ if (!FileExists(texname) && !texname.startsWith("@"))
8234	8378	{
8235	8379	texname = fallbackTextureName;
8236	8380	}
8237	8381
8238	8382	if (CACHETEXTURE)
8239		- texture = textures.get(texname); // TEXTURE CACHE
8240		-
8241		- TextureData texturedata = null;
8242		-
8243		- if (texture == null \|\| texture.resolution < resolution)
8244	8383	{
8245		- 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(""))
8246	8417	{
8247	8418	assert(!bump);
8248	8419	// if (bump)
..	..	@@ -8253,19 +8424,23 @@
8253	8424	// }
8254	8425	// else
8255	8426	// {
8256		- texture = textures.get(tex);
8257		- if (texture == null)
	8427	+ // texturecache = textures.get(texname); // suspicious
	8428	+ if (texturecache == null)
8258	8429	{
8259		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8430	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8260	8431	}
	8432	+ else
	8433	+ new Exception().printStackTrace();
8261	8434	// }
8262	8435	} else
8263		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8436	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8264	8437	{
8265	8438	assert(bump);
8266		- texture = textures.get(tex);
8267		- if (texture == null)
8268		- 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();
8269	8444	} else
8270	8445	{
8271	8446	//if (tex.equals("IMMORTAL"))
..	..	@@ -8273,11 +8448,22 @@
8273	8448	// texture = GetResourceTexture("default.png");
8274	8449	//} else
8275	8450	//{
8276		- if (tex.equals("WHITE_NOISE"))
	8451	+ if (texname.endsWith("WHITE_NOISE"))
8277	8452	{
8278		- texture = textures.get(tex);
8279		- if (texture == null)
8280		- 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();
8281	8467	} else
8282	8468	{
8283	8469	if (textureon)
..	..	@@ -8336,19 +8522,20 @@
8336	8522	if (texturedata == null)
8337	8523	throw new Exception();
8338	8524
8339		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8525	+ texturecache = new CacheTexture(texturedata,resolution);
8340	8526	//texture = GetTexture(tex, bump);
8341	8527	}
	8528	+ }
8342	8529	}
8343	8530	//}
8344	8531	}
8345	8532
8346		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8533	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8347	8534	{
8348	8535	//return false;
8349	8536
8350	8537	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8351		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8538	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8352	8539	{
8353	8540	// String ext = "_highres";
8354	8541	// if (REDUCETEXTURE)
..	..	@@ -8365,52 +8552,17 @@
8365	8552	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8366	8553	if (!cachefile.exists())
8367	8554	{
8368		- // cache to disk
8369		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8370		- //buffers[0].
8371		-
8372		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8373		- int[] pixels = new int[bytebuf.capacity()/3];
8374		-
8375		- // squared size heuristic...
8376		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8555	+ //if (texturedata.getWidth() == texturedata.getHeight())
8377	8556	{
8378		- for (int i=pixels.length; --i>=0;)
8379		- {
8380		- int i3 = i*3;
8381		- pixels[i] = 0xFF;
8382		- pixels[i] <<= 8;
8383		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8384		- pixels[i] <<= 8;
8385		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8386		- pixels[i] <<= 8;
8387		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8388		- }
8389		-
8390		- /*
8391		- int r=0,g=0,b=0,a=0;
8392		- for (int i=0; i<width; i++)
8393		- for (int j=0; j<height; j++)
8394		- {
8395		- int index = j*width+i;
8396		- int p = pixels[index];
8397		- a = ((p>>24) & 0xFF);
8398		- r = ((p>>16) & 0xFF);
8399		- g = ((p>>8) & 0xFF);
8400		- b = (p & 0xFF);
8401		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8402		- }
8403		- /**/
8404		- int width = (int)Math.sqrt(pixels.length); // squared
8405		- int height = width;
8406		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8407		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8557	+ BufferedImage rendImage = CreateBim(texturedata);
	8558	+
8408	8559	ImageWriter writer = null;
8409	8560	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8410	8561	if (iter.hasNext()) {
8411	8562	writer = (ImageWriter)iter.next();
8412	8563	}
8413		- float compressionQuality = 0.9f;
	8564	+
	8565	+ float compressionQuality = 0.85f;
8414	8566	try
8415	8567	{
8416	8568	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8427,18 +8579,20 @@
8427	8579	}
8428	8580	}
8429	8581	}
8430		-
	8582	+
	8583	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8584	+
8431	8585	//System.out.println("Texture = " + tex);
8432		- if (textures.containsKey(texname))
	8586	+ if (textures.containsKey(tex))
8433	8587	{
8434		- CacheTexture thetex = textures.get(texname);
	8588	+ CacheTexture thetex = textures.get(tex);
8435	8589	thetex.texture.disable();
8436	8590	thetex.texture.dispose();
8437		- textures.remove(texname);
	8591	+ textures.remove(tex);
8438	8592	}
8439	8593
8440		- texture.texturedata = texturedata;
8441		- textures.put(texname, texture);
	8594	+ //texture.texturedata = texturedata;
	8595	+ textures.put(tex, texturecache);
8442	8596
8443	8597	// newtex = true;
8444	8598	}
..	..	@@ -8454,10 +8608,46 @@
8454	8608	}
8455	8609	}
8456	8610
8457		- return texture;
	8611	+ return texturecache;
8458	8612	}
8459	8613
8460		- 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
8461	8651	{
8462	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8463	8653
..	..	@@ -8475,21 +8665,21 @@
8475	8665	return texture!=null?texture.texture:null;
8476	8666	}
8477	8667
8478		- 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
8479	8669	{
8480	8670	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8481	8671
8482	8672	return texture!=null?texture.texturedata:null;
8483	8673	}
8484	8674
8485		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8675	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8486	8676	{
8487	8677	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8488	8678	{
8489	8679	return false;
8490	8680	}
8491	8681
8492		- boolean newtex = false;
	8682	+ //boolean newtex = false;
8493	8683
8494	8684	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8495	8685
..	..	@@ -8521,9 +8711,75 @@
8521	8711	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8522	8712	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8523	8713
8524		- return newtex;
	8714	+ return true; // Warning: not used.
8525	8715	}
8526	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	+
8527	8783	ShadowBuffer shadowPBuf;
8528	8784	AntialiasBuffer antialiasPBuf;
8529	8785	int MAXSTACK;
..	..	@@ -8540,10 +8796,12 @@
8540	8796
8541	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8542	8798	MAXSTACK = temp[0];
8543		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8544	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8545	8802	MAXSTACK = temp[0];
8546		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8547	8805
8548	8806	// Use debug pipeline
8549	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8551,7 +8809,8 @@
8551	8809	gl = drawable.getGL(); //
8552	8810
8553	8811	GL gl3 = getGL();
8554		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8555	8814
8556	8815
8557	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8716,7 +8975,7 @@
8716	8975
8717	8976	if (cubemap == null)
8718	8977	{
8719		- LoadEnvy(5);
	8978	+ //LoadEnvy(1);
8720	8979	}
8721	8980
8722	8981	//cubemap.enable();
..	..	@@ -8992,6 +9251,8 @@
8992	9251
8993	9252	void LoadEnvy(int which)
8994	9253	{
	9254	+ assert(false);
	9255	+
8995	9256	String name;
8996	9257	String ext;
8997	9258
..	..	@@ -9003,37 +9264,58 @@
9003	9264	cubemap = null;
9004	9265	return;
9005	9266	case 1:
9006		- name = "cubemaps/box_";
9007		- ext = "png";
	9267	+ name = "cubemaps/rgb/";
	9268	+ ext = "jpg";
9008	9269	reverseUP = false;
9009	9270	break;
9010	9271	case 2:
9011		- name = "cubemaps/uffizi_";
9012		- ext = "png";
9013		- break; // reverseUP = true; break;
	9272	+ name = "cubemaps/uffizi/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
9014	9276	case 3:
9015		- name = "cubemaps/CloudyHills_";
9016		- ext = "tga";
	9277	+ name = "cubemaps/CloudyHills/";
	9278	+ ext = "jpg";
9017	9279	reverseUP = false;
9018	9280	break;
9019	9281	case 4:
9020		- name = "cubemaps/cornell_";
	9282	+ name = "cubemaps/cornell/";
9021	9283	ext = "png";
9022	9284	reverseUP = false;
9023	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;
9024	9311	default:
9025		- name = "cubemaps/rgb_";
9026		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9312	+ name = "cubemaps/box/";
	9313	+ ext = "png"; /mipmap = true;/
	9314	+ reverseUP = false;
9027	9315	break;
9028	9316	}
9029		-
9030		- try
9031		- {
9032		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9033		- } catch (IOException e)
9034		- {
9035		- throw new RuntimeException(e);
9036		- }
	9317	+
	9318	+ LoadSkybox(name, ext, mipmap);
9037	9319	}
9038	9320
9039	9321	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9065,8 +9347,12 @@
9065	9347	static double[] model = new double[16];
9066	9348	double[] camera2light = new double[16];
9067	9349	double[] light2camera = new double[16];
9068		- int newenvy = -1;
9069		- boolean envyoff = true; // false;
	9350	+
	9351	+ //int newenvy = -1;
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
	9355	+
9070	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9071	9357	//float[] light0 = { 0,0,0 };
9072	9358	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9359,11 +9645,35 @@
9359	9645	jy8[3] = 0.5f;
9360	9646	}
9361	9647
9362		- 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
9363	9649	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9364	9650	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9365	9651	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9366	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	+
9367	9677	static int imagecount = 0; // movie generation
9368	9678
9369	9679	static int jitter = 0;
..	..	@@ -9460,7 +9770,7 @@
9460	9770
9461	9771	if (renderCamera != lightCamera)
9462	9772	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9463		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9773	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9464	9774
9465	9775	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9466	9776
..	..	@@ -9476,7 +9786,7 @@
9476	9786
9477	9787	if (renderCamera != lightCamera)
9478	9788	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9479		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9789	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9480	9790
9481	9791	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9482	9792
..	..	@@ -9522,13 +9832,18 @@
9522	9832	rati = 1 / rati;
9523	9833	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9524	9834	}
9525		- assert (newenvy == -1);
	9835	+
	9836	+ //assert (newenvy == -1);
	9837	+
9526	9838	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9527	9839	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9528		- DrawSkyBox(gl);
	9840	+ DrawSkyBox(gl, (float)rati);
9529	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9530	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9531		- accPerspective(gl, renderCamera.shaper_fovy / ratio,
	9843	+
	9844	+ boolean vr = capsLocked && !lightMode;
	9845	+
	9846	+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
9532	9847	ratio,
9533	9848	//near_plane, far_plane,
9534	9849	renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..	..	@@ -10391,9 +10706,18 @@
10391	10706	static boolean init = false;
10392	10707
10393	10708	double[][] matrix = LA.newMatrix();
	10709	+
	10710	+ // This is to refresh the UI of the material panel.
	10711	+ ObjEditor patchMaterial;
10394	10712
10395	10713	public void display(GLAutoDrawable drawable)
10396	10714	{
	10715	+ if (patchMaterial.patchMaterial)
	10716	+ {
	10717	+ patchMaterial.patchMaterial = false;
	10718	+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
	10719	+ }
	10720	+
10397	10721	if (Grafreed.savesound && Grafreed.hassound)
10398	10722	{
10399	10723	Grafreed.wav.save();
..	..	@@ -10437,7 +10761,9 @@
10437	10761	}
10438	10762	/**/
10439	10763
10440		- if (selection)
	10764	+ boolean control = ((modifiers & CTRL) != 0);
	10765	+
	10766	+ if (selection && (!Globals.isLIVE() \|\| control))
10441	10767	{
10442	10768	selectbuffer.display();
10443	10769	return;
..	..	@@ -10474,6 +10800,7 @@
10474	10800	ANTIALIAS = 0;
10475	10801	//System.out.println("RESTART");
10476	10802	AAtimer.restart();
	10803	+ Globals.TIMERRUNNING = true;
10477	10804	}
10478	10805	}
10479	10806	}
..	..	@@ -10488,6 +10815,112 @@
10488	10815
10489	10816	if (DrawMode() == DEFAULT)
10490	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	+
10491	10924	currentlydrawing = true;
10492	10925	}
10493	10926
..	..	@@ -10541,7 +10974,8 @@
10541	10974	ambientOcclusion = false;
10542	10975	}
10543	10976
10544		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10977	+ if (//Globals.lighttouched &&
	10978	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10545	10979	{
10546	10980	//if (RENDERSHADOW) // ?
10547	10981	if (!IsFrozen())
..	..	@@ -10560,7 +10994,7 @@
10560	10994
10561	10995	if (wait)
10562	10996	{
10563		- Sleep(500);
	10997	+ Sleep(200); // blocks everything
10564	10998
10565	10999	wait = false;
10566	11000	}
..	..	@@ -10675,7 +11109,7 @@
10675	11109	// if (parentcam != renderCamera) // not a light
10676	11110	if (cam != lightCamera)
10677	11111	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10678		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	11112	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10679	11113
10680	11114	for (int j = 0; j < 4; j++)
10681	11115	{
..	..	@@ -10690,7 +11124,7 @@
10690	11124	// if (parentcam != renderCamera) // not a light
10691	11125	if (cam != lightCamera)
10692	11126	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10693		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	11127	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10694	11128
10695	11129	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10696	11130
..	..	@@ -10776,13 +11210,43 @@
10776	11210	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10777	11211	}
10778	11212
10779		- 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"))
10780	11221	{
10781		- LoadEnvy(newenvy);
	11222	+ if (cubemaprgb == null)
	11223	+ {
	11224	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11225	+ }
	11226	+
	11227	+ cubemap = cubemaprgb;
10782	11228	}
10783		-
10784		- newenvy = -1;
10785		-
	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	+
10786	11250	ratio = ((double) getWidth()) / getHeight();
10787	11251	//System.out.println("ratio = " + ratio);
10788	11252
..	..	@@ -10798,7 +11262,7 @@
10798	11262
10799	11263	if (!IsFrozen() && !ambientOcclusion)
10800	11264	{
10801		- DrawSkyBox(gl);
	11265	+ DrawSkyBox(gl, (float)ratio);
10802	11266	}
10803	11267
10804	11268	//if (selection_view == -1)
..	..	@@ -10981,8 +11445,8 @@
10981	11445
10982	11446	gl.glMatrixMode(GL.GL_MODELVIEW);
10983	11447
10984		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10985	11448	//gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11449	+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10986	11450	//gl.glEnable(gl.GL_MULTISAMPLE);
10987	11451	} else
10988	11452	{
..	..	@@ -10994,7 +11458,7 @@
10994	11458	//System.out.println("BLENDING ON");
10995	11459	gl.glEnable(GL.GL_BLEND);
10996	11460	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10997		-
	11461	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10998	11462	gl.glMatrixMode(gl.GL_PROJECTION);
10999	11463	gl.glLoadIdentity();
11000	11464
..	..	@@ -11044,7 +11508,10 @@
11044	11508	//gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
11045	11509	} else
11046	11510	{
11047		- 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());
11048	11515	}
11049	11516	}
11050	11517
..	..	@@ -11084,7 +11551,7 @@
11084	11551
11085	11552	// if (cam != lightCamera)
11086	11553	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11087		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11554	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11088	11555	}
11089	11556
11090	11557	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11243,7 +11710,7 @@
11243	11710	}
11244	11711	}
11245	11712
11246		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11713	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11247	11714	{
11248	11715	//gl.glDepthFunc(GL.GL_LEQUAL);
11249	11716	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11251,24 +11718,21 @@
11251	11718
11252	11719	boolean texon = textureon;
11253	11720
11254		- if (RENDERPROGRAM > 0)
11255		- {
11256		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11257		- textureon = false;
11258		- }
	11721	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11722	+ textureon = false;
	11723	+
11259	11724	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11260	11725	//System.out.println("ALLO");
11261	11726	gl.glColorMask(false, false, false, false);
11262	11727	DrawObject(gl);
11263		- if (RENDERPROGRAM > 0)
11264		- {
11265		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11266		- textureon = texon;
11267		- }
	11728	+
	11729	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11730	+ textureon = texon;
	11731	+
11268	11732	gl.glColorMask(true, true, true, true);
11269	11733
11270	11734	gl.glDepthFunc(GL.GL_EQUAL);
11271		- //gl.glDepthMask(false);
	11735	+ gl.glDepthMask(false);
11272	11736	}
11273	11737
11274	11738	if (false) // DrawMode() == SHADOW)
..	..	@@ -11403,8 +11867,11 @@
11403	11867	repaint();
11404	11868	}
11405	11869
11406		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11870	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11871	+ {
	11872	+ renderCamera.computeTransform();
11407	11873	repaint();
	11874	+ }
11408	11875
11409	11876	displaydone = true;
11410	11877	}
..	..	@@ -11451,16 +11918,51 @@
11451	11918
11452	11919	static boolean zoomonce = false;
11453	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	+
11454	11939	void DrawObject(GL gl, boolean draw)
11455	11940	{
	11941	+ // To clear camera values
	11942	+ ResetOptions();
	11943	+
11456	11944	//System.out.println("DRAW OBJECT " + mouseDown);
11457	11945	// DrawMode() = SELECTION;
11458	11946	//GL gl = getGL();
11459	11947	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11460	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	+ }
11461	11963	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11462		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11463		- pingthread.StepToTarget(true); // true);
	11964	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11965	+ pingthread.StepToTarget(); // true);
11464	11966	// zoomonce = false;
11465	11967	}
11466	11968
..	..	@@ -11531,8 +12033,9 @@
11531	12033
11532	12034	if (DrawMode() == DEFAULT)
11533	12035	{
11534		- if (DEBUG)
	12036	+ if (Globals.DEBUG)
11535	12037	{
	12038	+ CreateSelectedPoint();
11536	12039	float radius = 0.05f;
11537	12040	if (selectedpoint.radius != radius)
11538	12041	{
..	..	@@ -11586,20 +12089,32 @@
11586	12089	ReleaseTextures(DEFAULT_TEXTURES);
11587	12090
11588	12091	if (CLEANCACHE)
11589		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	12092	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11590	12093	{
11591		- String tex = e.nextElement();
	12094	+ cTexture tex = e.nextElement();
11592	12095
11593	12096	// System.out.println("Texture --------- " + tex);
11594	12097
11595		- if (tex.equals("WHITE_NOISE"))
	12098	+ if (tex.equals("WHITE_NOISE:"))
11596	12099	continue;
11597	12100
11598		- if (!usedtextures.containsKey(tex))
	12101	+ if (!usedtextures.contains(tex))
11599	12102	{
	12103	+ CacheTexture gettex = texturepigment.get(tex);
11600	12104	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11601		- textures.get(tex).texture.dispose();
11602		- 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	+ }
11603	12118	}
11604	12119	}
11605	12120	}
..	..	@@ -12019,7 +12534,7 @@
12019	12534	for (int i = tp.size(); --i >= 0;)
12020	12535	{
12021	12536	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12022		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12537	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
12023	12538	}
12024	12539
12025	12540
..	..	@@ -12127,8 +12642,82 @@
12127	12642
12128	12643	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12129	12644
12130		- String program =
	12645	+ String programmin =
	12646	+ // Min shader
12131	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	+
12132	12721	//"OPTION ARB_fragment_program_shadow;" +
12133	12722	"PARAM light2cam0 = program.env[10];" +
12134	12723	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12154,7 +12743,7 @@
12154	12743	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12155	12744	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12156	12745	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12157		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12746	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12158	12747	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12159	12748	"PARAM options1 = program.env[62];" + // fog rgb color
12160	12749	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12243,8 +12832,7 @@
12243	12832	"TEMP shininess;" +
12244	12833	"\n" +
12245	12834	"MOV texSamp, one;" +
12246		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12247		-
	12835	+
12248	12836	"MOV mapgrid.x, one2048th.x;" +
12249	12837	"MOV temp, fragment.texcoord[1];" +
12250	12838	/*
..	..	@@ -12265,20 +12853,20 @@
12265	12853	"MUL temp, floor, mapgrid.x;" +
12266	12854	//"TEX depth0, temp, texture[1], 2D;" +
12267	12855	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12268		- TextureFetch("depth0", "temp", "1") +
	12856	+ ShadowTextureFetch("depth0", "temp", "1") +
12269	12857	"") +
12270	12858	"ADD temp.x, temp.x, mapgrid.x;" +
12271	12859	//"TEX depth1, temp, texture[1], 2D;" +
12272	12860	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12273		- TextureFetch("depth1", "temp", "1") +
	12861	+ ShadowTextureFetch("depth1", "temp", "1") +
12274	12862	"") +
12275	12863	"ADD temp.y, temp.y, mapgrid.x;" +
12276	12864	//"TEX depth2, temp, texture[1], 2D;" +
12277		- TextureFetch("depth2", "temp", "1") +
	12865	+ ShadowTextureFetch("depth2", "temp", "1") +
12278	12866	"SUB temp.x, temp.x, mapgrid.x;" +
12279	12867	//"TEX depth3, temp, texture[1], 2D;" +
12280	12868	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12281		- TextureFetch("depth3", "temp", "1") +
	12869	+ ShadowTextureFetch("depth3", "temp", "1") +
12282	12870	"") +
12283	12871	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12284	12872	//"MOV params, material;" +
..	..	@@ -12400,7 +12988,7 @@
12400	12988	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12401	12989	// mar 2013 ??? "KIL alpha.a;" +
12402	12990	"MOV alpha, texSamp.aaaa;" + // y;" +
12403		- "KIL alpha.a;" +
	12991	+ "KIL alpha.a;" + // not sure with parallax mapping
12404	12992	/*
12405	12993	"MUL temp.xy, temp, two;" +
12406	12994	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12486,11 +13074,6 @@
12486	13074	"SUB bump0, bump0, half;" +
12487	13075	"ADD bump, bump, bump0;" +
12488	13076
12489		- "MOV temp.x, texSamp.a;" +
12490		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12491		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12492		- "MOV texSamp.a, temp.x;" +
12493		-
12494	13077	// double-sided
12495	13078	/**/
12496	13079	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12500,26 +13083,73 @@
12500	13083	"ADD temp.x, temp.x, one.x;" +
12501	13084	"MUL normal, normal, temp.xxxx;":""
12502	13085	) +
12503		- /**/
12504		-//// Normalize("normal") +
12505		-//// "MAX normal.z, eps.x, normal.z;" +
12506		-// Normalize("normal") +
12507		- "MOV normald, normal;" +
12508		- "MOV normals, normal;" +
	13086	+ /**/
	13087	+
	13088	+ "MOV temp, fragment.texcoord[4];" +
12509	13089
12510	13090	// UV base
12511	13091	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12512	13092	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12513	13093	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12514		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12515		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12516		- "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	+
12517	13099	"XPD V, normal, UP;" +
12518	13100	Normalize("V") +
12519	13101	"XPD U, V, normal;" +
12520	13102	Normalize("U") +
12521	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	+
12522	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;" +
12523	13153
12524	13154	//"MOV temp, fragment.texcoord[0];" +
12525	13155	//
..	..	@@ -12649,10 +13279,10 @@
12649	13279	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12650	13280	"") +
12651	13281
12652		- // display shadow only (bump == 0)
	13282	+ // display shadow only (fakedepth == 0)
12653	13283	"SUB temp.x, half.x, shadow.x;" +
12654	13284	"MOV temp.y, -params5.z;" + // params6.x;" +
12655		- "SLT temp.z, temp.y, -one2048th.x;" +
	13285	+ "SLT temp.z, temp.y, -c256i.x;" +
12656	13286	"SUB temp.y, one.x, temp.z;" +
12657	13287	"MUL temp.x, temp.x, temp.y;" +
12658	13288	"KIL temp.x;" +
..	..	@@ -12983,8 +13613,19 @@
12983	13613	//once = true;
12984	13614	}
12985	13615
12986		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12987		- 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	+
12988	13629	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12989	13630
12990	13631	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13031,7 +13672,8 @@
13031	13672	"\n" +
13032	13673	"END\n";
13033	13674
13034		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13675	+ if (Globals.DEBUG)
	13676	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13035	13677	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13036	13678
13037	13679	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13076,25 +13718,26 @@
13076	13718	return out;
13077	13719	}
13078	13720
13079		- String TextureFetch(String dest, String src, String unit)
	13721	+ // Also does frustum culling
	13722	+ String ShadowTextureFetch(String dest, String src, String unit)
13080	13723	{
13081	13724	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13082	13725	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13083	13726	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13727	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13728	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13084	13729	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13085		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13086		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13087		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13088		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13730	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13731	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13089	13732	//"SWZ buffer, temp, w,w,w,w;";
13090		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13733	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13091	13734	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13092	13735	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13093	13736	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13094		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13737	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13095	13738
13096		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13097		- //"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;";
13098	13741	}
13099	13742
13100	13743	String Shadow(String depth, String shadow)
..	..	@@ -13141,7 +13784,7 @@
13141	13784	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13142	13785	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13143	13786
13144		- // No shadow when out of frustrum
	13787	+ // No shadow when out of frustum
13145	13788	"SGE temp.x, " + depth + ".z, one.z;" +
13146	13789	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13147	13790	"";
..	..	@@ -13288,8 +13931,9 @@
13288	13931	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13289	13932	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13290	13933	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13291		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13292		- Object3D.cVector2[] vector2buffer;
	13934	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
	13935	+
	13936	+ //Object3D.cVector2[] vector2buffer;
13293	13937
13294	13938	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13295	13939	// OUT : diff, spec
..	..	@@ -13305,9 +13949,10 @@
13305	13949	"DP3 " + dest + ".z," + "normals," + "eye;" +
13306	13950	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13307	13951	//"MOV " + dest + ".w," + "normal.z;" +
13308		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13309		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13310		- //"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
13311	13956	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13312	13957	"RCP " + dest + ".w," + dest + ".w;" +
13313	13958	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13453,7 +14098,7 @@
13453	14098	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13454	14099	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13455	14100	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13456		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	14101	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13457	14102	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13458	14103	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13459	14104	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13514,7 +14159,7 @@
13514	14159	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13515	14160	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13516	14161	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13517		- //"MOV result.texcoord, vertex.texcoord;" +
	14162	+ //"MOV result.texcoord, vertex.fogcoord;" +
13518	14163	"MOV result.texcoord, temp;" +
13519	14164	// border fade
13520	14165	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13561,7 +14206,9 @@
13561	14206
13562	14207	//"ADD temp.z, temp.z, one;" +
13563	14208
13564		- "MOV result.color, temp;"
	14209	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14210	+
	14211	+ "MOV result.color, temp;" // Normal
13565	14212	: "MOV result.color, vertex.color;") +
13566	14213	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13567	14214	: "") +
..	..	@@ -13696,6 +14343,7 @@
13696	14343	public void mouseClicked(MouseEvent e)
13697	14344	{
13698	14345	System.out.println("mouseClicked: " + e);
	14346	+ System.exit(0);
13699	14347	}
13700	14348
13701	14349	public void mousePressed(MouseEvent e)
..	..	@@ -13734,10 +14382,12 @@
13734	14382	return;
13735	14383	}
13736	14384
13737		- 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;
13738	14388
13739	14389	// TIMER
13740		- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14390	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
13741	14391	{
13742	14392	keepboxmode = BOXMODE;
13743	14393	keepsupport = SUPPORT;
..	..	@@ -13778,7 +14428,7 @@
13778	14428	//}
13779	14429
13780	14430	SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
13781		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
	14431	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
13782	14432	anchorX = ax;
13783	14433	anchorY = ay;
13784	14434	prevX = px;
..	..	@@ -13812,6 +14462,7 @@
13812	14462	else
13813	14463	if (evt.getSource() == AAtimer)
13814	14464	{
	14465	+ Globals.TIMERRUNNING = false;
13815	14466	if (mouseDown)
13816	14467	{
13817	14468	//new Exception().printStackTrace();
..	..	@@ -13871,9 +14522,10 @@
13871	14522
13872	14523	// fev 2014???
13873	14524	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13874		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13875		- pingthread.StepToTarget(true); // true);
	14525	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14526	+ pingthread.StepToTarget(); // true);
13876	14527	}
	14528	+
13877	14529	// if (!LIVE)
13878	14530	super.repaint();
13879	14531	}
..	..	@@ -13886,6 +14538,7 @@
13886	14538	return;
13887	14539
13888	14540	AAtimer.restart(); //
	14541	+ Globals.TIMERRUNNING = true;
13889	14542
13890	14543	// waslive = LIVE;
13891	14544	// LIVE = false;
..	..	@@ -13935,14 +14588,15 @@
13935	14588	drag = false;
13936	14589	//System.out.println("Mouse DOWN");
13937	14590	editObj = false;
13938		- ClickInfo info = new ClickInfo();
13939		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13940		- info.pane = this;
13941		- info.camera = renderCamera;
13942		- info.x = x;
13943		- info.y = y;
13944		- info.modifiers = modifiersex;
13945		- 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);
13946	14600	if (!editObj)
13947	14601	{
13948	14602	hasMarquee = true;
..	..	@@ -13966,8 +14620,8 @@
13966	14620
13967	14621	//if (drawing)
13968	14622	//return;
13969		- if ((e.getModifiersEx() & CTRL) != 0
13970		- \|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
	14623	+ if ((e.getModifiersEx() & CTRL) != 0 \|\|
	14624	+ (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13971	14625	{
13972	14626	//System.out.println("mouseDragged: " + e);
13973	14627	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
..	..	@@ -13991,9 +14645,17 @@
13991	14645	return targetLookAt;
13992	14646	}
13993	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	+
13994	14653	class PingThread extends Thread
13995	14654	{
13996	14655	boolean jump;
	14656	+ boolean live;
	14657	+
	14658	+ boolean mute = false;
13997	14659
13998	14660	// void JumpToTarget()
13999	14661	// {
..	..	@@ -14009,6 +14671,95 @@
14009	14671	// only one thread!? synchronized
14010	14672	void StepToTarget(boolean jump)
14011	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	+
14012	14763	tmp.set(targetLookAt);
14013	14764	tmp.sub(manipCamera.lookAt); // june 2014
14014	14765
..	..	@@ -14046,7 +14797,7 @@
14046	14797
14047	14798	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
14048	14799	{
14049		- jump = true; // step = 1;
	14800	+ // sep 2019 jump = true; // step = 1;
14050	14801	}
14051	14802
14052	14803	if (OEILONCE && OEIL)
..	..	@@ -14081,7 +14832,10 @@
14081	14832	if (tmp.dot(tmp) < 0.00001)
14082	14833	{
14083	14834	zoomonce = false;
	14835	+ live = false;
14084	14836	}
	14837	+ else
	14838	+ live = true;
14085	14839
14086	14840	tmp.mul(step > step2 ? step : step2);
14087	14841	}
..	..	@@ -14108,7 +14862,7 @@
14108	14862	{
14109	14863	if (LOOKAT)
14110	14864	manipCamera.lookAt.add(tmp);
14111		- if (OEIL)
	14865	+ if (OEIL && !capsLocked)
14112	14866	manipCamera.location.add(tmp);
14113	14867
14114	14868	{
..	..	@@ -14123,7 +14877,10 @@
14123	14877	lightCamera.computeTransform();
14124	14878	}
14125	14879	}
14126		- manipCamera.computeTransform();
	14880	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14881	+ {
	14882	+ manipCamera.computeTransform();
	14883	+ }
14127	14884	}
14128	14885	// ?????? mouseDown = true;
14129	14886	//System.out.println("---------------- ---------- Paint " + tmp.length2());
..	..	@@ -14216,49 +14973,107 @@
14216	14973	}
14217	14974	}
14218	14975	}
	14976	+
14219	14977	PingThread pingthread = new PingThread();
14220		- int delta = 5;
14221		- int speed = 5;
	14978	+ int delta = 1;
	14979	+ int speed = 1;
	14980	+ int walk = 8;
14222	14981	boolean autorepeat = false;
14223	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	+
14224	15002	void GoDown(int mod)
14225	15003	{
14226	15004	MODIFIERS \|= COMMAND;
14227		- /*
	15005	+ boolean isVR = (mouseMode&VR)!=0;
	15006	+ /**/
14228	15007	if((mod&SHIFT) == SHIFT)
14229		- manipCamera.RotatePosition(0, -speed);
14230		- else
14231		- manipCamera.BackForth(0, -speed*delta, getWidth());
14232		- */
14233		- if ((mod & SHIFT) == SHIFT)
14234	15008	{
14235		- mouseMode = mouseMode; // VR??
14236		- } else
14237		- {
14238		- 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());
14239	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	+// }
14240	15033
	15034	+ targetLookAt.set(manipCamera.lookAt);
	15035	+
14241	15036	//prevX = X = anchorX;
14242	15037	prevY = Y = anchorY - (int) (renderCamera.Distance());
14243	15038	}
14244	15039
14245	15040	void GoUp(int mod)
14246	15041	{
	15042	+ RigidBody.justclicked = true;
	15043	+
14247	15044	MODIFIERS \|= COMMAND;
14248		- /*
	15045	+ /**/
	15046	+ boolean isVR = (mouseMode&VR)!=0;
	15047	+
14249	15048	if((mod&SHIFT) == SHIFT)
14250		- manipCamera.RotatePosition(0, speed);
14251		- else
14252		- manipCamera.BackForth(0, speed*delta, getWidth());
14253		- */
14254		- if ((mod & SHIFT) == SHIFT)
14255	15049	{
14256		- mouseMode = mouseMode;
14257		- } else
14258		- {
14259		- 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());
14260	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	+// }
14261	15074
	15075	+ targetLookAt.set(manipCamera.lookAt);
	15076	+
14262	15077	//prevX = X = anchorX;
14263	15078	prevY = Y = anchorY + (int) (renderCamera.Distance());
14264	15079	}
..	..	@@ -14266,20 +15081,31 @@
14266	15081	void GoLeft(int mod)
14267	15082	{
14268	15083	MODIFIERS \|= COMMAND;
14269		- /*
	15084	+ /**/
14270	15085	if((mod&SHIFT) == SHIFT)
14271		- manipCamera.RotatePosition(speed, 0);
	15086	+ manipCamera.Translate(speed, 0, getWidth());
14272	15087	else
14273		- manipCamera.Translate(speed*delta, 0, getWidth());
14274		- */
14275		- if ((mod & SHIFT) == SHIFT)
14276	15088	{
14277		- mouseMode = mouseMode;
14278		- } else
14279		- {
14280		- mouseMode \|= ROTATE;
14281		- } // 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;
14282	15103
	15104	+ //System.err.println("lookAt = " + manipCamera.lookAt);
	15105	+ //System.err.println("location = " + manipCamera.location);
	15106	+
	15107	+ targetLookAt.set(manipCamera.lookAt);
	15108	+
14283	15109	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14284	15110	prevY = Y = anchorY;
14285	15111	}
..	..	@@ -14287,20 +15113,28 @@
14287	15113	void GoRight(int mod)
14288	15114	{
14289	15115	MODIFIERS \|= COMMAND;
14290		- /*
	15116	+ /**/
14291	15117	if((mod&SHIFT) == SHIFT)
14292		- manipCamera.RotatePosition(-speed, 0);
	15118	+ manipCamera.Translate(-speed, 0, getWidth());
14293	15119	else
14294		- manipCamera.Translate(-speed*delta, 0, getWidth());
14295		- */
14296		- if ((mod & SHIFT) == SHIFT)
14297	15120	{
14298		- mouseMode = mouseMode;
14299		- } else
14300		- {
14301		- mouseMode \|= ROTATE;
14302		- } // 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;
14303	15135
	15136	+ targetLookAt.set(manipCamera.lookAt);
	15137	+
14304	15138	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14305	15139	prevY = Y = anchorY;
14306	15140	}
..	..	@@ -14342,14 +15176,16 @@
14342	15176	if (editObj)
14343	15177	{
14344	15178	drag = true;
14345		- ClickInfo info = new ClickInfo();
14346		- info.bounds.setBounds(0, 0,
	15179	+ //ClickInfo info = new ClickInfo();
	15180	+ object.clickInfo.bounds.setBounds(0, 0,
14347	15181	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14348		- info.pane = this;
14349		- info.camera = renderCamera;
14350		- info.x = x;
14351		- info.y = y;
14352		- 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);
14353	15189	} else
14354	15190	{
14355	15191	if (x < startX)
..	..	@@ -14432,6 +15268,11 @@
14432	15268	if ((mouseMode & ZOOM) != 0)
14433	15269	{
14434	15270	//if ((mouseMode & BACKFORTH) != 0)
	15271	+ if ((modifiersex & SHIFT) == SHIFT)
	15272	+ {
	15273	+ ViewAngle(dy);
	15274	+ }
	15275	+ else
14435	15276	if ((mouseMode & VR) != 0)
14436	15277	manipCamera.BackForth(dx, dy, getWidth());
14437	15278	else
..	..	@@ -14498,22 +15339,30 @@
14498	15339	}
14499	15340	}
14500	15341
	15342	+// ClickInfo clickInfo = new ClickInfo();
	15343	+
14501	15344	public void mouseMoved(MouseEvent e)
14502	15345	{
	15346	+//object.editWindow.frame.
	15347	+ setCursor(Cursor.getDefaultCursor());
	15348	+
14503	15349	//System.out.println("mouseMoved: " + e);
14504	15350	if (isRenderer)
14505	15351	return;
14506	15352
14507		- ClickInfo ci = new ClickInfo();
14508		- ci.x = e.getX();
14509		- ci.y = e.getY();
14510		- ci.modifiers = e.getModifiersEx();
14511		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14512		- ci.pane = this;
14513		- 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;
14514	15360	if (!isRenderer)
14515	15361	{
14516		- if (object.editWindow.copy.doEditClick(ci, 0))
	15362	+ //ObjEditor editWindow = object.editWindow;
	15363	+ //Object3D copy = editWindow.copy;
	15364	+ if (object.doEditClick(//clickInfo,
	15365	+ 0))
14517	15366	{
14518	15367	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14519	15368	} else
..	..	@@ -14525,10 +15374,17 @@
14525	15374
14526	15375	public void mouseReleased(MouseEvent e)
14527	15376	{
	15377	+ if (isRenderer && !movingcamera)
	15378	+ {
	15379	+ RigidBody.justclicked = true;
	15380	+ System.out.println("justclicked: " + e);
	15381	+ }
	15382	+
14528	15383	Globals.MOUSEDRAGGED = false;
14529	15384
14530	15385	movingcamera = false;
14531		- X = Y = 0;
	15386	+ X = 0; // getBounds().width/2;
	15387	+ Y = 0; // getBounds().height/2;
14532	15388	//System.out.println("mouseReleased: " + e);
14533	15389	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14534	15390	}
..	..	@@ -14680,8 +15536,10 @@
14680	15536	mouseMode \|= ZOOM;
14681	15537	}
14682	15538
14683		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14684		- 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)
14685	15543	{
14686	15544	mouseMode \|= VR; // BACKFORTH;
14687	15545	}
..	..	@@ -14693,7 +15551,8 @@
14693	15551	{
14694	15552	mouseMode \|= SELECT;
14695	15553	}
14696		- if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	15554	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15555	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14697	15556	{
14698	15557	mouseMode &= ~VR;
14699	15558	mouseMode \|= TRANSLATE;
..	..	@@ -14737,8 +15596,18 @@
14737	15596	float SATPOW = 1; // 2; // 0.5f;
14738	15597	float BRIPOW = 1; // 0.5f; // 0.5f;
14739	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	+
14740	15605	public void keyPressed(int key)
14741	15606	{
	15607	+// Set the blank cursor to the JFrame.
	15608	+//object.editWindow.frame.
	15609	+ setCursor(blankCursor);
	15610	+
14742	15611	if (key >= '0' && key <= '5')
14743	15612	clampbit = (key-'0');
14744	15613
..	..	@@ -14784,7 +15653,8 @@
14784	15653	// break;
14785	15654	case 'T':
14786	15655	CACHETEXTURE ^= true;
14787		- textures.clear();
	15656	+ texturepigment.clear();
	15657	+ texturebump.clear();
14788	15658	// repaint();
14789	15659	break;
14790	15660	case 'Y':
..	..	@@ -14794,8 +15664,8 @@
14794	15664	case 'K':
14795	15665	KOMPACTTEXTURE ^= true;
14796	15666	//textures.clear();
14797		- break;
14798		- case 'P': // Texture Projection macros
	15667	+ // break;
	15668	+ //case 'P': // Texture Projection macros
14799	15669	// SAVETEXTURE ^= true;
14800	15670	macromode = true;
14801	15671	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -14869,7 +15739,9 @@
14869	15739	case 'E' : COMPACT ^= true;
14870	15740	repaint();
14871	15741	break;
14872		- case 'W' : DEBUGHSB ^= true;
	15742	+ case 'W' : // Wide Window (fullscreen)
	15743	+ //DEBUGHSB ^= true;
	15744	+ ObjEditor.theFrame.ToggleFullScreen();
14873	15745	repaint();
14874	15746	break;
14875	15747	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14894,8 +15766,8 @@
14894	15766	RevertCamera();
14895	15767	repaint();
14896	15768	break;
	15769	+ //case 'l':
14897	15770	case 'L':
14898		- case 'l':
14899	15771	if (lightMode)
14900	15772	{
14901	15773	lightMode = false;
..	..	@@ -14914,7 +15786,7 @@
14914	15786	targetLookAt.set(manipCamera.lookAt);
14915	15787	repaint();
14916	15788	break;
14917		- case 'p':
	15789	+ case 'P': // p':
14918	15790	// c'est quoi ca au juste? spherical ^= true;
14919	15791	Skinshader ^= true; programInitialized = false;
14920	15792	repaint();
..	..	@@ -14925,7 +15797,8 @@
14925	15797	break;
14926	15798	case 'm':
14927	15799	{
14928		- PrintMemory();
	15800	+ //PrintMemory();
	15801	+ ToggleImageFlip();
14929	15802	break;
14930	15803	}
14931	15804	case 'M':
..	..	@@ -14952,27 +15825,31 @@
14952	15825	repaint();
14953	15826	break;
14954	15827	case 'O':
14955		- Globals.drawMode = OCCLUSION; // WARNING
14956		- repaint();
14957		- break;
	15828	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
	15829	+ //repaint();
	15830	+ //break;
14958	15831	case 'o':
14959	15832	OCCLUSION_CULLING ^= true;
14960	15833	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14961	15834	break;
14962		- case '0': envyoff ^= true; repaint(); break;
	15835	+ //case '0': envyoff ^= true; repaint(); break;
14963	15836	case '1':
14964	15837	case '2':
14965	15838	case '3':
14966	15839	case '4':
14967	15840	case '5':
14968		- newenvy = Character.getNumericValue(key);
14969		- repaint();
14970		- break;
14971	15841	case '6':
14972	15842	case '7':
14973	15843	case '8':
14974	15844	case '9':
14975		- 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	+ }
14976	15853	repaint();
14977	15854	break;
14978	15855	case '!':
..	..	@@ -15038,11 +15915,25 @@
15038	15915	case '_':
15039	15916	kompactbit = 5;
15040	15917	break;
15041		- case '+':
15042		- kompactbit = 6;
15043		- break;
	15918	+// case '+':
	15919	+// kompactbit = 6;
	15920	+// break;
15044	15921	case ' ':
	15922	+ capsLocked ^= true;
	15923	+ repaint();
	15924	+ break;
	15925	+ case 'l':
15045	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	+
15046	15937	Globals.lighttouched = true;
15047	15938	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15048	15939	targetLookAt.set(manipCamera.lookAt);
..	..	@@ -15050,8 +15941,13 @@
15050	15941	break;
15051	15942	//case '`' :
15052	15943	case ESC:
	15944	+ if (FULLSCREEN)
	15945	+ object.editWindow.ToggleFullScreen();
	15946	+ break;
	15947	+ case 'p':
15053	15948	RENDERPROGRAM += 1;
15054	15949	RENDERPROGRAM %= 3;
	15950	+
15055	15951	repaint();
15056	15952	break;
15057	15953	case 'Z':
..	..	@@ -15087,12 +15983,17 @@
15087	15983	case ENTER:
15088	15984	// object.editWindow.ScreenFit(); // Edit();
15089	15985	ToggleLive();
	15986	+ if (capsLocked)
	15987	+ {
	15988	+ Globals.WALK ^= true;
	15989	+ }
15090	15990	break;
15091	15991	case DELETE:
15092	15992	ClearSelection();
15093	15993	break;
15094		- /*
15095	15994	case '+':
	15995	+
	15996	+ /*
15096	15997	//fontsize += 1;
15097	15998	bbzoom *= 2;
15098	15999	repaint();
..	..	@@ -15109,30 +16010,36 @@
15109	16010	case '=':
15110	16011	IncDepth();
15111	16012	//fontsize += 1;
15112		- object.editWindow.refreshContents(true);
	16013	+ object.GetWindow().refreshContents(true);
15113	16014	maskbit = 6;
15114	16015	break;
15115	16016	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15116	16017	DecDepth();
15117	16018	maskbit = 5;
15118	16019	//if(fontsize > 1) fontsize -= 1;
15119		- if (object.editWindow == null)
15120		- new Exception().printStackTrace();
15121		- else
15122		- object.editWindow.refreshContents(true);
	16020	+// if (object.editWindow == null)
	16021	+// new Exception().printStackTrace();
	16022	+// else
	16023	+ object.GetWindow().refreshContents(true);
15123	16024	break;
15124	16025	case '{':
15125		- manipCamera.shaper_fovy /= 1.1;
	16026	+ double factor = 1.1;
	16027	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16028	+ manipCamera.shaper_fovy /= factor;
15126	16029	System.out.println("FOV = " + manipCamera.shaper_fovy);
15127	16030	repaint();
15128	16031	break;
15129	16032	case '}':
15130		- manipCamera.shaper_fovy *= 1.1;
	16033	+ factor = 1.1;
	16034	+ if (manipCamera.shaper_fovy * factor < 150)
	16035	+ manipCamera.shaper_fovy *= factor;
15131	16036	System.out.println("FOV = " + manipCamera.shaper_fovy);
15132	16037	repaint();
15133	16038	break;
15134	16039	case '[':
15135		- manipCamera.shaper_fovy /= 1.01;
	16040	+ factor = 1.01;
	16041	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16042	+ manipCamera.shaper_fovy /= factor;
15136	16043	if (false) //manipCamera.hAspect == 0)
15137	16044	{
15138	16045	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15148,7 +16055,9 @@
15148	16055	break;
15149	16056	case ']':
15150	16057	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15151		- manipCamera.shaper_fovy *= 1.01;
	16058	+ factor = 1.01;
	16059	+ if (manipCamera.shaper_fovy * factor < 150)
	16060	+ manipCamera.shaper_fovy *= factor;
15152	16061	if (false) //manipCamera.hAspect == 0)
15153	16062	{
15154	16063	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15186,98 +16095,113 @@
15186	16095	}
15187	16096	}
15188	16097
	16098	+ boolean keys[] = new boolean[256];
	16099	+ int speedkey[] = new int[256];
	16100	+ int modifiers = 0;
	16101	+
15189	16102	public void processKeyEvent(KeyEvent e)
15190	16103	{
15191	16104	switch (e.getID())
15192	16105	{
15193	16106	case KeyEvent.KEY_PRESSED:
15194		- if (!autorepeat)
15195		- {
15196		- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15197		- keyPressed(e.getKeyChar(), e.getModifiersEx());
15198		- }
15199		- if (manipCamera == lightCamera)
15200		- {
15201		- switch (e.getKeyCode())
15202		- {
15203		- case DOWN_ARROW:
15204		- lightCamera.DECAL /= 2;
15205		- repaint();
15206		- break;
15207		- case UP_ARROW:
15208		- lightCamera.DECAL *= 2;
15209		- repaint();
15210		- break;
15211		- case LEFT_ARROW:
15212		- lightCamera.SCALE /= 2;
15213		- repaint();
15214		- break;
15215		- case RIGHT_ARROW:
15216		- lightCamera.SCALE *= 2;
15217		- repaint();
15218		- break;
15219		- default:
15220		- break;
15221		- }
15222		-
15223		- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15224		- } else
15225		- {
15226		- if (true) // !autorepeat)
15227		- {
15228		- boolean reset = true;
15229		-
15230		- switch (e.getKeyCode())
15231		- {
15232		- case DOWN_ARROW:
15233		- GoDown(e.getModifiersEx());
15234		- repaint();
15235		- break;
15236		- case UP_ARROW:
15237		- GoUp(e.getModifiersEx());
15238		- repaint();
15239		- break;
15240		- case LEFT_ARROW:
15241		- GoLeft(e.getModifiersEx());
15242		- repaint();
15243		- break;
15244		- case RIGHT_ARROW:
15245		- GoRight(e.getModifiersEx());
15246		- repaint();
15247		- break;
15248		- default:
15249		- reset = false;
15250		- break;
15251		- }
15252		-
15253		- if (reset)
15254		- {
15255		- autorepeat = true;
15256		-
15257		- targetLookAt.set(manipCamera.lookAt);
15258		- }
15259		- }
15260		- }
	16107	+ keys[e.getKeyCode()] = true;
	16108	+ modifiers = e.getModifiersEx();
	16109	+ keyPressed(e.getKeyChar(), modifiers);
	16110	+ //Globals.theRenderer.keyPressed(e.getKeyChar());
	16111	+ repaint();
15261	16112	break;
15262		- case KeyEvent.KEY_TYPED:
15263		- 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;
15264	16183	case KeyEvent.KEY_RELEASED:
15265		- {
15266		- switch (e.getKeyCode())
15267		- {
15268		- case DOWN_ARROW:
15269		- case UP_ARROW:
15270		- case LEFT_ARROW:
15271		- case RIGHT_ARROW:
15272		- MODIFIERS &= ~COMMAND;
15273		- autorepeat = false;
15274		- break;
15275		- default:
15276		- break;
15277		- }
	16184	+ keys[e.getKeyCode()] = false;
	16185	+ modifiers = e.getModifiersEx();
15278	16186	keyReleased(e.getKeyChar(), e.getModifiersEx());
	16187	+ repaint();
15279	16188	break;
15280		- }
	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	+// }
15281	16205	default:
15282	16206	break;
15283	16207	}
..	..	@@ -15343,7 +16267,7 @@
15343	16267	}
15344	16268	*/
15345	16269
15346		- object.editWindow.EditSelection();
	16270	+ object.GetWindow().EditSelection(false);
15347	16271	}
15348	16272
15349	16273	void SelectParent()
..	..	@@ -15360,10 +16284,10 @@
15360	16284	{
15361	16285	//selectees.remove(i);
15362	16286	System.out.println("select parent of " + elem);
15363		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	16287	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15364	16288	} else
15365	16289	{
15366		- group.editWindow.Select(elem.GetTreePath(), first, true);
	16290	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15367	16291	}
15368	16292
15369	16293	first = false;
..	..	@@ -15405,12 +16329,12 @@
15405	16329	for (int j = 0; j < group.children.size(); j++)
15406	16330	{
15407	16331	elem = (Object3D) group.children.elementAt(j);
15408		- object.editWindow.Select(elem.GetTreePath(), first, true);
	16332	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15409	16333	first = false;
15410	16334	}
15411	16335	} else
15412	16336	{
15413		- object.editWindow.Select(elem.GetTreePath(), first, true);
	16337	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15414	16338	}
15415	16339
15416	16340	first = false;
..	..	@@ -15421,21 +16345,21 @@
15421	16345	{
15422	16346	//Composite group = (Composite) object;
15423	16347	Object3D group = object;
15424		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	16348	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15425	16349	}
15426	16350
15427	16351	void ResetTransform(int mask)
15428	16352	{
15429	16353	//Composite group = (Composite) object;
15430	16354	Object3D group = object;
15431		- group.editWindow.ResetTransform(mask);
	16355	+ group.GetWindow().ResetTransform(mask);
15432	16356	}
15433	16357
15434	16358	void FlipTransform()
15435	16359	{
15436	16360	//Composite group = (Composite) object;
15437	16361	Object3D group = object;
15438		- group.editWindow.FlipTransform();
	16362	+ group.GetWindow().FlipTransform();
15439	16363	// group.editWindow.ReduceMesh(true);
15440	16364	}
15441	16365
..	..	@@ -15443,7 +16367,7 @@
15443	16367	{
15444	16368	//Composite group = (Composite) object;
15445	16369	Object3D group = object;
15446		- group.editWindow.PrintMemory();
	16370	+ group.GetWindow().PrintMemory();
15447	16371	// group.editWindow.ReduceMesh(true);
15448	16372	}
15449	16373
..	..	@@ -15451,7 +16375,7 @@
15451	16375	{
15452	16376	//Composite group = (Composite) object;
15453	16377	Object3D group = object;
15454		- group.editWindow.ResetCentroid();
	16378	+ group.GetWindow().ResetCentroid();
15455	16379	}
15456	16380
15457	16381	void IncDepth()
..	..	@@ -15533,8 +16457,6 @@
15533	16457
15534	16458	int width = getBounds().width;
15535	16459	int height = getBounds().height;
15536		- ClickInfo info = new ClickInfo();
15537		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15538	16460	//Image img = CreateImage(width, height);
15539	16461	//System.out.println("width = " + width + "; height = " + height + "\n");
15540	16462
..	..	@@ -15611,48 +16533,77 @@
15611	16533	}
15612	16534	if (object != null && !hasMarquee)
15613	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	+
15614	16542	if (isRenderer)
15615	16543	{
15616		- info.flags++;
	16544	+ object.clickInfo.flags++;
15617	16545	double frameAspect = (double) width / (double) height;
15618	16546	if (frameAspect > renderCamera.aspect)
15619	16547	{
15620	16548	int desired = (int) ((double) height * renderCamera.aspect);
15621		- info.bounds.width -= width - desired;
15622		- info.bounds.x += (width - desired) / 2;
	16549	+ object.clickInfo.bounds.width -= width - desired;
	16550	+ object.clickInfo.bounds.x += (width - desired) / 2;
15623	16551	} else
15624	16552	{
15625	16553	int desired = (int) ((double) width / renderCamera.aspect);
15626		- info.bounds.height -= height - desired;
15627		- info.bounds.y += (height - desired) / 2;
	16554	+ object.clickInfo.bounds.height -= height - desired;
	16555	+ object.clickInfo.bounds.y += (height - desired) / 2;
15628	16556	}
15629	16557	}
15630		- info.g = gr;
15631		- info.camera = renderCamera;
	16558	+
	16559	+ object.clickInfo.g = gr;
	16560	+ object.clickInfo.camera = renderCamera;
15632	16561	/*
15633	16562	// Memory intensive (brep.verticescopy)
15634	16563	if (!(object instanceof Composite))
15635	16564	object.draw(info, 0, false); // SLOW :
15636	16565	*/
15637		- if (!isRenderer)
	16566	+ if (!isRenderer) // && drag)
15638	16567	{
15639		- object.drawEditHandles(info, 0);
15640		-
15641		- 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)
15642	16571	{
15643		- 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)
15644	16578	{
15645		- case Object3D.hitCenter: gr.setColor(Color.pink);
15646		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15647		- break;
15648		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15649		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15650		- break;
15651		- case Object3D.hitScale: gr.setColor(Color.cyan);
15652		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15653		- 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;
15654	16586	}
15655		-
	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	+ }
15656	16607	}
15657	16608	}
15658	16609	}
..	..	@@ -15667,7 +16618,7 @@
15667	16618	if (hasMarquee)
15668	16619	{
15669	16620	gr.setXORMode(Color.white);
15670		- gr.setColor(Color.red);
	16621	+ gr.setColor(Color.white);
15671	16622	if (!firstime)
15672	16623	{
15673	16624	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -15826,7 +16777,8 @@
15826	16777
15827	16778	public boolean mouseDrag(Event evt, int x, int y)
15828	16779	{
15829		- //System.out.println("mouseDrag: " + evt);
	16780	+ System.out.println("mouseDrag: " + evt);
	16781	+ System.exit(0);
15830	16782	/*
15831	16783	drag = true;
15832	16784	//System.out.println("Mouse DRAG");
..	..	@@ -15945,6 +16897,7 @@
15945	16897	public boolean mouseUp(Event evt, int x, int y)
15946	16898	{
15947	16899	System.out.println("mouseUp: " + evt);
	16900	+ System.exit(0);
15948	16901	/*
15949	16902	locked = false;
15950	16903	if (isRenderer)
..	..	@@ -16134,6 +17087,8 @@
16134	17087	private /static/ boolean firstime;
16135	17088	private /static/ cVector newView = new cVector();
16136	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"};
16137	17092	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16138	17093	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16139	17094	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16146,36 +17101,74 @@
16146	17101	{
16147	17102	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16148	17103
	17104	+ int usedsuf = 0;
	17105	+
16149	17106	for (int i = 0; i < suffixes.length; i++)
16150	17107	{
16151		- String resourceName = basename + suffixes[i] + "." + suffix;
16152		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16153		- mipmapped,
16154		- FileUtil.getFileSuffix(resourceName));
16155		- if (data == null)
	17108	+ String[] suffixe = suffixes;
	17109	+ String[] fallback = suffixes2;
	17110	+ String[] fallfallback = suffixes3;
	17111	+
	17112	+ for (int c=usedsuf; --c>=0;)
16156	17113	{
16157		- throw new IOException("Unable to load texture " + resourceName);
	17114	+// String[] temp = suffixe;
	17115	+// suffixe = fallback;
	17116	+// fallback = fallfallback;
	17117	+// fallfallback = temp;
16158	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	+
16159	17147	//System.out.println("Target = " + targets[i]);
16160	17148	cubemap.updateImage(data, targets[i]);
16161	17149	}
16162	17150
16163	17151	return cubemap;
16164	17152	}
	17153	+
16165	17154	int bigsphere = -1;
16166	17155
16167	17156	float BGcolor = 0.5f;
16168	17157
16169		- private void DrawSkyBox(GL gl)
	17158	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	17159	+
	17160	+ private void DrawSkyBox(GL gl, float ratio)
16170	17161	{
16171		- if (envyoff \|\| cubemap == null)
	17162	+ if (//envyoff \|\|
	17163	+ WIREFRAME \|\|
	17164	+ cubemap == null)
16172	17165	{
16173	17166	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16174	17167	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
16175	17168	return;
16176	17169	}
16177	17170
16178		- if (WIREFRAME)
	17171	+ //if (WIREFRAME)
16179	17172	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
16180	17173
16181	17174	gl.glDisable(gl.GL_CULL_FACE);
..	..	@@ -16183,7 +17176,17 @@
16183	17176	// Compensates for ExaminerViewer's modification of modelview matrix
16184	17177	gl.glMatrixMode(GL.GL_MODELVIEW);
16185	17178	gl.glLoadIdentity();
	17179	+ gl.glScalef(1,ratio,1);
16186	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	+
16187	17190	//gl.glActiveTexture(GL.GL_TEXTURE1);
16188	17191	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16189	17192
..	..	@@ -16215,6 +17218,7 @@
16215	17218	{
16216	17219	gl.glScalef(1.0f, -1.0f, 1.0f);
16217	17220	}
	17221	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16218	17222	gl.glMultMatrixd(viewrot_1, 0);
16219	17223	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16220	17224	//viewer.updateInverseRotation(gl);
..	..	@@ -16255,7 +17259,8 @@
16255	17259	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16256	17260
16257	17261	cubemap.disable();
16258		- ////cubemap.unbind();
	17262	+ //cubemap.dispose();
	17263	+
16259	17264	if (CULLFACE)
16260	17265	{
16261	17266	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16263,6 +17268,8 @@
16263	17268
16264	17269	if (WIREFRAME)
16265	17270	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_LINE);
	17271	+ else
	17272	+ gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
16266	17273	}
16267	17274
16268	17275	private void DrawChecker(GL gl)
..	..	@@ -16311,7 +17318,7 @@
16311	17318	gl.glScalef(1.0f, -1.0f, 1.0f);
16312	17319	}
16313	17320
16314		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	17321	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16315	17322
16316	17323	float step = 2; // 0.1666f; //0.25f;
16317	17324	float stepv = 2; // step * 1652 / 998;
..	..	@@ -16355,16 +17362,16 @@
16355	17362	cStatic.objectstack[materialdepth++] = checker;
16356	17363	//System.out.println("material " + material);
16357	17364	//Applet3D.tracein(this, selected);
16358		- vector2buffer = checker.projectedVertices;
	17365	+ //vector2buffer = checker.projectedVertices;
16359	17366
16360	17367	//checker.GetMaterial().Draw(this, false); // true);
16361		- DrawMaterial(checker.GetMaterial(), false); // true);
	17368	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16362	17369
16363	17370	materialdepth -= 1;
16364	17371	if (materialdepth > 0)
16365	17372	{
16366		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16367		- 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);
16368	17375	}
16369	17376	//checker.GetMaterial().opacity = 1f;
16370	17377	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16450,6 +17457,14 @@
16450	17457	}
16451	17458	}
16452	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	+
16453	17468	class SelectBuffer implements GLEventListener
16454	17469	{
16455	17470
..	..	@@ -16465,7 +17480,7 @@
16465	17480	//new Exception().printStackTrace();
16466	17481	System.out.println("select buffer init");
16467	17482	// Use debug pipeline
16468		- drawable.setGL(new DebugGL(drawable.getGL()));
	17483	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16469	17484
16470	17485	GL gl = drawable.getGL();
16471	17486
..	..	@@ -16529,6 +17544,17 @@
16529	17544
16530	17545	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16531	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	+
16532	17558	//int tmp = selection_view;
16533	17559	//selection_view = -1;
16534	17560	int temp = DrawMode();
..	..	@@ -16540,6 +17566,17 @@
16540	17566	// temp = DEFAULT; // patch for selection debug
16541	17567	Globals.drawMode = temp; // WARNING
16542	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	+
16543	17580	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16544	17581
16545	17582	// trying different ways of getting the depth info over
..	..	@@ -16570,7 +17607,7 @@
16570	17607
16571	17608	float depth = depths[y * TEX_SIZE + x];
16572	17609
16573		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17610	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
16574	17611	{
16575	17612	pointselection = false;
16576	17613
..	..	@@ -16587,6 +17624,8 @@
16587	17624	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16588	17625	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16589	17626	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17627	+
	17628	+ CreateSelectedPoint();
16590	17629
16591	17630	// Will fit the mesh !!!
16592	17631	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16641,29 +17680,31 @@
16641	17680	}
16642	17681
16643	17682	if (!movingcamera && !PAINTMODE)
16644		- object.editWindow.ScreenFitPoint(); // fev 2014
	17683	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16645	17684
16646		- 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)
16647	17686	{
16648		- 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);
16649	17688
16650		- Object3D group = new Object3D("inst" + paintcount++);
	17689	+ if (object.GetWindow().copy.selection.Size() > 0)
	17690	+ {
	17691	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16651	17692
16652		- group.CreateMaterial(); // use a void leaf to select instances
16653		-
16654		- group.add(paintobj); // link
16655		-
16656		- object.editWindow.SnapObject(group);
16657		-
16658		- Object3D folder = object.editWindow.copy;
16659		-
16660		- if (object.editWindow.copy.selection.Size() > 0)
16661		- folder = object.editWindow.copy.selection.elementAt(0);
16662		-
16663		- folder.add(group);
16664		-
16665		- object.editWindow.ResetModel();
16666		- 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	+ }
16667	17708	}
16668	17709	else
16669	17710	paintcount = 0;
..	..	@@ -16702,6 +17743,11 @@
16702	17743	//System.out.println("objects[color] = " + objects[color]);
16703	17744	//objects[color].Select();
16704	17745	indexcount = 0;
	17746	+ ObjEditor window = object.GetWindow();
	17747	+ if (window != null && deselect)
	17748	+ {
	17749	+ window.Select(null, deselect, true);
	17750	+ }
16705	17751	object.Select(color, deselect);
16706	17752	}
16707	17753
..	..	@@ -16752,6 +17798,7 @@
16752	17798
16753	17799	public void init(GLAutoDrawable drawable)
16754	17800	{
	17801	+ if (Globals.DEBUG)
16755	17802	System.out.println("shadow buffer init");
16756	17803
16757	17804	GL gl = drawable.getGL();
..	..	@@ -16980,10 +18027,14 @@
16980	18027	gl.glFlush();
16981	18028
16982	18029	/**/
16983		- 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);
16984	18031
16985		- float[] pixels = occlusionsizebuffer.array();
	18032	+ float[] depths = occlusiondepthbuffer.array();
16986	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	+
16987	18038	double r = 0, g = 0, b = 0;
16988	18039
16989	18040	double count = 0;
..	..	@@ -16994,7 +18045,7 @@
16994	18045
16995	18046	double FACTOR = 1;
16996	18047
16997		- for (int i = 0; i < pixels.length; i++)
	18048	+ for (int i = 0; i < depths.length; i++)
16998	18049	{
16999	18050	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17000	18051	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17077,7 +18128,7 @@
17077	18128
17078	18129	double scale = ray.z; // 1; // cos
17079	18130
17080		- float depth = pixels[newindex];
	18131	+ float depth = depths[newindex];
17081	18132
17082	18133	/*
17083	18134	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17220,6 +18271,11 @@
17220	18271	static boolean DEBUG_SELECTION = false;
17221	18272	boolean OCCLUSION_CULLING = false; //true;
17222	18273	public boolean lightMode = false;
	18274	+
	18275	+ private boolean keepshadow;
	18276	+
	18277	+ static public boolean capsLocked = false; // VR
	18278	+
17223	18279	static public int indexcount = 0;
17224	18280	/static/ cColor vertexOcclusion = new cColor();
17225	18281	//private int selection_view = -1;
..	..	@@ -17227,23 +18283,15 @@
17227	18283	int AAbuffersize = 0;
17228	18284
17229	18285	//double[] selectedpoint = new double[3];
17230		- static Superellipsoid selectedpoint = new Superellipsoid();
	18286	+ static Superellipsoid selectedpoint;
17231	18287	static Sphere previousselectedpoint = null;
17232		- static Sphere debugpointG = new Sphere();
17233		- static Sphere debugpointP = new Sphere();
17234		- static Sphere debugpointC = new Sphere();
17235		- static Sphere debugpointR = new Sphere();
	18288	+ static Sphere debugpointG;
	18289	+ static Sphere debugpointP;
	18290	+ static Sphere debugpointC;
	18291	+ static Sphere debugpointR;
17236	18292
17237	18293	static Sphere debugpoints[] = new Sphere[8];
17238	18294
17239		- static
17240		- {
17241		- for (int i=0; i<8; i++)
17242		- {
17243		- debugpoints[i] = new Sphere();
17244		- }
17245		- }
17246		-
17247	18295	static void InitPoints(float radius)
17248	18296	{
17249	18297	for (int i=0; i<8; i++)
..	..	@@ -17282,11 +18330,14 @@
17282	18330	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17283	18331	static IntBuffer bigAAbuffer;
17284	18332	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17285		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	18333	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17286	18334	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17287	18335	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17288	18336	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17289		- 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	+
17290	18341	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17291	18342	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17292	18343	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();