goat3d
diff libs/vmath/vmath.h @ 28:9ba3e2fb8a33
modified vmath to work with vs2012, still memory corruptions in 3dsmax...
author | John Tsiombikas <nuclear@member.fsf.org> |
---|---|
date | Sun, 29 Sep 2013 08:46:19 +0300 |
parents | 4deb0b12fe14 |
children |
line diff
1.1 --- a/libs/vmath/vmath.h Sun Sep 29 08:20:19 2013 +0300 1.2 +++ b/libs/vmath/vmath.h Sun Sep 29 08:46:19 2013 +0300 1.3 @@ -52,15 +52,15 @@ 1.4 extern "C" { 1.5 #endif /* __cplusplus */ 1.6 1.7 -static inline scalar_t smoothstep(float a, float b, float x); 1.8 +static VMATH_INLINE scalar_t smoothstep(float a, float b, float x); 1.9 1.10 -static inline scalar_t frand(scalar_t range); 1.11 -static inline vec3_t sphrand(scalar_t rad); 1.12 +static VMATH_INLINE scalar_t frand(scalar_t range); 1.13 +static VMATH_INLINE vec3_t sphrand(scalar_t rad); 1.14 1.15 scalar_t integral(scalar_t (*f)(scalar_t), scalar_t low, scalar_t high, int samples); 1.16 scalar_t gaussian(scalar_t x, scalar_t mean, scalar_t sdev); 1.17 1.18 -static inline scalar_t lerp(scalar_t a, scalar_t b, scalar_t t); 1.19 +static VMATH_INLINE scalar_t lerp(scalar_t a, scalar_t b, scalar_t t); 1.20 1.21 scalar_t bspline(scalar_t a, scalar_t b, scalar_t c, scalar_t d, scalar_t t); 1.22 scalar_t spline(scalar_t a, scalar_t b, scalar_t c, scalar_t d, scalar_t t);