From 4dd748f38051c3cb9abbde5abcc3ee5f6f320ffe Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Fri, 30 Dec 2016 00:03:34 +0100 Subject: [PATCH] Renamed tvec into vec --- glm/detail/_swizzle.hpp | 30 +- glm/detail/func_common.inl | 2 +- glm/detail/func_common_simd.inl | 36 +-- glm/detail/func_exponential.inl | 18 +- glm/detail/func_geometric.hpp | 4 +- glm/detail/func_geometric.inl | 24 +- glm/detail/func_geometric_simd.inl | 18 +- glm/detail/func_integer_simd.inl | 4 +- glm/detail/func_matrix.hpp | 18 +- glm/detail/func_matrix_simd.inl | 6 +- glm/detail/glm.cpp | 240 ++++++++-------- glm/detail/type_mat.hpp | 2 +- glm/detail/type_vec.hpp | 10 +- glm/detail/type_vec1.hpp | 150 +++++----- glm/detail/type_vec1.inl | 220 +++++++------- glm/detail/type_vec2.hpp | 218 +++++++------- glm/detail/type_vec2.inl | 324 ++++++++++----------- glm/detail/type_vec3.hpp | 230 +++++++-------- glm/detail/type_vec3.inl | 330 ++++++++++----------- glm/detail/type_vec4.hpp | 258 ++++++++--------- glm/detail/type_vec4.inl | 448 ++++++++++++++--------------- glm/detail/type_vec4_simd.inl | 48 ++-- glm/gtc/color_space.inl | 8 +- glm/gtc/integer.inl | 2 +- glm/gtc/packing.inl | 48 ++-- glm/gtc/quaternion.inl | 2 +- glm/gtc/random.inl | 10 +- glm/gtc/round.inl | 2 +- glm/gtx/type_trait.hpp | 2 +- glm/gtx/vector_query.inl | 12 +- test/core/core_func_integer.cpp | 6 +- 31 files changed, 1365 insertions(+), 1365 deletions(-) diff --git a/glm/detail/_swizzle.hpp b/glm/detail/_swizzle.hpp index 8b55e6db..d74e4907 100644 --- a/glm/detail/_swizzle.hpp +++ b/glm/detail/_swizzle.hpp @@ -28,19 +28,19 @@ namespace detail template struct _swizzle_base1<2, T, P, E0,E1,-1,-2, Aligned> : public _swizzle_base0 { - GLM_FUNC_QUALIFIER tvec<2, T, P> operator ()() const { return tvec<2, T, P>(this->elem(E0), this->elem(E1)); } + GLM_FUNC_QUALIFIER vec<2, T, P> operator ()() const { return vec<2, T, P>(this->elem(E0), this->elem(E1)); } }; template struct _swizzle_base1<3, T, P, E0,E1,E2,-1, Aligned> : public _swizzle_base0 { - GLM_FUNC_QUALIFIER tvec<3, T, P> operator ()() const { return tvec<3, T, P>(this->elem(E0), this->elem(E1), this->elem(E2)); } + GLM_FUNC_QUALIFIER vec<3, T, P> operator ()() const { return vec<3, T, P>(this->elem(E0), this->elem(E1), this->elem(E2)); } }; template struct _swizzle_base1<4, T, P, E0,E1,E2,E3, Aligned> : public _swizzle_base0 { - GLM_FUNC_QUALIFIER tvec<4, T, P> operator ()() const { return tvec<4, T, P>(this->elem(E0), this->elem(E1), this->elem(E2), this->elem(E3)); } + GLM_FUNC_QUALIFIER vec<4, T, P> operator ()() const { return vec<4, T, P>(this->elem(E0), this->elem(E1), this->elem(E2), this->elem(E3)); } }; // Internal class for implementing swizzle operators @@ -65,7 +65,7 @@ namespace detail return *this; } - GLM_FUNC_QUALIFIER _swizzle_base2& operator= (tvec const& that) + GLM_FUNC_QUALIFIER _swizzle_base2& operator= (vec const& that) { struct op { GLM_FUNC_QUALIFIER void operator() (T& e, T& t) { e = t; } @@ -74,7 +74,7 @@ namespace detail return *this; } - GLM_FUNC_QUALIFIER void operator -= (tvec const& that) + GLM_FUNC_QUALIFIER void operator -= (vec const& that) { struct op { GLM_FUNC_QUALIFIER void operator() (T& e, T& t) { e -= t; } @@ -82,7 +82,7 @@ namespace detail _apply_op(that, op()); } - GLM_FUNC_QUALIFIER void operator += (tvec const& that) + GLM_FUNC_QUALIFIER void operator += (vec const& that) { struct op { GLM_FUNC_QUALIFIER void operator() (T& e, T& t) { e += t; } @@ -90,7 +90,7 @@ namespace detail _apply_op(that, op()); } - GLM_FUNC_QUALIFIER void operator *= (tvec const& that) + GLM_FUNC_QUALIFIER void operator *= (vec const& that) { struct op { GLM_FUNC_QUALIFIER void operator() (T& e, T& t) { e *= t; } @@ -98,7 +98,7 @@ namespace detail _apply_op(that, op()); } - GLM_FUNC_QUALIFIER void operator /= (tvec const& that) + GLM_FUNC_QUALIFIER void operator /= (vec const& that) { struct op { GLM_FUNC_QUALIFIER void operator() (T& e, T& t) { e /= t; } @@ -119,7 +119,7 @@ namespace detail protected: template - GLM_FUNC_QUALIFIER void _apply_op(tvec const& that, U op) + GLM_FUNC_QUALIFIER void _apply_op(vec const& that, U op) { // Make a copy of the data in this == &that. // The copier should optimize out the copy in cases where the function is @@ -154,7 +154,7 @@ namespace detail using base_type::operator=; - GLM_FUNC_QUALIFIER operator tvec () const { return (*this)(); } + GLM_FUNC_QUALIFIER operator vec () const { return (*this)(); } }; // @@ -170,17 +170,17 @@ namespace detail // #define _GLM_SWIZZLE_VECTOR_BINARY_OPERATOR_IMPLEMENTATION(OPERAND) \ _GLM_SWIZZLE_TEMPLATE2 \ - GLM_FUNC_QUALIFIER tvec operator OPERAND ( const _GLM_SWIZZLE_TYPE1& a, const _GLM_SWIZZLE_TYPE2& b) \ + GLM_FUNC_QUALIFIER vec operator OPERAND ( const _GLM_SWIZZLE_TYPE1& a, const _GLM_SWIZZLE_TYPE2& b) \ { \ return a() OPERAND b(); \ } \ _GLM_SWIZZLE_TEMPLATE1 \ - GLM_FUNC_QUALIFIER tvec operator OPERAND ( const _GLM_SWIZZLE_TYPE1& a, const tvec& b) \ + GLM_FUNC_QUALIFIER vec operator OPERAND ( const _GLM_SWIZZLE_TYPE1& a, const vec& b) \ { \ return a() OPERAND b; \ } \ _GLM_SWIZZLE_TEMPLATE1 \ - GLM_FUNC_QUALIFIER tvec operator OPERAND ( const tvec& a, const _GLM_SWIZZLE_TYPE1& b) \ + GLM_FUNC_QUALIFIER vec operator OPERAND ( const vec& a, const _GLM_SWIZZLE_TYPE1& b) \ { \ return a OPERAND b(); \ } @@ -190,12 +190,12 @@ namespace detail // #define _GLM_SWIZZLE_SCALAR_BINARY_OPERATOR_IMPLEMENTATION(OPERAND) \ _GLM_SWIZZLE_TEMPLATE1 \ - GLM_FUNC_QUALIFIER tvec operator OPERAND ( const _GLM_SWIZZLE_TYPE1& a, const T& b) \ + GLM_FUNC_QUALIFIER vec operator OPERAND ( const _GLM_SWIZZLE_TYPE1& a, const T& b) \ { \ return a() OPERAND b; \ } \ _GLM_SWIZZLE_TEMPLATE1 \ - GLM_FUNC_QUALIFIER tvec operator OPERAND ( const T& a, const _GLM_SWIZZLE_TYPE1& b) \ + GLM_FUNC_QUALIFIER vec operator OPERAND ( const T& a, const _GLM_SWIZZLE_TYPE1& b) \ { \ return a OPERAND b(); \ } diff --git a/glm/detail/func_common.inl b/glm/detail/func_common.inl index ef636682..20af73c5 100644 --- a/glm/detail/func_common.inl +++ b/glm/detail/func_common.inl @@ -326,7 +326,7 @@ namespace detail std::numeric_limits::is_iec559 || (std::numeric_limits::is_signed && std::numeric_limits::is_integer), "'sign' only accept signed inputs"); - return detail::compute_sign<1, genFIType, defaultp, tvec, std::numeric_limits::is_iec559, highp>::call(tvec1(x)).x; + return detail::compute_sign<1, genFIType, defaultp, vec, std::numeric_limits::is_iec559, highp>::call(tvec1(x)).x; } template class vecType> diff --git a/glm/detail/func_common_simd.inl b/glm/detail/func_common_simd.inl index 2d127a1b..fc04e78b 100644 --- a/glm/detail/func_common_simd.inl +++ b/glm/detail/func_common_simd.inl @@ -11,7 +11,7 @@ namespace glm{ namespace detail { template - struct compute_abs_vector<4, float, P, tvec, true> + struct compute_abs_vector<4, float, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v) { @@ -22,7 +22,7 @@ namespace detail }; template - struct compute_abs_vector<4, int, P, tvec, true> + struct compute_abs_vector<4, int, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v) { @@ -33,7 +33,7 @@ namespace detail }; template - struct compute_floor<4, float, P, tvec, true> + struct compute_floor<4, float, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v) { @@ -44,7 +44,7 @@ namespace detail }; template - struct compute_ceil<4, float, P, tvec, true> + struct compute_ceil<4, float, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v) { @@ -55,7 +55,7 @@ namespace detail }; template - struct compute_fract<4, float, P, tvec, true> + struct compute_fract<4, float, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v) { @@ -66,7 +66,7 @@ namespace detail }; template - struct compute_round<4, float, P, tvec, true> + struct compute_round<4, float, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v) { @@ -77,7 +77,7 @@ namespace detail }; template - struct compute_mod<4, float, P, tvec, true> + struct compute_mod<4, float, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & x, tvec4 const & y) { @@ -88,7 +88,7 @@ namespace detail }; template - struct compute_min_vector<4, float, P, tvec, true> + struct compute_min_vector<4, float, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v1, tvec4 const & v2) { @@ -99,7 +99,7 @@ namespace detail }; template - struct compute_min_vector<4, int32, P, tvec, true> + struct compute_min_vector<4, int32, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v1, tvec4 const & v2) { @@ -110,7 +110,7 @@ namespace detail }; template - struct compute_min_vector<4, uint32, P, tvec, true> + struct compute_min_vector<4, uint32, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v1, tvec4 const & v2) { @@ -121,7 +121,7 @@ namespace detail }; template - struct compute_max_vector<4, float, P, tvec, true> + struct compute_max_vector<4, float, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v1, tvec4 const & v2) { @@ -132,7 +132,7 @@ namespace detail }; template - struct compute_max_vector<4, int32, P, tvec, true> + struct compute_max_vector<4, int32, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v1, tvec4 const & v2) { @@ -143,7 +143,7 @@ namespace detail }; template - struct compute_max_vector<4, uint32, P, tvec, true> + struct compute_max_vector<4, uint32, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v1, tvec4 const & v2) { @@ -154,7 +154,7 @@ namespace detail }; template - struct compute_clamp_vector<4, float, P, tvec, true> + struct compute_clamp_vector<4, float, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & x, tvec4 const & minVal, tvec4 const & maxVal) { @@ -165,7 +165,7 @@ namespace detail }; template - struct compute_clamp_vector<4, int32, P, tvec, true> + struct compute_clamp_vector<4, int32, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & x, tvec4 const & minVal, tvec4 const & maxVal) { @@ -176,7 +176,7 @@ namespace detail }; template - struct compute_clamp_vector<4, uint32, P, tvec, true> + struct compute_clamp_vector<4, uint32, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & x, tvec4 const & minVal, tvec4 const & maxVal) { @@ -187,7 +187,7 @@ namespace detail }; template - struct compute_mix_vector<4, float, bool, P, tvec, true> + struct compute_mix_vector<4, float, bool, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & x, tvec4 const & y, tvec4 const & a) { @@ -216,7 +216,7 @@ namespace detail }; */ template - struct compute_smoothstep_vector<4, float, P, tvec, true> + struct compute_smoothstep_vector<4, float, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const& edge0, tvec4 const& edge1, tvec4 const& x) { diff --git a/glm/detail/func_exponential.inl b/glm/detail/func_exponential.inl index 6b070993..a127ee46 100644 --- a/glm/detail/func_exponential.inl +++ b/glm/detail/func_exponential.inl @@ -23,7 +23,7 @@ namespace detail template class vecType, bool isFloat, bool Aligned> struct compute_log2 { - GLM_FUNC_QUALIFIER static tvec call(tvec const & vec) + GLM_FUNC_QUALIFIER static vec call(vec const & vec) { return detail::functor1::call(log2, vec); } @@ -32,7 +32,7 @@ namespace detail template struct compute_sqrt { - GLM_FUNC_QUALIFIER static tvec call(tvec const & x) + GLM_FUNC_QUALIFIER static vec call(vec const & x) { return detail::functor1::call(std::sqrt, x); } @@ -41,7 +41,7 @@ namespace detail template struct compute_inversesqrt { - GLM_FUNC_QUALIFIER static tvec call(tvec const & x) + GLM_FUNC_QUALIFIER static vec call(vec const & x) { return static_cast(1) / sqrt(x); } @@ -50,13 +50,13 @@ namespace detail template struct compute_inversesqrt { - GLM_FUNC_QUALIFIER static tvec call(tvec const & x) + GLM_FUNC_QUALIFIER static vec call(vec const & x) { - tvec tmp(x); - tvec xhalf(tmp * 0.5f); - tvec* p = reinterpret_cast*>(const_cast*>(&x)); - tvec i = tvec(0x5f375a86) - (*p >> tvec(1)); - tvec* ptmp = reinterpret_cast*>(&i); + vec tmp(x); + vec xhalf(tmp * 0.5f); + vec* p = reinterpret_cast*>(const_cast*>(&x)); + vec i = vec(0x5f375a86) - (*p >> vec(1)); + vec* ptmp = reinterpret_cast*>(&i); tmp = *ptmp; tmp = tmp * (1.5f - xhalf * tmp * tmp); return tmp; diff --git a/glm/detail/func_geometric.hpp b/glm/detail/func_geometric.hpp index d3279d1f..8d37cd6b 100644 --- a/glm/detail/func_geometric.hpp +++ b/glm/detail/func_geometric.hpp @@ -46,8 +46,8 @@ namespace glm /// @see GLSL 4.20.8 specification, section 8.5 Geometric Functions template GLM_FUNC_DECL T dot( - tvec const & x, - tvec const & y); + vec const & x, + vec const & y); /// Returns the cross product of x and y. /// diff --git a/glm/detail/func_geometric.inl b/glm/detail/func_geometric.inl index 78eed3cb..836c6b9d 100644 --- a/glm/detail/func_geometric.inl +++ b/glm/detail/func_geometric.inl @@ -32,28 +32,28 @@ namespace detail struct compute_dot{}; template - struct compute_dot, T, Aligned> + struct compute_dot, T, Aligned> { - GLM_FUNC_QUALIFIER static T call(tvec<1, T, P> const & a, tvec<1, T, P> const & b) + GLM_FUNC_QUALIFIER static T call(vec<1, T, P> const & a, vec<1, T, P> const & b) { return a.x * b.x; } }; template - struct compute_dot, T, Aligned> + struct compute_dot, T, Aligned> { - GLM_FUNC_QUALIFIER static T call(tvec<2, T, P> const & a, tvec<2, T, P> const & b) + GLM_FUNC_QUALIFIER static T call(vec<2, T, P> const & a, vec<2, T, P> const & b) { - tvec<2, T, P> tmp(a * b); + vec<2, T, P> tmp(a * b); return tmp.x + tmp.y; } }; template - struct compute_dot, T, Aligned> + struct compute_dot, T, Aligned> { - GLM_FUNC_QUALIFIER static T call(tvec<3, T, P> const & a, tvec<3, T, P> const & b) + GLM_FUNC_QUALIFIER static T call(vec<3, T, P> const & a, vec<3, T, P> const & b) { tvec3 tmp(a * b); return tmp.x + tmp.y + tmp.z; @@ -61,11 +61,11 @@ namespace detail }; template - struct compute_dot, T, Aligned> + struct compute_dot, T, Aligned> { - GLM_FUNC_QUALIFIER static T call(tvec<4, T, P> const & a, tvec<4, T, P> const & b) + GLM_FUNC_QUALIFIER static T call(vec<4, T, P> const & a, vec<4, T, P> const & b) { - tvec<4, T, P> tmp(a * b); + vec<4, T, P> tmp(a * b); return (tmp.x + tmp.y) + (tmp.z + tmp.w); } }; @@ -168,10 +168,10 @@ namespace detail } template - GLM_FUNC_QUALIFIER T dot(tvec const & x, tvec const & y) + GLM_FUNC_QUALIFIER T dot(vec const & x, vec const & y) { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'dot' accepts only floating-point inputs"); - return detail::compute_dot, T, detail::is_aligned

::value>::call(x, y); + return detail::compute_dot, T, detail::is_aligned

