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_vec2.hpp | 403 ------------------------------------------- 1 file changed, 403 deletions(-) delete mode 100644 inc/glm/detail/type_vec2.hpp (limited to 'inc/glm/detail/type_vec2.hpp') diff --git a/inc/glm/detail/type_vec2.hpp b/inc/glm/detail/type_vec2.hpp deleted file mode 100644 index 9b1553b..0000000 --- a/inc/glm/detail/type_vec2.hpp +++ /dev/null @@ -1,403 +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_vec2.hpp -/// @date 2008-08-18 / 2013-08-27 -/// @author Christophe Riccio -/////////////////////////////////////////////////////////////////////////////////// - -#pragma once - -//#include "../fwd.hpp" -#include "type_vec.hpp" -#ifdef GLM_SWIZZLE -# if GLM_HAS_ANONYMOUS_UNION -# include "_swizzle.hpp" -# else -# include "_swizzle_func.hpp" -# endif -#endif //GLM_SWIZZLE -#include - -namespace glm -{ - template - struct tvec2 - { - ////////////////////////////////////// - // Implementation detail - - typedef tvec2 type; - typedef tvec2 bool_type; - typedef T value_type; - - ////////////////////////////////////// - // Data - -# if GLM_HAS_ANONYMOUS_UNION - union - { - struct{ T x, y; }; - struct{ T r, g; }; - struct{ T s, t; }; - -# ifdef GLM_SWIZZLE - _GLM_SWIZZLE2_2_MEMBERS(T, P, tvec2, x, y) - _GLM_SWIZZLE2_2_MEMBERS(T, P, tvec2, r, g) - _GLM_SWIZZLE2_2_MEMBERS(T, P, tvec2, s, t) - _GLM_SWIZZLE2_3_MEMBERS(T, P, tvec3, x, y) - _GLM_SWIZZLE2_3_MEMBERS(T, P, tvec3, r, g) - _GLM_SWIZZLE2_3_MEMBERS(T, P, tvec3, s, t) - _GLM_SWIZZLE2_4_MEMBERS(T, P, tvec4, x, y) - _GLM_SWIZZLE2_4_MEMBERS(T, P, tvec4, r, g) - _GLM_SWIZZLE2_4_MEMBERS(T, P, tvec4, s, t) -# endif//GLM_SWIZZLE - }; -# else - union {T x, r, s;}; - union {T y, g, t;}; - -# ifdef GLM_SWIZZLE - GLM_SWIZZLE_GEN_VEC_FROM_VEC2(T, P, tvec2, tvec2, tvec3, tvec4) -# endif//GLM_SWIZZLE -# endif - - ////////////////////////////////////// - // Component accesses - -# ifdef GLM_FORCE_SIZE_FUNC - /// Return the count of components of the vector - typedef size_t size_type; - GLM_FUNC_DECL GLM_CONSTEXPR size_type size() const; - - GLM_FUNC_DECL T & operator[](size_type i); - GLM_FUNC_DECL T const & operator[](size_type i) const; -# else - /// Return the count of components of the vector - typedef length_t length_type; - GLM_FUNC_DECL GLM_CONSTEXPR length_type length() const; - - GLM_FUNC_DECL T & operator[](length_type i); - GLM_FUNC_DECL T const & operator[](length_type i) const; -# endif//GLM_FORCE_SIZE_FUNC - - ////////////////////////////////////// - // Implicit basic constructors - - GLM_FUNC_DECL tvec2(); - GLM_FUNC_DECL tvec2(tvec2 const & v); - template - GLM_FUNC_DECL tvec2(tvec2 const & v); - - ////////////////////////////////////// - // Explicit basic constructors - - GLM_FUNC_DECL explicit tvec2(ctor); - GLM_FUNC_DECL explicit tvec2(T const & s); - GLM_FUNC_DECL tvec2(T const & s1, T const & s2); - - ////////////////////////////////////// - // Conversion constructors - - /// Explicit converions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) - template - GLM_FUNC_DECL tvec2(A const & x, B const & y); - template - GLM_FUNC_DECL tvec2(tvec1 const & v1, tvec1 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 explicit tvec2(tvec3 const & v); - //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) - template - GLM_FUNC_DECL explicit tvec2(tvec4 const & v); - -# ifdef GLM_FORCE_EXPLICIT_CTOR - //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) - template - GLM_FUNC_DECL explicit tvec2(tvec2 const & v); -# else - //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) - template - GLM_FUNC_DECL tvec2(tvec2 const & v); -# endif - - ////////////////////////////////////// - // Swizzle constructors - -# if GLM_HAS_ANONYMOUS_UNION && defined(GLM_SWIZZLE) - template - GLM_FUNC_DECL tvec2(detail::_swizzle<2, T, P, tvec2, E0, E1,-1,-2> const & that) - { - *this = that(); - } -# endif// GLM_HAS_ANONYMOUS_UNION && defined(GLM_SWIZZLE) - - ////////////////////////////////////// - // Unary arithmetic operators - - GLM_FUNC_DECL tvec2& operator=(tvec2 const & v); - - template - GLM_FUNC_DECL tvec2& operator=(tvec2 const & v); - template - GLM_FUNC_DECL tvec2& operator+=(U s); - template - GLM_FUNC_DECL tvec2& operator+=(tvec1 const & v); - template - GLM_FUNC_DECL tvec2& operator+=(tvec2 const & v); - template - GLM_FUNC_DECL tvec2& operator-=(U s); - template - GLM_FUNC_DECL tvec2& operator-=(tvec1 const & v); - template - GLM_FUNC_DECL tvec2& operator-=(tvec2 const & v); - template - GLM_FUNC_DECL tvec2& operator*=(U s); - template - GLM_FUNC_DECL tvec2& operator*=(tvec1 const & v); - template - GLM_FUNC_DECL tvec2& operator*=(tvec2 const & v); - template - GLM_FUNC_DECL tvec2& operator/=(U s); - template - GLM_FUNC_DECL tvec2& operator/=(tvec1 const & v); - template - GLM_FUNC_DECL tvec2& operator/=(tvec2 const & v); - - ////////////////////////////////////// - // Increment and decrement operators - - GLM_FUNC_DECL tvec2 & operator++(); - GLM_FUNC_DECL tvec2 & operator--(); - GLM_FUNC_DECL tvec2 operator++(int); - GLM_FUNC_DECL tvec2 operator--(int); - - ////////////////////////////////////// - // Unary bit operators - - template - GLM_FUNC_DECL tvec2 & operator%=(U s); - template - GLM_FUNC_DECL tvec2 & operator%=(tvec1 const & v); - template - GLM_FUNC_DECL tvec2 & operator%=(tvec2 const & v); - template - GLM_FUNC_DECL tvec2 & operator&=(U s); - template - GLM_FUNC_DECL tvec2 & operator&=(tvec1 const & v); - template - GLM_FUNC_DECL tvec2 & operator&=(tvec2 const & v); - template - GLM_FUNC_DECL tvec2 & operator|=(U s); - template - GLM_FUNC_DECL tvec2 & operator|=(tvec1 const & v); - template - GLM_FUNC_DECL tvec2 & operator|=(tvec2 const & v); - template - GLM_FUNC_DECL tvec2 & operator^=(U s); - template - GLM_FUNC_DECL tvec2 & operator^=(tvec1 const & v); - template - GLM_FUNC_DECL tvec2 & operator^=(tvec2 const & v); - template - GLM_FUNC_DECL tvec2 & operator<<=(U s); - template - GLM_FUNC_DECL tvec2 & operator<<=(tvec1 const & v); - template - GLM_FUNC_DECL tvec2 & operator<<=(tvec2 const & v); - template - GLM_FUNC_DECL tvec2 & operator>>=(U s); - template - GLM_FUNC_DECL tvec2 & operator>>=(tvec1 const & v); - template - GLM_FUNC_DECL tvec2 & operator>>=(tvec2 const & v); - }; - - template - GLM_FUNC_DECL tvec2 operator+(tvec2 const & v, T const & s); - - template - GLM_FUNC_DECL tvec2 operator+(tvec2 const & v1, tvec1 const & v2); - - template - GLM_FUNC_DECL tvec2 operator+(T const & s, tvec2 const & v); - - template - GLM_FUNC_DECL tvec2 operator+(tvec1 const & v1, tvec2 const & v2); - - template - GLM_FUNC_DECL tvec2 operator+(tvec2 const & v1, tvec2 const & v2); - - template - GLM_FUNC_DECL tvec2 operator-(tvec2 const & v, T const & s); - - template - GLM_FUNC_DECL tvec2 operator-(tvec2 const & v1, tvec1 const & v2); - - template - GLM_FUNC_DECL tvec2 operator-(T const & s, tvec2 const & v); - - template - GLM_FUNC_DECL tvec2 operator-(tvec1 const & v1, tvec2 const & v2); - - template - GLM_FUNC_DECL tvec2 operator-(tvec2 const & v1, tvec2 const & v2); - - template - GLM_FUNC_DECL tvec2 operator*(tvec2 const & v, T const & s); - - template - GLM_FUNC_DECL tvec2 operator*(tvec2 const & v1, tvec1 const & v2); - - template - GLM_FUNC_DECL tvec2 operator*(T const & s, tvec2 const & v); - - template - GLM_FUNC_DECL tvec2 operator*(tvec1 const & v1, tvec2 const & v2); - - template - GLM_FUNC_DECL tvec2 operator*(tvec2 const & v1, tvec2 const & v2); - - template - GLM_FUNC_DECL tvec2 operator/(tvec2 const & v, T const & s); - - template - GLM_FUNC_DECL tvec2 operator/(tvec2 const & v1, tvec1 const & v2); - - template - GLM_FUNC_DECL tvec2 operator/(T const & s, tvec2 const & v); - - template - GLM_FUNC_DECL tvec2 operator/(tvec1 const & v1, tvec2 const & v2); - - template - GLM_FUNC_DECL tvec2 operator/(tvec2 const & v1, tvec2 const & v2); - - template - GLM_FUNC_DECL tvec2 operator-(tvec2 const & v); - - template - GLM_FUNC_DECL tvec2 operator%(tvec2 const & v, T const & s); - - template - GLM_FUNC_DECL tvec2 operator%(tvec2 const & v1, tvec1 const & v2); - - template - GLM_FUNC_DECL tvec2 operator%(T const & s, tvec2 const & v); - - template - GLM_FUNC_DECL tvec2 operator%(tvec1 const & v1, tvec2 const & v2); - - template - GLM_FUNC_DECL tvec2 operator%(tvec2 const & v1, tvec2 const & v2); - - template - GLM_FUNC_DECL tvec2 operator&(tvec2 const & v, T const & s); - - template - GLM_FUNC_DECL tvec2 operator&(tvec2 const & v1, tvec1 const & v2); - - template - GLM_FUNC_DECL tvec2 operator&(T const & s, tvec2 const & v); - - template - GLM_FUNC_DECL tvec2 operator&(tvec1 const & v1, tvec2 const & v2); - - template - GLM_FUNC_DECL tvec2 operator&(tvec2 const & v1, tvec2 const & v2); - - template - GLM_FUNC_DECL tvec2 operator|(tvec2 const & v, T const & s); - - template - GLM_FUNC_DECL tvec2 operator|(tvec2 const & v1, tvec1 const & v2); - - template - GLM_FUNC_DECL tvec2 operator|(T const & s, tvec2 const & v); - - template - GLM_FUNC_DECL tvec2 operator|(tvec1 const & v1, tvec2 const & v2); - - template - GLM_FUNC_DECL tvec2 operator|(tvec2 const & v1, tvec2 const & v2); - - template - GLM_FUNC_DECL tvec2 operator^(tvec2 const & v, T const & s); - - template - GLM_FUNC_DECL tvec2 operator^(tvec2 const & v1, tvec1 const & v2); - - template - GLM_FUNC_DECL tvec2 operator^(T const & s, tvec2 const & v); - - template - GLM_FUNC_DECL tvec2 operator^(tvec1 const & v1, tvec2 const & v2); - - template - GLM_FUNC_DECL tvec2 operator^(tvec2 const & v1, tvec2 const & v2); - - template - GLM_FUNC_DECL tvec2 operator<<(tvec2 const & v, T const & s); - - template - GLM_FUNC_DECL tvec2 operator<<(tvec2 const & v1, tvec1 const & v2); - - template - GLM_FUNC_DECL tvec2 operator<<(T const & s, tvec2 const & v); - - template - GLM_FUNC_DECL tvec2 operator<<(tvec1 const & v1, tvec2 const & v2); - - template - GLM_FUNC_DECL tvec2 operator<<(tvec2 const & v1, tvec2 const & v2); - - template - GLM_FUNC_DECL tvec2 operator>>(tvec2 const & v, T const & s); - - template - GLM_FUNC_DECL tvec2 operator>>(tvec2 const & v1, tvec1 const & v2); - - template - GLM_FUNC_DECL tvec2 operator>>(T const & s, tvec2 const & v); - - template - GLM_FUNC_DECL tvec2 operator>>(tvec1 const & v1, tvec2 const & v2); - - template - GLM_FUNC_DECL tvec2 operator>>(tvec2 const & v1, tvec2 const & v2); - - template - GLM_FUNC_DECL tvec2 operator~(tvec2 const & v); -}//namespace glm - -#ifndef GLM_EXTERNAL_TEMPLATE -#include "type_vec2.inl" -#endif//GLM_EXTERNAL_TEMPLATE -- cgit v1.2.3