~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.*;
..	..	@@ -123,7 +124,7 @@
123	124	static boolean LOCALTRANSFORM = false;
124	125	static boolean FULLSCREEN = false;
125	126	static boolean SUPPORT = true;
126		-static boolean INERTIA = true;
	127	+static boolean INERTIA = false; // true;
127	128	static boolean FAST = false;
128	129	static boolean SLOWPOSE = false;
129	130	static boolean FOOTCONTACT = true;
..	..	@@ -134,7 +135,7 @@
134	135	static boolean ZOOMBOXMODE = false;
135	136	static boolean BOXMODE = false;
136	137	static boolean IMAGEFLIP = false;
137		-static boolean SMOOTHFOCUS = false;
	138	+static boolean SMOOTHFOCUS = true; // false;
138	139	static boolean SPEAKERMOCAP = true; // jan 2014 false;
139	140	static boolean SPEAKERCAMERA = false;
140	141	static boolean SPEAKERFOCUS = false;
..	..	@@ -174,7 +175,7 @@
174	175	boolean Udebug = false;
175	176	boolean Vdebug = false;
176	177	boolean NORMALdebug = false;
177		- static boolean doublesided = false; // true; // reversed normals are awful for conformance
	178	+ static boolean doublesided = true; // false; // reversed normals are awful for conformance
178	179	boolean anisotropy = true;
179	180	boolean softshadow = true; // slower but better false;
180	181	boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
..	..	@@ -221,10 +222,10 @@
221	222	cameras = new Camera[2];
222	223	targetLookAts = new cVector[2];
223	224
224		- SetCamera(cam);
	225	+ SetCamera(cam, true);
225	226
226	227	// Warning: not used.
227		- SetLight(new Camera(new cVector(15, 10, -20)));
	228	+ //SetLight(new Camera(new cVector(15, 10, -20)));
228	229
229	230	object = o;
230	231
..	..	@@ -249,7 +250,7 @@
249	250
250	251	public javax.media.opengl.GL GetGL0()
251	252	{
252		- return null;
	253	+ return currentGL;
253	254	}
254	255
255	256	public int GenList()
..	..	@@ -542,7 +543,8 @@
542	543	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
543	544	LA.vecCross(obj.v0, obj.v1, obj.v2);
544	545	LA.vecNormalize(obj.v2);
545		- 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);
546	548	}
547	549
548	550	// P
..	..	@@ -564,7 +566,7 @@
564	566	y += ny * obj.NORMALPUSH;
565	567	z += nz * obj.NORMALPUSH;
566	568
567		- gl.glNormal3f(nx, ny, nz);
	569	+ SetGLNormal(gl, nx, ny, nz);
568	570	}
569	571	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
570	572	SetColor(obj, pv);
..	..	@@ -596,7 +598,7 @@
596	598	y += ny * obj.NORMALPUSH;
597	599	z += nz * obj.NORMALPUSH;
598	600
599		- gl.glNormal3f(nx, ny, nz);
	601	+ SetGLNormal(gl, nx, ny, nz);
600	602	}
601	603	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
602	604	// boolean locked = false;
..	..	@@ -644,7 +646,7 @@
644	646	y += ny * obj.NORMALPUSH;
645	647	z += nz * obj.NORMALPUSH;
646	648
647		- gl.glNormal3f(nx, ny, nz);
	649	+ SetGLNormal(gl, nx, ny, nz);
648	650	}
649	651
650	652	// if ((dot&4) == 0)
..	..	@@ -880,7 +882,7 @@
880	882	//// tris.postdraw(this);
881	883	}
882	884
883		- static Camera localcamera = new Camera();
	885	+ static Camera localAOcamera = new Camera();
884	886	static cVector from = new cVector();
885	887	static cVector to = new cVector();
886	888
..	..	@@ -889,7 +891,7 @@
889	891	CameraPane cp = this;
890	892
891	893	Camera keep = cp.RenderCamera();
892		- cp.renderCamera = localcamera;
	894	+ cp.renderCamera = localAOcamera;
893	895
894	896	if (br.trimmed)
895	897	{
..	..	@@ -907,7 +909,7 @@
907	909	br.positions[i3 + 2] + br.normals[i3 + 2]);
908	910	LA.xformPos(from, transform, from);
909	911	LA.xformPos(to, transform, to); // RIGID ONLY
910		- localcamera.setAim(from, to);
	912	+ localAOcamera.setAim(from, to);
911	913
912	914	CameraPane.occlusionbuffer.display();
913	915
..	..	@@ -941,7 +943,7 @@
941	943	to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
942	944	LA.xformPos(from, transform, from);
943	945	LA.xformPos(to, transform, to); // RIGID ONLY
944		- localcamera.setAim(from, to);
	946	+ localAOcamera.setAim(from, to);
