Implement AABB merge & scene radius (#44)

pjessesco · Dec 30, 2024 · bf5815b · bf5815b
1 parent e1e3101
commit bf5815b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 1 deletion.
diff --git a/include/aabb.h b/include/aabb.h
@@ -43,6 +43,15 @@ namespace Caramel{
 
         std::tuple<bool, Float, Float> ray_intersect(const Ray &ray) const;
 
+        static AABB merge(const AABB &a, const AABB &b) {
+            return {{std::min(a.m_min[0], b.m_min[0]),
+                     std::min(a.m_min[1], b.m_min[1]),
+                     std::min(a.m_min[2], b.m_min[2])},
+                    {std::max(a.m_max[0], b.m_max[0]),
+                     std::max(a.m_max[1], b.m_max[1]),
+                     std::max(a.m_max[2], b.m_max[2])}};
+        }
+
         Vector3f m_min;
         Vector3f m_max;
     };

diff --git a/include/common.h b/include/common.h
@@ -115,6 +115,10 @@ namespace Caramel{
         return {std::sqrt(a[0]), std::sqrt(a[1]), std::sqrt(a[2])};
     }
 
+    inline Float L2(const Vector3f &a, const Vector3f &b) {
+        return std::sqrt((a[0] - b[0]) * (a[0] - b[0]) + (a[1] - b[1]) * (a[1] - b[1]) + (a[2] - b[2]) * (a[2] - b[2]));
+    }
+
     template <typename T>
     inline T interpolate(const T &a, const T &b, const T &c, Float u, Float v){
         return (a*(Float1-u-v)) + (b*u) + (c*v);

diff --git a/include/scene.h b/include/scene.h
@@ -28,6 +28,7 @@
 #include <vector>
 
 #include <common.h>
+#include <aabb.h>
 
 namespace Caramel{
     class Camera;
@@ -51,6 +52,9 @@ namespace Caramel{
 
         std::vector<const Light*> m_lights;
         std::vector<const Shape*> m_meshes;
+        Vector3f m_sceneCenterPos;
+        Float m_sceneRadius;
+        AABB m_aabb;
         const Camera *m_cam;
     };
 }
diff --git a/src/scene.cpp b/src/scene.cpp
@@ -33,10 +33,12 @@
 #include <light.h>
 #include <rayintersectinfo.h>
 #include <sampler.h>
+#include <aabb.h>
 
 namespace Caramel{
 
-    Scene::Scene() : m_cam{nullptr} {}
+    Scene::Scene()
+    : m_cam{nullptr}, m_aabb{Vector3f::zeros(), Vector3f::zeros()}, m_sceneRadius{0.0f}, m_sceneCenterPos{Vector3f::zeros()} {}
 
     void Scene::set_camera(Camera *camera) {
         m_cam = camera;
@@ -68,6 +70,11 @@ namespace Caramel{
         if(shape->is_light()){
             m_lights.push_back(shape->get_arealight());
         }
+
+        m_aabb = m_meshes.empty() ? shape->get_aabb() :
+                                    AABB::merge(m_aabb, shape->get_aabb());
+        m_sceneCenterPos = (m_aabb.m_max + m_aabb.m_min) * 0.5f;
+        m_sceneRadius = L2(m_sceneCenterPos, m_aabb.m_max);
     }
 
     void Scene::add_light(const Light *light){