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_mat2x4.hpp | 202 ----------------------------------------- 1 file changed, 202 deletions(-) delete mode 100644 inc/glm/detail/type_mat2x4.hpp (limited to 'inc/glm/detail/type_mat2x4.hpp') diff --git a/inc/glm/detail/type_mat2x4.hpp b/inc/glm/detail/type_mat2x4.hpp deleted file mode 100644 index 425c807..0000000 --- a/inc/glm/detail/type_mat2x4.hpp +++ /dev/null @@ -1,202 +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_mat2x4.hpp -/// @date 2006-08-05 / 2011-06-15 -/// @author Christophe Riccio -/////////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#include "../fwd.hpp" -#include "type_vec2.hpp" -#include "type_vec4.hpp" -#include "type_mat.hpp" -#include -#include - -namespace glm -{ - template - struct tmat2x4 - { - typedef tvec4 col_type; - typedef tvec2 row_type; - typedef tmat2x4 type; - typedef tmat4x2 transpose_type; - typedef T value_type; - - private: - /// @cond DETAIL - col_type value[2]; - /// @endcond - - public: - // Constructors - GLM_FUNC_DECL tmat2x4(); - GLM_FUNC_DECL tmat2x4(tmat2x4 const & m); - template - GLM_FUNC_DECL tmat2x4(tmat2x4 const & m); - - GLM_FUNC_DECL explicit tmat2x4(ctor); - GLM_FUNC_DECL explicit tmat2x4(T const & s); - GLM_FUNC_DECL tmat2x4( - T const & x0, T const & y0, T const & z0, T const & w0, - T const & x1, T const & y1, T const & z1, T const & w1); - GLM_FUNC_DECL tmat2x4( - col_type const & v0, - col_type const & v1); - - ////////////////////////////////////// - // Conversions - template < - typename X1, typename Y1, typename Z1, typename W1, - typename X2, typename Y2, typename Z2, typename W2> - GLM_FUNC_DECL tmat2x4( - X1 const & x1, Y1 const & y1, Z1 const & z1, W1 const & w1, - X2 const & x2, Y2 const & y2, Z2 const & z2, W2 const & w2); - - template - GLM_FUNC_DECL tmat2x4( - tvec4 const & v1, - tvec4 const & v2); - - ////////////////////////////////////// - // Matrix conversions - -# ifdef GLM_FORCE_EXPLICIT_CTOR - template - GLM_FUNC_DECL explicit tmat2x4(tmat2x4 const & m); -# else - template - GLM_FUNC_DECL tmat2x4(tmat2x4 const & m); -# endif - - GLM_FUNC_DECL explicit tmat2x4(tmat2x2 const & x); - GLM_FUNC_DECL explicit tmat2x4(tmat3x3 const & x); - GLM_FUNC_DECL explicit tmat2x4(tmat4x4 const & x); - GLM_FUNC_DECL explicit tmat2x4(tmat2x3 const & x); - GLM_FUNC_DECL explicit tmat2x4(tmat3x2 const & x); - GLM_FUNC_DECL explicit tmat2x4(tmat3x4 const & x); - GLM_FUNC_DECL explicit tmat2x4(tmat4x2 const & x); - GLM_FUNC_DECL explicit tmat2x4(tmat4x3 const & x); - - ////////////////////////////////////// - // Accesses - -# ifdef GLM_FORCE_SIZE_FUNC - typedef size_t size_type; - GLM_FUNC_DECL GLM_CONSTEXPR size_t size() const; - - GLM_FUNC_DECL col_type & operator[](size_type i); - GLM_FUNC_DECL col_type const & operator[](size_type i) const; -# else - typedef length_t length_type; - GLM_FUNC_DECL GLM_CONSTEXPR length_type length() const; - - GLM_FUNC_DECL col_type & operator[](length_type i); - GLM_FUNC_DECL col_type const & operator[](length_type i) const; -# endif//GLM_FORCE_SIZE_FUNC - - ////////////////////////////////////// - // Unary arithmetic operators - - GLM_FUNC_DECL tmat2x4 & operator=(tmat2x4 const & m); - - template - GLM_FUNC_DECL tmat2x4 & operator=(tmat2x4 const & m); - template - GLM_FUNC_DECL tmat2x4 & operator+=(U s); - template - GLM_FUNC_DECL tmat2x4 & operator+=(tmat2x4 const & m); - template - GLM_FUNC_DECL tmat2x4 & operator-=(U s); - template - GLM_FUNC_DECL tmat2x4 & operator-=(tmat2x4 const & m); - template - GLM_FUNC_DECL tmat2x4 & operator*=(U s); - template - GLM_FUNC_DECL tmat2x4 & operator/=(U s); - - ////////////////////////////////////// - // Increment and decrement operators - - GLM_FUNC_DECL tmat2x4 & operator++ (); - GLM_FUNC_DECL tmat2x4 & operator-- (); - GLM_FUNC_DECL tmat2x4 operator++(int); - GLM_FUNC_DECL tmat2x4 operator--(int); - }; - - // Binary operators - - template - GLM_FUNC_DECL tmat2x4 operator+(tmat2x4 const & m, T const & s); - - template - GLM_FUNC_DECL tmat2x4 operator+(tmat2x4 const & m1, tmat2x4 const & m2); - - template - GLM_FUNC_DECL tmat2x4 operator-(tmat2x4 const & m, T const & s); - - template - GLM_FUNC_DECL tmat2x4 operator-(tmat2x4 const & m1, tmat2x4 const & m2); - - template - GLM_FUNC_DECL tmat2x4 operator*(tmat2x4 const & m, T const & s); - - template - GLM_FUNC_DECL tmat2x4 operator*(T const & s, tmat2x4 const & m); - - template - GLM_FUNC_DECL typename tmat2x4::col_type operator*(tmat2x4 const & m, typename tmat2x4::row_type const & v); - - template - GLM_FUNC_DECL typename tmat2x4::row_type operator*(typename tmat2x4::col_type const & v, tmat2x4 const & m); - - template - GLM_FUNC_DECL tmat4x4 operator*(tmat2x4 const & m1, tmat4x2 const & m2); - - template - GLM_FUNC_DECL tmat2x4 operator*(tmat2x4 const & m1, tmat2x2 const & m2); - - template - GLM_FUNC_DECL tmat3x4 operator*(tmat2x4 const & m1, tmat3x2 const & m2); - - template - GLM_FUNC_DECL tmat2x4 operator/(tmat2x4 const & m, T s); - - template - GLM_FUNC_DECL tmat2x4 operator/(T s, tmat2x4 const & m); - - // Unary constant operators - template - GLM_FUNC_DECL tmat2x4 const operator-(tmat2x4 const & m); -}//namespace glm - -#ifndef GLM_EXTERNAL_TEMPLATE -#include "type_mat2x4.inl" -#endif -- cgit v1.2.3