~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	}
..	..	@@ -9843,7 +9843,7 @@
9843	9843
9844	9844	boolean vr = capsLocked && !lightMode;
9845	9845
9846		- accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 2 : 1),
	9846	+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
9847	9847	ratio,
9848	9848	//near_plane, far_plane,
9849	9849	renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..	..	@@ -10715,7 +10715,7 @@
10715	10715	if (patchMaterial.patchMaterial)
10716	10716	{
10717	10717	patchMaterial.patchMaterial = false;
10718		- patchMaterial.objectPanel.setSelectedIndex(1);
	10718	+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
10719	10719	}
10720	10720
10721	10721	if (Grafreed.savesound && Grafreed.hassound)
..	..	@@ -10813,6 +10813,112 @@
10813	10813
10814	10814	if (DrawMode() == DEFAULT)
10815	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	+
10816	10922	currentlydrawing = true;
10817	10923	}
10818	10924
..	..	@@ -11337,9 +11443,9 @@
11337	11443
11338	11444	gl.glMatrixMode(GL.GL_MODELVIEW);
11339	11445
11340		-gl.glEnable(gl.GL_POLYGON_SMOOTH);
11341		-gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11342		-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);
11343	11449	} else
11344	11450	{
11345	11451	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11402,7 +11508,8 @@
11402	11508	{
11403	11509	boolean vr = capsLocked && !lightMode;
11404	11510
11405		- 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());
11406	11513	}
11407	11514	}
11408	11515
..	..	@@ -11758,8 +11865,11 @@
11758	11865	repaint();
11759	11866	}
11760	11867
11761		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11868	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11869	+ {
	11870	+ renderCamera.computeTransform();
11762	11871	repaint();
	11872	+ }
11763	11873
11764	11874	displaydone = true;
11765	11875	}
..	..	@@ -11834,9 +11944,23 @@
11834	11944	//GL gl = getGL();
11835	11945	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11836	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	+ }
11837	11961	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11838	11962	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11839		- pingthread.StepToTarget(true); // true);
	11963	+ pingthread.StepToTarget(); // true);
11840	11964	// zoomonce = false;
11841	11965	}
11842	11966
..	..	@@ -14217,10 +14341,13 @@
14217	14341	public void mouseClicked(MouseEvent e)
14218	14342	{
14219	14343	System.out.println("mouseClicked: " + e);
	14344	+ System.exit(0);
14220	14345	}
14221	14346
14222	14347	public void mousePressed(MouseEvent e)
14223	14348	{
	14349	+ RigidBody.justclicked = true;
	14350	+ System.out.println("justclicked: " + e);
14224	14351	//System.out.println("mousePressed: " + e);
14225	14352	clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
14226	14353	}
..	..	@@ -14301,7 +14428,7 @@
14301	14428	//}
14302	14429
14303	14430	SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
14304		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
	14431	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
14305	14432	anchorX = ax;
14306	14433	anchorY = ay;
14307	14434	prevX = px;
..	..	@@ -14396,8 +14523,9 @@
14396	14523	// fev 2014???
14397	14524	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
14398	14525	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14399		- pingthread.StepToTarget(true); // true);
	14526	+ pingthread.StepToTarget(); // true);
14400	14527	}
	14528	+
