~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.*;
..	..	@@ -113,6 +114,8 @@
113	114	/static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
114	115	/static/ com.sun.opengl.util.texture.Texture cubemapcustom;
115	116	/static/ com.sun.opengl.util.texture.Texture cubemaprgb;
	117	+ boolean transformMode;
	118	+
116	119	boolean reverseUP = false;
117	120	static boolean frozen = false;
118	121	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -121,7 +124,7 @@
121	124	static boolean LOCALTRANSFORM = false;
122	125	static boolean FULLSCREEN = false;
123	126	static boolean SUPPORT = true;
124		-static boolean INERTIA = true;
	127	+static boolean INERTIA = false; // true;
125	128	static boolean FAST = false;
126	129	static boolean SLOWPOSE = false;
127	130	static boolean FOOTCONTACT = true;
..	..	@@ -132,7 +135,7 @@
132	135	static boolean ZOOMBOXMODE = false;
133	136	static boolean BOXMODE = false;
134	137	static boolean IMAGEFLIP = false;
135		-static boolean SMOOTHFOCUS = false;
	138	+static boolean SMOOTHFOCUS = true; // false;
136	139	static boolean SPEAKERMOCAP = true; // jan 2014 false;
137	140	static boolean SPEAKERCAMERA = false;
138	141	static boolean SPEAKERFOCUS = false;
..	..	@@ -166,13 +169,13 @@
166	169
167	170
168	171	// OPTIONS
169		- boolean Skinshader = true;
	172	+ boolean Skinshader = false; // true;
170	173	boolean cameraLight = false;
171	174	boolean UVdebug = false;
172	175	boolean Udebug = false;
173	176	boolean Vdebug = false;
174	177	boolean NORMALdebug = false;
175		- static boolean doublesided = false; // true; // reversed normals are awful for conformance
	178	+ static boolean doublesided = true; // false; // reversed normals are awful for conformance
176	179	boolean anisotropy = true;
177	180	boolean softshadow = true; // slower but better false;
178	181	boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
..	..	@@ -219,10 +222,10 @@
219	222	cameras = new Camera[2];
220	223	targetLookAts = new cVector[2];
221	224
222		- SetCamera(cam);
	225	+ SetCamera(cam, true);
223	226
224	227	// Warning: not used.
225		- SetLight(new Camera(new cVector(15, 10, -20)));
	228	+ //SetLight(new Camera(new cVector(15, 10, -20)));
226	229
227	230	object = o;
228	231
..	..	@@ -247,7 +250,7 @@
247	250
248	251	public javax.media.opengl.GL GetGL0()
249	252	{
250		- return null;
	253	+ return currentGL;
251	254	}
252	255
253	256	public int GenList()
..	..	@@ -540,7 +543,8 @@
540	543	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
541	544	LA.vecCross(obj.v0, obj.v1, obj.v2);
542	545	LA.vecNormalize(obj.v2);
543		- 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);
544	548	}
545	549
546	550	// P
..	..	@@ -562,7 +566,7 @@
562	566	y += ny * obj.NORMALPUSH;
563	567	z += nz * obj.NORMALPUSH;
564	568
565		- gl.glNormal3f(nx, ny, nz);
	569	+ SetGLNormal(gl, nx, ny, nz);
566	570	}
567	571	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
568	572	SetColor(obj, pv);
..	..	@@ -594,7 +598,7 @@
594	598	y += ny * obj.NORMALPUSH;
595	599	z += nz * obj.NORMALPUSH;
596	600
597		- gl.glNormal3f(nx, ny, nz);
	601	+ SetGLNormal(gl, nx, ny, nz);
598	602	}
599	603	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
600	604	// boolean locked = false;
..	..	@@ -642,7 +646,7 @@
642	646	y += ny * obj.NORMALPUSH;
643	647	z += nz * obj.NORMALPUSH;
644	648
645		- gl.glNormal3f(nx, ny, nz);
	649	+ SetGLNormal(gl, nx, ny, nz);
646	650	}
647	651
648	652	// if ((dot&4) == 0)
..	..	@@ -878,7 +882,7 @@
878	882	//// tris.postdraw(this);
879	883	}
880	884
881		- static Camera localcamera = new Camera();
	885	+ static Camera localAOcamera = new Camera();
882	886	static cVector from = new cVector();
883	887	static cVector to = new cVector();
884	888
..	..	@@ -887,7 +891,7 @@
887	891	CameraPane cp = this;
888	892
889	893	Camera keep = cp.RenderCamera();
890		- cp.renderCamera = localcamera;
	894	+ cp.renderCamera = localAOcamera;
891	895
892	896	if (br.trimmed)
893	897	{
..	..	@@ -905,7 +909,7 @@
905	909	br.positions[i3 + 2] + br.normals[i3 + 2]);
906	910	LA.xformPos(from, transform, from);
907	911	LA.xformPos(to, transform, to); // RIGID ONLY
908		- localcamera.setAim(from, to);
	912	+ localAOcamera.setAim(from, to);
909	913
910	914	CameraPane.occlusionbuffer.display();
911	915
..	..	@@ -939,7 +943,7 @@
939	943	to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
940	944	LA.xformPos(from, transform, from);
941	945	LA.xformPos(to, transform, to); // RIGID ONLY
942		- localcamera.setAim(from, to);
	946	+ localAOcamera.setAim(from, to);