945	947
946	948	CameraPane.occlusionbuffer.display();
947	949
..	..	@@ -1250,10 +1252,10 @@
1250	1252	{
1251	1253	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1252	1254	{
1253		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1255	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1254	1256	} else
1255	1257	{
1256		- gl.glNormal3f(0, 0, 1);
	1258	+ SetGLNormal(gl, 0, 0, 1);
1257	1259	}
1258	1260
1259	1261	if (c != null)
..	..	@@ -1277,10 +1279,10 @@
1277	1279	{
1278	1280	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1279	1281	{
1280		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1282	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1281	1283	} else
1282	1284	{
1283		- gl.glNormal3f(0, 0, 1);
	1285	+ SetGLNormal(gl, 0, 0, 1);
1284	1286	}
1285	1287	if (c != null)
1286	1288	{
..	..	@@ -1305,10 +1307,10 @@
1305	1307	{
1306	1308	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1307	1309	{
1308		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1310	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1309	1311	} else
1310	1312	{
1311		- gl.glNormal3f(0, 0, 1);
	1313	+ SetGLNormal(gl, 0, 0, 1);
1312	1314	}
1313	1315	if (c != null)
1314	1316	{
..	..	@@ -1490,7 +1492,7 @@
1490	1492	{
1491	1493	if (!selectmode)
1492	1494	{
1493		- 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);
1494	1496	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1495	1497
1496	1498	if (flipV)
..	..	@@ -1528,7 +1530,7 @@
1528	1530	}
1529	1531	}
1530	1532	float b = 0;
1531		- if (obj.support != null && obj.link2master)
	1533	+ if (obj.support != null && obj.Link2Support())
1532	1534	{
1533	1535	b = 1;
1534	1536	}
..	..	@@ -1819,7 +1821,7 @@
1819	1821
1820	1822	display.modelParams7[0] = 0;
1821	1823	display.modelParams7[1] = 1000;
1822		- display.modelParams7[2] = 0;
	1824	+ display.modelParams7[2] = material.parallax;
1823	1825	display.modelParams7[3] = 0;
1824	1826
1825	1827	//display.modelParams6[0] = 100; // criss de bug de bump
..	..	@@ -2052,9 +2054,9 @@
2052	2054	switch(viewcode)
2053	2055	{
2054	2056	case 0: return "main";
2055		- case 1: return "one";
2056		- case 2: return "two";
2057		- case 3: return "three";
	2057	+ case 1: return "Red";
	2058	+ case 2: return "Green";
	2059	+ case 3: return "Blue";
2058	2060	case 4: return "light";
2059	2061	}
2060	2062
..	..	@@ -2063,7 +2065,7 @@
2063	2065
2064	2066	static int camerachangeframe;
2065	2067
2066		- public boolean SetCamera(Camera cam)
	2068	+ public boolean SetCamera(Camera cam, boolean set)
2067	2069	{
2068	2070	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
2069	2071	// return false;
..	..	@@ -2081,7 +2083,8 @@
2081	2083
2082	2084	camerachangeframe = Globals.framecount;
2083	2085
2084		- cam.hAspect = -1; // Read only
	2086	+ if (cam != null)
	2087	+ cam.hAspect = -1; // Read only
2085	2088
2086	2089	cameras[0] = cam;
2087	2090	targetLookAts[0] = new cVector(cam.lookAt);
..	..	@@ -2091,11 +2094,14 @@
2091	2094	{
2092	2095	cameras[i] = new Camera(cam.viewCode);
2093	2096	}
2094		-
2095		- cameras[i].setAim(cam.location, cam.lookAt);
2096		- cameras[i].shaper_fovy = cam.shaper_fovy;
2097		- cameras[i].UP.set(cam.UP);
2098		- 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	+ }
2099	2105	}
2100	2106	cameracount = 0;
2101	2107	targetLookAt = targetLookAts[cameracount];
..	..	@@ -2104,7 +2110,7 @@
2104	2110	// Start with free camera
2105	2111	SwitchCameras(true);
2106	2112
2107		- pingthread.jump = true; // optional?
	2113	+// pingthread.jump = true; // optional?
2108	2114
2109	2115	if (TRACKONCE)
2110	2116	{
..	..	@@ -2291,18 +2297,6 @@
2291	2297	public void ToggleTrack()
2292	2298	{
2293	2299	TRACK ^= true;
2294		- if (TRACK)
2295		- {
2296		- if (object.selection != null &&
2297		- object.selection.size() > 0 &&
2298		- object.selection.elementAt(0) != null &&
2299		- !(object.selection.elementAt(0) instanceof Camera) &&
2300		- !(object.selection.elementAt(0) instanceof ScriptNode))
2301		- {
2302		- trackedobject = object.selection.elementAt(0);
2303		- repaint();
2304		- }
2305		- }
2306	2300
2307	2301	repaint();
2308	2302	}
..	..	@@ -2394,7 +2388,8 @@
2394	2388	{
2395	2389	//System.out.println("PROTECTION = " + cam.hAspect);
2396	2390	//assert (cam.hAspect == 0);
2397		- cam.hAspect = 0;
	2391	+ if (cam != null)
	2392	+ cam.hAspect = 0;
2398	2393	lightCamera = cam;
2399	2394	}
2400	2395
..	..	@@ -2473,6 +2468,18 @@
2473	2468	byte[] bytes = bytebuf.array();
2474	2469
2475	2470	return CreateBim(bytes, width, height);
	2471	+ }
	2472	+
	2473	+ private void SetGLNormal(javax.media.opengl.GL gl, float nx, float ny, float nz)
	2474	+ {
	2475	+ gl.glNormal3f(nx, ny, nz);
	2476	+
	2477	+ if (ny > 0.9 \|\| ny < -0.9)
	2478	+ // Ground or ceiling
	2479	+ gl.glVertexAttrib3f(4, 1, 0, 0);
	2480	+ else
	2481	+ // Walls
	2482	+ gl.glVertexAttrib3f(4, 0, 1, 0);
2476	2483	}
2477	2484
2478	2485	/**/
..	..	@@ -3583,6 +3590,8 @@
3583	3590	};
3584	3591	/**/
3585	3592
	3593	+ static Object3D lastObject;
	3594	+
3586	3595	//com.sun.opengl.util.texture.Texture
3587	3596	TextureData
3588	3597	GetFileTexture(String name, boolean bump, int resolution)
..	..	@@ -3619,6 +3628,8 @@
3619	3628	// return null;
3620	3629	//if (i == 2)
3621	3630	// return null;
	3631	+ // TIFF issue sept 2019
	3632	+ System.err.println("lastObject = " + lastObject);
3622	3633	e.printStackTrace();
3623	3634	name = name.split("\\.tif")[0] + ".jpg";
3624	3635	}
..	..	@@ -6951,30 +6962,30 @@
6951	6962	short residu = 0;
6952	6963
6953	6964	// wraparound workarounds
6954		- short fuck = (short) (buffer[i] & 0xFF);
	6965	+ short ww = (short) (buffer[i] & 0xFF);
6955	6966	/*
6956		- residu += (fuck%2);
6957		- if(fuck/2 < 256-residu/2)
	6967	+ residu += (ww%2);
	6968	+ if(ww/2 < 256-residu/2)
6958	6969	{
6959		- fuck = (short)((fuck/2) + residu/2);
	6970	+ ww = (short)((ww/2) + residu/2);
6960	6971	if(residu == 2)
6961	6972	residu = 0;
6962	6973	}
6963	6974	else
6964	6975	{
6965	6976	residu = 0;
6966		- fuck /= 2;
	6977	+ ww /= 2;
6967	6978	}
6968	6979	*/
6969		- if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| fuck >= 254)
	6980	+ if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| ww >= 254)
