From: Daniel Karbach Date: Sat, 17 Nov 2018 12:10:22 +0000 (+0100) Subject: new gcc version X-Git-Url: http://git.localhorst.tv/?p=blank.git;a=commitdiff_plain;h=28585b166ce3ad765ab613a375a97265449841e7 new gcc version --- diff --git a/src/graphics/gl_traits.hpp b/src/graphics/gl_traits.hpp index 89d2dea..db81e67 100644 --- a/src/graphics/gl_traits.hpp +++ b/src/graphics/gl_traits.hpp @@ -71,7 +71,6 @@ template<> struct gl_traits { // composite types -template<> template struct gl_traits> { static constexpr GLint size = 1; @@ -82,7 +81,6 @@ constexpr GLint gl_traits>::size; template constexpr GLenum gl_traits>::type; -template<> template struct gl_traits> { static constexpr GLint size = 2; @@ -93,7 +91,6 @@ constexpr GLint gl_traits>::size; template constexpr GLenum gl_traits>::type; -template<> template struct gl_traits> { static constexpr GLint size = 3; @@ -104,7 +101,6 @@ constexpr GLint gl_traits>::size; template constexpr GLenum gl_traits>::type; -template<> template struct gl_traits> { static constexpr GLint size = 4; diff --git a/src/graphics/glm.hpp b/src/graphics/glm.hpp index db886e0..cf76657 100644 --- a/src/graphics/glm.hpp +++ b/src/graphics/glm.hpp @@ -5,6 +5,8 @@ # define GLM_FORCE_RADIANS 1 #endif +#define GLM_ENABLE_EXPERIMENTAL + #include // GLM moved tvec[1234] from glm::detail to glm in 0.9.6