diff options
author | Justin Berger <j.david.berger@gmail.com> | 2018-04-10 23:47:11 -0600 |
---|---|---|
committer | Justin Berger <j.david.berger@gmail.com> | 2018-04-10 23:47:11 -0600 |
commit | e6b487cacfd57792b9cdcde30489faf19f2a4a77 (patch) | |
tree | 2435f0302849919aa5001961a95daff693a16a12 /redist/linmath.h | |
parent | 30cfb87ec0d95e0cb8a671cf8f2327b4204927ed (diff) | |
parent | d7c88592a5450a65f5359e23d87122a04d019503 (diff) | |
download | libsurvive-e6b487cacfd57792b9cdcde30489faf19f2a4a77.tar.gz libsurvive-e6b487cacfd57792b9cdcde30489faf19f2a4a77.tar.bz2 |
Merge branch 'master' into simple_api
Diffstat (limited to 'redist/linmath.h')
-rw-r--r-- | redist/linmath.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/redist/linmath.h b/redist/linmath.h index bafdbe8..e46bbd4 100644 --- a/redist/linmath.h +++ b/redist/linmath.h @@ -9,7 +9,7 @@ extern "C" { #ifndef LINMATH_EXPORT #ifdef _WIN32 -#define LINMATH_EXPORT __declspec(dllexport) +#define LINMATH_EXPORT extern __declspec(dllexport) #else #define LINMATH_EXPORT __attribute__((visibility("default"))) #endif @@ -101,6 +101,7 @@ LINMATH_EXPORT void axisanglefromquat(FLT *angle, FLT *axis, LinmathQuat quat); typedef FLT LinmathEulerAngle[3]; +LINMATH_EXPORT void quatset(LinmathQuat q, FLT w, FLT x, FLT y, FLT z); LINMATH_EXPORT void quatsetnone(LinmathQuat q); LINMATH_EXPORT void quatcopy(LinmathQuat q, const LinmathQuat qin); LINMATH_EXPORT void quatfromeuler(LinmathQuat q, const LinmathEulerAngle euler); @@ -110,6 +111,7 @@ FLT quatmagnitude(const LinmathQuat q); FLT quatinvsqmagnitude(const LinmathQuat q); LINMATH_EXPORT void quatnormalize(LinmathQuat qout, const LinmathQuat qin); // Safe for in to be same as out. LINMATH_EXPORT void quattomatrix(FLT *matrix44, const LinmathQuat q); +LINMATH_EXPORT void quattomatrix33(FLT *matrix33, const LinmathQuat qin); LINMATH_EXPORT void quatfrommatrix(LinmathQuat q, const FLT *matrix44); LINMATH_EXPORT void quatfrommatrix33(LinmathQuat q, const FLT *matrix33); LINMATH_EXPORT void quatgetconjugate(LinmathQuat qout, const LinmathQuat qin); |