14401	14529	// if (!LIVE)
14402	14530	super.repaint();
14403	14531	}
..	..	@@ -14492,8 +14620,8 @@
14492	14620
14493	14621	//if (drawing)
14494	14622	//return;
14495		- if ((e.getModifiersEx() & CTRL) != 0
14496		- \|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
	14623	+ if ((e.getModifiersEx() & CTRL) != 0 \|\|
	14624	+ (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
14497	14625	{
14498	14626	//System.out.println("mouseDragged: " + e);
14499	14627	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
..	..	@@ -14517,9 +14645,17 @@
14517	14645	return targetLookAt;
14518	14646	}
14519	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	+
14520	14653	class PingThread extends Thread
14521	14654	{
14522	14655	boolean jump;
	14656	+ boolean live;
	14657	+
	14658	+ boolean mute;
14523	14659
14524	14660	// void JumpToTarget()
14525	14661	// {
..	..	@@ -14535,6 +14671,88 @@
14535	14671	// only one thread!? synchronized
14536	14672	void StepToTarget(boolean jump)
14537	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	+
14538	14756	tmp.set(targetLookAt);
14539	14757	tmp.sub(manipCamera.lookAt); // june 2014
14540	14758
..	..	@@ -14572,7 +14790,7 @@
14572	14790
14573	14791	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
14574	14792	{
14575		- jump = true; // step = 1;
	14793	+ // sep 2019 jump = true; // step = 1;
14576	14794	}
14577	14795
14578	14796	if (OEILONCE && OEIL)
..	..	@@ -14607,7 +14825,10 @@
14607	14825	if (tmp.dot(tmp) < 0.00001)
14608	14826	{
14609	14827	zoomonce = false;
	14828	+ live = false;
14610	14829	}
	14830	+ else
	14831	+ live = true;
14611	14832
14612	14833	tmp.mul(step > step2 ? step : step2);
14613	14834	}
..	..	@@ -14634,7 +14855,7 @@
14634	14855	{
14635	14856	if (LOOKAT)
14636	14857	manipCamera.lookAt.add(tmp);
14637		- if (OEIL)
	14858	+ if (OEIL && !capsLocked)
14638	14859	manipCamera.location.add(tmp);
14639	14860
14640	14861	{
..	..	@@ -14649,7 +14870,10 @@
14649	14870	lightCamera.computeTransform();
14650	14871	}
14651	14872	}
14652		- manipCamera.computeTransform();
	14873	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14874	+ {
	14875	+ manipCamera.computeTransform();
	14876	+ }
14653	14877	}
14654	14878	// ?????? mouseDown = true;
14655	14879	//System.out.println("---------------- ---------- Paint " + tmp.length2());
..	..	@@ -14742,11 +14966,32 @@
14742	14966	}
14743	14967	}
14744	14968	}
	14969	+
14745	14970	PingThread pingthread = new PingThread();
14746		- int delta = 2;
14747		- int speed = 10;
	14971	+ int delta = 1;
	14972	+ int speed = 1;
	14973	+ int walk = 8;
14748	14974	boolean autorepeat = false;
14749	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	+
14750	14995	void GoDown(int mod)
14751	14996	{
14752	14997	MODIFIERS \|= COMMAND;
..	..	@@ -14754,21 +14999,30 @@
14754	14999	/**/
14755	15000	if((mod&SHIFT) == SHIFT)
14756	15001	{
	15002	+// if (isVR)
	15003	+// manipCamera.RotateInterest(0, speed);
	15004	+// else
14757	15005	if (isVR)
14758		- 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());
14759	15014	else
14760	15015	manipCamera.RotatePosition(0, -speed);
14761	15016	}
14762		- else
14763		- manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	15017	+
14764	15018	/**/
14765		- if ((mod & SHIFT) == SHIFT)
14766		- {
14767		- mouseMode = mouseMode; // VR??
14768		- } else
14769		- {
14770		- mouseMode \|= BACKFORTH;
14771		- }
	15019	+// if ((mod & SHIFT) == SHIFT)
	15020	+// {
	15021	+// mouseMode = mouseMode; // VR??
	15022	+// } else
	15023	+// {
	15024	+// mouseMode \|= BACKFORTH;
	15025	+// }
14772	15026
14773	15027	targetLookAt.set(manipCamera.lookAt);
14774	15028
..	..	@@ -14778,27 +15032,38 @@
14778	15032
14779	15033	void GoUp(int mod)
14780	15034	{
	15035	+ RigidBody.justclicked = true;
	15036	+
14781	15037	MODIFIERS \|= COMMAND;
14782	15038	/**/
14783	15039	boolean isVR = (mouseMode&VR)!=0;
14784	15040
14785	15041	if((mod&SHIFT) == SHIFT)
14786	15042	{
	15043	+// if (isVR)
	15044	+// manipCamera.RotateInterest(0, -speed);
	15045	+// else
14787	15046	if (isVR)
14788		- 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());
14789	15055	else
14790	15056	manipCamera.RotatePosition(0, speed);
14791	15057	}
14792		- else
14793		- manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	15058	+
14794	15059	/**/
14795		- if ((mod & SHIFT) == SHIFT)
14796		- {
14797		- mouseMode = mouseMode;
14798		- } else
14799		- {
14800		- mouseMode \|= BACKFORTH;
14801		- }
	15060	+// if ((mod & SHIFT) == SHIFT)
	15061	+// {
	15062	+// mouseMode = mouseMode;
	15063	+// } else
	15064	+// {
	15065	+// mouseMode \|= BACKFORTH;
	15066	+// }
