diff options
| author | ladevieq <ladevie.quentin@gmail.com> | 2022-07-12 22:16:26 +0200 |
|---|---|---|
| committer | ladevieq <ladevie.quentin@gmail.com> | 2022-07-12 22:16:40 +0200 |
| commit | 715ab680e68f62a3a00777e81b18f8e64110058d (patch) | |
| tree | 66f825e75c84cd28ceb3a8aba3ff715036ceb362 /include | |
| parent | 13acb0321b5f2ed392c94e1f7c64069d4242971a (diff) | |
Fix BVH & vec3 API
Diffstat (limited to 'include')
| -rw-r--r-- | include/aabb.hpp | 8 | ||||
| -rw-r--r-- | include/scene.hpp | 2 | ||||
| -rw-r--r-- | include/vec3.hpp | 4 |
3 files changed, 7 insertions, 7 deletions
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(); |