~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.*;
..	..	@@ -110,7 +111,11 @@
110	111	//private Mat4f spotlightTransform = new Mat4f();
111	112	//private Mat4f spotlightInverseTransform = new Mat4f();
112	113	static GLContext glcontext = null;
113		- /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	+
114	119	boolean reverseUP = false;
115	120	static boolean frozen = false;
116	121	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -130,7 +135,7 @@
130	135	static boolean ZOOMBOXMODE = false;
131	136	static boolean BOXMODE = false;
132	137	static boolean IMAGEFLIP = false;
133		-static boolean SMOOTHFOCUS = false;
	138	+static boolean SMOOTHFOCUS = true; // false;
134	139	static boolean SPEAKERMOCAP = true; // jan 2014 false;
135	140	static boolean SPEAKERCAMERA = false;
136	141	static boolean SPEAKERFOCUS = false;
..	..	@@ -164,16 +169,16 @@
164	169
165	170
166	171	// OPTIONS
167		- boolean Skinshader = true;
	172	+ boolean Skinshader = false; // true;
168	173	boolean cameraLight = false;
169	174	boolean UVdebug = false;
170	175	boolean Udebug = false;
171	176	boolean Vdebug = false;
172	177	boolean NORMALdebug = false;
173		- static boolean doublesided = false; // true; // reversed normals are awful for conformance
	178	+ static boolean doublesided = true; // false; // reversed normals are awful for conformance
174	179	boolean anisotropy = true;
175	180	boolean softshadow = true; // slower but better false;
176		- boolean opacityhalo = false;
	181	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
177	182
178	183	boolean macromode = false;
179	184
..	..	@@ -187,6 +192,19 @@
187	192	}
188	193
189	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	+ }
190	208
191	209	void SetAsGLRenderer(boolean b)
192	210	{
..	..	@@ -204,9 +222,10 @@
204	222	cameras = new Camera[2];
205	223	targetLookAts = new cVector[2];
206	224
207		- SetCamera(cam);
	225	+ SetCamera(cam, true);
208	226
209		- SetLight(new Camera(new cVector(10, 10, -20)));
	227	+ // Warning: not used.
	228	+ //SetLight(new Camera(new cVector(15, 10, -20)));
210	229
211	230	object = o;
212	231
..	..	@@ -524,7 +543,8 @@
524	543	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
525	544	LA.vecCross(obj.v0, obj.v1, obj.v2);
526	545	LA.vecNormalize(obj.v2);
527		- 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);
528	548	}
529	549
530	550	// P
..	..	@@ -546,7 +566,7 @@
546	566	y += ny * obj.NORMALPUSH;
547	567	z += nz * obj.NORMALPUSH;
548	568
549		- gl.glNormal3f(nx, ny, nz);
	569	+ SetGLNormal(gl, nx, ny, nz);
550	570	}
551	571	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
552	572	SetColor(obj, pv);
..	..	@@ -578,7 +598,7 @@
578	598	y += ny * obj.NORMALPUSH;
579	599	z += nz * obj.NORMALPUSH;
580	600
581		- gl.glNormal3f(nx, ny, nz);
	601	+ SetGLNormal(gl, nx, ny, nz);
582	602	}
583	603	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
584	604	// boolean locked = false;
..	..	@@ -626,7 +646,7 @@
626	646	y += ny * obj.NORMALPUSH;
627	647	z += nz * obj.NORMALPUSH;
628	648
629		- gl.glNormal3f(nx, ny, nz);
	649	+ SetGLNormal(gl, nx, ny, nz);
630	650	}
631	651
632	652	// if ((dot&4) == 0)
..	..	@@ -862,7 +882,7 @@
862	882	//// tris.postdraw(this);
863	883	}
864	884
865		- static Camera localcamera = new Camera();
	885	+ static Camera localAOcamera = new Camera();
866	886	static cVector from = new cVector();
867	887	static cVector to = new cVector();
868	888
..	..	@@ -871,7 +891,7 @@
871	891	CameraPane cp = this;
872	892
873	893	Camera keep = cp.RenderCamera();
874		- cp.renderCamera = localcamera;
	894	+ cp.renderCamera = localAOcamera;
875	895
876	896	if (br.trimmed)
877	897	{
..	..	@@ -889,7 +909,7 @@
889	909	br.positions[i3 + 2] + br.normals[i3 + 2]);
890	910	LA.xformPos(from, transform, from);
891	911	LA.xformPos(to, transform, to); // RIGID ONLY
892		- localcamera.setAim(from, to);
	912	+ localAOcamera.setAim(from, to);
893	913
894	914	CameraPane.occlusionbuffer.display();
895	915
..	..	@@ -923,7 +943,7 @@
923	943	to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
924	944	LA.xformPos(from, transform, from);
925	945	LA.xformPos(to, transform, to); // RIGID ONLY
926		- localcamera.setAim(from, to);
	946	+ localAOcamera.setAim(from, to);
927	947
928	948	CameraPane.occlusionbuffer.display();
929	949
..	..	@@ -1232,10 +1252,10 @@
1232	1252	{
1233	1253	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1234	1254	{
1235		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1255	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1236	1256	} else
1237	1257	{
1238		- gl.glNormal3f(0, 0, 1);
	1258	+ SetGLNormal(gl, 0, 0, 1);
1239	1259	}
1240	1260
1241	1261	if (c != null)
..	..	@@ -1259,10 +1279,10 @@
1259	1279	{
1260	1280	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1261	1281	{
1262		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1282	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1263	1283	} else
1264	1284	{
1265		- gl.glNormal3f(0, 0, 1);
	1285	+ SetGLNormal(gl, 0, 0, 1);
1266	1286	}
1267	1287	if (c != null)
1268	1288	{
..	..	@@ -1287,10 +1307,10 @@
1287	1307	{
1288	1308	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1289	1309	{
1290		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1310	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1291	1311	} else
1292	1312	{
1293		- gl.glNormal3f(0, 0, 1);
	1313	+ SetGLNormal(gl, 0, 0, 1);
1294	1314	}
1295	1315	if (c != null)
1296	1316	{
..	..	@@ -1472,7 +1492,7 @@
1472	1492	{
1473	1493	if (!selectmode)
1474	1494	{
1475		- 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);
1476	1496	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1477	1497
1478	1498	if (flipV)
..	..	@@ -1484,6 +1504,8 @@
1484	1504	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1485	1505	}
1486	1506
	1507	+ float[] colorV = new float[4];
	1508	+
1487	1509	void SetColor(Object3D obj, Vertex p0)
1488	1510	{
1489	1511	CameraPane display = this;
..	..	@@ -1551,8 +1573,6 @@
1551	1573	{
1552	1574	return;
1553	1575	}
1554		-
1555		- float[] colorV = new float[3];
1556	1576
1557	1577	if (false) // marked)
1558	1578	{
..	..	@@ -1801,7 +1821,7 @@
1801	1821
1802	1822	display.modelParams7[0] = 0;
1803	1823	display.modelParams7[1] = 1000;
1804		- display.modelParams7[2] = 0;
	1824	+ display.modelParams7[2] = material.parallax;
1805	1825	display.modelParams7[3] = 0;
1806	1826
1807	1827	//display.modelParams6[0] = 100; // criss de bug de bump
..	..	@@ -2034,9 +2054,9 @@
2034	2054	switch(viewcode)
2035	2055	{
2036	2056	case 0: return "main";
2037		- case 1: return "one";
2038		- case 2: return "two";
2039		- case 3: return "three";
	2057	+ case 1: return "Red";
	2058	+ case 2: return "Green";
	2059	+ case 3: return "Blue";
2040	2060	case 4: return "light";
2041	2061	}
2042	2062
..	..	@@ -2045,7 +2065,7 @@
2045	2065
2046	2066	static int camerachangeframe;
2047	2067
2048		- public boolean SetCamera(Camera cam)
	2068	+ public boolean SetCamera(Camera cam, boolean set)
2049	2069	{
2050	2070	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
2051	2071	// return false;
..	..	@@ -2063,7 +2083,8 @@
2063	2083
2064	2084	camerachangeframe = Globals.framecount;
2065	2085
2066		- cam.hAspect = -1; // Read only
	2086	+ if (cam != null)
	2087	+ cam.hAspect = -1; // Read only
2067	2088
2068	2089	cameras[0] = cam;
2069	2090	targetLookAts[0] = new cVector(cam.lookAt);
..	..	@@ -2073,11 +2094,14 @@
2073	2094	{
2074	2095	cameras[i] = new Camera(cam.viewCode);
2075	2096	}
2076		-
2077		- cameras[i].setAim(cam.location, cam.lookAt);
2078		- cameras[i].shaper_fovy = cam.shaper_fovy;
2079		- cameras[i].UP.set(cam.UP);
2080		- 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	+ }
2081	2105	}
2082	2106	cameracount = 0;
2083	2107	targetLookAt = targetLookAts[cameracount];
..	..	@@ -2086,7 +2110,7 @@
2086	2110	// Start with free camera
2087	2111	SwitchCameras(true);
2088	2112
2089		- pingthread.jump = true; // optional?
	2113	+// pingthread.jump = true; // optional?
2090	2114
2091	2115	if (TRACKONCE)
2092	2116	{
..	..	@@ -2273,18 +2297,6 @@
2273	2297	public void ToggleTrack()
2274	2298	{
2275	2299	TRACK ^= true;
2276		- if (TRACK)
2277		- {
2278		- if (object.selection != null &&
2279		- object.selection.size() > 0 &&
2280		- object.selection.elementAt(0) != null &&
2281		- !(object.selection.elementAt(0) instanceof Camera) &&
2282		- !(object.selection.elementAt(0) instanceof ScriptNode))
2283		- {
2284		- trackedobject = object.selection.elementAt(0);
2285		- repaint();
2286		- }
2287		- }
2288	2300
2289	2301	repaint();
2290	2302	}
..	..	@@ -2376,7 +2388,8 @@
2376	2388	{
2377	2389	//System.out.println("PROTECTION = " + cam.hAspect);
2378	2390	//assert (cam.hAspect == 0);
2379		- cam.hAspect = 0;
	2391	+ if (cam != null)
	2392	+ cam.hAspect = 0;
2380	2393	lightCamera = cam;
2381	2394	}
2382	2395
..	..	@@ -2457,6 +2470,18 @@
2457	2470	return CreateBim(bytes, width, height);
2458	2471	}
2459	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	+
2460	2485	/**/
2461	2486	class CacheTexture
2462	2487	{
..	..	@@ -2499,7 +2524,7 @@
2499	2524	com.sun.opengl.util.texture.TextureIO.newTextureData(
2500	2525	getClass().getClassLoader().getResourceAsStream(name),
2501	2526	true,
2502		- com.sun.opengl.util.texture.TextureIO.PNG);
	2527	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2503	2528	} catch (java.io.IOException e)
2504	2529	{
2505	2530	throw new javax.media.opengl.GLException(e);
..	..	@@ -3565,6 +3590,8 @@
3565	3590	};
3566	3591	/**/
3567	3592
	3593	+ static Object3D lastObject;
	3594	+
3568	3595	//com.sun.opengl.util.texture.Texture
3569	3596	TextureData
3570	3597	GetFileTexture(String name, boolean bump, int resolution)
..	..	@@ -3601,6 +3628,8 @@
3601	3628	// return null;
3602	3629	//if (i == 2)
3603	3630	// return null;
	3631	+ // TIFF issue sept 2019
	3632	+ System.err.println("lastObject = " + lastObject);
3604	3633	e.printStackTrace();
3605	3634	name = name.split("\\.tif")[0] + ".jpg";
3606	3635	}
..	..	@@ -6933,30 +6962,30 @@
6933	6962	short residu = 0;
6934	6963
6935	6964	// wraparound workarounds
6936		- short fuck = (short) (buffer[i] & 0xFF);
	6965	+ short ww = (short) (buffer[i] & 0xFF);
6937	6966	/*
6938		- residu += (fuck%2);
6939		- if(fuck/2 < 256-residu/2)
	6967	+ residu += (ww%2);
	6968	+ if(ww/2 < 256-residu/2)
6940	6969	{
6941		- fuck = (short)((fuck/2) + residu/2);
	6970	+ ww = (short)((ww/2) + residu/2);
6942	6971	if(residu == 2)
6943	6972	residu = 0;
6944	6973	}
6945	6974	else
6946	6975	{
6947	6976	residu = 0;
6948		- fuck /= 2;
	6977	+ ww /= 2;
6949	6978	}
6950	6979	*/
6951		- if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| fuck >= 254)
	6980	+ if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| ww >= 254)
6952	6981	{
6953		- fuck /= 2;
	6982	+ ww /= 2;
6954	6983	} else
6955	6984	{
6956		- fuck = (short) ((fuck / 2) + fuck % 2);
	6985	+ ww = (short) ((ww / 2) + ww % 2);
6957	6986	}
6958	6987
6959		- buffer[i] = (byte) fuck;
	6988	+ buffer[i] = (byte) ww;
6960	6989	}
6961	6990	//System.out.print(bytes[i] + " ");
6962	6991	//if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
..	..	@@ -8345,7 +8374,7 @@
8345	8374	// else
8346	8375	// if (!texname.startsWith("/"))
8347	8376	// texname = "/Users/nbriere/Textures/" + texname;
8348		- if (!FileExists(texname))
	8377	+ if (!FileExists(texname) && !texname.startsWith("@"))
8349	8378	{
8350	8379	texname = fallbackTextureName;
8351	8380	}
..	..	@@ -8423,7 +8452,16 @@
8423	8452	{
8424	8453	// texturecache = textures.get(texname); // suspicious
8425	8454	if (texturecache == null)
8426		- texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	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);
8427	8465	else
8428	8466	new Exception().printStackTrace();
8429	8467	} else
..	..	@@ -8487,6 +8525,7 @@
8487	8525	texturecache = new CacheTexture(texturedata,resolution);
8488	8526	//texture = GetTexture(tex, bump);
8489	8527	}
	8528	+ }
