~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;
..	..	@@ -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.link2support)
	1533	+ if (obj.support != null && obj.Link2Support())
1533	1534	{
1534	1535	b = 1;
1535	1536	}
..	..	@@ -6961,30 +6962,30 @@
6961	6962	short residu = 0;
6962	6963
6963	6964	// wraparound workarounds
6964		- short fuck = (short) (buffer[i] & 0xFF);
	6965	+ short ww = (short) (buffer[i] & 0xFF);
6965	6966	/*
6966		- residu += (fuck%2);
6967		- if(fuck/2 < 256-residu/2)
	6967	+ residu += (ww%2);
	6968	+ if(ww/2 < 256-residu/2)
6968	6969	{
6969		- fuck = (short)((fuck/2) + residu/2);
	6970	+ ww = (short)((ww/2) + residu/2);
6970	6971	if(residu == 2)
6971	6972	residu = 0;
6972	6973	}
6973	6974	else
6974	6975	{
6975	6976	residu = 0;
6976		- fuck /= 2;
	6977	+ ww /= 2;
6977	6978	}
6978	6979	*/
6979		- if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| fuck >= 254)
	6980	+ if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| ww >= 254)
6980	6981	{
6981		- fuck /= 2;
	6982	+ ww /= 2;
6982	6983	} else
6983	6984	{
6984		- fuck = (short) ((fuck / 2) + fuck % 2);
	6985	+ ww = (short) ((ww / 2) + ww % 2);
6985	6986	}
6986	6987
6987		- buffer[i] = (byte) fuck;
	6988	+ buffer[i] = (byte) ww;
6988	6989	}
6989	6990	//System.out.print(bytes[i] + " ");
6990	6991	//if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
..	..	@@ -10760,7 +10761,9 @@
10760	10761	}
10761	10762	/**/
10762	10763
10763		- if (selection)
	10764	+ boolean control = ((modifiers & CTRL) != 0);
	10765	+
	10766	+ if (selection && (!Globals.isLIVE() \|\| control))
10764	10767	{
10765	10768	selectbuffer.display();
10766	10769	return;
..	..	@@ -14340,6 +14343,7 @@
14340	14343	public void mouseClicked(MouseEvent e)
14341	14344	{
14342	14345	System.out.println("mouseClicked: " + e);
	14346	+ System.exit(0);
14343	14347	}
14344	14348
14345	14349	public void mousePressed(MouseEvent e)
..	..	@@ -14651,7 +14655,7 @@
14651	14655	boolean jump;
14652	14656	boolean live;
14653	14657
14654		- boolean mute;
	14658	+ boolean mute = false;
14655	14659
14656	14660	// void JumpToTarget()
14657	14661	// {
..	..	@@ -14667,6 +14671,28 @@
14667	14671	// only one thread!? synchronized
14668	14672	void StepToTarget(boolean jump)
14669	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	+
14670	14696	if (mute)
14671	14697	return;
14672	14698
..	..	@@ -15013,6 +15039,8 @@
15013	15039
15014	15040	void GoUp(int mod)
15015	15041	{
	15042	+ RigidBody.justclicked = true;
	15043	+
15016	15044	MODIFIERS \|= COMMAND;
15017	15045	/**/
15018	15046	boolean isVR = (mouseMode&VR)!=0;
..	..	@@ -15346,6 +15374,12 @@
15346	15374
15347	15375	public void mouseReleased(MouseEvent e)
15348	15376	{
	15377	+ if (isRenderer && !movingcamera)
	15378	+ {
	15379	+ RigidBody.justclicked = true;
	15380	+ System.out.println("justclicked: " + e);
	15381	+ }
	15382	+
15349	15383	Globals.MOUSEDRAGGED = false;
15350	15384
15351	15385	movingcamera = false;
..	..	@@ -16743,7 +16777,8 @@
16743	16777
16744	16778	public boolean mouseDrag(Event evt, int x, int y)
16745	16779	{
16746		- //System.out.println("mouseDrag: " + evt);
	16780	+ System.out.println("mouseDrag: " + evt);
	16781	+ System.exit(0);
16747	16782	/*
16748	16783	drag = true;
16749	16784	//System.out.println("Mouse DRAG");
..	..	@@ -16862,6 +16897,7 @@
16862	16897	public boolean mouseUp(Event evt, int x, int y)
16863	16898	{
16864	16899	System.out.println("mouseUp: " + evt);
	16900	+ System.exit(0);
16865	16901	/*
16866	16902	locked = false;
16867	16903	if (isRenderer)
..	..	@@ -17132,7 +17168,7 @@
17132	17168	return;
17133	17169	}
17134	17170
17135		- if (WIREFRAME)
	17171	+ //if (WIREFRAME)
17136	17172	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
17137	17173
17138	17174	gl.glDisable(gl.GL_CULL_FACE);
..	..	@@ -17232,6 +17268,8 @@
17232	17268
17233	17269	if (WIREFRAME)
17234	17270	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_LINE);
	17271	+ else
	17272	+ gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
17235	17273	}
17236	17274
17237	17275	private void DrawChecker(GL gl)