added VectorBlend and Matrix4x4_Blend

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2738 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/mathlib.h b/mathlib.h
index 3080d2ec2e8222feb58c38b807deab8df225adf2..c4d82865532b6bdffbccdbb9845c8fa452664b15 100644 (file)
--- a/mathlib.h
+++ b/mathlib.h
@@ -87,7 +87,8 @@ extern vec3_t vec3_origin;
                VectorScale(_v, _y, _v);\
        }\
 }
-#define VectorRandom(v) {do{(v)[0] = lhrandom(-1, 1);(v)[1] = lhrandom(-1, 1);(v)[2] = lhrandom(-1, 1);}while(DotProduct(v, v) > 1);}
+#define VectorRandom(v) do{(v)[0] = lhrandom(-1, 1);(v)[1] = lhrandom(-1, 1);(v)[2] = lhrandom(-1, 1);}while(DotProduct(v, v) > 1)
+#define VectorBlend(b1, b2, blend, c) do{float iblend = 1 - (blend);VectorMAM(iblend, b1, blend, b2, c);}while(0)
 
 /*
 // LordHavoc: quaternion math, untested, don't know if these are correct,

diff --git a/matrixlib.c b/matrixlib.c
index 4672861e45fa411e88d92786ed22ad4ceaccd948..5d4279bf99fa406567729bcaa3919584e5e07dfe 100644 (file)
--- a/matrixlib.c
+++ b/matrixlib.c
@@ -328,6 +328,28 @@ void Matrix4x4_FromVectors(matrix4x4_t *out, const float vx[3], const float vy[3
        out->m[3][3] = 1.0f;
 }
 
+void Matrix4x4_Blend (matrix4x4_t *out, const matrix4x4_t *in1, const matrix4x4_t *in2, float blend)
+{
+       float iblend = 1 - blend;
+       out->m[0][0] = in1->m[0][0] * iblend + in2->m[0][0] * blend;
+       out->m[0][1] = in1->m[0][1] * iblend + in2->m[0][1] * blend;
+       out->m[0][2] = in1->m[0][2] * iblend + in2->m[0][2] * blend;
+       out->m[0][3] = in1->m[0][3] * iblend + in2->m[0][3] * blend;
+       out->m[1][0] = in1->m[1][0] * iblend + in2->m[1][0] * blend;
+       out->m[1][1] = in1->m[1][1] * iblend + in2->m[1][1] * blend;
+       out->m[1][2] = in1->m[1][2] * iblend + in2->m[1][2] * blend;
+       out->m[1][3] = in1->m[1][3] * iblend + in2->m[1][3] * blend;
+       out->m[2][0] = in1->m[2][0] * iblend + in2->m[2][0] * blend;
+       out->m[2][1] = in1->m[2][1] * iblend + in2->m[2][1] * blend;
+       out->m[2][2] = in1->m[2][2] * iblend + in2->m[2][2] * blend;
+       out->m[2][3] = in1->m[2][3] * iblend + in2->m[2][3] * blend;
+       out->m[3][0] = in1->m[3][0] * iblend + in2->m[3][0] * blend;
+       out->m[3][1] = in1->m[3][1] * iblend + in2->m[3][1] * blend;
+       out->m[3][2] = in1->m[3][2] * iblend + in2->m[3][2] * blend;
+       out->m[3][3] = in1->m[3][3] * iblend + in2->m[3][3] * blend;
+}
+
+
 void Matrix4x4_Transform (const matrix4x4_t *in, const float v[3], float out[3])
 {
        out[0] = v[0] * in->m[0][0] + v[1] * in->m[0][1] + v[2] * in->m[0][2] + in->m[0][3];

diff --git a/matrixlib.h b/matrixlib.h
index c54764435a3d73f5b0b60540f091b2efa07912e3..e6d817ba1056f526b36e6eb0f1a78721849365a3 100644 (file)
--- a/matrixlib.h
+++ b/matrixlib.h
@@ -59,6 +59,9 @@ void Matrix4x4_ToVectors(const matrix4x4_t *in, float vx[3], float vy[3], float
 // creates a matrix4x4 from a set of 3D vectors for axial directions, and translate
 void Matrix4x4_FromVectors(matrix4x4_t *out, const float vx[3], const float vy[3], const float vz[3], const float t[3]);
 
+// blends two matrices together, at a given percentage (blend controls percentage of in2)
+void Matrix4x4_Blend (matrix4x4_t *out, const matrix4x4_t *in1, const matrix4x4_t *in2, float blend);
+
 // transforms a 3D vector through a matrix4x4
 void Matrix4x4_Transform (const matrix4x4_t *in, const float v[3], float out[3]);
 // transforms a 4D vector through a matrix4x4