From 715ab680e68f62a3a00777e81b18f8e64110058d Mon Sep 17 00:00:00 2001 From: ladevieq Date: Tue, 12 Jul 2022 22:16:26 +0200 Subject: Fix BVH & vec3 API --- include/aabb.hpp | 8 ++++---- include/scene.hpp | 2 +- include/vec3.hpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/aabb.hpp b/include/aabb.hpp index ca6e84a..9862355 100644 --- a/include/aabb.hpp +++ b/include/aabb.hpp @@ -22,13 +22,13 @@ class aabb { } void union_with(const aabb &box) { - minimum.min(box.minimum); - maximum.max(box.maximum); + minimum = minimum.min(box.minimum); + maximum = maximum.max(box.maximum); } void union_with(const point3 &point) { - minimum.min(point); - maximum.max(point); + minimum = minimum.min(point); + maximum = maximum.max(point); } int32_t maximum_axis() const { diff --git a/include/scene.hpp b/include/scene.hpp index 379d888..c0b0344 100644 --- a/include/scene.hpp +++ b/include/scene.hpp @@ -20,7 +20,7 @@ class scene { uint32_t sample_index = 0; uint32_t enable_dof = (uint32_t)false; - uint32_t debug_bvh = (uint32_t)true; + uint32_t debug_bvh = (uint32_t)false; int32_t downscale_factor = 1; metadata(camera cam, uint32_t width, uint32_t height) diff --git a/include/vec3.hpp b/include/vec3.hpp index e3be2a4..6513ce8 100644 --- a/include/vec3.hpp +++ b/include/vec3.hpp @@ -34,9 +34,9 @@ class vec3 { vec3 cross(const vec3& vec) const; - vec3& min(const vec3& vec); + vec3 min(const vec3& vec) const; - vec3& max(const vec3& vec); + vec3 max(const vec3& vec) const; vec3& normalize(); -- cgit v1.3