6970	6981	{
6971		- fuck /= 2;
	6982	+ ww /= 2;
6972	6983	} else
6973	6984	{
6974		- fuck = (short) ((fuck / 2) + fuck % 2);
	6985	+ ww = (short) ((ww / 2) + ww % 2);
6975	6986	}
6976	6987
6977		- buffer[i] = (byte) fuck;
	6988	+ buffer[i] = (byte) ww;
6978	6989	}
6979	6990	//System.out.print(bytes[i] + " ");
6980	6991	//if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
..	..	@@ -8441,12 +8452,12 @@
8441	8452	{
8442	8453	// texturecache = textures.get(texname); // suspicious
8443	8454	if (texturecache == null)
8444		- texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8455	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.jpg", bump),resolution);
8445	8456	else
8446	8457	new Exception().printStackTrace();
8447	8458	} else
8448	8459	{
8449		- if (texname.startsWith("@"))
	8460	+ if (texname.startsWith("@") && textureon)
8450	8461	{
8451	8462	// texturecache = textures.get(texname); // suspicious
8452	8463	if (texturecache == null)
..	..	@@ -8629,7 +8640,9 @@
8629	8640	{
8630	8641	tex.bw = texturecache.texturedata.getWidth();
8631	8642	tex.bh = texturecache.texturedata.getHeight();
8632		- 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);
8633	8646	}
8634	8647	}
8635	8648	}
..	..	@@ -9827,7 +9840,10 @@
9827	9840	DrawSkyBox(gl, (float)rati);
9828	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9829	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9830		- accPerspective(gl, renderCamera.shaper_fovy / ratio,
	9843	+
	9844	+ boolean vr = capsLocked && !lightMode;
	9845	+
	9846	+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
9831	9847	ratio,
9832	9848	//near_plane, far_plane,
9833	9849	renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..	..	@@ -10699,7 +10715,7 @@
10699	10715	if (patchMaterial.patchMaterial)
10700	10716	{
10701	10717	patchMaterial.patchMaterial = false;
10702		- patchMaterial.objectPanel.setSelectedIndex(0);
	10718	+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
10703	10719	}
10704	10720
10705	10721	if (Grafreed.savesound && Grafreed.hassound)
..	..	@@ -10745,7 +10761,9 @@
10745	10761	}
10746	10762	/**/
10747	10763
10748		- if (selection)
	10764	+ boolean control = ((modifiers & CTRL) != 0);
	10765	+
	10766	+ if (selection && (!Globals.isLIVE() \|\| control))
10749	10767	{
10750	10768	selectbuffer.display();
10751	10769	return;
..	..	@@ -10797,6 +10815,112 @@
10797	10815
10798	10816	if (DrawMode() == DEFAULT)
10799	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	+
10800	10924	currentlydrawing = true;
10801	10925	}
10802	10926
..	..	@@ -11321,9 +11445,9 @@
11321	11445
11322	11446	gl.glMatrixMode(GL.GL_MODELVIEW);
11323	11447
11324		-gl.glEnable(gl.GL_POLYGON_SMOOTH);
11325		-gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11326		-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);
11327	11451	} else
11328	11452	{
11329	11453	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11384,7 +11508,10 @@
11384	11508	//gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
11385	11509	} else
11386	11510	{
11387		- 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());
11388	11515	}
11389	11516	}
11390	11517
..	..	@@ -11740,8 +11867,11 @@
11740	11867	repaint();
11741	11868	}
11742	11869
11743		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11870	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11871	+ {
	11872	+ renderCamera.computeTransform();
11744	11873	repaint();
	11874	+ }
11745	11875
11746	11876	displaydone = true;
11747	11877	}
..	..	@@ -11816,9 +11946,23 @@
11816	11946	//GL gl = getGL();
11817	11947	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11818	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	+ }
11819	11963	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11820	11964	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11821		- pingthread.StepToTarget(true); // true);
	11965	+ pingthread.StepToTarget(); // true);