943	947
944	948	CameraPane.occlusionbuffer.display();
945	949
..	..	@@ -1248,10 +1252,10 @@
1248	1252	{
1249	1253	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1250	1254	{
1251		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1255	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1252	1256	} else
1253	1257	{
1254		- gl.glNormal3f(0, 0, 1);
	1258	+ SetGLNormal(gl, 0, 0, 1);
1255	1259	}
1256	1260
1257	1261	if (c != null)
..	..	@@ -1275,10 +1279,10 @@
1275	1279	{
1276	1280	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1277	1281	{
1278		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1282	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1279	1283	} else
1280	1284	{
1281		- gl.glNormal3f(0, 0, 1);
	1285	+ SetGLNormal(gl, 0, 0, 1);
1282	1286	}
1283	1287	if (c != null)
1284	1288	{
..	..	@@ -1303,10 +1307,10 @@
1303	1307	{
1304	1308	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1305	1309	{
1306		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1310	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1307	1311	} else
1308	1312	{
1309		- gl.glNormal3f(0, 0, 1);
	1313	+ SetGLNormal(gl, 0, 0, 1);
1310	1314	}
1311	1315	if (c != null)
1312	1316	{
..	..	@@ -1488,7 +1492,7 @@
1488	1492	{
1489	1493	if (!selectmode)
1490	1494	{
1491		- 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);
1492	1496	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1493	1497
1494	1498	if (flipV)
..	..	@@ -1526,7 +1530,7 @@
1526	1530	}
1527	1531	}
1528	1532	float b = 0;
1529		- if (obj.support != null && obj.link2master)
	1533	+ if (obj.support != null && obj.Link2Support())
1530	1534	{
1531	1535	b = 1;
1532	1536	}
..	..	@@ -1817,7 +1821,7 @@
1817	1821
1818	1822	display.modelParams7[0] = 0;
1819	1823	display.modelParams7[1] = 1000;
1820		- display.modelParams7[2] = 0;
	1824	+ display.modelParams7[2] = material.parallax;
1821	1825	display.modelParams7[3] = 0;
1822	1826
1823	1827	//display.modelParams6[0] = 100; // criss de bug de bump
..	..	@@ -2050,9 +2054,9 @@
2050	2054	switch(viewcode)
2051	2055	{
2052	2056	case 0: return "main";
2053		- case 1: return "one";
2054		- case 2: return "two";
2055		- case 3: return "three";
	2057	+ case 1: return "Red";
	2058	+ case 2: return "Green";
	2059	+ case 3: return "Blue";
2056	2060	case 4: return "light";
2057	2061	}
2058	2062
..	..	@@ -2061,7 +2065,7 @@
2061	2065
2062	2066	static int camerachangeframe;
2063	2067
2064		- public boolean SetCamera(Camera cam)
	2068	+ public boolean SetCamera(Camera cam, boolean set)
2065	2069	{
2066	2070	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
2067	2071	// return false;
..	..	@@ -2079,7 +2083,8 @@
2079	2083
2080	2084	camerachangeframe = Globals.framecount;
2081	2085
2082		- cam.hAspect = -1; // Read only
	2086	+ if (cam != null)
	2087	+ cam.hAspect = -1; // Read only
2083	2088
2084	2089	cameras[0] = cam;
2085	2090	targetLookAts[0] = new cVector(cam.lookAt);
..	..	@@ -2089,11 +2094,14 @@
2089	2094	{
2090	2095	cameras[i] = new Camera(cam.viewCode);
2091	2096	}
2092		-
2093		- cameras[i].setAim(cam.location, cam.lookAt);
2094		- cameras[i].shaper_fovy = cam.shaper_fovy;
2095		- cameras[i].UP.set(cam.UP);
2096		- 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	+ }
2097	2105	}
2098	2106	cameracount = 0;
2099	2107	targetLookAt = targetLookAts[cameracount];
..	..	@@ -2102,7 +2110,7 @@
2102	2110	// Start with free camera
2103	2111	SwitchCameras(true);
2104	2112
2105		- pingthread.jump = true; // optional?
	2113	+// pingthread.jump = true; // optional?
2106	2114
2107	2115	if (TRACKONCE)
2108	2116	{
..	..	@@ -2289,18 +2297,6 @@
2289	2297	public void ToggleTrack()
2290	2298	{
2291	2299	TRACK ^= true;
2292		- if (TRACK)
2293		- {
2294		- if (object.selection != null &&
2295		- object.selection.size() > 0 &&
2296		- object.selection.elementAt(0) != null &&
2297		- !(object.selection.elementAt(0) instanceof Camera) &&
2298		- !(object.selection.elementAt(0) instanceof ScriptNode))
2299		- {
2300		- trackedobject = object.selection.elementAt(0);
2301		- repaint();
2302		- }
2303		- }
2304	2300
2305	2301	repaint();
2306	2302	}
..	..	@@ -2392,7 +2388,8 @@
2392	2388	{
2393	2389	//System.out.println("PROTECTION = " + cam.hAspect);
2394	2390	//assert (cam.hAspect == 0);
2395		- cam.hAspect = 0;
	2391	+ if (cam != null)
	2392	+ cam.hAspect = 0;
2396	2393	lightCamera = cam;
2397	2394	}
2398	2395
..	..	@@ -2473,6 +2470,18 @@
2473	2470	return CreateBim(bytes, width, height);
2474	2471	}
2475	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	+
2476	2485	/**/
2477	2486	class CacheTexture
2478	2487	{
..	..	@@ -2515,7 +2524,7 @@
2515	2524	com.sun.opengl.util.texture.TextureIO.newTextureData(
2516	2525	getClass().getClassLoader().getResourceAsStream(name),
2517	2526	true,
2518		- com.sun.opengl.util.texture.TextureIO.PNG);
	2527	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2519	2528	} catch (java.io.IOException e)
2520	2529	{
2521	2530	throw new javax.media.opengl.GLException(e);
..	..	@@ -3581,6 +3590,8 @@
3581	3590	};
3582	3591	/**/
3583	3592
	3593	+ static Object3D lastObject;
	3594	+
3584	3595	//com.sun.opengl.util.texture.Texture
3585	3596	TextureData
3586	3597	GetFileTexture(String name, boolean bump, int resolution)
..	..	@@ -3617,6 +3628,8 @@
3617	3628	// return null;
3618	3629	//if (i == 2)
3619	3630	// return null;
	3631	+ // TIFF issue sept 2019
	3632	+ System.err.println("lastObject = " + lastObject);
3620	3633	e.printStackTrace();
3621	3634	name = name.split("\\.tif")[0] + ".jpg";
3622	3635	}
..	..	@@ -6949,30 +6962,30 @@
6949	6962	short residu = 0;
6950	6963
6951	6964	// wraparound workarounds
6952		- short fuck = (short) (buffer[i] & 0xFF);
	6965	+ short ww = (short) (buffer[i] & 0xFF);
6953	6966	/*
6954		- residu += (fuck%2);
6955		- if(fuck/2 < 256-residu/2)
	6967	+ residu += (ww%2);
	6968	+ if(ww/2 < 256-residu/2)
6956	6969	{
6957		- fuck = (short)((fuck/2) + residu/2);
	6970	+ ww = (short)((ww/2) + residu/2);
6958	6971	if(residu == 2)
6959	6972	residu = 0;
6960	6973	}
6961	6974	else
6962	6975	{
6963	6976	residu = 0;
6964		- fuck /= 2;
	6977	+ ww /= 2;
6965	6978	}
6966	6979	*/
6967		- if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| fuck >= 254)
	6980	+ if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| ww >= 254)
