|
|
@ -106,6 +106,7 @@ namespace detail |
|
|
|
struct _swizzle_base2 : public _swizzle_base1<ValueType,VecType,E0,E1,E2,E3,N> |
|
|
|
struct _swizzle_base2 : public _swizzle_base1<ValueType,VecType,E0,E1,E2,E3,N> |
|
|
|
{ |
|
|
|
{ |
|
|
|
typedef VecType vec_type; |
|
|
|
typedef VecType vec_type; |
|
|
|
|
|
|
|
typedef ValueType value_type; |
|
|
|
|
|
|
|
|
|
|
|
_swizzle_base2& operator= (const ValueType& t) |
|
|
|
_swizzle_base2& operator= (const ValueType& t) |
|
|
|
{ |
|
|
|
{ |
|
|
@ -178,8 +179,6 @@ namespace detail |
|
|
|
for (int i = 0; i < N; ++i) |
|
|
|
for (int i = 0; i < N; ++i) |
|
|
|
op( (*this)[i], t[i] ); |
|
|
|
op( (*this)[i], t[i] ); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
//! Specialization for swizzles containing duplicate elements. These cannot be modified.
|
|
|
|
//! Specialization for swizzles containing duplicate elements. These cannot be modified.
|
|
|
@ -834,7 +833,6 @@ namespace glm |
|
|
|
struct { glm::detail::swizzle<4,T,P,3,3,3,2> E3 ## E3 ## E3 ## E2; }; \
|
|
|
|
struct { glm::detail::swizzle<4,T,P,3,3,3,2> E3 ## E3 ## E3 ## E2; }; \
|
|
|
|
struct { glm::detail::swizzle<4,T,P,3,3,3,3> E3 ## E3 ## E3 ## E3; };
|
|
|
|
struct { glm::detail::swizzle<4,T,P,3,3,3,3> E3 ## E3 ## E3 ## E3; };
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if(defined(GLM_SWIZZLE_XYZW) || defined(GLM_SWIZZLE)) |
|
|
|
#if(defined(GLM_SWIZZLE_XYZW) || defined(GLM_SWIZZLE)) |
|
|
|
|
|
|
|
|
|
|
|
#define xx swizzle(glm::X, glm::X) |
|
|
|
#define xx swizzle(glm::X, glm::X) |
|
|
|