~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.*;
..	..	@@ -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
..	..	@@ -2064,7 +2065,7 @@
2064	2065
2065	2066	static int camerachangeframe;
2066	2067
2067		- public boolean SetCamera(Camera cam)
	2068	+ public boolean SetCamera(Camera cam, boolean set)
2068	2069	{
2069	2070	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
2070	2071	// return false;
..	..	@@ -2082,7 +2083,8 @@
2082	2083
2083	2084	camerachangeframe = Globals.framecount;
2084	2085
2085		- cam.hAspect = -1; // Read only
	2086	+ if (cam != null)
	2087	+ cam.hAspect = -1; // Read only
2086	2088
2087	2089	cameras[0] = cam;
2088	2090	targetLookAts[0] = new cVector(cam.lookAt);
..	..	@@ -2092,11 +2094,14 @@
2092	2094	{
2093	2095	cameras[i] = new Camera(cam.viewCode);
2094	2096	}
2095		-
2096		- cameras[i].setAim(cam.location, cam.lookAt);
2097		- cameras[i].shaper_fovy = cam.shaper_fovy;
2098		- cameras[i].UP.set(cam.UP);
2099		- 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	+ }
2100	2105	}
2101	2106	cameracount = 0;
2102	2107	targetLookAt = targetLookAts[cameracount];
..	..	@@ -2105,7 +2110,7 @@
2105	2110	// Start with free camera
2106	2111	SwitchCameras(true);
2107	2112
2108		- pingthread.jump = true; // optional?
	2113	+// pingthread.jump = true; // optional?
2109	2114
2110	2115	if (TRACKONCE)
2111	2116	{
..	..	@@ -2292,18 +2297,6 @@
2292	2297	public void ToggleTrack()
2293	2298	{
2294	2299	TRACK ^= true;
2295		- if (TRACK)
2296		- {
2297		- if (object.selection != null &&
2298		- object.selection.size() > 0 &&
2299		- object.selection.elementAt(0) != null &&
2300		- !(object.selection.elementAt(0) instanceof Camera) &&
2301		- !(object.selection.elementAt(0) instanceof ScriptNode))
2302		- {
2303		- trackedobject = object.selection.elementAt(0);
2304		- repaint();
2305		- }
2306		- }
2307	2300
2308	2301	repaint();
2309	2302	}
..	..	@@ -2395,7 +2388,8 @@
2395	2388	{
2396	2389	//System.out.println("PROTECTION = " + cam.hAspect);
2397	2390	//assert (cam.hAspect == 0);
2398		- cam.hAspect = 0;
	2391	+ if (cam != null)
	2392	+ cam.hAspect = 0;
2399	2393	lightCamera = cam;
2400	2394	}
2401	2395
..	..	@@ -3596,6 +3590,8 @@
3596	3590	};
3597	3591	/**/
3598	3592
	3593	+ static Object3D lastObject;
	3594	+
3599	3595	//com.sun.opengl.util.texture.Texture
3600	3596	TextureData
3601	3597	GetFileTexture(String name, boolean bump, int resolution)
..	..	@@ -3632,6 +3628,8 @@
3632	3628	// return null;
3633	3629	//if (i == 2)
3634	3630	// return null;
	3631	+ // TIFF issue sept 2019
	3632	+ System.err.println("lastObject = " + lastObject);
3635	3633	e.printStackTrace();
3636	3634	name = name.split("\\.tif")[0] + ".jpg";
3637	3635	}
..	..	@@ -6964,30 +6962,30 @@
6964	6962	short residu = 0;
6965	6963
6966	6964	// wraparound workarounds
6967		- short fuck = (short) (buffer[i] & 0xFF);
	6965	+ short ww = (short) (buffer[i] & 0xFF);
6968	6966	/*
6969		- residu += (fuck%2);
6970		- if(fuck/2 < 256-residu/2)
	6967	+ residu += (ww%2);
	6968	+ if(ww/2 < 256-residu/2)
6971	6969	{
6972		- fuck = (short)((fuck/2) + residu/2);
	6970	+ ww = (short)((ww/2) + residu/2);
6973	6971	if(residu == 2)
6974	6972	residu = 0;
6975	6973	}
6976	6974	else
6977	6975	{
6978	6976	residu = 0;
6979		- fuck /= 2;
	6977	+ ww /= 2;
6980	6978	}
6981	6979	*/
6982		- if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| fuck >= 254)
	6980	+ if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| ww >= 254)
6983	6981	{
6984		- fuck /= 2;
	6982	+ ww /= 2;
6985	6983	} else
6986	6984	{
6987		- fuck = (short) ((fuck / 2) + fuck % 2);
	6985	+ ww = (short) ((ww / 2) + ww % 2);
6988	6986	}
6989	6987
6990		- buffer[i] = (byte) fuck;
	6988	+ buffer[i] = (byte) ww;