6968	6981	{
6969		- fuck /= 2;
	6982	+ ww /= 2;
6970	6983	} else
6971	6984	{
6972		- fuck = (short) ((fuck / 2) + fuck % 2);
	6985	+ ww = (short) ((ww / 2) + ww % 2);
6973	6986	}
6974	6987
6975		- buffer[i] = (byte) fuck;
	6988	+ buffer[i] = (byte) ww;
6976	6989	}
6977	6990	//System.out.print(bytes[i] + " ");
6978	6991	//if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
..	..	@@ -8439,12 +8452,12 @@
8439	8452	{
8440	8453	// texturecache = textures.get(texname); // suspicious
8441	8454	if (texturecache == null)
8442		- texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8455	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.jpg", bump),resolution);
8443	8456	else
8444	8457	new Exception().printStackTrace();
8445	8458	} else
8446	8459	{
8447		- if (texname.startsWith("@"))
	8460	+ if (texname.startsWith("@") && textureon)
8448	8461	{
8449	8462	// texturecache = textures.get(texname); // suspicious
8450	8463	if (texturecache == null)
..	..	@@ -8627,7 +8640,9 @@
8627	8640	{
8628	8641	tex.bw = texturecache.texturedata.getWidth();
8629	8642	tex.bh = texturecache.texturedata.getHeight();
8630		- 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);
8631	8646	}
8632	8647	}
8633	8648	}
..	..	@@ -9825,7 +9840,10 @@
9825	9840	DrawSkyBox(gl, (float)rati);
9826	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9827	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9828		- accPerspective(gl, renderCamera.shaper_fovy / ratio,
	9843	+
	9844	+ boolean vr = capsLocked && !lightMode;
	9845	+
	9846	+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
9829	9847	ratio,
9830	9848	//near_plane, far_plane,
9831	9849	renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..	..	@@ -10688,9 +10706,18 @@
10688	10706	static boolean init = false;
10689	10707
10690	10708	double[][] matrix = LA.newMatrix();
	10709	+
	10710	+ // This is to refresh the UI of the material panel.
	10711	+ ObjEditor patchMaterial;
10691	10712
10692	10713	public void display(GLAutoDrawable drawable)
10693	10714	{
	10715	+ if (patchMaterial.patchMaterial)
	10716	+ {
	10717	+ patchMaterial.patchMaterial = false;
	10718	+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
	10719	+ }
	10720	+
10694	10721	if (Grafreed.savesound && Grafreed.hassound)
10695	10722	{
10696	10723	Grafreed.wav.save();
..	..	@@ -10734,7 +10761,9 @@
10734	10761	}
10735	10762	/**/
10736	10763
10737		- if (selection)
	10764	+ boolean control = ((modifiers & CTRL) != 0);
	10765	+
	10766	+ if (selection && (!Globals.isLIVE() \|\| control))
10738	10767	{
10739	10768	selectbuffer.display();
10740	10769	return;
..	..	@@ -10786,6 +10815,112 @@
10786	10815
10787	10816	if (DrawMode() == DEFAULT)
10788	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	+
10789	10924	currentlydrawing = true;
10790	10925	}
10791	10926
..	..	@@ -11082,11 +11217,11 @@
11082	11217	//
11083	11218	// newenvy = -1;
11084	11219
11085		- if (object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
	11220	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
11086	11221	{
11087	11222	if (cubemaprgb == null)
11088	11223	{
11089		- cubemaprgb = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11224	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
11090	11225	}
11091	11226
11092	11227	cubemap = cubemaprgb;
..	..	@@ -11097,6 +11232,8 @@
11097	11232	{
11098	11233	if (!object.skyboxname.equals(this.loadedskyboxname))
11099	11234	{
	11235	+ if (cubemap != null && cubemap != cubemaprgb)
	11236	+ cubemap.dispose();
11100	11237	cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11101	11238	loadedskyboxname = object.skyboxname;
11102	11239	}
..	..	@@ -11308,9 +11445,9 @@
11308	11445
11309	11446	gl.glMatrixMode(GL.GL_MODELVIEW);
11310	11447
11311		-gl.glEnable(gl.GL_POLYGON_SMOOTH);
11312		-gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11313		-gl.glEnable(gl.GL_MULTISAMPLE);
	11448	+//gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11449	+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11450	+//gl.glEnable(gl.GL_MULTISAMPLE);
11314	11451	} else
11315	11452	{
11316	11453	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11371,7 +11508,10 @@
11371	11508	//gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
11372	11509	} else
11373	11510	{
11374		- 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());
11375	11515	}
11376	11516	}
11377	11517
..	..	@@ -11727,8 +11867,11 @@
11727	11867	repaint();
11728	11868	}
11729	11869
11730		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11870	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11871	+ {
	11872	+ renderCamera.computeTransform();
11731	11873	repaint();
	11874	+ }
11732	11875
11733	11876	displaydone = true;
11734	11877	}
..	..	@@ -11803,9 +11946,23 @@
11803	11946	//GL gl = getGL();
11804	11947	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11805	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	+ }
11806	11963	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11807	11964	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11808		- pingthread.StepToTarget(true); // true);
	11965	+ pingthread.StepToTarget(); // true);
