diff options
Diffstat (limited to 'sdl/math3d.h')
| -rw-r--r-- | sdl/math3d.h | 69 |
1 files changed, 49 insertions, 20 deletions
diff --git a/sdl/math3d.h b/sdl/math3d.h index 670b4af..875757c 100644 --- a/sdl/math3d.h +++ b/sdl/math3d.h @@ -18,34 +18,33 @@ typedef float M3DVector3f[3]; /* vector of 3 floats */ typedef float M3DVector2f[2]; /* vector of 2 floats */ /* math function prototypes */ -void m3dFindNormalf(M3DVector3f, const M3DVector3f, const M3DVector3f, - const M3DVector3f); +void m3dFindNormalf(M3DVector3f, const M3DVector3f, const M3DVector3f, const M3DVector3f); void m3dLoadIdentity33f(M3DMatrix33f); void m3dLoadIdentity44f(M3DMatrix44f); -void m3dGetPlaneEquationf(M3DVector4f, const M3DVector3f, - const M3DVector3f, const M3DVector3f); +void m3dGetPlaneEquationf(M3DVector4f, const M3DVector3f, const M3DVector3f, const M3DVector3f); void m3dRotationMatrix44f(M3DMatrix44f, float, float, float, float); void m3dMakePlanarShadowMatrixf(M3DMatrix44f, const M3DVector4f, const M3DVector3f); void m3dMatrixMultiply44f(M3DMatrix44f, const M3DMatrix44f, const M3DMatrix44f); void m3dPrintMatrix44f(const M3DMatrix44f); +int m3dInvertMatrix44f(M3DMatrix44f, const M3DMatrix44f); static inline void m3dCrossProductf(M3DVector3f result, const M3DVector3f u, - const M3DVector3f v) + const M3DVector3f v) { - result[0] = u[1] * v[2] - v[1] * u[2]; + result[0] = u[1] * v[2] - v[1] * u[2]; result[1] = -u[0] * v[2] + v[0] * u[2]; - result[2] = u[0] * v[1] - v[0] * u[1]; + result[2] = u[0] * v[1] - v[0] * u[1]; } -static inline void m3dTransformVector3f(M3DVector3f vOut, const M3DVector3f v, - const M3DMatrix44f m) +static inline void m3dTransformVector3f(M3DVector3f vout, const M3DVector3f v, + const M3DMatrix44f m) { - vOut[0] = m[0] * v[0] + m[4] * v[1] + m[8] * v[2] + m[12]; - vOut[1] = m[1] * v[0] + m[5] * v[1] + m[9] * v[2] + m[13]; - vOut[2] = m[2] * v[0] + m[6] * v[1] + m[10] * v[2] + m[14]; + vout[0] = m[0] * v[0] + m[4] * v[1] + m[8] * v[2] + m[12]; + vout[1] = m[1] * v[0] + m[5] * v[1] + m[9] * v[2] + m[13]; + vout[2] = m[2] * v[0] + m[6] * v[1] + m[10] * v[2] + m[14]; } -static inline void m3dScaleVector3f(M3DVector3f v, float scale) +static inline void m3dScaleVector3f(M3DVector3f v, const float scale) { v[0] *= scale; v[1] *= scale; @@ -67,18 +66,19 @@ static inline void m3dNormalizeVectorf(M3DVector3f u) m3dScaleVector3f(u, 1.0f / m3dGetVectorLengthf(u)); } -static inline void m3dTranslateMatrix44f(M3DMatrix44f m, float x, float y, - float z) +static inline void m3dTranslateMatrix44f(M3DMatrix44f m, const float x, + const float y, const float z) { m[12] += x; m[13] += y; m[14] += z; } -static inline void m3dScaleMatrix44f(M3DMatrix44f m, float x, float y, float z) +static inline void m3dScaleMatrix44f(M3DMatrix44f m, const float x, + const float y, const float z) { - m[0] *= x; - m[5] *= y; + m[0] *= x; + m[5] *= y; m[10] *= z; } @@ -95,8 +95,7 @@ static inline void m3dScaleMatrix44f(M3DMatrix44f m, float x, float y, float z) } \ } -static inline void m3dTransposeMatrix44f(M3DMatrix44f dst, - const M3DMatrix44f src) +static inline void m3dTransposeMatrix44f(M3DMatrix44f dst, const M3DMatrix44f src) { TRANSPOSE44(dst, src); } @@ -106,5 +105,35 @@ static inline void m3dCopyVector3f(M3DVector3f dst, const M3DVector3f src) memcpy(dst, src, sizeof(M3DVector3f)); } +static inline void m3dSetMatrixColumn44f(M3DMatrix44f dst, const M3DVector4f src, + const int col) +{ + memcpy(dst + (4 * col), src, sizeof(float) * 4); +} + + + +static inline void m3dLoadVector2f(M3DVector2f v, const float x, const float y) +{ + v[0] = x; + v[1] = y; +} + +static inline void m3dLoadVector3f(M3DVector3f v, const float x, const float y, const float z) +{ + v[0] = x; + v[1] = y; + v[2] = z; +} + +static inline void m3dLoadVector4f(M3DVector4f v, const float x, const float y, + const float z, const float w) +{ + v[0] = x; + v[1] = y; + v[2] = z; + v[3] = w; +} + #endif |