mirror of
https://github.com/g-truc/glm.git
synced 2024-11-10 04:31:47 +00:00
Merge branch '0.9.2' into 0.9.3
This commit is contained in:
commit
4779a6d990
@ -197,6 +197,7 @@ namespace detail
|
||||
GLM_FUNC_DECL tvec2<T> swizzle(comp X, comp Y) const;
|
||||
GLM_FUNC_DECL tvec3<T> swizzle(comp X, comp Y, comp Z) const;
|
||||
GLM_FUNC_DECL tvec4<T> swizzle(comp X, comp Y, comp Z, comp W) const;
|
||||
GLM_FUNC_DECL tref2<T> swizzle(comp X, comp Y);
|
||||
GLM_FUNC_DECL tref3<T> swizzle(comp X, comp Y, comp Z);
|
||||
};
|
||||
|
||||
|
@ -594,6 +594,18 @@ namespace detail
|
||||
(*this)[w]);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER tref2<T> tvec3<T>::swizzle
|
||||
(
|
||||
comp x,
|
||||
comp y
|
||||
)
|
||||
{
|
||||
return tref2<T>(
|
||||
(*this)[x],
|
||||
(*this)[y]);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER tref3<T> tvec3<T>::swizzle
|
||||
(
|
||||
|
@ -209,6 +209,8 @@ namespace detail
|
||||
GLM_FUNC_DECL tvec2<T> swizzle(comp X, comp Y) const;
|
||||
GLM_FUNC_DECL tvec3<T> swizzle(comp X, comp Y, comp Z) const;
|
||||
GLM_FUNC_DECL tvec4<T> swizzle(comp X, comp Y, comp Z, comp W) const;
|
||||
GLM_FUNC_DECL tref2<T> swizzle(comp X, comp Y);
|
||||
GLM_FUNC_DECL tref3<T> swizzle(comp X, comp Y, comp Z);
|
||||
GLM_FUNC_DECL tref4<T> swizzle(comp X, comp Y, comp Z, comp W);
|
||||
};
|
||||
|
||||
|
@ -651,6 +651,32 @@ namespace detail
|
||||
(*this)[w]);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER tref2<T> tvec4<T>::swizzle
|
||||
(
|
||||
comp x,
|
||||
comp y
|
||||
)
|
||||
{
|
||||
return tref2<T>(
|
||||
(*this)[x],
|
||||
(*this)[y]);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER tref3<T> tvec4<T>::swizzle
|
||||
(
|
||||
comp x,
|
||||
comp y,
|
||||
comp z
|
||||
)
|
||||
{
|
||||
return tref3<T>(
|
||||
(*this)[x],
|
||||
(*this)[y],
|
||||
(*this)[z]);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER tref4<T> tvec4<T>::swizzle
|
||||
(
|
||||
|
Loading…
Reference in New Issue
Block a user