11809	11966	// zoomonce = false;
11810	11967	}
11811	11968
..	..	@@ -12488,8 +12645,9 @@
12488	12645	String programmin =
12489	12646	// Min shader
12490	12647	"!!ARBfp1.0\n" +
12491		- "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
12492		- "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	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 };" +
12493	12651	"PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
12494	12652	"PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
12495	12653	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
..	..	@@ -12504,10 +12662,11 @@
12504	12662	"TEMP eye;" +
12505	12663	"TEMP pos;" +
12506	12664
12507		- "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12665	+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
12508	12666	Normalize("normal") +
12509	12667	"MOV light, state.light[0].position;" +
12510	12668	"DP3 ndotl.x, light, normal;" +
	12669	+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
12511	12670
12512	12671	// shadow
12513	12672	"MOV pos, fragment.texcoord[1];" +
..	..	@@ -12523,7 +12682,7 @@
12523	12682	"MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
12524	12683
12525	12684	// Backlit
12526		- "MOV pos.w, zero123.y;" +
	12685	+ "MOV pos.w, zero12t.y;" + // one
12527	12686	"DP4 eye.x, pos, light2cam0;" +
12528	12687	"DP4 eye.y, pos, light2cam1;" +
12529	12688	"DP4 eye.z, pos, light2cam2;" +
..	..	@@ -12531,24 +12690,28 @@
12531	12690
12532	12691	"DP3 ndotl.y, -eye, normal;" +
12533	12692	//"MUL ndotl.y, ndotl.y, pow2.x;" +
12534		- "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12535		- "SUB ndotl.y, zero123.y, ndotl.y;" +
	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
12536	12696	//"SUB ndotl.y, zero123.y, ndotl.y;" +
12537	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;" +
12538	12700
12539	12701	//"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
12540	12702	//"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
12541	12703
12542	12704	// Pigment
12543	12705	"TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12544		- "LRP temp, zero123.w, temp, one;" + // texture proportion
12545		- "MUL temp, temp, ndotl.x;" +
12546		-
12547		- "MUL temp, temp, zero123.z;" +
	12706	+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
	12707	+ "MUL temp, temp, zero12t.w;" + // Times x
12548	12708
12549	12709	//"MUL temp, temp, ndotl.y;" +
	12710	+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
12550	12711
12551		- "MOV temp.w, zero123.y;" + // reset alpha
	12712	+ "MUL temp, temp, ndotl.x;" + // lambert
	12713	+
	12714	+ "MOV temp.w, zero12t.y;" + // reset alpha
12552	12715	"MOV result.color, temp;" +
12553	12716	"END";
12554	12717
..	..	@@ -12580,7 +12743,7 @@
12580	12743	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12581	12744	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12582	12745	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12583		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12746	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12584	12747	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12585	12748	"PARAM options1 = program.env[62];" + // fog rgb color
12586	12749	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12825,7 +12988,7 @@
12825	12988	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12826	12989	// mar 2013 ??? "KIL alpha.a;" +
12827	12990	"MOV alpha, texSamp.aaaa;" + // y;" +
12828		- "KIL alpha.a;" +
	12991	+ "KIL alpha.a;" + // not sure with parallax mapping
12829	12992	/*
12830	12993	"MUL temp.xy, temp, two;" +
12831	12994	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12911,11 +13074,6 @@
12911	13074	"SUB bump0, bump0, half;" +
12912	13075	"ADD bump, bump, bump0;" +
12913	13076
12914		- "MOV temp.x, texSamp.a;" +
12915		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12916		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12917		- "MOV texSamp.a, temp.x;" +
12918		-
12919	13077	// double-sided
12920	13078	/**/
12921	13079	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12925,26 +13083,73 @@
12925	13083	"ADD temp.x, temp.x, one.x;" +
12926	13084	"MUL normal, normal, temp.xxxx;":""
12927	13085	) +
12928		- /**/
12929		-//// Normalize("normal") +
12930		-//// "MAX normal.z, eps.x, normal.z;" +
12931		-// Normalize("normal") +
12932		- "MOV normald, normal;" +
12933		- "MOV normals, normal;" +
	13086	+ /**/
	13087	+
	13088	+ "MOV temp, fragment.texcoord[4];" +
12934	13089
12935	13090	// UV base
12936	13091	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12937	13092	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12938	13093	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12939		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12940		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12941		- "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	+
12942	13099	"XPD V, normal, UP;" +
12943	13100	Normalize("V") +
12944	13101	"XPD U, V, normal;" +
12945	13102	Normalize("U") +
12946	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	+
12947	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;" +
12948	13153
12949	13154	//"MOV temp, fragment.texcoord[0];" +
12950	13155	//
..	..	@@ -13415,8 +13620,12 @@
13415	13620	program = programmin;
13416	13621	}
13417	13622
13418		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13419		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	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	+
13420	13629	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13421	13630
13422	13631	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13463,7 +13672,8 @@
13463	13672	"\n" +
13464	13673	"END\n";
13465	13674
13466		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13675	+ if (Globals.DEBUG)
	13676	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13467	13677	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13468	13678
13469	13679	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13721,7 +13931,7 @@
13721	13931	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13722	13932	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13723	13933	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13724		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
	13934	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
13725	13935
13726	13936	//Object3D.cVector2[] vector2buffer;
13727	13937
..	..	@@ -13888,7 +14098,7 @@
13888	14098	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13889	14099	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13890	14100	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13891		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	14101	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13892	14102	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13893	14103	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13894	14104	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13949,7 +14159,7 @@
13949	14159	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13950	14160	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13951	14161	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13952		- //"MOV result.texcoord, vertex.texcoord;" +
	14162	+ //"MOV result.texcoord, vertex.fogcoord;" +