14802	15067
14803	15068	targetLookAt.set(manipCamera.lookAt);
14804	15069
..	..	@@ -14811,23 +15076,27 @@
14811	15076	MODIFIERS \|= COMMAND;
14812	15077	/**/
14813	15078	if((mod&SHIFT) == SHIFT)
14814		- manipCamera.Translate(speed*delta, 0, getWidth());
	15079	+ manipCamera.Translate(speed, 0, getWidth());
14815	15080	else
14816	15081	{
14817	15082	if ((mouseMode&VR)!=0)
14818		- manipCamera.RotateInterest(-speed, 0);
	15083	+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
14819	15084	else
14820		- manipCamera.RotatePosition(speed, 0);
	15085	+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
14821	15086	}
	15087	+
14822	15088	/**/
14823		- if ((mod & SHIFT) == SHIFT)
14824		- {
14825		- mouseMode = mouseMode;
14826		- } else
14827		- {
14828		- mouseMode \|= ROTATE;
14829		- } // TRANSLATE;
	15089	+// if ((mod & SHIFT) == SHIFT)
	15090	+// {
	15091	+// mouseMode = mouseMode;
	15092	+// } else
	15093	+// {
	15094	+// mouseMode \|= ROTATE;
	15095	+// } // TRANSLATE;
14830	15096
	15097	+ //System.err.println("lookAt = " + manipCamera.lookAt);
	15098	+ //System.err.println("location = " + manipCamera.location);
	15099	+
14831	15100	targetLookAt.set(manipCamera.lookAt);
14832	15101
14833	15102	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
..	..	@@ -14839,23 +15108,23 @@
14839	15108	MODIFIERS \|= COMMAND;
14840	15109	/**/
14841	15110	if((mod&SHIFT) == SHIFT)
14842		- manipCamera.Translate(-speed*delta, 0, getWidth());
	15111	+ manipCamera.Translate(-speed, 0, getWidth());
14843	15112	else
14844	15113	{
14845	15114	if ((mouseMode&VR)!=0)
14846		- manipCamera.RotateInterest(speed, 0);
	15115	+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
14847	15116	else
14848		- manipCamera.RotatePosition(-speed, 0);
	15117	+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
14849	15118	}
14850	15119
14851	15120	/**/
14852		- if ((mod & SHIFT) == SHIFT)
14853		- {
14854		- mouseMode = mouseMode;
14855		- } else
14856		- {
14857		- mouseMode \|= ROTATE;
14858		- } // TRANSLATE;
	15121	+// if ((mod & SHIFT) == SHIFT)
	15122	+// {
	15123	+// mouseMode = mouseMode;
	15124	+// } else
	15125	+// {
	15126	+// mouseMode \|= ROTATE;
	15127	+// } // TRANSLATE;