8490	8529	}
8491	8530	//}
8492	8531	}
..	..	@@ -8601,7 +8640,9 @@
8601	8640	{
8602	8641	tex.bw = texturecache.texturedata.getWidth();
8603	8642	tex.bh = texturecache.texturedata.getHeight();
8604		- tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8643	+ tex.bumpdata = //CompressJPEG(CreateBim(
	8644	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
	8645	+ //, tex.bw, tex.bh), 0.5f);
8605	8646	}
8606	8647	}
8607	8648	}
..	..	@@ -8755,10 +8796,12 @@
8755	8796
8756	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8757	8798	MAXSTACK = temp[0];
8758		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8759	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8760	8802	MAXSTACK = temp[0];
8761		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8762	8805
8763	8806	// Use debug pipeline
8764	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8766,7 +8809,8 @@
8766	8809	gl = drawable.getGL(); //
8767	8810
8768	8811	GL gl3 = getGL();
8769		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8770	8814
8771	8815
8772	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8931,7 +8975,7 @@
8931	8975
8932	8976	if (cubemap == null)
8933	8977	{
8934		- LoadEnvy(5);
	8978	+ //LoadEnvy(1);
8935	8979	}
8936	8980
8937	8981	//cubemap.enable();
..	..	@@ -9207,6 +9251,8 @@
9207	9251
9208	9252	void LoadEnvy(int which)
9209	9253	{
	9254	+ assert(false);
	9255	+
9210	9256	String name;
9211	9257	String ext;
9212	9258
..	..	@@ -9218,37 +9264,58 @@
9218	9264	cubemap = null;
9219	9265	return;
9220	9266	case 1:
9221		- name = "cubemaps/box_";
9222		- ext = "png";
	9267	+ name = "cubemaps/rgb/";
	9268	+ ext = "jpg";
9223	9269	reverseUP = false;
9224	9270	break;
9225	9271	case 2:
9226		- name = "cubemaps/uffizi_";
9227		- ext = "png";
9228		- break; // reverseUP = true; break;
	9272	+ name = "cubemaps/uffizi/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
9229	9276	case 3:
9230		- name = "cubemaps/CloudyHills_";
9231		- ext = "tga";
	9277	+ name = "cubemaps/CloudyHills/";
	9278	+ ext = "jpg";
9232	9279	reverseUP = false;
9233	9280	break;
9234	9281	case 4:
9235		- name = "cubemaps/cornell_";
	9282	+ name = "cubemaps/cornell/";
9236	9283	ext = "png";
9237	9284	reverseUP = false;
9238	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;
9239	9311	default:
9240		- name = "cubemaps/rgb_";
9241		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9312	+ name = "cubemaps/box/";
	9313	+ ext = "png"; /mipmap = true;/
	9314	+ reverseUP = false;
9242	9315	break;
9243	9316	}
9244		-
9245		- try
9246		- {
9247		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9248		- } catch (IOException e)
9249		- {
9250		- throw new RuntimeException(e);
9251		- }
	9317	+
	9318	+ LoadSkybox(name, ext, mipmap);
9252	9319	}
9253	9320
9254	9321	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9280,8 +9347,12 @@
9280	9347	static double[] model = new double[16];
9281	9348	double[] camera2light = new double[16];
9282	9349	double[] light2camera = new double[16];
9283		- int newenvy = -1;
9284		- boolean envyoff = true; // false;
	9350	+
	9351	+ //int newenvy = -1;
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
	9355	+
9285	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9286	9357	//float[] light0 = { 0,0,0 };
9287	9358	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9699,7 +9770,7 @@
9699	9770
9700	9771	if (renderCamera != lightCamera)
9701	9772	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9702		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9773	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9703	9774
9704	9775	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9705	9776
..	..	@@ -9715,7 +9786,7 @@
9715	9786
9716	9787	if (renderCamera != lightCamera)
9717	9788	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9718		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9789	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9719	9790
9720	9791	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9721	9792
..	..	@@ -9761,13 +9832,18 @@
9761	9832	rati = 1 / rati;
9762	9833	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9763	9834	}
9764		- assert (newenvy == -1);
	9835	+
	9836	+ //assert (newenvy == -1);
	9837	+
9765	9838	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9766	9839	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9767		- DrawSkyBox(gl);
	9840	+ DrawSkyBox(gl, (float)rati);