13953	14163	"MOV result.texcoord, temp;" +
13954	14164	// border fade
13955	14165	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13996,7 +14206,9 @@
13996	14206
13997	14207	//"ADD temp.z, temp.z, one;" +
13998	14208
13999		- "MOV result.color, temp;"
	14209	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14210	+
	14211	+ "MOV result.color, temp;" // Normal
14000	14212	: "MOV result.color, vertex.color;") +
14001	14213	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
14002	14214	: "") +
..	..	@@ -14131,6 +14343,7 @@
14131	14343	public void mouseClicked(MouseEvent e)
14132	14344	{
14133	14345	System.out.println("mouseClicked: " + e);
	14346	+ System.exit(0);
14134	14347	}
14135	14348
14136	14349	public void mousePressed(MouseEvent e)
..	..	@@ -14169,10 +14382,12 @@
14169	14382	return;
14170	14383	}
14171	14384
14172		- 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;
14173	14388
14174	14389	// TIMER
14175		- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14390	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
14176	14391	{
14177	14392	keepboxmode = BOXMODE;
14178	14393	keepsupport = SUPPORT;
..	..	@@ -14213,7 +14428,7 @@
14213	14428	//}
14214	14429
14215	14430	SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
14216		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
	14431	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
14217	14432	anchorX = ax;
14218	14433	anchorY = ay;
14219	14434	prevX = px;
..	..	@@ -14308,8 +14523,9 @@
14308	14523	// fev 2014???
14309	14524	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
14310	14525	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14311		- pingthread.StepToTarget(true); // true);
	14526	+ pingthread.StepToTarget(); // true);
14312	14527	}
	14528	+
14313	14529	// if (!LIVE)
14314	14530	super.repaint();
14315	14531	}
..	..	@@ -14404,8 +14620,8 @@
14404	14620
14405	14621	//if (drawing)
14406	14622	//return;
14407		- if ((e.getModifiersEx() & CTRL) != 0
14408		- \|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
	14623	+ if ((e.getModifiersEx() & CTRL) != 0 \|\|
	14624	+ (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
14409	14625	{
14410	14626	//System.out.println("mouseDragged: " + e);
14411	14627	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
..	..	@@ -14429,9 +14645,17 @@
14429	14645	return targetLookAt;
14430	14646	}
14431	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	+
14432	14653	class PingThread extends Thread
14433	14654	{
14434	14655	boolean jump;
	14656	+ boolean live;
	14657	+
	14658	+ boolean mute = false;
14435	14659
14436	14660	// void JumpToTarget()
14437	14661	// {
..	..	@@ -14447,6 +14671,95 @@
14447	14671	// only one thread!? synchronized
14448	14672	void StepToTarget(boolean jump)
14449	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	+
14450	14763	tmp.set(targetLookAt);
14451	14764	tmp.sub(manipCamera.lookAt); // june 2014
14452	14765
..	..	@@ -14484,7 +14797,7 @@
14484	14797
14485	14798	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
14486	14799	{
14487		- jump = true; // step = 1;
	14800	+ // sep 2019 jump = true; // step = 1;
14488	14801	}
14489	14802
14490	14803	if (OEILONCE && OEIL)
..	..	@@ -14519,7 +14832,10 @@
14519	14832	if (tmp.dot(tmp) < 0.00001)
14520	14833	{
14521	14834	zoomonce = false;
	14835	+ live = false;
14522	14836	}
	14837	+ else
	14838	+ live = true;
14523	14839
14524	14840	tmp.mul(step > step2 ? step : step2);
14525	14841	}
..	..	@@ -14546,7 +14862,7 @@
14546	14862	{
14547	14863	if (LOOKAT)
14548	14864	manipCamera.lookAt.add(tmp);
14549		- if (OEIL)
	14865	+ if (OEIL && !capsLocked)
14550	14866	manipCamera.location.add(tmp);
14551	14867
14552	14868	{
..	..	@@ -14561,7 +14877,10 @@
14561	14877	lightCamera.computeTransform();
14562	14878	}
14563	14879	}
14564		- manipCamera.computeTransform();
	14880	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14881	+ {
	14882	+ manipCamera.computeTransform();
	14883	+ }
14565	14884	}
14566	14885	// ?????? mouseDown = true;
14567	14886	//System.out.println("---------------- ---------- Paint " + tmp.length2());
..	..	@@ -14654,49 +14973,107 @@
14654	14973	}
14655	14974	}
14656	14975	}
	14976	+
14657	14977	PingThread pingthread = new PingThread();
14658		- int delta = 5;
14659		- int speed = 5;
	14978	+ int delta = 1;
	14979	+ int speed = 1;
	14980	+ int walk = 8;
14660	14981	boolean autorepeat = false;
14661	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	+
14662	15002	void GoDown(int mod)
14663	15003	{
14664	15004	MODIFIERS \|= COMMAND;
	15005	+ boolean isVR = (mouseMode&VR)!=0;
14665	15006	/**/
14666	15007	if((mod&SHIFT) == SHIFT)
14667		- manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14668		- else
14669		- manipCamera.RotatePosition(0, -speed);
14670		- /**/
14671		- if ((mod & SHIFT) == SHIFT)
14672	15008	{
14673		- mouseMode = mouseMode; // VR??
14674		- } else
14675		- {
14676		- 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());
14677	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	+// }
14678	15033
	15034	+ targetLookAt.set(manipCamera.lookAt);
	15035	+
14679	15036	//prevX = X = anchorX;
14680	15037	prevY = Y = anchorY - (int) (renderCamera.Distance());
14681	15038	}
14682	15039
14683	15040	void GoUp(int mod)
14684	15041	{
	15042	+ RigidBody.justclicked = true;
	15043	+
14685	15044	MODIFIERS \|= COMMAND;
14686	15045	/**/
	15046	+ boolean isVR = (mouseMode&VR)!=0;
	15047	+
14687	15048	if((mod&SHIFT) == SHIFT)
14688		- manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14689		- else
14690		- manipCamera.RotatePosition(0, speed);
14691		- /**/
14692		- if ((mod & SHIFT) == SHIFT)
14693	15049	{
14694		- mouseMode = mouseMode;
14695		- } else
14696		- {
14697		- 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());
14698	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	+// }
14699	15074
	15075	+ targetLookAt.set(manipCamera.lookAt);
	15076	+
14700	15077	//prevX = X = anchorX;
14701	15078	prevY = Y = anchorY + (int) (renderCamera.Distance());
14702	15079	}
..	..	@@ -14706,18 +15083,29 @@
14706	15083	MODIFIERS \|= COMMAND;
14707	15084	/**/
14708	15085	if((mod&SHIFT) == SHIFT)
14709		- manipCamera.Translate(speed*delta, 0, getWidth());
	15086	+ manipCamera.Translate(speed, 0, getWidth());
