X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=mathlib.c;h=d6170d28977c27645f71b9987887854670d34916;hp=36e858dee589dca6c48541c8730375e5a6340db1;hb=f575e5ad7f9eab64e89b714e75ff5dd92e49f373;hpb=6824d8ddc8a43cae0609be5bbe8bee01fa1a4225

diff --git a/mathlib.c b/mathlib.c
index 36e858de..d6170d28 100644
--- a/mathlib.c
+++ b/mathlib.c
@@ -19,9 +19,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // mathlib.c -- math primitives
 
-#include <math.h>
 #include "quakedef.h"
 
+#include <math.h>
+
 vec3_t vec3_origin = {0,0,0};
 float ixtable[4096];
 
@@ -254,6 +255,24 @@ void RotatePointAroundVector( vec3_t dst, const vec3_t dir, const vec3_t point,
 	       + (t0 * vr[2] + t1 * vu[2] + vf[2] * vf[2]) * point[2];
 }
 
+/*-----------------------------------------------------------------*/
+
+// returns the smallest integer greater than or equal to "value", or 0 if "value" is too big
+unsigned int CeilPowerOf2(unsigned int value)
+{
+	unsigned int ceilvalue;
+
+	if (value > (1U << (sizeof(int) * 8 - 1)))
+		return 0;
+
+	ceilvalue = 1;
+	while (ceilvalue < value)
+		ceilvalue <<= 1;
+
+	return ceilvalue;
+}
+
+
 /*-----------------------------------------------------------------*/
 
 
@@ -499,6 +518,82 @@ void AngleVectorsFLU (const vec3_t angles, vec3_t forward, vec3_t left, vec3_t u
 	}
 }
 
+// LordHavoc: calculates pitch/yaw/roll angles from forward and up vectors
+void AnglesFromVectors (vec3_t angles, const vec3_t forward, const vec3_t up, qboolean flippitch)
+{
+	if (forward[0] == 0 && forward[1] == 0)
+	{
+		if(forward[2] > 0)
+		{
+			angles[PITCH] = -M_PI * 0.5;
+			angles[YAW] = up ? atan2(-up[1], -up[0]) : 0;
+		}
+		else
+		{
+			angles[PITCH] = M_PI * 0.5;
+			angles[YAW] = up ? atan2(up[1], up[0]) : 0;
+		}
+		angles[ROLL] = 0;
+	}
+	else
+	{
+		angles[YAW] = atan2(forward[1], forward[0]);
+		angles[PITCH] = -atan2(forward[2], sqrt(forward[0]*forward[0] + forward[1]*forward[1]));
+		if (up)
+		{
+			vec_t cp = cos(angles[PITCH]), sp = sin(angles[PITCH]);
+			vec_t cy = cos(angles[YAW]), sy = sin(angles[YAW]);
+			vec3_t tleft, tup;
+			tleft[0] = -sy;
+			tleft[1] = cy;
+			tleft[2] = 0;
+			tup[0] = sp*cy;
+			tup[1] = sp*sy;
+			tup[2] = cp;
+			angles[ROLL] = -atan2(DotProduct(up, tleft), DotProduct(up, tup));
+		}
+		else
+			angles[ROLL] = 0;
+	}
+
+	// now convert radians to degrees, and make all values positive
+	VectorScale(angles, 180.0 / M_PI, angles);
+	if (flippitch)
+		angles[PITCH] *= -1;
+	if (angles[PITCH] < 0) angles[PITCH] += 360;
+	if (angles[YAW] < 0) angles[YAW] += 360;
+	if (angles[ROLL] < 0) angles[ROLL] += 360;
+
+#if 0
+{
+	// debugging code
+	vec3_t tforward, tleft, tup, nforward, nup;
+	VectorCopy(forward, nforward);
+	VectorNormalize(nforward);
+	if (up)
+	{
+		VectorCopy(up, nup);
+		VectorNormalize(nup);
+		AngleVectors(angles, tforward, tleft, tup);
+		if (VectorDistance(tforward, nforward) > 0.01 || VectorDistance(tup, nup) > 0.01)
+		{
+			Con_Printf("vectoangles('%f %f %f', '%f %f %f') = %f %f %f\n", nforward[0], nforward[1], nforward[2], nup[0], nup[1], nup[2], angles[0], angles[1], angles[2]);
+			Con_Printf("^3But that is '%f %f %f', '%f %f %f'\n", tforward[0], tforward[1], tforward[2], tup[0], tup[1], tup[2]);
+		}
+	}
+	else
+	{
+		AngleVectors(angles, tforward, tleft, tup);
+		if (VectorDistance(tforward, nforward) > 0.01)
+		{
+			Con_Printf("vectoangles('%f %f %f') = %f %f %f\n", nforward[0], nforward[1], nforward[2], angles[0], angles[1], angles[2]);
+			Con_Printf("^3But that is '%f %f %f'\n", tforward[0], tforward[1], tforward[2]);
+		}
+	}
+}
+#endif
+}
+
 #if 0
 void AngleMatrix (const vec3_t angles, const vec3_t translate, vec_t matrix[][4])
 {