6991	6989	}
6992	6990	//System.out.print(bytes[i] + " ");
6993	6991	//if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
..	..	@@ -8454,12 +8452,12 @@
8454	8452	{
8455	8453	// texturecache = textures.get(texname); // suspicious
8456	8454	if (texturecache == null)
8457		- texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8455	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.jpg", bump),resolution);
8458	8456	else
8459	8457	new Exception().printStackTrace();
8460	8458	} else
8461	8459	{
8462		- if (texname.startsWith("@"))
	8460	+ if (texname.startsWith("@") && textureon)
8463	8461	{
8464	8462	// texturecache = textures.get(texname); // suspicious
8465	8463	if (texturecache == null)
..	..	@@ -8642,7 +8640,9 @@
8642	8640	{
8643	8641	tex.bw = texturecache.texturedata.getWidth();
8644	8642	tex.bh = texturecache.texturedata.getHeight();
8645		- 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);
8646	8646	}
8647	8647	}
8648	8648	}
..	..	@@ -9840,7 +9840,10 @@
9840	9840	DrawSkyBox(gl, (float)rati);
9841	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9842	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9843		- accPerspective(gl, renderCamera.shaper_fovy / ratio,
	9843	+
	9844	+ boolean vr = capsLocked && !lightMode;
	9845	+
	9846	+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
9844	9847	ratio,
9845	9848	//near_plane, far_plane,
9846	9849	renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..	..	@@ -10712,7 +10715,7 @@
10712	10715	if (patchMaterial.patchMaterial)
10713	10716	{
10714	10717	patchMaterial.patchMaterial = false;
10715		- patchMaterial.objectPanel.setSelectedIndex(1);
	10718	+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
10716	10719	}
10717	10720
10718	10721	if (Grafreed.savesound && Grafreed.hassound)
..	..	@@ -10810,6 +10813,112 @@
10810	10813
10811	10814	if (DrawMode() == DEFAULT)
10812	10815	{
	10816	+ if (manipCamera == lightCamera)
	10817	+ {
	10818	+// switch (e.getKeyCode())
	10819	+// {
	10820	+// case DOWN_ARROW:
	10821	+// lightCamera.DECAL /= 2;
	10822	+// repaint();
	10823	+// break;
	10824	+// case UP_ARROW:
	10825	+// lightCamera.DECAL *= 2;
	10826	+// repaint();
	10827	+// break;
	10828	+// case LEFT_ARROW:
	10829	+// lightCamera.SCALE /= 2;
	10830	+// repaint();
	10831	+// break;
	10832	+// case RIGHT_ARROW:
	10833	+// lightCamera.SCALE *= 2;
	10834	+// repaint();
	10835	+// break;
	10836	+// default:
	10837	+// break;
	10838	+ if (keys[DOWN_ARROW])
	10839	+ {
	10840	+ lightCamera.DECAL /= 2;
	10841	+ }
	10842	+
	10843	+ if (keys[UP_ARROW])
	10844	+ {
	10845	+ lightCamera.DECAL *= 2;
	10846	+ }
	10847	+
	10848	+ if (keys[LEFT_ARROW])
	10849	+ {
	10850	+ lightCamera.SCALE /= 2;
	10851	+ }
	10852	+
	10853	+ if (keys[RIGHT_ARROW])
	10854	+ {
	10855	+ lightCamera.SCALE *= 2;
	10856	+ }
	10857	+ }
	10858	+ else
	10859	+ {
	10860	+ //pingthread.mute = true;
	10861	+
	10862	+ boolean keyon = false;
	10863	+
	10864	+ if (keys[DOWN_ARROW])
	10865	+ {
	10866	+ speed = ++speedkey[DOWN_ARROW];
	10867	+ if (speed > 20)
	10868	+ speed = 20;
	10869	+ GoDown(modifiers);
	10870	+ keyon = true;
	10871	+ }
	10872	+ else
	10873	+ speedkey[DOWN_ARROW] = 0;
	10874	+
	10875	+ if (keys[UP_ARROW])
	10876	+ {
	10877	+ speed = ++speedkey[UP_ARROW];
	10878	+ if (speed > 20)
	10879	+ speed = 20;
	10880	+ GoUp(modifiers);
	10881	+ keyon = true;
	10882	+ }
	10883	+ else
	10884	+ speedkey[UP_ARROW] = 0;
	10885	+
	10886	+ if (keys[LEFT_ARROW])
	10887	+ {
	10888	+ speed = ++speedkey[LEFT_ARROW];
	10889	+ if (speed > 20)
	10890	+ speed = 20;
	10891	+ GoLeft(modifiers);
	10892	+ keyon = true;
	10893	+ }
	10894	+ else
	10895	+ speedkey[LEFT_ARROW] = 0;
	10896	+
	10897	+ if (keys[RIGHT_ARROW])
	10898	+ {
	10899	+ speed = ++speedkey[RIGHT_ARROW];
	10900	+ if (speed > 20)
	10901	+ speed = 20;
	10902	+ GoRight(modifiers);
	10903	+ keyon = true;
	10904	+ }
	10905	+ else
	10906	+ speedkey[RIGHT_ARROW] = 0;
	10907	+
	10908	+ if (Globals.WALK && capsLocked)
	10909	+ {
	10910	+ Walk();
	10911	+ keyon = true;
	10912	+ }
	10913	+
	10914	+ if (keyon)
	10915	+ {
	10916	+ repaint();
	10917	+ }
	10918	+
	10919	+ //pingthread.mute = false;
	10920	+ }
	10921	+
10813	10922	currentlydrawing = true;
10814	10923	}
10815	10924
..	..	@@ -11334,9 +11443,9 @@
11334	11443
11335	11444	gl.glMatrixMode(GL.GL_MODELVIEW);
11336	11445
11337		-gl.glEnable(gl.GL_POLYGON_SMOOTH);
11338		-gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11339		-gl.glEnable(gl.GL_MULTISAMPLE);
	11446	+//gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11447	+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11448	+//gl.glEnable(gl.GL_MULTISAMPLE);
11340	11449	} else
11341	11450	{
11342	11451	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11397,7 +11506,10 @@
11397	11506	//gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
11398	11507	} else
11399	11508	{
11400		- glu.gluPerspective(cam.shaper_fovy / ratio, ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
	11509	+ boolean vr = capsLocked && !lightMode;
	11510	+
	11511	+ glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1),
	11512	+ ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
11401	11513	}
11402	11514	}
11403	11515
..	..	@@ -11753,8 +11865,11 @@
11753	11865	repaint();
11754	11866	}
11755	11867
11756		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11868	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11869	+ {
	11870	+ renderCamera.computeTransform();
11757	11871	repaint();
	11872	+ }