::value>::call(x, y); } template diff --git a/glm/detail/func_geometric_simd.inl b/glm/detail/func_geometric_simd.inl index 97a2daba..1bc2a01e 100644 --- a/glm/detail/func_geometric_simd.inl +++ b/glm/detail/func_geometric_simd.inl @@ -9,16 +9,16 @@ namespace glm{ namespace detail { template - struct compute_length + struct compute_length { - GLM_FUNC_QUALIFIER static float call(tvec<4, float, P> const & v) + GLM_FUNC_QUALIFIER static float call(vec<4, float, P> const & v) { return _mm_cvtss_f32(glm_vec4_length(v.data)); } }; template - struct compute_distance + struct compute_distance { GLM_FUNC_QUALIFIER static float call(tvec4 const & p0, tvec4 const & p1) { @@ -27,9 +27,9 @@ namespace detail }; template - struct compute_dot, float, true> + struct compute_dot, float, true> { - GLM_FUNC_QUALIFIER static float call(tvec<4, float, P> const& x, tvec<4, float, P> const& y) + GLM_FUNC_QUALIFIER static float call(vec<4, float, P> const& x, vec<4, float, P> const& y) { return _mm_cvtss_f32(glm_vec1_dot(x.data, y.data)); } @@ -51,7 +51,7 @@ namespace detail }; template - struct compute_normalize<4, float, P, tvec, true> + struct compute_normalize<4, float, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v) { @@ -62,7 +62,7 @@ namespace detail }; template - struct compute_faceforward<4, float, P, tvec, true> + struct compute_faceforward<4, float, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const& N, tvec4 const& I, tvec4 const& Nref) { @@ -73,7 +73,7 @@ namespace detail }; template - struct compute_reflect<4, float, P, tvec, true> + struct compute_reflect<4, float, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const& I, tvec4 const& N) { @@ -84,7 +84,7 @@ namespace detail }; template - struct compute_refract<4, float, P, tvec, true> + struct compute_refract<4, float, P, vec, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const& I, tvec4 const& N, float eta) { diff --git a/glm/detail/func_integer_simd.inl b/glm/detail/func_integer_simd.inl index 644fd4e0..b812995b 100644 --- a/glm/detail/func_integer_simd.inl +++ b/glm/detail/func_integer_simd.inl @@ -9,7 +9,7 @@ namespace glm{ namespace detail { template - struct compute_bitfieldReverseStep<4, uint32, P, tvec, true, true> + struct compute_bitfieldReverseStep<4, uint32, P, vec, true, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v, uint32 Mask, uint32 Shift) { @@ -30,7 +30,7 @@ namespace detail }; template - struct compute_bitfieldBitCountStep<4, uint32, P, tvec, true, true> + struct compute_bitfieldBitCountStep<4, uint32, P, vec, true, true> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v, uint32 Mask, uint32 Shift) { diff --git a/glm/detail/func_matrix.hpp b/glm/detail/func_matrix.hpp index fa41f5ce..10a339b6 100644 --- a/glm/detail/func_matrix.hpp +++ b/glm/detail/func_matrix.hpp @@ -35,55 +35,55 @@ namespace glm{ namespace detail { template - struct outerProduct_trait<2, 2, T, P, tvec, tvec> + struct outerProduct_trait<2, 2, T, P, vec, vec> { typedef tmat2x2 type; }; template - struct outerProduct_trait<2, 3, T, P, tvec, tvec> + struct outerProduct_trait<2, 3, T, P, vec, vec> { typedef tmat3x2 type; }; template - struct outerProduct_trait<2, 4, T, P, tvec, tvec> + struct outerProduct_trait<2, 4, T, P, vec, vec> { typedef tmat4x2 type; }; template - struct outerProduct_trait<3, 2, T, P, tvec, tvec> + struct outerProduct_trait<3, 2, T, P, vec, vec> { typedef tmat2x3 type; }; template - struct outerProduct_trait<3, 3, T, P, tvec, tvec> + struct outerProduct_trait<3, 3, T, P, vec, vec> { typedef tmat3x3 type; }; template - struct outerProduct_trait<3, 4, T, P, tvec, tvec> + struct outerProduct_trait<3, 4, T, P, vec, vec> { typedef tmat4x3 type; }; template - struct outerProduct_trait<4, 2, T, P, tvec, tvec> + struct outerProduct_trait<4, 2, T, P, vec, vec> { typedef tmat2x4 type; }; template - struct outerProduct_trait<4, 3, T, P, tvec, tvec> + struct outerProduct_trait<4, 3, T, P, vec, vec> { typedef tmat3x4 type; }; template - struct outerProduct_trait<4, 4, T, P, tvec, tvec> + struct outerProduct_trait<4, 4, T, P, vec, vec> { typedef tmat4x4 type; }; diff --git a/glm/detail/func_matrix_simd.inl b/glm/detail/func_matrix_simd.inl index d684ba12..028f28c1 100644 --- a/glm/detail/func_matrix_simd.inl +++ b/glm/detail/func_matrix_simd.inl @@ -61,7 +61,7 @@ namespace detail }//namespace detail template<> - GLM_FUNC_QUALIFIER tmat4x4 outerProduct<4, 4, float, aligned_lowp, tvec, tvec>(tvec4 const & c, tvec4 const & r) + GLM_FUNC_QUALIFIER tmat4x4 outerProduct<4, 4, float, aligned_lowp, vec, vec>(tvec4 const & c, tvec4 const & r) { tmat4x4 m(uninitialize); glm_mat4_outerProduct(c.data, r.data, *reinterpret_cast<__m128(*)[4]>(&m[0].data)); @@ -69,7 +69,7 @@ namespace detail } template<> - GLM_FUNC_QUALIFIER tmat4x4 outerProduct<4, 4, float, aligned_mediump, tvec, tvec>(tvec4 const & c, tvec4 const & r) + GLM_FUNC_QUALIFIER tmat4x4 outerProduct<4, 4, float, aligned_mediump, vec, vec>(tvec4 const & c, tvec4 const & r) { tmat4x4 m(uninitialize); glm_mat4_outerProduct(c.data, r.data, *reinterpret_cast<__m128(*)[4]>(&m[0].data)); @@ -77,7 +77,7 @@ namespace detail } template<> - GLM_FUNC_QUALIFIER tmat4x4 outerProduct<4, 4, float, aligned_highp, tvec, tvec>(tvec4 const & c, tvec4 const & r) + GLM_FUNC_QUALIFIER tmat4x4 outerProduct<4, 4, float, aligned_highp, vec, vec>(tvec4 const & c, tvec4 const & r) { tmat4x4 m(uninitialize); glm_mat4_outerProduct(c.data, r.data, *reinterpret_cast<__m128(*)[4]>(&m[0].data)); diff --git a/glm/detail/glm.cpp b/glm/detail/glm.cpp index 25d7dc1d..c8bbef90 100644 --- a/glm/detail/glm.cpp +++ b/glm/detail/glm.cpp @@ -9,140 +9,140 @@ namespace glm { // tvec1 type explicit instantiation -template struct tvec<1, uint8, lowp>; -template struct tvec<1, uint16, lowp>; -template struct tvec<1, uint32, lowp>; -template struct tvec<1, uint64, lowp>; -template struct tvec<1, int8, lowp>; -template struct tvec<1, int16, lowp>; -template struct tvec<1, int32, lowp>; -template struct tvec<1, int64, lowp>; -template struct tvec<1, float32, lowp>; -template struct tvec<1, float64, lowp>; +template struct vec<1, uint8, lowp>; +template struct vec<1, uint16, lowp>; +template struct vec<1, uint32, lowp>; +template struct vec<1, uint64, lowp>; +template struct vec<1, int8, lowp>; +template struct vec<1, int16, lowp>; +template struct vec<1, int32, lowp>; +template struct vec<1, int64, lowp>; +template struct vec<1, float32, lowp>; +template struct vec<1, float64, lowp>; -template struct tvec<1, uint8, mediump>; -template struct tvec<1, uint16, mediump>; -template struct tvec<1, uint32, mediump>; -template struct tvec<1, uint64, mediump>; -template struct tvec<1, int8, mediump>; -template struct tvec<1, int16, mediump>; -template struct tvec<1, int32, mediump>; -template struct tvec<1, int64, mediump>; -template struct tvec<1, float32, mediump>; -template struct tvec<1, float64, mediump>; +template struct vec<1, uint8, mediump>; +template struct vec<1, uint16, mediump>; +template struct vec<1, uint32, mediump>; +template struct vec<1, uint64, mediump>; +template struct vec<1, int8, mediump>; +template struct vec<1, int16, mediump>; +template struct vec<1, int32, mediump>; +template struct vec<1, int64, mediump>; +template struct vec<1, float32, mediump>; +template struct vec<1, float64, mediump>; -template struct tvec<1, uint8, highp>; -template struct tvec<1, uint16, highp>; -template struct tvec<1, uint32, highp>; -template struct tvec<1, uint64, highp>; -template struct tvec<1, int8, highp>; -template struct tvec<1, int16, highp>; -template struct tvec<1, int32, highp>; -template struct tvec<1, int64, highp>; -template struct tvec<1, float32, highp>; -template struct tvec<1, float64, highp>; +template struct vec<1, uint8, highp>; +template struct vec<1, uint16, highp>; +template struct vec<1, uint32, highp>; +template struct vec<1, uint64, highp>; +template struct vec<1, int8, highp>; +template struct vec<1, int16, highp>; +template struct vec<1, int32, highp>; +template struct vec<1, int64, highp>; +template struct vec<1, float32, highp>; +template struct vec<1, float64, highp>; // tvec2 type explicit instantiation -template struct tvec<2, uint8, lowp>; -template struct tvec<2, uint16, lowp>; -template struct tvec<2, uint32, lowp>; -template struct tvec<2, uint64, lowp>; -template struct tvec<2, int8, lowp>; -template struct tvec<2, int16, lowp>; -template struct tvec<2, int32, lowp>; -template struct tvec<2, int64, lowp>; -template struct tvec<2, float32, lowp>; -template struct tvec<2, float64, lowp>; +template struct vec<2, uint8, lowp>; +template struct vec<2, uint16, lowp>; +template struct vec<2, uint32, lowp>; +template struct vec<2, uint64, lowp>; +template struct vec<2, int8, lowp>; +template struct vec<2, int16, lowp>; +template struct vec<2, int32, lowp>; +template struct vec<2, int64, lowp>; +template struct vec<2, float32, lowp>; +template struct vec<2, float64, lowp>; -template struct tvec<2, uint8, mediump>; -template struct tvec<2, uint16, mediump>; -template struct tvec<2, uint32, mediump>; -template struct tvec<2, uint64, mediump>; -template struct tvec<2, int8, mediump>; -template struct tvec<2, int16, mediump>; -template struct tvec<2, int32, mediump>; -template struct tvec<2, int64, mediump>; -template struct tvec<2, float32, mediump>; -template struct tvec<2, float64, mediump>; +template struct vec<2, uint8, mediump>; +template struct vec<2, uint16, mediump>; +template struct vec<2, uint32, mediump>; +template struct vec<2, uint64, mediump>; +template struct vec<2, int8, mediump>; +template struct vec<2, int16, mediump>; +template struct vec<2, int32, mediump>; +template struct vec<2, int64, mediump>; +template struct vec<2, float32, mediump>; +template struct vec<2, float64, mediump>; -template struct tvec<2, uint8, highp>; -template struct tvec<2, uint16, highp>; -template struct tvec<2, uint32, highp>; -template struct tvec<2, uint64, highp>; -template struct tvec<2, int8, highp>; -template struct tvec<2, int16, highp>; -template struct tvec<2, int32, highp>; -template struct tvec<2, int64, highp>; -template struct tvec<2, float32, highp>; -template struct tvec<2, float64, highp>; +template struct vec<2, uint8, highp>; +template struct vec<2, uint16, highp>; +template struct vec<2, uint32, highp>; +template struct vec<2, uint64, highp>; +template struct vec<2, int8, highp>; +template struct vec<2, int16, highp>; +template struct vec<2, int32, highp>; +template struct vec<2, int64, highp>; +template struct vec<2, float32, highp>; +template struct vec<2, float64, highp>; // tvec3 type explicit instantiation -template struct tvec<3, uint8, lowp>; -template struct tvec<3, uint16, lowp>; -template struct tvec<3, uint32, lowp>; -template struct tvec<3, uint64, lowp>; -template struct tvec<3, int8, lowp>; -template struct tvec<3, int16, lowp>; -template struct tvec<3, int32, lowp>; -template struct tvec<3, int64, lowp>; -template struct tvec<3, float32, lowp>; -template struct tvec<3, float64, lowp>; +template struct vec<3, uint8, lowp>; +template struct vec<3, uint16, lowp>; +template struct vec<3, uint32, lowp>; +template struct vec<3, uint64, lowp>; +template struct vec<3, int8, lowp>; +template struct vec<3, int16, lowp>; +template struct vec<3, int32, lowp>; +template struct vec<3, int64, lowp>; +template struct vec<3, float32, lowp>; +template struct vec<3, float64, lowp>; -template struct tvec<3, uint8, mediump>; -template struct tvec<3, uint16, mediump>; -template struct tvec<3, uint32, mediump>; -template struct tvec<3, uint64, mediump>; -template struct tvec<3, int8, mediump>; -template struct tvec<3, int16, mediump>; -template struct tvec<3, int32, mediump>; -template struct tvec<3, int64, mediump>; -template struct tvec<3, float32, mediump>; -template struct tvec<3, float64, mediump>; +template struct vec<3, uint8, mediump>; +template struct vec<3, uint16, mediump>; +template struct vec<3, uint32, mediump>; +template struct vec<3, uint64, mediump>; +template struct vec<3, int8, mediump>; +template struct vec<3, int16, mediump>; +template struct vec<3, int32, mediump>; +template struct vec<3, int64, mediump>; +template struct vec<3, float32, mediump>; +template struct vec<3, float64, mediump>; -template struct tvec<3, uint8, highp>; -template struct tvec<3, uint16, highp>; -template struct tvec<3, uint32, highp>; -template struct tvec<3, uint64, highp>; -template struct tvec<3, int8, highp>; -template struct tvec<3, int16, highp>; -template struct tvec<3, int32, highp>; -template struct tvec<3, int64, highp>; -template struct tvec<3, float32, highp>; -template struct tvec<3, float64, highp>; +template struct vec<3, uint8, highp>; +template struct vec<3, uint16, highp>; +template struct vec<3, uint32, highp>; +template struct vec<3, uint64, highp>; +template struct vec<3, int8, highp>; +template struct vec<3, int16, highp>; +template struct vec<3, int32, highp>; +template struct vec<3, int64, highp>; +template struct vec<3, float32, highp>; +template struct vec<3, float64, highp>; // tvec4 type explicit instantiation -template struct tvec<4, uint8, lowp>; -template struct tvec<4, uint16, lowp>; -template struct tvec<4, uint32, lowp>; -template struct tvec<4, uint64, lowp>; -template struct tvec<4, int8, lowp>; -template struct tvec<4, int16, lowp>; -template struct tvec<4, int32, lowp>; -template struct tvec<4, int64, lowp>; -template struct tvec<4, float32, lowp>; -template struct tvec<4, float64, lowp>; +template struct vec<4, uint8, lowp>; +template struct vec<4, uint16, lowp>; +template struct vec<4, uint32, lowp>; +template struct vec<4, uint64, lowp>; +template struct vec<4, int8, lowp>; +template struct vec<4, int16, lowp>; +template struct vec<4, int32, lowp>; +template struct vec<4, int64, lowp>; +template struct vec<4, float32, lowp>; +template struct vec<4, float64, lowp>; -template struct tvec<4, uint8, mediump>; -template struct tvec<4, uint16, mediump>; -template struct tvec<4, uint32, mediump>; -template struct tvec<4, uint64, mediump>; -template struct tvec<4, int8, mediump>; -template struct tvec<4, int16, mediump>; -template struct tvec<4, int32, mediump>; -template struct tvec<4, int64, mediump>; -template struct tvec<4, float32, mediump>; -template struct tvec<4, float64, mediump>; +template struct vec<4, uint8, mediump>; +template struct vec<4, uint16, mediump>; +template struct vec<4, uint32, mediump>; +template struct vec<4, uint64, mediump>; +template struct vec<4, int8, mediump>; +template struct vec<4, int16, mediump>; +template struct vec<4, int32, mediump>; +template struct vec<4, int64, mediump>; +template struct vec<4, float32, mediump>; +template struct vec<4, float64, mediump>; -template struct tvec<4, uint8, highp>; -template struct tvec<4, uint16, highp>; -template struct tvec<4, uint32, highp>; -template struct tvec<4, uint64, highp>; -template struct tvec<4, int8, highp>; -template struct tvec<4, int16, highp>; -template struct tvec<4, int32, highp>; -template struct tvec<4, int64, highp>; -template struct tvec<4, float32, highp>; -template struct tvec<4, float64, highp>; +template struct vec<4, uint8, highp>; +template struct vec<4, uint16, highp>; +template struct vec<4, uint32, highp>; +template struct vec<4, uint64, highp>; +template struct vec<4, int8, highp>; +template struct vec<4, int16, highp>; +template struct vec<4, int32, highp>; +template struct vec<4, int64, highp>; +template struct vec<4, float32, highp>; +template struct vec<4, float64, highp>; // tmat2x2 type explicit instantiation template struct tmat2x2; diff --git a/glm/detail/type_mat.hpp b/glm/detail/type_mat.hpp index 9039dbe9..7dac566e 100644 --- a/glm/detail/type_mat.hpp +++ b/glm/detail/type_mat.hpp @@ -12,7 +12,7 @@ namespace detail struct outerProduct_trait{}; }//namespace detail - template struct tvec; + template struct vec; template struct tmat2x2; template struct tmat2x3; template struct tmat2x4; diff --git a/glm/detail/type_vec.hpp b/glm/detail/type_vec.hpp index 4d958f71..38367ce2 100644 --- a/glm/detail/type_vec.hpp +++ b/glm/detail/type_vec.hpp @@ -101,12 +101,12 @@ namespace detail # endif }//namespace detail - template struct tvec; + template struct vec; - template using tvec1 = tvec<1, T, P>; - template using tvec2 = tvec<2, T, P>; - template using tvec3 = tvec<3, T, P>; - template using tvec4 = tvec<4, T, P>; + template using tvec1 = vec<1, T, P>; + template using tvec2 = vec<2, T, P>; + template using tvec3 = vec<3, T, P>; + template using tvec4 = vec<4, T, P>; typedef tvec1 highp_vec1_t; typedef tvec1 mediump_vec1_t; diff --git a/glm/detail/type_vec1.hpp b/glm/detail/type_vec1.hpp index 954f3f2a..ddd3c210 100644 --- a/glm/detail/type_vec1.hpp +++ b/glm/detail/type_vec1.hpp @@ -17,13 +17,13 @@ namespace glm { template - struct tvec<1, T, P> + struct vec<1, T, P> { // -- Implementation detail -- typedef T value_type; - typedef tvec type; - typedef tvec<1, bool, P> bool_type; + typedef vec type; + typedef vec<1, bool, P> bool_type; // -- Data -- @@ -82,31 +82,31 @@ namespace glm // -- Implicit basic constructors -- - GLM_FUNC_DECL GLM_CONSTEXPR tvec() GLM_DEFAULT_CTOR; - GLM_FUNC_DECL GLM_CONSTEXPR tvec(tvec const & v) GLM_DEFAULT; + GLM_FUNC_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR; + GLM_FUNC_DECL GLM_CONSTEXPR vec(vec const & v) GLM_DEFAULT; template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(tvec<1, T, Q> const & v); + GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<1, T, Q> const & v); // -- Explicit basic constructors -- - GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec(ctor); - GLM_FUNC_DECL GLM_CONSTEXPR explicit tvec(T scalar); + GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit vec(ctor); + GLM_FUNC_DECL GLM_CONSTEXPR explicit vec(T scalar); // -- Conversion vector constructors -- /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tvec(tvec<2, U, Q> const & v); + GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT vec(vec<2, U, Q> const & v); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tvec(tvec<3, U, Q> const & v); + GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT vec(vec<3, U, Q> const & v); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tvec(tvec<4, U, Q> const & v); + GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT vec(vec<4, U, Q> const & v); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tvec(tvec<1, U, Q> const & v); + GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT vec(vec<1, U, Q> const & v); // -- Swizzle constructors -- /* @@ -120,178 +120,178 @@ namespace glm */ // -- Unary arithmetic operators -- - GLM_FUNC_DECL tvec & operator=(tvec const & v) GLM_DEFAULT; + GLM_FUNC_DECL vec & operator=(vec const & v) GLM_DEFAULT; template - GLM_FUNC_DECL tvec & operator=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator+=(U scalar); + GLM_FUNC_DECL vec & operator+=(U scalar); template - GLM_FUNC_DECL tvec & operator+=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator+=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator-=(U scalar); + GLM_FUNC_DECL vec & operator-=(U scalar); template - GLM_FUNC_DECL tvec & operator-=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator-=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator*=(U scalar); + GLM_FUNC_DECL vec & operator*=(U scalar); template - GLM_FUNC_DECL tvec & operator*=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator*=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator/=(U scalar); + GLM_FUNC_DECL vec & operator/=(U scalar); template - GLM_FUNC_DECL tvec & operator/=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator/=(vec<1, U, P> const & v); // -- Increment and decrement operators -- - GLM_FUNC_DECL tvec & operator++(); - GLM_FUNC_DECL tvec & operator--(); - GLM_FUNC_DECL tvec operator++(int); - GLM_FUNC_DECL tvec operator--(int); + GLM_FUNC_DECL vec & operator++(); + GLM_FUNC_DECL vec & operator--(); + GLM_FUNC_DECL vec operator++(int); + GLM_FUNC_DECL vec operator--(int); // -- Unary bit operators -- template - GLM_FUNC_DECL tvec & operator%=(U scalar); + GLM_FUNC_DECL vec & operator%=(U scalar); template - GLM_FUNC_DECL tvec & operator%=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator%=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator&=(U scalar); + GLM_FUNC_DECL vec & operator&=(U scalar); template - GLM_FUNC_DECL tvec & operator&=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator&=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator|=(U scalar); + GLM_FUNC_DECL vec & operator|=(U scalar); template - GLM_FUNC_DECL tvec & operator|=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator|=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator^=(U scalar); + GLM_FUNC_DECL vec & operator^=(U scalar); template - GLM_FUNC_DECL tvec & operator^=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator^=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator<<=(U scalar); + GLM_FUNC_DECL vec & operator<<=(U scalar); template - GLM_FUNC_DECL tvec & operator<<=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator<<=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator>>=(U scalar); + GLM_FUNC_DECL vec & operator>>=(U scalar); template - GLM_FUNC_DECL tvec & operator>>=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator>>=(vec<1, U, P> const & v); }; // -- Unary operators -- template - GLM_FUNC_DECL tvec<1, T, P> operator+(tvec<1, T, P> const & v); + GLM_FUNC_DECL vec<1, T, P> operator+(vec<1, T, P> const & v); template - GLM_FUNC_DECL tvec<1, T, P> operator-(tvec<1, T, P> const & v); + GLM_FUNC_DECL vec<1, T, P> operator-(vec<1, T, P> const & v); // -- Binary operators -- template - GLM_FUNC_DECL tvec<1, T, P> operator+(tvec<1, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<1, T, P> operator+(vec<1, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<1, T, P> operator+(T scalar, tvec<1, T, P> const & v); + GLM_FUNC_DECL vec<1, T, P> operator+(T scalar, vec<1, T, P> const & v); template - GLM_FUNC_DECL tvec<1, T, P> operator+(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<1, T, P> operator+(vec<1, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<1, T, P> operator-(tvec<1, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<1, T, P> operator-(vec<1, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<1, T, P> operator-(T scalar, tvec<1, T, P> const & v); + GLM_FUNC_DECL vec<1, T, P> operator-(T scalar, vec<1, T, P> const & v); template - GLM_FUNC_DECL tvec<1, T, P> operator- (tvec<1, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<1, T, P> operator- (vec<1, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<1, T, P> operator*(tvec<1, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<1, T, P> operator*(vec<1, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<1, T, P> operator*(T scalar, tvec<1, T, P> const & v); + GLM_FUNC_DECL vec<1, T, P> operator*(T scalar, vec<1, T, P> const & v); template - GLM_FUNC_DECL tvec<1, T, P> operator*(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<1, T, P> operator*(vec<1, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<1, T, P> operator/(tvec<1, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<1, T, P> operator/(vec<1, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<1, T, P> operator/(T scalar, tvec<1, T, P> const & v); + GLM_FUNC_DECL vec<1, T, P> operator/(T scalar, vec<1, T, P> const & v); template - GLM_FUNC_DECL tvec<1, T, P> operator/(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<1, T, P> operator/(vec<1, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<1, T, P> operator%(tvec<1, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<1, T, P> operator%(vec<1, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<1, T, P> operator%(T scalar, tvec<1, T, P> const & v); + GLM_FUNC_DECL vec<1, T, P> operator%(T scalar, vec<1, T, P> const & v); template - GLM_FUNC_DECL tvec<1, T, P> operator%(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<1, T, P> operator%(vec<1, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<1, T, P> operator&(tvec<1, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<1, T, P> operator&(vec<1, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<1, T, P> operator&(T scalar, tvec<1, T, P> const & v); + GLM_FUNC_DECL vec<1, T, P> operator&(T scalar, vec<1, T, P> const & v); template - GLM_FUNC_DECL tvec<1, T, P> operator&(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<1, T, P> operator&(vec<1, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<1, T, P> operator|(tvec<1, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<1, T, P> operator|(vec<1, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<1, T, P> operator|(T scalar, tvec<1, T, P> const & v); + GLM_FUNC_DECL vec<1, T, P> operator|(T scalar, vec<1, T, P> const & v); template - GLM_FUNC_DECL tvec<1, T, P> operator|(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<1, T, P> operator|(vec<1, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<1, T, P> operator^(tvec<1, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<1, T, P> operator^(vec<1, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<1, T, P> operator^(T scalar, tvec<1, T, P> const & v); + GLM_FUNC_DECL vec<1, T, P> operator^(T scalar, vec<1, T, P> const & v); template - GLM_FUNC_DECL tvec<1, T, P> operator^(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<1, T, P> operator^(vec<1, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<1, T, P> operator<<(tvec<1, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<1, T, P> operator<<(vec<1, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<1, T, P> operator<<(T scalar, tvec<1, T, P> const & v); + GLM_FUNC_DECL vec<1, T, P> operator<<(T scalar, vec<1, T, P> const & v); template - GLM_FUNC_DECL tvec<1, T, P> operator<<(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<1, T, P> operator<<(vec<1, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<1, T, P> operator>>(tvec<1, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<1, T, P> operator>>(vec<1, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<1, T, P> operator>>(T scalar, tvec<1, T, P> const & v); + GLM_FUNC_DECL vec<1, T, P> operator>>(T scalar, vec<1, T, P> const & v); template - GLM_FUNC_DECL tvec<1, T, P> operator>>(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<1, T, P> operator>>(vec<1, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<1, T, P> operator~(tvec<1, T, P> const & v); + GLM_FUNC_DECL vec<1, T, P> operator~(vec<1, T, P> const & v); // -- Boolean operators -- template - GLM_FUNC_DECL bool operator==(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL bool operator==(vec<1, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL bool operator!=(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL bool operator!=(vec<1, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<1, bool, P> operator&&(tvec<1, bool, P> const & v1, tvec<1, bool, P> const & v2); + GLM_FUNC_DECL vec<1, bool, P> operator&&(vec<1, bool, P> const & v1, vec<1, bool, P> const & v2); template - GLM_FUNC_DECL tvec<1, bool, P> operator||(tvec<1, bool, P> const & v1, tvec<1, bool, P> const & v2); + GLM_FUNC_DECL vec<1, bool, P> operator||(vec<1, bool, P> const & v1, vec<1, bool, P> const & v2); }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/detail/type_vec1.inl b/glm/detail/type_vec1.inl index e11ed4ee..8400db20 100644 --- a/glm/detail/type_vec1.inl +++ b/glm/detail/type_vec1.inl @@ -7,7 +7,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<1, T, P>::tvec() + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, P>::vec() # ifndef GLM_FORCE_NO_CTOR_INIT : x(0) # endif @@ -16,25 +16,25 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<1, T, P>::tvec(tvec<1, T, P> const & v) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, P>::vec(vec<1, T, P> const & v) : x(v.x) {} # endif//!GLM_HAS_DEFAULTED_FUNCTIONS template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<1, T, P>::tvec(tvec<1, T, Q> const & v) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, P>::vec(vec<1, T, Q> const & v) : x(v.x) {} // -- Explicit basic constructors -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tvec<1, T, P>::tvec(ctor) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR vec<1, T, P>::vec(ctor) {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<1, T, P>::tvec(T scalar) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, P>::vec(T scalar) : x(scalar) {} @@ -42,39 +42,39 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<1, T, P>::tvec(tvec<1, U, Q> const & v) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, P>::vec(vec<1, U, Q> const & v) : x(static_cast(v.x)) {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<1, T, P>::tvec(tvec<2, U, Q> const & v) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, P>::vec(vec<2, U, Q> const & v) : x(static_cast(v.x)) {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<1, T, P>::tvec(tvec<3, U, Q> const & v) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, P>::vec(vec<3, U, Q> const & v) : x(static_cast(v.x)) {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<1, T, P>::tvec(tvec<4, U, Q> const & v) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, P>::vec(vec<4, U, Q> const & v) : x(static_cast(v.x)) {} // -- Component accesses -- template - GLM_FUNC_QUALIFIER T & tvec<1, T, P>::operator[](typename tvec<1, T, P>::length_type i) + GLM_FUNC_QUALIFIER T & vec<1, T, P>::operator[](typename vec<1, T, P>::length_type i) { assert(i >= 0 && i < this->length()); return (&x)[i]; } template - GLM_FUNC_QUALIFIER T const & tvec<1, T, P>::operator[](typename tvec<1, T, P>::length_type i) const + GLM_FUNC_QUALIFIER T const & vec<1, T, P>::operator[](typename vec<1, T, P>::length_type i) const { assert(i >= 0 && i < this->length()); return (&x)[i]; @@ -84,7 +84,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator=(tvec<1, T, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator=(vec<1, T, P> const & v) { this->x = v.x; return *this; @@ -93,7 +93,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator=(vec<1, U, P> const & v) { this->x = static_cast(v.x); return *this; @@ -101,7 +101,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator+=(U scalar) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator+=(U scalar) { this->x += static_cast(scalar); return *this; @@ -109,7 +109,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator+=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator+=(vec<1, U, P> const & v) { this->x += static_cast(v.x); return *this; @@ -117,7 +117,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator-=(U scalar) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator-=(U scalar) { this->x -= static_cast(scalar); return *this; @@ -125,7 +125,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator-=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator-=(vec<1, U, P> const & v) { this->x -= static_cast(v.x); return *this; @@ -133,7 +133,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator*=(U scalar) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator*=(U scalar) { this->x *= static_cast(scalar); return *this; @@ -141,7 +141,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator*=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator*=(vec<1, U, P> const & v) { this->x *= static_cast(v.x); return *this; @@ -149,7 +149,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator/=(U scalar) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator/=(U scalar) { this->x /= static_cast(scalar); return *this; @@ -157,7 +157,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator/=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator/=(vec<1, U, P> const & v) { this->x /= static_cast(v.x); return *this; @@ -166,31 +166,31 @@ namespace glm // -- Increment and decrement operators -- template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator++() + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator++() { ++this->x; return *this; } template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator--() + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator--() { --this->x; return *this; } template - GLM_FUNC_QUALIFIER tvec<1, T, P> tvec<1, T, P>::operator++(int) + GLM_FUNC_QUALIFIER vec<1, T, P> vec<1, T, P>::operator++(int) { - tvec<1, T, P> Result(*this); + vec<1, T, P> Result(*this); ++*this; return Result; } template - GLM_FUNC_QUALIFIER tvec<1, T, P> tvec<1, T, P>::operator--(int) + GLM_FUNC_QUALIFIER vec<1, T, P> vec<1, T, P>::operator--(int) { - tvec<1, T, P> Result(*this); + vec<1, T, P> Result(*this); --*this; return Result; } @@ -199,7 +199,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator%=(U scalar) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator%=(U scalar) { this->x %= static_cast(scalar); return *this; @@ -207,7 +207,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator%=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator%=(vec<1, U, P> const & v) { this->x %= static_cast(v.x); return *this; @@ -215,7 +215,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator&=(U scalar) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator&=(U scalar) { this->x &= static_cast(scalar); return *this; @@ -223,7 +223,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator&=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator&=(vec<1, U, P> const & v) { this->x &= static_cast(v.x); return *this; @@ -231,7 +231,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator|=(U scalar) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator|=(U scalar) { this->x |= static_cast(scalar); return *this; @@ -239,7 +239,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator|=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator|=(vec<1, U, P> const & v) { this->x |= U(v.x); return *this; @@ -247,7 +247,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator^=(U scalar) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator^=(U scalar) { this->x ^= static_cast(scalar); return *this; @@ -255,7 +255,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator^=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator^=(vec<1, U, P> const & v) { this->x ^= static_cast(v.x); return *this; @@ -263,7 +263,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator<<=(U scalar) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator<<=(U scalar) { this->x <<= static_cast(scalar); return *this; @@ -271,7 +271,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator<<=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator<<=(vec<1, U, P> const & v) { this->x <<= static_cast(v.x); return *this; @@ -279,7 +279,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator>>=(U scalar) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator>>=(U scalar) { this->x >>= static_cast(scalar); return *this; @@ -287,7 +287,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<1, T, P> & tvec<1, T, P>::operator>>=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator>>=(vec<1, U, P> const & v) { this->x >>= static_cast(v.x); return *this; @@ -296,263 +296,263 @@ namespace glm // -- Unary constant operators -- template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator+(tvec<1, T, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> operator+(vec<1, T, P> const & v) { return v; } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator-(tvec<1, T, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> operator-(vec<1, T, P> const & v) { - return tvec<1, T, P>( + return vec<1, T, P>( -v.x); } // -- Binary arithmetic operators -- template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator+(tvec<1, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<1, T, P> operator+(vec<1, T, P> const & v, T scalar) { - return tvec<1, T, P>( + return vec<1, T, P>( v.x + scalar); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator+(T scalar, tvec<1, T, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> operator+(T scalar, vec<1, T, P> const & v) { - return tvec<1, T, P>( + return vec<1, T, P>( scalar + v.x); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator+(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<1, T, P> operator+(vec<1, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<1, T, P>( + return vec<1, T, P>( v1.x + v2.x); } //operator- template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator-(tvec<1, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<1, T, P> operator-(vec<1, T, P> const & v, T scalar) { - return tvec<1, T, P>( + return vec<1, T, P>( v.x - scalar); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator-(T scalar, tvec<1, T, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> operator-(T scalar, vec<1, T, P> const & v) { - return tvec<1, T, P>( + return vec<1, T, P>( scalar - v.x); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator-(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<1, T, P> operator-(vec<1, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<1, T, P>( + return vec<1, T, P>( v1.x - v2.x); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator*(tvec<1, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<1, T, P> operator*(vec<1, T, P> const & v, T scalar) { - return tvec<1, T, P>( + return vec<1, T, P>( v.x * scalar); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator*(T scalar, tvec<1, T, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> operator*(T scalar, vec<1, T, P> const & v) { - return tvec<1, T, P>( + return vec<1, T, P>( scalar * v.x); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator*(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<1, T, P> operator*(vec<1, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<1, T, P>( + return vec<1, T, P>( v1.x * v2.x); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator/(tvec<1, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<1, T, P> operator/(vec<1, T, P> const & v, T scalar) { - return tvec<1, T, P>( + return vec<1, T, P>( v.x / scalar); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator/(T scalar, tvec<1, T, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> operator/(T scalar, vec<1, T, P> const & v) { - return tvec<1, T, P>( + return vec<1, T, P>( scalar / v.x); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator/(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<1, T, P> operator/(vec<1, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<1, T, P>( + return vec<1, T, P>( v1.x / v2.x); } // -- Binary bit operators -- template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator%(tvec<1, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<1, T, P> operator%(vec<1, T, P> const & v, T scalar) { - return tvec<1, T, P>( + return vec<1, T, P>( v.x % scalar); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator%(T scalar, tvec<1, T, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> operator%(T scalar, vec<1, T, P> const & v) { - return tvec<1, T, P>( + return vec<1, T, P>( scalar % v.x); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator%(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<1, T, P> operator%(vec<1, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<1, T, P>( + return vec<1, T, P>( v1.x % v2.x); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator&(tvec<1, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<1, T, P> operator&(vec<1, T, P> const & v, T scalar) { - return tvec<1, T, P>( + return vec<1, T, P>( v.x & scalar); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator&(T scalar, tvec<1, T, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> operator&(T scalar, vec<1, T, P> const & v) { - return tvec<1, T, P>( + return vec<1, T, P>( scalar & v.x); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator&(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<1, T, P> operator&(vec<1, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<1, T, P>( + return vec<1, T, P>( v1.x & v2.x); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator|(tvec<1, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<1, T, P> operator|(vec<1, T, P> const & v, T scalar) { - return tvec<1, T, P>( + return vec<1, T, P>( v.x | scalar); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator|(T scalar, tvec<1, T, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> operator|(T scalar, vec<1, T, P> const & v) { - return tvec<1, T, P>( + return vec<1, T, P>( scalar | v.x); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator|(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<1, T, P> operator|(vec<1, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<1, T, P>( + return vec<1, T, P>( v1.x | v2.x); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator^(tvec<1, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<1, T, P> operator^(vec<1, T, P> const & v, T scalar) { - return tvec<1, T, P>( + return vec<1, T, P>( v.x ^ scalar); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator^(T scalar, tvec<1, T, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> operator^(T scalar, vec<1, T, P> const & v) { - return tvec<1, T, P>( + return vec<1, T, P>( scalar ^ v.x); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator^(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<1, T, P> operator^(vec<1, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<1, T, P>( + return vec<1, T, P>( v1.x ^ v2.x); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator<<(tvec<1, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<1, T, P> operator<<(vec<1, T, P> const & v, T scalar) { - return tvec<1, T, P>( + return vec<1, T, P>( v.x << scalar); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator<<(T scalar, tvec<1, T, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> operator<<(T scalar, vec<1, T, P> const & v) { - return tvec<1, T, P>( + return vec<1, T, P>( scalar << v.x); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator<<(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<1, T, P> operator<<(vec<1, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<1, T, P>( + return vec<1, T, P>( v1.x << v2.x); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator>>(tvec<1, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<1, T, P> operator>>(vec<1, T, P> const & v, T scalar) { - return tvec<1, T, P>( + return vec<1, T, P>( v.x >> scalar); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator>>(T scalar, tvec<1, T, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> operator>>(T scalar, vec<1, T, P> const & v) { - return tvec<1, T, P>( + return vec<1, T, P>( scalar >> v.x); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator>>(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<1, T, P> operator>>(vec<1, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<1, T, P>( + return vec<1, T, P>( v1.x >> v2.x); } template - GLM_FUNC_QUALIFIER tvec<1, T, P> operator~(tvec<1, T, P> const & v) + GLM_FUNC_QUALIFIER vec<1, T, P> operator~(vec<1, T, P> const & v) { - return tvec<1, T, P>( + return vec<1, T, P>( ~v.x); } // -- Boolean operators -- template - GLM_FUNC_QUALIFIER bool operator==(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER bool operator==(vec<1, T, P> const & v1, vec<1, T, P> const & v2) { return (v1.x == v2.x); } template - GLM_FUNC_QUALIFIER bool operator!=(tvec<1, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER bool operator!=(vec<1, T, P> const & v1, vec<1, T, P> const & v2) { return (v1.x != v2.x); } template - GLM_FUNC_QUALIFIER tvec<1, bool, P> operator&&(tvec<1, bool, P> const & v1, tvec<1, bool, P> const & v2) + GLM_FUNC_QUALIFIER vec<1, bool, P> operator&&(vec<1, bool, P> const & v1, vec<1, bool, P> const & v2) { - return tvec<1, bool, P>(v1.x && v2.x); + return vec<1, bool, P>(v1.x && v2.x); } template - GLM_FUNC_QUALIFIER tvec<1, bool, P> operator||(tvec<1, bool, P> const & v1, tvec<1, bool, P> const & v2) + GLM_FUNC_QUALIFIER vec<1, bool, P> operator||(vec<1, bool, P> const & v1, vec<1, bool, P> const & v2) { - return tvec<1, bool, P>(v1.x || v2.x); + return vec<1, bool, P>(v1.x || v2.x); } }//namespace glm diff --git a/glm/detail/type_vec2.hpp b/glm/detail/type_vec2.hpp index 8bb61b5f..ec2f1999 100644 --- a/glm/detail/type_vec2.hpp +++ b/glm/detail/type_vec2.hpp @@ -16,13 +16,13 @@ namespace glm { template - struct tvec<2, T, P> + struct vec<2, T, P> { // -- Implementation detail -- typedef T value_type; - typedef tvec type; - typedef tvec<2, bool, P> bool_type; + typedef vec type; + typedef vec<2, bool, P> bool_type; // -- Data -- @@ -83,42 +83,42 @@ namespace glm // -- Implicit basic constructors -- - GLM_FUNC_DECL GLM_CONSTEXPR tvec() GLM_DEFAULT_CTOR; - GLM_FUNC_DECL GLM_CONSTEXPR tvec(tvec const& v) GLM_DEFAULT; + GLM_FUNC_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR; + GLM_FUNC_DECL GLM_CONSTEXPR vec(vec const& v) GLM_DEFAULT; template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(tvec<2, T, Q> const& v); + GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<2, T, Q> const& v); // -- Explicit basic constructors -- - GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec(ctor); - GLM_FUNC_DECL GLM_CONSTEXPR explicit tvec(T scalar); - GLM_FUNC_DECL GLM_CONSTEXPR tvec(T s1, T s2); + GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit vec(ctor); + GLM_FUNC_DECL GLM_CONSTEXPR explicit vec(T scalar); + GLM_FUNC_DECL GLM_CONSTEXPR vec(T s1, T s2); // -- Conversion constructors -- - /// Explicit converions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) + /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(A x, B y); + GLM_FUNC_DECL GLM_CONSTEXPR vec(A x, B y); template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(tvec<1, A, P> const & v1, tvec<1, B, P> const & v2); + GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<1, A, P> const & v1, vec<1, B, P> const & v2); // -- Conversion vector constructors -- /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tvec(tvec<3, U, Q> const & v); + GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT vec(vec<3, U, Q> const & v); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tvec(tvec<4, U, Q> const & v); + GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT vec(vec<4, U, Q> const & v); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tvec(tvec<2, U, Q> const & v); + GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT vec(vec<2, U, Q> const & v); // -- Swizzle constructors -- # if GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED) template - GLM_FUNC_DECL tvec(detail::_swizzle<2, T, P, E0, E1,-1,-2> const& that) + GLM_FUNC_DECL vec(detail::_swizzle<2, T, P, E0, E1,-1,-2> const& that) { *this = that(); } @@ -126,258 +126,258 @@ namespace glm // -- Unary arithmetic operators -- - GLM_FUNC_DECL tvec& operator=(tvec const & v) GLM_DEFAULT; + GLM_FUNC_DECL vec& operator=(vec const & v) GLM_DEFAULT; template - GLM_FUNC_DECL tvec& operator=(tvec<2, U, P> const & v); + GLM_FUNC_DECL vec& operator=(vec<2, U, P> const & v); template - GLM_FUNC_DECL tvec& operator+=(U scalar); + GLM_FUNC_DECL vec& operator+=(U scalar); template - GLM_FUNC_DECL tvec& operator+=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec& operator+=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec& operator+=(tvec<2, U, P> const & v); + GLM_FUNC_DECL vec& operator+=(vec<2, U, P> const & v); template - GLM_FUNC_DECL tvec& operator-=(U scalar); + GLM_FUNC_DECL vec& operator-=(U scalar); template - GLM_FUNC_DECL tvec& operator-=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec& operator-=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec& operator-=(tvec<2, U, P> const & v); + GLM_FUNC_DECL vec& operator-=(vec<2, U, P> const & v); template - GLM_FUNC_DECL tvec& operator*=(U scalar); + GLM_FUNC_DECL vec& operator*=(U scalar); template - GLM_FUNC_DECL tvec& operator*=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec& operator*=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec& operator*=(tvec<2, U, P> const & v); + GLM_FUNC_DECL vec& operator*=(vec<2, U, P> const & v); template - GLM_FUNC_DECL tvec& operator/=(U scalar); + GLM_FUNC_DECL vec& operator/=(U scalar); template - GLM_FUNC_DECL tvec& operator/=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec& operator/=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec& operator/=(tvec<2, U, P> const & v); + GLM_FUNC_DECL vec& operator/=(vec<2, U, P> const & v); // -- Increment and decrement operators -- - GLM_FUNC_DECL tvec & operator++(); - GLM_FUNC_DECL tvec & operator--(); - GLM_FUNC_DECL tvec operator++(int); - GLM_FUNC_DECL tvec operator--(int); + GLM_FUNC_DECL vec & operator++(); + GLM_FUNC_DECL vec & operator--(); + GLM_FUNC_DECL vec operator++(int); + GLM_FUNC_DECL vec operator--(int); // -- Unary bit operators -- template - GLM_FUNC_DECL tvec & operator%=(U scalar); + GLM_FUNC_DECL vec & operator%=(U scalar); template - GLM_FUNC_DECL tvec & operator%=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator%=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator%=(tvec<2, U, P> const & v); + GLM_FUNC_DECL vec & operator%=(vec<2, U, P> const & v); template - GLM_FUNC_DECL tvec & operator&=(U scalar); + GLM_FUNC_DECL vec & operator&=(U scalar); template - GLM_FUNC_DECL tvec & operator&=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator&=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator&=(tvec<2, U, P> const & v); + GLM_FUNC_DECL vec & operator&=(vec<2, U, P> const & v); template - GLM_FUNC_DECL tvec & operator|=(U scalar); + GLM_FUNC_DECL vec & operator|=(U scalar); template - GLM_FUNC_DECL tvec & operator|=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator|=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator|=(tvec<2, U, P> const & v); + GLM_FUNC_DECL vec & operator|=(vec<2, U, P> const & v); template - GLM_FUNC_DECL tvec & operator^=(U scalar); + GLM_FUNC_DECL vec & operator^=(U scalar); template - GLM_FUNC_DECL tvec & operator^=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator^=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator^=(tvec<2, U, P> const & v); + GLM_FUNC_DECL vec & operator^=(vec<2, U, P> const & v); template - GLM_FUNC_DECL tvec & operator<<=(U scalar); + GLM_FUNC_DECL vec & operator<<=(U scalar); template - GLM_FUNC_DECL tvec & operator<<=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator<<=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator<<=(tvec<2, U, P> const & v); + GLM_FUNC_DECL vec & operator<<=(vec<2, U, P> const & v); template - GLM_FUNC_DECL tvec & operator>>=(U scalar); + GLM_FUNC_DECL vec & operator>>=(U scalar); template - GLM_FUNC_DECL tvec & operator>>=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator>>=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator>>=(tvec<2, U, P> const & v); + GLM_FUNC_DECL vec & operator>>=(vec<2, U, P> const & v); }; // -- Unary operators -- template - GLM_FUNC_DECL tvec<2, T, P> operator+(tvec<2, T, P> const & v); + GLM_FUNC_DECL vec<2, T, P> operator+(vec<2, T, P> const & v); template - GLM_FUNC_DECL tvec<2, T, P> operator-(tvec<2, T, P> const & v); + GLM_FUNC_DECL vec<2, T, P> operator-(vec<2, T, P> const & v); // -- Binary operators -- template - GLM_FUNC_DECL tvec<2, T, P> operator+(tvec<2, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<2, T, P> operator+(vec<2, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<2, T, P> operator+(tvec<2, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator+(vec<2, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator+(T scalar, tvec<2, T, P> const & v); + GLM_FUNC_DECL vec<2, T, P> operator+(T scalar, vec<2, T, P> const & v); template - GLM_FUNC_DECL tvec<2, T, P> operator+(tvec<1, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator+(vec<1, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator+(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator+(vec<2, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator-(tvec<2, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<2, T, P> operator-(vec<2, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<2, T, P> operator-(tvec<2, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator-(vec<2, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator-(T scalar, tvec<2, T, P> const & v); + GLM_FUNC_DECL vec<2, T, P> operator-(T scalar, vec<2, T, P> const & v); template - GLM_FUNC_DECL tvec<2, T, P> operator-(tvec<1, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator-(vec<1, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator-(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator-(vec<2, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator*(tvec<2, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<2, T, P> operator*(vec<2, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<2, T, P> operator*(tvec<2, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator*(vec<2, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator*(T scalar, tvec<2, T, P> const & v); + GLM_FUNC_DECL vec<2, T, P> operator*(T scalar, vec<2, T, P> const & v); template - GLM_FUNC_DECL tvec<2, T, P> operator*(tvec<1, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator*(vec<1, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator*(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator*(vec<2, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator/(tvec<2, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<2, T, P> operator/(vec<2, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<2, T, P> operator/(tvec<2, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator/(vec<2, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator/(T scalar, tvec<2, T, P> const & v); + GLM_FUNC_DECL vec<2, T, P> operator/(T scalar, vec<2, T, P> const & v); template - GLM_FUNC_DECL tvec<2, T, P> operator/(tvec<1, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator/(vec<1, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator/(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator/(vec<2, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator%(tvec<2, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<2, T, P> operator%(vec<2, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<2, T, P> operator%(tvec<2, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator%(vec<2, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator%(T scalar, tvec<2, T, P> const & v); + GLM_FUNC_DECL vec<2, T, P> operator%(T scalar, vec<2, T, P> const & v); template - GLM_FUNC_DECL tvec<2, T, P> operator%(tvec<1, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator%(vec<1, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator%(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator%(vec<2, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator&(tvec<2, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<2, T, P> operator&(vec<2, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<2, T, P> operator&(tvec<2, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator&(vec<2, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator&(T scalar, tvec<2, T, P> const & v); + GLM_FUNC_DECL vec<2, T, P> operator&(T scalar, vec<2, T, P> const & v); template - GLM_FUNC_DECL tvec<2, T, P> operator&(tvec<1, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator&(vec<1, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator&(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator&(vec<2, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator|(tvec<2, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<2, T, P> operator|(vec<2, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<2, T, P> operator|(tvec<2, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator|(vec<2, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator|(T scalar, tvec<2, T, P> const & v); + GLM_FUNC_DECL vec<2, T, P> operator|(T scalar, vec<2, T, P> const & v); template - GLM_FUNC_DECL tvec<2, T, P> operator|(tvec<1, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator|(vec<1, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator|(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator|(vec<2, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator^(tvec<2, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<2, T, P> operator^(vec<2, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<2, T, P> operator^(tvec<2, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator^(vec<2, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator^(T scalar, tvec<2, T, P> const & v); + GLM_FUNC_DECL vec<2, T, P> operator^(T scalar, vec<2, T, P> const & v); template - GLM_FUNC_DECL tvec<2, T, P> operator^(tvec<1, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator^(vec<1, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator^(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator^(vec<2, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator<<(tvec<2, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<2, T, P> operator<<(vec<2, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<2, T, P> operator<<(tvec<2, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator<<(vec<2, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator<<(T scalar, tvec<2, T, P> const & v); + GLM_FUNC_DECL vec<2, T, P> operator<<(T scalar, vec<2, T, P> const & v); template - GLM_FUNC_DECL tvec<2, T, P> operator<<(tvec<1, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator<<(vec<1, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator<<(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator<<(vec<2, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator>>(tvec<2, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<2, T, P> operator>>(vec<2, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<2, T, P> operator>>(tvec<2, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator>>(vec<2, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator>>(T scalar, tvec<2, T, P> const & v); + GLM_FUNC_DECL vec<2, T, P> operator>>(T scalar, vec<2, T, P> const & v); template - GLM_FUNC_DECL tvec<2, T, P> operator>>(tvec<1, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator>>(vec<1, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator>>(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL vec<2, T, P> operator>>(vec<2, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, T, P> operator~(tvec<2, T, P> const & v); + GLM_FUNC_DECL vec<2, T, P> operator~(vec<2, T, P> const & v); // -- Boolean operators -- template - GLM_FUNC_DECL bool operator==(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL bool operator==(vec<2, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL bool operator!=(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2); + GLM_FUNC_DECL bool operator!=(vec<2, T, P> const & v1, vec<2, T, P> const & v2); template - GLM_FUNC_DECL tvec<2, bool, P> operator&&(tvec<2, bool, P> const & v1, tvec<2, bool, P> const & v2); + GLM_FUNC_DECL vec<2, bool, P> operator&&(vec<2, bool, P> const & v1, vec<2, bool, P> const & v2); template - GLM_FUNC_DECL tvec<2, bool, P> operator||(tvec<2, bool, P> const & v1, tvec<2, bool, P> const & v2); + GLM_FUNC_DECL vec<2, bool, P> operator||(vec<2, bool, P> const & v1, vec<2, bool, P> const & v2); }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/detail/type_vec2.inl b/glm/detail/type_vec2.inl index f7b4fede..e52cfe70 100644 --- a/glm/detail/type_vec2.inl +++ b/glm/detail/type_vec2.inl @@ -7,7 +7,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<2, T, P>::tvec() + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, P>::vec() # ifndef GLM_FORCE_NO_CTOR_INIT : x(0), y(0) # endif @@ -16,30 +16,30 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<2, T, P>::tvec(tvec<2, T, P> const & v) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, P>::vec(vec<2, T, P> const & v) : x(v.x), y(v.y) {} # endif//!GLM_HAS_DEFAULTED_FUNCTIONS template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<2, T, P>::tvec(tvec<2, T, Q> const & v) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, P>::vec(vec<2, T, Q> const & v) : x(v.x), y(v.y) {} // -- Explicit basic constructors -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tvec<2, T, P>::tvec(ctor) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR vec<2, T, P>::vec(ctor) {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<2, T, P>::tvec(T scalar) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, P>::vec(T scalar) : x(scalar), y(scalar) {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<2, T, P>::tvec(T s1, T s2) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, P>::vec(T s1, T s2) : x(s1), y(s2) {} @@ -47,14 +47,14 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<2, T, P>::tvec(A a, B b) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, P>::vec(A a, B b) : x(static_cast(a)) , y(static_cast(b)) {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<2, T, P>::tvec(tvec<1, A, P> const & a, tvec<1, B, P> const & b) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, P>::vec(vec<1, A, P> const & a, vec<1, B, P> const & b) : x(static_cast(a.x)) , y(static_cast(b.x)) {} @@ -63,21 +63,21 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<2, T, P>::tvec(tvec<2, U, Q> const & v) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, P>::vec(vec<2, U, Q> const & v) : x(static_cast(v.x)) , y(static_cast(v.y)) {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<2, T, P>::tvec(tvec<3, U, Q> const & v) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, P>::vec(vec<3, U, Q> const & v) : x(static_cast(v.x)) , y(static_cast(v.y)) {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<2, T, P>::tvec(tvec<4, U, Q> const & v) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, P>::vec(vec<4, U, Q> const & v) : x(static_cast(v.x)) , y(static_cast(v.y)) {} @@ -85,14 +85,14 @@ namespace glm // -- Component accesses -- template - GLM_FUNC_QUALIFIER T & tvec<2, T, P>::operator[](typename tvec<2, T, P>::length_type i) + GLM_FUNC_QUALIFIER T & vec<2, T, P>::operator[](typename vec<2, T, P>::length_type i) { assert(i >= 0 && i < this->length()); return (&x)[i]; } template - GLM_FUNC_QUALIFIER T const & tvec<2, T, P>::operator[](typename tvec<2, T, P>::length_type i) const + GLM_FUNC_QUALIFIER T const & vec<2, T, P>::operator[](typename vec<2, T, P>::length_type i) const { assert(i >= 0 && i < this->length()); return (&x)[i]; @@ -102,7 +102,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator=(tvec<2, T, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator=(vec<2, T, P> const & v) { this->x = v.x; this->y = v.y; @@ -112,7 +112,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator=(tvec<2, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator=(vec<2, U, P> const & v) { this->x = static_cast(v.x); this->y = static_cast(v.y); @@ -121,7 +121,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator+=(U scalar) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator+=(U scalar) { this->x += static_cast(scalar); this->y += static_cast(scalar); @@ -130,7 +130,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator+=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator+=(vec<1, U, P> const & v) { this->x += static_cast(v.x); this->y += static_cast(v.x); @@ -139,7 +139,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator+=(tvec<2, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator+=(vec<2, U, P> const & v) { this->x += static_cast(v.x); this->y += static_cast(v.y); @@ -148,7 +148,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator-=(U scalar) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator-=(U scalar) { this->x -= static_cast(scalar); this->y -= static_cast(scalar); @@ -157,7 +157,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator-=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator-=(vec<1, U, P> const & v) { this->x -= static_cast(v.x); this->y -= static_cast(v.x); @@ -166,7 +166,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator-=(tvec<2, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator-=(vec<2, U, P> const & v) { this->x -= static_cast(v.x); this->y -= static_cast(v.y); @@ -175,7 +175,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator*=(U scalar) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator*=(U scalar) { this->x *= static_cast(scalar); this->y *= static_cast(scalar); @@ -184,7 +184,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator*=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator*=(vec<1, U, P> const & v) { this->x *= static_cast(v.x); this->y *= static_cast(v.x); @@ -193,7 +193,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator*=(tvec<2, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator*=(vec<2, U, P> const & v) { this->x *= static_cast(v.x); this->y *= static_cast(v.y); @@ -202,7 +202,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator/=(U scalar) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator/=(U scalar) { this->x /= static_cast(scalar); this->y /= static_cast(scalar); @@ -211,7 +211,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator/=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator/=(vec<1, U, P> const & v) { this->x /= static_cast(v.x); this->y /= static_cast(v.x); @@ -220,7 +220,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator/=(tvec<2, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator/=(vec<2, U, P> const & v) { this->x /= static_cast(v.x); this->y /= static_cast(v.y); @@ -230,7 +230,7 @@ namespace glm // -- Increment and decrement operators -- template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator++() + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator++() { ++this->x; ++this->y; @@ -238,7 +238,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator--() + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator--() { --this->x; --this->y; @@ -246,17 +246,17 @@ namespace glm } template - GLM_FUNC_QUALIFIER tvec<2, T, P> tvec<2, T, P>::operator++(int) + GLM_FUNC_QUALIFIER vec<2, T, P> vec<2, T, P>::operator++(int) { - tvec<2, T, P> Result(*this); + vec<2, T, P> Result(*this); ++*this; return Result; } template - GLM_FUNC_QUALIFIER tvec<2, T, P> tvec<2, T, P>::operator--(int) + GLM_FUNC_QUALIFIER vec<2, T, P> vec<2, T, P>::operator--(int) { - tvec<2, T, P> Result(*this); + vec<2, T, P> Result(*this); --*this; return Result; } @@ -265,7 +265,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator%=(U scalar) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator%=(U scalar) { this->x %= static_cast(scalar); this->y %= static_cast(scalar); @@ -274,7 +274,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator%=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator%=(vec<1, U, P> const & v) { this->x %= static_cast(v.x); this->y %= static_cast(v.x); @@ -283,7 +283,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator%=(tvec<2, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator%=(vec<2, U, P> const & v) { this->x %= static_cast(v.x); this->y %= static_cast(v.y); @@ -292,7 +292,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator&=(U scalar) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator&=(U scalar) { this->x &= static_cast(scalar); this->y &= static_cast(scalar); @@ -301,7 +301,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator&=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator&=(vec<1, U, P> const & v) { this->x &= static_cast(v.x); this->y &= static_cast(v.x); @@ -310,7 +310,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator&=(tvec<2, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator&=(vec<2, U, P> const & v) { this->x &= static_cast(v.x); this->y &= static_cast(v.y); @@ -319,7 +319,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator|=(U scalar) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator|=(U scalar) { this->x |= static_cast(scalar); this->y |= static_cast(scalar); @@ -328,7 +328,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator|=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator|=(vec<1, U, P> const & v) { this->x |= static_cast(v.x); this->y |= static_cast(v.x); @@ -337,7 +337,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator|=(tvec<2, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator|=(vec<2, U, P> const & v) { this->x |= static_cast(v.x); this->y |= static_cast(v.y); @@ -346,7 +346,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator^=(U scalar) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator^=(U scalar) { this->x ^= static_cast(scalar); this->y ^= static_cast(scalar); @@ -355,7 +355,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator^=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator^=(vec<1, U, P> const & v) { this->x ^= static_cast(v.x); this->y ^= static_cast(v.x); @@ -364,7 +364,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator^=(tvec<2, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator^=(vec<2, U, P> const & v) { this->x ^= static_cast(v.x); this->y ^= static_cast(v.y); @@ -373,7 +373,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator<<=(U scalar) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator<<=(U scalar) { this->x <<= static_cast(scalar); this->y <<= static_cast(scalar); @@ -382,7 +382,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator<<=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator<<=(vec<1, U, P> const & v) { this->x <<= static_cast(v.x); this->y <<= static_cast(v.x); @@ -391,7 +391,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator<<=(tvec<2, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator<<=(vec<2, U, P> const & v) { this->x <<= static_cast(v.x); this->y <<= static_cast(v.y); @@ -400,7 +400,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator>>=(U scalar) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator>>=(U scalar) { this->x >>= static_cast(scalar); this->y >>= static_cast(scalar); @@ -409,7 +409,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator>>=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator>>=(vec<1, U, P> const & v) { this->x >>= static_cast(v.x); this->y >>= static_cast(v.x); @@ -418,7 +418,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<2, T, P> & tvec<2, T, P>::operator>>=(tvec<2, U, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator>>=(vec<2, U, P> const & v) { this->x >>= static_cast(v.x); this->y >>= static_cast(v.y); @@ -428,15 +428,15 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator+(tvec<2, T, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> operator+(vec<2, T, P> const & v) { return v; } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator-(tvec<2, T, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> operator-(vec<2, T, P> const & v) { - return tvec<2, T, P>( + return vec<2, T, P>( -v.x, -v.y); } @@ -444,161 +444,161 @@ namespace glm // -- Binary arithmetic operators -- template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator+(tvec<2, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<2, T, P> operator+(vec<2, T, P> const & v, T scalar) { - return tvec<2, T, P>( + return vec<2, T, P>( v.x + scalar, v.y + scalar); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator+(tvec<2, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator+(vec<2, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x + v2.x, v1.y + v2.x); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator+(T scalar, tvec<2, T, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> operator+(T scalar, vec<2, T, P> const & v) { - return tvec<2, T, P>( + return vec<2, T, P>( scalar + v.x, scalar + v.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator+(tvec<1, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator+(vec<1, T, P> const & v1, vec<2, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x + v2.x, v1.x + v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator+(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator+(vec<2, T, P> const & v1, vec<2, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x + v2.x, v1.y + v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator-(tvec<2, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<2, T, P> operator-(vec<2, T, P> const & v, T scalar) { - return tvec<2, T, P>( + return vec<2, T, P>( v.x - scalar, v.y - scalar); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator-(tvec<2, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator-(vec<2, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x - v2.x, v1.y - v2.x); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator-(T scalar, tvec<2, T, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> operator-(T scalar, vec<2, T, P> const & v) { - return tvec<2, T, P>( + return vec<2, T, P>( scalar - v.x, scalar - v.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator-(tvec<1, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator-(vec<1, T, P> const & v1, vec<2, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x - v2.x, v1.x - v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator-(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator-(vec<2, T, P> const & v1, vec<2, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x - v2.x, v1.y - v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator*(tvec<2, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<2, T, P> operator*(vec<2, T, P> const & v, T scalar) { - return tvec<2, T, P>( + return vec<2, T, P>( v.x * scalar, v.y * scalar); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator*(tvec<2, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator*(vec<2, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x * v2.x, v1.y * v2.x); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator*(T scalar, tvec<2, T, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> operator*(T scalar, vec<2, T, P> const & v) { - return tvec<2, T, P>( + return vec<2, T, P>( scalar * v.x, scalar * v.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator*(tvec<1, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator*(vec<1, T, P> const & v1, vec<2, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x * v2.x, v1.x * v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator*(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator*(vec<2, T, P> const & v1, vec<2, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x * v2.x, v1.y * v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator/(tvec<2, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<2, T, P> operator/(vec<2, T, P> const & v, T scalar) { - return tvec<2, T, P>( + return vec<2, T, P>( v.x / scalar, v.y / scalar); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator/(tvec<2, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator/(vec<2, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x / v2.x, v1.y / v2.x); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator/(T scalar, tvec<2, T, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> operator/(T scalar, vec<2, T, P> const & v) { - return tvec<2, T, P>( + return vec<2, T, P>( scalar / v.x, scalar / v.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator/(tvec<1, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator/(vec<1, T, P> const & v1, vec<2, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x / v2.x, v1.x / v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator/(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator/(vec<2, T, P> const & v1, vec<2, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x / v2.x, v1.y / v2.y); } @@ -606,249 +606,249 @@ namespace glm // -- Binary bit operators -- template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator%(tvec<2, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<2, T, P> operator%(vec<2, T, P> const & v, T scalar) { - return tvec<2, T, P>( + return vec<2, T, P>( v.x % scalar, v.y % scalar); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator%(tvec<2, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator%(vec<2, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x % v2.x, v1.y % v2.x); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator%(T scalar, tvec<2, T, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> operator%(T scalar, vec<2, T, P> const & v) { - return tvec<2, T, P>( + return vec<2, T, P>( scalar % v.x, scalar % v.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator%(tvec<1, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator%(vec<1, T, P> const & v1, vec<2, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x % v2.x, v1.x % v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator%(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator%(vec<2, T, P> const & v1, vec<2, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x % v2.x, v1.y % v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator&(tvec<2, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<2, T, P> operator&(vec<2, T, P> const & v, T scalar) { - return tvec<2, T, P>( + return vec<2, T, P>( v.x & scalar, v.y & scalar); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator&(tvec<2, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator&(vec<2, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x & v2.x, v1.y & v2.x); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator&(T scalar, tvec<2, T, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> operator&(T scalar, vec<2, T, P> const & v) { - return tvec<2, T, P>( + return vec<2, T, P>( scalar & v.x, scalar & v.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator&(tvec<1, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator&(vec<1, T, P> const & v1, vec<2, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x & v2.x, v1.x & v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator&(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator&(vec<2, T, P> const & v1, vec<2, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x & v2.x, v1.y & v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator|(tvec<2, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<2, T, P> operator|(vec<2, T, P> const & v, T scalar) { - return tvec<2, T, P>( + return vec<2, T, P>( v.x | scalar, v.y | scalar); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator|(tvec<2, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator|(vec<2, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x | v2.x, v1.y | v2.x); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator|(T scalar, tvec<2, T, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> operator|(T scalar, vec<2, T, P> const & v) { - return tvec<2, T, P>( + return vec<2, T, P>( scalar | v.x, scalar | v.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator|(tvec<1, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator|(vec<1, T, P> const & v1, vec<2, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x | v2.x, v1.x | v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator|(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator|(vec<2, T, P> const & v1, vec<2, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x | v2.x, v1.y | v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator^(tvec<2, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<2, T, P> operator^(vec<2, T, P> const & v, T scalar) { - return tvec<2, T, P>( + return vec<2, T, P>( v.x ^ scalar, v.y ^ scalar); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator^(tvec<2, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator^(vec<2, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x ^ v2.x, v1.y ^ v2.x); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator^(T scalar, tvec<2, T, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> operator^(T scalar, vec<2, T, P> const & v) { - return tvec<2, T, P>( + return vec<2, T, P>( scalar ^ v.x, scalar ^ v.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator^(tvec<1, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator^(vec<1, T, P> const & v1, vec<2, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x ^ v2.x, v1.x ^ v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator^(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator^(vec<2, T, P> const & v1, vec<2, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x ^ v2.x, v1.y ^ v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator<<(tvec<2, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<2, T, P> operator<<(vec<2, T, P> const & v, T scalar) { - return tvec<2, T, P>( + return vec<2, T, P>( v.x << scalar, v.y << scalar); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator<<(tvec<2, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator<<(vec<2, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x << v2.x, v1.y << v2.x); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator<<(T scalar, tvec<2, T, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> operator<<(T scalar, vec<2, T, P> const & v) { - return tvec<2, T, P>( + return vec<2, T, P>( scalar << v.x, scalar << v.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator<<(tvec<1, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator<<(vec<1, T, P> const & v1, vec<2, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x << v2.x, v1.x << v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator<<(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator<<(vec<2, T, P> const & v1, vec<2, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x << v2.x, v1.y << v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator>>(tvec<2, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<2, T, P> operator>>(vec<2, T, P> const & v, T scalar) { - return tvec<2, T, P>( + return vec<2, T, P>( v.x >> scalar, v.y >> scalar); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator>>(tvec<2, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator>>(vec<2, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x >> v2.x, v1.y >> v2.x); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator>>(T scalar, tvec<2, T, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> operator>>(T scalar, vec<2, T, P> const & v) { - return tvec<2, T, P>( + return vec<2, T, P>( scalar >> v.x, scalar >> v.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator>>(tvec<1, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator>>(vec<1, T, P> const & v1, vec<2, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x >> v2.x, v1.x >> v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator>>(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, T, P> operator>>(vec<2, T, P> const & v1, vec<2, T, P> const & v2) { - return tvec<2, T, P>( + return vec<2, T, P>( v1.x >> v2.x, v1.y >> v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, T, P> operator~(tvec<2, T, P> const & v) + GLM_FUNC_QUALIFIER vec<2, T, P> operator~(vec<2, T, P> const & v) { - return tvec<2, T, P>( + return vec<2, T, P>( ~v.x, ~v.y); } @@ -856,26 +856,26 @@ namespace glm // -- Boolean operators -- template - GLM_FUNC_QUALIFIER bool operator==(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER bool operator==(vec<2, T, P> const & v1, vec<2, T, P> const & v2) { return (v1.x == v2.x) && (v1.y == v2.y); } template - GLM_FUNC_QUALIFIER bool operator!=(tvec<2, T, P> const & v1, tvec<2, T, P> const & v2) + GLM_FUNC_QUALIFIER bool operator!=(vec<2, T, P> const & v1, vec<2, T, P> const & v2) { return (v1.x != v2.x) || (v1.y != v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, bool, P> operator&&(tvec<2, bool, P> const & v1, tvec<2, bool, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, bool, P> operator&&(vec<2, bool, P> const & v1, vec<2, bool, P> const & v2) { - return tvec<2, bool, P>(v1.x && v2.x, v1.y && v2.y); + return vec<2, bool, P>(v1.x && v2.x, v1.y && v2.y); } template - GLM_FUNC_QUALIFIER tvec<2, bool, P> operator||(tvec<2, bool, P> const & v1, tvec<2, bool, P> const & v2) + GLM_FUNC_QUALIFIER vec<2, bool, P> operator||(vec<2, bool, P> const & v1, vec<2, bool, P> const & v2) { - return tvec<2, bool, P>(v1.x || v2.x, v1.y || v2.y); + return vec<2, bool, P>(v1.x || v2.x, v1.y || v2.y); } }//namespace glm diff --git a/glm/detail/type_vec3.hpp b/glm/detail/type_vec3.hpp index 755f4c32..313e27be 100644 --- a/glm/detail/type_vec3.hpp +++ b/glm/detail/type_vec3.hpp @@ -16,13 +16,13 @@ namespace glm { template - struct tvec<3, T, P> + struct vec<3, T, P> { // -- Implementation detail -- typedef T value_type; - typedef tvec type; - typedef tvec<3, bool, P> bool_type; + typedef vec type; + typedef vec<3, bool, P> bool_type; // -- Data -- @@ -83,322 +83,322 @@ namespace glm // -- Implicit basic constructors -- - GLM_FUNC_DECL GLM_CONSTEXPR tvec() GLM_DEFAULT_CTOR; - GLM_FUNC_DECL GLM_CONSTEXPR tvec(tvec const & v) GLM_DEFAULT; + GLM_FUNC_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR; + GLM_FUNC_DECL GLM_CONSTEXPR vec(vec const & v) GLM_DEFAULT; template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(tvec<3, T, Q> const & v); + GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<3, T, Q> const & v); // -- Explicit basic constructors -- - GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec(ctor); - GLM_FUNC_DECL GLM_CONSTEXPR explicit tvec(T scalar); - GLM_FUNC_DECL GLM_CONSTEXPR tvec(T a, T b, T c); + GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit vec(ctor); + GLM_FUNC_DECL GLM_CONSTEXPR explicit vec(T scalar); + GLM_FUNC_DECL GLM_CONSTEXPR vec(T a, T b, T c); // -- Conversion scalar constructors -- /// Explicit converions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(A a, B b, C c); + GLM_FUNC_DECL GLM_CONSTEXPR vec(A a, B b, C c); template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(tvec<1, A, P> const & a, tvec<1, B, P> const & b, tvec<1, C, P> const & c); + GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<1, A, P> const & a, vec<1, B, P> const & b, vec<1, C, P> const & c); // -- Conversion vector constructors -- /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(tvec<2, A, Q> const & a, B b); + GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<2, A, Q> const & a, B b); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(tvec<2, A, Q> const & a, tvec<1, B, Q> const & b); + GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<2, A, Q> const & a, vec<1, B, Q> const & b); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(A a, tvec<2, B, Q> const & b); + GLM_FUNC_DECL GLM_CONSTEXPR vec(A a, vec<2, B, Q> const & b); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(tvec<1, A, Q> const & a, tvec<2, B, Q> const & b); + GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<1, A, Q> const & a, vec<2, B, Q> const & b); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tvec(tvec<4, U, Q> const & v); + GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT vec(vec<4, U, Q> const & v); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tvec(tvec<3, U, Q> const & v); + GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT vec(vec<3, U, Q> const & v); // -- Swizzle constructors -- # if GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED) template - GLM_FUNC_DECL tvec(detail::_swizzle<3, T, P, E0, E1, E2, -1> const & that) + GLM_FUNC_DECL vec(detail::_swizzle<3, T, P, E0, E1, E2, -1> const & that) { *this = that(); } template - GLM_FUNC_DECL tvec(detail::_swizzle<2, T, P, E0, E1, -1, -2> const & v, T const & scalar) + GLM_FUNC_DECL vec(detail::_swizzle<2, T, P, E0, E1, -1, -2> const & v, T const & scalar) { - *this = tvec(v(), scalar); + *this = vec(v(), scalar); } template - GLM_FUNC_DECL tvec(T const & scalar, detail::_swizzle<2, T, P, E0, E1, -1, -2> const & v) + GLM_FUNC_DECL vec(T const & scalar, detail::_swizzle<2, T, P, E0, E1, -1, -2> const & v) { - *this = tvec(scalar, v()); + *this = vec(scalar, v()); } # endif// GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED) // -- Unary arithmetic operators -- - GLM_FUNC_DECL tvec & operator=(tvec const & v) GLM_DEFAULT; + GLM_FUNC_DECL vec & operator=(vec const & v) GLM_DEFAULT; template - GLM_FUNC_DECL tvec & operator=(tvec<3, U, P> const & v); + GLM_FUNC_DECL vec & operator=(vec<3, U, P> const & v); template - GLM_FUNC_DECL tvec & operator+=(U scalar); + GLM_FUNC_DECL vec & operator+=(U scalar); template - GLM_FUNC_DECL tvec & operator+=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator+=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator+=(tvec<3, U, P> const & v); + GLM_FUNC_DECL vec & operator+=(vec<3, U, P> const & v); template - GLM_FUNC_DECL tvec & operator-=(U scalar); + GLM_FUNC_DECL vec & operator-=(U scalar); template - GLM_FUNC_DECL tvec & operator-=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator-=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator-=(tvec<3, U, P> const & v); + GLM_FUNC_DECL vec & operator-=(vec<3, U, P> const & v); template - GLM_FUNC_DECL tvec & operator*=(U scalar); + GLM_FUNC_DECL vec & operator*=(U scalar); template - GLM_FUNC_DECL tvec & operator*=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator*=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator*=(tvec<3, U, P> const & v); + GLM_FUNC_DECL vec & operator*=(vec<3, U, P> const & v); template - GLM_FUNC_DECL tvec & operator/=(U scalar); + GLM_FUNC_DECL vec & operator/=(U scalar); template - GLM_FUNC_DECL tvec & operator/=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator/=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator/=(tvec<3, U, P> const & v); + GLM_FUNC_DECL vec & operator/=(vec<3, U, P> const & v); // -- Increment and decrement operators -- - GLM_FUNC_DECL tvec & operator++(); - GLM_FUNC_DECL tvec & operator--(); - GLM_FUNC_DECL tvec operator++(int); - GLM_FUNC_DECL tvec operator--(int); + GLM_FUNC_DECL vec & operator++(); + GLM_FUNC_DECL vec & operator--(); + GLM_FUNC_DECL vec operator++(int); + GLM_FUNC_DECL vec operator--(int); // -- Unary bit operators -- template - GLM_FUNC_DECL tvec & operator%=(U scalar); + GLM_FUNC_DECL vec & operator%=(U scalar); template - GLM_FUNC_DECL tvec & operator%=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator%=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator%=(tvec<3, U, P> const & v); + GLM_FUNC_DECL vec & operator%=(vec<3, U, P> const & v); template - GLM_FUNC_DECL tvec & operator&=(U scalar); + GLM_FUNC_DECL vec & operator&=(U scalar); template - GLM_FUNC_DECL tvec & operator&=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator&=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator&=(tvec<3, U, P> const & v); + GLM_FUNC_DECL vec & operator&=(vec<3, U, P> const & v); template - GLM_FUNC_DECL tvec & operator|=(U scalar); + GLM_FUNC_DECL vec & operator|=(U scalar); template - GLM_FUNC_DECL tvec & operator|=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator|=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator|=(tvec<3, U, P> const & v); + GLM_FUNC_DECL vec & operator|=(vec<3, U, P> const & v); template - GLM_FUNC_DECL tvec & operator^=(U scalar); + GLM_FUNC_DECL vec & operator^=(U scalar); template - GLM_FUNC_DECL tvec & operator^=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator^=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator^=(tvec<3, U, P> const & v); + GLM_FUNC_DECL vec & operator^=(vec<3, U, P> const & v); template - GLM_FUNC_DECL tvec & operator<<=(U scalar); + GLM_FUNC_DECL vec & operator<<=(U scalar); template - GLM_FUNC_DECL tvec & operator<<=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator<<=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator<<=(tvec<3, U, P> const & v); + GLM_FUNC_DECL vec & operator<<=(vec<3, U, P> const & v); template - GLM_FUNC_DECL tvec & operator>>=(U scalar); + GLM_FUNC_DECL vec & operator>>=(U scalar); template - GLM_FUNC_DECL tvec & operator>>=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec & operator>>=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec & operator>>=(tvec<3, U, P> const & v); + GLM_FUNC_DECL vec & operator>>=(vec<3, U, P> const & v); }; // -- Unary operators -- template - GLM_FUNC_DECL tvec<3, T, P> operator+(tvec<3, T, P> const & v); + GLM_FUNC_DECL vec<3, T, P> operator+(vec<3, T, P> const & v); template - GLM_FUNC_DECL tvec<3, T, P> operator-(tvec<3, T, P> const & v); + GLM_FUNC_DECL vec<3, T, P> operator-(vec<3, T, P> const & v); // -- Binary operators -- template - GLM_FUNC_DECL tvec<3, T, P> operator+(tvec<3, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<3, T, P> operator+(vec<3, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<3, T, P> operator+(tvec<3, T, P> const & v, tvec<1, T, P> const & scalar); + GLM_FUNC_DECL vec<3, T, P> operator+(vec<3, T, P> const & v, vec<1, T, P> const & scalar); template - GLM_FUNC_DECL tvec<3, T, P> operator+(T scalar, tvec<3, T, P> const & v); + GLM_FUNC_DECL vec<3, T, P> operator+(T scalar, vec<3, T, P> const & v); template - GLM_FUNC_DECL tvec<3, T, P> operator+(tvec<1, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator+(vec<1, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator+(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator+(vec<3, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator-(tvec<3, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<3, T, P> operator-(vec<3, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<3, T, P> operator-(tvec<3, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator-(vec<3, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator-(T scalar, tvec<3, T, P> const & v); + GLM_FUNC_DECL vec<3, T, P> operator-(T scalar, vec<3, T, P> const & v); template - GLM_FUNC_DECL tvec<3, T, P> operator-(tvec<1, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator-(vec<1, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator-(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator-(vec<3, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator*(tvec<3, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<3, T, P> operator*(vec<3, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<3, T, P> operator*(tvec<3, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator*(vec<3, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator*(T scalar, tvec<3, T, P> const & v); + GLM_FUNC_DECL vec<3, T, P> operator*(T scalar, vec<3, T, P> const & v); template - GLM_FUNC_DECL tvec<3, T, P> operator*(tvec<1, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator*(vec<1, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator*(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator*(vec<3, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator/(tvec<3, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<3, T, P> operator/(vec<3, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<3, T, P> operator/(tvec<3, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator/(vec<3, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator/(T scalar, tvec<3, T, P> const & v); + GLM_FUNC_DECL vec<3, T, P> operator/(T scalar, vec<3, T, P> const & v); template - GLM_FUNC_DECL tvec<3, T, P> operator/(tvec<1, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator/(vec<1, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator/(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator/(vec<3, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator%(tvec<3, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<3, T, P> operator%(vec<3, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<3, T, P> operator%(tvec<3, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator%(vec<3, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator%(T const & scalar, tvec<3, T, P> const & v); + GLM_FUNC_DECL vec<3, T, P> operator%(T const & scalar, vec<3, T, P> const & v); template - GLM_FUNC_DECL tvec<3, T, P> operator%(tvec<1, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator%(vec<1, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator%(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator%(vec<3, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator&(tvec<3, T, P> const & v1, T scalar); + GLM_FUNC_DECL vec<3, T, P> operator&(vec<3, T, P> const & v1, T scalar); template - GLM_FUNC_DECL tvec<3, T, P> operator&(tvec<3, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator&(vec<3, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator&(T scalar, tvec<3, T, P> const & v); + GLM_FUNC_DECL vec<3, T, P> operator&(T scalar, vec<3, T, P> const & v); template - GLM_FUNC_DECL tvec<3, T, P> operator&(tvec<1, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator&(vec<1, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator&(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator&(vec<3, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator|(tvec<3, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<3, T, P> operator|(vec<3, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<3, T, P> operator|(tvec<3, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator|(vec<3, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator|(T scalar, tvec<3, T, P> const & v); + GLM_FUNC_DECL vec<3, T, P> operator|(T scalar, vec<3, T, P> const & v); template - GLM_FUNC_DECL tvec<3, T, P> operator|(tvec<1, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator|(vec<1, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator|(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator|(vec<3, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator^(tvec<3, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<3, T, P> operator^(vec<3, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<3, T, P> operator^(tvec<3, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator^(vec<3, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator^(T scalar, tvec<3, T, P> const & v); + GLM_FUNC_DECL vec<3, T, P> operator^(T scalar, vec<3, T, P> const & v); template - GLM_FUNC_DECL tvec<3, T, P> operator^(tvec<1, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator^(vec<1, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator^(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator^(vec<3, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator<<(tvec<3, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<3, T, P> operator<<(vec<3, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<3, T, P> operator<<(tvec<3, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator<<(vec<3, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator<<(T scalar, tvec<3, T, P> const & v); + GLM_FUNC_DECL vec<3, T, P> operator<<(T scalar, vec<3, T, P> const & v); template - GLM_FUNC_DECL tvec<3, T, P> operator<<(tvec<1, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator<<(vec<1, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator<<(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator<<(vec<3, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator>>(tvec<3, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<3, T, P> operator>>(vec<3, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<3, T, P> operator>>(tvec<3, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator>>(vec<3, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator>>(T scalar, tvec<3, T, P> const & v); + GLM_FUNC_DECL vec<3, T, P> operator>>(T scalar, vec<3, T, P> const & v); template - GLM_FUNC_DECL tvec<3, T, P> operator>>(tvec<1, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator>>(vec<1, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator>>(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL vec<3, T, P> operator>>(vec<3, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, T, P> operator~(tvec<3, T, P> const & v); + GLM_FUNC_DECL vec<3, T, P> operator~(vec<3, T, P> const & v); // -- Boolean operators -- template - GLM_FUNC_DECL bool operator==(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL bool operator==(vec<3, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL bool operator!=(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2); + GLM_FUNC_DECL bool operator!=(vec<3, T, P> const & v1, vec<3, T, P> const & v2); template - GLM_FUNC_DECL tvec<3, bool, P> operator&&(tvec<3, bool, P> const & v1, tvec<3, bool, P> const & v2); + GLM_FUNC_DECL vec<3, bool, P> operator&&(vec<3, bool, P> const & v1, vec<3, bool, P> const & v2); template - GLM_FUNC_DECL tvec<3, bool, P> operator||(tvec<3, bool, P> const & v1, tvec<3, bool, P> const & v2); + GLM_FUNC_DECL vec<3, bool, P> operator||(vec<3, bool, P> const & v1, vec<3, bool, P> const & v2); }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/detail/type_vec3.inl b/glm/detail/type_vec3.inl index 1ebbf6be..39fb0bf3 100644 --- a/glm/detail/type_vec3.inl +++ b/glm/detail/type_vec3.inl @@ -7,7 +7,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<3, T, P>::tvec() + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec() # ifndef GLM_FORCE_NO_CTOR_INIT : x(0), y(0), z(0) # endif @@ -16,30 +16,30 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<3, T, P>::tvec(tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(vec<3, T, P> const & v) : x(v.x), y(v.y), z(v.z) {} # endif//!GLM_HAS_DEFAULTED_FUNCTIONS template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<3, T, P>::tvec(tvec<3, T, Q> const & v) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(vec<3, T, Q> const & v) : x(v.x), y(v.y), z(v.z) {} // -- Explicit basic constructors -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tvec<3, T, P>::tvec(ctor) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR vec<3, T, P>::vec(ctor) {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<3, T, P>::tvec(T scalar) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(T scalar) : x(scalar), y(scalar), z(scalar) {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<3, T, P>::tvec(T a, T b, T c) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(T a, T b, T c) : x(a), y(b), z(c) {} @@ -47,7 +47,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<3, T, P>::tvec(A a, B b, C c) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(A a, B b, C c) : x(static_cast(a)), y(static_cast(b)), z(static_cast(c)) @@ -55,7 +55,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<3, T, P>::tvec(tvec<1, A, P> const & a, tvec<1, B, P> const & b, tvec<1, C, P> const & c) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(vec<1, A, P> const & a, vec<1, B, P> const & b, vec<1, C, P> const & c) : x(static_cast(a)), y(static_cast(b)), z(static_cast(c)) @@ -65,7 +65,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<3, T, P>::tvec(tvec<2, A, Q> const & a, B b) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(vec<2, A, Q> const & a, B b) : x(static_cast(a.x)), y(static_cast(a.y)), z(static_cast(b)) @@ -73,7 +73,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<3, T, P>::tvec(tvec<2, A, Q> const & a, tvec<1, B, Q> const & b) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(vec<2, A, Q> const & a, vec<1, B, Q> const & b) : x(static_cast(a.x)), y(static_cast(a.y)), z(static_cast(b.x)) @@ -81,7 +81,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<3, T, P>::tvec(A a, tvec<2, B, Q> const & b) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(A a, vec<2, B, Q> const & b) : x(static_cast(a)), y(static_cast(b.x)), z(static_cast(b.y)) @@ -89,7 +89,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<3, T, P>::tvec(tvec<1, A, Q> const & a, tvec<2, B, Q> const & b) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(vec<1, A, Q> const & a, vec<2, B, Q> const & b) : x(static_cast(a.x)), y(static_cast(b.x)), z(static_cast(b.y)) @@ -97,7 +97,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<3, T, P>::tvec(tvec<3, U, Q> const & v) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(vec<3, U, Q> const & v) : x(static_cast(v.x)), y(static_cast(v.y)), z(static_cast(v.z)) @@ -105,7 +105,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<3, T, P>::tvec(tvec<4, U, Q> const & v) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(vec<4, U, Q> const & v) : x(static_cast(v.x)), y(static_cast(v.y)), z(static_cast(v.z)) @@ -114,14 +114,14 @@ namespace glm // -- Component accesses -- template - GLM_FUNC_QUALIFIER T & tvec<3, T, P>::operator[](typename tvec<3, T, P>::length_type i) + GLM_FUNC_QUALIFIER T & vec<3, T, P>::operator[](typename vec<3, T, P>::length_type i) { assert(i >= 0 && i < this->length()); return (&x)[i]; } template - GLM_FUNC_QUALIFIER T const & tvec<3, T, P>::operator[](typename tvec<3, T, P>::length_type i) const + GLM_FUNC_QUALIFIER T const & vec<3, T, P>::operator[](typename vec<3, T, P>::length_type i) const { assert(i >= 0 && i < this->length()); return (&x)[i]; @@ -131,7 +131,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS template - GLM_FUNC_QUALIFIER tvec<3, T, P>& tvec<3, T, P>::operator=(tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P>& vec<3, T, P>::operator=(vec<3, T, P> const & v) { this->x = v.x; this->y = v.y; @@ -142,7 +142,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P>& tvec<3, T, P>::operator=(tvec<3, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P>& vec<3, T, P>::operator=(vec<3, U, P> const & v) { this->x = static_cast(v.x); this->y = static_cast(v.y); @@ -152,7 +152,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator+=(U scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator+=(U scalar) { this->x += static_cast(scalar); this->y += static_cast(scalar); @@ -162,7 +162,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator+=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator+=(vec<1, U, P> const & v) { this->x += static_cast(v.x); this->y += static_cast(v.x); @@ -172,7 +172,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator+=(tvec<3, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator+=(vec<3, U, P> const & v) { this->x += static_cast(v.x); this->y += static_cast(v.y); @@ -182,7 +182,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator-=(U scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator-=(U scalar) { this->x -= static_cast(scalar); this->y -= static_cast(scalar); @@ -192,7 +192,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator-=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator-=(vec<1, U, P> const & v) { this->x -= static_cast(v.x); this->y -= static_cast(v.x); @@ -202,7 +202,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator-=(tvec<3, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator-=(vec<3, U, P> const & v) { this->x -= static_cast(v.x); this->y -= static_cast(v.y); @@ -212,7 +212,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator*=(U scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator*=(U scalar) { this->x *= static_cast(scalar); this->y *= static_cast(scalar); @@ -222,7 +222,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator*=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator*=(vec<1, U, P> const & v) { this->x *= static_cast(v.x); this->y *= static_cast(v.x); @@ -232,7 +232,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator*=(tvec<3, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator*=(vec<3, U, P> const & v) { this->x *= static_cast(v.x); this->y *= static_cast(v.y); @@ -242,7 +242,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator/=(U v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator/=(U v) { this->x /= static_cast(v); this->y /= static_cast(v); @@ -252,7 +252,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator/=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator/=(vec<1, U, P> const & v) { this->x /= static_cast(v.x); this->y /= static_cast(v.x); @@ -262,7 +262,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator/=(tvec<3, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator/=(vec<3, U, P> const & v) { this->x /= static_cast(v.x); this->y /= static_cast(v.y); @@ -273,7 +273,7 @@ namespace glm // -- Increment and decrement operators -- template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator++() + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator++() { ++this->x; ++this->y; @@ -282,7 +282,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator--() + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator--() { --this->x; --this->y; @@ -291,17 +291,17 @@ namespace glm } template - GLM_FUNC_QUALIFIER tvec<3, T, P> tvec<3, T, P>::operator++(int) + GLM_FUNC_QUALIFIER vec<3, T, P> vec<3, T, P>::operator++(int) { - tvec<3, T, P> Result(*this); + vec<3, T, P> Result(*this); ++*this; return Result; } template - GLM_FUNC_QUALIFIER tvec<3, T, P> tvec<3, T, P>::operator--(int) + GLM_FUNC_QUALIFIER vec<3, T, P> vec<3, T, P>::operator--(int) { - tvec<3, T, P> Result(*this); + vec<3, T, P> Result(*this); --*this; return Result; } @@ -310,7 +310,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator%=(U scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator%=(U scalar) { this->x %= scalar; this->y %= scalar; @@ -320,7 +320,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator%=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator%=(vec<1, U, P> const & v) { this->x %= v.x; this->y %= v.x; @@ -330,7 +330,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator%=(tvec<3, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator%=(vec<3, U, P> const & v) { this->x %= v.x; this->y %= v.y; @@ -340,7 +340,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator&=(U scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator&=(U scalar) { this->x &= scalar; this->y &= scalar; @@ -350,7 +350,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator&=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator&=(vec<1, U, P> const & v) { this->x &= v.x; this->y &= v.x; @@ -360,7 +360,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator&=(tvec<3, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator&=(vec<3, U, P> const & v) { this->x &= v.x; this->y &= v.y; @@ -370,7 +370,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator|=(U scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator|=(U scalar) { this->x |= scalar; this->y |= scalar; @@ -380,7 +380,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator|=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator|=(vec<1, U, P> const & v) { this->x |= v.x; this->y |= v.x; @@ -390,7 +390,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator|=(tvec<3, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator|=(vec<3, U, P> const & v) { this->x |= v.x; this->y |= v.y; @@ -400,7 +400,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator^=(U scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator^=(U scalar) { this->x ^= scalar; this->y ^= scalar; @@ -410,7 +410,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator^=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator^=(vec<1, U, P> const & v) { this->x ^= v.x; this->y ^= v.x; @@ -420,7 +420,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator^=(tvec<3, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator^=(vec<3, U, P> const & v) { this->x ^= v.x; this->y ^= v.y; @@ -430,7 +430,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator<<=(U scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator<<=(U scalar) { this->x <<= scalar; this->y <<= scalar; @@ -440,7 +440,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator<<=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator<<=(vec<1, U, P> const & v) { this->x <<= static_cast(v.x); this->y <<= static_cast(v.x); @@ -450,7 +450,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator<<=(tvec<3, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator<<=(vec<3, U, P> const & v) { this->x <<= static_cast(v.x); this->y <<= static_cast(v.y); @@ -460,7 +460,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator>>=(U scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator>>=(U scalar) { this->x >>= static_cast(scalar); this->y >>= static_cast(scalar); @@ -470,7 +470,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator>>=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator>>=(vec<1, U, P> const & v) { this->x >>= static_cast(v.x); this->y >>= static_cast(v.x); @@ -480,7 +480,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec<3, T, P> & tvec<3, T, P>::operator>>=(tvec<3, U, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator>>=(vec<3, U, P> const & v) { this->x >>= static_cast(v.x); this->y >>= static_cast(v.y); @@ -491,15 +491,15 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator+(tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator+(vec<3, T, P> const & v) { return v; } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator-(tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator-(vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( -v.x, -v.y, -v.z); @@ -508,180 +508,180 @@ namespace glm // -- Binary arithmetic operators -- template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator+(tvec<3, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> operator+(vec<3, T, P> const & v, T scalar) { - return tvec<3, T, P>( + return vec<3, T, P>( v.x + scalar, v.y + scalar, v.z + scalar); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator+(tvec<3, T, P> const & v, tvec<1, T, P> const & scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> operator+(vec<3, T, P> const & v, vec<1, T, P> const & scalar) { - return tvec<3, T, P>( + return vec<3, T, P>( v.x + scalar.x, v.y + scalar.x, v.z + scalar.x); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator+(T scalar, tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator+(T scalar, vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( scalar + v.x, scalar + v.y, scalar + v.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator+(tvec<1, T, P> const & scalar, tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator+(vec<1, T, P> const & scalar, vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( scalar.x + v.x, scalar.x + v.y, scalar.x + v.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator+(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<3, T, P> operator+(vec<3, T, P> const & v1, vec<3, T, P> const & v2) { - return tvec<3, T, P>( + return vec<3, T, P>( v1.x + v2.x, v1.y + v2.y, v1.z + v2.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator-(tvec<3, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> operator-(vec<3, T, P> const & v, T scalar) { - return tvec<3, T, P>( + return vec<3, T, P>( v.x - scalar, v.y - scalar, v.z - scalar); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator-(tvec<3, T, P> const & v, tvec<1, T, P> const & scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> operator-(vec<3, T, P> const & v, vec<1, T, P> const & scalar) { - return tvec<3, T, P>( + return vec<3, T, P>( v.x - scalar.x, v.y - scalar.x, v.z - scalar.x); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator-(T scalar, tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator-(T scalar, vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( scalar - v.x, scalar - v.y, scalar - v.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator-(tvec<1, T, P> const & scalar, tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator-(vec<1, T, P> const & scalar, vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( scalar.x - v.x, scalar.x - v.y, scalar.x - v.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator-(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<3, T, P> operator-(vec<3, T, P> const & v1, vec<3, T, P> const & v2) { - return tvec<3, T, P>( + return vec<3, T, P>( v1.x - v2.x, v1.y - v2.y, v1.z - v2.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator*(tvec<3, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> operator*(vec<3, T, P> const & v, T scalar) { - return tvec<3, T, P>( + return vec<3, T, P>( v.x * scalar, v.y * scalar, v.z * scalar); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator*(tvec<3, T, P> const & v, tvec<1, T, P> const & scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> operator*(vec<3, T, P> const & v, vec<1, T, P> const & scalar) { - return tvec<3, T, P>( + return vec<3, T, P>( v.x * scalar.x, v.y * scalar.x, v.z * scalar.x); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator*(T scalar, tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator*(T scalar, vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( scalar * v.x, scalar * v.y, scalar * v.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator*(tvec<1, T, P> const & scalar, tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator*(vec<1, T, P> const & scalar, vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( scalar.x * v.x, scalar.x * v.y, scalar.x * v.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator*(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<3, T, P> operator*(vec<3, T, P> const & v1, vec<3, T, P> const & v2) { - return tvec<3, T, P>( + return vec<3, T, P>( v1.x * v2.x, v1.y * v2.y, v1.z * v2.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator/(tvec<3, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> operator/(vec<3, T, P> const & v, T scalar) { - return tvec<3, T, P>( + return vec<3, T, P>( v.x / scalar, v.y / scalar, v.z / scalar); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator/(tvec<3, T, P> const & v, tvec<1, T, P> const & scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> operator/(vec<3, T, P> const & v, vec<1, T, P> const & scalar) { - return tvec<3, T, P>( + return vec<3, T, P>( v.x / scalar.x, v.y / scalar.x, v.z / scalar.x); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator/(T scalar, tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator/(T scalar, vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( scalar / v.x, scalar / v.y, scalar / v.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator/(tvec<1, T, P> const & scalar, tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator/(vec<1, T, P> const & scalar, vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( scalar.x / v.x, scalar.x / v.y, scalar.x / v.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator/(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<3, T, P> operator/(vec<3, T, P> const & v1, vec<3, T, P> const & v2) { - return tvec<3, T, P>( + return vec<3, T, P>( v1.x / v2.x, v1.y / v2.y, v1.z / v2.z); @@ -690,279 +690,279 @@ namespace glm // -- Binary bit operators -- template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator%(tvec<3, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> operator%(vec<3, T, P> const & v, T scalar) { - return tvec<3, T, P>( + return vec<3, T, P>( v.x % scalar, v.y % scalar, v.z % scalar); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator%(tvec<3, T, P> const & v, tvec<1, T, P> const & scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> operator%(vec<3, T, P> const & v, vec<1, T, P> const & scalar) { - return tvec<3, T, P>( + return vec<3, T, P>( v.x % scalar.x, v.y % scalar.x, v.z % scalar.x); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator%(T scalar, tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator%(T scalar, vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( scalar % v.x, scalar % v.y, scalar % v.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator%(tvec<1, T, P> const & scalar, tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator%(vec<1, T, P> const & scalar, vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( scalar.x % v.x, scalar.x % v.y, scalar.x % v.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator%(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<3, T, P> operator%(vec<3, T, P> const & v1, vec<3, T, P> const & v2) { - return tvec<3, T, P>( + return vec<3, T, P>( v1.x % v2.x, v1.y % v2.y, v1.z % v2.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator&(tvec<3, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> operator&(vec<3, T, P> const & v, T scalar) { - return tvec<3, T, P>( + return vec<3, T, P>( v.x & scalar, v.y & scalar, v.z & scalar); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator&(tvec<3, T, P> const & v, tvec<1, T, P> const & scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> operator&(vec<3, T, P> const & v, vec<1, T, P> const & scalar) { - return tvec<3, T, P>( + return vec<3, T, P>( v.x & scalar.x, v.y & scalar.x, v.z & scalar.x); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator&(T scalar, tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator&(T scalar, vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( scalar & v.x, scalar & v.y, scalar & v.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator&(tvec<1, T, P> const & scalar, tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator&(vec<1, T, P> const & scalar, vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( scalar.x & v.x, scalar.x & v.y, scalar.x & v.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator&(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<3, T, P> operator&(vec<3, T, P> const & v1, vec<3, T, P> const & v2) { - return tvec<3, T, P>( + return vec<3, T, P>( v1.x & v2.x, v1.y & v2.y, v1.z & v2.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator|(tvec<3, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> operator|(vec<3, T, P> const & v, T scalar) { - return tvec<3, T, P>( + return vec<3, T, P>( v.x | scalar, v.y | scalar, v.z | scalar); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator|(tvec<3, T, P> const & v, tvec<1, T, P> const & scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> operator|(vec<3, T, P> const & v, vec<1, T, P> const & scalar) { - return tvec<3, T, P>( + return vec<3, T, P>( v.x | scalar.x, v.y | scalar.x, v.z | scalar.x); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator|(T scalar, tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator|(T scalar, vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( scalar | v.x, scalar | v.y, scalar | v.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator|(tvec<1, T, P> const & scalar, tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator|(vec<1, T, P> const & scalar, vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( scalar.x | v.x, scalar.x | v.y, scalar.x | v.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator|(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<3, T, P> operator|(vec<3, T, P> const & v1, vec<3, T, P> const & v2) { - return tvec<3, T, P>( + return vec<3, T, P>( v1.x | v2.x, v1.y | v2.y, v1.z | v2.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator^(tvec<3, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> operator^(vec<3, T, P> const & v, T scalar) { - return tvec<3, T, P>( + return vec<3, T, P>( v.x ^ scalar, v.y ^ scalar, v.z ^ scalar); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator^(tvec<3, T, P> const & v, tvec<1, T, P> const & scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> operator^(vec<3, T, P> const & v, vec<1, T, P> const & scalar) { - return tvec<3, T, P>( + return vec<3, T, P>( v.x ^ scalar.x, v.y ^ scalar.x, v.z ^ scalar.x); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator^(T scalar, tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator^(T scalar, vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( scalar ^ v.x, scalar ^ v.y, scalar ^ v.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator^(tvec<1, T, P> const & scalar, tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator^(vec<1, T, P> const & scalar, vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( scalar.x ^ v.x, scalar.x ^ v.y, scalar.x ^ v.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator^(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<3, T, P> operator^(vec<3, T, P> const & v1, vec<3, T, P> const & v2) { - return tvec<3, T, P>( + return vec<3, T, P>( v1.x ^ v2.x, v1.y ^ v2.y, v1.z ^ v2.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator<<(tvec<3, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> operator<<(vec<3, T, P> const & v, T scalar) { - return tvec<3, T, P>( + return vec<3, T, P>( v.x << scalar, v.y << scalar, v.z << scalar); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator<<(tvec<3, T, P> const & v, tvec<1, T, P> const & scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> operator<<(vec<3, T, P> const & v, vec<1, T, P> const & scalar) { - return tvec<3, T, P>( + return vec<3, T, P>( v.x << scalar.x, v.y << scalar.x, v.z << scalar.x); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator<<(T scalar, tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator<<(T scalar, vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( scalar << v.x, scalar << v.y, scalar << v.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator<<(tvec<1, T, P> const & scalar, tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator<<(vec<1, T, P> const & scalar, vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( scalar.x << v.x, scalar.x << v.y, scalar.x << v.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator<<(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<3, T, P> operator<<(vec<3, T, P> const & v1, vec<3, T, P> const & v2) { - return tvec<3, T, P>( + return vec<3, T, P>( v1.x << v2.x, v1.y << v2.y, v1.z << v2.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator>>(tvec<3, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> operator>>(vec<3, T, P> const & v, T scalar) { - return tvec<3, T, P>( + return vec<3, T, P>( v.x >> scalar, v.y >> scalar, v.z >> scalar); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator>>(tvec<3, T, P> const & v, tvec<1, T, P> const & scalar) + GLM_FUNC_QUALIFIER vec<3, T, P> operator>>(vec<3, T, P> const & v, vec<1, T, P> const & scalar) { - return tvec<3, T, P>( + return vec<3, T, P>( v.x >> scalar.x, v.y >> scalar.x, v.z >> scalar.x); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator>>(T scalar, tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator>>(T scalar, vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( scalar >> v.x, scalar >> v.y, scalar >> v.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator>>(tvec<1, T, P> const & scalar, tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator>>(vec<1, T, P> const & scalar, vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( scalar.x >> v.x, scalar.x >> v.y, scalar.x >> v.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator>>(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<3, T, P> operator>>(vec<3, T, P> const & v1, vec<3, T, P> const & v2) { - return tvec<3, T, P>( + return vec<3, T, P>( v1.x >> v2.x, v1.y >> v2.y, v1.z >> v2.z); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> operator~(tvec<3, T, P> const & v) + GLM_FUNC_QUALIFIER vec<3, T, P> operator~(vec<3, T, P> const & v) { - return tvec<3, T, P>( + return vec<3, T, P>( ~v.x, ~v.y, ~v.z); @@ -971,26 +971,26 @@ namespace glm // -- Boolean operators -- template - GLM_FUNC_QUALIFIER bool operator==(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2) + GLM_FUNC_QUALIFIER bool operator==(vec<3, T, P> const & v1, vec<3, T, P> const & v2) { return (v1.x == v2.x) && (v1.y == v2.y) && (v1.z == v2.z); } template - GLM_FUNC_QUALIFIER bool operator!=(tvec<3, T, P> const & v1, tvec<3, T, P> const & v2) + GLM_FUNC_QUALIFIER bool operator!=(vec<3, T, P> const & v1, vec<3, T, P> const & v2) { return (v1.x != v2.x) || (v1.y != v2.y) || (v1.z != v2.z); } template - GLM_FUNC_QUALIFIER tvec<3, bool, P> operator&&(tvec<3, bool, P> const & v1, tvec<3, bool, P> const & v2) + GLM_FUNC_QUALIFIER vec<3, bool, P> operator&&(vec<3, bool, P> const & v1, vec<3, bool, P> const & v2) { - return tvec<3, bool, P>(v1.x && v2.x, v1.y && v2.y, v1.z && v2.z); + return vec<3, bool, P>(v1.x && v2.x, v1.y && v2.y, v1.z && v2.z); } template - GLM_FUNC_QUALIFIER tvec<3, bool, P> operator||(tvec<3, bool, P> const & v1, tvec<3, bool, P> const & v2) + GLM_FUNC_QUALIFIER vec<3, bool, P> operator||(vec<3, bool, P> const & v1, vec<3, bool, P> const & v2) { - return tvec<3, bool, P>(v1.x || v2.x, v1.y || v2.y, v1.z || v2.z); + return vec<3, bool, P>(v1.x || v2.x, v1.y || v2.y, v1.z || v2.z); } }//namespace glm diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp index af9ec56a..796e131e 100644 --- a/glm/detail/type_vec4.hpp +++ b/glm/detail/type_vec4.hpp @@ -16,13 +16,13 @@ namespace glm { template - struct tvec<4, T, P> + struct vec<4, T, P> { // -- Implementation detail -- typedef T value_type; - typedef tvec<4, T, P> type; - typedef tvec<4, bool, P> bool_type; + typedef vec<4, T, P> type; + typedef vec<4, bool, P> bool_type; // -- Data -- @@ -86,364 +86,364 @@ namespace glm // -- Implicit basic constructors -- - GLM_FUNC_DECL GLM_CONSTEXPR_SIMD tvec() GLM_DEFAULT_CTOR; - GLM_FUNC_DECL GLM_CONSTEXPR_SIMD tvec(tvec<4, T, P> const& v) GLM_DEFAULT; + GLM_FUNC_DECL GLM_CONSTEXPR_SIMD vec() GLM_DEFAULT_CTOR; + GLM_FUNC_DECL GLM_CONSTEXPR_SIMD vec(vec<4, T, P> const& v) GLM_DEFAULT; template - GLM_FUNC_DECL GLM_CONSTEXPR_SIMD tvec(tvec<4, T, Q> const& v); + GLM_FUNC_DECL GLM_CONSTEXPR_SIMD vec(vec<4, T, Q> const& v); // -- Explicit basic constructors -- - GLM_FUNC_DECL GLM_CONSTEXPR_SIMD explicit tvec(ctor); - GLM_FUNC_DECL GLM_CONSTEXPR_SIMD explicit tvec(T scalar); - GLM_FUNC_DECL GLM_CONSTEXPR_SIMD tvec(T a, T b, T c, T d); + GLM_FUNC_DECL GLM_CONSTEXPR_SIMD explicit vec(ctor); + GLM_FUNC_DECL GLM_CONSTEXPR_SIMD explicit vec(T scalar); + GLM_FUNC_DECL GLM_CONSTEXPR_SIMD vec(T a, T b, T c, T d); // -- Conversion scalar constructors -- /// Explicit converions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR_SIMD tvec(A a, B b, C c, D d); + GLM_FUNC_DECL GLM_CONSTEXPR_SIMD vec(A a, B b, C c, D d); template - GLM_FUNC_DECL GLM_CONSTEXPR_CTOR tvec(tvec<1, A, P> const& a, tvec<1, B, P> const& b, tvec<1, C, P> const& c, tvec<1, D, P> const& d); + GLM_FUNC_DECL GLM_CONSTEXPR_CTOR vec(vec<1, A, P> const& a, vec<1, B, P> const& b, vec<1, C, P> const& c, vec<1, D, P> const& d); // -- Conversion vector constructors -- /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(tvec<2, A, Q> const & a, B b, C c); + GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<2, A, Q> const & a, B b, C c); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(tvec<2, A, Q> const & a, tvec<1, B, Q> const & b, tvec<1, C, Q> const & c); + GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<2, A, Q> const & a, vec<1, B, Q> const & b, vec<1, C, Q> const & c); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(A a, tvec<2, B, Q> const & b, C c); + GLM_FUNC_DECL GLM_CONSTEXPR vec(A a, vec<2, B, Q> const & b, C c); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(tvec<1, A, Q> const & a, tvec<2, B, Q> const & b, tvec<1, C, Q> const & c); + GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<1, A, Q> const & a, vec<2, B, Q> const & b, vec<1, C, Q> const & c); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(A a, B b, tvec<2, C, Q> const & c); + GLM_FUNC_DECL GLM_CONSTEXPR vec(A a, B b, vec<2, C, Q> const & c); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(tvec<1, A, Q> const & a, tvec<1, B, Q> const & b, tvec<2, C, Q> const & c); + GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<1, A, Q> const & a, vec<1, B, Q> const & b, vec<2, C, Q> const & c); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(tvec<3, A, Q> const & a, B b); + GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<3, A, Q> const & a, B b); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(tvec<3, A, Q> const & a, tvec<1, B, Q> const & b); + GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<3, A, Q> const & a, vec<1, B, Q> const & b); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(A a, tvec<3, B, Q> const & b); + GLM_FUNC_DECL GLM_CONSTEXPR vec(A a, vec<3, B, Q> const & b); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(tvec<1, A, Q> const & a, tvec<3, B, Q> const & b); + GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<1, A, Q> const & a, vec<3, B, Q> const & b); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR tvec(tvec<2, A, Q> const & a, tvec<2, B, Q> const & b); + GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<2, A, Q> const & a, vec<2, B, Q> const & b); /// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tvec(tvec<4, U, Q> const& v); + GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT vec(vec<4, U, Q> const& v); // -- Swizzle constructors -- # if GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED) template - GLM_FUNC_DECL tvec(detail::_swizzle<4, T, P, E0, E1, E2, E3> const & that) + GLM_FUNC_DECL vec(detail::_swizzle<4, T, P, E0, E1, E2, E3> const & that) { *this = that(); } template - GLM_FUNC_DECL tvec(detail::_swizzle<2, T, P, E0, E1, -1, -2> const & v, detail::_swizzle<2, T, P, F0, F1, -1, -2> const & u) + GLM_FUNC_DECL vec(detail::_swizzle<2, T, P, E0, E1, -1, -2> const & v, detail::_swizzle<2, T, P, F0, F1, -1, -2> const & u) { - *this = tvec<4, T, P>(v(), u()); + *this = vec<4, T, P>(v(), u()); } template - GLM_FUNC_DECL tvec(T const & x, T const & y, detail::_swizzle<2, T, P, E0, E1, -1, -2> const & v) + GLM_FUNC_DECL vec(T const & x, T const & y, detail::_swizzle<2, T, P, E0, E1, -1, -2> const & v) { - *this = tvec<4, T, P>(x, y, v()); + *this = vec<4, T, P>(x, y, v()); } template - GLM_FUNC_DECL tvec(T const & x, detail::_swizzle<2, T, P, E0, E1, -1, -2> const & v, T const & w) + GLM_FUNC_DECL vec(T const & x, detail::_swizzle<2, T, P, E0, E1, -1, -2> const & v, T const & w) { - *this = tvec<4, T, P>(x, v(), w); + *this = vec<4, T, P>(x, v(), w); } template - GLM_FUNC_DECL tvec(detail::_swizzle<2, T, P, E0, E1, -1, -2> const & v, T const & z, T const & w) + GLM_FUNC_DECL vec(detail::_swizzle<2, T, P, E0, E1, -1, -2> const & v, T const & z, T const & w) { - *this = tvec<4, T, P>(v(), z, w); + *this = vec<4, T, P>(v(), z, w); } template - GLM_FUNC_DECL tvec(detail::_swizzle<3, T, P, E0, E1, E2, -1> const & v, T const & w) + GLM_FUNC_DECL vec(detail::_swizzle<3, T, P, E0, E1, E2, -1> const & v, T const & w) { - *this = tvec<4, T, P>(v(), w); + *this = vec<4, T, P>(v(), w); } template - GLM_FUNC_DECL tvec(T const & x, detail::_swizzle<3, T, P, E0, E1, E2, -1> const & v) + GLM_FUNC_DECL vec(T const & x, detail::_swizzle<3, T, P, E0, E1, E2, -1> const & v) { - *this = tvec<4, T, P>(x, v()); + *this = vec<4, T, P>(x, v()); } # endif// GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED) // -- Unary arithmetic operators -- - GLM_FUNC_DECL tvec<4, T, P> & operator=(tvec<4, T, P> const & v) GLM_DEFAULT; + GLM_FUNC_DECL vec<4, T, P> & operator=(vec<4, T, P> const & v) GLM_DEFAULT; template - GLM_FUNC_DECL tvec<4, T, P> & operator=(tvec<4, U, P> const & v); + GLM_FUNC_DECL vec<4, T, P> & operator=(vec<4, U, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> & operator+=(U scalar); + GLM_FUNC_DECL vec<4, T, P> & operator+=(U scalar); template - GLM_FUNC_DECL tvec<4, T, P> & operator+=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec<4, T, P> & operator+=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> & operator+=(tvec<4, U, P> const & v); + GLM_FUNC_DECL vec<4, T, P> & operator+=(vec<4, U, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> & operator-=(U scalar); + GLM_FUNC_DECL vec<4, T, P> & operator-=(U scalar); template - GLM_FUNC_DECL tvec<4, T, P> & operator-=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec<4, T, P> & operator-=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> & operator-=(tvec<4, U, P> const & v); + GLM_FUNC_DECL vec<4, T, P> & operator-=(vec<4, U, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> & operator*=(U scalar); + GLM_FUNC_DECL vec<4, T, P> & operator*=(U scalar); template - GLM_FUNC_DECL tvec<4, T, P> & operator*=(tvec<1, U, P> const& v); + GLM_FUNC_DECL vec<4, T, P> & operator*=(vec<1, U, P> const& v); template - GLM_FUNC_DECL tvec<4, T, P> & operator*=(tvec<4, U, P> const& v); + GLM_FUNC_DECL vec<4, T, P> & operator*=(vec<4, U, P> const& v); template - GLM_FUNC_DECL tvec<4, T, P> & operator/=(U scalar); + GLM_FUNC_DECL vec<4, T, P> & operator/=(U scalar); template - GLM_FUNC_DECL tvec<4, T, P> & operator/=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec<4, T, P> & operator/=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> & operator/=(tvec<4, U, P> const & v); + GLM_FUNC_DECL vec<4, T, P> & operator/=(vec<4, U, P> const & v); // -- Increment and decrement operators -- - GLM_FUNC_DECL tvec<4, T, P> & operator++(); - GLM_FUNC_DECL tvec<4, T, P> & operator--(); - GLM_FUNC_DECL tvec<4, T, P> operator++(int); - GLM_FUNC_DECL tvec<4, T, P> operator--(int); + GLM_FUNC_DECL vec<4, T, P> & operator++(); + GLM_FUNC_DECL vec<4, T, P> & operator--(); + GLM_FUNC_DECL vec<4, T, P> operator++(int); + GLM_FUNC_DECL vec<4, T, P> operator--(int); // -- Unary bit operators -- template - GLM_FUNC_DECL tvec<4, T, P> & operator%=(U scalar); + GLM_FUNC_DECL vec<4, T, P> & operator%=(U scalar); template - GLM_FUNC_DECL tvec<4, T, P> & operator%=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec<4, T, P> & operator%=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> & operator%=(tvec<4, U, P> const & v); + GLM_FUNC_DECL vec<4, T, P> & operator%=(vec<4, U, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> & operator&=(U scalar); + GLM_FUNC_DECL vec<4, T, P> & operator&=(U scalar); template - GLM_FUNC_DECL tvec<4, T, P> & operator&=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec<4, T, P> & operator&=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> & operator&=(tvec<4, U, P> const & v); + GLM_FUNC_DECL vec<4, T, P> & operator&=(vec<4, U, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> & operator|=(U scalar); + GLM_FUNC_DECL vec<4, T, P> & operator|=(U scalar); template - GLM_FUNC_DECL tvec<4, T, P> & operator|=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec<4, T, P> & operator|=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> & operator|=(tvec<4, U, P> const & v); + GLM_FUNC_DECL vec<4, T, P> & operator|=(vec<4, U, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> & operator^=(U scalar); + GLM_FUNC_DECL vec<4, T, P> & operator^=(U scalar); template - GLM_FUNC_DECL tvec<4, T, P> & operator^=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec<4, T, P> & operator^=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> & operator^=(tvec<4, U, P> const & v); + GLM_FUNC_DECL vec<4, T, P> & operator^=(vec<4, U, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> & operator<<=(U scalar); + GLM_FUNC_DECL vec<4, T, P> & operator<<=(U scalar); template - GLM_FUNC_DECL tvec<4, T, P> & operator<<=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec<4, T, P> & operator<<=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> & operator<<=(tvec<4, U, P> const & v); + GLM_FUNC_DECL vec<4, T, P> & operator<<=(vec<4, U, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> & operator>>=(U scalar); + GLM_FUNC_DECL vec<4, T, P> & operator>>=(U scalar); template - GLM_FUNC_DECL tvec<4, T, P> & operator>>=(tvec<1, U, P> const & v); + GLM_FUNC_DECL vec<4, T, P> & operator>>=(vec<1, U, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> & operator>>=(tvec<4, U, P> const & v); + GLM_FUNC_DECL vec<4, T, P> & operator>>=(vec<4, U, P> const & v); }; // -- Unary operators -- template - GLM_FUNC_DECL tvec<4, T, P> operator+(tvec<4, T, P> const & v); + GLM_FUNC_DECL vec<4, T, P> operator+(vec<4, T, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> operator-(tvec<4, T, P> const & v); + GLM_FUNC_DECL vec<4, T, P> operator-(vec<4, T, P> const & v); // -- Binary operators -- template - GLM_FUNC_DECL tvec<4, T, P> operator+(tvec<4, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<4, T, P> operator+(vec<4, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<4, T, P> operator+(tvec<4, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<4, T, P> operator+(vec<4, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<4, T, P> operator+(T scalar, tvec<4, T, P> const & v); + GLM_FUNC_DECL vec<4, T, P> operator+(T scalar, vec<4, T, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> operator+(tvec<1, T, P> const & v1, tvec<4, T, P> const & v2); + GLM_FUNC_DECL vec<4, T, P> operator+(vec<1, T, P> const & v1, vec<4, T, P> const & v2); template - GLM_FUNC_DECL tvec<4, T, P> operator+(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2); + GLM_FUNC_DECL vec<4, T, P> operator+(vec<4, T, P> const & v1, vec<4, T, P> const & v2); template - GLM_FUNC_DECL tvec<4, T, P> operator-(tvec<4, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<4, T, P> operator-(vec<4, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<4, T, P> operator-(tvec<4, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<4, T, P> operator-(vec<4, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<4, T, P> operator-(T scalar, tvec<4, T, P> const & v); + GLM_FUNC_DECL vec<4, T, P> operator-(T scalar, vec<4, T, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> operator-(tvec<1, T, P> const & v1, tvec<4, T, P> const & v2); + GLM_FUNC_DECL vec<4, T, P> operator-(vec<1, T, P> const & v1, vec<4, T, P> const & v2); template - GLM_FUNC_DECL tvec<4, T, P> operator-(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2); + GLM_FUNC_DECL vec<4, T, P> operator-(vec<4, T, P> const & v1, vec<4, T, P> const & v2); template - GLM_FUNC_DECL tvec<4, T, P> operator*(tvec<4, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<4, T, P> operator*(vec<4, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<4, T, P> operator*(tvec<4, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<4, T, P> operator*(vec<4, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<4, T, P> operator*(T scalar, tvec<4, T, P> const & v); + GLM_FUNC_DECL vec<4, T, P> operator*(T scalar, vec<4, T, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> operator*(tvec<1, T, P> const & v1, tvec<4, T, P> const & v2); + GLM_FUNC_DECL vec<4, T, P> operator*(vec<1, T, P> const & v1, vec<4, T, P> const & v2); template - GLM_FUNC_DECL tvec<4, T, P> operator*(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2); + GLM_FUNC_DECL vec<4, T, P> operator*(vec<4, T, P> const & v1, vec<4, T, P> const & v2); template - GLM_FUNC_DECL tvec<4, T, P> operator/(tvec<4, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<4, T, P> operator/(vec<4, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<4, T, P> operator/(tvec<4, T, P> const & v1, tvec<1, T, P> const & v2); + GLM_FUNC_DECL vec<4, T, P> operator/(vec<4, T, P> const & v1, vec<1, T, P> const & v2); template - GLM_FUNC_DECL tvec<4, T, P> operator/(T scalar, tvec<4, T, P> const & v); + GLM_FUNC_DECL vec<4, T, P> operator/(T scalar, vec<4, T, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> operator/(tvec<1, T, P> const & v1, tvec<4, T, P> const & v2); + GLM_FUNC_DECL vec<4, T, P> operator/(vec<1, T, P> const & v1, vec<4, T, P> const & v2); template - GLM_FUNC_DECL tvec<4, T, P> operator/(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2); + GLM_FUNC_DECL vec<4, T, P> operator/(vec<4, T, P> const & v1, vec<4, T, P> const & v2); template - GLM_FUNC_DECL tvec<4, T, P> operator%(tvec<4, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<4, T, P> operator%(vec<4, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<4, T, P> operator%(tvec<4, T, P> const & v, tvec<1, T, P> const & scalar); + GLM_FUNC_DECL vec<4, T, P> operator%(vec<4, T, P> const & v, vec<1, T, P> const & scalar); template - GLM_FUNC_DECL tvec<4, T, P> operator%(T scalar, tvec<4, T, P> const & v); + GLM_FUNC_DECL vec<4, T, P> operator%(T scalar, vec<4, T, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> operator%(tvec<1, T, P> const & scalar, tvec<4, T, P> const & v); + GLM_FUNC_DECL vec<4, T, P> operator%(vec<1, T, P> const & scalar, vec<4, T, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> operator%(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2); + GLM_FUNC_DECL vec<4, T, P> operator%(vec<4, T, P> const & v1, vec<4, T, P> const & v2); template - GLM_FUNC_DECL tvec<4, T, P> operator&(tvec<4, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<4, T, P> operator&(vec<4, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<4, T, P> operator&(tvec<4, T, P> const & v, tvec<1, T, P> const & scalar); + GLM_FUNC_DECL vec<4, T, P> operator&(vec<4, T, P> const & v, vec<1, T, P> const & scalar); template - GLM_FUNC_DECL tvec<4, T, P> operator&(T scalar, tvec<4, T, P> const & v); + GLM_FUNC_DECL vec<4, T, P> operator&(T scalar, vec<4, T, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> operator&(tvec<1, T, P> const & scalar, tvec<4, T, P> const & v); + GLM_FUNC_DECL vec<4, T, P> operator&(vec<1, T, P> const & scalar, vec<4, T, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> operator&(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2); + GLM_FUNC_DECL vec<4, T, P> operator&(vec<4, T, P> const & v1, vec<4, T, P> const & v2); template - GLM_FUNC_DECL tvec<4, T, P> operator|(tvec<4, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<4, T, P> operator|(vec<4, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<4, T, P> operator|(tvec<4, T, P> const & v, tvec<1, T, P> const & scalar); + GLM_FUNC_DECL vec<4, T, P> operator|(vec<4, T, P> const & v, vec<1, T, P> const & scalar); template - GLM_FUNC_DECL tvec<4, T, P> operator|(T scalar, tvec<4, T, P> const & v); + GLM_FUNC_DECL vec<4, T, P> operator|(T scalar, vec<4, T, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> operator|(tvec<1, T, P> const & scalar, tvec<4, T, P> const & v); + GLM_FUNC_DECL vec<4, T, P> operator|(vec<1, T, P> const & scalar, vec<4, T, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> operator|(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2); + GLM_FUNC_DECL vec<4, T, P> operator|(vec<4, T, P> const & v1, vec<4, T, P> const & v2); template - GLM_FUNC_DECL tvec<4, T, P> operator^(tvec<4, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<4, T, P> operator^(vec<4, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<4, T, P> operator^(tvec<4, T, P> const & v, tvec<1, T, P> const & scalar); + GLM_FUNC_DECL vec<4, T, P> operator^(vec<4, T, P> const & v, vec<1, T, P> const & scalar); template - GLM_FUNC_DECL tvec<4, T, P> operator^(T scalar, tvec<4, T, P> const & v); + GLM_FUNC_DECL vec<4, T, P> operator^(T scalar, vec<4, T, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> operator^(tvec<1, T, P> const & scalar, tvec<4, T, P> const & v); + GLM_FUNC_DECL vec<4, T, P> operator^(vec<1, T, P> const & scalar, vec<4, T, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> operator^(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2); + GLM_FUNC_DECL vec<4, T, P> operator^(vec<4, T, P> const & v1, vec<4, T, P> const & v2); template - GLM_FUNC_DECL tvec<4, T, P> operator<<(tvec<4, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<4, T, P> operator<<(vec<4, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<4, T, P> operator<<(tvec<4, T, P> const & v, tvec<1, T, P> const & scalar); + GLM_FUNC_DECL vec<4, T, P> operator<<(vec<4, T, P> const & v, vec<1, T, P> const & scalar); template - GLM_FUNC_DECL tvec<4, T, P> operator<<(T scalar, tvec<4, T, P> const & v); + GLM_FUNC_DECL vec<4, T, P> operator<<(T scalar, vec<4, T, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> operator<<(tvec<1, T, P> const & scalar, tvec<4, T, P> const & v); + GLM_FUNC_DECL vec<4, T, P> operator<<(vec<1, T, P> const & scalar, vec<4, T, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> operator<<(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2); + GLM_FUNC_DECL vec<4, T, P> operator<<(vec<4, T, P> const & v1, vec<4, T, P> const & v2); template - GLM_FUNC_DECL tvec<4, T, P> operator>>(tvec<4, T, P> const & v, T scalar); + GLM_FUNC_DECL vec<4, T, P> operator>>(vec<4, T, P> const & v, T scalar); template - GLM_FUNC_DECL tvec<4, T, P> operator>>(tvec<4, T, P> const & v, tvec<1, T, P> const & scalar); + GLM_FUNC_DECL vec<4, T, P> operator>>(vec<4, T, P> const & v, vec<1, T, P> const & scalar); template - GLM_FUNC_DECL tvec<4, T, P> operator>>(T scalar, tvec<4, T, P> const & v); + GLM_FUNC_DECL vec<4, T, P> operator>>(T scalar, vec<4, T, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> operator>>(tvec<1, T, P> const & scalar, tvec<4, T, P> const & v); + GLM_FUNC_DECL vec<4, T, P> operator>>(vec<1, T, P> const & scalar, vec<4, T, P> const & v); template - GLM_FUNC_DECL tvec<4, T, P> operator>>(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2); + GLM_FUNC_DECL vec<4, T, P> operator>>(vec<4, T, P> const & v1, vec<4, T, P> const & v2); template - GLM_FUNC_DECL tvec<4, T, P> operator~(tvec<4, T, P> const & v); + GLM_FUNC_DECL vec<4, T, P> operator~(vec<4, T, P> const & v); // -- Boolean operators -- template - GLM_FUNC_DECL bool operator==(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2); + GLM_FUNC_DECL bool operator==(vec<4, T, P> const & v1, vec<4, T, P> const & v2); template - GLM_FUNC_DECL bool operator!=(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2); + GLM_FUNC_DECL bool operator!=(vec<4, T, P> const & v1, vec<4, T, P> const & v2); template - GLM_FUNC_DECL tvec<4, bool, P> operator&&(tvec<4, bool, P> const & v1, tvec<4, bool, P> const & v2); + GLM_FUNC_DECL vec<4, bool, P> operator&&(vec<4, bool, P> const & v1, vec<4, bool, P> const & v2); template - GLM_FUNC_DECL tvec<4, bool, P> operator||(tvec<4, bool, P> const & v1, tvec<4, bool, P> const & v2); + GLM_FUNC_DECL vec<4, bool, P> operator||(vec<4, bool, P> const & v1, vec<4, bool, P> const & v2); }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/detail/type_vec4.inl b/glm/detail/type_vec4.inl index 19e3efd5..d177c5eb 100644 --- a/glm/detail/type_vec4.inl +++ b/glm/detail/type_vec4.inl @@ -37,97 +37,97 @@ namespace detail template struct compute_vec4_add { - GLM_FUNC_QUALIFIER static tvec<4, T, P> call(tvec<4, T, P> const & a, tvec<4, T, P> const & b) + GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & a, vec<4, T, P> const & b) { - return tvec<4, T, P>(a.x + b.x, a.y + b.y, a.z + b.z, a.w + b.w); + return vec<4, T, P>(a.x + b.x, a.y + b.y, a.z + b.z, a.w + b.w); } }; template struct compute_vec4_sub { - GLM_FUNC_QUALIFIER static tvec<4, T, P> call(tvec<4, T, P> const & a, tvec<4, T, P> const & b) + GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & a, vec<4, T, P> const & b) { - return tvec<4, T, P>(a.x - b.x, a.y - b.y, a.z - b.z, a.w - b.w); + return vec<4, T, P>(a.x - b.x, a.y - b.y, a.z - b.z, a.w - b.w); } }; template struct compute_vec4_mul { - GLM_FUNC_QUALIFIER static tvec<4, T, P> call(tvec<4, T, P> const & a, tvec<4, T, P> const & b) + GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & a, vec<4, T, P> const & b) { - return tvec<4, T, P>(a.x * b.x, a.y * b.y, a.z * b.z, a.w * b.w); + return vec<4, T, P>(a.x * b.x, a.y * b.y, a.z * b.z, a.w * b.w); } }; template struct compute_vec4_div { - GLM_FUNC_QUALIFIER static tvec<4, T, P> call(tvec<4, T, P> const & a, tvec<4, T, P> const & b) + GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & a, vec<4, T, P> const & b) { - return tvec<4, T, P>(a.x / b.x, a.y / b.y, a.z / b.z, a.w / b.w); + return vec<4, T, P>(a.x / b.x, a.y / b.y, a.z / b.z, a.w / b.w); } }; template struct compute_vec4_mod { - GLM_FUNC_QUALIFIER static tvec<4, T, P> call(tvec<4, T, P> const & a, tvec<4, T, P> const & b) + GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & a, vec<4, T, P> const & b) { - return tvec<4, T, P>(a.x % b.x, a.y % b.y, a.z % b.z, a.w % b.w); + return vec<4, T, P>(a.x % b.x, a.y % b.y, a.z % b.z, a.w % b.w); } }; template struct compute_vec4_and { - GLM_FUNC_QUALIFIER static tvec<4, T, P> call(tvec<4, T, P> const & a, tvec<4, T, P> const & b) + GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & a, vec<4, T, P> const & b) { - return tvec<4, T, P>(a.x & b.x, a.y & b.y, a.z & b.z, a.w & b.w); + return vec<4, T, P>(a.x & b.x, a.y & b.y, a.z & b.z, a.w & b.w); } }; template struct compute_vec4_or { - GLM_FUNC_QUALIFIER static tvec<4, T, P> call(tvec<4, T, P> const & a, tvec<4, T, P> const & b) + GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & a, vec<4, T, P> const & b) { - return tvec<4, T, P>(a.x | b.x, a.y | b.y, a.z | b.z, a.w | b.w); + return vec<4, T, P>(a.x | b.x, a.y | b.y, a.z | b.z, a.w | b.w); } }; template struct compute_vec4_xor { - GLM_FUNC_QUALIFIER static tvec<4, T, P> call(tvec<4, T, P> const & a, tvec<4, T, P> const & b) + GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & a, vec<4, T, P> const & b) { - return tvec<4, T, P>(a.x ^ b.x, a.y ^ b.y, a.z ^ b.z, a.w ^ b.w); + return vec<4, T, P>(a.x ^ b.x, a.y ^ b.y, a.z ^ b.z, a.w ^ b.w); } }; template struct compute_vec4_shift_left { - GLM_FUNC_QUALIFIER static tvec<4, T, P> call(tvec<4, T, P> const & a, tvec<4, T, P> const & b) + GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & a, vec<4, T, P> const & b) { - return tvec<4, T, P>(a.x << b.x, a.y << b.y, a.z << b.z, a.w << b.w); + return vec<4, T, P>(a.x << b.x, a.y << b.y, a.z << b.z, a.w << b.w); } }; template struct compute_vec4_shift_right { - GLM_FUNC_QUALIFIER static tvec<4, T, P> call(tvec<4, T, P> const & a, tvec<4, T, P> const & b) + GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & a, vec<4, T, P> const & b) { - return tvec<4, T, P>(a.x >> b.x, a.y >> b.y, a.z >> b.z, a.w >> b.w); + return vec<4, T, P>(a.x >> b.x, a.y >> b.y, a.z >> b.z, a.w >> b.w); } }; template struct compute_vec4_equal { - GLM_FUNC_QUALIFIER static bool call(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER static bool call(vec<4, T, P> const & v1, vec<4, T, P> const & v2) { return (v1.x == v2.x) && (v1.y == v2.y) && (v1.z == v2.z) && (v1.w == v2.w); } @@ -136,7 +136,7 @@ namespace detail template struct compute_vec4_nequal { - GLM_FUNC_QUALIFIER static bool call(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER static bool call(vec<4, T, P> const & v1, vec<4, T, P> const & v2) { return (v1.x != v2.x) || (v1.y != v2.y) || (v1.z != v2.z) || (v1.w != v2.w); } @@ -145,9 +145,9 @@ namespace detail template struct compute_vec4_bitwise_not { - GLM_FUNC_QUALIFIER static tvec<4, T, P> call(tvec<4, T, P> const & v) + GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & v) { - return tvec<4, T, P>(~v.x, ~v.y, ~v.z, ~v.w); + return vec<4, T, P>(~v.x, ~v.y, ~v.z, ~v.w); } }; }//namespace detail @@ -156,7 +156,7 @@ namespace detail # if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec<4, T, P>::tvec() + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, T, P>::vec() # ifndef GLM_FORCE_NO_CTOR_INIT : x(0), y(0), z(0), w(0) # endif @@ -165,30 +165,30 @@ namespace detail # if !GLM_HAS_DEFAULTED_FUNCTIONS template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec<4, T, P>::tvec(tvec<4, T, P> const & v) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, T, P>::vec(vec<4, T, P> const & v) : x(v.x), y(v.y), z(v.z), w(v.w) {} # endif//!GLM_HAS_DEFAULTED_FUNCTIONS template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec<4, T, P>::tvec(tvec<4, T, Q> const & v) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, T, P>::vec(vec<4, T, Q> const & v) : x(v.x), y(v.y), z(v.z), w(v.w) {} // -- Explicit basic constructors -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec<4, T, P>::tvec(ctor) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, T, P>::vec(ctor) {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec<4, T, P>::tvec(T scalar) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, T, P>::vec(T scalar) : x(scalar), y(scalar), z(scalar), w(scalar) {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec<4, T, P>::tvec(T a, T b, T c, T d) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, T, P>::vec(T a, T b, T c, T d) : x(a), y(b), z(c), w(d) {} @@ -196,7 +196,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec<4, T, P>::tvec(A a, B b, C c, D d) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, T, P>::vec(A a, B b, C c, D d) : x(static_cast(a)), y(static_cast(b)), z(static_cast(c)), @@ -205,7 +205,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tvec<4, T, P>::tvec(tvec<1, A, P> const & a, tvec<1, B, P> const & b, tvec<1, C, P> const & c, tvec<1, D, P> const & d) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR vec<4, T, P>::vec(vec<1, A, P> const & a, vec<1, B, P> const & b, vec<1, C, P> const & c, vec<1, D, P> const & d) : x(static_cast(a.x)), y(static_cast(b.x)), z(static_cast(c.x)), @@ -216,7 +216,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<4, T, P>::tvec(tvec<2, A, Q> const & a, B b, C c) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(vec<2, A, Q> const & a, B b, C c) : x(static_cast(a.x)), y(static_cast(a.y)), z(static_cast(b)), @@ -225,7 +225,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<4, T, P>::tvec(tvec<2, A, Q> const & a, tvec<1, B, Q> const & b, tvec<1, C, Q> const & c) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(vec<2, A, Q> const & a, vec<1, B, Q> const & b, vec<1, C, Q> const & c) : x(static_cast(a.x)), y(static_cast(a.y)), z(static_cast(b.x)), @@ -234,7 +234,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<4, T, P>::tvec(A s1, tvec<2, B, Q> const & v, C s2) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(A s1, vec<2, B, Q> const & v, C s2) : x(static_cast(s1)), y(static_cast(v.x)), z(static_cast(v.y)), @@ -243,7 +243,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<4, T, P>::tvec(tvec<1, A, Q> const & a, tvec<2, B, Q> const & b, tvec<1, C, Q> const & c) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(vec<1, A, Q> const & a, vec<2, B, Q> const & b, vec<1, C, Q> const & c) : x(static_cast(a.x)), y(static_cast(b.x)), z(static_cast(b.y)), @@ -252,7 +252,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<4, T, P>::tvec(A s1, B s2, tvec<2, C, Q> const & v) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(A s1, B s2, vec<2, C, Q> const & v) : x(static_cast(s1)), y(static_cast(s2)), z(static_cast(v.x)), @@ -261,7 +261,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<4, T, P>::tvec(tvec<1, A, Q> const & a, tvec<1, B, Q> const & b, tvec<2, C, Q> const & c) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(vec<1, A, Q> const & a, vec<1, B, Q> const & b, vec<2, C, Q> const & c) : x(static_cast(a.x)), y(static_cast(b.x)), z(static_cast(c.x)), @@ -270,7 +270,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<4, T, P>::tvec(tvec<3, A, Q> const & a, B b) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(vec<3, A, Q> const & a, B b) : x(static_cast(a.x)), y(static_cast(a.y)), z(static_cast(a.z)), @@ -279,7 +279,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<4, T, P>::tvec(tvec<3, A, Q> const & a, tvec<1, B, Q> const & b) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(vec<3, A, Q> const & a, vec<1, B, Q> const & b) : x(static_cast(a.x)), y(static_cast(a.y)), z(static_cast(a.z)), @@ -288,7 +288,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<4, T, P>::tvec(A a, tvec<3, B, Q> const & b) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(A a, vec<3, B, Q> const & b) : x(static_cast(a)), y(static_cast(b.x)), z(static_cast(b.y)), @@ -297,7 +297,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<4, T, P>::tvec(tvec<1, A, Q> const & a, tvec<3, B, Q> const & b) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(vec<1, A, Q> const & a, vec<3, B, Q> const & b) : x(static_cast(a.x)), y(static_cast(b.x)), z(static_cast(b.y)), @@ -306,7 +306,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<4, T, P>::tvec(tvec<2, A, Q> const & a, tvec<2, B, Q> const & b) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(vec<2, A, Q> const & a, vec<2, B, Q> const & b) : x(static_cast(a.x)), y(static_cast(a.y)), z(static_cast(b.x)), @@ -315,7 +315,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec<4, T, P>::tvec(tvec<4, U, Q> const & v) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(vec<4, U, Q> const & v) : x(static_cast(v.x)), y(static_cast(v.y)), z(static_cast(v.z)), @@ -325,14 +325,14 @@ namespace detail // -- Component accesses -- template - GLM_FUNC_QUALIFIER T & tvec<4, T, P>::operator[](typename tvec<4, T, P>::length_type i) + GLM_FUNC_QUALIFIER T & vec<4, T, P>::operator[](typename vec<4, T, P>::length_type i) { assert(i >= 0 && i < this->length()); return (&x)[i]; } template - GLM_FUNC_QUALIFIER T const & tvec<4, T, P>::operator[](typename tvec<4, T, P>::length_type i) const + GLM_FUNC_QUALIFIER T const & vec<4, T, P>::operator[](typename vec<4, T, P>::length_type i) const { assert(i >= 0 && i < this->length()); return (&x)[i]; @@ -342,7 +342,7 @@ namespace detail # if !GLM_HAS_DEFAULTED_FUNCTIONS template - GLM_FUNC_QUALIFIER tvec<4, T, P>& tvec<4, T, P>::operator=(tvec<4, T, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P>& vec<4, T, P>::operator=(vec<4, T, P> const & v) { this->x = v.x; this->y = v.y; @@ -354,7 +354,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER tvec<4, T, P>& tvec<4, T, P>::operator=(tvec<4, U, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P>& vec<4, T, P>::operator=(vec<4, U, P> const & v) { this->x = static_cast(v.x); this->y = static_cast(v.y); @@ -365,92 +365,92 @@ namespace detail template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator+=(U scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator+=(U scalar) { - return (*this = detail::compute_vec4_add::value>::call(*this, tvec<4, T, P>(scalar))); + return (*this = detail::compute_vec4_add::value>::call(*this, vec<4, T, P>(scalar))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator+=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator+=(vec<1, U, P> const & v) { - return (*this = detail::compute_vec4_add::value>::call(*this, tvec<4, T, P>(v.x))); + return (*this = detail::compute_vec4_add::value>::call(*this, vec<4, T, P>(v.x))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator+=(tvec<4, U, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator+=(vec<4, U, P> const & v) { - return (*this = detail::compute_vec4_add::value>::call(*this, tvec<4, T, P>(v))); + return (*this = detail::compute_vec4_add::value>::call(*this, vec<4, T, P>(v))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator-=(U scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator-=(U scalar) { - return (*this = detail::compute_vec4_sub::value>::call(*this, tvec<4, T, P>(scalar))); + return (*this = detail::compute_vec4_sub::value>::call(*this, vec<4, T, P>(scalar))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator-=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator-=(vec<1, U, P> const & v) { - return (*this = detail::compute_vec4_sub::value>::call(*this, tvec<4, T, P>(v.x))); + return (*this = detail::compute_vec4_sub::value>::call(*this, vec<4, T, P>(v.x))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator-=(tvec<4, U, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator-=(vec<4, U, P> const & v) { - return (*this = detail::compute_vec4_sub::value>::call(*this, tvec<4, T, P>(v))); + return (*this = detail::compute_vec4_sub::value>::call(*this, vec<4, T, P>(v))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator*=(U scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator*=(U scalar) { - return (*this = detail::compute_vec4_mul::value>::call(*this, tvec<4, T, P>(scalar))); + return (*this = detail::compute_vec4_mul::value>::call(*this, vec<4, T, P>(scalar))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator*=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator*=(vec<1, U, P> const & v) { - return (*this = detail::compute_vec4_mul::value>::call(*this, tvec<4, T, P>(v.x))); + return (*this = detail::compute_vec4_mul::value>::call(*this, vec<4, T, P>(v.x))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator*=(tvec<4, U, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator*=(vec<4, U, P> const & v) { - return (*this = detail::compute_vec4_mul::value>::call(*this, tvec<4, T, P>(v))); + return (*this = detail::compute_vec4_mul::value>::call(*this, vec<4, T, P>(v))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator/=(U scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator/=(U scalar) { - return (*this = detail::compute_vec4_div::value>::call(*this, tvec<4, T, P>(scalar))); + return (*this = detail::compute_vec4_div::value>::call(*this, vec<4, T, P>(scalar))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator/=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator/=(vec<1, U, P> const & v) { - return (*this = detail::compute_vec4_div::value>::call(*this, tvec<4, T, P>(v.x))); + return (*this = detail::compute_vec4_div::value>::call(*this, vec<4, T, P>(v.x))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator/=(tvec<4, U, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator/=(vec<4, U, P> const & v) { - return (*this = detail::compute_vec4_div::value>::call(*this, tvec<4, T, P>(v))); + return (*this = detail::compute_vec4_div::value>::call(*this, vec<4, T, P>(v))); } // -- Increment and decrement operators -- template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator++() + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator++() { ++this->x; ++this->y; @@ -460,7 +460,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator--() + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator--() { --this->x; --this->y; @@ -470,17 +470,17 @@ namespace detail } template - GLM_FUNC_QUALIFIER tvec<4, T, P> tvec<4, T, P>::operator++(int) + GLM_FUNC_QUALIFIER vec<4, T, P> vec<4, T, P>::operator++(int) { - tvec<4, T, P> Result(*this); + vec<4, T, P> Result(*this); ++*this; return Result; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> tvec<4, T, P>::operator--(int) + GLM_FUNC_QUALIFIER vec<4, T, P> vec<4, T, P>::operator--(int) { - tvec<4, T, P> Result(*this); + vec<4, T, P> Result(*this); --*this; return Result; } @@ -489,450 +489,450 @@ namespace detail template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator%=(U scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator%=(U scalar) { - return (*this = detail::compute_vec4_mod::value>::call(*this, tvec<4, T, P>(scalar))); + return (*this = detail::compute_vec4_mod::value>::call(*this, vec<4, T, P>(scalar))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator%=(tvec<1, U, P> const& v) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator%=(vec<1, U, P> const& v) { - return (*this = detail::compute_vec4_mod::value>::call(*this, tvec<4, T, P>(v))); + return (*this = detail::compute_vec4_mod::value>::call(*this, vec<4, T, P>(v))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator%=(tvec<4, U, P> const& v) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator%=(vec<4, U, P> const& v) { - return (*this = detail::compute_vec4_mod::value>::call(*this, tvec<4, T, P>(v))); + return (*this = detail::compute_vec4_mod::value>::call(*this, vec<4, T, P>(v))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator&=(U scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator&=(U scalar) { - return (*this = detail::compute_vec4_and::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, tvec<4, T, P>(scalar))); + return (*this = detail::compute_vec4_and::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, vec<4, T, P>(scalar))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator&=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator&=(vec<1, U, P> const & v) { - return (*this = detail::compute_vec4_and::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, tvec<4, T, P>(v))); + return (*this = detail::compute_vec4_and::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, vec<4, T, P>(v))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator&=(tvec<4, U, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator&=(vec<4, U, P> const & v) { - return (*this = detail::compute_vec4_and::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, tvec<4, T, P>(v))); + return (*this = detail::compute_vec4_and::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, vec<4, T, P>(v))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator|=(U scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator|=(U scalar) { - return (*this = detail::compute_vec4_or::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, tvec<4, T, P>(scalar))); + return (*this = detail::compute_vec4_or::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, vec<4, T, P>(scalar))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator|=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator|=(vec<1, U, P> const & v) { - return (*this = detail::compute_vec4_or::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, tvec<4, T, P>(v))); + return (*this = detail::compute_vec4_or::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, vec<4, T, P>(v))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator|=(tvec<4, U, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator|=(vec<4, U, P> const & v) { - return (*this = detail::compute_vec4_or::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, tvec<4, T, P>(v))); + return (*this = detail::compute_vec4_or::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, vec<4, T, P>(v))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator^=(U scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator^=(U scalar) { - return (*this = detail::compute_vec4_xor::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, tvec<4, T, P>(scalar))); + return (*this = detail::compute_vec4_xor::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, vec<4, T, P>(scalar))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator^=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator^=(vec<1, U, P> const & v) { - return (*this = detail::compute_vec4_xor::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, tvec<4, T, P>(v))); + return (*this = detail::compute_vec4_xor::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, vec<4, T, P>(v))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator^=(tvec<4, U, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator^=(vec<4, U, P> const & v) { - return (*this = detail::compute_vec4_xor::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, tvec<4, T, P>(v))); + return (*this = detail::compute_vec4_xor::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, vec<4, T, P>(v))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator<<=(U scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator<<=(U scalar) { - return (*this = detail::compute_vec4_shift_left::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, tvec<4, T, P>(scalar))); + return (*this = detail::compute_vec4_shift_left::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, vec<4, T, P>(scalar))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator<<=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator<<=(vec<1, U, P> const & v) { - return (*this = detail::compute_vec4_shift_left::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, tvec<4, T, P>(v))); + return (*this = detail::compute_vec4_shift_left::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, vec<4, T, P>(v))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator<<=(tvec<4, U, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator<<=(vec<4, U, P> const & v) { - return (*this = detail::compute_vec4_shift_left::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, tvec<4, T, P>(v))); + return (*this = detail::compute_vec4_shift_left::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, vec<4, T, P>(v))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator>>=(U scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator>>=(U scalar) { - return (*this = detail::compute_vec4_shift_right::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, tvec<4, T, P>(scalar))); + return (*this = detail::compute_vec4_shift_right::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, vec<4, T, P>(scalar))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator>>=(tvec<1, U, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator>>=(vec<1, U, P> const & v) { - return (*this = detail::compute_vec4_shift_right::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, tvec<4, T, P>(v))); + return (*this = detail::compute_vec4_shift_right::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, vec<4, T, P>(v))); } template template - GLM_FUNC_QUALIFIER tvec<4, T, P> & tvec<4, T, P>::operator>>=(tvec<4, U, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator>>=(vec<4, U, P> const & v) { - return (*this = detail::compute_vec4_shift_right::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, tvec<4, T, P>(v))); + return (*this = detail::compute_vec4_shift_right::value, sizeof(T) * 8, detail::is_aligned

::value>::call(*this, vec<4, T, P>(v))); } // -- Unary constant operators -- template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator+(tvec<4, T, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> operator+(vec<4, T, P> const & v) { return v; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator-(tvec<4, T, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> operator-(vec<4, T, P> const & v) { - return tvec<4, T, P>(0) -= v; + return vec<4, T, P>(0) -= v; } // -- Binary arithmetic operators -- template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator+(tvec<4, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> operator+(vec<4, T, P> const & v, T scalar) { - return tvec<4, T, P>(v) += scalar; + return vec<4, T, P>(v) += scalar; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator+(tvec<4, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator+(vec<4, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<4, T, P>(v1) += v2; + return vec<4, T, P>(v1) += v2; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator+(T scalar, tvec<4, T, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> operator+(T scalar, vec<4, T, P> const & v) { - return tvec<4, T, P>(v) += scalar; + return vec<4, T, P>(v) += scalar; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator+(tvec<1, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator+(vec<1, T, P> const & v1, vec<4, T, P> const & v2) { - return tvec<4, T, P>(v2) += v1; + return vec<4, T, P>(v2) += v1; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator+(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator+(vec<4, T, P> const & v1, vec<4, T, P> const & v2) { - return tvec<4, T, P>(v1) += v2; + return vec<4, T, P>(v1) += v2; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator-(tvec<4, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> operator-(vec<4, T, P> const & v, T scalar) { - return tvec<4, T, P>(v) -= scalar; + return vec<4, T, P>(v) -= scalar; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator-(tvec<4, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator-(vec<4, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<4, T, P>(v1) -= v2; + return vec<4, T, P>(v1) -= v2; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator-(T scalar, tvec<4, T, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> operator-(T scalar, vec<4, T, P> const & v) { - return tvec<4, T, P>(scalar) -= v; + return vec<4, T, P>(scalar) -= v; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator-(tvec<1, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator-(vec<1, T, P> const & v1, vec<4, T, P> const & v2) { - return tvec<4, T, P>(v1.x) -= v2; + return vec<4, T, P>(v1.x) -= v2; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator-(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator-(vec<4, T, P> const & v1, vec<4, T, P> const & v2) { - return tvec<4, T, P>(v1) -= v2; + return vec<4, T, P>(v1) -= v2; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator*(tvec<4, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> operator*(vec<4, T, P> const & v, T scalar) { - return tvec<4, T, P>(v) *= scalar; + return vec<4, T, P>(v) *= scalar; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator*(tvec<4, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator*(vec<4, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<4, T, P>(v1) *= v2; + return vec<4, T, P>(v1) *= v2; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator*(T scalar, tvec<4, T, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> operator*(T scalar, vec<4, T, P> const & v) { - return tvec<4, T, P>(v) *= scalar; + return vec<4, T, P>(v) *= scalar; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator*(tvec<1, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator*(vec<1, T, P> const & v1, vec<4, T, P> const & v2) { - return tvec<4, T, P>(v2) *= v1; + return vec<4, T, P>(v2) *= v1; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator*(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator*(vec<4, T, P> const & v1, vec<4, T, P> const & v2) { - return tvec<4, T, P>(v1) *= v2; + return vec<4, T, P>(v1) *= v2; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator/(tvec<4, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> operator/(vec<4, T, P> const & v, T scalar) { - return tvec<4, T, P>(v) /= scalar; + return vec<4, T, P>(v) /= scalar; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator/(tvec<4, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator/(vec<4, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<4, T, P>(v1) /= v2; + return vec<4, T, P>(v1) /= v2; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator/(T scalar, tvec<4, T, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> operator/(T scalar, vec<4, T, P> const & v) { - return tvec<4, T, P>(scalar) /= v; + return vec<4, T, P>(scalar) /= v; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator/(tvec<1, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator/(vec<1, T, P> const & v1, vec<4, T, P> const & v2) { - return tvec<4, T, P>(v1.x) /= v2; + return vec<4, T, P>(v1.x) /= v2; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator/(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator/(vec<4, T, P> const & v1, vec<4, T, P> const & v2) { - return tvec<4, T, P>(v1) /= v2; + return vec<4, T, P>(v1) /= v2; } // -- Binary bit operators -- template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator%(tvec<4, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> operator%(vec<4, T, P> const & v, T scalar) { - return tvec<4, T, P>(v) %= scalar; + return vec<4, T, P>(v) %= scalar; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator%(tvec<4, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator%(vec<4, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<4, T, P>(v1) %= v2.x; + return vec<4, T, P>(v1) %= v2.x; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator%(T scalar, tvec<4, T, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> operator%(T scalar, vec<4, T, P> const & v) { - return tvec<4, T, P>(scalar) %= v; + return vec<4, T, P>(scalar) %= v; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator%(tvec<1, T, P> const & scalar, tvec<4, T, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> operator%(vec<1, T, P> const & scalar, vec<4, T, P> const & v) { - return tvec<4, T, P>(scalar.x) %= v; + return vec<4, T, P>(scalar.x) %= v; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator%(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator%(vec<4, T, P> const & v1, vec<4, T, P> const & v2) { - return tvec<4, T, P>(v1) %= v2; + return vec<4, T, P>(v1) %= v2; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator&(tvec<4, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> operator&(vec<4, T, P> const & v, T scalar) { - return tvec<4, T, P>(v) &= scalar; + return vec<4, T, P>(v) &= scalar; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator&(tvec<4, T, P> const & v, tvec<1, T, P> const & scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> operator&(vec<4, T, P> const & v, vec<1, T, P> const & scalar) { - return tvec<4, T, P>(v) &= scalar; + return vec<4, T, P>(v) &= scalar; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator&(T scalar, tvec<4, T, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> operator&(T scalar, vec<4, T, P> const & v) { - return tvec<4, T, P>(scalar) &= v; + return vec<4, T, P>(scalar) &= v; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator&(tvec<1, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator&(vec<1, T, P> const & v1, vec<4, T, P> const & v2) { - return tvec<4, T, P>(v1.x) &= v2; + return vec<4, T, P>(v1.x) &= v2; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator&(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator&(vec<4, T, P> const & v1, vec<4, T, P> const & v2) { - return tvec<4, T, P>(v1) &= v2; + return vec<4, T, P>(v1) &= v2; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator|(tvec<4, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> operator|(vec<4, T, P> const & v, T scalar) { - return tvec<4, T, P>(v) |= scalar; + return vec<4, T, P>(v) |= scalar; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator|(tvec<4, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator|(vec<4, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<4, T, P>(v1) |= v2.x; + return vec<4, T, P>(v1) |= v2.x; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator|(T scalar, tvec<4, T, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> operator|(T scalar, vec<4, T, P> const & v) { - return tvec<4, T, P>(scalar) |= v; + return vec<4, T, P>(scalar) |= v; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator|(tvec<1, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator|(vec<1, T, P> const & v1, vec<4, T, P> const & v2) { - return tvec<4, T, P>(v1.x) |= v2; + return vec<4, T, P>(v1.x) |= v2; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator|(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator|(vec<4, T, P> const & v1, vec<4, T, P> const & v2) { - return tvec<4, T, P>(v1) |= v2; + return vec<4, T, P>(v1) |= v2; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator^(tvec<4, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> operator^(vec<4, T, P> const & v, T scalar) { - return tvec<4, T, P>(v) ^= scalar; + return vec<4, T, P>(v) ^= scalar; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator^(tvec<4, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator^(vec<4, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<4, T, P>(v1) ^= v2.x; + return vec<4, T, P>(v1) ^= v2.x; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator^(T scalar, tvec<4, T, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> operator^(T scalar, vec<4, T, P> const & v) { - return tvec<4, T, P>(scalar) ^= v; + return vec<4, T, P>(scalar) ^= v; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator^(tvec<1, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator^(vec<1, T, P> const & v1, vec<4, T, P> const & v2) { - return tvec<4, T, P>(v1.x) ^= v2; + return vec<4, T, P>(v1.x) ^= v2; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator^(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator^(vec<4, T, P> const & v1, vec<4, T, P> const & v2) { - return tvec<4, T, P>(v1) ^= v2; + return vec<4, T, P>(v1) ^= v2; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator<<(tvec<4, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> operator<<(vec<4, T, P> const & v, T scalar) { - return tvec<4, T, P>(v) <<= scalar; + return vec<4, T, P>(v) <<= scalar; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator<<(tvec<4, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator<<(vec<4, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<4, T, P>(v1) <<= v2.x; + return vec<4, T, P>(v1) <<= v2.x; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator<<(T scalar, tvec<4, T, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> operator<<(T scalar, vec<4, T, P> const & v) { - return tvec<4, T, P>(scalar) <<= v; + return vec<4, T, P>(scalar) <<= v; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator<<(tvec<1, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator<<(vec<1, T, P> const & v1, vec<4, T, P> const & v2) { - return tvec<4, T, P>(v1.x) <<= v2; + return vec<4, T, P>(v1.x) <<= v2; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator<<(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator<<(vec<4, T, P> const & v1, vec<4, T, P> const & v2) { - return tvec<4, T, P>(v1) <<= v2; + return vec<4, T, P>(v1) <<= v2; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator>>(tvec<4, T, P> const & v, T scalar) + GLM_FUNC_QUALIFIER vec<4, T, P> operator>>(vec<4, T, P> const & v, T scalar) { - return tvec<4, T, P>(v) >>= scalar; + return vec<4, T, P>(v) >>= scalar; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator>>(tvec<4, T, P> const & v1, tvec<1, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator>>(vec<4, T, P> const & v1, vec<1, T, P> const & v2) { - return tvec<4, T, P>(v1) >>= v2.x; + return vec<4, T, P>(v1) >>= v2.x; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator>>(T scalar, tvec<4, T, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> operator>>(T scalar, vec<4, T, P> const & v) { - return tvec<4, T, P>(scalar) >>= v; + return vec<4, T, P>(scalar) >>= v; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator>>(tvec<1, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator>>(vec<1, T, P> const & v1, vec<4, T, P> const & v2) { - return tvec<4, T, P>(v1.x) >>= v2; + return vec<4, T, P>(v1.x) >>= v2; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator>>(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, T, P> operator>>(vec<4, T, P> const & v1, vec<4, T, P> const & v2) { - return tvec<4, T, P>(v1) >>= v2; + return vec<4, T, P>(v1) >>= v2; } template - GLM_FUNC_QUALIFIER tvec<4, T, P> operator~(tvec<4, T, P> const & v) + GLM_FUNC_QUALIFIER vec<4, T, P> operator~(vec<4, T, P> const & v) { return detail::compute_vec4_bitwise_not::value, sizeof(T) * 8, detail::is_aligned

::value>::call(v); } @@ -940,27 +940,27 @@ namespace detail // -- Boolean operators -- template - GLM_FUNC_QUALIFIER bool operator==(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER bool operator==(vec<4, T, P> const & v1, vec<4, T, P> const & v2) { return detail::compute_vec4_equal::value, sizeof(T) * 8, detail::is_aligned

