goat3d
diff libs/vmath/ray.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/ray.h Sun Sep 29 08:20:19 2013 +0300 1.2 +++ b/libs/vmath/ray.h Sun Sep 29 08:46:19 2013 +0300 1.3 @@ -30,7 +30,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 ray_t ray_transform(ray_t r, mat4_t m); 1.10 1.11 #ifdef __cplusplus 1.12 @@ -55,8 +55,8 @@ 1.13 Ray transformed(const Matrix4x4 &xform) const; 1.14 }; 1.15 1.16 -inline Ray reflect_ray(const Ray &inray, const Vector3 &norm); 1.17 -inline Ray refract_ray(const Ray &inray, const Vector3 &norm, scalar_t from_ior, scalar_t to_ior); 1.18 +VMATH_INLINE Ray reflect_ray(const Ray &inray, const Vector3 &norm); 1.19 +VMATH_INLINE Ray refract_ray(const Ray &inray, const Vector3 &norm, scalar_t from_ior, scalar_t to_ior); 1.20 #endif /* __cplusplus */ 1.21 1.22 #include "ray.inl"