11758	11873
11759	11874	displaydone = true;
11760	11875	}
..	..	@@ -11829,9 +11944,23 @@
11829	11944	//GL gl = getGL();
11830	11945	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11831	11946	{
	11947	+ if (TRACK)
	11948	+ {
	11949	+ if (object.selection != null &&
	11950	+ object.selection.size() > 0 &&
	11951	+ object.selection.elementAt(0) != null &&
	11952	+ !(object.selection.elementAt(0) instanceof Camera) &&
	11953	+ !(object.selection.elementAt(0) instanceof ScriptNode))
	11954	+ {
	11955	+ trackedobject = object.selection.elementAt(0);
	11956	+ //repaint();
	11957	+ }
	11958	+ else
	11959	+ trackedobject = null;
	11960	+ }
11832	11961	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11833	11962	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11834		- pingthread.StepToTarget(true); // true);
	11963	+ pingthread.StepToTarget(); // true);
11835	11964	// zoomonce = false;
11836	11965	}
11837	11966
..	..	@@ -12952,12 +13081,7 @@
12952	13081	"ADD temp.x, temp.x, one.x;" +
12953	13082	"MUL normal, normal, temp.xxxx;":""
12954	13083	) +
12955		- /**/
12956		-//// Normalize("normal") +
12957		-//// "MAX normal.z, eps.x, normal.z;" +
12958		-// Normalize("normal") +
12959		- "MOV normald, normal;" +
12960		- "MOV normals, normal;" +
	13084	+ /**/
12961	13085
12962	13086	"MOV temp, fragment.texcoord[4];" +
12963	13087
..	..	@@ -12975,6 +13099,17 @@
12975	13099	"XPD U, V, normal;" +
12976	13100	Normalize("U") +
12977	13101
	13102	+ "MOV temp, fragment.texcoord[0];" +
	13103	+
	13104	+// "MAD normal, -temp.x, U, normal;" +
	13105	+// "MAD normal, -temp.y, V, normal;" +
	13106	+// Normalize("normal") +
	13107	+
	13108	+//// "MAX normal.z, eps.x, normal.z;" +
	13109	+// Normalize("normal") +
	13110	+ "MOV normald, normal;" +
	13111	+ "MOV normals, normal;" +
	13112	+
12978	13113	// parallax mapping
12979	13114
12980	13115	"DP3 temp2.x, V, eye;" +
..	..	@@ -12987,17 +13122,15 @@
12987	13122	"RCP temp2.w, temp2.w;" +
12988	13123
12989	13124	"SUB temp2.w, temp2.w, half;" +
12990		-// "SGE temp.x, temp2.w, eps.x;" +
12991		-// "MUL temp2.w, temp2.w, temp.x;" +
	13125	+ // "SGE temp.x, temp2.w, eps.x;" +
	13126	+ // "MUL temp2.w, temp2.w, temp.x;" +
12992	13127
12993		- //"MOV texSamp, U;" +
	13128	+ // "MOV texSamp, U;" +
12994	13129
12995	13130	"MUL temp2.z, temp2.z, temp2.w;" +
12996	13131	"MUL temp2.z, temp2.z, params7.z;" + // parallax
12997	13132
12998	13133	"MUL temp2, temp2, temp2.z;" +
12999		-
13000		- "MOV temp, fragment.texcoord[0];" +
13001	13134
13002	13135	"SUB temp, temp, temp2;" +
13003	13136
..	..	@@ -14208,10 +14341,13 @@
14208	14341	public void mouseClicked(MouseEvent e)
14209	14342	{
14210	14343	System.out.println("mouseClicked: " + e);
	14344	+ System.exit(0);
14211	14345	}
14212	14346
14213	14347	public void mousePressed(MouseEvent e)
14214	14348	{
	14349	+ RigidBody.justclicked = true;
	14350	+ System.out.println("justclicked: " + e);
14215	14351	//System.out.println("mousePressed: " + e);
14216	14352	clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
14217	14353	}
..	..	@@ -14246,10 +14382,12 @@
14246	14382	return;
14247	14383	}
14248	14384
14249		- 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;
14250	14388
14251	14389	// TIMER
14252		- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14390	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
14253	14391	{
14254	14392	keepboxmode = BOXMODE;
14255	14393	keepsupport = SUPPORT;
..	..	@@ -14290,7 +14428,7 @@
14290	14428	//}
14291	14429
14292	14430	SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
14293		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
	14431	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
14294	14432	anchorX = ax;
14295	14433	anchorY = ay;
14296	14434	prevX = px;
..	..	@@ -14385,8 +14523,9 @@
14385	14523	// fev 2014???
14386	14524	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
14387	14525	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14388		- pingthread.StepToTarget(true); // true);
	14526	+ pingthread.StepToTarget(); // true);
14389	14527	}
	14528	+
