diff options
-rw-r--r-- | main.c | 8 | ||||
-rw-r--r-- | ray.c | 6 | ||||
-rw-r--r-- | ray.h | 2 | ||||
-rw-r--r-- | test.png | bin | 693556 -> 693556 bytes |
4 files changed, 6 insertions, 10 deletions
@@ -93,12 +93,10 @@ int main() for (int x = TESTW; x; x--) { // Random seed seed = x * y; - color_t *c = ray_trace(&cont->space, x, y, 2, &seed); + color_t c; + ray_trace(&cont->space, x, y, 2, &c, &seed); - if (c) { - pgm_write_pixel(stdout, c); - } - free(c); + pgm_write_pixel(stdout, &c); } @@ -309,10 +309,10 @@ exit: return 0; } -color_t *ray_trace(space_t *s, unsigned int x, unsigned int y, unsigned samples, void *seed) +void ray_trace(space_t *s, unsigned int x, unsigned int y, unsigned samples, color_t *c, void *seed) { // Init return color. Will be accumilated with all the detected light. - color_t *c = color_set(NULL, 0, 0, 0); + color_set(c, 0, 0, 0); // Setup primary ray ray_t r; @@ -349,6 +349,4 @@ color_t *ray_trace(space_t *s, unsigned int x, unsigned int y, unsigned samples, // Add ambient color_add(c, c, &s->ambient); - - return c; } @@ -20,7 +20,7 @@ COORD_T ray_intersect_sphere(sphere_t *s, ray_t *ray, bool skip_dist); COORD_T ray_intersect_plane(plane_t *p, ray_t *ray, bool skip_dist); object_t *ray_cast(space_t *s, ray_t *r, COORD_T *dist_ret, bool chk, COORD_T chk_dist); -color_t *ray_trace(space_t *s, unsigned int x, unsigned int y, unsigned samples, void *seed); +void ray_trace(space_t *s, unsigned int x, unsigned int y, unsigned samples, color_t *c, void *seed); #endif Binary files differ |