~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)
..	..	@@ -9845,7 +9843,7 @@
9845	9843
9846	9844	boolean vr = capsLocked && !lightMode;
9847	9845
9848		- accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 2 : 1),
	9846	+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
9849	9847	ratio,
9850	9848	//near_plane, far_plane,
9851	9849	renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..	..	@@ -10717,7 +10715,7 @@
10717	10715	if (patchMaterial.patchMaterial)
10718	10716	{
10719	10717	patchMaterial.patchMaterial = false;
10720		- patchMaterial.objectPanel.setSelectedIndex(1);
	10718	+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
10721	10719	}
10722	10720
10723	10721	if (Grafreed.savesound && Grafreed.hassound)
..	..	@@ -10865,30 +10863,59 @@
10865	10863
10866	10864	if (keys[DOWN_ARROW])
10867	10865	{
	10866	+ speed = ++speedkey[DOWN_ARROW];
	10867	+ if (speed > 20)
	10868	+ speed = 20;
10868	10869	GoDown(modifiers);
10869	10870	keyon = true;
10870	10871	}
	10872	+ else
	10873	+ speedkey[DOWN_ARROW] = 0;
10871	10874
10872	10875	if (keys[UP_ARROW])
10873	10876	{
	10877	+ speed = ++speedkey[UP_ARROW];
	10878	+ if (speed > 20)
	10879	+ speed = 20;
10874	10880	GoUp(modifiers);
10875	10881	keyon = true;
10876	10882	}
	10883	+ else
	10884	+ speedkey[UP_ARROW] = 0;
10877	10885
10878	10886	if (keys[LEFT_ARROW])
10879	10887	{
	10888	+ speed = ++speedkey[LEFT_ARROW];
	10889	+ if (speed > 20)
	10890	+ speed = 20;
10880	10891	GoLeft(modifiers);
10881	10892	keyon = true;
10882	10893	}
	10894	+ else
	10895	+ speedkey[LEFT_ARROW] = 0;
10883	10896
10884	10897	if (keys[RIGHT_ARROW])
10885	10898	{
	10899	+ speed = ++speedkey[RIGHT_ARROW];
	10900	+ if (speed > 20)
	10901	+ speed = 20;
10886	10902	GoRight(modifiers);
	10903	+ keyon = true;
	10904	+ }
	10905	+ else
	10906	+ speedkey[RIGHT_ARROW] = 0;
	10907	+
	10908	+ if (Globals.WALK && capsLocked)
	10909	+ {
	10910	+ Walk();
10887	10911	keyon = true;
10888	10912	}
10889	10913
10890	10914	if (keyon)
	10915	+ {
10891	10916	repaint();
	10917	+ }
	10918	+
10892	10919	//pingthread.mute = false;
10893	10920	}
10894	10921
..	..	@@ -11481,7 +11508,8 @@
11481	11508	{
11482	11509	boolean vr = capsLocked && !lightMode;
11483	11510
11484		- glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 2 : 1), ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
	11511	+ glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1),
	11512	+ ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
11485	11513	}
11486	11514	}
11487	11515
..	..	@@ -11837,8 +11865,11 @@
11837	11865	repaint();
11838	11866	}
11839	11867
11840		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11868	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11869	+ {
	11870	+ renderCamera.computeTransform();
11841	11871	repaint();
	11872	+ }
11842	11873
11843	11874	displaydone = true;
11844	11875	}
..	..	@@ -11913,9 +11944,23 @@
11913	11944	//GL gl = getGL();
11914	11945	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11915	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	+ }
11916	11961	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11917	11962	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11918		- pingthread.StepToTarget(true); // true);
	11963	+ pingthread.StepToTarget(); // true);
