X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=mathlib.c;h=a55ab9d6df90b2ef526322591e06be8e630dccb8;hb=f7c977317897310bddfd6f32e179a79e2c1caa14;hp=4dea77d59d066b15b7b57600ebe6c74c62905cbd;hpb=a3a9a6454a1d1450eef77e7d0411a196805f2673;p=xonotic%2Fdarkplaces.git

diff --git a/mathlib.c b/mathlib.c
index 4dea77d5..a55ab9d6 100644
--- a/mathlib.c
+++ b/mathlib.c
@@ -29,66 +29,66 @@ float ixtable[4096];
 
 float m_bytenormals[NUMVERTEXNORMALS][3] =
 {
-{-0.525731, 0.000000, 0.850651}, {-0.442863, 0.238856, 0.864188}, 
-{-0.295242, 0.000000, 0.955423}, {-0.309017, 0.500000, 0.809017}, 
+{-0.525731, 0.000000, 0.850651}, {-0.442863, 0.238856, 0.864188},
+{-0.295242, 0.000000, 0.955423}, {-0.309017, 0.500000, 0.809017},
 {-0.162460, 0.262866, 0.951056}, {0.000000, 0.000000, 1.000000},
-{0.000000, 0.850651, 0.525731}, {-0.147621, 0.716567, 0.681718}, 
-{0.147621, 0.716567, 0.681718}, {0.000000, 0.525731, 0.850651}, 
-{0.309017, 0.500000, 0.809017}, {0.525731, 0.000000, 0.850651}, 
-{0.295242, 0.000000, 0.955423}, {0.442863, 0.238856, 0.864188}, 
-{0.162460, 0.262866, 0.951056}, {-0.681718, 0.147621, 0.716567}, 
-{-0.809017, 0.309017, 0.500000}, {-0.587785, 0.425325, 0.688191}, 
+{0.000000, 0.850651, 0.525731}, {-0.147621, 0.716567, 0.681718},
+{0.147621, 0.716567, 0.681718}, {0.000000, 0.525731, 0.850651},
+{0.309017, 0.500000, 0.809017}, {0.525731, 0.000000, 0.850651},
+{0.295242, 0.000000, 0.955423}, {0.442863, 0.238856, 0.864188},
+{0.162460, 0.262866, 0.951056}, {-0.681718, 0.147621, 0.716567},
+{-0.809017, 0.309017, 0.500000}, {-0.587785, 0.425325, 0.688191},
 {-0.850651, 0.525731, 0.000000}, {-0.864188, 0.442863, 0.238856},
-{-0.716567, 0.681718, 0.147621}, {-0.688191, 0.587785, 0.425325}, 
-{-0.500000, 0.809017, 0.309017}, {-0.238856, 0.864188, 0.442863}, 
-{-0.425325, 0.688191, 0.587785}, {-0.716567, 0.681718, -0.147621}, 
-{-0.500000, 0.809017, -0.309017}, {-0.525731, 0.850651, 0.000000}, 
+{-0.716567, 0.681718, 0.147621}, {-0.688191, 0.587785, 0.425325},
+{-0.500000, 0.809017, 0.309017}, {-0.238856, 0.864188, 0.442863},
+{-0.425325, 0.688191, 0.587785}, {-0.716567, 0.681718, -0.147621},
+{-0.500000, 0.809017, -0.309017}, {-0.525731, 0.850651, 0.000000},
 {0.000000, 0.850651, -0.525731}, {-0.238856, 0.864188, -0.442863},
-{0.000000, 0.955423, -0.295242}, {-0.262866, 0.951056, -0.162460}, 
+{0.000000, 0.955423, -0.295242}, {-0.262866, 0.951056, -0.162460},
 {0.000000, 1.000000, 0.000000}, {0.000000, 0.955423, 0.295242},
-{-0.262866, 0.951056, 0.162460}, {0.238856, 0.864188, 0.442863}, 
-{0.262866, 0.951056, 0.162460}, {0.500000, 0.809017, 0.309017}, 
-{0.238856, 0.864188, -0.442863}, {0.262866, 0.951056, -0.162460}, 
-{0.500000, 0.809017, -0.309017}, {0.850651, 0.525731, 0.000000}, 
-{0.716567, 0.681718, 0.147621}, {0.716567, 0.681718, -0.147621}, 
-{0.525731, 0.850651, 0.000000}, {0.425325, 0.688191, 0.587785}, 
-{0.864188, 0.442863, 0.238856}, {0.688191, 0.587785, 0.425325}, 
+{-0.262866, 0.951056, 0.162460}, {0.238856, 0.864188, 0.442863},
+{0.262866, 0.951056, 0.162460}, {0.500000, 0.809017, 0.309017},
+{0.238856, 0.864188, -0.442863}, {0.262866, 0.951056, -0.162460},
+{0.500000, 0.809017, -0.309017}, {0.850651, 0.525731, 0.000000},
+{0.716567, 0.681718, 0.147621}, {0.716567, 0.681718, -0.147621},
+{0.525731, 0.850651, 0.000000}, {0.425325, 0.688191, 0.587785},
+{0.864188, 0.442863, 0.238856}, {0.688191, 0.587785, 0.425325},
 {0.809017, 0.309017, 0.500000}, {0.681718, 0.147621, 0.716567},
-{0.587785, 0.425325, 0.688191}, {0.955423, 0.295242, 0.000000}, 
+{0.587785, 0.425325, 0.688191}, {0.955423, 0.295242, 0.000000},
 {1.000000, 0.000000, 0.000000}, {0.951056, 0.162460, 0.262866},
-{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.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.809017, 0.309017, -0.500000}, {0.951056, 0.162460, -0.262866}, 
-{0.525731, 0.000000, -0.850651}, {0.681718, 0.147621, -0.716567}, 
+{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},
-{0.809017, -0.309017, -0.500000}, {0.864188, -0.442863, -0.238856}, 
+{0.809017, -0.309017, -0.500000}, {0.864188, -0.442863, -0.238856},
 {0.951056, -0.162460, -0.262866}, {0.147621, 0.716567, -0.681718},
-{0.309017, 0.500000, -0.809017}, {0.425325, 0.688191, -0.587785}, 
-{0.442863, 0.238856, -0.864188}, {0.587785, 0.425325, -0.688191}, 
-{0.688191, 0.587785, -0.425325}, {-0.147621, 0.716567, -0.681718}, 
+{0.309017, 0.500000, -0.809017}, {0.425325, 0.688191, -0.587785},
+{0.442863, 0.238856, -0.864188}, {0.587785, 0.425325, -0.688191},
+{0.688191, 0.587785, -0.425325}, {-0.147621, 0.716567, -0.681718},
 {-0.309017, 0.500000, -0.809017}, {0.000000, 0.525731, -0.850651},
 {-0.525731, 0.000000, -0.850651}, {-0.442863, 0.238856, -0.864188},
-{-0.295242, 0.000000, -0.955423}, {-0.162460, 0.262866, -0.951056}, 
-{0.000000, 0.000000, -1.000000}, {0.295242, 0.000000, -0.955423}, 
-{0.162460, 0.262866, -0.951056}, {-0.442863, -0.238856, -0.864188}, 
-{-0.309017, -0.500000, -0.809017}, {-0.162460, -0.262866, -0.951056}, 
-{0.000000, -0.850651, -0.525731}, {-0.147621, -0.716567, -0.681718}, 
-{0.147621, -0.716567, -0.681718}, {0.000000, -0.525731, -0.850651}, 
-{0.309017, -0.500000, -0.809017}, {0.442863, -0.238856, -0.864188}, 
-{0.162460, -0.262866, -0.951056}, {0.238856, -0.864188, -0.442863}, 
-{0.500000, -0.809017, -0.309017}, {0.425325, -0.688191, -0.587785}, 
-{0.716567, -0.681718, -0.147621}, {0.688191, -0.587785, -0.425325}, 
+{-0.295242, 0.000000, -0.955423}, {-0.162460, 0.262866, -0.951056},
+{0.000000, 0.000000, -1.000000}, {0.295242, 0.000000, -0.955423},
+{0.162460, 0.262866, -0.951056}, {-0.442863, -0.238856, -0.864188},
+{-0.309017, -0.500000, -0.809017}, {-0.162460, -0.262866, -0.951056},
+{0.000000, -0.850651, -0.525731}, {-0.147621, -0.716567, -0.681718},
+{0.147621, -0.716567, -0.681718}, {0.000000, -0.525731, -0.850651},
+{0.309017, -0.500000, -0.809017}, {0.442863, -0.238856, -0.864188},
+{0.162460, -0.262866, -0.951056}, {0.238856, -0.864188, -0.442863},
+{0.500000, -0.809017, -0.309017}, {0.425325, -0.688191, -0.587785},
+{0.716567, -0.681718, -0.147621}, {0.688191, -0.587785, -0.425325},
 {0.587785, -0.425325, -0.688191}, {0.000000, -0.955423, -0.295242},
-{0.000000, -1.000000, 0.000000}, {0.262866, -0.951056, -0.162460}, 
-{0.000000, -0.850651, 0.525731}, {0.000000, -0.955423, 0.295242}, 
-{0.238856, -0.864188, 0.442863}, {0.262866, -0.951056, 0.162460}, 
-{0.500000, -0.809017, 0.309017}, {0.716567, -0.681718, 0.147621}, 
-{0.525731, -0.850651, 0.000000}, {-0.238856, -0.864188, -0.442863}, 
-{-0.500000, -0.809017, -0.309017}, {-0.262866, -0.951056, -0.162460}, 
+{0.000000, -1.000000, 0.000000}, {0.262866, -0.951056, -0.162460},
+{0.000000, -0.850651, 0.525731}, {0.000000, -0.955423, 0.295242},
+{0.238856, -0.864188, 0.442863}, {0.262866, -0.951056, 0.162460},
+{0.500000, -0.809017, 0.309017}, {0.716567, -0.681718, 0.147621},
+{0.525731, -0.850651, 0.000000}, {-0.238856, -0.864188, -0.442863},
+{-0.500000, -0.809017, -0.309017}, {-0.262866, -0.951056, -0.162460},
 {-0.850651, -0.525731, 0.000000}, {-0.716567, -0.681718, -0.147621},
-{-0.716567, -0.681718, 0.147621}, {-0.525731, -0.850651, 0.000000}, 
+{-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},
@@ -436,7 +436,7 @@ float VectorNormalizeLength (vec3_t v)
 		v[1] *= ilength;
 		v[2] *= ilength;
 	}
-		
+
 	return length;
 
 }
@@ -482,6 +482,21 @@ void R_ConcatTransforms (const float in1[3*4], const float in2[3*4], float out[3
 	out[2*4+3] = in1[2*4+0] * in2[0*4+3] + in1[2*4+1] * in2[1*4+3] + in1[2*4+2] * in2[2*4+3] + in1[2*4+3];
 }
 
+float RadiusFromBounds (const vec3_t mins, const vec3_t maxs)
+{
+	vec3_t m1, m2;
+	VectorMultiply(mins, mins, m1);
+	VectorMultiply(maxs, maxs, m2);
+	return sqrt(max(m1[0], m2[0]) + max(m1[1], m2[1]) + max(m1[2], m2[2]));
+}
+
+float RadiusFromBoundsAndOrigin (const vec3_t mins, const vec3_t maxs, const vec3_t origin)
+{
+	vec3_t m1, m2;
+	VectorSubtract(mins, origin, m1);VectorMultiply(m1, m1, m1);
+	VectorSubtract(maxs, origin, m2);VectorMultiply(m2, m2, m2);
+	return sqrt(max(m1[0], m2[0]) + max(m1[1], m2[1]) + max(m1[2], m2[2]));
+}
 
 void Mathlib_Init(void)
 {