X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=mathlib.c;h=a55ab9d6df90b2ef526322591e06be8e630dccb8;hb=f7c977317897310bddfd6f32e179a79e2c1caa14;hp=7846af91a6a90019e80c7791acd40fc1adbae6e3;hpb=55bdf1bafcbe11965b60d505d335f95129405822;p=xonotic%2Fdarkplaces.git diff --git a/mathlib.c b/mathlib.c index 7846af91..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.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.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.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.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.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.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}, @@ -244,14 +244,9 @@ void RotatePointAroundVector( vec3_t dst, const vec3_t dir, const vec3_t point, vec3_t vr, vu, vf; angle = DEG2RAD(degrees); - c = cos(angle); s = sin(angle); - - vf[0] = dir[0]; - vf[1] = dir[1]; - vf[2] = dir[2]; - + VectorCopy(dir, vf); VectorVectors(vf, vr, vu); t0 = vr[0] * c + vu[0] * -s; @@ -276,79 +271,15 @@ void RotatePointAroundVector( vec3_t dst, const vec3_t dir, const vec3_t point, /*-----------------------------------------------------------------*/ -// LordHavoc note 1: -// BoxOnPlaneSide did a switch on a 'signbits' value and had optimized -// assembly in an attempt to accelerate it further, very inefficient -// considering that signbits of the frustum planes only changed each -// frame, and the world planes changed only at load time. -// So, to optimize it further I took the obvious route of storing a function -// pointer in the plane struct itself, and shrunk each of the individual -// cases to a single return statement. -// LordHavoc note 2: -// realized axial cases would be a nice speedup for world geometry, although -// never useful for the frustum planes. -int BoxOnPlaneSideX (vec3_t emins, vec3_t emaxs, mplane_t *p) {return p->dist <= emins[0] ? 1 : (p->dist >= emaxs[0] ? 2 : 3);} -int BoxOnPlaneSideY (vec3_t emins, vec3_t emaxs, mplane_t *p) {return p->dist <= emins[1] ? 1 : (p->dist >= emaxs[1] ? 2 : 3);} -int BoxOnPlaneSideZ (vec3_t emins, vec3_t emaxs, mplane_t *p) {return p->dist <= emins[2] ? 1 : (p->dist >= emaxs[2] ? 2 : 3);} -int BoxOnPlaneSide0 (vec3_t emins, vec3_t emaxs, mplane_t *p) {return (((p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2]) >= p->dist) | (((p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2]) < p->dist) << 1));} -int BoxOnPlaneSide1 (vec3_t emins, vec3_t emaxs, mplane_t *p) {return (((p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2]) >= p->dist) | (((p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2]) < p->dist) << 1));} -int BoxOnPlaneSide2 (vec3_t emins, vec3_t emaxs, mplane_t *p) {return (((p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2]) >= p->dist) | (((p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2]) < p->dist) << 1));} -int BoxOnPlaneSide3 (vec3_t emins, vec3_t emaxs, mplane_t *p) {return (((p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2]) >= p->dist) | (((p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2]) < p->dist) << 1));} -int BoxOnPlaneSide4 (vec3_t emins, vec3_t emaxs, mplane_t *p) {return (((p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2]) >= p->dist) | (((p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2]) < p->dist) << 1));} -int BoxOnPlaneSide5 (vec3_t emins, vec3_t emaxs, mplane_t *p) {return (((p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2]) >= p->dist) | (((p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2]) < p->dist) << 1));} -int BoxOnPlaneSide6 (vec3_t emins, vec3_t emaxs, mplane_t *p) {return (((p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2]) >= p->dist) | (((p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2]) < p->dist) << 1));} -int BoxOnPlaneSide7 (vec3_t emins, vec3_t emaxs, mplane_t *p) {return (((p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2]) >= p->dist) | (((p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2]) < p->dist) << 1));} - void BoxOnPlaneSideClassify(mplane_t *p) { - switch(p->type) - { - case 0: // x axis - p->BoxOnPlaneSideFunc = BoxOnPlaneSideX; - break; - case 1: // y axis - p->BoxOnPlaneSideFunc = BoxOnPlaneSideY; - break; - case 2: // z axis - p->BoxOnPlaneSideFunc = BoxOnPlaneSideZ; - break; - default: - if (p->normal[2] < 0) // 4 - { - if (p->normal[1] < 0) // 2 - { - if (p->normal[0] < 0) // 1 - p->BoxOnPlaneSideFunc = BoxOnPlaneSide7; - else - p->BoxOnPlaneSideFunc = BoxOnPlaneSide6; - } - else - { - if (p->normal[0] < 0) // 1 - p->BoxOnPlaneSideFunc = BoxOnPlaneSide5; - else - p->BoxOnPlaneSideFunc = BoxOnPlaneSide4; - } - } - else - { - if (p->normal[1] < 0) // 2 - { - if (p->normal[0] < 0) // 1 - p->BoxOnPlaneSideFunc = BoxOnPlaneSide3; - else - p->BoxOnPlaneSideFunc = BoxOnPlaneSide2; - } - else - { - if (p->normal[0] < 0) // 1 - p->BoxOnPlaneSideFunc = BoxOnPlaneSide1; - else - p->BoxOnPlaneSideFunc = BoxOnPlaneSide0; - } - } - break; - } + p->signbits = 0; + if (p->normal[0] < 0) // 1 + p->signbits |= 1; + if (p->normal[1] < 0) // 2 + p->signbits |= 2; + if (p->normal[2] < 0) // 4 + p->signbits |= 4; } void PlaneClassify(mplane_t *p) @@ -364,6 +295,32 @@ void PlaneClassify(mplane_t *p) BoxOnPlaneSideClassify(p); } +int BoxOnPlaneSide (const vec3_t emins, const vec3_t emaxs, const mplane_t *p) +{ + if (p->type < 3) + return ((emaxs[p->type] >= p->dist) | ((emins[p->type] < p->dist) << 1)); + switch(p->signbits) + { + default: + case 0: + return (((p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2]) >= p->dist) | (((p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2]) < p->dist) << 1)); + case 1: + return (((p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2]) >= p->dist) | (((p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2]) < p->dist) << 1)); + case 2: + return (((p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2]) >= p->dist) | (((p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2]) < p->dist) << 1)); + case 3: + return (((p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2]) >= p->dist) | (((p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2]) < p->dist) << 1)); + case 4: + return (((p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2]) >= p->dist) | (((p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2]) < p->dist) << 1)); + case 5: + return (((p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2]) >= p->dist) | (((p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2]) < p->dist) << 1)); + case 6: + return (((p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2]) >= p->dist) | (((p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2]) < p->dist) << 1)); + case 7: + return (((p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2]) >= p->dist) | (((p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2]) < p->dist) << 1)); + } +} + void AngleVectors (const vec3_t angles, vec3_t forward, vec3_t right, vec3_t up) { double angle, sr, sp, sy, cr, cp, cy; @@ -479,7 +436,7 @@ float VectorNormalizeLength (vec3_t v) v[1] *= ilength; v[2] *= ilength; } - + return length; } @@ -525,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) { @@ -536,3 +508,13 @@ void Mathlib_Init(void) ixtable[a] = 1.0f / a; } +#include "matrixlib.h" + +void Matrix4x4_Print (const matrix4x4_t *in) +{ + Con_Printf("%f %f %f %f\n%f %f %f %f\n%f %f %f %f\n%f %f %f %f\n" + , in->m[0][0], in->m[0][1], in->m[0][2], in->m[0][3] + , in->m[1][0], in->m[1][1], in->m[1][2], in->m[1][3] + , in->m[2][0], in->m[2][1], in->m[2][2], in->m[2][3] + , in->m[3][0], in->m[3][1], in->m[3][2], in->m[3][3]); +}