~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -1,4 +1,5 @@
1	1
	2	+import com.bulletphysics.dynamics.RigidBody;
2	3	import java.awt.*;
3	4	import java.awt.event.*;
4	5	import java.awt.image.*;
..	..	@@ -123,7 +124,7 @@
123	124	static boolean LOCALTRANSFORM = false;
124	125	static boolean FULLSCREEN = false;
125	126	static boolean SUPPORT = true;
126		-static boolean INERTIA = true;
	127	+static boolean INERTIA = false; // true;
127	128	static boolean FAST = false;
128	129	static boolean SLOWPOSE = false;
129	130	static boolean FOOTCONTACT = true;
..	..	@@ -134,7 +135,7 @@
134	135	static boolean ZOOMBOXMODE = false;
135	136	static boolean BOXMODE = false;
136	137	static boolean IMAGEFLIP = false;
137		-static boolean SMOOTHFOCUS = false;
	138	+static boolean SMOOTHFOCUS = true; // false;
138	139	static boolean SPEAKERMOCAP = true; // jan 2014 false;
139	140	static boolean SPEAKERCAMERA = false;
140	141	static boolean SPEAKERFOCUS = false;
..	..	@@ -249,7 +250,7 @@
249	250
250	251	public javax.media.opengl.GL GetGL0()
251	252	{
252		- return null;
	253	+ return currentGL;
253	254	}
254	255
255	256	public int GenList()
..	..	@@ -1529,7 +1530,7 @@
1529	1530	}
1530	1531	}
1531	1532	float b = 0;
1532		- if (obj.support != null && obj.link2master)
	1533	+ if (obj.support != null && obj.Link2Support())
1533	1534	{
1534	1535	b = 1;
1535	1536	}
..	..	@@ -2109,7 +2110,7 @@
2109	2110	// Start with free camera
2110	2111	SwitchCameras(true);
2111	2112
2112		- pingthread.jump = true; // optional?
	2113	+// pingthread.jump = true; // optional?
2113	2114
2114	2115	if (TRACKONCE)
2115	2116	{
..	..	@@ -2296,18 +2297,6 @@
2296	2297	public void ToggleTrack()
2297	2298	{
2298	2299	TRACK ^= true;
2299		- if (TRACK)
2300		- {
2301		- if (object.selection != null &&
2302		- object.selection.size() > 0 &&
2303		- object.selection.elementAt(0) != null &&
2304		- !(object.selection.elementAt(0) instanceof Camera) &&
2305		- !(object.selection.elementAt(0) instanceof ScriptNode))
2306		- {
2307		- trackedobject = object.selection.elementAt(0);
2308		- repaint();
2309		- }
2310		- }
2311	2300
2312	2301	repaint();
2313	2302	}
..	..	@@ -6973,30 +6962,30 @@
6973	6962	short residu = 0;
6974	6963
6975	6964	// wraparound workarounds
6976		- short fuck = (short) (buffer[i] & 0xFF);
	6965	+ short ww = (short) (buffer[i] & 0xFF);
6977	6966	/*
6978		- residu += (fuck%2);
6979		- if(fuck/2 < 256-residu/2)
	6967	+ residu += (ww%2);
	6968	+ if(ww/2 < 256-residu/2)
6980	6969	{
6981		- fuck = (short)((fuck/2) + residu/2);
	6970	+ ww = (short)((ww/2) + residu/2);
6982	6971	if(residu == 2)
6983	6972	residu = 0;
6984	6973	}
6985	6974	else
6986	6975	{
6987	6976	residu = 0;
6988		- fuck /= 2;
	6977	+ ww /= 2;
6989	6978	}
6990	6979	*/
6991		- if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| fuck >= 254)
	6980	+ if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| ww >= 254)
6992	6981	{
6993		- fuck /= 2;
	6982	+ ww /= 2;
6994	6983	} else
6995	6984	{
6996		- fuck = (short) ((fuck / 2) + fuck % 2);
	6985	+ ww = (short) ((ww / 2) + ww % 2);
6997	6986	}
6998	6987
6999		- buffer[i] = (byte) fuck;
	6988	+ buffer[i] = (byte) ww;