9768	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9769	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9770		- accPerspective(gl, renderCamera.shaper_fovy / ratio,
	9843	+
	9844	+ boolean vr = capsLocked && !lightMode;
	9845	+
	9846	+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
9771	9847	ratio,
9772	9848	//near_plane, far_plane,
9773	9849	renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..	..	@@ -10630,9 +10706,18 @@
10630	10706	static boolean init = false;
10631	10707
10632	10708	double[][] matrix = LA.newMatrix();
	10709	+
	10710	+ // This is to refresh the UI of the material panel.
	10711	+ ObjEditor patchMaterial;
10633	10712
10634	10713	public void display(GLAutoDrawable drawable)
10635	10714	{
	10715	+ if (patchMaterial.patchMaterial)
	10716	+ {
	10717	+ patchMaterial.patchMaterial = false;
	10718	+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
	10719	+ }
	10720	+
10636	10721	if (Grafreed.savesound && Grafreed.hassound)
10637	10722	{
10638	10723	Grafreed.wav.save();
..	..	@@ -10728,6 +10813,112 @@
10728	10813
10729	10814	if (DrawMode() == DEFAULT)
10730	10815	{
	10816	+ if (manipCamera == lightCamera)
	10817	+ {
	10818	+// switch (e.getKeyCode())
	10819	+// {
	10820	+// case DOWN_ARROW:
	10821	+// lightCamera.DECAL /= 2;
	10822	+// repaint();
	10823	+// break;
	10824	+// case UP_ARROW:
	10825	+// lightCamera.DECAL *= 2;
	10826	+// repaint();
	10827	+// break;
	10828	+// case LEFT_ARROW:
	10829	+// lightCamera.SCALE /= 2;
	10830	+// repaint();
	10831	+// break;
	10832	+// case RIGHT_ARROW:
	10833	+// lightCamera.SCALE *= 2;
	10834	+// repaint();
	10835	+// break;
	10836	+// default:
	10837	+// break;
	10838	+ if (keys[DOWN_ARROW])
	10839	+ {
	10840	+ lightCamera.DECAL /= 2;
	10841	+ }
	10842	+
	10843	+ if (keys[UP_ARROW])
	10844	+ {
	10845	+ lightCamera.DECAL *= 2;
	10846	+ }
	10847	+
	10848	+ if (keys[LEFT_ARROW])
	10849	+ {
	10850	+ lightCamera.SCALE /= 2;
	10851	+ }
	10852	+
	10853	+ if (keys[RIGHT_ARROW])
	10854	+ {
	10855	+ lightCamera.SCALE *= 2;
	10856	+ }
	10857	+ }
	10858	+ else
	10859	+ {
	10860	+ //pingthread.mute = true;
	10861	+
	10862	+ boolean keyon = false;
	10863	+
	10864	+ if (keys[DOWN_ARROW])
	10865	+ {
	10866	+ speed = ++speedkey[DOWN_ARROW];
	10867	+ if (speed > 20)
	10868	+ speed = 20;
	10869	+ GoDown(modifiers);
	10870	+ keyon = true;
	10871	+ }
	10872	+ else
	10873	+ speedkey[DOWN_ARROW] = 0;
	10874	+
	10875	+ if (keys[UP_ARROW])
	10876	+ {
	10877	+ speed = ++speedkey[UP_ARROW];
	10878	+ if (speed > 20)
	10879	+ speed = 20;
	10880	+ GoUp(modifiers);
	10881	+ keyon = true;
	10882	+ }
	10883	+ else
	10884	+ speedkey[UP_ARROW] = 0;
	10885	+
	10886	+ if (keys[LEFT_ARROW])
	10887	+ {
	10888	+ speed = ++speedkey[LEFT_ARROW];
	10889	+ if (speed > 20)
	10890	+ speed = 20;
	10891	+ GoLeft(modifiers);
	10892	+ keyon = true;
	10893	+ }
	10894	+ else
	10895	+ speedkey[LEFT_ARROW] = 0;
	10896	+
	10897	+ if (keys[RIGHT_ARROW])
	10898	+ {
	10899	+ speed = ++speedkey[RIGHT_ARROW];
	10900	+ if (speed > 20)
	10901	+ speed = 20;
	10902	+ GoRight(modifiers);
	10903	+ keyon = true;
	10904	+ }
	10905	+ else
	10906	+ speedkey[RIGHT_ARROW] = 0;
	10907	+
	10908	+ if (Globals.WALK && capsLocked)
	10909	+ {
	10910	+ Walk();
	10911	+ keyon = true;
	10912	+ }
	10913	+
	10914	+ if (keyon)
	10915	+ {
	10916	+ repaint();
	10917	+ }
	10918	+
	10919	+ //pingthread.mute = false;
	10920	+ }
	10921	+
10731	10922	currentlydrawing = true;
10732	10923	}
10733	10924
..	..	@@ -10801,7 +10992,7 @@
10801	10992
10802	10993	if (wait)
10803	10994	{
10804		- Sleep(500);
	10995	+ Sleep(200); // blocks everything
10805	10996
10806	10997	wait = false;
10807	10998	}
..	..	@@ -10916,7 +11107,7 @@
10916	11107	// if (parentcam != renderCamera) // not a light
10917	11108	if (cam != lightCamera)
10918	11109	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10919		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	11110	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10920	11111
10921	11112	for (int j = 0; j < 4; j++)
10922	11113	{
..	..	@@ -10931,7 +11122,7 @@
10931	11122	// if (parentcam != renderCamera) // not a light
10932	11123	if (cam != lightCamera)
10933	11124	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10934		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	11125	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10935	11126
10936	11127	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10937	11128
..	..	@@ -11017,13 +11208,43 @@
11017	11208	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
11018	11209	}
11019	11210
11020		- if (newenvy > -1)
	11211	+// if (newenvy > -1)
	11212	+// {
	11213	+// LoadEnvy(newenvy);
	11214	+// }
	11215	+//
	11216	+// newenvy = -1;
	11217	+
	11218	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
11021	11219	{
11022		- LoadEnvy(newenvy);
	11220	+ if (cubemaprgb == null)
	11221	+ {
	11222	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11223	+ }
	11224	+
	11225	+ cubemap = cubemaprgb;
11023	11226	}
11024		-
11025		- newenvy = -1;
11026		-
	11227	+ else
	11228	+ {
	11229	+ if (object.skyboxname != null)
	11230	+ {
	11231	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11232	+ {
	11233	+ if (cubemap != null && cubemap != cubemaprgb)
	11234	+ cubemap.dispose();
	11235	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11236	+ loadedskyboxname = object.skyboxname;
	11237	+ }
	11238	+ }
	11239	+ else
	11240	+ {
	11241	+ cubemapcustom = null;
	11242	+ loadedskyboxname = null;
	11243	+ }
	11244	+
	11245	+ cubemap = cubemapcustom;
	11246	+ }
	11247	+
11027	11248	ratio = ((double) getWidth()) / getHeight();
11028	11249	//System.out.println("ratio = " + ratio);
11029	11250
..	..	@@ -11039,7 +11260,7 @@
11039	11260
11040	11261	if (!IsFrozen() && !ambientOcclusion)
11041	11262	{
11042		- DrawSkyBox(gl);
	11263	+ DrawSkyBox(gl, (float)ratio);
11043	11264	}
11044	11265
11045	11266	//if (selection_view == -1)
..	..	@@ -11222,9 +11443,9 @@
11222	11443
11223	11444	gl.glMatrixMode(GL.GL_MODELVIEW);
11224	11445
11225		-gl.glEnable(gl.GL_POLYGON_SMOOTH);
11226		-gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11227		-gl.glEnable(gl.GL_MULTISAMPLE);
	11446	+//gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11447	+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11448	+//gl.glEnable(gl.GL_MULTISAMPLE);
11228	11449	} else
11229	11450	{
11230	11451	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11285,7 +11506,10 @@
11285	11506	//gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
11286	11507	} else
11287	11508	{
11288		- glu.gluPerspective(cam.shaper_fovy / ratio, ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
	11509	+ boolean vr = capsLocked && !lightMode;
	11510	+
	11511	+ glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1),
	11512	+ ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
11289	11513	}
11290	11514	}
11291	11515
..	..	@@ -11325,7 +11549,7 @@
11325	11549
11326	11550	// if (cam != lightCamera)
11327	11551	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11328		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11552	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11329	11553	}
11330	11554
11331	11555	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11641,8 +11865,11 @@
11641	11865	repaint();
11642	11866	}
11643	11867
11644		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11868	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11869	+ {
	11870	+ renderCamera.computeTransform();
11645	11871	repaint();
	11872	+ }
11646	11873
11647	11874	displaydone = true;
11648	11875	}
..	..	@@ -11717,9 +11944,23 @@
11717	11944	//GL gl = getGL();
11718	11945	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11719	11946	{
	11947	+ if (TRACK)
	11948	+ {
	11949	+ if (object.selection != null &&
	11950	+ object.selection.size() > 0 &&
	11951	+ object.selection.elementAt(0) != null &&
	11952	+ !(object.selection.elementAt(0) instanceof Camera) &&
	11953	+ !(object.selection.elementAt(0) instanceof ScriptNode))
	11954	+ {
	11955	+ trackedobject = object.selection.elementAt(0);
	11956	+ //repaint();
	11957	+ }
	11958	+ else
	11959	+ trackedobject = null;
	11960	+ }
11720	11961	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11721	11962	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11722		- pingthread.StepToTarget(true); // true);
	11963	+ pingthread.StepToTarget(); // true);
11723	11964	// zoomonce = false;
11724	11965	}
11725	11966
..	..	@@ -12399,51 +12640,80 @@
12399	12640
12400	12641	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12401	12642
12402		- String program =
	12643	+ String programmin =
12403	12644	// Min shader
12404	12645	"!!ARBfp1.0\n" +
12405		- "PARAM zero123 = { 0.0, 1.0, 2.0, 1.25 };" +
12406		- "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12646	+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
	12647	+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12648	+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
12407	12649	"PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
12408	12650	"PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
12409	12651	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12652	+ "PARAM light2cam0 = program.env[10];" +
	12653	+ "PARAM light2cam1 = program.env[11];" +
	12654	+ "PARAM light2cam2 = program.env[12];" +
12410	12655	"TEMP temp;" +
12411	12656	"TEMP light;" +
12412	12657	"TEMP ndotl;" +
12413	12658	"TEMP normal;" +
12414	12659	"TEMP depth;" +
	12660	+ "TEMP eye;" +
	12661	+ "TEMP pos;" +
12415	12662
12416		- "MAD normal, fragment.color, zero123.z, -zero123.y;" +
12417		-
	12663	+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
	12664	+ Normalize("normal") +
12418	12665	"MOV light, state.light[0].position;" +
12419	12666	"DP3 ndotl.x, light, normal;" +
	12667	+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
12420	12668
12421	12669	// shadow
12422		- "MOV temp, fragment.texcoord[1];" +
12423		- TextureFetch("depth", "temp", "1") +
	12670	+ "MOV pos, fragment.texcoord[1];" +
	12671	+ "MOV temp, pos;" +
	12672	+ ShadowTextureFetch("depth", "temp", "1") +
12424	12673	//"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
12425		- "SLT temp.x, fragment.texcoord[1].z, depth.z;" +
12426		-
	12674	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
12427	12675
12428	12676	// No shadow when out of frustum
12429	12677	//"SGE temp.y, depth.z, zero123.y;" +
12430	12678	//"LRP temp.x, temp.y, zero123.y, temp.x;" +
12431	12679
12432		- "MUL ndotl.x, ndotl.x, temp.x;" +
12433		- "MAX ndotl.x, ndotl.x, pow2.y;" +
	12680	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
12434	12681
	12682	+ // Backlit
	12683	+ "MOV pos.w, zero12t.y;" + // one
	12684	+ "DP4 eye.x, pos, light2cam0;" +
	12685	+ "DP4 eye.y, pos, light2cam1;" +
	12686	+ "DP4 eye.z, pos, light2cam2;" +
	12687	+ Normalize("eye") +
	12688	+
	12689	+ "DP3 ndotl.y, -eye, normal;" +
	12690	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12691	+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
	12692	+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
	12693	+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12694	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12695	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12696	+ "ADD ndotl.y, ndotl.y, one.x;" +
	12697	+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
	12698	+
	12699	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12700	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12701	+
	12702	+ // Pigment
12435	12703	"TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12436		- "LRP temp, zero123.w, temp, one;" + // texture proportion
12437		- "MUL temp, temp, ndotl.x;" +
	12704	+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
	12705	+ "MUL temp, temp, zero12t.w;" + // Times x
12438	12706
12439		- "MUL temp, temp, zero123.z;" +
	12707	+ //"MUL temp, temp, ndotl.y;" +
	12708	+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
12440	12709
12441		- "MOV temp.w, zero123.y;" + // reset alpha
	12710	+ "MUL temp, temp, ndotl.x;" + // lambert
12442	12711
	12712	+ "MOV temp.w, zero12t.y;" + // reset alpha
12443	12713	"MOV result.color, temp;" +
12444	12714	"END";
12445	12715
12446		- String program2 =
	12716	+ String programmax =