14859	15128
14860	15129	targetLookAt.set(manipCamera.lookAt);
14861	15130
..	..	@@ -14992,6 +15261,11 @@
14992	15261	if ((mouseMode & ZOOM) != 0)
14993	15262	{
14994	15263	//if ((mouseMode & BACKFORTH) != 0)
	15264	+ if ((modifiersex & SHIFT) == SHIFT)
	15265	+ {
	15266	+ ViewAngle(dy);
	15267	+ }
	15268	+ else
14995	15269	if ((mouseMode & VR) != 0)
14996	15270	manipCamera.BackForth(dx, dy, getWidth());
14997	15271	else
..	..	@@ -15062,6 +15336,9 @@
15062	15336
15063	15337	public void mouseMoved(MouseEvent e)
15064	15338	{
	15339	+//object.editWindow.frame.
	15340	+ setCursor(Cursor.getDefaultCursor());
	15341	+
15065	15342	//System.out.println("mouseMoved: " + e);
15066	15343	if (isRenderer)
15067	15344	return;
..	..	@@ -15261,7 +15538,8 @@
15261	15538	{
15262	15539	mouseMode \|= SELECT;
15263	15540	}
15264		- if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	15541	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15542	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15265	15543	{
15266	15544	mouseMode &= ~VR;
15267	15545	mouseMode \|= TRANSLATE;
..	..	@@ -15305,8 +15583,18 @@
15305	15583	float SATPOW = 1; // 2; // 0.5f;
15306	15584	float BRIPOW = 1; // 0.5f; // 0.5f;
15307	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	+
15308	15592	public void keyPressed(int key)
15309	15593	{
	15594	+// Set the blank cursor to the JFrame.
	15595	+//object.editWindow.frame.
	15596	+ setCursor(blankCursor);
	15597	+
15310	15598	if (key >= '0' && key <= '5')
15311	15599	clampbit = (key-'0');
15312	15600
..	..	@@ -15496,7 +15784,8 @@
15496	15784	break;
15497	15785	case 'm':
15498	15786	{
15499		- PrintMemory();
	15787	+ //PrintMemory();
	15788	+ ToggleImageFlip();
15500	15789	break;
15501	15790	}
15502	15791	case 'M':
..	..	@@ -15622,6 +15911,16 @@
15622	15911	break;
15623	15912	case 'l':
15624	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	+
15625	15924	Globals.lighttouched = true;
15626	15925	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15627	15926	targetLookAt.set(manipCamera.lookAt);
..	..	@@ -15629,6 +15928,10 @@
15629	15928	break;
15630	15929	//case '`' :
15631	15930	case ESC:
	15931	+ if (FULLSCREEN)
	15932	+ object.editWindow.ToggleFullScreen();
	15933	+ break;
	15934	+ case 'p':
15632	15935	RENDERPROGRAM += 1;
15633	15936	RENDERPROGRAM %= 3;
15634	15937
..	..	@@ -15667,6 +15970,10 @@
15667	15970	case ENTER:
15668	15971	// object.editWindow.ScreenFit(); // Edit();
15669	15972	ToggleLive();
	15973	+ if (capsLocked)
	15974	+ {
	15975	+ Globals.WALK ^= true;
	15976	+ }
15670	15977	break;
15671	15978	case DELETE:
15672	15979	ClearSelection();
..	..	@@ -15703,17 +16010,23 @@
15703	16010	object.GetWindow().refreshContents(true);
15704	16011	break;
15705	16012	case '{':
15706		- manipCamera.shaper_fovy /= 1.1;
	16013	+ double factor = 1.1;
	16014	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16015	+ manipCamera.shaper_fovy /= factor;
15707	16016	System.out.println("FOV = " + manipCamera.shaper_fovy);
15708	16017	repaint();
15709	16018	break;
15710	16019	case '}':
15711		- manipCamera.shaper_fovy *= 1.1;
	16020	+ factor = 1.1;
	16021	+ if (manipCamera.shaper_fovy * factor < 150)
	16022	+ manipCamera.shaper_fovy *= factor;
15712	16023	System.out.println("FOV = " + manipCamera.shaper_fovy);
15713	16024	repaint();
15714	16025	break;
15715	16026	case '[':
15716		- manipCamera.shaper_fovy /= 1.01;
	16027	+ factor = 1.01;
	16028	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16029	+ manipCamera.shaper_fovy /= factor;
15717	16030	if (false) //manipCamera.hAspect == 0)
15718	16031	{
15719	16032	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15729,7 +16042,9 @@
15729	16042	break;
15730	16043	case ']':
15731	16044	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15732		- manipCamera.shaper_fovy *= 1.01;
	16045	+ factor = 1.01;
	16046	+ if (manipCamera.shaper_fovy * factor < 150)
	16047	+ manipCamera.shaper_fovy *= factor;
15733	16048	if (false) //manipCamera.hAspect == 0)
15734	16049	{
15735	16050	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15767,98 +16082,113 @@
15767	16082	}
15768	16083	}
15769	16084
	16085	+ boolean keys[] = new boolean[256];
	16086	+ int speedkey[] = new int[256];
	16087	+ int modifiers = 0;
	16088	+
15770	16089	public void processKeyEvent(KeyEvent e)
15771	16090	{
15772	16091	switch (e.getID())
15773	16092	{
15774	16093	case KeyEvent.KEY_PRESSED:
15775		- if (!autorepeat)
15776		- {
15777		- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15778		- keyPressed(e.getKeyChar(), e.getModifiersEx());
15779		- }
15780		- if (manipCamera == lightCamera)
15781		- {
15782		- switch (e.getKeyCode())
15783		- {
15784		- case DOWN_ARROW:
15785		- lightCamera.DECAL /= 2;
15786		- repaint();
15787		- break;
15788		- case UP_ARROW:
15789		- lightCamera.DECAL *= 2;
15790		- repaint();
15791		- break;
15792		- case LEFT_ARROW:
15793		- lightCamera.SCALE /= 2;
15794		- repaint();
15795		- break;
15796		- case RIGHT_ARROW:
15797		- lightCamera.SCALE *= 2;
15798		- repaint();
15799		- break;
15800		- default:
15801		- break;
15802		- }
15803		-
15804		- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15805		- } else
15806		- {
15807		- if (true) // !autorepeat)
15808		- {
15809		- boolean reset = true;
15810		-
15811		- switch (e.getKeyCode())
15812		- {
15813		- case DOWN_ARROW:
15814		- GoDown(e.getModifiersEx());
15815		- repaint();
15816		- break;
15817		- case UP_ARROW:
15818		- GoUp(e.getModifiersEx());
15819		- repaint();
15820		- break;
15821		- case LEFT_ARROW:
15822		- GoLeft(e.getModifiersEx());
15823		- repaint();
15824		- break;
15825		- case RIGHT_ARROW:
15826		- GoRight(e.getModifiersEx());
15827		- repaint();
15828		- break;
15829		- default:
15830		- reset = false;
15831		- break;
15832		- }
15833		-
15834		- if (reset)
15835		- {
15836		- autorepeat = true;
15837		-
15838		- targetLookAt.set(manipCamera.lookAt);
15839		- }
15840		- }
15841		- }
	16094	+ keys[e.getKeyCode()] = true;
	16095	+ modifiers = e.getModifiersEx();
	16096	+ keyPressed(e.getKeyChar(), modifiers);
	16097	+ //Globals.theRenderer.keyPressed(e.getKeyChar());
	16098	+ repaint();
15842	16099	break;
15843		- case KeyEvent.KEY_TYPED:
15844		- 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;
15845	16170	case KeyEvent.KEY_RELEASED:
15846		- {
15847		- switch (e.getKeyCode())
15848		- {
15849		- case DOWN_ARROW:
15850		- case UP_ARROW:
15851		- case LEFT_ARROW:
15852		- case RIGHT_ARROW:
15853		- MODIFIERS &= ~COMMAND;
15854		- autorepeat = false;
15855		- break;
15856		- default:
15857		- break;
15858		- }
	16171	+ keys[e.getKeyCode()] = false;
	16172	+ modifiers = e.getModifiersEx();
15859	16173	keyReleased(e.getKeyChar(), e.getModifiersEx());
	16174	+ repaint();
15860	16175	break;
15861		- }
	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	+// }
15862	16192	default:
15863	16193	break;
15864	16194	}
..	..	@@ -16434,7 +16764,8 @@
16434	16764
16435	16765	public boolean mouseDrag(Event evt, int x, int y)
16436	16766	{
16437		- //System.out.println("mouseDrag: " + evt);
	16767	+ System.out.println("mouseDrag: " + evt);
	16768	+ System.exit(0);
16438	16769	/*
16439	16770	drag = true;
16440	16771	//System.out.println("Mouse DRAG");
..	..	@@ -16553,6 +16884,7 @@
16553	16884	public boolean mouseUp(Event evt, int x, int y)
16554	16885	{
16555	16886	System.out.println("mouseUp: " + evt);
	16887	+ System.exit(0);
16556	16888	/*
16557	16889	locked = false;
16558	16890	if (isRenderer)
..	..	@@ -17260,7 +17592,7 @@
17260	17592
17261	17593	float depth = depths[y * TEX_SIZE + x];
17262	17594
17263		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17595	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
17264	17596	{
17265	17597	pointselection = false;
17266	17598
..	..	@@ -17925,7 +18257,9 @@
17925	18257	boolean OCCLUSION_CULLING = false; //true;
17926	18258	public boolean lightMode = false;
17927	18259
17928		- public boolean capsLocked = false; // VR
	18260	+ private boolean keepshadow;
	18261	+
	18262	+ static public boolean capsLocked = false; // VR
17929	18263
17930	18264	static public int indexcount = 0;
17931	18265	/static/ cColor vertexOcclusion = new cColor();