diff options
Diffstat (limited to '')
| -rw-r--r-- | external/include/glm/gtx/wrap.inl | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/external/include/glm/gtx/wrap.inl b/external/include/glm/gtx/wrap.inl index 941a803..83e350f 100644 --- a/external/include/glm/gtx/wrap.inl +++ b/external/include/glm/gtx/wrap.inl @@ -3,56 +3,56 @@ namespace glm { - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> clamp(vecType<T, P> const& Texcoord) + template<length_t L, typename T, qualifier Q> + GLM_FUNC_QUALIFIER vec<L, T, Q> clamp(vec<L, T, Q> const& Texcoord) { - return glm::clamp(Texcoord, vecType<T, P>(0), vecType<T, P>(1)); + return glm::clamp(Texcoord, vec<L, T, Q>(0), vec<L, T, Q>(1)); } - template <typename genType> - GLM_FUNC_QUALIFIER genType clamp(genType const & Texcoord) + template<typename genType> + GLM_FUNC_QUALIFIER genType clamp(genType const& Texcoord) { - return clamp(tvec1<genType, defaultp>(Texcoord)).x; + return clamp(vec<1, genType, defaultp>(Texcoord)).x; } - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> repeat(vecType<T, P> const& Texcoord) + template<length_t L, typename T, qualifier Q> + GLM_FUNC_QUALIFIER vec<L, T, Q> repeat(vec<L, T, Q> const& Texcoord) { return glm::fract(Texcoord); } - template <typename genType> - GLM_FUNC_QUALIFIER genType repeat(genType const & Texcoord) + template<typename genType> + GLM_FUNC_QUALIFIER genType repeat(genType const& Texcoord) { - return repeat(tvec1<genType, defaultp>(Texcoord)).x; + return repeat(vec<1, genType, defaultp>(Texcoord)).x; } - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> mirrorClamp(vecType<T, P> const& Texcoord) + template<length_t L, typename T, qualifier Q> + GLM_FUNC_QUALIFIER vec<L, T, Q> mirrorClamp(vec<L, T, Q> const& Texcoord) { return glm::fract(glm::abs(Texcoord)); } - template <typename genType> - GLM_FUNC_QUALIFIER genType mirrorClamp(genType const & Texcoord) + template<typename genType> + GLM_FUNC_QUALIFIER genType mirrorClamp(genType const& Texcoord) { - return mirrorClamp(tvec1<genType, defaultp>(Texcoord)).x; + return mirrorClamp(vec<1, genType, defaultp>(Texcoord)).x; } - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> mirrorRepeat(vecType<T, P> const& Texcoord) + template<length_t L, typename T, qualifier Q> + GLM_FUNC_QUALIFIER vec<L, T, Q> mirrorRepeat(vec<L, T, Q> const& Texcoord) { - vecType<T, P> const Abs = glm::abs(Texcoord); - vecType<T, P> const Clamp = glm::mod(glm::floor(Abs), vecType<T, P>(2)); - vecType<T, P> const Floor = glm::floor(Abs); - vecType<T, P> const Rest = Abs - Floor; - vecType<T, P> const Mirror = Clamp + Rest; - return mix(Rest, vecType<T, P>(1) - Rest, glm::greaterThanEqual(Mirror, vecType<T, P>(1))); + vec<L, T, Q> const Abs = glm::abs(Texcoord); + vec<L, T, Q> const Clamp = glm::mod(glm::floor(Abs), vec<L, T, Q>(2)); + vec<L, T, Q> const Floor = glm::floor(Abs); + vec<L, T, Q> const Rest = Abs - Floor; + vec<L, T, Q> const Mirror = Clamp + Rest; + return mix(Rest, vec<L, T, Q>(1) - Rest, glm::greaterThanEqual(Mirror, vec<L, T, Q>(1))); } - template <typename genType> + template<typename genType> GLM_FUNC_QUALIFIER genType mirrorRepeat(genType const& Texcoord) { - return mirrorRepeat(tvec1<genType, defaultp>(Texcoord)).x; + return mirrorRepeat(vec<1, genType, defaultp>(Texcoord)).x; } }//namespace glm |