From af40667b229bad26277d9162ad93e3fc82d3b01b Mon Sep 17 00:00:00 2001 From: Joseph Walton-Rivers <joseph@walton-rivers.uk> Date: Fri, 2 Sep 2022 02:14:57 +0100 Subject: [PATCH] ensure GLM experimental is set --- include/fggl/gfx/ogl/shader.hpp | 2 +- include/fggl/math/types.hpp | 1 + include/fggl/math/vector.hpp | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/fggl/gfx/ogl/shader.hpp b/include/fggl/gfx/ogl/shader.hpp index a5cba96..3828f43 100644 --- a/include/fggl/gfx/ogl/shader.hpp +++ b/include/fggl/gfx/ogl/shader.hpp @@ -37,7 +37,7 @@ namespace fggl::gfx { std::string geometry; bool hasGeom = false; - constexpr static ShaderConfig named(const std::string &name, bool hasGeom = false) { + static ShaderConfig named(const std::string &name, bool hasGeom = false) { return { .name = name, .vertex = name + "_vert.glsl", diff --git a/include/fggl/math/types.hpp b/include/fggl/math/types.hpp index 8899ab9..07ad9a0 100644 --- a/include/fggl/math/types.hpp +++ b/include/fggl/math/types.hpp @@ -19,6 +19,7 @@ #include <iostream> #include "fggl/math/vector.hpp" + #include <glm/ext/matrix_transform.hpp> #include <glm/gtc/quaternion.hpp> #include <glm/gtx/transform.hpp> diff --git a/include/fggl/math/vector.hpp b/include/fggl/math/vector.hpp index 20a9a25..84dd0a9 100644 --- a/include/fggl/math/vector.hpp +++ b/include/fggl/math/vector.hpp @@ -21,6 +21,7 @@ #include <ostream> +#define GLM_ENABLE_EXPERIMENTAL #define GLM_FORCE_MESSAGES #include <glm/glm.hpp> -- GitLab