mirror of
https://github.com/g-truc/glm.git
synced 2024-11-26 10:14:35 +00:00
Use different qualifiers for default function and constructor
So it is more robust against user configuration to force constructor initialisation
This commit is contained in:
parent
140e7cf1b2
commit
91c9409959
@ -479,13 +479,21 @@
|
|||||||
#define GLM_FUNC_DECL GLM_CUDA_FUNC_DECL
|
#define GLM_FUNC_DECL GLM_CUDA_FUNC_DECL
|
||||||
#define GLM_FUNC_QUALIFIER GLM_CUDA_FUNC_DEF GLM_INLINE
|
#define GLM_FUNC_QUALIFIER GLM_CUDA_FUNC_DEF GLM_INLINE
|
||||||
|
|
||||||
#if GLM_CONFIG_DEFAULTED_FUNCTIONS == GLM_ENABLE
|
// Do not use CUDA function qualifiers on CUDA compiler when functions are made default
|
||||||
|
#if GLM_HAS_DEFAULTED_FUNCTIONS
|
||||||
# define GLM_DEFAULTED_FUNC_DECL
|
# define GLM_DEFAULTED_FUNC_DECL
|
||||||
# define GLM_DEFAULTED_FUNC_QUALIFIER
|
# define GLM_DEFAULTED_FUNC_QUALIFIER GLM_INLINE
|
||||||
#else
|
#else
|
||||||
# define GLM_DEFAULTED_FUNC_DECL GLM_FUNC_DECL
|
# define GLM_DEFAULTED_FUNC_DECL GLM_FUNC_DECL
|
||||||
# define GLM_DEFAULTED_FUNC_QUALIFIER GLM_FUNC_QUALIFIER
|
# define GLM_DEFAULTED_FUNC_QUALIFIER GLM_FUNC_QUALIFIER
|
||||||
#endif//GLM_CONFIG_DEFAULTED_FUNCTIONS == GLM_ENABLE
|
#endif//GLM_HAS_DEFAULTED_FUNCTIONS
|
||||||
|
#if !defined(GLM_FORCE_CTOR_INIT)
|
||||||
|
# define GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_DEFAULTED_FUNC_DECL
|
||||||
|
# define GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_DEFAULTED_FUNC_QUALIFIER
|
||||||
|
#else
|
||||||
|
# define GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_FUNC_DECL
|
||||||
|
# define GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_FUNC_QUALIFIER
|
||||||
|
#endif//GLM_FORCE_CTOR_INIT
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////
|
||||||
// Swizzle operators
|
// Swizzle operators
|
||||||
|
@ -32,7 +32,7 @@ namespace glm
|
|||||||
|
|
||||||
// -- Constructors --
|
// -- Constructors --
|
||||||
|
|
||||||
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
|
GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
|
||||||
template<qualifier P>
|
template<qualifier P>
|
||||||
GLM_FUNC_DECL GLM_CONSTEXPR mat(mat<2, 2, T, P> const& m);
|
GLM_FUNC_DECL GLM_CONSTEXPR mat(mat<2, 2, T, P> const& m);
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ namespace glm
|
|||||||
|
|
||||||
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
||||||
template<typename T, qualifier Q>
|
template<typename T, qualifier Q>
|
||||||
GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>::mat()
|
GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>::mat()
|
||||||
# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST
|
# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST
|
||||||
: value{col_type(1, 0), col_type(0, 1)}
|
: value{col_type(1, 0), col_type(0, 1)}
|
||||||
# endif
|
# endif
|
||||||
|
@ -33,7 +33,7 @@ namespace glm
|
|||||||
|
|
||||||
// -- Constructors --
|
// -- Constructors --
|
||||||
|
|
||||||
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
|
GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
|
||||||
template<qualifier P>
|
template<qualifier P>
|
||||||
GLM_FUNC_DECL GLM_CONSTEXPR mat(mat<2, 3, T, P> const& m);
|
GLM_FUNC_DECL GLM_CONSTEXPR mat(mat<2, 3, T, P> const& m);
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ namespace glm
|
|||||||
|
|
||||||
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
||||||
template<typename T, qualifier Q>
|
template<typename T, qualifier Q>
|
||||||
GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>::mat()
|
GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>::mat()
|
||||||
# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST
|
# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST
|
||||||
: value{col_type(1, 0, 0), col_type(0, 1, 0)}
|
: value{col_type(1, 0, 0), col_type(0, 1, 0)}
|
||||||
# endif
|
# endif
|
||||||
|
@ -33,7 +33,7 @@ namespace glm
|
|||||||
|
|
||||||
// -- Constructors --
|
// -- Constructors --
|
||||||
|
|
||||||
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
|
GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
|
||||||
template<qualifier P>
|
template<qualifier P>
|
||||||
GLM_FUNC_DECL GLM_CONSTEXPR mat(mat<2, 4, T, P> const& m);
|
GLM_FUNC_DECL GLM_CONSTEXPR mat(mat<2, 4, T, P> const& m);
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ namespace glm
|
|||||||
|
|
||||||
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
||||||
template<typename T, qualifier Q>
|
template<typename T, qualifier Q>
|
||||||
GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>::mat()
|
GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>::mat()
|
||||||
# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST
|
# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST
|
||||||
: value{col_type(1, 0, 0, 0), col_type(0, 1, 0, 0)}
|
: value{col_type(1, 0, 0, 0), col_type(0, 1, 0, 0)}
|
||||||
# endif
|
# endif
|
||||||
|
@ -33,7 +33,7 @@ namespace glm
|
|||||||
|
|
||||||
// -- Constructors --
|
// -- Constructors --
|
||||||
|
|
||||||
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
|
GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
|
||||||
template<qualifier P>
|
template<qualifier P>
|
||||||
GLM_FUNC_DECL GLM_CONSTEXPR mat(mat<3, 2, T, P> const& m);
|
GLM_FUNC_DECL GLM_CONSTEXPR mat(mat<3, 2, T, P> const& m);
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ namespace glm
|
|||||||
|
|
||||||
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
||||||
template<typename T, qualifier Q>
|
template<typename T, qualifier Q>
|
||||||
GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>::mat()
|
GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>::mat()
|
||||||
# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST
|
# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST
|
||||||
: value{col_type(1, 0), col_type(0, 1), col_type(0, 0)}
|
: value{col_type(1, 0), col_type(0, 1), col_type(0, 0)}
|
||||||
# endif
|
# endif
|
||||||
|
@ -32,7 +32,7 @@ namespace glm
|
|||||||
|
|
||||||
// -- Constructors --
|
// -- Constructors --
|
||||||
|
|
||||||
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
|
GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
|
||||||
template<qualifier P>
|
template<qualifier P>
|
||||||
GLM_FUNC_DECL GLM_CONSTEXPR mat(mat<3, 3, T, P> const& m);
|
GLM_FUNC_DECL GLM_CONSTEXPR mat(mat<3, 3, T, P> const& m);
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ namespace glm
|
|||||||
|
|
||||||
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
||||||
template<typename T, qualifier Q>
|
template<typename T, qualifier Q>
|
||||||
GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q>::mat()
|
GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q>::mat()
|
||||||
# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST
|
# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST
|
||||||
: value{col_type(1, 0, 0), col_type(0, 1, 0), col_type(0, 0, 1)}
|
: value{col_type(1, 0, 0), col_type(0, 1, 0), col_type(0, 0, 1)}
|
||||||
# endif
|
# endif
|
||||||
|
@ -33,7 +33,7 @@ namespace glm
|
|||||||
|
|
||||||
// -- Constructors --
|
// -- Constructors --
|
||||||
|
|
||||||
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
|
GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
|
||||||
template<qualifier P>
|
template<qualifier P>
|
||||||
GLM_FUNC_DECL GLM_CONSTEXPR mat(mat<3, 4, T, P> const& m);
|
GLM_FUNC_DECL GLM_CONSTEXPR mat(mat<3, 4, T, P> const& m);
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ namespace glm
|
|||||||
|
|
||||||
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
||||||
template<typename T, qualifier Q>
|
template<typename T, qualifier Q>
|
||||||
GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>::mat()
|
GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>::mat()
|
||||||
# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST
|
# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST
|
||||||
: value{col_type(1, 0, 0, 0), col_type(0, 1, 0, 0), col_type(0, 0, 1, 0)}
|
: value{col_type(1, 0, 0, 0), col_type(0, 1, 0, 0), col_type(0, 0, 1, 0)}
|
||||||
# endif
|
# endif
|
||||||
|
@ -33,7 +33,7 @@ namespace glm
|
|||||||
|
|
||||||
// -- Constructors --
|
// -- Constructors --
|
||||||
|
|
||||||
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
|
GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
|
||||||
template<qualifier P>
|
template<qualifier P>
|
||||||
GLM_FUNC_DECL GLM_CONSTEXPR mat(mat<4, 2, T, P> const& m);
|
GLM_FUNC_DECL GLM_CONSTEXPR mat(mat<4, 2, T, P> const& m);
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ namespace glm
|
|||||||
|
|
||||||
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
||||||
template<typename T, qualifier Q>
|
template<typename T, qualifier Q>
|
||||||
GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q>::mat()
|
GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q>::mat()
|
||||||
# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST
|
# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST
|
||||||
: value{col_type(1, 0), col_type(0, 1), col_type(0, 0), col_type(0, 0)}
|
: value{col_type(1, 0), col_type(0, 1), col_type(0, 0), col_type(0, 0)}
|
||||||
# endif
|
# endif
|
||||||
|
@ -33,7 +33,7 @@ namespace glm
|
|||||||
|
|
||||||
// -- Constructors --
|
// -- Constructors --
|
||||||
|
|
||||||
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
|
GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
|
||||||
template<qualifier P>
|
template<qualifier P>
|
||||||
GLM_FUNC_DECL GLM_CONSTEXPR mat(mat<4, 3, T, P> const& m);
|
GLM_FUNC_DECL GLM_CONSTEXPR mat(mat<4, 3, T, P> const& m);
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ namespace glm
|
|||||||
|
|
||||||
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
||||||
template<typename T, qualifier Q>
|
template<typename T, qualifier Q>
|
||||||
GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>::mat()
|
GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>::mat()
|
||||||
# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST
|
# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST
|
||||||
: value{col_type(1, 0, 0), col_type(0, 1, 0), col_type(0, 0, 1), col_type(0, 0, 0)}
|
: value{col_type(1, 0, 0), col_type(0, 1, 0), col_type(0, 0, 1), col_type(0, 0, 0)}
|
||||||
# endif
|
# endif
|
||||||
|
@ -32,7 +32,7 @@ namespace glm
|
|||||||
|
|
||||||
// -- Constructors --
|
// -- Constructors --
|
||||||
|
|
||||||
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
|
GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
|
||||||
template<qualifier P>
|
template<qualifier P>
|
||||||
GLM_FUNC_DECL GLM_CONSTEXPR mat(mat<4, 4, T, P> const& m);
|
GLM_FUNC_DECL GLM_CONSTEXPR mat(mat<4, 4, T, P> const& m);
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ namespace glm
|
|||||||
|
|
||||||
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
||||||
template<typename T, qualifier Q>
|
template<typename T, qualifier Q>
|
||||||
GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>::mat()
|
GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>::mat()
|
||||||
# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST
|
# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST
|
||||||
: value{col_type(1, 0, 0, 0), col_type(0, 1, 0, 0), col_type(0, 0, 1, 0), col_type(0, 0, 0, 1)}
|
: value{col_type(1, 0, 0, 0), col_type(0, 1, 0, 0), col_type(0, 0, 1, 0), col_type(0, 0, 0, 1)}
|
||||||
# endif
|
# endif
|
||||||
|
@ -80,7 +80,7 @@ namespace glm
|
|||||||
|
|
||||||
// -- Implicit basic constructors --
|
// -- Implicit basic constructors --
|
||||||
|
|
||||||
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR qua() GLM_DEFAULT_CTOR;
|
GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR qua() GLM_DEFAULT_CTOR;
|
||||||
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR qua(qua<T, Q> const& q) GLM_DEFAULT;
|
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR qua(qua<T, Q> const& q) GLM_DEFAULT;
|
||||||
template<qualifier P>
|
template<qualifier P>
|
||||||
GLM_FUNC_DECL GLM_CONSTEXPR qua(qua<T, P> const& q);
|
GLM_FUNC_DECL GLM_CONSTEXPR qua(qua<T, P> const& q);
|
||||||
|
@ -97,7 +97,7 @@ namespace detail
|
|||||||
|
|
||||||
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
||||||
template<typename T, qualifier Q>
|
template<typename T, qualifier Q>
|
||||||
GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR qua<T, Q>::qua()
|
GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR qua<T, Q>::qua()
|
||||||
# if GLM_CONFIG_CTOR_INIT != GLM_CTOR_INIT_DISABLE
|
# if GLM_CONFIG_CTOR_INIT != GLM_CTOR_INIT_DISABLE
|
||||||
# ifdef GLM_FORCE_QUAT_DATA_XYZW
|
# ifdef GLM_FORCE_QUAT_DATA_XYZW
|
||||||
: x(0), y(0), z(0), w(1)
|
: x(0), y(0), z(0), w(1)
|
||||||
|
@ -92,7 +92,7 @@ namespace glm
|
|||||||
|
|
||||||
// -- Implicit basic constructors --
|
// -- Implicit basic constructors --
|
||||||
|
|
||||||
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR;
|
GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR;
|
||||||
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec(vec const& v) GLM_DEFAULT;
|
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec(vec const& v) GLM_DEFAULT;
|
||||||
template<qualifier P>
|
template<qualifier P>
|
||||||
GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<1, T, P> const& v);
|
GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<1, T, P> const& v);
|
||||||
|
@ -8,7 +8,7 @@ namespace glm
|
|||||||
|
|
||||||
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
||||||
template<typename T, qualifier Q>
|
template<typename T, qualifier Q>
|
||||||
GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q>::vec()
|
GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR vec<1, T, Q>::vec()
|
||||||
# if GLM_CONFIG_CTOR_INIT != GLM_CTOR_INIT_DISABLE
|
# if GLM_CONFIG_CTOR_INIT != GLM_CTOR_INIT_DISABLE
|
||||||
: x(0)
|
: x(0)
|
||||||
# endif
|
# endif
|
||||||
|
@ -94,7 +94,7 @@ namespace glm
|
|||||||
|
|
||||||
// -- Implicit basic constructors --
|
// -- Implicit basic constructors --
|
||||||
|
|
||||||
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR;
|
GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR;
|
||||||
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec(vec const& v) GLM_DEFAULT;
|
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec(vec const& v) GLM_DEFAULT;
|
||||||
template<qualifier P>
|
template<qualifier P>
|
||||||
GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<2, T, P> const& v);
|
GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<2, T, P> const& v);
|
||||||
|
@ -8,7 +8,7 @@ namespace glm
|
|||||||
|
|
||||||
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
||||||
template<typename T, qualifier Q>
|
template<typename T, qualifier Q>
|
||||||
GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q>::vec()
|
GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR vec<2, T, Q>::vec()
|
||||||
# if GLM_CONFIG_CTOR_INIT != GLM_CTOR_INIT_DISABLE
|
# if GLM_CONFIG_CTOR_INIT != GLM_CTOR_INIT_DISABLE
|
||||||
: x(0), y(0)
|
: x(0), y(0)
|
||||||
# endif
|
# endif
|
||||||
|
@ -98,7 +98,7 @@ namespace glm
|
|||||||
|
|
||||||
// -- Implicit basic constructors --
|
// -- Implicit basic constructors --
|
||||||
|
|
||||||
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR;
|
GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR;
|
||||||
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec(vec const& v) GLM_DEFAULT;
|
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec(vec const& v) GLM_DEFAULT;
|
||||||
template<qualifier P>
|
template<qualifier P>
|
||||||
GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<3, T, P> const& v);
|
GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<3, T, P> const& v);
|
||||||
|
@ -8,7 +8,7 @@ namespace glm
|
|||||||
|
|
||||||
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
||||||
template<typename T, qualifier Q>
|
template<typename T, qualifier Q>
|
||||||
GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec()
|
GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec()
|
||||||
# if GLM_CONFIG_CTOR_INIT != GLM_CTOR_INIT_DISABLE
|
# if GLM_CONFIG_CTOR_INIT != GLM_CTOR_INIT_DISABLE
|
||||||
: x(0), y(0), z(0)
|
: x(0), y(0), z(0)
|
||||||
# endif
|
# endif
|
||||||
|
@ -97,7 +97,7 @@ namespace glm
|
|||||||
|
|
||||||
// -- Implicit basic constructors --
|
// -- Implicit basic constructors --
|
||||||
|
|
||||||
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR;
|
GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR;
|
||||||
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec(vec<4, T, Q> const& v) GLM_DEFAULT;
|
GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec(vec<4, T, Q> const& v) GLM_DEFAULT;
|
||||||
template<qualifier P>
|
template<qualifier P>
|
||||||
GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<4, T, P> const& v);
|
GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<4, T, P> const& v);
|
||||||
|
@ -131,7 +131,7 @@ namespace detail
|
|||||||
|
|
||||||
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
# if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE
|
||||||
template<typename T, qualifier Q>
|
template<typename T, qualifier Q>
|
||||||
GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec()
|
GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec()
|
||||||
# if GLM_CONFIG_CTOR_INIT != GLM_CTOR_INIT_DISABLE
|
# if GLM_CONFIG_CTOR_INIT != GLM_CTOR_INIT_DISABLE
|
||||||
: x(0), y(0), z(0), w(0)
|
: x(0), y(0), z(0), w(0)
|
||||||
# endif
|
# endif
|
||||||
|
Loading…
Reference in New Issue
Block a user