14710	15087	else
14711		- manipCamera.RotatePosition(speed, 0);
	15088	+ {
	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	+
14712	15095	/**/
14713		- if ((mod & SHIFT) == SHIFT)
14714		- {
14715		- mouseMode = mouseMode;
14716		- } else
14717		- {
14718		- mouseMode \|= ROTATE;
14719		- } // TRANSLATE;
	15096	+// if ((mod & SHIFT) == SHIFT)
	15097	+// {
	15098	+// mouseMode = mouseMode;
	15099	+// } else
	15100	+// {
	15101	+// mouseMode \|= ROTATE;
	15102	+// } // TRANSLATE;
14720	15103
	15104	+ //System.err.println("lookAt = " + manipCamera.lookAt);
	15105	+ //System.err.println("location = " + manipCamera.location);
	15106	+
	15107	+ targetLookAt.set(manipCamera.lookAt);
	15108	+
14721	15109	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14722	15110	prevY = Y = anchorY;
14723	15111	}
..	..	@@ -14727,18 +15115,26 @@
14727	15115	MODIFIERS \|= COMMAND;
14728	15116	/**/
14729	15117	if((mod&SHIFT) == SHIFT)
14730		- manipCamera.Translate(-speed*delta, 0, getWidth());
	15118	+ manipCamera.Translate(-speed, 0, getWidth());
