mirror of
https://github.com/g-truc/glm.git
synced 2024-11-10 12:41:54 +00:00
Uses L for length template argument #584
This commit is contained in:
parent
0318de8b98
commit
9a8724925a
@ -21,23 +21,23 @@
|
|||||||
return vec<4, T, P>(this->A, this->B, this->C, this->D); \
|
return vec<4, T, P>(this->A, this->B, this->C, this->D); \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define GLM_SWIZZLE_GEN_VEC2_ENTRY_DEF(T, P, S, CONST, A, B) \
|
#define GLM_SWIZZLE_GEN_VEC2_ENTRY_DEF(T, P, L, CONST, A, B) \
|
||||||
template <typename T> \
|
template <typename T> \
|
||||||
vec<S, T, P> vec<S, T, P>::A ## B() CONST \
|
vec<L, T, P> vec<L, T, P>::A ## B() CONST \
|
||||||
{ \
|
{ \
|
||||||
return vec<2, T, P>(this->A, this->B); \
|
return vec<2, T, P>(this->A, this->B); \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define GLM_SWIZZLE_GEN_VEC3_ENTRY_DEF(T, P, S, CONST, A, B, C) \
|
#define GLM_SWIZZLE_GEN_VEC3_ENTRY_DEF(T, P, L, CONST, A, B, C) \
|
||||||
template <typename T> \
|
template <typename T> \
|
||||||
vec<3, T, P> vec<S, T, P>::A ## B ## C() CONST \
|
vec<3, T, P> vec<L, T, P>::A ## B ## C() CONST \
|
||||||
{ \
|
{ \
|
||||||
return vec<S, T, P>(this->A, this->B, this->C); \
|
return vec<3, T, P>(this->A, this->B, this->C); \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define GLM_SWIZZLE_GEN_VEC4_ENTRY_DEF(T, P, S, CONST, A, B, C, D) \
|
#define GLM_SWIZZLE_GEN_VEC4_ENTRY_DEF(T, P, L, CONST, A, B, C, D) \
|
||||||
template <typename T> \
|
template <typename T> \
|
||||||
vec<4, T, P> vec<S, T, P>::A ## B ## C ## D() CONST \
|
vec<4, T, P> vec<L, T, P>::A ## B ## C ## D() CONST \
|
||||||
{ \
|
{ \
|
||||||
return vec<4, T, P>(this->A, this->B, this->C, this->D); \
|
return vec<4, T, P>(this->A, this->B, this->C, this->D); \
|
||||||
}
|
}
|
||||||
|
@ -99,7 +99,7 @@ namespace glm
|
|||||||
|
|
||||||
// -- Conversion scalar constructors --
|
// -- Conversion scalar constructors --
|
||||||
|
|
||||||
/// Explicit converions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
|
/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
|
||||||
template <typename A, typename B, typename C, typename D>
|
template <typename A, typename B, typename C, typename D>
|
||||||
GLM_FUNC_DECL GLM_CONSTEXPR_SIMD vec(A a, B b, C c, D d);
|
GLM_FUNC_DECL GLM_CONSTEXPR_SIMD vec(A a, B b, C c, D d);
|
||||||
template <typename A, typename B, typename C, typename D>
|
template <typename A, typename B, typename C, typename D>
|
||||||
|
Loading…
Reference in New Issue
Block a user