From 2877f4eda3d1b0c7431039e3142ecf1a282a34b1 Mon Sep 17 00:00:00 2001 From: LaG1924 <12997935+LaG1924@users.noreply.github.com> Date: Tue, 21 Aug 2018 20:40:38 +0500 Subject: Update glm to 0.9.9.0 --- .../include/glm/detail/func_vector_relational.inl | 56 +++++++++++----------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'external/include/glm/detail/func_vector_relational.inl') diff --git a/external/include/glm/detail/func_vector_relational.inl b/external/include/glm/detail/func_vector_relational.inl index 3d8d2b7..b081a90 100644 --- a/external/include/glm/detail/func_vector_relational.inl +++ b/external/include/glm/detail/func_vector_relational.inl @@ -1,79 +1,79 @@ /// @ref core /// @file glm/detail/func_vector_relational.inl -#include +#include "compute_vector_relational.hpp" namespace glm { - template class vecType> - GLM_FUNC_QUALIFIER vecType lessThan(vecType const & x, vecType const & y) + template + GLM_FUNC_QUALIFIER vec lessThan(vec const& x, vec const& y) { assert(x.length() == y.length()); - vecType Result(uninitialize); + vec Result; for(length_t i = 0; i < x.length(); ++i) Result[i] = x[i] < y[i]; return Result; } - template class vecType> - GLM_FUNC_QUALIFIER vecType lessThanEqual(vecType const & x, vecType const & y) + template + GLM_FUNC_QUALIFIER vec lessThanEqual(vec const& x, vec const& y) { assert(x.length() == y.length()); - vecType Result(uninitialize); + vec Result; for(length_t i = 0; i < x.length(); ++i) Result[i] = x[i] <= y[i]; return Result; } - template class vecType> - GLM_FUNC_QUALIFIER vecType greaterThan(vecType const & x, vecType const & y) + template + GLM_FUNC_QUALIFIER vec greaterThan(vec const& x, vec const& y) { assert(x.length() == y.length()); - vecType Result(uninitialize); + vec Result; for(length_t i = 0; i < x.length(); ++i) Result[i] = x[i] > y[i]; return Result; } - template class vecType> - GLM_FUNC_QUALIFIER vecType greaterThanEqual(vecType const & x, vecType const & y) + template + GLM_FUNC_QUALIFIER vec greaterThanEqual(vec const& x, vec const& y) { assert(x.length() == y.length()); - vecType Result(uninitialize); + vec Result; for(length_t i = 0; i < x.length(); ++i) Result[i] = x[i] >= y[i]; return Result; } - template class vecType> - GLM_FUNC_QUALIFIER vecType equal(vecType const & x, vecType const & y) + template + GLM_FUNC_QUALIFIER vec equal(vec const& x, vec const& y) { assert(x.length() == y.length()); - vecType Result(uninitialize); + vec Result; for(length_t i = 0; i < x.length(); ++i) - Result[i] = x[i] == y[i]; + Result[i] = detail::compute_equal::call(x[i], y[i]); return Result; } - template class vecType> - GLM_FUNC_QUALIFIER vecType notEqual(vecType const & x, vecType const & y) + template + GLM_FUNC_QUALIFIER vec notEqual(vec const& x, vec const& y) { assert(x.length() == y.length()); - vecType Result(uninitialize); + vec Result; for(length_t i = 0; i < x.length(); ++i) - Result[i] = x[i] != y[i]; + Result[i] = !detail::compute_equal::call(x[i], y[i]); return Result; } - template class vecType> - GLM_FUNC_QUALIFIER bool any(vecType const & v) + template + GLM_FUNC_QUALIFIER bool any(vec const& v) { bool Result = false; for(length_t i = 0; i < v.length(); ++i) @@ -81,8 +81,8 @@ namespace glm return Result; } - template class vecType> - GLM_FUNC_QUALIFIER bool all(vecType const & v) + template + GLM_FUNC_QUALIFIER bool all(vec const& v) { bool Result = true; for(length_t i = 0; i < v.length(); ++i) @@ -90,10 +90,10 @@ namespace glm return Result; } - template class vecType> - GLM_FUNC_QUALIFIER vecType not_(vecType const & v) + template + GLM_FUNC_QUALIFIER vec not_(vec const& v) { - vecType Result(uninitialize); + vec Result; for(length_t i = 0; i < v.length(); ++i) Result[i] = !v[i]; return Result; -- cgit v1.2.3