X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=mathlib.c;h=ab50923c26b6c4c1ba9169839cac44a4d35e90ae;hp=726cd089590a16dc992d46479d4d74d020c5404e;hb=088d86ccd8820f33680aa850fd9bf80efd0a5227;hpb=45982a9894c5bff60ff494a0f82865ec267d52f7

diff --git a/mathlib.c b/mathlib.c
index 726cd089..ab50923c 100644
--- a/mathlib.c
+++ b/mathlib.c
@@ -62,7 +62,7 @@ float m_bytenormals[NUMVERTEXNORMALS][3] =
 {0.850651, -0.525731, 0.000000}, {0.955423, -0.295242, 0.000000}, 
 {0.864188, -0.442863, 0.238856}, {0.951056, -0.162460, 0.262866}, 
 {0.809017, -0.309017, 0.500000}, {0.681718, -0.147621, 0.716567},
-{0.850651, 0.000000, 0.525731}, {0.864188, 0.442863, -0.238856}, 
+{0.850651, 0.000000, 0.525731}, {0.864188, 0.442863, -0.238856},
 {0.809017, 0.309017, -0.500000}, {0.951056, 0.162460, -0.262866}, 
 {0.525731, 0.000000, -0.850651}, {0.681718, 0.147621, -0.716567}, 
 {0.681718, -0.147621, -0.716567}, {0.850651, 0.000000, -0.525731},
@@ -94,7 +94,7 @@ float m_bytenormals[NUMVERTEXNORMALS][3] =
 {-0.716567, -0.681718, 0.147621}, {-0.525731, -0.850651, 0.000000}, 
 {-0.500000, -0.809017, 0.309017}, {-0.238856, -0.864188, 0.442863},
 {-0.262866, -0.951056, 0.162460}, {-0.864188, -0.442863, 0.238856}, 
-{-0.809017, -0.309017, 0.500000}, {-0.688191, -0.587785, 0.425325}, 
+{-0.809017, -0.309017, 0.500000}, {-0.688191, -0.587785, 0.425325},
 {-0.681718, -0.147621, 0.716567}, {-0.442863, -0.238856, 0.864188}, 
 {-0.587785, -0.425325, 0.688191}, {-0.309017, -0.500000, 0.809017}, 
 {-0.147621, -0.716567, 0.681718}, {-0.425325, -0.688191, 0.587785}, 
@@ -138,9 +138,9 @@ byte NormalToByte(vec3_t n)
 void ByteToNormal(byte num, vec3_t n)
 {
 	if (num < NUMVERTEXNORMALS)
-		VectorCopy(m_bytenormals[num], n)
+		VectorCopy(m_bytenormals[num], n);
 	else
-		VectorClear(n) // FIXME: complain?
+		VectorClear(n); // FIXME: complain?
 }
 
 float Q_RSqrt(float number)
@@ -297,6 +297,22 @@ void VectorVectors(const vec3_t forward, vec3_t right, vec3_t up)
 	right[1] = -forward[0];
 	right[2] = forward[1];
 
