diff options
| author | Mike Turvey <mturvey6@gmail.com> | 2017-03-11 09:00:58 -0700 |
|---|---|---|
| committer | Mike Turvey <mturvey6@gmail.com> | 2017-03-11 09:00:58 -0700 |
| commit | ba38ddcc4c3d74c00139ceff9b45481259d80fc7 (patch) | |
| tree | ba1efc8aa8f7a76aa9f9f831aff16ea86fdc2b23 /redist/linmath.h | |
| parent | 1d9db12d7e115f2b8994f014e37f1086c17e90fd (diff) | |
| parent | cdc60d110a9cd69c5bd8c0ac4e67db1ce7cecc93 (diff) | |
| download | libsurvive-ba38ddcc4c3d74c00139ceff9b45481259d80fc7.tar.gz libsurvive-ba38ddcc4c3d74c00139ceff9b45481259d80fc7.tar.bz2 | |
Merge remote-tracking branch 'remotes/upstream/master' into Octavios_Algorithm
Conflicts:
redist/linmath.c
Diffstat (limited to 'redist/linmath.h')
| -rw-r--r-- | redist/linmath.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/redist/linmath.h b/redist/linmath.h index caec281..676d182 100644 --- a/redist/linmath.h +++ b/redist/linmath.h @@ -7,8 +7,8 @@ #define DEFAULT_EPSILON 0.001 //For printf -#define PFTHREE(x) x[0], x[1], x[2] -#define PFFOUR(x) x[0], x[1], x[2], x[3] +#define PFTHREE(x) (x)[0], (x)[1], (x)[2] +#define PFFOUR(x) (x)[0], (x)[1], (x)[2], (x)[3] #define LINMATHPI ((FLT)3.141592653589) @@ -76,6 +76,7 @@ FLT quatmagnitude( const FLT * q ); FLT quatinvsqmagnitude( const FLT * q ); void quatnormalize( FLT * qout, const FLT * qin ); //Safe for in to be same as out. void quattomatrix( FLT * matrix44, const FLT * q ); +void quatfrommatrix( FLT * q, const FLT * matrix44 ); void quatgetconjugate( FLT * qout, const FLT * qin ); void quatgetreciprocal( FLT * qout, const FLT * qin ); void quatsub( FLT * qout, const FLT * a, const FLT * b ); @@ -103,7 +104,7 @@ void rotation_between_vecs_to_m3(Matrix3x3 *m, const FLT v1[3], const FLT v2[3]) Matrix3x3 inverseM33(const Matrix3x3 mat); - +void matrix44copy(FLT * mout, const FLT * minm ); |