From 5c46e0f0a924989201c6784b0f956bc442f14a7e Mon Sep 17 00:00:00 2001 From: majortom6 Date: Sun, 19 Feb 2017 09:17:35 -0600 Subject: -removed glm library, its in the debian repos -made opengl and sdl folders in includes, moved various *hpps to them --- inc/glm/detail/type_mat2x2.inl | 548 ----------------------------------------- 1 file changed, 548 deletions(-) delete mode 100644 inc/glm/detail/type_mat2x2.inl (limited to 'inc/glm/detail/type_mat2x2.inl') diff --git a/inc/glm/detail/type_mat2x2.inl b/inc/glm/detail/type_mat2x2.inl deleted file mode 100644 index 4a19cb9..0000000 --- a/inc/glm/detail/type_mat2x2.inl +++ /dev/null @@ -1,548 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref core -/// @file glm/detail/type_mat2x2.inl -/// @date 2005-01-16 / 2011-06-15 -/// @author Christophe Riccio -/////////////////////////////////////////////////////////////////////////////////// - -namespace glm{ -namespace detail -{ - template - GLM_FUNC_QUALIFIER tmat2x2 compute_inverse(tmat2x2 const & m) - { - T OneOverDeterminant = static_cast(1) / ( - + m[0][0] * m[1][1] - - m[1][0] * m[0][1]); - - tmat2x2 Inverse( - + m[1][1] * OneOverDeterminant, - - m[0][1] * OneOverDeterminant, - - m[1][0] * OneOverDeterminant, - + m[0][0] * OneOverDeterminant); - - return Inverse; - } -}//namespace detail - - ////////////////////////////////////////////////////////////// - // Constructors - - template - GLM_FUNC_QUALIFIER tmat2x2::tmat2x2() - { -# ifndef GLM_FORCE_NO_CTOR_INIT - this->value[0] = col_type(1, 0); - this->value[1] = col_type(0, 1); -# endif - } - - template - GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat2x2 const & m) - { - this->value[0] = m.value[0]; - this->value[1] = m.value[1]; - } - - template - template - GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat2x2 const & m) - { - this->value[0] = m.value[0]; - this->value[1] = m.value[1]; - } - - template - GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(ctor) - {} - - template - GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(T const & s) - { - this->value[0] = col_type(s, 0); - this->value[1] = col_type(0, s); - } - - template - GLM_FUNC_QUALIFIER tmat2x2::tmat2x2 - ( - T const & x0, T const & y0, - T const & x1, T const & y1 - ) - { - this->value[0] = col_type(x0, y0); - this->value[1] = col_type(x1, y1); - } - - template - GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(col_type const & v0, col_type const & v1) - { - this->value[0] = v0; - this->value[1] = v1; - } - - ////////////////////////////////////// - // Conversion constructors - template - template - GLM_FUNC_QUALIFIER tmat2x2::tmat2x2 - ( - X1 const & x1, Y1 const & y1, - X2 const & x2, Y2 const & y2 - ) - { - this->value[0] = col_type(static_cast(x1), value_type(y1)); - this->value[1] = col_type(static_cast(x2), value_type(y2)); - } - - template - template - GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tvec2 const & v1, tvec2 const & v2) - { - this->value[0] = col_type(v1); - this->value[1] = col_type(v2); - } - - ////////////////////////////////////////////////////////////// - // mat2x2 matrix conversions - - template - template - GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat2x2 const & m) - { - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - } - - template - GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat3x3 const & m) - { - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - } - - template - GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat4x4 const & m) - { - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - } - - template - GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat2x3 const & m) - { - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - } - - template - GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat3x2 const & m) - { - this->value[0] = m[0]; - this->value[1] = m[1]; - } - - template - GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat2x4 const & m) - { - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - } - - template - GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat4x2 const & m) - { - this->value[0] = m[0]; - this->value[1] = m[1]; - } - - template - GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat3x4 const & m) - { - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - } - - template - GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat4x3 const & m) - { - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - } - - ////////////////////////////////////// - // Accesses - -# ifdef GLM_FORCE_SIZE_FUNC - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tmat2x2::size_type tmat2x2::size() const - { - return 2; - } - - template - GLM_FUNC_QUALIFIER typename tmat2x2::col_type & tmat2x2::operator[](typename tmat2x2::size_type i) - { - assert(i < this->size()); - return this->value[i]; - } - - template - GLM_FUNC_QUALIFIER typename tmat2x2::col_type const & tmat2x2::operator[](typename tmat2x2::size_type i) const - { - assert(i < this->size()); - return this->value[i]; - } -# else - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tmat2x2::length_type tmat2x2::length() const - { - return 2; - } - - template - GLM_FUNC_QUALIFIER typename tmat2x2::col_type & tmat2x2::operator[](typename tmat2x2::length_type i) - { - assert(i < this->length()); - return this->value[i]; - } - - template - GLM_FUNC_QUALIFIER typename tmat2x2::col_type const & tmat2x2::operator[](typename tmat2x2::length_type i) const - { - assert(i < this->length()); - return this->value[i]; - } -# endif//GLM_FORCE_SIZE_FUNC - - ////////////////////////////////////////////////////////////// - // Unary updatable operators - - template - GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator=(tmat2x2 const & m) - { - this->value[0] = m[0]; - this->value[1] = m[1]; - return *this; - } - - template - template - GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator=(tmat2x2 const & m) - { - this->value[0] = m[0]; - this->value[1] = m[1]; - return *this; - } - - template - template - GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator+=(U s) - { - this->value[0] += s; - this->value[1] += s; - return *this; - } - - template - template - GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator+=(tmat2x2 const & m) - { - this->value[0] += m[0]; - this->value[1] += m[1]; - return *this; - } - - template - template - GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator-=(U s) - { - this->value[0] -= s; - this->value[1] -= s; - return *this; - } - - template - template - GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator-=(tmat2x2 const & m) - { - this->value[0] -= m[0]; - this->value[1] -= m[1]; - return *this; - } - - template - template - GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator*=(U s) - { - this->value[0] *= s; - this->value[1] *= s; - return *this; - } - - template - template - GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator*=(tmat2x2 const & m) - { - return (*this = *this * m); - } - - template - template - GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator/=(U s) - { - this->value[0] /= s; - this->value[1] /= s; - return *this; - } - - template - template - GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator/=(tmat2x2 const & m) - { - return (*this = *this * detail::compute_inverse(m)); - } - - template - GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator++() - { - ++this->value[0]; - ++this->value[1]; - return *this; - } - - template - GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator--() - { - --this->value[0]; - --this->value[1]; - return *this; - } - - template - GLM_FUNC_QUALIFIER tmat2x2 tmat2x2::operator++(int) - { - tmat2x2 Result(*this); - ++*this; - return Result; - } - - template - GLM_FUNC_QUALIFIER tmat2x2 tmat2x2::operator--(int) - { - tmat2x2 Result(*this); - --*this; - return Result; - } - - ////////////////////////////////////////////////////////////// - // Binary operators - - template - GLM_FUNC_QUALIFIER tmat2x2 operator+(tmat2x2 const & m, T const & s) - { - return tmat2x2( - m[0] + s, - m[1] + s); - } - - template - GLM_FUNC_QUALIFIER tmat2x2 operator+(T const & s, tmat2x2 const & m) - { - return tmat2x2( - m[0] + s, - m[1] + s); - } - - template - GLM_FUNC_QUALIFIER tmat2x2 operator+(tmat2x2 const & m1, tmat2x2 const & m2) - { - return tmat2x2( - m1[0] + m2[0], - m1[1] + m2[1]); - } - - template - GLM_FUNC_QUALIFIER tmat2x2 operator-(tmat2x2 const & m, T const & s) - { - return tmat2x2( - m[0] - s, - m[1] - s); - } - - template - GLM_FUNC_QUALIFIER tmat2x2 operator-(T const & s, tmat2x2 const & m) - { - return tmat2x2( - s - m[0], - s - m[1]); - } - - template - GLM_FUNC_QUALIFIER tmat2x2 operator-(tmat2x2 const & m1, tmat2x2 const & m2) - { - return tmat2x2( - m1[0] - m2[0], - m1[1] - m2[1]); - } - - template - GLM_FUNC_QUALIFIER tmat2x2 operator*(tmat2x2 const & m, T const & s) - { - return tmat2x2( - m[0] * s, - m[1] * s); - } - - template - GLM_FUNC_QUALIFIER tmat2x2 operator*(T const & s, tmat2x2 const & m) - { - return tmat2x2( - m[0] * s, - m[1] * s); - } - - template - GLM_FUNC_QUALIFIER typename tmat2x2::col_type operator* - ( - tmat2x2 const & m, - typename tmat2x2::row_type const & v - ) - { - return tvec2( - m[0][0] * v.x + m[1][0] * v.y, - m[0][1] * v.x + m[1][1] * v.y); - } - - template - GLM_FUNC_QUALIFIER typename tmat2x2::row_type operator* - ( - typename tmat2x2::col_type const & v, - tmat2x2 const & m - ) - { - return tvec2( - v.x * m[0][0] + v.y * m[0][1], - v.x * m[1][0] + v.y * m[1][1]); - } - - template - GLM_FUNC_QUALIFIER tmat2x2 operator*(tmat2x2 const & m1, tmat2x2 const & m2) - { - return tmat2x2( - m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1], - m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1], - m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1], - m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1]); - } - - template - GLM_FUNC_QUALIFIER tmat3x2 operator*(tmat2x2 const & m1, tmat3x2 const & m2) - { - return tmat3x2( - m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1], - m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1], - m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1], - m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1], - m1[0][0] * m2[2][0] + m1[1][0] * m2[2][1], - m1[0][1] * m2[2][0] + m1[1][1] * m2[2][1]); - } - - template - GLM_FUNC_QUALIFIER tmat4x2 operator*(tmat2x2 const & m1, tmat4x2 const & m2) - { - return tmat4x2( - m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1], - m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1], - m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1], - m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1], - m1[0][0] * m2[2][0] + m1[1][0] * m2[2][1], - m1[0][1] * m2[2][0] + m1[1][1] * m2[2][1], - m1[0][0] * m2[3][0] + m1[1][0] * m2[3][1], - m1[0][1] * m2[3][0] + m1[1][1] * m2[3][1]); - } - - template - GLM_FUNC_QUALIFIER tmat2x2 operator/(tmat2x2 const & m, T const & s) - { - return tmat2x2( - m[0] / s, - m[1] / s); - } - - template - GLM_FUNC_QUALIFIER tmat2x2 operator/(T const & s, tmat2x2 const & m) - { - return tmat2x2( - s / m[0], - s / m[1]); - } - - template - GLM_FUNC_QUALIFIER typename tmat2x2::col_type operator/(tmat2x2 const & m, typename tmat2x2::row_type const & v) - { - return detail::compute_inverse(m) * v; - } - - template - GLM_FUNC_QUALIFIER typename tmat2x2::row_type operator/(typename tmat2x2::col_type const & v, tmat2x2 const & m) - { - return v * detail::compute_inverse(m); - } - - template - GLM_FUNC_QUALIFIER tmat2x2 operator/(tmat2x2 const & m1, tmat2x2 const & m2) - { - tmat2x2 m1_copy(m1); - return m1_copy /= m2; - } - - // Unary constant operators - template - GLM_FUNC_QUALIFIER tmat2x2 const operator-(tmat2x2 const & m) - { - return tmat2x2( - -m[0], - -m[1]); - } - - ////////////////////////////////////// - // Boolean operators - - template - GLM_FUNC_QUALIFIER bool operator==(tmat2x2 const & m1, tmat2x2 const & m2) - { - return (m1[0] == m2[0]) && (m1[1] == m2[1]); - } - - template - GLM_FUNC_QUALIFIER bool operator!=(tmat2x2 const & m1, tmat2x2 const & m2) - { - return (m1[0] != m2[0]) || (m1[1] != m2[1]); - } -} //namespace glm -- cgit v1.2.3