11919	11964	// zoomonce = false;
11920	11965	}
11921	11966
..	..	@@ -14296,10 +14341,13 @@
14296	14341	public void mouseClicked(MouseEvent e)
14297	14342	{
14298	14343	System.out.println("mouseClicked: " + e);
	14344	+ System.exit(0);
14299	14345	}
14300	14346
14301	14347	public void mousePressed(MouseEvent e)
14302	14348	{
	14349	+ RigidBody.justclicked = true;
	14350	+ System.out.println("justclicked: " + e);
14303	14351	//System.out.println("mousePressed: " + e);
14304	14352	clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
14305	14353	}
..	..	@@ -14380,7 +14428,7 @@
14380	14428	//}
14381	14429
14382	14430	SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
14383		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
	14431	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
14384	14432	anchorX = ax;
14385	14433	anchorY = ay;
14386	14434	prevX = px;
..	..	@@ -14475,8 +14523,9 @@
14475	14523	// fev 2014???
14476	14524	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
14477	14525	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14478		- pingthread.StepToTarget(true); // true);
	14526	+ pingthread.StepToTarget(); // true);
14479	14527	}
	14528	+
14480	14529	// if (!LIVE)
14481	14530	super.repaint();
14482	14531	}
..	..	@@ -14571,8 +14620,8 @@
14571	14620
14572	14621	//if (drawing)
14573	14622	//return;
14574		- if ((e.getModifiersEx() & CTRL) != 0
14575		- \|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
	14623	+ if ((e.getModifiersEx() & CTRL) != 0 \|\|
	14624	+ (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
14576	14625	{
14577	14626	//System.out.println("mouseDragged: " + e);
14578	14627	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
..	..	@@ -14596,9 +14645,15 @@
14596	14645	return targetLookAt;
14597	14646	}
14598	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	+
14599	14653	class PingThread extends Thread
14600	14654	{
14601	14655	boolean jump;
	14656	+ boolean live;
14602	14657
14603	14658	boolean mute;
14604	14659
..	..	@@ -14616,8 +14671,87 @@
14616	14671	// only one thread!? synchronized
14617	14672	void StepToTarget(boolean jump)
14618	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	+
14619	14689	if (mute)
14620	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	+ }
14621	14755
14622	14756	tmp.set(targetLookAt);
14623	14757	tmp.sub(manipCamera.lookAt); // june 2014
..	..	@@ -14656,7 +14790,7 @@
14656	14790
14657	14791	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
14658	14792	{
14659		- jump = true; // step = 1;
	14793	+ // sep 2019 jump = true; // step = 1;
14660	14794	}
14661	14795
14662	14796	if (OEILONCE && OEIL)
..	..	@@ -14691,7 +14825,10 @@
14691	14825	if (tmp.dot(tmp) < 0.00001)
14692	14826	{
14693	14827	zoomonce = false;
	14828	+ live = false;
14694	14829	}
	14830	+ else
	14831	+ live = true;
14695	14832
14696	14833	tmp.mul(step > step2 ? step : step2);
14697	14834	}
..	..	@@ -14718,7 +14855,7 @@
14718	14855	{
14719	14856	if (LOOKAT)
14720	14857	manipCamera.lookAt.add(tmp);
14721		- if (OEIL)
	14858	+ if (OEIL && !capsLocked)
14722	14859	manipCamera.location.add(tmp);
14723	14860
14724	14861	{
..	..	@@ -14733,7 +14870,10 @@
14733	14870	lightCamera.computeTransform();
14734	14871	}
14735	14872	}
14736		- manipCamera.computeTransform();
	14873	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14874	+ {
	14875	+ manipCamera.computeTransform();
	14876	+ }
14737	14877	}
14738	14878	// ?????? mouseDown = true;
14739	14879	//System.out.println("---------------- ---------- Paint " + tmp.length2());
..	..	@@ -14826,11 +14966,32 @@
14826	14966	}
14827	14967	}
14828	14968	}
	14969	+
14829	14970	PingThread pingthread = new PingThread();
14830		- int delta = 2;
14831		- int speed = 10;
	14971	+ int delta = 1;
	14972	+ int speed = 1;
	14973	+ int walk = 8;
