From d34925777dd4fac709096f1c18b7d886b43c15b2 Mon Sep 17 00:00:00 2001 From: hachem Date: Mon, 18 Aug 2025 05:02:13 +0200 Subject: [fix]: improvements, bump to c++20 and fix bugs --- src/Core/Camera.cpp | 4 ++-- src/Core/Camera.h | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src/Core') diff --git a/src/Core/Camera.cpp b/src/Core/Camera.cpp index eeb62a4..028924e 100644 --- a/src/Core/Camera.cpp +++ b/src/Core/Camera.cpp @@ -163,7 +163,7 @@ namespace Donut glm::vec3 Camera::GetOrbitalPosition() const { - float clampedElevation = glm::clamp(m_Elevation, 0.01f, float(M_PI) - 0.01f); + float clampedElevation = glm::clamp(m_Elevation, 0.01f, float(std::numbers::pi) - 0.01f); return glm::vec3 ( m_OrbitalRadius * sin(clampedElevation) * cos(m_Azimuth), @@ -191,7 +191,7 @@ namespace Donut m_Azimuth += dx * m_OrbitalSpeed; m_Elevation -= dy * m_OrbitalSpeed; - m_Elevation = glm::clamp(m_Elevation, 0.01f, float(M_PI) - 0.01f); + m_Elevation = glm::clamp(m_Elevation, 0.01f, float(std::numbers::pi) - 0.01f); } m_LastX_Orbital = x; diff --git a/src/Core/Camera.h b/src/Core/Camera.h index a049d06..a9aec2a 100644 --- a/src/Core/Camera.h +++ b/src/Core/Camera.h @@ -3,10 +3,7 @@ #include #include -#define _USE_MATH_DEFINES -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif +#include namespace Donut { @@ -121,7 +118,7 @@ namespace Donut double m_OrbitalMinRadius = 1e10; double m_OrbitalMaxRadius = 1e12; float m_Azimuth = 0.0f; - float m_Elevation = static_cast(M_PI) / 2.0f; + float m_Elevation = static_cast(std::numbers::pi) / 2.0f; float m_OrbitalSpeed = 0.01f; double m_ZoomSpeed = 25e9f; bool m_Dragging = false; -- cgit v1.3