Compare commits

...

2 Commits

Author SHA1 Message Date
a32222f22f fix: correct windows define 2025-10-17 12:17:44 +02:00
ab917089b5 fix: windows glm 2025-10-17 12:16:56 +02:00
2 changed files with 7 additions and 3 deletions

View File

@ -1,8 +1,7 @@
#include <iostream> #include <iostream>
#include <cassert>
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/ext/matrix_clip_space.hpp> #include <glm/ext/matrix_clip_space.hpp>
#ifdef WIN32 #ifdef _WIN32
#include <corecrt_math_defines.h> #include <corecrt_math_defines.h>
#endif #endif
#include <glm/ext/matrix_transform.hpp> #include <glm/ext/matrix_transform.hpp>

View File

@ -3,6 +3,11 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/constants.hpp> #include <glm/gtc/constants.hpp>
#ifdef _WIN32
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/extended_min_max.hpp>
#endif
#include "engine/renderer/wavefront.h" #include "engine/renderer/wavefront.h"
#include "engine/renderer/renderer.h" #include "engine/renderer/renderer.h"
@ -157,7 +162,7 @@ public:
glm::vec3 sunDir = glm::normalize(glm::vec3(0.0f, sin(sunAngle), cos(sunAngle))); glm::vec3 sunDir = glm::normalize(glm::vec3(0.0f, sin(sunAngle), cos(sunAngle)));
// Compute intensity: bright at noon, dim at dusk/dawn, dark at night // Compute intensity: bright at noon, dim at dusk/dawn, dark at night
float intensity = glm::max(sin(sunAngle), (double)0.0f); // 0 at night, 1 at noon float intensity = glm::max(static_cast<double>(sin(sunAngle)), static_cast<double>(0.0f)); // 0 at night, 1 at noon
intensity = glm::mix(0.05f, 1.5f, intensity); // keep some ambient even at night intensity = glm::mix(0.05f, 1.5f, intensity); // keep some ambient even at night
// Optional: tint color (warm at sunrise/sunset) // Optional: tint color (warm at sunrise/sunset)