7000	6989	}
7001	6990	//System.out.print(bytes[i] + " ");
7002	6991	//if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
..	..	@@ -10772,7 +10761,9 @@
10772	10761	}
10773	10762	/**/
10774	10763
10775		- if (selection)
	10764	+ boolean control = ((modifiers & CTRL) != 0);
	10765	+
	10766	+ if (selection && (!Globals.isLIVE() \|\| control))
10776	10767	{
10777	10768	selectbuffer.display();
10778	10769	return;
..	..	@@ -10915,6 +10906,12 @@
10915	10906	}
10916	10907	else
10917	10908	speedkey[RIGHT_ARROW] = 0;
	10909	+
	10910	+ if (Globals.WALK && capsLocked)
	10911	+ {
	10912	+ Walk();
	10913	+ keyon = true;
	10914	+ }
10918	10915
10919	10916	if (keyon)
10920	10917	{
..	..	@@ -11870,8 +11867,11 @@
11870	11867	repaint();
11871	11868	}
11872	11869
11873		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11870	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11871	+ {
	11872	+ renderCamera.computeTransform();
11874	11873	repaint();
	11874	+ }
11875	11875
11876	11876	displaydone = true;
11877	11877	}
..	..	@@ -11946,9 +11946,23 @@
11946	11946	//GL gl = getGL();
11947	11947	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11948	11948	{
	11949	+ if (TRACK)
	11950	+ {
	11951	+ if (object.selection != null &&
	11952	+ object.selection.size() > 0 &&
	11953	+ object.selection.elementAt(0) != null &&
	11954	+ !(object.selection.elementAt(0) instanceof Camera) &&
	11955	+ !(object.selection.elementAt(0) instanceof ScriptNode))
	11956	+ {
	11957	+ trackedobject = object.selection.elementAt(0);
	11958	+ //repaint();
	11959	+ }
	11960	+ else
	11961	+ trackedobject = null;
	11962	+ }
11949	11963	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11950	11964	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11951		- pingthread.StepToTarget(true); // true);
	11965	+ pingthread.StepToTarget(); // true);
11952	11966	// zoomonce = false;
11953	11967	}
11954	11968
..	..	@@ -14329,6 +14343,7 @@
14329	14343	public void mouseClicked(MouseEvent e)
14330	14344	{
14331	14345	System.out.println("mouseClicked: " + e);
	14346	+ System.exit(0);
14332	14347	}
14333	14348
14334	14349	public void mousePressed(MouseEvent e)
..	..	@@ -14413,7 +14428,7 @@
14413	14428	//}
14414	14429
14415	14430	SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
14416		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
	14431	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
14417	14432	anchorX = ax;
14418	14433	anchorY = ay;
14419	14434	prevX = px;
..	..	@@ -14508,8 +14523,9 @@
14508	14523	// fev 2014???
14509	14524	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
14510	14525	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14511		- pingthread.StepToTarget(true); // true);
	14526	+ pingthread.StepToTarget(); // true);
14512	14527	}
	14528	+