12447	12717	"!!ARBfp1.0\n" +
12448	12718
12449	12719	//"OPTION ARB_fragment_program_shadow;" +
..	..	@@ -12471,7 +12741,7 @@
12471	12741	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12472	12742	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12473	12743	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12474		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12744	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12475	12745	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12476	12746	"PARAM options1 = program.env[62];" + // fog rgb color
12477	12747	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12581,20 +12851,20 @@
12581	12851	"MUL temp, floor, mapgrid.x;" +
12582	12852	//"TEX depth0, temp, texture[1], 2D;" +
12583	12853	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12584		- TextureFetch("depth0", "temp", "1") +
	12854	+ ShadowTextureFetch("depth0", "temp", "1") +
12585	12855	"") +
12586	12856	"ADD temp.x, temp.x, mapgrid.x;" +
12587	12857	//"TEX depth1, temp, texture[1], 2D;" +
12588	12858	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12589		- TextureFetch("depth1", "temp", "1") +
	12859	+ ShadowTextureFetch("depth1", "temp", "1") +
12590	12860	"") +
12591	12861	"ADD temp.y, temp.y, mapgrid.x;" +
12592	12862	//"TEX depth2, temp, texture[1], 2D;" +
12593		- TextureFetch("depth2", "temp", "1") +
	12863	+ ShadowTextureFetch("depth2", "temp", "1") +
12594	12864	"SUB temp.x, temp.x, mapgrid.x;" +
12595	12865	//"TEX depth3, temp, texture[1], 2D;" +
12596	12866	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12597		- TextureFetch("depth3", "temp", "1") +
	12867	+ ShadowTextureFetch("depth3", "temp", "1") +
12598	12868	"") +
12599	12869	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12600	12870	//"MOV params, material;" +
..	..	@@ -12716,7 +12986,7 @@
12716	12986	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12717	12987	// mar 2013 ??? "KIL alpha.a;" +
12718	12988	"MOV alpha, texSamp.aaaa;" + // y;" +
12719		- "KIL alpha.a;" +
	12989	+ "KIL alpha.a;" + // not sure with parallax mapping
12720	12990	/*
12721	12991	"MUL temp.xy, temp, two;" +
12722	12992	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12802,11 +13072,6 @@
12802	13072	"SUB bump0, bump0, half;" +
12803	13073	"ADD bump, bump, bump0;" +
12804	13074
12805		- "MOV temp.x, texSamp.a;" +
12806		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12807		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12808		- "MOV texSamp.a, temp.x;" +
12809		-
12810	13075	// double-sided
12811	13076	/**/
12812	13077	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12816,26 +13081,73 @@
12816	13081	"ADD temp.x, temp.x, one.x;" +
12817	13082	"MUL normal, normal, temp.xxxx;":""
12818	13083	) +
12819		- /**/
12820		-//// Normalize("normal") +
12821		-//// "MAX normal.z, eps.x, normal.z;" +
12822		-// Normalize("normal") +
12823		- "MOV normald, normal;" +
12824		- "MOV normals, normal;" +
	13084	+ /**/
	13085	+
	13086	+ "MOV temp, fragment.texcoord[4];" +
12825	13087
12826	13088	// UV base
12827	13089	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12828	13090	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12829	13091	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12830		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12831		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12832		- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
	13092	+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
	13093	+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
	13094	+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
	13095	+ Normalize("UP") +
	13096	+
12833	13097	"XPD V, normal, UP;" +
12834	13098	Normalize("V") +
12835	13099	"XPD U, V, normal;" +
12836	13100	Normalize("U") +
12837	13101
	13102	+ "MOV temp, fragment.texcoord[0];" +
	13103	+
	13104	+// "MAD normal, -temp.x, U, normal;" +
	13105	+// "MAD normal, -temp.y, V, normal;" +
	13106	+// Normalize("normal") +
	13107	+
	13108	+//// "MAX normal.z, eps.x, normal.z;" +
	13109	+// Normalize("normal") +
	13110	+ "MOV normald, normal;" +
	13111	+ "MOV normals, normal;" +
	13112	+
12838	13113	// parallax mapping
	13114	+
	13115	+ "DP3 temp2.x, V, eye;" +
	13116	+ "DP3 temp2.y, U, eye;" +
	13117	+ "DP3 temp2.z, normal, eye;" +
	13118	+ "RCP temp2.z, temp2.z;" +
	13119	+
	13120	+ "DP3 temp2.w, texSamp, texSamp;" + // Height
	13121	+ "RSQ temp2.w, temp2.w;" +
	13122	+ "RCP temp2.w, temp2.w;" +
	13123	+
	13124	+ "SUB temp2.w, temp2.w, half;" +
	13125	+ // "SGE temp.x, temp2.w, eps.x;" +
	13126	+ // "MUL temp2.w, temp2.w, temp.x;" +
	13127	+
	13128	+ // "MOV texSamp, U;" +
	13129	+
	13130	+ "MUL temp2.z, temp2.z, temp2.w;" +
	13131	+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
	13132	+
	13133	+ "MUL temp2, temp2, temp2.z;" +
	13134	+
	13135	+ "SUB temp, temp, temp2;" +
	13136	+
	13137	+ "TEX temp, temp, texture[0], 2D;" +
	13138	+ "POW temp.a, temp.a, params6.w;" + // punch through
	13139	+
	13140	+ "ADD texSamp, temp, texSamp;" +
	13141	+ "MUL texSamp.xyz, half, texSamp;" +
	13142	+
	13143	+ "MOV alpha, texSamp.aaaa;" +
	13144	+
	13145	+// parallax mapping
	13146	+
	13147	+ "MOV temp.x, texSamp.a;" +
	13148	+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
	13149	+ //"LRP texSamp0, params5.x, texSamp0, one;" +
	13150	+ "MOV texSamp.a, temp.x;" +
12839	13151
12840	13152	//"MOV temp, fragment.texcoord[0];" +
12841	13153	//
..	..	@@ -12968,7 +13280,7 @@
12968	13280	// display shadow only (fakedepth == 0)
12969	13281	"SUB temp.x, half.x, shadow.x;" +
12970	13282	"MOV temp.y, -params5.z;" + // params6.x;" +
12971		- "SLT temp.z, temp.y, -one2048th.x;" +
	13283	+ "SLT temp.z, temp.y, -c256i.x;" +
12972	13284	"SUB temp.y, one.x, temp.z;" +
12973	13285	"MUL temp.x, temp.x, temp.y;" +
12974	13286	"KIL temp.x;" +
..	..	@@ -13299,8 +13611,19 @@
13299	13611	//once = true;
13300	13612	}
13301	13613
13302		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13303		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13614	+ String program = programmax;
	13615	+
	13616	+ if (Globals.MINSHADER)
	13617	+ {
	13618	+ program = programmin;
	13619	+ }
	13620	+
	13621	+ if (Globals.DEBUG)
	13622	+ {
	13623	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13624	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13625	+ }
	13626	+
13304	13627	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13305	13628
13306	13629	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13347,7 +13670,8 @@
13347	13670	"\n" +
13348	13671	"END\n";
13349	13672
13350		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13673	+ if (Globals.DEBUG)
	13674	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13351	13675	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13352	13676
13353	13677	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13392,7 +13716,8 @@
13392	13716	return out;
13393	13717	}
13394	13718
13395		- String TextureFetch(String dest, String src, String unit)
	13719	+ // Also does frustum culling
	13720	+ String ShadowTextureFetch(String dest, String src, String unit)
13396	13721	{
13397	13722	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13398	13723	"SGE " + src + ".w, " + src + ".x, eps.x;" +
..	..	@@ -13604,7 +13929,7 @@
13604	13929	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13605	13930	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13606	13931	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13607		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
	13932	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
13608	13933
13609	13934	//Object3D.cVector2[] vector2buffer;
13610	13935
..	..	@@ -13771,7 +14096,7 @@
13771	14096	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13772	14097	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13773	14098	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13774		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	14099	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13775	14100	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13776	14101	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13777	14102	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13832,7 +14157,7 @@
13832	14157	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13833	14158	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13834	14159	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13835		- //"MOV result.texcoord, vertex.texcoord;" +
	14160	+ //"MOV result.texcoord, vertex.fogcoord;" +
13836	14161	"MOV result.texcoord, temp;" +
13837	14162	// border fade
13838	14163	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13879,7 +14204,9 @@
13879	14204
13880	14205	//"ADD temp.z, temp.z, one;" +
13881	14206
13882		- "MOV result.color, temp;"
	14207	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14208	+
	14209	+ "MOV result.color, temp;" // Normal
13883	14210	: "MOV result.color, vertex.color;") +
13884	14211	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13885	14212	: "") +
..	..	@@ -14014,10 +14341,13 @@
14014	14341	public void mouseClicked(MouseEvent e)
14015	14342	{
14016	14343	System.out.println("mouseClicked: " + e);
	14344	+ System.exit(0);
14017	14345	}
14018	14346
14019	14347	public void mousePressed(MouseEvent e)
14020	14348	{
	14349	+ RigidBody.justclicked = true;
	14350	+ System.out.println("justclicked: " + e);
14021	14351	//System.out.println("mousePressed: " + e);
14022	14352	clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
14023	14353	}
..	..	@@ -14052,10 +14382,12 @@
14052	14382	return;
14053	14383	}
14054	14384
14055		- 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;
14056	14388
14057	14389	// TIMER
14058		- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14390	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
14059	14391	{
14060	14392	keepboxmode = BOXMODE;
14061	14393	keepsupport = SUPPORT;
..	..	@@ -14096,7 +14428,7 @@
14096	14428	//}
14097	14429
14098	14430	SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
14099		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
	14431	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
14100	14432	anchorX = ax;
14101	14433	anchorY = ay;
14102	14434	prevX = px;
..	..	@@ -14191,8 +14523,9 @@
14191	14523	// fev 2014???
14192	14524	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
14193	14525	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14194		- pingthread.StepToTarget(true); // true);
	14526	+ pingthread.StepToTarget(); // true);
14195	14527	}
	14528	+
