mewin/glm
1
0
Fork 0
Code Releases Activity

Wrap tvec2's static constants in GLM_STATIC_CONST_MEMBERS

Browse Source
This commit is contained in:
Jesse Talavera-Greenberg
2015-10-05 18:23:18 -04:00
parent 5a60b3986b
commit 4552ec737e
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
glm/detail/type_vec2.hpp
View File

@@ -58,10 +58,13 @@ namespace glm
static GLM_RELAXED_CONSTEXPR precision prec = P; static GLM_RELAXED_CONSTEXPR precision prec = P;
# endif//GLM_META_PROG_HELPERS # endif//GLM_META_PROG_HELPERS
# ifdef GLM_STATIC_CONST_MEMBERS
static const type ZERO; static const type ZERO;
static const type X; static const type X;
static const type Y; static const type Y;
static const type XY; static const type XY;
# endif
// -- Data -- // -- Data --
# if GLM_HAS_ANONYMOUS_UNION # if GLM_HAS_ANONYMOUS_UNION

2
glm/detail/type_vec2.inl
View File

@@ -28,6 +28,7 @@
namespace glm namespace glm
{ {
# ifdef GLM_STATIC_CONST_MEMBERS
template <typename T, precision P> template <typename T, precision P>
const tvec2<T, P> tvec2<T, P>::ZERO = tvec2<T, P>(static_cast<T>(0), static_cast<T>(0)); const tvec2<T, P> tvec2<T, P>::ZERO = tvec2<T, P>(static_cast<T>(0), static_cast<T>(0));
@@ -39,6 +40,7 @@ namespace glm
template <typename T, precision P> template <typename T, precision P>
const tvec2<T, P> tvec2<T, P>::XY = tvec2<T, P>(static_cast<T>(1), static_cast<T>(1)); const tvec2<T, P> tvec2<T, P>::XY = tvec2<T, P>(static_cast<T>(1), static_cast<T>(1));
# endif
// -- Implicit basic constructors -- // -- Implicit basic constructors --
# if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) # if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)

2
test/core/core_type_vec2.cpp
View File

@@ -29,6 +29,7 @@
/// @author Christophe Riccio /// @author Christophe Riccio
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#define GLM_STATIC_CONST_MEMBERS
#if !(GLM_COMPILER & GLM_COMPILER_GCC) #if !(GLM_COMPILER & GLM_COMPILER_GCC)
# define GLM_META_PROG_HELPERS # define GLM_META_PROG_HELPERS
#endif #endif
@@ -40,6 +41,7 @@
# include <type_traits> # include <type_traits>
#endif #endif
int test_vec2_operators() int test_vec2_operators()
{ {
int Error = 0; int Error = 0;