diff options
author | CNLohr <charles@cnlohr.com> | 2018-04-15 20:41:22 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-15 20:41:22 -0400 |
commit | 69b31d3c3b1957e59d7962722a4145bfb0db16f9 (patch) | |
tree | 927d843a553ef53217c283f19f16728b0ca51c50 /redist/linmath.h | |
parent | c73823e20c9ed2f2f8f6a13c2031971d8b7d7be2 (diff) | |
parent | 39a63badbb5864314a9d9e18c0871718ac5d2912 (diff) | |
download | libsurvive-69b31d3c3b1957e59d7962722a4145bfb0db16f9.tar.gz libsurvive-69b31d3c3b1957e59d7962722a4145bfb0db16f9.tar.bz2 |
Merge branch 'master' into tcc_build
Diffstat (limited to 'redist/linmath.h')
-rw-r--r-- | redist/linmath.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/redist/linmath.h b/redist/linmath.h index e268e96..e46bbd4 100644 --- a/redist/linmath.h +++ b/redist/linmath.h @@ -7,11 +7,13 @@ extern "C" { #endif +#ifndef LINMATH_EXPORT #ifdef _WIN32 -#define LINMATH_EXPORT __declspec(dllexport) +#define LINMATH_EXPORT extern __declspec(dllexport) #else #define LINMATH_EXPORT __attribute__((visibility("default"))) #endif +#endif // Yes, I know it's kind of arbitrary. #define DEFAULT_EPSILON 0.001 @@ -99,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); @@ -108,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); |