From 715ab680e68f62a3a00777e81b18f8e64110058d Mon Sep 17 00:00:00 2001
From: ladevieq <ladevie.quentin@gmail.com>
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 ++--
 src/camera.cpp    |  4 ++++
 src/vec3.cpp      | 18 +++++++-----------
 5 files changed, 18 insertions(+), 18 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();
 
diff --git a/src/camera.cpp b/src/camera.cpp
index e9e5f60..6950fec 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -47,6 +47,10 @@ void camera::rotate_y(float theta) {
 
     auto h = tan(deg_to_rad(fov) / 2.f);
     auto viewport_height = 2.f * h;
+    auto viewport_width = viewport_height * aspect_ratio;
+
+    horizontal  = focus_distance * viewport_width * right;
+    vertical    = focus_distance * viewport_height * up;
 
     vertical    = focus_distance * viewport_height * up;
     first_pixel = position - horizontal / 2.0 - vertical / 2.0 + focus_distance * forward;
diff --git a/src/vec3.cpp b/src/vec3.cpp
index 096dde0..43431fc 100644
--- a/src/vec3.cpp
+++ b/src/vec3.cpp
@@ -16,7 +16,7 @@ vec3::vec3(const vec3 &vec) { v = _mm_load_ps((float *)&vec.v); }
 
 vec3::vec3(const vec3 &&vec) { v = _mm_load_ps((float *)&vec.v); }
 
-vec3 vec3::operator-() const { return vec3(_mm_xor_ps(v, _mm_set1_ps(-0.0f))); }
+vec3 vec3::operator-() const { return { _mm_xor_ps(v, _mm_set1_ps(-0.0f)) }; }
 
 vec3 &vec3::operator=(const vec3 &vec) {
     v = _mm_load_ps((float *)&vec.v);
@@ -68,16 +68,12 @@ vec3 vec3::cross(const vec3 &vec) const {
     return _mm_sub_ps(tmp3, tmp4);
 }
 
-vec3 &vec3::min(const vec3 &vec) {
-    v = _mm_min_ps(v, vec.v);
-
-    return *this;
+vec3 vec3::min(const vec3 &vec) const {
+    return { _mm_min_ps(v, vec.v) };
 }
 
-vec3 &vec3::max(const vec3 &vec) {
-    v = _mm_max_ps(v, vec.v);
-
-    return *this;
+vec3 vec3::max(const vec3 &vec) const {
+    return { _mm_max_ps(v, vec.v) };
 }
 
 vec3 &vec3::normalize() {
@@ -96,9 +92,9 @@ void vec3::print() const {
     printf("%f %f %f\n", v[0], v[1], v[2]);
 }
 
-vec3 vec3::random() { return vec3{randd(), randd(), randd()}; }
+vec3 vec3::random() { return { randd(), randd(), randd() }; }
 
-vec3 vec3::random(float min, float max) { return vec3{randd(min, max), randd(min, max), randd(min, max)}; }
+vec3 vec3::random(float min, float max) { return { randd(min, max), randd(min, max), randd(min, max) }; }
 
 
 // TODO: Use simd instructions
-- 
cgit v1.3