14513	14529	// if (!LIVE)
14514	14530	super.repaint();
14515	14531	}
..	..	@@ -14629,11 +14645,17 @@
14629	14645	return targetLookAt;
14630	14646	}
14631	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	+
14632	14653	class PingThread extends Thread
14633	14654	{
14634	14655	boolean jump;
	14656	+ boolean live;
14635	14657
14636		- boolean mute;
	14658	+ boolean mute = false;
14637	14659
14638	14660	// void JumpToTarget()
14639	14661	// {
..	..	@@ -14649,8 +14671,94 @@
14649	14671	// only one thread!? synchronized
14650	14672	void StepToTarget(boolean jump)
14651	14673	{
	14674	+ RigidBody.pos.x = 0;
	14675	+ RigidBody.pos.y = 0;
	14676	+ RigidBody.pos.z = 0;
	14677	+ if (RigidBody.justclicked)
	14678	+ {
	14679	+// RigidBody.pos.x = (float)manipCamera.lookAt.x;
	14680	+// RigidBody.pos.y = (float)manipCamera.lookAt.y;
	14681	+// RigidBody.pos.z = (float)manipCamera.lookAt.z;
	14682	+ // System.err.println("selected point = " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][1]) + " " + Trunk(selectedpoint.toParent[3][2]));
	14683	+ CreateSelectedPoint();
	14684	+
	14685	+ RigidBody.pos.x = (float)selectedpoint.toParent[3][0];
	14686	+ RigidBody.pos.y = (float)selectedpoint.toParent[3][1];
	14687	+ RigidBody.pos.z = (float)selectedpoint.toParent[3][2];
	14688	+
	14689	+ RigidBody.wind.set(RigidBody.pos);
	14690	+ RigidBody.wind.x -= (float)manipCamera.location.x;
	14691	+ RigidBody.wind.y -= (float)manipCamera.location.y;
	14692	+ RigidBody.wind.z -= (float)manipCamera.location.z;
	14693	+ RigidBody.wind.normalize();
	14694	+ }
	14695	+
14652	14696	if (mute)
14653	14697	return;
	14698	+
	14699	+ if (capsLocked && manipCamera.viewCode == 0)
	14700	+ {
	14701	+ eye.x = manipCamera.location.x;
	14702	+ eye.y = manipCamera.location.y + 0.25;
	14703	+ eye.z = manipCamera.location.z;
	14704	+
	14705	+ dir.y = -1;
	14706	+
	14707	+ Ray ray = new Ray(eye, dir);
	14708	+
	14709	+ IntersectResult res = new IntersectResult();
	14710	+ res.t = Double.POSITIVE_INFINITY;
	14711	+
	14712	+ tmp.set(targetLookAt);
	14713	+ tmp.sub(manipCamera.location);
	14714	+
	14715	+ double dist = tmp.length();
	14716	+
	14717	+ tmp.normalize();
	14718	+
	14719	+ eye2.x = manipCamera.location.x + tmp.x * 0.25;
	14720	+ eye2.y = manipCamera.location.y + 0.25;
	14721	+ eye2.z = manipCamera.location.z + tmp.z * 0.25;
	14722	+
	14723	+ Ray ray2 = new Ray(eye2, dir);
	14724	+
	14725	+ IntersectResult res2 = new IntersectResult();
	14726	+ res2.t = Double.POSITIVE_INFINITY;
	14727	+
	14728	+ if (object.intersect(ray, res) && object.intersect(ray2, res2) && Math.abs(res.t - res2.t) < 0.25)
	14729	+ {
	14730	+ //tmp.set(manipCamera.location);
	14731	+
	14732	+ manipCamera.location.x = ray.eyePoint.x + ray.viewDirection.x * res.t;
	14733	+ manipCamera.location.y = ray.eyePoint.y + ray.viewDirection.y * res.t + 0.5;
	14734	+ manipCamera.location.z = ray.eyePoint.z + ray.viewDirection.z * res.t;
	14735	+
	14736	+ //tmp.sub(manipCamera.location);
	14737	+
	14738	+ targetLookAt.x = ray2.eyePoint.x + ray2.viewDirection.x * res2.t;
	14739	+ targetLookAt.y = ray2.eyePoint.y + ray2.viewDirection.y * res2.t + 0.5;
	14740	+ targetLookAt.z = ray2.eyePoint.z + ray2.viewDirection.z * res2.t;
	14741	+
	14742	+ targetLookAt.sub(manipCamera.location);
	14743	+ targetLookAt.normalize();
	14744	+ targetLookAt.mul(dist);
	14745	+ targetLookAt.add(manipCamera.location);
	14746	+
	14747	+ //if (tmp.dot(tmp) > 0.000001)
	14748	+ // System.out.println("INTERSECTION " + manipCamera.location);
	14749	+
	14750	+ manipCamera.lookAt.set(targetLookAt);
	14751	+
	14752	+ tmp.x = res.n.x;
	14753	+ tmp.y = res.n.y;
	14754	+ tmp.z = res.n.z;
	14755	+ tmp.x += res2.n.x;
	14756	+ tmp.y += res2.n.y;
	14757	+ tmp.z += res2.n.z;
	14758	+ tmp.normalize();
	14759	+ manipCamera.UP.set(tmp);
	14760	+ }
	14761	+ }
14654	14762
14655	14763	tmp.set(targetLookAt);
14656	14764	tmp.sub(manipCamera.lookAt); // june 2014
..	..	@@ -14689,7 +14797,7 @@
14689	14797
14690	14798	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
14691	14799	{
14692		- jump = true; // step = 1;
	14800	+ // sep 2019 jump = true; // step = 1;
14693	14801	}
14694	14802
14695	14803	if (OEILONCE && OEIL)
..	..	@@ -14724,7 +14832,10 @@
14724	14832	if (tmp.dot(tmp) < 0.00001)
14725	14833	{
14726	14834	zoomonce = false;
	14835	+ live = false;
14727	14836	}
	14837	+ else
	14838	+ live = true;
14728	14839
14729	14840	tmp.mul(step > step2 ? step : step2);
14730	14841	}
..	..	@@ -14866,8 +14977,28 @@
14866	14977	PingThread pingthread = new PingThread();
14867	14978	int delta = 1;
14868	14979	int speed = 1;
	14980	+ int walk = 8;
14869	14981	boolean autorepeat = false;
14870	14982
	14983	+ void Walk()
	14984	+ {
	14985	+ manipCamera.BackForth(0, walk, 1000);
	14986	+
	14987	+ targetLookAt.set(manipCamera.lookAt);
	14988	+ }
	14989	+
	14990	+ void ViewAngle(float dy)
	14991	+ {
	14992	+ double factor = Math.exp(-dy/300.0); // (1 + dy/100);
	14993	+
	14994	+ if (manipCamera.shaper_fovy * factor > 1 &&
	14995	+ manipCamera.shaper_fovy * factor < 150)
	14996	+ {
	14997	+ manipCamera.shaper_fovy *= factor;
	14998	+ //System.out.println("fovy = " + shaper_fovy);
	14999	+ }
	15000	+ }
	15001	+
14871	15002	void GoDown(int mod)
14872	15003	{
14873	15004	MODIFIERS \|= COMMAND;
..	..	@@ -14878,6 +15009,9 @@
14878	15009	// if (isVR)
14879	15010	// manipCamera.RotateInterest(0, speed);
14880	15011	// else
	15012	+ if (isVR)
	15013	+ ViewAngle(-speed*delta);
	15014	+ else
14881	15015	manipCamera.Translate(0, -speed*delta, getWidth());
14882	15016	}
14883	15017	else
..	..	@@ -14905,6 +15039,8 @@
14905	15039
14906	15040	void GoUp(int mod)
14907	15041	{
	15042	+ RigidBody.justclicked = true;
	15043	+
14908	15044	MODIFIERS \|= COMMAND;
14909	15045	/**/
14910	15046	boolean isVR = (mouseMode&VR)!=0;
..	..	@@ -14914,6 +15050,9 @@
14914	15050	// if (isVR)
14915	15051	// manipCamera.RotateInterest(0, -speed);
14916	15052	// else
	15053	+ if (isVR)
	15054	+ ViewAngle(speed*delta);
	15055	+ else
14917	15056	manipCamera.Translate(0, speed*delta, getWidth());
14918	15057	}
14919	15058	else
..	..	@@ -14944,13 +15083,13 @@
14944	15083	MODIFIERS \|= COMMAND;
14945	15084	/**/
14946	15085	if((mod&SHIFT) == SHIFT)
14947		- manipCamera.Translate(speed*delta, 0, getWidth());
	15086	+ manipCamera.Translate(speed, 0, getWidth());
14948	15087	else
14949	15088	{
14950	15089	if ((mouseMode&VR)!=0)
14951		- manipCamera.RotateInterest(-speed, 0);
	15090	+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
14952	15091	else
14953		- manipCamera.RotatePosition(speed, 0);
	15092	+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
14954	15093	}
14955	15094
14956	15095	/**/
..	..	@@ -14976,13 +15115,13 @@
14976	15115	MODIFIERS \|= COMMAND;
14977	15116	/**/
14978	15117	if((mod&SHIFT) == SHIFT)
14979		- manipCamera.Translate(-speed*delta, 0, getWidth());
	15118	+ manipCamera.Translate(-speed, 0, getWidth());
14980	15119	else
14981	15120	{
14982	15121	if ((mouseMode&VR)!=0)
14983		- manipCamera.RotateInterest(speed, 0);
	15122	+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
14984	15123	else
14985		- manipCamera.RotatePosition(-speed, 0);
	15124	+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
14986	15125	}
14987	15126
14988	15127	/**/
..	..	@@ -15129,6 +15268,11 @@
15129	15268	if ((mouseMode & ZOOM) != 0)
15130	15269	{
15131	15270	//if ((mouseMode & BACKFORTH) != 0)
	15271	+ if ((modifiersex & SHIFT) == SHIFT)
	15272	+ {
	15273	+ ViewAngle(dy);
	15274	+ }
	15275	+ else
15132	15276	if ((mouseMode & VR) != 0)
15133	15277	manipCamera.BackForth(dx, dy, getWidth());
15134	15278	else
..	..	@@ -15230,6 +15374,12 @@
15230	15374
15231	15375	public void mouseReleased(MouseEvent e)
15232	15376	{
	15377	+ if (isRenderer && !movingcamera)
	15378	+ {
	15379	+ RigidBody.justclicked = true;
	15380	+ System.out.println("justclicked: " + e);
	15381	+ }
	15382	+
15233	15383	Globals.MOUSEDRAGGED = false;
15234	15384
15235	15385	movingcamera = false;
..	..	@@ -15833,6 +15983,10 @@
15833	15983	case ENTER:
15834	15984	// object.editWindow.ScreenFit(); // Edit();
15835	15985	ToggleLive();
	15986	+ if (capsLocked)
	15987	+ {
	15988	+ Globals.WALK ^= true;
	15989	+ }
15836	15990	break;
15837	15991	case DELETE:
15838	15992	ClearSelection();
..	..	@@ -15869,17 +16023,23 @@
15869	16023	object.GetWindow().refreshContents(true);
15870	16024	break;
15871	16025	case '{':
15872		- manipCamera.shaper_fovy /= 1.1;
	16026	+ double factor = 1.1;
	16027	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16028	+ manipCamera.shaper_fovy /= factor;
15873	16029	System.out.println("FOV = " + manipCamera.shaper_fovy);
15874	16030	repaint();
15875	16031	break;
15876	16032	case '}':
15877		- manipCamera.shaper_fovy *= 1.1;
	16033	+ factor = 1.1;
	16034	+ if (manipCamera.shaper_fovy * factor < 150)
	16035	+ manipCamera.shaper_fovy *= factor;
15878	16036	System.out.println("FOV = " + manipCamera.shaper_fovy);
15879	16037	repaint();
15880	16038	break;
15881	16039	case '[':
15882		- manipCamera.shaper_fovy /= 1.01;
	16040	+ factor = 1.01;
	16041	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16042	+ manipCamera.shaper_fovy /= factor;
15883	16043	if (false) //manipCamera.hAspect == 0)
15884	16044	{
15885	16045	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15895,7 +16055,9 @@
15895	16055	break;
15896	16056	case ']':
15897	16057	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15898		- manipCamera.shaper_fovy *= 1.01;
	16058	+ factor = 1.01;
	16059	+ if (manipCamera.shaper_fovy * factor < 150)
	16060	+ manipCamera.shaper_fovy *= factor;
15899	16061	if (false) //manipCamera.hAspect == 0)
15900	16062	{
15901	16063	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -16615,7 +16777,8 @@
16615	16777
16616	16778	public boolean mouseDrag(Event evt, int x, int y)
16617	16779	{
16618		- //System.out.println("mouseDrag: " + evt);
	16780	+ System.out.println("mouseDrag: " + evt);
	16781	+ System.exit(0);
16619	16782	/*
16620	16783	drag = true;
16621	16784	//System.out.println("Mouse DRAG");
..	..	@@ -16734,6 +16897,7 @@
16734	16897	public boolean mouseUp(Event evt, int x, int y)
16735	16898	{
16736	16899	System.out.println("mouseUp: " + evt);
	16900	+ System.exit(0);
16737	16901	/*
16738	16902	locked = false;
16739	16903	if (isRenderer)
..	..	@@ -17004,7 +17168,7 @@
17004	17168	return;
17005	17169	}
17006	17170
17007		- if (WIREFRAME)
	17171	+ //if (WIREFRAME)
17008	17172	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
17009	17173
17010	17174	gl.glDisable(gl.GL_CULL_FACE);
..	..	@@ -17104,6 +17268,8 @@
17104	17268
17105	17269	if (WIREFRAME)
17106	17270	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_LINE);
	17271	+ else
	17272	+ gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
17107	17273	}
17108	17274
17109	17275	private void DrawChecker(GL gl)
..	..	@@ -18108,7 +18274,7 @@
18108	18274
18109	18275	private boolean keepshadow;
18110	18276
18111		- public boolean capsLocked = false; // VR
	18277	+ static public boolean capsLocked = false; // VR
18112	18278
18113	18279	static public int indexcount = 0;
18114	18280	/static/ cColor vertexOcclusion = new cColor();