From 50bd76589f93ee1ac84f9cecec684da7ab208651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Dumas?= Date: Wed, 27 Mar 2024 17:33:03 -0700 Subject: [PATCH] Update glm to 1.0.1 (#263) --- deps/CMakeLists.txt | 1 + deps/glm | 2 +- examples/demo-app/demo_app.cpp | 1 - include/polyscope/view.h | 2 -- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 8229e52c..2e8795ac 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -18,6 +18,7 @@ endif() ## glm if(NOT TARGET glm::glm) add_subdirectory(glm) + target_compile_definitions(glm INTERFACE GLM_ENABLE_EXPERIMENTAL) endif() ## Imgui diff --git a/deps/glm b/deps/glm index bf71a834..0af55cce 160000 --- a/deps/glm +++ b/deps/glm @@ -1 +1 @@ -Subproject commit bf71a834948186f4097caa076cd2663c69a10e1e +Subproject commit 0af55ccecd98d4e5a8d1fad7de25ba429d60e863 diff --git a/examples/demo-app/demo_app.cpp b/examples/demo-app/demo_app.cpp index 1dc196ad..abc5ec92 100644 --- a/examples/demo-app/demo_app.cpp +++ b/examples/demo-app/demo_app.cpp @@ -29,7 +29,6 @@ #include "simple_dot_mesh_parser.h" #include "surface_mesh_io.h" -#define GLM_ENABLE_EXPERIMENTAL #include "glm/gtx/string_cast.hpp" #include "stb_image.h" diff --git a/include/polyscope/view.h b/include/polyscope/view.h index 47f3c9ad..70e2f68b 100644 --- a/include/polyscope/view.h +++ b/include/polyscope/view.h @@ -19,10 +19,8 @@ #include "glm/mat4x4.hpp" #include "glm/vec3.hpp" #include "glm/vec4.hpp" -#define GLM_ENABLE_EXPERIMENTAL #include "glm/gtx/dual_quaternion.hpp" #include "glm/gtx/norm.hpp" // necessary for dual_quaternion below -#undef GLM_ENABLE_EXPERIMENTAL namespace polyscope { namespace view {