11822	11966	// zoomonce = false;
11823	11967	}
11824	11968
..	..	@@ -12501,8 +12645,9 @@
12501	12645	String programmin =
12502	12646	// Min shader
12503	12647	"!!ARBfp1.0\n" +
12504		- "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
12505		- "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 };" +
12506	12651	"PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
12507	12652	"PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
12508	12653	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
..	..	@@ -12517,10 +12662,11 @@
12517	12662	"TEMP eye;" +
12518	12663	"TEMP pos;" +
12519	12664
12520		- "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12665	+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
12521	12666	Normalize("normal") +
12522	12667	"MOV light, state.light[0].position;" +
12523	12668	"DP3 ndotl.x, light, normal;" +
	12669	+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
12524	12670
12525	12671	// shadow
12526	12672	"MOV pos, fragment.texcoord[1];" +
..	..	@@ -12536,7 +12682,7 @@
12536	12682	"MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
12537	12683
12538	12684	// Backlit
12539		- "MOV pos.w, zero123.y;" +
	12685	+ "MOV pos.w, zero12t.y;" + // one
12540	12686	"DP4 eye.x, pos, light2cam0;" +
12541	12687	"DP4 eye.y, pos, light2cam1;" +
12542	12688	"DP4 eye.z, pos, light2cam2;" +
..	..	@@ -12544,24 +12690,28 @@
12544	12690
12545	12691	"DP3 ndotl.y, -eye, normal;" +
12546	12692	//"MUL ndotl.y, ndotl.y, pow2.x;" +
12547		- "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12548		- "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
12549	12696	//"SUB ndotl.y, zero123.y, ndotl.y;" +
12550	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;" +
12551	12700
12552	12701	//"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
12553	12702	//"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
12554	12703
12555	12704	// Pigment
12556	12705	"TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12557		- "LRP temp, zero123.w, temp, one;" + // texture proportion
12558		- "MUL temp, temp, ndotl.x;" +
12559		-
12560		- "MUL temp, temp, zero123.z;" +
	12706	+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
	12707	+ "MUL temp, temp, zero12t.w;" + // Times x
12561	12708
12562	12709	//"MUL temp, temp, ndotl.y;" +
	12710	+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
12563	12711
12564		- "MOV temp.w, zero123.y;" + // reset alpha
	12712	+ "MUL temp, temp, ndotl.x;" + // lambert
	12713	+
	12714	+ "MOV temp.w, zero12t.y;" + // reset alpha
12565	12715	"MOV result.color, temp;" +
12566	12716	"END";
12567	12717
..	..	@@ -12593,7 +12743,7 @@
12593	12743	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12594	12744	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12595	12745	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12596		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12746	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12597	12747	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12598	12748	"PARAM options1 = program.env[62];" + // fog rgb color
12599	12749	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12838,7 +12988,7 @@
12838	12988	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12839	12989	// mar 2013 ??? "KIL alpha.a;" +
12840	12990	"MOV alpha, texSamp.aaaa;" + // y;" +
12841		- "KIL alpha.a;" +
	12991	+ "KIL alpha.a;" + // not sure with parallax mapping
12842	12992	/*
12843	12993	"MUL temp.xy, temp, two;" +
12844	12994	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12924,11 +13074,6 @@
12924	13074	"SUB bump0, bump0, half;" +
12925	13075	"ADD bump, bump, bump0;" +
12926	13076
12927		- "MOV temp.x, texSamp.a;" +
12928		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12929		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12930		- "MOV texSamp.a, temp.x;" +
12931		-
12932	13077	// double-sided
12933	13078	/**/
12934	13079	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12938,26 +13083,73 @@
12938	13083	"ADD temp.x, temp.x, one.x;" +
12939	13084	"MUL normal, normal, temp.xxxx;":""
12940	13085	) +
12941		- /**/
12942		-//// Normalize("normal") +
12943		-//// "MAX normal.z, eps.x, normal.z;" +
12944		-// Normalize("normal") +
12945		- "MOV normald, normal;" +
12946		- "MOV normals, normal;" +
	13086	+ /**/
	13087	+
	13088	+ "MOV temp, fragment.texcoord[4];" +
12947	13089
12948	13090	// UV base
12949	13091	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12950	13092	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12951	13093	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12952		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12953		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12954		- "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	+
12955	13099	"XPD V, normal, UP;" +
12956	13100	Normalize("V") +
12957	13101	"XPD U, V, normal;" +
12958	13102	Normalize("U") +
12959	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	+
12960	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;" +
12961	13153
12962	13154	//"MOV temp, fragment.texcoord[0];" +
12963	13155	//
..	..	@@ -13739,7 +13931,7 @@
13739	13931	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13740	13932	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13741	13933	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13742		- /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
13743	13935
13744	13936	//Object3D.cVector2[] vector2buffer;
13745	13937
..	..	@@ -13906,7 +14098,7 @@
13906	14098	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13907	14099	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13908	14100	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13909		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	14101	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13910	14102	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13911	14103	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13912	14104	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13967,7 +14159,7 @@
13967	14159	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13968	14160	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13969	14161	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13970		- //"MOV result.texcoord, vertex.texcoord;" +
	14162	+ //"MOV result.texcoord, vertex.fogcoord;" +
13971	14163	"MOV result.texcoord, temp;" +
13972	14164	// border fade
13973	14165	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -14014,7 +14206,9 @@
14014	14206
14015	14207	//"ADD temp.z, temp.z, one;" +
14016	14208
14017		- "MOV result.color, temp;"
	14209	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14210	+
	14211	+ "MOV result.color, temp;" // Normal
