goat3d
diff libs/vmath/ray.inl @ 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/ray.inl Sun Sep 29 08:20:19 2013 +0300 1.2 +++ b/libs/vmath/ray.inl Sun Sep 29 08:46:19 2013 +0300 1.3 @@ -20,7 +20,7 @@ 1.4 extern "C" { 1.5 #endif /* __cplusplus */ 1.6 1.7 -static inline ray_t ray_cons(vec3_t origin, vec3_t dir) 1.8 +static VMATH_INLINE ray_t ray_cons(vec3_t origin, vec3_t dir) 1.9 { 1.10 ray_t r; 1.11 r.origin = origin; 1.12 @@ -31,14 +31,14 @@ 1.13 #ifdef __cplusplus 1.14 } 1.15 1.16 -inline Ray reflect_ray(const Ray &inray, const Vector3 &norm) 1.17 +VMATH_INLINE Ray reflect_ray(const Ray &inray, const Vector3 &norm) 1.18 { 1.19 Ray ray = inray; 1.20 ray.dir = ray.dir.reflection(norm); 1.21 return ray; 1.22 } 1.23 1.24 -inline Ray refract_ray(const Ray &inray, const Vector3 &norm, scalar_t from_ior, scalar_t to_ior) 1.25 +VMATH_INLINE Ray refract_ray(const Ray &inray, const Vector3 &norm, scalar_t from_ior, scalar_t to_ior) 1.26 { 1.27 Ray ray = inray; 1.28 ray.dir = ray.dir.refraction(norm, from_ior, to_ior);