This commit is contained in:
evghenii
2014-02-20 14:27:21 +01:00
parent 226bf34803
commit e20a8f7534

View File

@@ -40,6 +40,12 @@
typedef float<3> vec; typedef float<3> vec;
#if 1
#define __inline inline
#else
#define __inline
#endif
struct Isect { struct Isect {
float t; float t;
vec p; vec p;
@@ -81,9 +87,7 @@ static inline void vnormalize(vec &v) {
} }
#if 1 __inline
inline
#endif
static void static void
ray_plane_intersect(Isect &isect, Ray &ray, const uniform Plane &plane) { ray_plane_intersect(Isect &isect, Ray &ray, const uniform Plane &plane) {
float d = -dot(plane.p, plane.n); float d = -dot(plane.p, plane.n);
@@ -152,9 +156,7 @@ ray_sphere_intersect(Isect &isect, Ray &ray, const uniform Sphere &sphere) {
} }
#if 1 __inline
inline
#endif
static void static void
orthoBasis(vec basis[3], vec n) { orthoBasis(vec basis[3], vec n) {
basis[2] = n; basis[2] = n;
@@ -178,9 +180,7 @@ orthoBasis(vec basis[3], vec n) {
} }
#if 1 __inline
inline
#endif
static float static float
ambient_occlusion(Isect &isect, const uniform Plane &plane, const uniform Sphere spheres[3], ambient_occlusion(Isect &isect, const uniform Plane &plane, const uniform Sphere spheres[3],
RNGState &rngstate) { RNGState &rngstate) {