Merge remote-tracking branch 'origin/master'

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.28)
+cmake_minimum_required(VERSION 3.27)
 set(CMAKE_CXX_STANDARD 23)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

src/scene/AABB.h

@@ -49,8 +49,8 @@ struct AABB
         glm::vec3 t0s = glm::vec3(min - ray.origin) * invD;
         glm::vec3 t1s = glm::vec3(max - ray.origin) * invD;
 
-        glm::vec3 tsmaller = std::min(t0s, t1s);
+        glm::vec3 tsmaller = glm::min(t0s, t1s);
-        glm::vec3 tbigger = std::max(t0s, t1s);
+        glm::vec3 tbigger = glm::max(t0s, t1s);
 
         tmin = std::max(tmin, std::max(tsmaller.x, std::max(tsmaller.y, tsmaller.z)));
         tmax = std::min(tmax, std::min(tbigger.x, std::min(tbigger.y, tbigger.z)));

src/scene/BVH.h

@@ -4,6 +4,7 @@
 #include <vector>
 #include <glm/glm.hpp>
 #include "util/Ray.h"
+#include <optional>
 
 
 class BVH

src/util/Model.h

@@ -2,6 +2,7 @@
 #include "Minimal.h"
 #include "scene/AABB.h"
 #include <vector>
+#include <optional>
 
 // material infos
 // shading parameter