From 3a98e489c3d48b1e09b3982154ed8dd6a781e063 Mon Sep 17 00:00:00 2001 From: Gamemaker1998 Date: Fri, 24 Jan 2025 21:54:46 +0100 Subject: [PATCH] Minor hickup changes --- CMakeLists.txt | 2 +- src/scene/AABB.h | 4 ++-- src/scene/BVH.h | 1 + src/util/Model.h | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cbb750a..3365fdf 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/src/scene/AABB.h b/src/scene/AABB.h index 18664f0..f97e003 100644 --- a/src/scene/AABB.h +++ b/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 tbigger = std::max(t0s, t1s); + glm::vec3 tsmaller = glm::min(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))); diff --git a/src/scene/BVH.h b/src/scene/BVH.h index 8f27686..0ad7beb 100644 --- a/src/scene/BVH.h +++ b/src/scene/BVH.h @@ -4,6 +4,7 @@ #include #include #include "util/Ray.h" +#include class BVH diff --git a/src/util/Model.h b/src/util/Model.h index c08bfd4..e599f24 100644 --- a/src/util/Model.h +++ b/src/util/Model.h @@ -2,6 +2,7 @@ #include "Minimal.h" #include "scene/AABB.h" #include +#include // material infos // shading parameter