14832	14974	boolean autorepeat = false;
14833	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	+
14834	14995	void GoDown(int mod)
14835	14996	{
14836	14997	MODIFIERS \|= COMMAND;
..	..	@@ -14838,21 +14999,30 @@
14838	14999	/**/
14839	15000	if((mod&SHIFT) == SHIFT)
14840	15001	{
	15002	+// if (isVR)
	15003	+// manipCamera.RotateInterest(0, speed);
	15004	+// else
14841	15005	if (isVR)
14842		- 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());
14843	15014	else
14844	15015	manipCamera.RotatePosition(0, -speed);
14845	15016	}
14846		- else
14847		- manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	15017	+
14848	15018	/**/
14849		- if ((mod & SHIFT) == SHIFT)
14850		- {
14851		- mouseMode = mouseMode; // VR??
14852		- } else
14853		- {
14854		- mouseMode \|= BACKFORTH;
14855		- }
	15019	+// if ((mod & SHIFT) == SHIFT)
	15020	+// {
	15021	+// mouseMode = mouseMode; // VR??
	15022	+// } else
	15023	+// {
	15024	+// mouseMode \|= BACKFORTH;
	15025	+// }
14856	15026
14857	15027	targetLookAt.set(manipCamera.lookAt);
14858	15028
..	..	@@ -14862,27 +15032,38 @@
14862	15032
14863	15033	void GoUp(int mod)
14864	15034	{
	15035	+ RigidBody.justclicked = true;
	15036	+
14865	15037	MODIFIERS \|= COMMAND;
14866	15038	/**/
14867	15039	boolean isVR = (mouseMode&VR)!=0;
14868	15040
14869	15041	if((mod&SHIFT) == SHIFT)
14870	15042	{
	15043	+// if (isVR)
	15044	+// manipCamera.RotateInterest(0, -speed);
	15045	+// else
14871	15046	if (isVR)
14872		- 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());
14873	15055	else
14874	15056	manipCamera.RotatePosition(0, speed);
14875	15057	}
14876		- else
14877		- manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	15058	+
14878	15059	/**/
14879		- if ((mod & SHIFT) == SHIFT)
14880		- {
14881		- mouseMode = mouseMode;
14882		- } else
14883		- {
14884		- mouseMode \|= BACKFORTH;
14885		- }
	15060	+// if ((mod & SHIFT) == SHIFT)
	15061	+// {
	15062	+// mouseMode = mouseMode;
	15063	+// } else
	15064	+// {
	15065	+// mouseMode \|= BACKFORTH;
	15066	+// }
14886	15067
14887	15068	targetLookAt.set(manipCamera.lookAt);
14888	15069
..	..	@@ -14895,22 +15076,23 @@
14895	15076	MODIFIERS \|= COMMAND;
14896	15077	/**/
14897	15078	if((mod&SHIFT) == SHIFT)
14898		- manipCamera.Translate(speed*delta, 0, getWidth());
	15079	+ manipCamera.Translate(speed, 0, getWidth());
14899	15080	else
14900	15081	{
14901	15082	if ((mouseMode&VR)!=0)
14902		- manipCamera.RotateInterest(-speed, 0);
	15083	+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
14903	15084	else
14904		- manipCamera.RotatePosition(speed, 0);
	15085	+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
14905	15086	}
	15087	+
14906	15088	/**/
14907		- if ((mod & SHIFT) == SHIFT)
14908		- {
14909		- mouseMode = mouseMode;
14910		- } else
14911		- {
14912		- mouseMode \|= ROTATE;
14913		- } // TRANSLATE;
	15089	+// if ((mod & SHIFT) == SHIFT)
	15090	+// {
	15091	+// mouseMode = mouseMode;
	15092	+// } else
	15093	+// {
	15094	+// mouseMode \|= ROTATE;
	15095	+// } // TRANSLATE;