14018	14212	: "MOV result.color, vertex.color;") +
14019	14213	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
14020	14214	: "") +
..	..	@@ -14149,6 +14343,7 @@
14149	14343	public void mouseClicked(MouseEvent e)
14150	14344	{
14151	14345	System.out.println("mouseClicked: " + e);
	14346	+ System.exit(0);
14152	14347	}
14153	14348
14154	14349	public void mousePressed(MouseEvent e)
..	..	@@ -14187,10 +14382,12 @@
14187	14382	return;
14188	14383	}
14189	14384
14190		- 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;
14191	14388
14192	14389	// TIMER
14193		- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14390	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
14194	14391	{
14195	14392	keepboxmode = BOXMODE;
14196	14393	keepsupport = SUPPORT;
..	..	@@ -14231,7 +14428,7 @@
14231	14428	//}
14232	14429
14233	14430	SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
14234		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
	14431	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
14235	14432	anchorX = ax;
14236	14433	anchorY = ay;
14237	14434	prevX = px;
..	..	@@ -14326,8 +14523,9 @@
14326	14523	// fev 2014???
14327	14524	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
14328	14525	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14329		- pingthread.StepToTarget(true); // true);
	14526	+ pingthread.StepToTarget(); // true);
14330	14527	}
	14528	+
14331	14529	// if (!LIVE)
14332	14530	super.repaint();
14333	14531	}
..	..	@@ -14422,8 +14620,8 @@
14422	14620
14423	14621	//if (drawing)
14424	14622	//return;
14425		- if ((e.getModifiersEx() & CTRL) != 0
14426		- \|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
	14623	+ if ((e.getModifiersEx() & CTRL) != 0 \|\|
	14624	+ (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
14427	14625	{
14428	14626	//System.out.println("mouseDragged: " + e);
14429	14627	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
..	..	@@ -14447,9 +14645,17 @@
14447	14645	return targetLookAt;
14448	14646	}
14449	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	+
14450	14653	class PingThread extends Thread
14451	14654	{
14452	14655	boolean jump;
	14656	+ boolean live;
	14657	+
	14658	+ boolean mute = false;
14453	14659
14454	14660	// void JumpToTarget()
14455	14661	// {
..	..	@@ -14465,6 +14671,95 @@
14465	14671	// only one thread!? synchronized
14466	14672	void StepToTarget(boolean jump)
14467	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	+
14468	14763	tmp.set(targetLookAt);
14469	14764	tmp.sub(manipCamera.lookAt); // june 2014
14470	14765
..	..	@@ -14502,7 +14797,7 @@
14502	14797
14503	14798	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
14504	14799	{
14505		- jump = true; // step = 1;
	14800	+ // sep 2019 jump = true; // step = 1;
14506	14801	}
14507	14802
14508	14803	if (OEILONCE && OEIL)
..	..	@@ -14537,7 +14832,10 @@
14537	14832	if (tmp.dot(tmp) < 0.00001)
14538	14833	{
14539	14834	zoomonce = false;
	14835	+ live = false;
14540	14836	}
	14837	+ else
	14838	+ live = true;
14541	14839
14542	14840	tmp.mul(step > step2 ? step : step2);
14543	14841	}
..	..	@@ -14564,7 +14862,7 @@
14564	14862	{
14565	14863	if (LOOKAT)
14566	14864	manipCamera.lookAt.add(tmp);
14567		- if (OEIL)
	14865	+ if (OEIL && !capsLocked)
14568	14866	manipCamera.location.add(tmp);
14569	14867
14570	14868	{
..	..	@@ -14579,7 +14877,10 @@
14579	14877	lightCamera.computeTransform();
14580	14878	}
14581	14879	}
14582		- manipCamera.computeTransform();
	14880	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14881	+ {
	14882	+ manipCamera.computeTransform();
	14883	+ }
14583	14884	}
14584	14885	// ?????? mouseDown = true;
14585	14886	//System.out.println("---------------- ---------- Paint " + tmp.length2());
..	..	@@ -14672,11 +14973,32 @@
14672	14973	}
14673	14974	}
14674	14975	}
	14976	+
14675	14977	PingThread pingthread = new PingThread();
14676		- int delta = 5;
14677		- int speed = 5;
	14978	+ int delta = 1;
	14979	+ int speed = 1;
	14980	+ int walk = 8;