::value>::call(v1, v2); } template - GLM_FUNC_QUALIFIER bool operator!=(tvec<4, T, P> const & v1, tvec<4, T, P> const & v2) + GLM_FUNC_QUALIFIER bool operator!=(vec<4, T, P> const & v1, vec<4, T, P> const & v2) { return detail::compute_vec4_nequal::value, sizeof(T) * 8, detail::is_aligned

::value>::call(v1, v2); } template - GLM_FUNC_QUALIFIER tvec<4, bool, P> operator&&(tvec<4, bool, P> const & v1, tvec<4, bool, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, bool, P> operator&&(vec<4, bool, P> const & v1, vec<4, bool, P> const & v2) { - return tvec<4, bool, P>(v1.x && v2.x, v1.y && v2.y, v1.z && v2.z, v1.w && v2.w); + return vec<4, bool, P>(v1.x && v2.x, v1.y && v2.y, v1.z && v2.z, v1.w && v2.w); } template - GLM_FUNC_QUALIFIER tvec<4, bool, P> operator||(tvec<4, bool, P> const & v1, tvec<4, bool, P> const & v2) + GLM_FUNC_QUALIFIER vec<4, bool, P> operator||(vec<4, bool, P> const & v1, vec<4, bool, P> const & v2) { - return tvec<4, bool, P>(v1.x || v2.x, v1.y || v2.y, v1.z || v2.z, v1.w || v2.w); + return vec<4, bool, P>(v1.x || v2.x, v1.y || v2.y, v1.z || v2.z, v1.w || v2.w); } }//namespace glm diff --git a/glm/detail/type_vec4_simd.inl b/glm/detail/type_vec4_simd.inl index 370d65d5..b8fc40f0 100644 --- a/glm/detail/type_vec4_simd.inl +++ b/glm/detail/type_vec4_simd.inl @@ -341,21 +341,21 @@ namespace detail # if !GLM_HAS_DEFAULTED_FUNCTIONS template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec() + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec() # ifndef GLM_FORCE_NO_CTOR_INIT : data(_mm_setzero_ps()) # endif {} template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec() + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec() # ifndef GLM_FORCE_NO_CTOR_INIT : data(_mm_setzero_ps()) # endif {} template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec() + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec() # ifndef GLM_FORCE_NO_CTOR_INIT : data(_mm_setzero_ps()) # endif @@ -363,117 +363,117 @@ namespace detail # endif//!GLM_HAS_DEFAULTED_FUNCTIONS template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(float s) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(float s) : data(_mm_set1_ps(s)) {} template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(float s) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(float s) : data(_mm_set1_ps(s)) {} template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(float s) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(float s) : data(_mm_set1_ps(s)) {} # if GLM_ARCH & GLM_ARCH_AVX_BIT template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(double s) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(double s) : data(_mm256_set1_pd(s)) {} template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(double s) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(double s) : data(_mm256_set1_pd(s)) {} template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(double s) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(double s) : data(_mm256_set1_pd(s)) {} # endif template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(int32 s) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(int32 s) : data(_mm_set1_epi32(s)) {} template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(int32 s) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(int32 s) : data(_mm_set1_epi32(s)) {} template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(int32 s) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(int32 s) : data(_mm_set1_epi32(s)) {} # if GLM_ARCH & GLM_ARCH_AVX2_BIT template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(int64 s) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(int64 s) : data(_mm256_set1_epi64x(s)) {} template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(int64 s) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(int64 s) : data(_mm256_set1_epi64x(s)) {} template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(int64 s) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(int64 s) : data(_mm256_set1_epi64x(s)) {} # endif template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(float a, float b, float c, float d) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(float a, float b, float c, float d) : data(_mm_set_ps(d, c, b, a)) {} template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(float a, float b, float c, float d) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(float a, float b, float c, float d) : data(_mm_set_ps(d, c, b, a)) {} template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(float a, float b, float c, float d) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(float a, float b, float c, float d) : data(_mm_set_ps(d, c, b, a)) {} template <> template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(int32 a, int32 b, int32 c, int32 d) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(int32 a, int32 b, int32 c, int32 d) : data(_mm_set_epi32(d, c, b, a)) {} template <> template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(int32 a, int32 b, int32 c, int32 d) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(int32 a, int32 b, int32 c, int32 d) : data(_mm_set_epi32(d, c, b, a)) {} template <> template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(int32 a, int32 b, int32 c, int32 d) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(int32 a, int32 b, int32 c, int32 d) : data(_mm_set_epi32(d, c, b, a)) {} template <> template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(int32 a, int32 b, int32 c, int32 d) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(int32 a, int32 b, int32 c, int32 d) : data(_mm_castsi128_ps(_mm_set_epi32(d, c, b, a))) {} template <> template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(int32 a, int32 b, int32 c, int32 d) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(int32 a, int32 b, int32 c, int32 d) : data(_mm_castsi128_ps(_mm_set_epi32(d, c, b, a))) {} template <> template <> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec(int32 a, int32 b, int32 c, int32 d) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::vec(int32 a, int32 b, int32 c, int32 d) : data(_mm_castsi128_ps(_mm_set_epi32(d, c, b, a))) {} }//namespace glm diff --git a/glm/gtc/color_space.inl b/glm/gtc/color_space.inl index 3b244b3b..047a4abd 100644 --- a/glm/gtc/color_space.inl +++ b/glm/gtc/color_space.inl @@ -19,11 +19,11 @@ namespace detail }; template - struct compute_rgbToSrgb<4, T, P, tvec> + struct compute_rgbToSrgb<4, T, P, vec> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const& ColorRGB, T GammaCorrection) { - return tvec4(compute_rgbToSrgb<3, T, P, tvec>::call(tvec3(ColorRGB), GammaCorrection), ColorRGB.a); + return tvec4(compute_rgbToSrgb<3, T, P, vec>::call(tvec3(ColorRGB), GammaCorrection), ColorRGB.a); } }; @@ -40,11 +40,11 @@ namespace detail }; template - struct compute_srgbToRgb<4, T, P, tvec> + struct compute_srgbToRgb<4, T, P, vec> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const& ColorSRGB, T Gamma) { - return tvec4(compute_srgbToRgb<3, T, P, tvec>::call(tvec3(ColorSRGB), Gamma), ColorSRGB.a); + return tvec4(compute_srgbToRgb<3, T, P, vec>::call(tvec3(ColorSRGB), Gamma), ColorSRGB.a); } }; }//namespace detail diff --git a/glm/gtc/integer.inl b/glm/gtc/integer.inl index cf72066f..530db8b7 100644 --- a/glm/gtc/integer.inl +++ b/glm/gtc/integer.inl @@ -17,7 +17,7 @@ namespace detail # if GLM_HAS_BITSCAN_WINDOWS template - struct compute_log2<4, int, P, tvec, false, Aligned> + struct compute_log2<4, int, P, vec, false, Aligned> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & vec) { diff --git a/glm/gtc/packing.inl b/glm/gtc/packing.inl index e8abd9e9..28d1dcbd 100644 --- a/glm/gtc/packing.inl +++ b/glm/gtc/packing.inl @@ -275,9 +275,9 @@ namespace detail {}; template - struct compute_half<1, P, tvec> + struct compute_half<1, P, vec> { - GLM_FUNC_QUALIFIER static tvec<1, uint16, P> pack(tvec<1, float, P> const & v) + GLM_FUNC_QUALIFIER static vec<1, uint16, P> pack(vec<1, float, P> const & v) { int16 const Unpack(detail::toFloat16(v.x)); u16vec1 Packed(uninitialize); @@ -285,68 +285,68 @@ namespace detail return Packed; } - GLM_FUNC_QUALIFIER static tvec<1, float, P> unpack(tvec<1, uint16, P> const & v) + GLM_FUNC_QUALIFIER static vec<1, float, P> unpack(vec<1, uint16, P> const & v) { i16vec1 Unpack(uninitialize); memcpy(&Unpack, &v, sizeof(Unpack)); - return tvec<1, float, P>(detail::toFloat32(v.x)); + return vec<1, float, P>(detail::toFloat32(v.x)); } }; template - struct compute_half<2, P, tvec> + struct compute_half<2, P, vec> { - GLM_FUNC_QUALIFIER static tvec<2, uint16, P> pack(tvec<2, float, P> const & v) + GLM_FUNC_QUALIFIER static vec<2, uint16, P> pack(vec<2, float, P> const & v) { - tvec<2, int16, P> const Unpack(detail::toFloat16(v.x), detail::toFloat16(v.y)); + vec<2, int16, P> const Unpack(detail::toFloat16(v.x), detail::toFloat16(v.y)); u16vec2 Packed(uninitialize); memcpy(&Packed, &Unpack, sizeof(Packed)); return Packed; } - GLM_FUNC_QUALIFIER static tvec<2, float, P> unpack(tvec<2, uint16, P> const & v) + GLM_FUNC_QUALIFIER static vec<2, float, P> unpack(vec<2, uint16, P> const & v) { i16vec2 Unpack(uninitialize); memcpy(&Unpack, &v, sizeof(Unpack)); - return tvec<2, float, P>(detail::toFloat32(v.x), detail::toFloat32(v.y)); + return vec<2, float, P>(detail::toFloat32(v.x), detail::toFloat32(v.y)); } }; template - struct compute_half<3, P, tvec> + struct compute_half<3, P, vec> { - GLM_FUNC_QUALIFIER static tvec<3, uint16, P> pack(tvec<3, float, P> const & v) + GLM_FUNC_QUALIFIER static vec<3, uint16, P> pack(vec<3, float, P> const & v) { - tvec<3, int16, P> const Unpack(detail::toFloat16(v.x), detail::toFloat16(v.y), detail::toFloat16(v.z)); + vec<3, int16, P> const Unpack(detail::toFloat16(v.x), detail::toFloat16(v.y), detail::toFloat16(v.z)); u16vec3 Packed(uninitialize); memcpy(&Packed, &Unpack, sizeof(Packed)); return Packed; } - GLM_FUNC_QUALIFIER static tvec<3, float, P> unpack(tvec<3, uint16, P> const & v) + GLM_FUNC_QUALIFIER static vec<3, float, P> unpack(vec<3, uint16, P> const & v) { i16vec3 Unpack(uninitialize); memcpy(&Unpack, &v, sizeof(Unpack)); - return tvec<3, float, P>(detail::toFloat32(v.x), detail::toFloat32(v.y), detail::toFloat32(v.z)); + return vec<3, float, P>(detail::toFloat32(v.x), detail::toFloat32(v.y), detail::toFloat32(v.z)); } }; template - struct compute_half<4, P, tvec> + struct compute_half<4, P, vec> { - GLM_FUNC_QUALIFIER static tvec<4, uint16, P> pack(tvec<4, float, P> const & v) + GLM_FUNC_QUALIFIER static vec<4, uint16, P> pack(vec<4, float, P> const & v) { - tvec<4, int16, P> const Unpack(detail::toFloat16(v.x), detail::toFloat16(v.y), detail::toFloat16(v.z), detail::toFloat16(v.w)); + vec<4, int16, P> const Unpack(detail::toFloat16(v.x), detail::toFloat16(v.y), detail::toFloat16(v.z), detail::toFloat16(v.w)); u16vec4 Packed(uninitialize); memcpy(&Packed, &Unpack, sizeof(Packed)); return Packed; } - GLM_FUNC_QUALIFIER static tvec<4, float, P> unpack(tvec<4, uint16, P> const & v) + GLM_FUNC_QUALIFIER static vec<4, float, P> unpack(vec<4, uint16, P> const & v) { i16vec4 Unpack(uninitialize); memcpy(&Unpack, &v, sizeof(Unpack)); - return tvec<4, float, P>(detail::toFloat32(v.x), detail::toFloat32(v.y), detail::toFloat32(v.z), detail::toFloat32(v.w)); + return vec<4, float, P>(detail::toFloat32(v.x), detail::toFloat32(v.y), detail::toFloat32(v.z), detail::toFloat32(v.w)); } }; }//namespace detail @@ -641,18 +641,18 @@ namespace detail // Based on Brian Karis http://graphicrants.blogspot.fr/2009/04/rgbm-color-encoding.html template - GLM_FUNC_QUALIFIER tvec<4, T, P> packRGBM(tvec<3, T, P> const & rgb) + GLM_FUNC_QUALIFIER vec<4, T, P> packRGBM(vec<3, T, P> const & rgb) { - tvec<3, T, P> const Color(rgb * static_cast(1.0 / 6.0)); + vec<3, T, P> const Color(rgb * static_cast(1.0 / 6.0)); T Alpha = clamp(max(max(Color.x, Color.y), max(Color.z, static_cast(1e-6))), static_cast(0), static_cast(1)); Alpha = ceil(Alpha * static_cast(255.0)) / static_cast(255.0); - return tvec<4, T, P>(Color / Alpha, Alpha); + return vec<4, T, P>(Color / Alpha, Alpha); } template - GLM_FUNC_QUALIFIER tvec<3, T, P> unpackRGBM(tvec<4, T, P> const & rgbm) + GLM_FUNC_QUALIFIER vec<3, T, P> unpackRGBM(vec<4, T, P> const & rgbm) { - return tvec<3, T, P>(rgbm.x, rgbm.y, rgbm.z) * rgbm.w * static_cast(6); + return vec<3, T, P>(rgbm.x, rgbm.y, rgbm.z) * rgbm.w * static_cast(6); } template class vecType> diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl index ea1a2ebb..0d4d734b 100644 --- a/glm/gtc/quaternion.inl +++ b/glm/gtc/quaternion.inl @@ -154,7 +154,7 @@ namespace detail GLM_FUNC_QUALIFIER tquat::tquat(tvec3 const & u, tvec3 const & v) { tvec3 const LocalW(cross(u, v)); - T Dot = detail::compute_dot, T, detail::is_aligned

