diff options
| author | cnlohr <lohr85@gmail.com> | 2017-03-09 20:00:42 -0500 |
|---|---|---|
| committer | cnlohr <lohr85@gmail.com> | 2017-03-09 20:00:42 -0500 |
| commit | 765bf1623299e81f5f95b78a78e7d66997e4ad0c (patch) | |
| tree | e0eae0d3122557bb9f8f4e251ced84557319b3f5 /redist/linmath.h | |
| parent | 6362b6ee00ef5e394b636e2bb63d5e20c18c01f8 (diff) | |
| download | libsurvive-765bf1623299e81f5f95b78a78e7d66997e4ad0c.tar.gz libsurvive-765bf1623299e81f5f95b78a78e7d66997e4ad0c.tar.bz2 | |
Fix wrong quat functions + Add matrix->quat conversion.
Diffstat (limited to 'redist/linmath.h')
| -rw-r--r-- | redist/linmath.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/redist/linmath.h b/redist/linmath.h index caec281..ec20534 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 ); |