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 --- external/include/glm/detail/type_vec1.inl | 434 +++++++++++++++--------------- 1 file changed, 215 insertions(+), 219 deletions(-) (limited to 'external/include/glm/detail/type_vec1.inl') diff --git a/external/include/glm/detail/type_vec1.inl b/external/include/glm/detail/type_vec1.inl index 72f9437..7f77f6c 100644 --- a/external/include/glm/detail/type_vec1.inl +++ b/external/include/glm/detail/type_vec1.inl @@ -5,76 +5,72 @@ namespace glm { // -- Implicit basic constructors -- -# if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tvec1::tvec1() -# ifndef GLM_FORCE_NO_CTOR_INIT +# if !GLM_HAS_DEFAULTED_FUNCTIONS || defined(GLM_FORCE_CTOR_INIT) + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR vec<1, T, Q>::vec() +# ifdef GLM_FORCE_CTOR_INIT : x(0) # endif {} -# endif//!GLM_HAS_DEFAULTED_FUNCTIONS +# endif//!GLM_HAS_DEFAULTED_FUNCTIONS || defined(GLM_FORCE_CTOR_INIT) # if !GLM_HAS_DEFAULTED_FUNCTIONS - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tvec1::tvec1(tvec1 const & v) + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR vec<1, T, Q>::vec(vec<1, T, Q> const& v) : x(v.x) {} # endif//!GLM_HAS_DEFAULTED_FUNCTIONS - template - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tvec1::tvec1(tvec1 const & v) + template + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR vec<1, T, Q>::vec(vec<1, T, P> const& v) : x(v.x) {} // -- Explicit basic constructors -- - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tvec1::tvec1(ctor) - {} - - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tvec1::tvec1(T scalar) + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR vec<1, T, Q>::vec(T scalar) : x(scalar) {} // -- Conversion vector constructors -- - template - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tvec1::tvec1(tvec1 const & v) + template + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR vec<1, T, Q>::vec(vec<1, U, P> const& v) : x(static_cast(v.x)) {} - template - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tvec1::tvec1(tvec2 const & v) + template + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR vec<1, T, Q>::vec(vec<2, U, P> const& v) : x(static_cast(v.x)) {} - template - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tvec1::tvec1(tvec3 const & v) + template + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR vec<1, T, Q>::vec(vec<3, U, P> const& v) : x(static_cast(v.x)) {} - template - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tvec1::tvec1(tvec4 const & v) + template + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR vec<1, T, Q>::vec(vec<4, U, P> const& v) : x(static_cast(v.x)) {} // -- Component accesses -- - template - GLM_FUNC_QUALIFIER T & tvec1::operator[](typename tvec1::length_type i) + template + GLM_FUNC_QUALIFIER T & vec<1, T, Q>::operator[](typename vec<1, T, Q>::length_type i) { assert(i >= 0 && i < this->length()); return (&x)[i]; } - template - GLM_FUNC_QUALIFIER T const & tvec1::operator[](typename tvec1::length_type i) const + template + GLM_FUNC_QUALIFIER T const& vec<1, T, Q>::operator[](typename vec<1, T, Q>::length_type i) const { assert(i >= 0 && i < this->length()); return (&x)[i]; @@ -83,81 +79,81 @@ namespace glm // -- Unary arithmetic operators -- # if !GLM_HAS_DEFAULTED_FUNCTIONS - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator=(tvec1 const & v) + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 vec<1, T, Q> & vec<1, T, Q>::operator=(vec<1, T, Q> const& v) { this->x = v.x; return *this; } # endif//!GLM_HAS_DEFAULTED_FUNCTIONS - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator=(tvec1 const & v) + template + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 vec<1, T, Q> & vec<1, T, Q>::operator=(vec<1, U, Q> const& v) { this->x = static_cast(v.x); return *this; } - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator+=(U scalar) + template + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator+=(U scalar) { this->x += static_cast(scalar); return *this; } - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator+=(tvec1 const & v) + template + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator+=(vec<1, U, Q> const& v) { this->x += static_cast(v.x); return *this; } - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator-=(U scalar) + template + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator-=(U scalar) { this->x -= static_cast(scalar); return *this; } - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator-=(tvec1 const & v) + template + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator-=(vec<1, U, Q> const& v) { this->x -= static_cast(v.x); return *this; } - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator*=(U scalar) + template + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator*=(U scalar) { this->x *= static_cast(scalar); return *this; } - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator*=(tvec1 const & v) + template + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator*=(vec<1, U, Q> const& v) { this->x *= static_cast(v.x); return *this; } - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator/=(U scalar) + template + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator/=(U scalar) { this->x /= static_cast(scalar); return *this; } - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator/=(tvec1 const & v) + template + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator/=(vec<1, U, Q> const& v) { this->x /= static_cast(v.x); return *this; @@ -165,129 +161,129 @@ namespace glm // -- Increment and decrement operators -- - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator++() + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator++() { ++this->x; return *this; } - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator--() + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator--() { --this->x; return *this; } - template - GLM_FUNC_QUALIFIER tvec1 tvec1::operator++(int) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> vec<1, T, Q>::operator++(int) { - tvec1 Result(*this); + vec<1, T, Q> Result(*this); ++*this; return Result; } - template - GLM_FUNC_QUALIFIER tvec1 tvec1::operator--(int) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> vec<1, T, Q>::operator--(int) { - tvec1 Result(*this); + vec<1, T, Q> Result(*this); --*this; return Result; } // -- Unary bit operators -- - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator%=(U scalar) + template + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator%=(U scalar) { this->x %= static_cast(scalar); return *this; } - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator%=(tvec1 const & v) + template + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator%=(vec<1, U, Q> const& v) { this->x %= static_cast(v.x); return *this; } - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator&=(U scalar) + template + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator&=(U scalar) { this->x &= static_cast(scalar); return *this; } - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator&=(tvec1 const & v) + template + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator&=(vec<1, U, Q> const& v) { this->x &= static_cast(v.x); return *this; } - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator|=(U scalar) + template + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator|=(U scalar) { this->x |= static_cast(scalar); return *this; } - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator|=(tvec1 const & v) + template + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator|=(vec<1, U, Q> const& v) { this->x |= U(v.x); return *this; } - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator^=(U scalar) + template + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator^=(U scalar) { this->x ^= static_cast(scalar); return *this; } - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator^=(tvec1 const & v) + template + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator^=(vec<1, U, Q> const& v) { this->x ^= static_cast(v.x); return *this; } - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator<<=(U scalar) + template + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator<<=(U scalar) { this->x <<= static_cast(scalar); return *this; } - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator<<=(tvec1 const & v) + template + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator<<=(vec<1, U, Q> const& v) { this->x <<= static_cast(v.x); return *this; } - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator>>=(U scalar) + template + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator>>=(U scalar) { this->x >>= static_cast(scalar); return *this; } - template - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator>>=(tvec1 const & v) + template + template + GLM_FUNC_QUALIFIER vec<1, T, Q> & vec<1, T, Q>::operator>>=(vec<1, U, Q> const& v) { this->x >>= static_cast(v.x); return *this; @@ -295,264 +291,264 @@ namespace glm // -- Unary constant operators -- - template - GLM_FUNC_QUALIFIER tvec1 operator+(tvec1 const & v) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator+(vec<1, T, Q> const& v) { return v; } - template - GLM_FUNC_QUALIFIER tvec1 operator-(tvec1 const & v) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator-(vec<1, T, Q> const& v) { - return tvec1( + return vec<1, T, Q>( -v.x); } // -- Binary arithmetic operators -- - template - GLM_FUNC_QUALIFIER tvec1 operator+(tvec1 const & v, T scalar) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator+(vec<1, T, Q> const& v, T scalar) { - return tvec1( + return vec<1, T, Q>( v.x + scalar); } - template - GLM_FUNC_QUALIFIER tvec1 operator+(T scalar, tvec1 const & v) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator+(T scalar, vec<1, T, Q> const& v) { - return tvec1( + return vec<1, T, Q>( scalar + v.x); } - template - GLM_FUNC_QUALIFIER tvec1 operator+(tvec1 const & v1, tvec1 const & v2) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator+(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { - return tvec1( + return vec<1, T, Q>( v1.x + v2.x); } //operator- - template - GLM_FUNC_QUALIFIER tvec1 operator-(tvec1 const & v, T scalar) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator-(vec<1, T, Q> const& v, T scalar) { - return tvec1( + return vec<1, T, Q>( v.x - scalar); } - template - GLM_FUNC_QUALIFIER tvec1 operator-(T scalar, tvec1 const & v) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator-(T scalar, vec<1, T, Q> const& v) { - return tvec1( + return vec<1, T, Q>( scalar - v.x); } - template - GLM_FUNC_QUALIFIER tvec1 operator-(tvec1 const & v1, tvec1 const & v2) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator-(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { - return tvec1( + return vec<1, T, Q>( v1.x - v2.x); } - template - GLM_FUNC_QUALIFIER tvec1 operator*(tvec1 const & v, T scalar) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator*(vec<1, T, Q> const& v, T scalar) { - return tvec1( + return vec<1, T, Q>( v.x * scalar); } - template - GLM_FUNC_QUALIFIER tvec1 operator*(T scalar, tvec1 const & v) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator*(T scalar, vec<1, T, Q> const& v) { - return tvec1( + return vec<1, T, Q>( scalar * v.x); } - template - GLM_FUNC_QUALIFIER tvec1 operator*(tvec1 const & v1, tvec1 const & v2) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator*(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { - return tvec1( + return vec<1, T, Q>( v1.x * v2.x); } - template - GLM_FUNC_QUALIFIER tvec1 operator/(tvec1 const & v, T scalar) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator/(vec<1, T, Q> const& v, T scalar) { - return tvec1( + return vec<1, T, Q>( v.x / scalar); } - template - GLM_FUNC_QUALIFIER tvec1 operator/(T scalar, tvec1 const & v) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator/(T scalar, vec<1, T, Q> const& v) { - return tvec1( + return vec<1, T, Q>( scalar / v.x); } - template - GLM_FUNC_QUALIFIER tvec1 operator/(tvec1 const & v1, tvec1 const & v2) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator/(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { - return tvec1( + return vec<1, T, Q>( v1.x / v2.x); } // -- Binary bit operators -- - template - GLM_FUNC_QUALIFIER tvec1 operator%(tvec1 const & v, T scalar) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator%(vec<1, T, Q> const& v, T scalar) { - return tvec1( + return vec<1, T, Q>( v.x % scalar); } - template - GLM_FUNC_QUALIFIER tvec1 operator%(T scalar, tvec1 const & v) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator%(T scalar, vec<1, T, Q> const& v) { - return tvec1( + return vec<1, T, Q>( scalar % v.x); } - template - GLM_FUNC_QUALIFIER tvec1 operator%(tvec1 const & v1, tvec1 const & v2) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator%(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { - return tvec1( + return vec<1, T, Q>( v1.x % v2.x); } - template - GLM_FUNC_QUALIFIER tvec1 operator&(tvec1 const & v, T scalar) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator&(vec<1, T, Q> const& v, T scalar) { - return tvec1( + return vec<1, T, Q>( v.x & scalar); } - template - GLM_FUNC_QUALIFIER tvec1 operator&(T scalar, tvec1 const & v) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator&(T scalar, vec<1, T, Q> const& v) { - return tvec1( + return vec<1, T, Q>( scalar & v.x); } - template - GLM_FUNC_QUALIFIER tvec1 operator&(tvec1 const & v1, tvec1 const & v2) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator&(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { - return tvec1( + return vec<1, T, Q>( v1.x & v2.x); } - template - GLM_FUNC_QUALIFIER tvec1 operator|(tvec1 const & v, T scalar) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator|(vec<1, T, Q> const& v, T scalar) { - return tvec1( + return vec<1, T, Q>( v.x | scalar); } - template - GLM_FUNC_QUALIFIER tvec1 operator|(T scalar, tvec1 const & v) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator|(T scalar, vec<1, T, Q> const& v) { - return tvec1( + return vec<1, T, Q>( scalar | v.x); } - template - GLM_FUNC_QUALIFIER tvec1 operator|(tvec1 const & v1, tvec1 const & v2) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator|(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { - return tvec1( + return vec<1, T, Q>( v1.x | v2.x); } - - template - GLM_FUNC_QUALIFIER tvec1 operator^(tvec1 const & v, T scalar) + + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator^(vec<1, T, Q> const& v, T scalar) { - return tvec1( + return vec<1, T, Q>( v.x ^ scalar); } - template - GLM_FUNC_QUALIFIER tvec1 operator^(T scalar, tvec1 const & v) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator^(T scalar, vec<1, T, Q> const& v) { - return tvec1( + return vec<1, T, Q>( scalar ^ v.x); } - template - GLM_FUNC_QUALIFIER tvec1 operator^(tvec1 const & v1, tvec1 const & v2) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator^(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { - return tvec1( + return vec<1, T, Q>( v1.x ^ v2.x); } - template - GLM_FUNC_QUALIFIER tvec1 operator<<(tvec1 const & v, T scalar) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator<<(vec<1, T, Q> const& v, T scalar) { - return tvec1( - v.x << scalar); + return vec<1, T, Q>( + static_cast(v.x << scalar)); } - template - GLM_FUNC_QUALIFIER tvec1 operator<<(T scalar, tvec1 const & v) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator<<(T scalar, vec<1, T, Q> const& v) { - return tvec1( + return vec<1, T, Q>( scalar << v.x); } - template - GLM_FUNC_QUALIFIER tvec1 operator<<(tvec1 const & v1, tvec1 const & v2) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator<<(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { - return tvec1( + return vec<1, T, Q>( v1.x << v2.x); } - template - GLM_FUNC_QUALIFIER tvec1 operator>>(tvec1 const & v, T scalar) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator>>(vec<1, T, Q> const& v, T scalar) { - return tvec1( + return vec<1, T, Q>( v.x >> scalar); } - template - GLM_FUNC_QUALIFIER tvec1 operator>>(T scalar, tvec1 const & v) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator>>(T scalar, vec<1, T, Q> const& v) { - return tvec1( + return vec<1, T, Q>( scalar >> v.x); } - template - GLM_FUNC_QUALIFIER tvec1 operator>>(tvec1 const & v1, tvec1 const & v2) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator>>(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { - return tvec1( + return vec<1, T, Q>( v1.x >> v2.x); } - template - GLM_FUNC_QUALIFIER tvec1 operator~(tvec1 const & v) + template + GLM_FUNC_QUALIFIER vec<1, T, Q> operator~(vec<1, T, Q> const& v) { - return tvec1( + return vec<1, T, Q>( ~v.x); } // -- Boolean operators -- - template - GLM_FUNC_QUALIFIER bool operator==(tvec1 const & v1, tvec1 const & v2) + template + GLM_FUNC_QUALIFIER bool operator==(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { - return (v1.x == v2.x); + return detail::compute_equal::call(v1.x, v2.x); } - template - GLM_FUNC_QUALIFIER bool operator!=(tvec1 const & v1, tvec1 const & v2) + template + GLM_FUNC_QUALIFIER bool operator!=(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { - return (v1.x != v2.x); + return !(v1 == v2); } - template - GLM_FUNC_QUALIFIER tvec1 operator&&(tvec1 const & v1, tvec1 const & v2) + template + GLM_FUNC_QUALIFIER vec<1, bool, Q> operator&&(vec<1, bool, Q> const& v1, vec<1, bool, Q> const& v2) { - return tvec1(v1.x && v2.x); + return vec<1, bool, Q>(v1.x && v2.x); } - template - GLM_FUNC_QUALIFIER tvec1 operator||(tvec1 const & v1, tvec1 const & v2) + template + GLM_FUNC_QUALIFIER vec<1, bool, Q> operator||(vec<1, bool, Q> const& v1, vec<1, bool, Q> const& v2) { - return tvec1(v1.x || v2.x); + return vec<1, bool, Q>(v1.x || v2.x); } }//namespace glm -- cgit v1.2.3