::value>::call(u, v); + T Dot = detail::compute_dot, T, detail::is_aligned

::value>::call(u, v); tquat q(T(1) + Dot, LocalW.x, LocalW.y, LocalW.z); *this = normalize(q); diff --git a/glm/gtc/random.inl b/glm/gtc/random.inl index 4dcfa485..61eeb826 100644 --- a/glm/gtc/random.inl +++ b/glm/gtc/random.inl @@ -17,7 +17,7 @@ namespace detail }; template - struct compute_rand<1, uint8, P, tvec> + struct compute_rand<1, uint8, P, vec> { GLM_FUNC_QUALIFIER static tvec1 call() { @@ -27,7 +27,7 @@ namespace detail }; template - struct compute_rand<2, uint8, P, tvec> + struct compute_rand<2, uint8, P, vec> { GLM_FUNC_QUALIFIER static tvec2 call() { @@ -38,7 +38,7 @@ namespace detail }; template - struct compute_rand<3, uint8, P, tvec> + struct compute_rand<3, uint8, P, vec> { GLM_FUNC_QUALIFIER static tvec3 call() { @@ -50,7 +50,7 @@ namespace detail }; template - struct compute_rand<4, uint8, P, tvec> + struct compute_rand<4, uint8, P, vec> { GLM_FUNC_QUALIFIER static tvec4 call() { @@ -258,7 +258,7 @@ namespace detail template GLM_FUNC_QUALIFIER genType linearRand(genType Min, genType Max) { - return detail::compute_linearRand<1, genType, highp, tvec>::call( + return detail::compute_linearRand<1, genType, highp, vec>::call( tvec1(Min), tvec1(Max)).x; } diff --git a/glm/gtc/round.inl b/glm/gtc/round.inl index e6d918ae..6f798f72 100644 --- a/glm/gtc/round.inl +++ b/glm/gtc/round.inl @@ -232,7 +232,7 @@ namespace detail template GLM_FUNC_QUALIFIER genType ceilPowerOfTwo(genType value) { - return detail::compute_ceilPowerOfTwo<1, genType, defaultp, tvec, std::numeric_limits::is_signed>::call(tvec1(value)).x; + return detail::compute_ceilPowerOfTwo<1, genType, defaultp, vec, std::numeric_limits::is_signed>::call(tvec1(value)).x; } template class vecType> diff --git a/glm/gtx/type_trait.hpp b/glm/gtx/type_trait.hpp index 4d29005e..0c84106a 100644 --- a/glm/gtx/type_trait.hpp +++ b/glm/gtx/type_trait.hpp @@ -53,7 +53,7 @@ namespace glm }; template - struct type> + struct type> { static bool const is_vec = true; static bool const is_mat = false; diff --git a/glm/gtx/vector_query.inl b/glm/gtx/vector_query.inl index f61a8546..75a9c3f3 100644 --- a/glm/gtx/vector_query.inl +++ b/glm/gtx/vector_query.inl @@ -10,7 +10,7 @@ namespace detail struct compute_areCollinear{}; template - struct compute_areCollinear<2, T, P, tvec> + struct compute_areCollinear<2, T, P, vec> { GLM_FUNC_QUALIFIER static bool call(tvec2 const & v0, tvec2 const & v1, T const & epsilon) { @@ -19,7 +19,7 @@ namespace detail }; template - struct compute_areCollinear<3, T, P, tvec> + struct compute_areCollinear<3, T, P, vec> { GLM_FUNC_QUALIFIER static bool call(tvec3 const & v0, tvec3 const & v1, T const & epsilon) { @@ -28,7 +28,7 @@ namespace detail }; template - struct compute_areCollinear<4, T, P, tvec> + struct compute_areCollinear<4, T, P, vec> { GLM_FUNC_QUALIFIER static bool call(tvec4 const & v0, tvec4 const & v1, T const & epsilon) { @@ -40,7 +40,7 @@ namespace detail struct compute_isCompNull{}; template - struct compute_isCompNull<2, T, P, tvec> + struct compute_isCompNull<2, T, P, vec> { GLM_FUNC_QUALIFIER static tvec2 call(tvec2 const & v, T const & epsilon) { @@ -51,7 +51,7 @@ namespace detail }; template - struct compute_isCompNull<3, T, P, tvec> + struct compute_isCompNull<3, T, P, vec> { GLM_FUNC_QUALIFIER static tvec3 call(tvec3 const & v, T const & epsilon) { @@ -63,7 +63,7 @@ namespace detail }; template - struct compute_isCompNull<4, T, P, tvec> + struct compute_isCompNull<4, T, P, vec> { GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v, T const & epsilon) { diff --git a/test/core/core_func_integer.cpp b/test/core/core_func_integer.cpp index 234a49a8..36995e7a 100644 --- a/test/core/core_func_integer.cpp +++ b/test/core/core_func_integer.cpp @@ -170,7 +170,7 @@ namespace bitfieldReverse template GLM_FUNC_QUALIFIER T bitfieldReverseLoop(T v) { - return bitfieldReverseLoop(glm::tvec<1, T>(v)).x; + return bitfieldReverseLoop(glm::vec<1, T>(v)).x; } GLM_FUNC_QUALIFIER glm::uint32_t bitfieldReverseUint32(glm::uint32_t x) @@ -230,7 +230,7 @@ namespace bitfieldReverse template GLM_FUNC_QUALIFIER genType bitfieldReverseOps(genType x) { - return bitfieldReverseOps(glm::tvec<1, genType, glm::defaultp>(x)).x; + return bitfieldReverseOps(glm::vec<1, genType, glm::defaultp>(x)).x; } template @@ -1440,7 +1440,7 @@ namespace bitCount template GLM_FUNC_QUALIFIER int bitCount_bitfield(genType x) { - return bitCount_bitfield(glm::tvec<1, genType, glm::defaultp>(x)).x; + return bitCount_bitfield(glm::vec<1, genType, glm::defaultp>(x)).x; } int perf(std::size_t Size)