Skip to content

Commit

Permalink
Update glm to 1.0.1 (#263)
Browse files Browse the repository at this point in the history
  • Loading branch information
jdumas authored Mar 28, 2024
1 parent 8a151ce commit 50bd765
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 4 deletions.
1 change: 1 addition & 0 deletions deps/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ endif()
## glm
if(NOT TARGET glm::glm)
add_subdirectory(glm)
target_compile_definitions(glm INTERFACE GLM_ENABLE_EXPERIMENTAL)
endif()

## Imgui
Expand Down
2 changes: 1 addition & 1 deletion deps/glm
Submodule glm updated 1704 files
1 change: 0 additions & 1 deletion examples/demo-app/demo_app.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions include/polyscope/view.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 50bd765

Please sign in to comment.