14731	15119	else
14732		- manipCamera.RotatePosition(-speed, 0);
	15120	+ {
	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	+
14733	15127	/**/
14734		- if ((mod & SHIFT) == SHIFT)
14735		- {
14736		- mouseMode = mouseMode;
14737		- } else
14738		- {
14739		- mouseMode \|= ROTATE;
14740		- } // TRANSLATE;
	15128	+// if ((mod & SHIFT) == SHIFT)
	15129	+// {
	15130	+// mouseMode = mouseMode;
	15131	+// } else
	15132	+// {
	15133	+// mouseMode \|= ROTATE;
	15134	+// } // TRANSLATE;
14741	15135
	15136	+ targetLookAt.set(manipCamera.lookAt);
	15137	+
14742	15138	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14743	15139	prevY = Y = anchorY;
14744	15140	}
..	..	@@ -14872,6 +15268,11 @@
14872	15268	if ((mouseMode & ZOOM) != 0)
14873	15269	{
14874	15270	//if ((mouseMode & BACKFORTH) != 0)
	15271	+ if ((modifiersex & SHIFT) == SHIFT)
	15272	+ {
	15273	+ ViewAngle(dy);
	15274	+ }
	15275	+ else
14875	15276	if ((mouseMode & VR) != 0)
14876	15277	manipCamera.BackForth(dx, dy, getWidth());
14877	15278	else
..	..	@@ -14942,6 +15343,9 @@
14942	15343
14943	15344	public void mouseMoved(MouseEvent e)
14944	15345	{
	15346	+//object.editWindow.frame.
	15347	+ setCursor(Cursor.getDefaultCursor());
	15348	+
14945	15349	//System.out.println("mouseMoved: " + e);
14946	15350	if (isRenderer)
14947	15351	return;
..	..	@@ -14970,6 +15374,12 @@
14970	15374
14971	15375	public void mouseReleased(MouseEvent e)
14972	15376	{
	15377	+ if (isRenderer && !movingcamera)
	15378	+ {
	15379	+ RigidBody.justclicked = true;
	15380	+ System.out.println("justclicked: " + e);
	15381	+ }
	15382	+
14973	15383	Globals.MOUSEDRAGGED = false;
14974	15384
14975	15385	movingcamera = false;
..	..	@@ -15126,8 +15536,10 @@
15126	15536	mouseMode \|= ZOOM;
15127	15537	}
15128	15538
15129		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
15130		- 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)
15131	15543	{
15132	15544	mouseMode \|= VR; // BACKFORTH;
15133	15545	}
..	..	@@ -15139,7 +15551,8 @@
15139	15551	{
15140	15552	mouseMode \|= SELECT;
15141	15553	}
15142		- if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	15554	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15555	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15143	15556	{
15144	15557	mouseMode &= ~VR;
15145	15558	mouseMode \|= TRANSLATE;
..	..	@@ -15183,8 +15596,18 @@
15183	15596	float SATPOW = 1; // 2; // 0.5f;
15184	15597	float BRIPOW = 1; // 0.5f; // 0.5f;
15185	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	+
15186	15605	public void keyPressed(int key)
15187	15606	{
	15607	+// Set the blank cursor to the JFrame.
	15608	+//object.editWindow.frame.
	15609	+ setCursor(blankCursor);
	15610	+
15188	15611	if (key >= '0' && key <= '5')
15189	15612	clampbit = (key-'0');
15190	15613
..	..	@@ -15241,8 +15664,8 @@
15241	15664	case 'K':
15242	15665	KOMPACTTEXTURE ^= true;
15243	15666	//textures.clear();
15244		- break;
15245		- case 'P': // Texture Projection macros
	15667	+ // break;
	15668	+ //case 'P': // Texture Projection macros
15246	15669	// SAVETEXTURE ^= true;
15247	15670	macromode = true;
15248	15671	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -15343,8 +15766,8 @@
15343	15766	RevertCamera();
15344	15767	repaint();
15345	15768	break;
15346		- case 'l':
15347		- //case 'L':
	15769	+ //case 'l':
	15770	+ case 'L':
15348	15771	if (lightMode)
15349	15772	{
15350	15773	lightMode = false;
..	..	@@ -15363,7 +15786,7 @@
15363	15786	targetLookAt.set(manipCamera.lookAt);
15364	15787	repaint();
15365	15788	break;
15366		- case 'p':
	15789	+ case 'P': // p':
15367	15790	// c'est quoi ca au juste? spherical ^= true;
15368	15791	Skinshader ^= true; programInitialized = false;
15369	15792	repaint();
..	..	@@ -15374,7 +15797,8 @@
15374	15797	break;
15375	15798	case 'm':
15376	15799	{
15377		- PrintMemory();
	15800	+ //PrintMemory();
	15801	+ ToggleImageFlip();
15378	15802	break;
15379	15803	}
15380	15804	case 'M':
..	..	@@ -15401,9 +15825,9 @@
15401	15825	repaint();
15402	15826	break;
15403	15827	case 'O':
15404		- Globals.drawMode = OCCLUSION; // WARNING
15405		- repaint();
15406		- break;
	15828	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
	15829	+ //repaint();
	15830	+ //break;
15407	15831	case 'o':
15408	15832	OCCLUSION_CULLING ^= true;
15409	15833	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
..	..	@@ -15495,7 +15919,21 @@
15495	15919	// kompactbit = 6;
15496	15920	// break;
15497	15921	case ' ':
	15922	+ capsLocked ^= true;
	15923	+ repaint();
	15924	+ break;
	15925	+ case 'l':
15498	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	+
15499	15937	Globals.lighttouched = true;
15500	15938	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15501	15939	targetLookAt.set(manipCamera.lookAt);
..	..	@@ -15503,6 +15941,10 @@
15503	15941	break;
15504	15942	//case '`' :
15505	15943	case ESC:
	15944	+ if (FULLSCREEN)
	15945	+ object.editWindow.ToggleFullScreen();
	15946	+ break;
	15947	+ case 'p':
15506	15948	RENDERPROGRAM += 1;
15507	15949	RENDERPROGRAM %= 3;
15508	15950
..	..	@@ -15541,6 +15983,10 @@
15541	15983	case ENTER:
15542	15984	// object.editWindow.ScreenFit(); // Edit();
15543	15985	ToggleLive();
	15986	+ if (capsLocked)
	15987	+ {
	15988	+ Globals.WALK ^= true;
	15989	+ }
15544	15990	break;
15545	15991	case DELETE:
15546	15992	ClearSelection();
..	..	@@ -15577,17 +16023,23 @@
15577	16023	object.GetWindow().refreshContents(true);
15578	16024	break;
15579	16025	case '{':
15580		- manipCamera.shaper_fovy /= 1.1;
	16026	+ double factor = 1.1;
	16027	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16028	+ manipCamera.shaper_fovy /= factor;
15581	16029	System.out.println("FOV = " + manipCamera.shaper_fovy);
15582	16030	repaint();
15583	16031	break;
15584	16032	case '}':
15585		- manipCamera.shaper_fovy *= 1.1;
	16033	+ factor = 1.1;
	16034	+ if (manipCamera.shaper_fovy * factor < 150)
	16035	+ manipCamera.shaper_fovy *= factor;
15586	16036	System.out.println("FOV = " + manipCamera.shaper_fovy);
15587	16037	repaint();
15588	16038	break;
15589	16039	case '[':
15590		- manipCamera.shaper_fovy /= 1.01;
	16040	+ factor = 1.01;
	16041	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16042	+ manipCamera.shaper_fovy /= factor;
15591	16043	if (false) //manipCamera.hAspect == 0)
15592	16044	{
15593	16045	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15603,7 +16055,9 @@
15603	16055	break;
15604	16056	case ']':
15605	16057	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15606		- manipCamera.shaper_fovy *= 1.01;
	16058	+ factor = 1.01;
	16059	+ if (manipCamera.shaper_fovy * factor < 150)
	16060	+ manipCamera.shaper_fovy *= factor;
15607	16061	if (false) //manipCamera.hAspect == 0)
15608	16062	{
15609	16063	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15641,98 +16095,113 @@
15641	16095	}
15642	16096	}
15643	16097
	16098	+ boolean keys[] = new boolean[256];
	16099	+ int speedkey[] = new int[256];
	16100	+ int modifiers = 0;
	16101	+
15644	16102	public void processKeyEvent(KeyEvent e)
15645	16103	{
15646	16104	switch (e.getID())
15647	16105	{
15648	16106	case KeyEvent.KEY_PRESSED:
15649		- if (!autorepeat)
15650		- {
15651		- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15652		- keyPressed(e.getKeyChar(), e.getModifiersEx());
15653		- }
15654		- if (manipCamera == lightCamera)
15655		- {
15656		- switch (e.getKeyCode())
15657		- {
15658		- case DOWN_ARROW:
15659		- lightCamera.DECAL /= 2;
15660		- repaint();
15661		- break;
15662		- case UP_ARROW:
15663		- lightCamera.DECAL *= 2;
15664		- repaint();
15665		- break;
15666		- case LEFT_ARROW:
15667		- lightCamera.SCALE /= 2;
15668		- repaint();
15669		- break;
15670		- case RIGHT_ARROW:
15671		- lightCamera.SCALE *= 2;
15672		- repaint();
15673		- break;
15674		- default:
15675		- break;
15676		- }
15677		-
15678		- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15679		- } else
15680		- {
15681		- if (true) // !autorepeat)
15682		- {
15683		- boolean reset = true;
15684		-
15685		- switch (e.getKeyCode())
15686		- {
15687		- case DOWN_ARROW:
15688		- GoDown(e.getModifiersEx());
15689		- repaint();
15690		- break;
15691		- case UP_ARROW:
15692		- GoUp(e.getModifiersEx());
15693		- repaint();
15694		- break;
15695		- case LEFT_ARROW:
15696		- GoLeft(e.getModifiersEx());
15697		- repaint();
15698		- break;
15699		- case RIGHT_ARROW:
15700		- GoRight(e.getModifiersEx());
15701		- repaint();
15702		- break;
15703		- default:
15704		- reset = false;
15705		- break;
15706		- }
15707		-
15708		- if (reset)
15709		- {
15710		- autorepeat = true;
15711		-
15712		- targetLookAt.set(manipCamera.lookAt);
15713		- }
15714		- }
15715		- }
	16107	+ keys[e.getKeyCode()] = true;
	16108	+ modifiers = e.getModifiersEx();
	16109	+ keyPressed(e.getKeyChar(), modifiers);
	16110	+ //Globals.theRenderer.keyPressed(e.getKeyChar());
	16111	+ repaint();
15716	16112	break;
15717		- case KeyEvent.KEY_TYPED:
15718		- 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;
15719	16183	case KeyEvent.KEY_RELEASED:
15720		- {
15721		- switch (e.getKeyCode())
15722		- {
15723		- case DOWN_ARROW:
15724		- case UP_ARROW:
15725		- case LEFT_ARROW:
15726		- case RIGHT_ARROW:
15727		- MODIFIERS &= ~COMMAND;
15728		- autorepeat = false;
15729		- break;
15730		- default:
15731		- break;
15732		- }
	16184	+ keys[e.getKeyCode()] = false;
	16185	+ modifiers = e.getModifiersEx();
15733	16186	keyReleased(e.getKeyChar(), e.getModifiersEx());
	16187	+ repaint();
15734	16188	break;
15735		- }
	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	+// }
15736	16205	default:
15737	16206	break;
15738	16207	}
..	..	@@ -16123,7 +16592,7 @@
16123	16592	{
16124	16593	switch (hitSomething)
16125	16594	{
16126		- case Object3D.hitCenter: gr.setColor(Color.pink);
	16595	+ case Object3D.hitCenter: gr.setColor(Color.white);
16127	16596	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16128	16597	break;
16129	16598	case Object3D.hitRotate: gr.setColor(Color.yellow);
..	..	@@ -16149,7 +16618,7 @@
16149	16618	if (hasMarquee)
16150	16619	{
16151	16620	gr.setXORMode(Color.white);
16152		- gr.setColor(Color.red);
	16621	+ gr.setColor(Color.white);
16153	16622	if (!firstime)
16154	16623	{
16155	16624	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -16308,7 +16777,8 @@
16308	16777
16309	16778	public boolean mouseDrag(Event evt, int x, int y)
16310	16779	{
16311		- //System.out.println("mouseDrag: " + evt);
	16780	+ System.out.println("mouseDrag: " + evt);
	16781	+ System.exit(0);
16312	16782	/*
16313	16783	drag = true;
16314	16784	//System.out.println("Mouse DRAG");
..	..	@@ -16427,6 +16897,7 @@
16427	16897	public boolean mouseUp(Event evt, int x, int y)
16428	16898	{
16429	16899	System.out.println("mouseUp: " + evt);
	16900	+ System.exit(0);
16430	16901	/*
16431	16902	locked = false;
16432	16903	if (isRenderer)
..	..	@@ -16697,7 +17168,7 @@
16697	17168	return;
16698	17169	}
16699	17170
16700		- if (WIREFRAME)
	17171	+ //if (WIREFRAME)
16701	17172	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
16702	17173
16703	17174	gl.glDisable(gl.GL_CULL_FACE);
..	..	@@ -16788,7 +17259,8 @@
16788	17259	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16789	17260
16790	17261	cubemap.disable();
16791		- ////cubemap.unbind();
	17262	+ //cubemap.dispose();
	17263	+
16792	17264	if (CULLFACE)
16793	17265	{
16794	17266	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16796,6 +17268,8 @@
16796	17268
16797	17269	if (WIREFRAME)
16798	17270	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_LINE);
	17271	+ else
	17272	+ gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
16799	17273	}
16800	17274
16801	17275	private void DrawChecker(GL gl)
..	..	@@ -16844,7 +17318,7 @@
16844	17318	gl.glScalef(1.0f, -1.0f, 1.0f);
16845	17319	}
16846	17320
16847		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	17321	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16848	17322
16849	17323	float step = 2; // 0.1666f; //0.25f;
16850	17324	float stepv = 2; // step * 1652 / 998;
..	..	@@ -17133,7 +17607,7 @@
17133	17607
17134	17608	float depth = depths[y * TEX_SIZE + x];
17135	17609
17136		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17610	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
17137	17611	{
17138	17612	pointselection = false;
17139	17613
..	..	@@ -17324,6 +17798,7 @@
17324	17798
17325	17799	public void init(GLAutoDrawable drawable)
17326	17800	{
	17801	+ if (Globals.DEBUG)
17327	17802	System.out.println("shadow buffer init");
17328	17803
17329	17804	GL gl = drawable.getGL();
..	..	@@ -17796,6 +18271,11 @@
17796	18271	static boolean DEBUG_SELECTION = false;
17797	18272	boolean OCCLUSION_CULLING = false; //true;
17798	18273	public boolean lightMode = false;
	18274	+
	18275	+ private boolean keepshadow;
	18276	+
	18277	+ static public boolean capsLocked = false; // VR
	18278	+
17799	18279	static public int indexcount = 0;
17800	18280	/static/ cColor vertexOcclusion = new cColor();
17801	18281	//private int selection_view = -1;