From dbba33fcd07c9e81e3ca9bc4f5e8185d364fb792 Mon Sep 17 00:00:00 2001 From: Julian T Date: Sat, 25 Jul 2020 00:09:53 +0200 Subject: Further experimentation with pathtracing Probably starting over in cpp --- scene.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'scene.h') diff --git a/scene.h b/scene.h index e7ee95f..7cd388e 100644 --- a/scene.h +++ b/scene.h @@ -14,7 +14,10 @@ #define TYPE_L_POINT 1 #define TYPE_L_AREA 2 -#define CONTAINER_SIZE(objs, mats, ligs) (sizeof(container_t) + objs * sizeof(object_t) + ligs * sizeof(light_t)) +#define CONTAINER_SIZE(objs, mats, ligs) (sizeof(container_t) + \ + objs * sizeof(object_t) + \ + mats * sizeof(material_t) + \ + ligs * sizeof(light_t)) typedef struct { vector_t center; @@ -69,18 +72,11 @@ typedef struct light_s{ struct light_s *next; } light_t; -light_t l; - // Graphics settings // Should actually sit in ray.c typedef struct { - unsigned arealight_samples; - unsigned antialias_samples; - unsigned envlight_samples; - unsigned globallight_samples; - + unsigned samples; unsigned depth; - unsigned gl_opt_depth; } settings_t; typedef struct { -- cgit v1.2.3