14914	15096
14915	15097	//System.err.println("lookAt = " + manipCamera.lookAt);
14916	15098	//System.err.println("location = " + manipCamera.location);
..	..	@@ -14926,23 +15108,23 @@
14926	15108	MODIFIERS \|= COMMAND;
14927	15109	/**/
14928	15110	if((mod&SHIFT) == SHIFT)
14929		- manipCamera.Translate(-speed*delta, 0, getWidth());
	15111	+ manipCamera.Translate(-speed, 0, getWidth());
14930	15112	else
14931	15113	{
14932	15114	if ((mouseMode&VR)!=0)
14933		- manipCamera.RotateInterest(speed, 0);
	15115	+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
14934	15116	else
14935		- manipCamera.RotatePosition(-speed, 0);
	15117	+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
14936	15118	}
14937	15119
14938	15120	/**/
14939		- if ((mod & SHIFT) == SHIFT)
14940		- {
14941		- mouseMode = mouseMode;
14942		- } else
14943		- {
14944		- mouseMode \|= ROTATE;
14945		- } // TRANSLATE;
	15121	+// if ((mod & SHIFT) == SHIFT)
	15122	+// {
	15123	+// mouseMode = mouseMode;
	15124	+// } else
	15125	+// {
	15126	+// mouseMode \|= ROTATE;
	15127	+// } // TRANSLATE;