14196	14529	// if (!LIVE)
14197	14530	super.repaint();
14198	14531	}
..	..	@@ -14255,14 +14588,15 @@
14255	14588	drag = false;
14256	14589	//System.out.println("Mouse DOWN");
14257	14590	editObj = false;
14258		- ClickInfo info = new ClickInfo();
14259		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14260		- info.pane = this;
14261		- info.camera = renderCamera;
14262		- info.x = x;
14263		- info.y = y;
14264		- info.modifiers = modifiersex;
14265		- 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);
14266	14600	if (!editObj)
14267	14601	{
14268	14602	hasMarquee = true;
..	..	@@ -14286,8 +14620,8 @@
14286	14620
14287	14621	//if (drawing)
14288	14622	//return;
14289		- if ((e.getModifiersEx() & CTRL) != 0
14290		- \|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
	14623	+ if ((e.getModifiersEx() & CTRL) != 0 \|\|
	14624	+ (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
14291	14625	{
14292	14626	//System.out.println("mouseDragged: " + e);
14293	14627	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
..	..	@@ -14311,9 +14645,17 @@
14311	14645	return targetLookAt;
14312	14646	}
14313	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	+
14314	14653	class PingThread extends Thread
14315	14654	{
14316	14655	boolean jump;
	14656	+ boolean live;
	14657	+
	14658	+ boolean mute;
14317	14659
14318	14660	// void JumpToTarget()
14319	14661	// {
..	..	@@ -14329,6 +14671,88 @@
14329	14671	// only one thread!? synchronized
14330	14672	void StepToTarget(boolean jump)
14331	14673	{
	14674	+ RigidBody.pos.x = 0;
	14675	+ RigidBody.pos.y = 0;
	14676	+ RigidBody.pos.z = 0;
	14677	+ if (RigidBody.justclicked)
	14678	+ {
	14679	+ RigidBody.pos.x = (float)manipCamera.lookAt.x;
	14680	+ RigidBody.pos.y = (float)manipCamera.lookAt.y;
	14681	+ RigidBody.pos.z = (float)manipCamera.lookAt.z;
	14682	+ RigidBody.wind.set(RigidBody.pos);
	14683	+ RigidBody.wind.x -= (float)manipCamera.location.x;
	14684	+ RigidBody.wind.y -= (float)manipCamera.location.y;
	14685	+ RigidBody.wind.z -= (float)manipCamera.location.z;
	14686	+ RigidBody.wind.normalize();
	14687	+ }
	14688	+
	14689	+ if (mute)
	14690	+ return;
	14691	+
	14692	+ if (capsLocked && manipCamera.viewCode == 0)
	14693	+ {
	14694	+ eye.x = manipCamera.location.x;
	14695	+ eye.y = manipCamera.location.y + 0.25;
	14696	+ eye.z = manipCamera.location.z;
	14697	+
	14698	+ dir.y = -1;
	14699	+
	14700	+ Ray ray = new Ray(eye, dir);
	14701	+
	14702	+ IntersectResult res = new IntersectResult();
	14703	+ res.t = Double.POSITIVE_INFINITY;
	14704	+
	14705	+ tmp.set(targetLookAt);
	14706	+ tmp.sub(manipCamera.location);
	14707	+
	14708	+ double dist = tmp.length();
	14709	+
	14710	+ tmp.normalize();
	14711	+
	14712	+ eye2.x = manipCamera.location.x + tmp.x * 0.25;
	14713	+ eye2.y = manipCamera.location.y + 0.25;
	14714	+ eye2.z = manipCamera.location.z + tmp.z * 0.25;
	14715	+
	14716	+ Ray ray2 = new Ray(eye2, dir);
	14717	+
	14718	+ IntersectResult res2 = new IntersectResult();
	14719	+ res2.t = Double.POSITIVE_INFINITY;
	14720	+
	14721	+ if (object.intersect(ray, res) && object.intersect(ray2, res2) && Math.abs(res.t - res2.t) < 0.25)
	14722	+ {
	14723	+ //tmp.set(manipCamera.location);
	14724	+
	14725	+ manipCamera.location.x = ray.eyePoint.x + ray.viewDirection.x * res.t;
	14726	+ manipCamera.location.y = ray.eyePoint.y + ray.viewDirection.y * res.t + 0.5;
	14727	+ manipCamera.location.z = ray.eyePoint.z + ray.viewDirection.z * res.t;
	14728	+
	14729	+ //tmp.sub(manipCamera.location);
	14730	+
	14731	+ targetLookAt.x = ray2.eyePoint.x + ray2.viewDirection.x * res2.t;
	14732	+ targetLookAt.y = ray2.eyePoint.y + ray2.viewDirection.y * res2.t + 0.5;
	14733	+ targetLookAt.z = ray2.eyePoint.z + ray2.viewDirection.z * res2.t;
	14734	+
	14735	+ targetLookAt.sub(manipCamera.location);
	14736	+ targetLookAt.normalize();
	14737	+ targetLookAt.mul(dist);
	14738	+ targetLookAt.add(manipCamera.location);
	14739	+
	14740	+ //if (tmp.dot(tmp) > 0.000001)
	14741	+ // System.out.println("INTERSECTION " + manipCamera.location);
	14742	+
	14743	+ manipCamera.lookAt.set(targetLookAt);
	14744	+
	14745	+ tmp.x = res.n.x;
	14746	+ tmp.y = res.n.y;
	14747	+ tmp.z = res.n.z;
	14748	+ tmp.x += res2.n.x;
	14749	+ tmp.y += res2.n.y;
	14750	+ tmp.z += res2.n.z;
	14751	+ tmp.normalize();
	14752	+ manipCamera.UP.set(tmp);
	14753	+ }
	14754	+ }
	14755	+
14332	14756	tmp.set(targetLookAt);
14333	14757	tmp.sub(manipCamera.lookAt); // june 2014
14334	14758
..	..	@@ -14366,7 +14790,7 @@
14366	14790
14367	14791	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
14368	14792	{
14369		- jump = true; // step = 1;
	14793	+ // sep 2019 jump = true; // step = 1;
14370	14794	}
14371	14795
14372	14796	if (OEILONCE && OEIL)
..	..	@@ -14401,7 +14825,10 @@
14401	14825	if (tmp.dot(tmp) < 0.00001)
14402	14826	{
14403	14827	zoomonce = false;
	14828	+ live = false;
14404	14829	}
	14830	+ else
	14831	+ live = true;
14405	14832
14406	14833	tmp.mul(step > step2 ? step : step2);
14407	14834	}
..	..	@@ -14428,7 +14855,7 @@
14428	14855	{
14429	14856	if (LOOKAT)
14430	14857	manipCamera.lookAt.add(tmp);
14431		- if (OEIL)
	14858	+ if (OEIL && !capsLocked)
14432	14859	manipCamera.location.add(tmp);
14433	14860
14434	14861	{
..	..	@@ -14443,7 +14870,10 @@
14443	14870	lightCamera.computeTransform();
14444	14871	}
14445	14872	}
14446		- manipCamera.computeTransform();
	14873	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14874	+ {
	14875	+ manipCamera.computeTransform();
	14876	+ }
14447	14877	}
14448	14878	// ?????? mouseDown = true;
14449	14879	//System.out.println("---------------- ---------- Paint " + tmp.length2());
..	..	@@ -14536,49 +14966,107 @@
14536	14966	}
14537	14967	}
14538	14968	}
	14969	+
14539	14970	PingThread pingthread = new PingThread();
14540		- int delta = 5;
14541		- int speed = 5;
	14971	+ int delta = 1;
	14972	+ int speed = 1;
	14973	+ int walk = 8;
14542	14974	boolean autorepeat = false;
14543	14975
	14976	+ void Walk()
	14977	+ {
	14978	+ manipCamera.BackForth(0, walk, 1000);
	14979	+
	14980	+ targetLookAt.set(manipCamera.lookAt);
	14981	+ }
	14982	+
	14983	+ void ViewAngle(float dy)
	14984	+ {
	14985	+ double factor = Math.exp(-dy/300.0); // (1 + dy/100);
	14986	+
	14987	+ if (manipCamera.shaper_fovy * factor > 1 &&
	14988	+ manipCamera.shaper_fovy * factor < 150)
	14989	+ {
	14990	+ manipCamera.shaper_fovy *= factor;
	14991	+ //System.out.println("fovy = " + shaper_fovy);
	14992	+ }
	14993	+ }
	14994	+
14544	14995	void GoDown(int mod)
14545	14996	{
14546	14997	MODIFIERS \|= COMMAND;
	14998	+ boolean isVR = (mouseMode&VR)!=0;
14547	14999	/**/
14548	15000	if((mod&SHIFT) == SHIFT)
14549		- manipCamera.RotatePosition(0, -speed);
14550		- else
14551		- manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14552		- /**/
14553		- if ((mod & SHIFT) == SHIFT)
14554	15001	{
14555		- mouseMode = mouseMode; // VR??
14556		- } else
14557		- {
14558		- mouseMode \|= BACKFORTH;
	15002	+// if (isVR)
	15003	+// manipCamera.RotateInterest(0, speed);
	15004	+// else
	15005	+ if (isVR)
	15006	+ ViewAngle(-speed*delta);
	15007	+ else
	15008	+ manipCamera.Translate(0, -speed*delta, getWidth());
14559	15009	}
	15010	+ else
	15011	+ {
	15012	+ if (isVR)
	15013	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	15014	+ else
	15015	+ manipCamera.RotatePosition(0, -speed);
	15016	+ }
	15017	+
	15018	+ /**/
	15019	+// if ((mod & SHIFT) == SHIFT)
	15020	+// {
	15021	+// mouseMode = mouseMode; // VR??
	15022	+// } else
	15023	+// {
	15024	+// mouseMode \|= BACKFORTH;
	15025	+// }
14560	15026
	15027	+ targetLookAt.set(manipCamera.lookAt);
	15028	+
14561	15029	//prevX = X = anchorX;
14562	15030	prevY = Y = anchorY - (int) (renderCamera.Distance());
14563	15031	}
14564	15032
14565	15033	void GoUp(int mod)
14566	15034	{
	15035	+ RigidBody.justclicked = true;
	15036	+
14567	15037	MODIFIERS \|= COMMAND;
14568	15038	/**/
	15039	+ boolean isVR = (mouseMode&VR)!=0;
	15040	+
14569	15041	if((mod&SHIFT) == SHIFT)
14570		- manipCamera.RotatePosition(0, speed);
14571		- else
14572		- manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14573		- /**/
14574		- if ((mod & SHIFT) == SHIFT)
14575	15042	{
14576		- mouseMode = mouseMode;
14577		- } else
14578		- {
14579		- mouseMode \|= BACKFORTH;
	15043	+// if (isVR)
	15044	+// manipCamera.RotateInterest(0, -speed);
	15045	+// else
	15046	+ if (isVR)
	15047	+ ViewAngle(speed*delta);
	15048	+ else
	15049	+ manipCamera.Translate(0, speed*delta, getWidth());
14580	15050	}
	15051	+ else
	15052	+ {
	15053	+ if (isVR)
	15054	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	15055	+ else
	15056	+ manipCamera.RotatePosition(0, speed);
	15057	+ }
	15058	+
	15059	+ /**/
	15060	+// if ((mod & SHIFT) == SHIFT)
	15061	+// {
	15062	+// mouseMode = mouseMode;
	15063	+// } else
	15064	+// {
	15065	+// mouseMode \|= BACKFORTH;
	15066	+// }
14581	15067
	15068	+ targetLookAt.set(manipCamera.lookAt);
	15069	+
14582	15070	//prevX = X = anchorX;
14583	15071	prevY = Y = anchorY + (int) (renderCamera.Distance());
14584	15072	}
..	..	@@ -14588,18 +15076,29 @@
14588	15076	MODIFIERS \|= COMMAND;
14589	15077	/**/
14590	15078	if((mod&SHIFT) == SHIFT)
14591		- manipCamera.Translate(speed*delta, 0, getWidth());
	15079	+ manipCamera.Translate(speed, 0, getWidth());
14592	15080	else
14593		- manipCamera.RotatePosition(speed, 0);
	15081	+ {
	15082	+ if ((mouseMode&VR)!=0)
	15083	+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
	15084	+ else
	15085	+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
	15086	+ }
	15087	+
14594	15088	/**/
14595		- if ((mod & SHIFT) == SHIFT)
14596		- {
14597		- mouseMode = mouseMode;
14598		- } else
14599		- {
14600		- mouseMode \|= ROTATE;
14601		- } // TRANSLATE;
	15089	+// if ((mod & SHIFT) == SHIFT)
	15090	+// {
	15091	+// mouseMode = mouseMode;
	15092	+// } else
	15093	+// {
	15094	+// mouseMode \|= ROTATE;
	15095	+// } // TRANSLATE;
14602	15096
	15097	+ //System.err.println("lookAt = " + manipCamera.lookAt);
	15098	+ //System.err.println("location = " + manipCamera.location);
	15099	+
	15100	+ targetLookAt.set(manipCamera.lookAt);
	15101	+
14603	15102	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14604	15103	prevY = Y = anchorY;
14605	15104	}
..	..	@@ -14609,18 +15108,26 @@
14609	15108	MODIFIERS \|= COMMAND;
14610	15109	/**/
14611	15110	if((mod&SHIFT) == SHIFT)
14612		- manipCamera.Translate(-speed*delta, 0, getWidth());
	15111	+ manipCamera.Translate(-speed, 0, getWidth());