14678	14981	boolean autorepeat = false;
14679	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	+
14680	15002	void GoDown(int mod)
14681	15003	{
14682	15004	MODIFIERS \|= COMMAND;
..	..	@@ -14684,21 +15006,30 @@
14684	15006	/**/
14685	15007	if((mod&SHIFT) == SHIFT)
14686	15008	{
	15009	+// if (isVR)
	15010	+// manipCamera.RotateInterest(0, speed);
	15011	+// else
14687	15012	if (isVR)
14688		- manipCamera.RotateInterest(0, -speed);
	15013	+ ViewAngle(-speed*delta);
	15014	+ else
	15015	+ manipCamera.Translate(0, -speed*delta, getWidth());
	15016	+ }
	15017	+ else
	15018	+ {
	15019	+ if (isVR)
	15020	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
14689	15021	else
14690	15022	manipCamera.RotatePosition(0, -speed);
14691	15023	}
14692		- else
14693		- manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	15024	+
14694	15025	/**/
14695		- if ((mod & SHIFT) == SHIFT)
14696		- {
14697		- mouseMode = mouseMode; // VR??
14698		- } else
14699		- {
14700		- mouseMode \|= BACKFORTH;
14701		- }
	15026	+// if ((mod & SHIFT) == SHIFT)
	15027	+// {
	15028	+// mouseMode = mouseMode; // VR??
	15029	+// } else
	15030	+// {
	15031	+// mouseMode \|= BACKFORTH;
	15032	+// }
14702	15033
14703	15034	targetLookAt.set(manipCamera.lookAt);
14704	15035
..	..	@@ -14708,27 +15039,38 @@
14708	15039
14709	15040	void GoUp(int mod)
14710	15041	{
	15042	+ RigidBody.justclicked = true;
	15043	+
14711	15044	MODIFIERS \|= COMMAND;
14712	15045	/**/
14713	15046	boolean isVR = (mouseMode&VR)!=0;
14714	15047
14715	15048	if((mod&SHIFT) == SHIFT)
14716	15049	{
	15050	+// if (isVR)
	15051	+// manipCamera.RotateInterest(0, -speed);
	15052	+// else
14717	15053	if (isVR)
14718		- manipCamera.RotateInterest(0, speed);
	15054	+ ViewAngle(speed*delta);
	15055	+ else
	15056	+ manipCamera.Translate(0, speed*delta, getWidth());
	15057	+ }
	15058	+ else
	15059	+ {
	15060	+ if (isVR)
	15061	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
14719	15062	else
14720	15063	manipCamera.RotatePosition(0, speed);
14721	15064	}
14722		- else
14723		- manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	15065	+
14724	15066	/**/
14725		- if ((mod & SHIFT) == SHIFT)
14726		- {
14727		- mouseMode = mouseMode;
14728		- } else
14729		- {
14730		- mouseMode \|= BACKFORTH;
14731		- }
	15067	+// if ((mod & SHIFT) == SHIFT)
	15068	+// {
	15069	+// mouseMode = mouseMode;
	15070	+// } else
	15071	+// {
	15072	+// mouseMode \|= BACKFORTH;
	15073	+// }
14732	15074
14733	15075	targetLookAt.set(manipCamera.lookAt);
14734	15076
..	..	@@ -14741,23 +15083,27 @@
14741	15083	MODIFIERS \|= COMMAND;
14742	15084	/**/
14743	15085	if((mod&SHIFT) == SHIFT)
14744		- manipCamera.Translate(speed*delta, 0, getWidth());
	15086	+ manipCamera.Translate(speed, 0, getWidth());
14745	15087	else
14746	15088	{
14747	15089	if ((mouseMode&VR)!=0)
14748		- manipCamera.RotateInterest(-speed, 0);
	15090	+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
14749	15091	else
14750		- manipCamera.RotatePosition(speed, 0);
	15092	+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
14751	15093	}
	15094	+
14752	15095	/**/
14753		- if ((mod & SHIFT) == SHIFT)
14754		- {
14755		- mouseMode = mouseMode;
14756		- } else
14757		- {
14758		- mouseMode \|= ROTATE;
14759		- } // TRANSLATE;
	15096	+// if ((mod & SHIFT) == SHIFT)
	15097	+// {
	15098	+// mouseMode = mouseMode;
	15099	+// } else
	15100	+// {
	15101	+// mouseMode \|= ROTATE;
	15102	+// } // TRANSLATE;
14760	15103
	15104	+ //System.err.println("lookAt = " + manipCamera.lookAt);
	15105	+ //System.err.println("location = " + manipCamera.location);
	15106	+
14761	15107	targetLookAt.set(manipCamera.lookAt);
14762	15108
14763	15109	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
..	..	@@ -14769,23 +15115,23 @@
14769	15115	MODIFIERS \|= COMMAND;
14770	15116	/**/
14771	15117	if((mod&SHIFT) == SHIFT)
14772		- manipCamera.Translate(-speed*delta, 0, getWidth());
	15118	+ manipCamera.Translate(-speed, 0, getWidth());
14773	15119	else
14774	15120	{
14775	15121	if ((mouseMode&VR)!=0)
14776		- manipCamera.RotateInterest(speed, 0);
	15122	+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
14777	15123	else
14778		- manipCamera.RotatePosition(-speed, 0);
	15124	+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
14779	15125	}
14780	15126
14781	15127	/**/
14782		- if ((mod & SHIFT) == SHIFT)
14783		- {
14784		- mouseMode = mouseMode;
14785		- } else
14786		- {
14787		- mouseMode \|= ROTATE;
14788		- } // TRANSLATE;
	15128	+// if ((mod & SHIFT) == SHIFT)
	15129	+// {
	15130	+// mouseMode = mouseMode;
	15131	+// } else
	15132	+// {
	15133	+// mouseMode \|= ROTATE;
	15134	+// } // TRANSLATE;
14789	15135
14790	15136	targetLookAt.set(manipCamera.lookAt);
14791	15137
..	..	@@ -14922,6 +15268,11 @@
14922	15268	if ((mouseMode & ZOOM) != 0)
14923	15269	{
14924	15270	//if ((mouseMode & BACKFORTH) != 0)
	15271	+ if ((modifiersex & SHIFT) == SHIFT)
	15272	+ {
	15273	+ ViewAngle(dy);
	15274	+ }
	15275	+ else
14925	15276	if ((mouseMode & VR) != 0)
14926	15277	manipCamera.BackForth(dx, dy, getWidth());
14927	15278	else
..	..	@@ -14992,6 +15343,9 @@
14992	15343
14993	15344	public void mouseMoved(MouseEvent e)
14994	15345	{
	15346	+//object.editWindow.frame.
	15347	+ setCursor(Cursor.getDefaultCursor());
	15348	+
14995	15349	//System.out.println("mouseMoved: " + e);
14996	15350	if (isRenderer)
14997	15351	return;
..	..	@@ -15020,6 +15374,12 @@
15020	15374
15021	15375	public void mouseReleased(MouseEvent e)
15022	15376	{
	15377	+ if (isRenderer && !movingcamera)
	15378	+ {
	15379	+ RigidBody.justclicked = true;
	15380	+ System.out.println("justclicked: " + e);
	15381	+ }
	15382	+
15023	15383	Globals.MOUSEDRAGGED = false;
15024	15384
15025	15385	movingcamera = false;
..	..	@@ -15176,8 +15536,10 @@
15176	15536	mouseMode \|= ZOOM;
15177	15537	}
15178	15538
15179		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
15180		- 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)
15181	15543	{
15182	15544	mouseMode \|= VR; // BACKFORTH;
15183	15545	}
..	..	@@ -15189,7 +15551,8 @@
15189	15551	{
15190	15552	mouseMode \|= SELECT;
15191	15553	}
15192		- if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	15554	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15555	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15193	15556	{
15194	15557	mouseMode &= ~VR;
15195	15558	mouseMode \|= TRANSLATE;
..	..	@@ -15233,8 +15596,18 @@
15233	15596	float SATPOW = 1; // 2; // 0.5f;
15234	15597	float BRIPOW = 1; // 0.5f; // 0.5f;
15235	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	+
15236	15605	public void keyPressed(int key)
15237	15606	{
	15607	+// Set the blank cursor to the JFrame.
	15608	+//object.editWindow.frame.
	15609	+ setCursor(blankCursor);
	15610	+
15238	15611	if (key >= '0' && key <= '5')
15239	15612	clampbit = (key-'0');
15240	15613
..	..	@@ -15393,8 +15766,8 @@
15393	15766	RevertCamera();
15394	15767	repaint();
15395	15768	break;
15396		- case 'l':
15397		- //case 'L':
	15769	+ //case 'l':
	15770	+ case 'L':
15398	15771	if (lightMode)
15399	15772	{
15400	15773	lightMode = false;
..	..	@@ -15424,7 +15797,8 @@
15424	15797	break;
15425	15798	case 'm':
15426	15799	{
15427		- PrintMemory();
	15800	+ //PrintMemory();
	15801	+ ToggleImageFlip();
15428	15802	break;
15429	15803	}
15430	15804	case 'M':
..	..	@@ -15451,9 +15825,9 @@
15451	15825	repaint();
15452	15826	break;
15453	15827	case 'O':
15454		- Globals.drawMode = OCCLUSION; // WARNING
15455		- repaint();
15456		- break;
	15828	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
	15829	+ //repaint();
	15830	+ //break;
15457	15831	case 'o':
15458	15832	OCCLUSION_CULLING ^= true;
15459	15833	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
..	..	@@ -15545,7 +15919,21 @@
15545	15919	// kompactbit = 6;
15546	15920	// break;
15547	15921	case ' ':
	15922	+ capsLocked ^= true;
	15923	+ repaint();
	15924	+ break;
	15925	+ case 'l':
15548	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	+
15549	15937	Globals.lighttouched = true;
15550	15938	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15551	15939	targetLookAt.set(manipCamera.lookAt);
..	..	@@ -15553,6 +15941,10 @@
15553	15941	break;
15554	15942	//case '`' :
15555	15943	case ESC:
	15944	+ if (FULLSCREEN)
	15945	+ object.editWindow.ToggleFullScreen();
	15946	+ break;
	15947	+ case 'p':
15556	15948	RENDERPROGRAM += 1;
15557	15949	RENDERPROGRAM %= 3;
15558	15950
..	..	@@ -15591,6 +15983,10 @@
15591	15983	case ENTER:
15592	15984	// object.editWindow.ScreenFit(); // Edit();
15593	15985	ToggleLive();
	15986	+ if (capsLocked)
	15987	+ {
	15988	+ Globals.WALK ^= true;
	15989	+ }
15594	15990	break;
15595	15991	case DELETE:
15596	15992	ClearSelection();
..	..	@@ -15627,17 +16023,23 @@
15627	16023	object.GetWindow().refreshContents(true);
15628	16024	break;
15629	16025	case '{':
15630		- manipCamera.shaper_fovy /= 1.1;
	16026	+ double factor = 1.1;
	16027	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16028	+ manipCamera.shaper_fovy /= factor;
15631	16029	System.out.println("FOV = " + manipCamera.shaper_fovy);
15632	16030	repaint();
15633	16031	break;
15634	16032	case '}':
15635		- manipCamera.shaper_fovy *= 1.1;
	16033	+ factor = 1.1;
	16034	+ if (manipCamera.shaper_fovy * factor < 150)
	16035	+ manipCamera.shaper_fovy *= factor;
15636	16036	System.out.println("FOV = " + manipCamera.shaper_fovy);
15637	16037	repaint();
15638	16038	break;
15639	16039	case '[':
15640		- manipCamera.shaper_fovy /= 1.01;
	16040	+ factor = 1.01;
	16041	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16042	+ manipCamera.shaper_fovy /= factor;
15641	16043	if (false) //manipCamera.hAspect == 0)
15642	16044	{
15643	16045	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15653,7 +16055,9 @@
15653	16055	break;
15654	16056	case ']':
15655	16057	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15656		- manipCamera.shaper_fovy *= 1.01;
	16058	+ factor = 1.01;
	16059	+ if (manipCamera.shaper_fovy * factor < 150)
	16060	+ manipCamera.shaper_fovy *= factor;
15657	16061	if (false) //manipCamera.hAspect == 0)
15658	16062	{
15659	16063	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15691,98 +16095,113 @@
15691	16095	}
15692	16096	}
15693	16097
	16098	+ boolean keys[] = new boolean[256];
	16099	+ int speedkey[] = new int[256];
	16100	+ int modifiers = 0;
	16101	+
15694	16102	public void processKeyEvent(KeyEvent e)
15695	16103	{
15696	16104	switch (e.getID())
15697	16105	{
15698	16106	case KeyEvent.KEY_PRESSED:
15699		- if (!autorepeat)
15700		- {
15701		- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15702		- keyPressed(e.getKeyChar(), e.getModifiersEx());
15703		- }
15704		- if (manipCamera == lightCamera)
15705		- {
15706		- switch (e.getKeyCode())
15707		- {
15708		- case DOWN_ARROW:
15709		- lightCamera.DECAL /= 2;
15710		- repaint();
15711		- break;
15712		- case UP_ARROW:
15713		- lightCamera.DECAL *= 2;
15714		- repaint();
15715		- break;
15716		- case LEFT_ARROW:
15717		- lightCamera.SCALE /= 2;
15718		- repaint();
15719		- break;
15720		- case RIGHT_ARROW:
15721		- lightCamera.SCALE *= 2;
15722		- repaint();
15723		- break;
15724		- default:
15725		- break;
15726		- }
15727		-
15728		- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15729		- } else
15730		- {
15731		- if (true) // !autorepeat)
15732		- {
15733		- boolean reset = true;
15734		-
15735		- switch (e.getKeyCode())
15736		- {
15737		- case DOWN_ARROW:
15738		- GoDown(e.getModifiersEx());
15739		- repaint();
15740		- break;
15741		- case UP_ARROW:
15742		- GoUp(e.getModifiersEx());
15743		- repaint();
15744		- break;
15745		- case LEFT_ARROW:
15746		- GoLeft(e.getModifiersEx());
15747		- repaint();
15748		- break;
15749		- case RIGHT_ARROW:
15750		- GoRight(e.getModifiersEx());
15751		- repaint();
15752		- break;
15753		- default:
15754		- reset = false;
15755		- break;
15756		- }
15757		-
15758		- if (reset)
15759		- {
15760		- autorepeat = true;
15761		-
15762		- targetLookAt.set(manipCamera.lookAt);
15763		- }
15764		- }
15765		- }
	16107	+ keys[e.getKeyCode()] = true;
	16108	+ modifiers = e.getModifiersEx();
	16109	+ keyPressed(e.getKeyChar(), modifiers);
	16110	+ //Globals.theRenderer.keyPressed(e.getKeyChar());
	16111	+ repaint();
15766	16112	break;
15767		- case KeyEvent.KEY_TYPED:
15768		- 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;
15769	16183	case KeyEvent.KEY_RELEASED:
15770		- {
15771		- switch (e.getKeyCode())
15772		- {
15773		- case DOWN_ARROW:
15774		- case UP_ARROW:
15775		- case LEFT_ARROW:
15776		- case RIGHT_ARROW:
15777		- MODIFIERS &= ~COMMAND;
15778		- autorepeat = false;
15779		- break;
15780		- default:
15781		- break;
15782		- }
	16184	+ keys[e.getKeyCode()] = false;
	16185	+ modifiers = e.getModifiersEx();
15783	16186	keyReleased(e.getKeyChar(), e.getModifiersEx());
	16187	+ repaint();
15784	16188	break;
15785		- }
	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	+// }
15786	16205	default:
15787	16206	break;
15788	16207	}
..	..	@@ -16358,7 +16777,8 @@
16358	16777
16359	16778	public boolean mouseDrag(Event evt, int x, int y)
16360	16779	{
16361		- //System.out.println("mouseDrag: " + evt);
	16780	+ System.out.println("mouseDrag: " + evt);
	16781	+ System.exit(0);
16362	16782	/*
16363	16783	drag = true;
16364	16784	//System.out.println("Mouse DRAG");
..	..	@@ -16477,6 +16897,7 @@
16477	16897	public boolean mouseUp(Event evt, int x, int y)
16478	16898	{
16479	16899	System.out.println("mouseUp: " + evt);
	16900	+ System.exit(0);
16480	16901	/*
16481	16902	locked = false;
16482	16903	if (isRenderer)
..	..	@@ -16747,7 +17168,7 @@
16747	17168	return;
16748	17169	}
16749	17170
16750		- if (WIREFRAME)
	17171	+ //if (WIREFRAME)
16751	17172	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
16752	17173
16753	17174	gl.glDisable(gl.GL_CULL_FACE);
..	..	@@ -16847,6 +17268,8 @@
16847	17268
16848	17269	if (WIREFRAME)
16849	17270	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_LINE);
	17271	+ else
	17272	+ gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
16850	17273	}
16851	17274
16852	17275	private void DrawChecker(GL gl)
..	..	@@ -16895,7 +17318,7 @@
16895	17318	gl.glScalef(1.0f, -1.0f, 1.0f);
16896	17319	}
16897	17320
16898		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	17321	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16899	17322
16900	17323	float step = 2; // 0.1666f; //0.25f;
16901	17324	float stepv = 2; // step * 1652 / 998;
..	..	@@ -17184,7 +17607,7 @@
17184	17607
17185	17608	float depth = depths[y * TEX_SIZE + x];
17186	17609
17187		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17610	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
17188	17611	{
17189	17612	pointselection = false;
17190	17613
..	..	@@ -17848,6 +18271,11 @@
17848	18271	static boolean DEBUG_SELECTION = false;
17849	18272	boolean OCCLUSION_CULLING = false; //true;
17850	18273	public boolean lightMode = false;
	18274	+
	18275	+ private boolean keepshadow;
	18276	+
	18277	+ static public boolean capsLocked = false; // VR
	18278	+
17851	18279	static public int indexcount = 0;
17852	18280	/static/ cColor vertexOcclusion = new cColor();
17853	18281	//private int selection_view = -1;