14946	15128
14947	15129	targetLookAt.set(manipCamera.lookAt);
14948	15130
..	..	@@ -15079,6 +15261,11 @@
15079	15261	if ((mouseMode & ZOOM) != 0)
15080	15262	{
15081	15263	//if ((mouseMode & BACKFORTH) != 0)
	15264	+ if ((modifiersex & SHIFT) == SHIFT)
	15265	+ {
	15266	+ ViewAngle(dy);
	15267	+ }
	15268	+ else
15082	15269	if ((mouseMode & VR) != 0)
15083	15270	manipCamera.BackForth(dx, dy, getWidth());
15084	15271	else
..	..	@@ -15149,6 +15336,9 @@
15149	15336
15150	15337	public void mouseMoved(MouseEvent e)
15151	15338	{
	15339	+//object.editWindow.frame.
	15340	+ setCursor(Cursor.getDefaultCursor());
	15341	+
15152	15342	//System.out.println("mouseMoved: " + e);
15153	15343	if (isRenderer)
15154	15344	return;
..	..	@@ -15348,7 +15538,8 @@
15348	15538	{
15349	15539	mouseMode \|= SELECT;
15350	15540	}
15351		- if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	15541	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15542	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15352	15543	{
15353	15544	mouseMode &= ~VR;
15354	15545	mouseMode \|= TRANSLATE;
..	..	@@ -15392,8 +15583,18 @@
15392	15583	float SATPOW = 1; // 2; // 0.5f;
15393	15584	float BRIPOW = 1; // 0.5f; // 0.5f;
15394	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	+
15395	15592	public void keyPressed(int key)
15396	15593	{
	15594	+// Set the blank cursor to the JFrame.
	15595	+//object.editWindow.frame.
	15596	+ setCursor(blankCursor);
	15597	+
15397	15598	if (key >= '0' && key <= '5')
15398	15599	clampbit = (key-'0');
15399	15600
..	..	@@ -15583,7 +15784,8 @@
15583	15784	break;
15584	15785	case 'm':
15585	15786	{
15586		- PrintMemory();
	15787	+ //PrintMemory();
	15788	+ ToggleImageFlip();
15587	15789	break;
15588	15790	}
15589	15791	case 'M':
..	..	@@ -15709,6 +15911,16 @@
15709	15911	break;
15710	15912	case 'l':
15711	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	+
15712	15924	Globals.lighttouched = true;
15713	15925	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15714	15926	targetLookAt.set(manipCamera.lookAt);
..	..	@@ -15716,6 +15928,10 @@
15716	15928	break;
15717	15929	//case '`' :
15718	15930	case ESC:
	15931	+ if (FULLSCREEN)
	15932	+ object.editWindow.ToggleFullScreen();
	15933	+ break;
	15934	+ case 'p':
15719	15935	RENDERPROGRAM += 1;
15720	15936	RENDERPROGRAM %= 3;
15721	15937
..	..	@@ -15754,6 +15970,10 @@
15754	15970	case ENTER:
15755	15971	// object.editWindow.ScreenFit(); // Edit();
15756	15972	ToggleLive();
	15973	+ if (capsLocked)
	15974	+ {
	15975	+ Globals.WALK ^= true;
	15976	+ }
15757	15977	break;
15758	15978	case DELETE:
15759	15979	ClearSelection();
..	..	@@ -15790,17 +16010,23 @@
15790	16010	object.GetWindow().refreshContents(true);
15791	16011	break;
15792	16012	case '{':
15793		- manipCamera.shaper_fovy /= 1.1;
	16013	+ double factor = 1.1;
	16014	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16015	+ manipCamera.shaper_fovy /= factor;
15794	16016	System.out.println("FOV = " + manipCamera.shaper_fovy);
15795	16017	repaint();
15796	16018	break;
15797	16019	case '}':
15798		- manipCamera.shaper_fovy *= 1.1;
	16020	+ factor = 1.1;
	16021	+ if (manipCamera.shaper_fovy * factor < 150)
	16022	+ manipCamera.shaper_fovy *= factor;
15799	16023	System.out.println("FOV = " + manipCamera.shaper_fovy);
15800	16024	repaint();
15801	16025	break;
15802	16026	case '[':
15803		- manipCamera.shaper_fovy /= 1.01;
	16027	+ factor = 1.01;
	16028	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16029	+ manipCamera.shaper_fovy /= factor;
15804	16030	if (false) //manipCamera.hAspect == 0)
15805	16031	{
15806	16032	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15816,7 +16042,9 @@
15816	16042	break;
15817	16043	case ']':
15818	16044	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15819		- manipCamera.shaper_fovy *= 1.01;
	16045	+ factor = 1.01;
	16046	+ if (manipCamera.shaper_fovy * factor < 150)
	16047	+ manipCamera.shaper_fovy *= factor;
15820	16048	if (false) //manipCamera.hAspect == 0)
15821	16049	{
15822	16050	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15855,6 +16083,7 @@
15855	16083	}
15856	16084
15857	16085	boolean keys[] = new boolean[256];
	16086	+ int speedkey[] = new int[256];
15858	16087	int modifiers = 0;
15859	16088
15860	16089	public void processKeyEvent(KeyEvent e)
..	..	@@ -16535,7 +16764,8 @@
16535	16764
16536	16765	public boolean mouseDrag(Event evt, int x, int y)
16537	16766	{
16538		- //System.out.println("mouseDrag: " + evt);
	16767	+ System.out.println("mouseDrag: " + evt);
	16768	+ System.exit(0);
16539	16769	/*
16540	16770	drag = true;
16541	16771	//System.out.println("Mouse DRAG");
..	..	@@ -16654,6 +16884,7 @@
16654	16884	public boolean mouseUp(Event evt, int x, int y)
16655	16885	{
16656	16886	System.out.println("mouseUp: " + evt);
	16887	+ System.exit(0);
16657	16888	/*
16658	16889	locked = false;
16659	16890	if (isRenderer)
..	..	@@ -17361,7 +17592,7 @@
17361	17592
17362	17593	float depth = depths[y * TEX_SIZE + x];
17363	17594
17364		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17595	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
17365	17596	{
17366	17597	pointselection = false;
17367	17598
..	..	@@ -18026,7 +18257,9 @@
18026	18257	boolean OCCLUSION_CULLING = false; //true;
18027	18258	public boolean lightMode = false;
18028	18259
18029		- public boolean capsLocked = false; // VR
	18260	+ private boolean keepshadow;
	18261	+
	18262	+ static public boolean capsLocked = false; // VR
18030	18263
18031	18264	static public int indexcount = 0;
18032	18265	/static/ cColor vertexOcclusion = new cColor();