mewin/glm
1
0
Fork 0
Code Releases Activity

Wrap tvec3's static constants in GLM_STATIC_CONST_MEMBERS

Browse Source 
- Fixed the indentation, too
This commit is contained in:
Jesse Talavera-Greenberg 2015-10-05 18:24:31 -04:00
parent 4552ec737e
commit 8be318970c
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glm/detail/type_vec3.hpp
View File

@ -58,6 +58,7 @@ 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;
@ -66,6 +67,7 @@ namespace glm
static const type XZ; static const type XZ;
static const type YZ; static const type YZ;
static const type XYZ; static const type XYZ;
# endif
// -- Data -- // -- Data --

4
glm/detail/type_vec3.inl
View File

@ -32,6 +32,8 @@
namespace glm namespace glm
{ {
# ifdef GLM_STATIC_CONST_MEMBERS
template <typename T, precision P> template <typename T, precision P>
const tvec3<T, P> tvec3<T, P>::ZERO = tvec3<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(0)); const tvec3<T, P> tvec3<T, P>::ZERO = tvec3<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
@ -55,7 +57,7 @@ const tvec3<T, P> tvec3<T, P>::YZ = tvec3<T, P>(static_cast<T>(0), static_cast<T
template <typename T, precision P> template <typename T, precision P>
const tvec3<T, P> tvec3<T, P>::XYZ = tvec3<T, P>(static_cast<T>(1), static_cast<T>(1), static_cast<T>(1)); const tvec3<T, P> tvec3<T, P>::XYZ = tvec3<T, P>(static_cast<T>(1), 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)

1
test/core/core_type_vec3.cpp
View File

@ -33,6 +33,7 @@
# define GLM_META_PROG_HELPERS # define GLM_META_PROG_HELPERS
#endif #endif
#define GLM_SWIZZLE #define GLM_SWIZZLE
#define GLM_STATIC_CONST_MEMBERS
#include <glm/vector_relational.hpp> #include <glm/vector_relational.hpp>
#include <glm/geometric.hpp> #include <glm/geometric.hpp>
#include <glm/vec2.hpp> #include <glm/vec2.hpp>