+	d = DotProduct(forward, right);
+	right[0] -= d * forward[0];
+	right[1] -= d * forward[1];
+	right[2] -= d * forward[2];
+	VectorNormalizeFast(right);
+	CrossProduct(right, forward, up);
+}
+
+void VectorVectorsDouble(const double *forward, double *right, double *up)
+{
+	double d;
+
+	right[0] = forward[2];
+	right[1] = -forward[0];
+	right[2] = forward[1];
+
 	d = DotProduct(forward, right);
 	right[0] -= d * forward[0];
 	right[1] -= d * forward[1];
@@ -580,55 +596,101 @@ void PlaneClassify(mplane_t *p)
 
 void AngleVectors (vec3_t angles, vec3_t forward, vec3_t right, vec3_t up)
 {
-	float		angle;
-	float		sr, sp, sy, cr, cp, cy;
-	
+	double angle, sr, sp, sy, cr, cp, cy;
+
 	angle = angles[YAW] * (M_PI*2 / 360);
 	sy = sin(angle);
 	cy = cos(angle);
 	angle = angles[PITCH] * (M_PI*2 / 360);
 	sp = sin(angle);
 	cp = cos(angle);
-	// LordHavoc: this is only to hush up gcc complaining about 'might be used uninitialized' variables
-	// (they are NOT used uninitialized, but oh well)
-	cr = 0;
-	sr = 0;
+	if (forward)
+	{
+		forward[0] = cp*cy;
+		forward[1] = cp*sy;
+		forward[2] = -sp;
+	}
 	if (right || up)
 	{
 		angle = angles[ROLL] * (M_PI*2 / 360);
 		sr = sin(angle);
 		cr = cos(angle);
+		if (right)
+		{
+			right[0] = -1*(sr*sp*cy+cr*-sy);
+			right[1] = -1*(sr*sp*sy+cr*cy);
+			right[2] = -1*(sr*cp);
+		}
+		if (up)
+		{
+			up[0] = (cr*sp*cy+-sr*-sy);
+			up[1] = (cr*sp*sy+-sr*cy);
+			up[2] = cr*cp;
+		}
 	}
+}
 
+void AngleVectorsFLU (vec3_t angles, vec3_t forward, vec3_t left, vec3_t up)
+{
+	double angle, sr, sp, sy, cr, cp, cy;
+
+	angle = angles[YAW] * (M_PI*2 / 360);
+	sy = sin(angle);
+	cy = cos(angle);
+	angle = angles[PITCH] * (M_PI*2 / 360);
+	sp = sin(angle);
+	cp = cos(angle);
 	if (forward)
 	{
 		forward[0] = cp*cy;
 		forward[1] = cp*sy;
 		forward[2] = -sp;
 	}
-	if (right)
-	{
-		right[0] = (-1*sr*sp*cy+-1*cr*-sy);
-		right[1] = (-1*sr*sp*sy+-1*cr*cy);
-		right[2] = -1*sr*cp;
-	}
-	if (up)
+	if (left || up)
 	{
-		up[0] = (cr*sp*cy+-sr*-sy);
-		up[1] = (cr*sp*sy+-sr*cy);
-		up[2] = cr*cp;
+		angle = angles[ROLL] * (M_PI*2 / 360);
+		sr = sin(angle);
+		cr = cos(angle);
+		if (left)
+		{
+			left[0] = sr*sp*cy+cr*-sy;
+			left[1] = sr*sp*sy+cr*cy;
+			left[2] = sr*cp;
+		}
+		if (up)
+		{
+			up[0] = cr*sp*cy+-sr*-sy;
+			up[1] = cr*sp*sy+-sr*cy;
+			up[2] = cr*cp;
+		}
 	}
 }
 
-int VectorCompare (vec3_t v1, vec3_t v2)
+void AngleMatrix (vec3_t angles, vec3_t translate, vec_t matrix[][4])
 {
-	int		i;
-	
-	for (i=0 ; i<3 ; i++)
-		if (v1[i] != v2[i])
-			return 0;
-			
-	return 1;
+	double angle, sr, sp, sy, cr, cp, cy;
+
+	angle = angles[YAW] * (M_PI*2 / 360);
+	sy = sin(angle);
+	cy = cos(angle);
+	angle = angles[PITCH] * (M_PI*2 / 360);
+	sp = sin(angle);
+	cp = cos(angle);
+	angle = angles[ROLL] * (M_PI*2 / 360);
+	sr = sin(angle);
+	cr = cos(angle);
+	matrix[0][0] = cp*cy;
+	matrix[0][1] = sr*sp*cy+cr*-sy;
+	matrix[0][2] = cr*sp*cy+-sr*-sy;
+	matrix[0][3] = translate[0];
+	matrix[1][0] = cp*sy;
+	matrix[1][1] = sr*sp*sy+cr*cy;
+	matrix[1][2] = cr*sp*sy+-sr*cy;
+	matrix[1][3] = translate[1];
+	matrix[2][0] = -sp;
+	matrix[2][1] = sr*cp;
+	matrix[2][2] = cr*cp;
+	matrix[2][3] = translate[2];
 }
 
 void VectorMASlow (vec3_t veca, float scale, vec3_t vecb, vec3_t vecc)