14613	15112	else
14614		- manipCamera.RotatePosition(-speed, 0);
	15113	+ {
	15114	+ if ((mouseMode&VR)!=0)
	15115	+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
	15116	+ else
	15117	+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
	15118	+ }
	15119	+
14615	15120	/**/
14616		- if ((mod & SHIFT) == SHIFT)
14617		- {
14618		- mouseMode = mouseMode;
14619		- } else
14620		- {
14621		- mouseMode \|= ROTATE;
14622		- } // TRANSLATE;
	15121	+// if ((mod & SHIFT) == SHIFT)
	15122	+// {
	15123	+// mouseMode = mouseMode;
	15124	+// } else
	15125	+// {
	15126	+// mouseMode \|= ROTATE;
	15127	+// } // TRANSLATE;
14623	15128
	15129	+ targetLookAt.set(manipCamera.lookAt);
	15130	+
14624	15131	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14625	15132	prevY = Y = anchorY;
14626	15133	}
..	..	@@ -14662,15 +15169,16 @@
14662	15169	if (editObj)
14663	15170	{
14664	15171	drag = true;
14665		- ClickInfo info = new ClickInfo();
14666		- info.bounds.setBounds(0, 0,
	15172	+ //ClickInfo info = new ClickInfo();
	15173	+ object.clickInfo.bounds.setBounds(0, 0,
14667	15174	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14668		- info.pane = this;
14669		- info.camera = renderCamera;
14670		- info.x = x;
14671		- info.y = y;
14672		- object.GetWindow().copy
14673		- .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	15175	+ object.clickInfo.pane = this;
	15176	+ object.clickInfo.camera = renderCamera;
	15177	+ object.clickInfo.x = x;
	15178	+ object.clickInfo.y = y;
	15179	+ object //.GetWindow().copy
	15180	+ .doEditDrag(//info,
	15181	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14674	15182	} else
14675	15183	{
14676	15184	if (x < startX)
..	..	@@ -14753,6 +15261,11 @@
14753	15261	if ((mouseMode & ZOOM) != 0)
14754	15262	{
14755	15263	//if ((mouseMode & BACKFORTH) != 0)
	15264	+ if ((modifiersex & SHIFT) == SHIFT)
	15265	+ {
	15266	+ ViewAngle(dy);
	15267	+ }
	15268	+ else
14756	15269	if ((mouseMode & VR) != 0)
14757	15270	manipCamera.BackForth(dx, dy, getWidth());
14758	15271	else
..	..	@@ -14819,24 +15332,30 @@
14819	15332	}
14820	15333	}
14821	15334
	15335	+// ClickInfo clickInfo = new ClickInfo();
	15336	+
14822	15337	public void mouseMoved(MouseEvent e)
14823	15338	{
	15339	+//object.editWindow.frame.
	15340	+ setCursor(Cursor.getDefaultCursor());
	15341	+
14824	15342	//System.out.println("mouseMoved: " + e);
14825	15343	if (isRenderer)
14826	15344	return;
14827	15345
14828		- ClickInfo ci = new ClickInfo();
14829		- ci.x = e.getX();
14830		- ci.y = e.getY();
14831		- ci.modifiers = e.getModifiersEx();
14832		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14833		- ci.pane = this;
14834		- ci.camera = renderCamera;
	15346	+ // Mouse cursor feedback
	15347	+ object.clickInfo.x = e.getX();
	15348	+ object.clickInfo.y = e.getY();
	15349	+ object.clickInfo.modifiers = e.getModifiersEx();
	15350	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15351	+ object.clickInfo.pane = this;
	15352	+ object.clickInfo.camera = renderCamera;
14835	15353	if (!isRenderer)
14836	15354	{
14837	15355	//ObjEditor editWindow = object.editWindow;
14838	15356	//Object3D copy = editWindow.copy;
14839		- if (object.doEditClick(ci, 0))
	15357	+ if (object.doEditClick(//clickInfo,
	15358	+ 0))
14840	15359	{
14841	15360	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14842	15361	} else
..	..	@@ -15004,8 +15523,10 @@
15004	15523	mouseMode \|= ZOOM;
15005	15524	}
15006	15525
15007		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
15008		- if (capsLocked) // \|\| (modifiers & META) == META)
	15526	+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	15527	+ boolean vr = capsLocked && !lightMode;
	15528	+
	15529	+ if (vr) // \|\| (modifiers & META) == META)
15009	15530	{
15010	15531	mouseMode \|= VR; // BACKFORTH;
15011	15532	}
..	..	@@ -15017,7 +15538,8 @@
15017	15538	{
15018	15539	mouseMode \|= SELECT;
15019	15540	}
15020		- if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	15541	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15542	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15021	15543	{
15022	15544	mouseMode &= ~VR;
15023	15545	mouseMode \|= TRANSLATE;
..	..	@@ -15061,8 +15583,18 @@
15061	15583	float SATPOW = 1; // 2; // 0.5f;
15062	15584	float BRIPOW = 1; // 0.5f; // 0.5f;
15063	15585
	15586	+static BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
	15587	+
	15588	+// Create a new blank cursor.
	15589	+static Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
	15590	+ cursorImg, new Point(0, 0), "blank cursor");
	15591	+
15064	15592	public void keyPressed(int key)
15065	15593	{
	15594	+// Set the blank cursor to the JFrame.
	15595	+//object.editWindow.frame.
	15596	+ setCursor(blankCursor);
	15597	+
15066	15598	if (key >= '0' && key <= '5')
15067	15599	clampbit = (key-'0');
15068	15600
..	..	@@ -15119,8 +15651,8 @@
15119	15651	case 'K':
15120	15652	KOMPACTTEXTURE ^= true;
15121	15653	//textures.clear();
15122		- break;
15123		- case 'P': // Texture Projection macros
	15654	+ // break;
	15655	+ //case 'P': // Texture Projection macros
15124	15656	// SAVETEXTURE ^= true;
15125	15657	macromode = true;
15126	15658	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -15221,8 +15753,8 @@
15221	15753	RevertCamera();
15222	15754	repaint();
15223	15755	break;
15224		- case 'l':
15225		- //case 'L':
	15756	+ //case 'l':
	15757	+ case 'L':
15226	15758	if (lightMode)
15227	15759	{
15228	15760	lightMode = false;
..	..	@@ -15241,7 +15773,7 @@
15241	15773	targetLookAt.set(manipCamera.lookAt);
15242	15774	repaint();
15243	15775	break;
15244		- case 'p':
	15776	+ case 'P': // p':
15245	15777	// c'est quoi ca au juste? spherical ^= true;
15246	15778	Skinshader ^= true; programInitialized = false;
15247	15779	repaint();
..	..	@@ -15252,7 +15784,8 @@
15252	15784	break;
15253	15785	case 'm':
15254	15786	{
15255		- PrintMemory();
	15787	+ //PrintMemory();
	15788	+ ToggleImageFlip();
15256	15789	break;
15257	15790	}
15258	15791	case 'M':
..	..	@@ -15279,27 +15812,31 @@
15279	15812	repaint();
15280	15813	break;
15281	15814	case 'O':
15282		- Globals.drawMode = OCCLUSION; // WARNING
15283		- repaint();
15284		- break;
	15815	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
	15816	+ //repaint();
	15817	+ //break;
15285	15818	case 'o':
15286	15819	OCCLUSION_CULLING ^= true;
15287	15820	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15288	15821	break;
15289		- case '0': envyoff ^= true; repaint(); break;
	15822	+ //case '0': envyoff ^= true; repaint(); break;
15290	15823	case '1':
15291	15824	case '2':
15292	15825	case '3':
15293	15826	case '4':
15294	15827	case '5':
15295		- newenvy = Character.getNumericValue(key);
15296		- repaint();
15297		- break;
15298	15828	case '6':
15299	15829	case '7':
15300	15830	case '8':
15301	15831	case '9':
15302		- BGcolor = (key - '6')/3.f;
	15832	+ if (true) // envyoff)
	15833	+ {
	15834	+ BGcolor = (key - '1')/8.f;
	15835	+ }
	15836	+ else
	15837	+ {
	15838	+ //newenvy = Character.getNumericValue(key);
	15839	+ }
15303	15840	repaint();
15304	15841	break;
15305	15842	case '!':
..	..	@@ -15369,7 +15906,21 @@
15369	15906	// kompactbit = 6;
15370	15907	// break;
15371	15908	case ' ':
	15909	+ capsLocked ^= true;
	15910	+ repaint();
	15911	+ break;
	15912	+ case 'l':
15372	15913	lightMode ^= true;
	15914	+ if (lightMode)
	15915	+ {
	15916	+ keepshadow = Globals.RENDERSHADOW;
	15917	+ Globals.RENDERSHADOW = false;
	15918	+ }
	15919	+ else
	15920	+ {
	15921	+ Globals.RENDERSHADOW = keepshadow;
	15922	+ }
	15923	+
15373	15924	Globals.lighttouched = true;
15374	15925	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15375	15926	targetLookAt.set(manipCamera.lookAt);
..	..	@@ -15377,6 +15928,10 @@
15377	15928	break;
15378	15929	//case '`' :
15379	15930	case ESC:
	15931	+ if (FULLSCREEN)
	15932	+ object.editWindow.ToggleFullScreen();
	15933	+ break;
	15934	+ case 'p':
15380	15935	RENDERPROGRAM += 1;
15381	15936	RENDERPROGRAM %= 3;
15382	15937
..	..	@@ -15415,6 +15970,10 @@
15415	15970	case ENTER:
15416	15971	// object.editWindow.ScreenFit(); // Edit();
15417	15972	ToggleLive();
	15973	+ if (capsLocked)
	15974	+ {
	15975	+ Globals.WALK ^= true;
	15976	+ }
15418	15977	break;
15419	15978	case DELETE:
15420	15979	ClearSelection();
..	..	@@ -15451,17 +16010,23 @@
15451	16010	object.GetWindow().refreshContents(true);
15452	16011	break;
15453	16012	case '{':
15454		- manipCamera.shaper_fovy /= 1.1;
	16013	+ double factor = 1.1;
	16014	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16015	+ manipCamera.shaper_fovy /= factor;
15455	16016	System.out.println("FOV = " + manipCamera.shaper_fovy);
15456	16017	repaint();
15457	16018	break;
15458	16019	case '}':
15459		- manipCamera.shaper_fovy *= 1.1;
	16020	+ factor = 1.1;
	16021	+ if (manipCamera.shaper_fovy * factor < 150)
	16022	+ manipCamera.shaper_fovy *= factor;
15460	16023	System.out.println("FOV = " + manipCamera.shaper_fovy);
15461	16024	repaint();
15462	16025	break;
15463	16026	case '[':
15464		- manipCamera.shaper_fovy /= 1.01;
	16027	+ factor = 1.01;
	16028	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16029	+ manipCamera.shaper_fovy /= factor;
15465	16030	if (false) //manipCamera.hAspect == 0)
15466	16031	{
15467	16032	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15477,7 +16042,9 @@
15477	16042	break;
15478	16043	case ']':
15479	16044	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15480		- manipCamera.shaper_fovy *= 1.01;
	16045	+ factor = 1.01;
	16046	+ if (manipCamera.shaper_fovy * factor < 150)
	16047	+ manipCamera.shaper_fovy *= factor;
15481	16048	if (false) //manipCamera.hAspect == 0)
15482	16049	{
15483	16050	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15515,98 +16082,113 @@
15515	16082	}
15516	16083	}
15517	16084
	16085	+ boolean keys[] = new boolean[256];
	16086	+ int speedkey[] = new int[256];
	16087	+ int modifiers = 0;
	16088	+
15518	16089	public void processKeyEvent(KeyEvent e)
15519	16090	{
15520	16091	switch (e.getID())
15521	16092	{
15522	16093	case KeyEvent.KEY_PRESSED:
15523		- if (!autorepeat)
15524		- {
15525		- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15526		- keyPressed(e.getKeyChar(), e.getModifiersEx());
15527		- }
15528		- if (manipCamera == lightCamera)
15529		- {
15530		- switch (e.getKeyCode())
15531		- {
15532		- case DOWN_ARROW:
15533		- lightCamera.DECAL /= 2;
15534		- repaint();
15535		- break;
15536		- case UP_ARROW:
15537		- lightCamera.DECAL *= 2;
15538		- repaint();
15539		- break;
15540		- case LEFT_ARROW:
15541		- lightCamera.SCALE /= 2;
15542		- repaint();
15543		- break;
15544		- case RIGHT_ARROW:
15545		- lightCamera.SCALE *= 2;
15546		- repaint();
15547		- break;
15548		- default:
15549		- break;
15550		- }
15551		-
15552		- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15553		- } else
15554		- {
15555		- if (true) // !autorepeat)
15556		- {
15557		- boolean reset = true;
15558		-
15559		- switch (e.getKeyCode())
15560		- {
15561		- case DOWN_ARROW:
15562		- GoDown(e.getModifiersEx());
15563		- repaint();
15564		- break;
15565		- case UP_ARROW:
15566		- GoUp(e.getModifiersEx());
15567		- repaint();
15568		- break;
15569		- case LEFT_ARROW:
15570		- GoLeft(e.getModifiersEx());
15571		- repaint();
15572		- break;
15573		- case RIGHT_ARROW:
15574		- GoRight(e.getModifiersEx());
15575		- repaint();
15576		- break;
15577		- default:
15578		- reset = false;
15579		- break;
15580		- }
15581		-
15582		- if (reset)
15583		- {
15584		- autorepeat = true;
15585		-
15586		- targetLookAt.set(manipCamera.lookAt);
15587		- }
15588		- }
15589		- }
	16094	+ keys[e.getKeyCode()] = true;
	16095	+ modifiers = e.getModifiersEx();
	16096	+ keyPressed(e.getKeyChar(), modifiers);
	16097	+ //Globals.theRenderer.keyPressed(e.getKeyChar());
	16098	+ repaint();
15590	16099	break;
15591		- case KeyEvent.KEY_TYPED:
15592		- break;
	16100	+// if (!autorepeat)
	16101	+// {
	16102	+// //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
	16103	+// keyPressed(e.getKeyChar(), e.getModifiersEx());
	16104	+// }
	16105	+// if (manipCamera == lightCamera)
	16106	+// {
	16107	+// switch (e.getKeyCode())
	16108	+// {
	16109	+// case DOWN_ARROW:
	16110	+// lightCamera.DECAL /= 2;
	16111	+// repaint();
	16112	+// break;
	16113	+// case UP_ARROW:
	16114	+// lightCamera.DECAL *= 2;
	16115	+// repaint();
	16116	+// break;
	16117	+// case LEFT_ARROW:
	16118	+// lightCamera.SCALE /= 2;
	16119	+// repaint();
	16120	+// break;
	16121	+// case RIGHT_ARROW:
	16122	+// lightCamera.SCALE *= 2;
	16123	+// repaint();
	16124	+// break;
	16125	+// default:
	16126	+// break;
	16127	+// }
	16128	+//
	16129	+// System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
	16130	+// } else
	16131	+// {
	16132	+// if (true) // !autorepeat)
	16133	+// {
	16134	+// boolean reset = true;
	16135	+//
	16136	+// switch (e.getKeyCode())
	16137	+// {
	16138	+// case DOWN_ARROW:
	16139	+// GoDown(e.getModifiersEx());
	16140	+// repaint();
	16141	+// break;
	16142	+// case UP_ARROW:
	16143	+// GoUp(e.getModifiersEx());
	16144	+// repaint();
	16145	+// break;
	16146	+// case LEFT_ARROW:
	16147	+// GoLeft(e.getModifiersEx());
	16148	+// repaint();
	16149	+// break;
	16150	+// case RIGHT_ARROW:
	16151	+// GoRight(e.getModifiersEx());
	16152	+// repaint();
	16153	+// break;
	16154	+// default:
	16155	+// reset = false;
	16156	+// break;
	16157	+// }
	16158	+//
	16159	+// if (reset)
	16160	+// {
	16161	+// autorepeat = true;
	16162	+//
	16163	+// targetLookAt.set(manipCamera.lookAt);
	16164	+// }
	16165	+// }
	16166	+// }
	16167	+// break;
	16168	+// case KeyEvent.KEY_TYPED:
	16169	+// break;
15593	16170	case KeyEvent.KEY_RELEASED:
15594		- {
15595		- switch (e.getKeyCode())
15596		- {
15597		- case DOWN_ARROW:
15598		- case UP_ARROW:
15599		- case LEFT_ARROW:
15600		- case RIGHT_ARROW:
15601		- MODIFIERS &= ~COMMAND;
15602		- autorepeat = false;
15603		- break;
15604		- default:
15605		- break;
15606		- }
	16171	+ keys[e.getKeyCode()] = false;
	16172	+ modifiers = e.getModifiersEx();
15607	16173	keyReleased(e.getKeyChar(), e.getModifiersEx());
	16174	+ repaint();
15608	16175	break;
15609		- }
	16176	+// {
	16177	+// switch (e.getKeyCode())
	16178	+// {
	16179	+// case DOWN_ARROW:
	16180	+// case UP_ARROW:
	16181	+// case LEFT_ARROW:
	16182	+// case RIGHT_ARROW:
	16183	+// MODIFIERS &= ~COMMAND;
	16184	+// autorepeat = false;
	16185	+// break;
	16186	+// default:
	16187	+// break;
	16188	+// }
	16189	+// keyReleased(e.getKeyChar(), e.getModifiersEx());
	16190	+// break;
	16191	+// }
15610	16192	default:
15611	16193	break;
15612	16194	}
..	..	@@ -15862,8 +16444,6 @@
15862	16444
15863	16445	int width = getBounds().width;
15864	16446	int height = getBounds().height;
15865		- ClickInfo info = new ClickInfo();
15866		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15867	16447	//Image img = CreateImage(width, height);
15868	16448	//System.out.println("width = " + width + "; height = " + height + "\n");
15869	16449
..	..	@@ -15940,31 +16520,37 @@
15940	16520	}
15941	16521	if (object != null && !hasMarquee)
15942	16522	{
	16523	+ if (object.clickInfo == null)
	16524	+ object.clickInfo = new ClickInfo();
	16525	+ ClickInfo info = object.clickInfo;
	16526	+ //ClickInfo info = new ClickInfo();
	16527	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16528	+
15943	16529	if (isRenderer)
15944	16530	{
15945		- info.flags++;
	16531	+ object.clickInfo.flags++;
15946	16532	double frameAspect = (double) width / (double) height;
15947	16533	if (frameAspect > renderCamera.aspect)
15948	16534	{
15949	16535	int desired = (int) ((double) height * renderCamera.aspect);
15950		- info.bounds.width -= width - desired;
15951		- info.bounds.x += (width - desired) / 2;
	16536	+ object.clickInfo.bounds.width -= width - desired;
	16537	+ object.clickInfo.bounds.x += (width - desired) / 2;
15952	16538	} else
15953	16539	{
15954	16540	int desired = (int) ((double) width / renderCamera.aspect);
15955		- info.bounds.height -= height - desired;
15956		- info.bounds.y += (height - desired) / 2;
	16541	+ object.clickInfo.bounds.height -= height - desired;
	16542	+ object.clickInfo.bounds.y += (height - desired) / 2;
15957	16543	}
15958	16544	}
15959	16545
15960		- info.g = gr;
15961		- info.camera = renderCamera;
	16546	+ object.clickInfo.g = gr;
	16547	+ object.clickInfo.camera = renderCamera;
15962	16548	/*
15963	16549	// Memory intensive (brep.verticescopy)
15964	16550	if (!(object instanceof Composite))
15965	16551	object.draw(info, 0, false); // SLOW :
15966	16552	*/
15967		- if (!isRenderer)
	16553	+ if (!isRenderer) // && drag)
15968	16554	{
15969	16555	Grafreed.Assert(object != null);
15970	16556	Grafreed.Assert(object.selection != null);
..	..	@@ -15972,9 +16558,9 @@
15972	16558	{
15973	16559	int hitSomething = object.selection.get(0).hitSomething;
15974	16560
15975		- info.DX = 0;
15976		- info.DY = 0;
15977		- info.W = 1;
	16561	+ object.clickInfo.DX = 0;
	16562	+ object.clickInfo.DY = 0;
	16563	+ object.clickInfo.W = 1;
15978	16564	if (hitSomething == Object3D.hitCenter)
15979	16565	{
15980	16566	info.DX = X;
..	..	@@ -15986,13 +16572,14 @@
15986	16572	info.DY -= info.bounds.height/2;
15987	16573	}
15988	16574
15989		- object.drawEditHandles(info, 0);
	16575	+ object.drawEditHandles(//info,
	16576	+ 0);
15990	16577
15991	16578	if (drag && (X != 0 \|\| Y != 0))
15992	16579	{
15993	16580	switch (hitSomething)
15994	16581	{
15995		- case Object3D.hitCenter: gr.setColor(Color.pink);
	16582	+ case Object3D.hitCenter: gr.setColor(Color.white);
15996	16583	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15997	16584	break;
15998	16585	case Object3D.hitRotate: gr.setColor(Color.yellow);
..	..	@@ -16018,7 +16605,7 @@
16018	16605	if (hasMarquee)
16019	16606	{
16020	16607	gr.setXORMode(Color.white);
16021		- gr.setColor(Color.red);
	16608	+ gr.setColor(Color.white);
16022	16609	if (!firstime)
16023	16610	{
16024	16611	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -16177,7 +16764,8 @@
16177	16764
16178	16765	public boolean mouseDrag(Event evt, int x, int y)
16179	16766	{
16180		- //System.out.println("mouseDrag: " + evt);
	16767	+ System.out.println("mouseDrag: " + evt);
	16768	+ System.exit(0);
16181	16769	/*
16182	16770	drag = true;
16183	16771	//System.out.println("Mouse DRAG");
..	..	@@ -16296,6 +16884,7 @@
16296	16884	public boolean mouseUp(Event evt, int x, int y)
16297	16885	{
16298	16886	System.out.println("mouseUp: " + evt);
	16887	+ System.exit(0);
16299	16888	/*
16300	16889	locked = false;
16301	16890	if (isRenderer)
..	..	@@ -16485,6 +17074,8 @@
16485	17074	private /static/ boolean firstime;
16486	17075	private /static/ cVector newView = new cVector();
16487	17076	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	17077	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	17078	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16488	17079	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16489	17080	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16490	17081	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16497,29 +17088,67 @@
16497	17088	{
16498	17089	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16499	17090
	17091	+ int usedsuf = 0;
	17092	+
16500	17093	for (int i = 0; i < suffixes.length; i++)
16501	17094	{
16502		- String resourceName = basename + suffixes[i] + "." + suffix;
16503		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16504		- mipmapped,
16505		- FileUtil.getFileSuffix(resourceName));
16506		- if (data == null)
	17095	+ String[] suffixe = suffixes;
	17096	+ String[] fallback = suffixes2;
	17097	+ String[] fallfallback = suffixes3;
	17098	+
	17099	+ for (int c=usedsuf; --c>=0;)
16507	17100	{
16508		- throw new IOException("Unable to load texture " + resourceName);
	17101	+// String[] temp = suffixe;
	17102	+// suffixe = fallback;
	17103	+// fallback = fallfallback;
	17104	+// fallfallback = temp;
16509	17105	}
	17106	+
	17107	+ String resourceName = basename + suffixe[i] + "." + suffix;
	17108	+ TextureData data;
	17109	+
	17110	+ try
	17111	+ {
	17112	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17113	+ mipmapped,
	17114	+ FileUtil.getFileSuffix(resourceName));
	17115	+ }
	17116	+ catch (Exception e)
	17117	+ {
	17118	+ try
	17119	+ {
	17120	+ resourceName = basename + fallback[i] + "." + suffix;
	17121	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17122	+ mipmapped,
	17123	+ FileUtil.getFileSuffix(resourceName));
	17124	+ }
	17125	+ catch (Exception e2)
	17126	+ {
	17127	+ resourceName = basename + fallfallback[i] + "." + suffix;
	17128	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17129	+ mipmapped,
	17130	+ FileUtil.getFileSuffix(resourceName));
	17131	+ }
	17132	+ }
	17133	+
16510	17134	//System.out.println("Target = " + targets[i]);
16511	17135	cubemap.updateImage(data, targets[i]);
16512	17136	}
16513	17137
16514	17138	return cubemap;
16515	17139	}
	17140	+
16516	17141	int bigsphere = -1;
16517	17142
16518	17143	float BGcolor = 0.5f;
16519	17144
16520		- private void DrawSkyBox(GL gl)
	17145	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	17146	+
	17147	+ private void DrawSkyBox(GL gl, float ratio)
16521	17148	{
16522		- if (envyoff \|\| cubemap == null)
	17149	+ if (//envyoff \|\|
	17150	+ WIREFRAME \|\|
	17151	+ cubemap == null)
16523	17152	{
16524	17153	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16525	17154	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16534,7 +17163,17 @@
16534	17163	// Compensates for ExaminerViewer's modification of modelview matrix
16535	17164	gl.glMatrixMode(GL.GL_MODELVIEW);
16536	17165	gl.glLoadIdentity();
	17166	+ gl.glScalef(1,ratio,1);
16537	17167
	17168	+// colorV[0] = 2;
	17169	+// colorV[1] = 2;
	17170	+// colorV[2] = 2;
	17171	+// colorV[3] = 1;
	17172	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	17173	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	17174	+//
	17175	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	17176	+
16538	17177	//gl.glActiveTexture(GL.GL_TEXTURE1);
16539	17178	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16540	17179
..	..	@@ -16566,6 +17205,7 @@
16566	17205	{
16567	17206	gl.glScalef(1.0f, -1.0f, 1.0f);
16568	17207	}
	17208	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16569	17209	gl.glMultMatrixd(viewrot_1, 0);
16570	17210	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16571	17211	//viewer.updateInverseRotation(gl);
..	..	@@ -16606,7 +17246,8 @@
16606	17246	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16607	17247
16608	17248	cubemap.disable();
16609		- ////cubemap.unbind();
	17249	+ //cubemap.dispose();
	17250	+
16610	17251	if (CULLFACE)
16611	17252	{
16612	17253	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16662,7 +17303,7 @@
16662	17303	gl.glScalef(1.0f, -1.0f, 1.0f);
16663	17304	}
16664	17305
16665		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	17306	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16666	17307
16667	17308	float step = 2; // 0.1666f; //0.25f;
16668	17309	float stepv = 2; // step * 1652 / 998;
..	..	@@ -16824,7 +17465,7 @@
16824	17465	//new Exception().printStackTrace();
16825	17466	System.out.println("select buffer init");
16826	17467	// Use debug pipeline
16827		- drawable.setGL(new DebugGL(drawable.getGL()));
	17468	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16828	17469
16829	17470	GL gl = drawable.getGL();
16830	17471
..	..	@@ -16951,7 +17592,7 @@
16951	17592
16952	17593	float depth = depths[y * TEX_SIZE + x];
16953	17594
16954		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17595	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
16955	17596	{
16956	17597	pointselection = false;
16957	17598
..	..	@@ -17142,6 +17783,7 @@
17142	17783
17143	17784	public void init(GLAutoDrawable drawable)
17144	17785	{
	17786	+ if (Globals.DEBUG)
17145	17787	System.out.println("shadow buffer init");
17146	17788
17147	17789	GL gl = drawable.getGL();
..	..	@@ -17370,10 +18012,14 @@
17370	18012	gl.glFlush();
17371	18013
17372	18014	/**/
17373		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	18015	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
17374	18016
17375		- float[] pixels = occlusionsizebuffer.array();
	18017	+ float[] depths = occlusiondepthbuffer.array();
17376	18018
	18019	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	18020	+
	18021	+ int[] pixels = selectsizebuffer.array();
	18022	+
17377	18023	double r = 0, g = 0, b = 0;
17378	18024
17379	18025	double count = 0;
..	..	@@ -17384,7 +18030,7 @@
17384	18030
17385	18031	double FACTOR = 1;
17386	18032
17387		- for (int i = 0; i < pixels.length; i++)
	18033	+ for (int i = 0; i < depths.length; i++)
17388	18034	{
17389	18035	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17390	18036	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17467,7 +18113,7 @@
17467	18113
17468	18114	double scale = ray.z; // 1; // cos
17469	18115
17470		- float depth = pixels[newindex];
	18116	+ float depth = depths[newindex];
17471	18117
17472	18118	/*
17473	18119	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17610,6 +18256,11 @@
17610	18256	static boolean DEBUG_SELECTION = false;
17611	18257	boolean OCCLUSION_CULLING = false; //true;
17612	18258	public boolean lightMode = false;
	18259	+
	18260	+ private boolean keepshadow;
	18261	+
	18262	+ static public boolean capsLocked = false; // VR
	18263	+
17613	18264	static public int indexcount = 0;
17614	18265	/static/ cColor vertexOcclusion = new cColor();
17615	18266	//private int selection_view = -1;
..	..	@@ -17664,11 +18315,14 @@
17664	18315	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17665	18316	static IntBuffer bigAAbuffer;
17666	18317	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17667		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	18318	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17668	18319	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17669	18320	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17670	18321	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17671		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18322	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18323	+
	18324	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18325	+
17672	18326	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17673	18327	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17674	18328	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();