14390	14529	// if (!LIVE)
14391	14530	super.repaint();
14392	14531	}
..	..	@@ -14481,8 +14620,8 @@
14481	14620
14482	14621	//if (drawing)
14483	14622	//return;
14484		- if ((e.getModifiersEx() & CTRL) != 0
14485		- \|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
	14623	+ if ((e.getModifiersEx() & CTRL) != 0 \|\|
	14624	+ (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
14486	14625	{
14487	14626	//System.out.println("mouseDragged: " + e);
14488	14627	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
..	..	@@ -14506,9 +14645,17 @@
14506	14645	return targetLookAt;
14507	14646	}
14508	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	+
14509	14653	class PingThread extends Thread
14510	14654	{
14511	14655	boolean jump;
	14656	+ boolean live;
	14657	+
	14658	+ boolean mute;
14512	14659
14513	14660	// void JumpToTarget()
14514	14661	// {
..	..	@@ -14524,6 +14671,88 @@
14524	14671	// only one thread!? synchronized
14525	14672	void StepToTarget(boolean jump)
14526	14673	{
	14674	+ RigidBody.pos.x = 0;
	14675	+ RigidBody.pos.y = 0;
	14676	+ RigidBody.pos.z = 0;
	14677	+ if (RigidBody.justclicked)
	14678	+ {
	14679	+ RigidBody.pos.x = (float)manipCamera.lookAt.x;
	14680	+ RigidBody.pos.y = (float)manipCamera.lookAt.y;
	14681	+ RigidBody.pos.z = (float)manipCamera.lookAt.z;
	14682	+ RigidBody.wind.set(RigidBody.pos);
	14683	+ RigidBody.wind.x -= (float)manipCamera.location.x;
	14684	+ RigidBody.wind.y -= (float)manipCamera.location.y;
	14685	+ RigidBody.wind.z -= (float)manipCamera.location.z;
	14686	+ RigidBody.wind.normalize();
	14687	+ }
	14688	+
	14689	+ if (mute)
	14690	+ return;
	14691	+
	14692	+ if (capsLocked && manipCamera.viewCode == 0)
	14693	+ {
	14694	+ eye.x = manipCamera.location.x;
	14695	+ eye.y = manipCamera.location.y + 0.25;
	14696	+ eye.z = manipCamera.location.z;
	14697	+
	14698	+ dir.y = -1;
	14699	+
	14700	+ Ray ray = new Ray(eye, dir);
	14701	+
	14702	+ IntersectResult res = new IntersectResult();
	14703	+ res.t = Double.POSITIVE_INFINITY;
	14704	+
	14705	+ tmp.set(targetLookAt);
	14706	+ tmp.sub(manipCamera.location);
	14707	+
	14708	+ double dist = tmp.length();
	14709	+
	14710	+ tmp.normalize();
	14711	+
	14712	+ eye2.x = manipCamera.location.x + tmp.x * 0.25;
	14713	+ eye2.y = manipCamera.location.y + 0.25;
	14714	+ eye2.z = manipCamera.location.z + tmp.z * 0.25;
	14715	+
	14716	+ Ray ray2 = new Ray(eye2, dir);
	14717	+
	14718	+ IntersectResult res2 = new IntersectResult();
	14719	+ res2.t = Double.POSITIVE_INFINITY;
	14720	+
	14721	+ if (object.intersect(ray, res) && object.intersect(ray2, res2) && Math.abs(res.t - res2.t) < 0.25)
	14722	+ {
	14723	+ //tmp.set(manipCamera.location);
	14724	+
	14725	+ manipCamera.location.x = ray.eyePoint.x + ray.viewDirection.x * res.t;
	14726	+ manipCamera.location.y = ray.eyePoint.y + ray.viewDirection.y * res.t + 0.5;
	14727	+ manipCamera.location.z = ray.eyePoint.z + ray.viewDirection.z * res.t;
	14728	+
	14729	+ //tmp.sub(manipCamera.location);
	14730	+
	14731	+ targetLookAt.x = ray2.eyePoint.x + ray2.viewDirection.x * res2.t;
	14732	+ targetLookAt.y = ray2.eyePoint.y + ray2.viewDirection.y * res2.t + 0.5;
	14733	+ targetLookAt.z = ray2.eyePoint.z + ray2.viewDirection.z * res2.t;
	14734	+
	14735	+ targetLookAt.sub(manipCamera.location);
	14736	+ targetLookAt.normalize();
	14737	+ targetLookAt.mul(dist);
	14738	+ targetLookAt.add(manipCamera.location);
	14739	+
	14740	+ //if (tmp.dot(tmp) > 0.000001)
	14741	+ // System.out.println("INTERSECTION " + manipCamera.location);
	14742	+
	14743	+ manipCamera.lookAt.set(targetLookAt);
	14744	+
	14745	+ tmp.x = res.n.x;
	14746	+ tmp.y = res.n.y;
	14747	+ tmp.z = res.n.z;
	14748	+ tmp.x += res2.n.x;
	14749	+ tmp.y += res2.n.y;
	14750	+ tmp.z += res2.n.z;
	14751	+ tmp.normalize();
	14752	+ manipCamera.UP.set(tmp);
	14753	+ }
	14754	+ }
	14755	+
14527	14756	tmp.set(targetLookAt);
14528	14757	tmp.sub(manipCamera.lookAt); // june 2014
14529	14758
..	..	@@ -14561,7 +14790,7 @@
14561	14790
14562	14791	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
14563	14792	{
14564		- jump = true; // step = 1;
	14793	+ // sep 2019 jump = true; // step = 1;
14565	14794	}
14566	14795
14567	14796	if (OEILONCE && OEIL)
..	..	@@ -14596,7 +14825,10 @@
14596	14825	if (tmp.dot(tmp) < 0.00001)
14597	14826	{
14598	14827	zoomonce = false;
	14828	+ live = false;
14599	14829	}
	14830	+ else
	14831	+ live = true;
14600	14832
14601	14833	tmp.mul(step > step2 ? step : step2);
14602	14834	}
..	..	@@ -14623,7 +14855,7 @@
14623	14855	{
14624	14856	if (LOOKAT)
14625	14857	manipCamera.lookAt.add(tmp);
14626		- if (OEIL)
	14858	+ if (OEIL && !capsLocked)
14627	14859	manipCamera.location.add(tmp);
14628	14860
14629	14861	{
..	..	@@ -14638,7 +14870,10 @@
14638	14870	lightCamera.computeTransform();
14639	14871	}
14640	14872	}
14641		- manipCamera.computeTransform();
	14873	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14874	+ {
	14875	+ manipCamera.computeTransform();
	14876	+ }
14642	14877	}
14643	14878	// ?????? mouseDown = true;
14644	14879	//System.out.println("---------------- ---------- Paint " + tmp.length2());
..	..	@@ -14731,11 +14966,32 @@
14731	14966	}
14732	14967	}
14733	14968	}
	14969	+
