mewin/glm
1
0
Fork 0
Code Releases Activity

Wrap tvec4's static constants in GLM_STATIC_CONST_MEMBERS

Browse Source 
- Fix the indentation, too
This commit is contained in:
Jesse Talavera-Greenberg 2015-10-05 18:25:01 -04:00
parent 8be318970c
commit 5df08dfc78
3 changed files with 54 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glm/detail/type_vec4.hpp
View File

@ -112,6 +112,7 @@ namespace detail
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;
@ -128,6 +129,8 @@ namespace detail
static const type XZW; static const type XZW;
static const type YZW; static const type YZW;
static const type XYZW; static const type XYZW;
# endif
// -- Data -- // -- Data --
# if GLM_HAS_ANONYMOUS_UNION && GLM_NOT_BUGGY_VC32BITS # if GLM_HAS_ANONYMOUS_UNION && GLM_NOT_BUGGY_VC32BITS

98
glm/detail/type_vec4.inl
View File

@ -32,70 +32,72 @@
namespace glm namespace glm
{ {
template <typename T, precision P>
const tvec4<T, P> tvec4<T, P>::ZERO =
tvec4<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
template <typename T, precision P> # ifdef GLM_STATIC_CONST_MEMBERS
const tvec4<T, P> tvec4<T, P>::X = template <typename T, precision P>
tvec4<T, P>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0)); const tvec4<T, P> tvec4<T, P>::ZERO =
tvec4<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
template <typename T, precision P> template <typename T, precision P>
const tvec4<T, P> tvec4<T, P>::Y = const tvec4<T, P> tvec4<T, P>::X =
tvec4<T, P>(static_cast<T>(0), static_cast<T>(1), static_cast<T>(0), static_cast<T>(0)); tvec4<T, P>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
template <typename T, precision P> template <typename T, precision P>
const tvec4<T, P> tvec4<T, P>::Z = const tvec4<T, P> tvec4<T, P>::Y =
tvec4<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(1), static_cast<T>(0)); tvec4<T, P>(static_cast<T>(0), static_cast<T>(1), static_cast<T>(0), static_cast<T>(0));
template <typename T, precision P> template <typename T, precision P>
const tvec4<T, P> tvec4<T, P>::W = const tvec4<T, P> tvec4<T, P>::Z =
tvec4<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(0), static_cast<T>(1)); tvec4<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(1), static_cast<T>(0));
template <typename T, precision P> template <typename T, precision P>
const tvec4<T, P> tvec4<T, P>::XY = const tvec4<T, P> tvec4<T, P>::W =
tvec4<T, P>(static_cast<T>(1), static_cast<T>(1), static_cast<T>(0), static_cast<T>(0)); tvec4<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(0), static_cast<T>(1));
template <typename T, precision P> template <typename T, precision P>
const tvec4<T, P> tvec4<T, P>::XZ = const tvec4<T, P> tvec4<T, P>::XY =
tvec4<T, P>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(1), static_cast<T>(0)); tvec4<T, P>(static_cast<T>(1), static_cast<T>(1), static_cast<T>(0), static_cast<T>(0));
template <typename T, precision P> template <typename T, precision P>
const tvec4<T, P> tvec4<T, P>::XW = const tvec4<T, P> tvec4<T, P>::XZ =
tvec4<T, P>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(0), static_cast<T>(1)); tvec4<T, P>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(1), static_cast<T>(0));
template <typename T, precision P> template <typename T, precision P>
const tvec4<T, P> tvec4<T, P>::YZ = const tvec4<T, P> tvec4<T, P>::XW =
tvec4<T, P>(static_cast<T>(0), static_cast<T>(1), static_cast<T>(1), static_cast<T>(0)); tvec4<T, P>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(0), static_cast<T>(1));
template <typename T, precision P> template <typename T, precision P>
const tvec4<T, P> tvec4<T, P>::YW = const tvec4<T, P> tvec4<T, P>::YZ =
tvec4<T, P>(static_cast<T>(0), static_cast<T>(1), static_cast<T>(0), static_cast<T>(1)); tvec4<T, P>(static_cast<T>(0), static_cast<T>(1), static_cast<T>(1), static_cast<T>(0));
template <typename T, precision P> template <typename T, precision P>
const tvec4<T, P> tvec4<T, P>::ZW = const tvec4<T, P> tvec4<T, P>::YW =
tvec4<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(1), static_cast<T>(1)); tvec4<T, P>(static_cast<T>(0), static_cast<T>(1), static_cast<T>(0), static_cast<T>(1));
template <typename T, precision P> template <typename T, precision P>
const tvec4<T, P> tvec4<T, P>::XYZ = const tvec4<T, P> tvec4<T, P>::ZW =
tvec4<T, P>(static_cast<T>(1), static_cast<T>(1), static_cast<T>(1), static_cast<T>(0)); tvec4<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(1), static_cast<T>(1));
template <typename T, precision P> template <typename T, precision P>
const tvec4<T, P> tvec4<T, P>::XYW = const tvec4<T, P> tvec4<T, P>::XYZ =
tvec4<T, P>(static_cast<T>(1), static_cast<T>(1), static_cast<T>(0), static_cast<T>(1)); tvec4<T, P>(static_cast<T>(1), static_cast<T>(1), static_cast<T>(1), static_cast<T>(0));
template <typename T, precision P> template <typename T, precision P>
const tvec4<T, P> tvec4<T, P>::XZW = const tvec4<T, P> tvec4<T, P>::XYW =
tvec4<T, P>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(1), static_cast<T>(1)); tvec4<T, P>(static_cast<T>(1), static_cast<T>(1), static_cast<T>(0), static_cast<T>(1));
template <typename T, precision P> template <typename T, precision P>
const tvec4<T, P> tvec4<T, P>::YZW = const tvec4<T, P> tvec4<T, P>::XZW =
tvec4<T, P>(static_cast<T>(0), static_cast<T>(1), static_cast<T>(1), static_cast<T>(1)); tvec4<T, P>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(1), static_cast<T>(1));
template <typename T, precision P> template <typename T, precision P>
const tvec4<T, P> tvec4<T, P>::XYZW = const tvec4<T, P> tvec4<T, P>::YZW =
tvec4<T, P>(static_cast<T>(1), static_cast<T>(1), static_cast<T>(1), static_cast<T>(1)); tvec4<T, P>(static_cast<T>(0), static_cast<T>(1), static_cast<T>(1), static_cast<T>(1));
template <typename T, precision P>
const tvec4<T, P> tvec4<T, P>::XYZW =
tvec4<T, P>(static_cast<T>(1), 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_vec4.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/vec2.hpp> #include <glm/vec2.hpp>
#include <glm/vec3.hpp> #include <glm/vec3.hpp>