14734	14970	PingThread pingthread = new PingThread();
14735		- int delta = 5;
14736		- int speed = 5;
	14971	+ int delta = 1;
	14972	+ int speed = 1;
	14973	+ int walk = 8;
14737	14974	boolean autorepeat = false;
14738	14975
	14976	+ void Walk()
	14977	+ {
	14978	+ manipCamera.BackForth(0, walk, 1000);
	14979	+
	14980	+ targetLookAt.set(manipCamera.lookAt);
	14981	+ }
	14982	+
	14983	+ void ViewAngle(float dy)
	14984	+ {
	14985	+ double factor = Math.exp(-dy/300.0); // (1 + dy/100);
	14986	+
	14987	+ if (manipCamera.shaper_fovy * factor > 1 &&
	14988	+ manipCamera.shaper_fovy * factor < 150)
	14989	+ {
	14990	+ manipCamera.shaper_fovy *= factor;
	14991	+ //System.out.println("fovy = " + shaper_fovy);
	14992	+ }
	14993	+ }
	14994	+
14739	14995	void GoDown(int mod)
14740	14996	{
14741	14997	MODIFIERS \|= COMMAND;
..	..	@@ -14743,21 +14999,30 @@
14743	14999	/**/
14744	15000	if((mod&SHIFT) == SHIFT)
14745	15001	{
	15002	+// if (isVR)
	15003	+// manipCamera.RotateInterest(0, speed);
	15004	+// else
14746	15005	if (isVR)
14747		- manipCamera.RotateInterest(0, -speed);
	15006	+ ViewAngle(-speed*delta);
	15007	+ else
	15008	+ manipCamera.Translate(0, -speed*delta, getWidth());
	15009	+ }
	15010	+ else
	15011	+ {
	15012	+ if (isVR)
	15013	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
14748	15014	else
14749	15015	manipCamera.RotatePosition(0, -speed);
14750	15016	}
14751		- else
14752		- manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	15017	+
14753	15018	/**/
14754		- if ((mod & SHIFT) == SHIFT)
14755		- {
14756		- mouseMode = mouseMode; // VR??
14757		- } else
14758		- {
14759		- mouseMode \|= BACKFORTH;
14760		- }
	15019	+// if ((mod & SHIFT) == SHIFT)
	15020	+// {
	15021	+// mouseMode = mouseMode; // VR??
	15022	+// } else
	15023	+// {
	15024	+// mouseMode \|= BACKFORTH;
	15025	+// }
14761	15026
14762	15027	targetLookAt.set(manipCamera.lookAt);
14763	15028
..	..	@@ -14767,27 +15032,38 @@
14767	15032
14768	15033	void GoUp(int mod)
14769	15034	{
	15035	+ RigidBody.justclicked = true;
	15036	+
14770	15037	MODIFIERS \|= COMMAND;
14771	15038	/**/
14772	15039	boolean isVR = (mouseMode&VR)!=0;
14773	15040
14774	15041	if((mod&SHIFT) == SHIFT)
14775	15042	{
	15043	+// if (isVR)
	15044	+// manipCamera.RotateInterest(0, -speed);
	15045	+// else
14776	15046	if (isVR)
14777		- manipCamera.RotateInterest(0, speed);
	15047	+ ViewAngle(speed*delta);
	15048	+ else
	15049	+ manipCamera.Translate(0, speed*delta, getWidth());
	15050	+ }
	15051	+ else
	15052	+ {
	15053	+ if (isVR)
	15054	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
14778	15055	else
14779	15056	manipCamera.RotatePosition(0, speed);
14780	15057	}
14781		- else
14782		- manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	15058	+
14783	15059	/**/
14784		- if ((mod & SHIFT) == SHIFT)
14785		- {
14786		- mouseMode = mouseMode;
14787		- } else
14788		- {
14789		- mouseMode \|= BACKFORTH;
14790		- }
	15060	+// if ((mod & SHIFT) == SHIFT)
	15061	+// {
	15062	+// mouseMode = mouseMode;
	15063	+// } else
	15064	+// {
	15065	+// mouseMode \|= BACKFORTH;
	15066	+// }
14791	15067
14792	15068	targetLookAt.set(manipCamera.lookAt);
14793	15069
..	..	@@ -14800,23 +15076,27 @@
14800	15076	MODIFIERS \|= COMMAND;
14801	15077	/**/
14802	15078	if((mod&SHIFT) == SHIFT)
14803		- manipCamera.Translate(speed*delta, 0, getWidth());
	15079	+ manipCamera.Translate(speed, 0, getWidth());
14804	15080	else
14805	15081	{
14806	15082	if ((mouseMode&VR)!=0)
14807		- manipCamera.RotateInterest(-speed, 0);
	15083	+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
14808	15084	else
14809		- manipCamera.RotatePosition(speed, 0);
	15085	+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
14810	15086	}
	15087	+
14811	15088	/**/
14812		- if ((mod & SHIFT) == SHIFT)
14813		- {
14814		- mouseMode = mouseMode;
14815		- } else
14816		- {
14817		- mouseMode \|= ROTATE;
14818		- } // TRANSLATE;
	15089	+// if ((mod & SHIFT) == SHIFT)
	15090	+// {
	15091	+// mouseMode = mouseMode;
	15092	+// } else
	15093	+// {
	15094	+// mouseMode \|= ROTATE;
	15095	+// } // TRANSLATE;
14819	15096
	15097	+ //System.err.println("lookAt = " + manipCamera.lookAt);
	15098	+ //System.err.println("location = " + manipCamera.location);
	15099	+
14820	15100	targetLookAt.set(manipCamera.lookAt);
14821	15101
14822	15102	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
..	..	@@ -14828,23 +15108,23 @@
14828	15108	MODIFIERS \|= COMMAND;
14829	15109	/**/
14830	15110	if((mod&SHIFT) == SHIFT)
14831		- manipCamera.Translate(-speed*delta, 0, getWidth());
	15111	+ manipCamera.Translate(-speed, 0, getWidth());
14832	15112	else
14833	15113	{
14834	15114	if ((mouseMode&VR)!=0)
14835		- manipCamera.RotateInterest(speed, 0);
	15115	+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
14836	15116	else
14837		- manipCamera.RotatePosition(-speed, 0);
	15117	+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
14838	15118	}
14839	15119
14840	15120	/**/
14841		- if ((mod & SHIFT) == SHIFT)
14842		- {
14843		- mouseMode = mouseMode;
14844		- } else
14845		- {
14846		- mouseMode \|= ROTATE;
14847		- } // TRANSLATE;
	15121	+// if ((mod & SHIFT) == SHIFT)
	15122	+// {
	15123	+// mouseMode = mouseMode;
	15124	+// } else
	15125	+// {
	15126	+// mouseMode \|= ROTATE;
	15127	+// } // TRANSLATE;
14848	15128
14849	15129	targetLookAt.set(manipCamera.lookAt);
14850	15130
..	..	@@ -14981,6 +15261,11 @@
14981	15261	if ((mouseMode & ZOOM) != 0)
14982	15262	{
14983	15263	//if ((mouseMode & BACKFORTH) != 0)
	15264	+ if ((modifiersex & SHIFT) == SHIFT)
	15265	+ {
	15266	+ ViewAngle(dy);
	15267	+ }
	15268	+ else
14984	15269	if ((mouseMode & VR) != 0)
14985	15270	manipCamera.BackForth(dx, dy, getWidth());
14986	15271	else
..	..	@@ -15051,6 +15336,9 @@
15051	15336
15052	15337	public void mouseMoved(MouseEvent e)
15053	15338	{
	15339	+//object.editWindow.frame.
	15340	+ setCursor(Cursor.getDefaultCursor());
	15341	+
15054	15342	//System.out.println("mouseMoved: " + e);
15055	15343	if (isRenderer)
15056	15344	return;
..	..	@@ -15235,8 +15523,10 @@
15235	15523	mouseMode \|= ZOOM;
15236	15524	}
15237	15525
15238		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
15239		- if (capsLocked) // \|\| (modifiers & META) == META)
	15526	+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	15527	+ boolean vr = capsLocked && !lightMode;
	15528	+
	15529	+ if (vr) // \|\| (modifiers & META) == META)
15240	15530	{
15241	15531	mouseMode \|= VR; // BACKFORTH;
15242	15532	}
..	..	@@ -15248,7 +15538,8 @@
15248	15538	{
15249	15539	mouseMode \|= SELECT;
15250	15540	}
15251		- if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	15541	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15542	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15252	15543	{
15253	15544	mouseMode &= ~VR;
15254	15545	mouseMode \|= TRANSLATE;
..	..	@@ -15292,8 +15583,18 @@
15292	15583	float SATPOW = 1; // 2; // 0.5f;
15293	15584	float BRIPOW = 1; // 0.5f; // 0.5f;
15294	15585
	15586	+static BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
	15587	+
	15588	+// Create a new blank cursor.
	15589	+static Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
	15590	+ cursorImg, new Point(0, 0), "blank cursor");
	15591	+
15295	15592	public void keyPressed(int key)
15296	15593	{
	15594	+// Set the blank cursor to the JFrame.
	15595	+//object.editWindow.frame.
	15596	+ setCursor(blankCursor);
	15597	+
15297	15598	if (key >= '0' && key <= '5')
15298	15599	clampbit = (key-'0');
15299	15600
..	..	@@ -15452,8 +15753,8 @@
15452	15753	RevertCamera();
15453	15754	repaint();
15454	15755	break;
15455		- case 'l':
15456		- //case 'L':
	15756	+ //case 'l':
	15757	+ case 'L':
15457	15758	if (lightMode)
15458	15759	{
15459	15760	lightMode = false;
..	..	@@ -15483,7 +15784,8 @@
15483	15784	break;
15484	15785	case 'm':
15485	15786	{
15486		- PrintMemory();
	15787	+ //PrintMemory();
	15788	+ ToggleImageFlip();
15487	15789	break;
15488	15790	}
15489	15791	case 'M':
..	..	@@ -15511,8 +15813,8 @@
15511	15813	break;
15512	15814	case 'O':
15513	15815	// Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
15514		- repaint();
15515		- break;
	15816	+ //repaint();
	15817	+ //break;
15516	15818	case 'o':
15517	15819	OCCLUSION_CULLING ^= true;
15518	15820	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
..	..	@@ -15604,7 +15906,21 @@
15604	15906	// kompactbit = 6;
15605	15907	// break;
15606	15908	case ' ':
	15909	+ capsLocked ^= true;
	15910	+ repaint();
	15911	+ break;
	15912	+ case 'l':
15607	15913	lightMode ^= true;
	15914	+ if (lightMode)
	15915	+ {
	15916	+ keepshadow = Globals.RENDERSHADOW;
	15917	+ Globals.RENDERSHADOW = false;
	15918	+ }
	15919	+ else
	15920	+ {
	15921	+ Globals.RENDERSHADOW = keepshadow;
	15922	+ }
	15923	+
15608	15924	Globals.lighttouched = true;
15609	15925	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15610	15926	targetLookAt.set(manipCamera.lookAt);
..	..	@@ -15612,6 +15928,10 @@
15612	15928	break;
15613	15929	//case '`' :
15614	15930	case ESC:
	15931	+ if (FULLSCREEN)
	15932	+ object.editWindow.ToggleFullScreen();
	15933	+ break;
	15934	+ case 'p':
15615	15935	RENDERPROGRAM += 1;
15616	15936	RENDERPROGRAM %= 3;
15617	15937
..	..	@@ -15650,6 +15970,10 @@
15650	15970	case ENTER:
15651	15971	// object.editWindow.ScreenFit(); // Edit();
15652	15972	ToggleLive();
	15973	+ if (capsLocked)
	15974	+ {
	15975	+ Globals.WALK ^= true;
	15976	+ }
15653	15977	break;
15654	15978	case DELETE:
15655	15979	ClearSelection();
..	..	@@ -15686,17 +16010,23 @@
15686	16010	object.GetWindow().refreshContents(true);
15687	16011	break;
15688	16012	case '{':
15689		- manipCamera.shaper_fovy /= 1.1;
	16013	+ double factor = 1.1;
	16014	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16015	+ manipCamera.shaper_fovy /= factor;
15690	16016	System.out.println("FOV = " + manipCamera.shaper_fovy);
15691	16017	repaint();
15692	16018	break;
15693	16019	case '}':
15694		- manipCamera.shaper_fovy *= 1.1;
	16020	+ factor = 1.1;
	16021	+ if (manipCamera.shaper_fovy * factor < 150)
	16022	+ manipCamera.shaper_fovy *= factor;
15695	16023	System.out.println("FOV = " + manipCamera.shaper_fovy);
15696	16024	repaint();
15697	16025	break;
15698	16026	case '[':
15699		- manipCamera.shaper_fovy /= 1.01;
	16027	+ factor = 1.01;
	16028	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16029	+ manipCamera.shaper_fovy /= factor;
15700	16030	if (false) //manipCamera.hAspect == 0)
15701	16031	{
15702	16032	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15712,7 +16042,9 @@
15712	16042	break;
15713	16043	case ']':
15714	16044	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15715		- manipCamera.shaper_fovy *= 1.01;
	16045	+ factor = 1.01;
	16046	+ if (manipCamera.shaper_fovy * factor < 150)
	16047	+ manipCamera.shaper_fovy *= factor;
15716	16048	if (false) //manipCamera.hAspect == 0)
15717	16049	{
15718	16050	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15750,98 +16082,113 @@
15750	16082	}
15751	16083	}
15752	16084
	16085	+ boolean keys[] = new boolean[256];
	16086	+ int speedkey[] = new int[256];
	16087	+ int modifiers = 0;
	16088	+
15753	16089	public void processKeyEvent(KeyEvent e)
15754	16090	{
15755	16091	switch (e.getID())
15756	16092	{
15757	16093	case KeyEvent.KEY_PRESSED:
15758		- if (!autorepeat)
15759		- {
15760		- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15761		- keyPressed(e.getKeyChar(), e.getModifiersEx());
15762		- }
15763		- if (manipCamera == lightCamera)
15764		- {
15765		- switch (e.getKeyCode())
15766		- {
15767		- case DOWN_ARROW:
15768		- lightCamera.DECAL /= 2;
15769		- repaint();
15770		- break;
15771		- case UP_ARROW:
15772		- lightCamera.DECAL *= 2;
15773		- repaint();
15774		- break;
15775		- case LEFT_ARROW:
15776		- lightCamera.SCALE /= 2;
15777		- repaint();
15778		- break;
15779		- case RIGHT_ARROW:
15780		- lightCamera.SCALE *= 2;
15781		- repaint();
15782		- break;
15783		- default:
15784		- break;
15785		- }
15786		-
15787		- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15788		- } else
15789		- {
15790		- if (true) // !autorepeat)
15791		- {
15792		- boolean reset = true;
15793		-
15794		- switch (e.getKeyCode())
15795		- {
15796		- case DOWN_ARROW:
15797		- GoDown(e.getModifiersEx());
15798		- repaint();
15799		- break;
15800		- case UP_ARROW:
15801		- GoUp(e.getModifiersEx());
15802		- repaint();
15803		- break;
15804		- case LEFT_ARROW:
15805		- GoLeft(e.getModifiersEx());
15806		- repaint();
15807		- break;
15808		- case RIGHT_ARROW:
15809		- GoRight(e.getModifiersEx());
15810		- repaint();
15811		- break;
15812		- default:
15813		- reset = false;
15814		- break;
15815		- }
15816		-
15817		- if (reset)
15818		- {
15819		- autorepeat = true;
15820		-
15821		- targetLookAt.set(manipCamera.lookAt);
15822		- }
15823		- }
15824		- }
	16094	+ keys[e.getKeyCode()] = true;
	16095	+ modifiers = e.getModifiersEx();
	16096	+ keyPressed(e.getKeyChar(), modifiers);
	16097	+ //Globals.theRenderer.keyPressed(e.getKeyChar());
	16098	+ repaint();
15825	16099	break;
15826		- case KeyEvent.KEY_TYPED:
15827		- break;
	16100	+// if (!autorepeat)
	16101	+// {
	16102	+// //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
	16103	+// keyPressed(e.getKeyChar(), e.getModifiersEx());
	16104	+// }
	16105	+// if (manipCamera == lightCamera)
	16106	+// {
	16107	+// switch (e.getKeyCode())
	16108	+// {
	16109	+// case DOWN_ARROW:
	16110	+// lightCamera.DECAL /= 2;
	16111	+// repaint();
	16112	+// break;
	16113	+// case UP_ARROW:
	16114	+// lightCamera.DECAL *= 2;
	16115	+// repaint();
	16116	+// break;
	16117	+// case LEFT_ARROW:
	16118	+// lightCamera.SCALE /= 2;
	16119	+// repaint();
	16120	+// break;
	16121	+// case RIGHT_ARROW:
	16122	+// lightCamera.SCALE *= 2;
	16123	+// repaint();
	16124	+// break;
	16125	+// default:
	16126	+// break;
	16127	+// }
	16128	+//
	16129	+// System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
	16130	+// } else
	16131	+// {
	16132	+// if (true) // !autorepeat)
	16133	+// {
	16134	+// boolean reset = true;
	16135	+//
	16136	+// switch (e.getKeyCode())
	16137	+// {
	16138	+// case DOWN_ARROW:
	16139	+// GoDown(e.getModifiersEx());
	16140	+// repaint();
	16141	+// break;
	16142	+// case UP_ARROW:
	16143	+// GoUp(e.getModifiersEx());
	16144	+// repaint();
	16145	+// break;
	16146	+// case LEFT_ARROW:
	16147	+// GoLeft(e.getModifiersEx());
	16148	+// repaint();
	16149	+// break;
	16150	+// case RIGHT_ARROW:
	16151	+// GoRight(e.getModifiersEx());
	16152	+// repaint();
	16153	+// break;
	16154	+// default:
	16155	+// reset = false;
	16156	+// break;
	16157	+// }
	16158	+//
	16159	+// if (reset)
	16160	+// {
	16161	+// autorepeat = true;
	16162	+//
	16163	+// targetLookAt.set(manipCamera.lookAt);
	16164	+// }
	16165	+// }
	16166	+// }
	16167	+// break;
	16168	+// case KeyEvent.KEY_TYPED:
	16169	+// break;
15828	16170	case KeyEvent.KEY_RELEASED:
15829		- {
15830		- switch (e.getKeyCode())
15831		- {
15832		- case DOWN_ARROW:
15833		- case UP_ARROW:
15834		- case LEFT_ARROW:
15835		- case RIGHT_ARROW:
15836		- MODIFIERS &= ~COMMAND;
15837		- autorepeat = false;
15838		- break;
15839		- default:
15840		- break;
15841		- }
	16171	+ keys[e.getKeyCode()] = false;
	16172	+ modifiers = e.getModifiersEx();
15842	16173	keyReleased(e.getKeyChar(), e.getModifiersEx());
	16174	+ repaint();
15843	16175	break;
15844		- }
	16176	+// {
	16177	+// switch (e.getKeyCode())
	16178	+// {
	16179	+// case DOWN_ARROW:
	16180	+// case UP_ARROW:
	16181	+// case LEFT_ARROW:
	16182	+// case RIGHT_ARROW:
	16183	+// MODIFIERS &= ~COMMAND;
	16184	+// autorepeat = false;
	16185	+// break;
	16186	+// default:
	16187	+// break;
	16188	+// }
	16189	+// keyReleased(e.getKeyChar(), e.getModifiersEx());
	16190	+// break;
	16191	+// }
15845	16192	default:
15846	16193	break;
15847	16194	}
..	..	@@ -16417,7 +16764,8 @@
16417	16764
16418	16765	public boolean mouseDrag(Event evt, int x, int y)
16419	16766	{
16420		- //System.out.println("mouseDrag: " + evt);
	16767	+ System.out.println("mouseDrag: " + evt);
	16768	+ System.exit(0);
16421	16769	/*
16422	16770	drag = true;
16423	16771	//System.out.println("Mouse DRAG");
..	..	@@ -16536,6 +16884,7 @@
16536	16884	public boolean mouseUp(Event evt, int x, int y)
16537	16885	{
16538	16886	System.out.println("mouseUp: " + evt);
	16887	+ System.exit(0);
16539	16888	/*
16540	16889	locked = false;
16541	16890	if (isRenderer)
..	..	@@ -17243,7 +17592,7 @@
17243	17592
17244	17593	float depth = depths[y * TEX_SIZE + x];
17245	17594
17246		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17595	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
17247	17596	{
17248	17597	pointselection = false;
17249	17598
..	..	@@ -17907,6 +18256,11 @@
17907	18256	static boolean DEBUG_SELECTION = false;
17908	18257	boolean OCCLUSION_CULLING = false; //true;
17909	18258	public boolean lightMode = false;
	18259	+
	18260	+ private boolean keepshadow;
	18261	+
	18262	+ static public boolean capsLocked = false; // VR
	18263	+
17910	18264	static public int indexcount = 0;
17911	18265	/static/ cColor vertexOcclusion = new cColor();
17912	18266	//private int selection_view = -1;