From 420822704d1f7609a88609b8e94e1f41a6cf9e4e Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 18 Dec 2013 19:19:14 +0100 Subject: [PATCH] Removed useless GTX extensions --- glm/ext.hpp | 2 - glm/gtx/vector_access.hpp | 85 ------------------------ glm/gtx/vector_access.inl | 53 --------------- glm/gtx/verbose_operator.hpp | 83 ----------------------- glm/gtx/verbose_operator.inl | 124 ----------------------------------- 5 files changed, 347 deletions(-) delete mode 100644 glm/gtx/vector_access.hpp delete mode 100644 glm/gtx/vector_access.inl delete mode 100644 glm/gtx/verbose_operator.hpp delete mode 100644 glm/gtx/verbose_operator.inl diff --git a/glm/ext.hpp b/glm/ext.hpp index 89a55287..2e491766 100644 --- a/glm/ext.hpp +++ b/glm/ext.hpp @@ -124,10 +124,8 @@ #include "./gtx/transform.hpp" #include "./gtx/transform2.hpp" #include "./gtx/vec1.hpp" -#include "./gtx/vector_access.hpp" #include "./gtx/vector_angle.hpp" #include "./gtx/vector_query.hpp" -#include "./gtx/verbose_operator.hpp" #include "./gtx/wrap.hpp" #if(GLM_ARCH & GLM_ARCH_SSE2) diff --git a/glm/gtx/vector_access.hpp b/glm/gtx/vector_access.hpp deleted file mode 100644 index 82b73eee..00000000 --- a/glm/gtx/vector_access.hpp +++ /dev/null @@ -1,85 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2013 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. -/// -/// 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 gtx_vector_access -/// @file glm/gtx/vector_access.hpp -/// @date 2006-01-16 / 2011-06-07 -/// @author Christophe Riccio -/// -/// @see core (dependence) -/// -/// @defgroup gtx_vector_access GLM_GTX_vector_access -/// @ingroup gtx -/// -/// @brief Function to set values to vectors -/// -/// need to be included to use these functionalities. -/////////////////////////////////////////////////////////////////////////////////// - -#ifndef GLM_GTX_vector_access -#define GLM_GTX_vector_access GLM_VERSION - -// Dependency: -#include "../glm.hpp" - -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) -# pragma message("GLM: GLM_GTX_vector_access extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_vector_access - /// @{ - - //! Set values to a 2 components vector. - /// @see gtx_vector_access extension. - template - void set( - detail::tvec2 & v, - valType const & x, - valType const & y); - - //! Set values to a 3 components vector. - /// @see gtx_vector_access extension. - template - void set( - detail::tvec3 & v, - valType const & x, - valType const & y, - valType const & z); - - //! Set values to a 4 components vector. - /// @see gtx_vector_access extension. - template - void set( - detail::tvec4 & v, - valType const & x, - valType const & y, - valType const & z, - valType const & w); - - /// @} -}//namespace glm - -#include "vector_access.inl" - -#endif//GLM_GTX_vector_access diff --git a/glm/gtx/vector_access.inl b/glm/gtx/vector_access.inl deleted file mode 100644 index e50b27b1..00000000 --- a/glm/gtx/vector_access.inl +++ /dev/null @@ -1,53 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2013 G-Truc Creation (www.g-truc.net) -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Created : 2006-01-16 -// Updated : 2008-10-07 -// Licence : This source is under MIT License -// File : glm/gtx/vector_access.inl -/////////////////////////////////////////////////////////////////////////////////////////////////// - -namespace glm -{ - template - GLM_FUNC_QUALIFIER void set - ( - detail::tvec2& v, - valType const & x, - valType const & y - ) - { - v.x = x; - v.y = y; - } - - template - GLM_FUNC_QUALIFIER void set - ( - detail::tvec3& v, - valType const & x, - valType const & y, - valType const & z - ) - { - v.x = x; - v.y = y; - v.z = z; - } - - template - GLM_FUNC_QUALIFIER void set - ( - detail::tvec4& v, - valType const & x, - valType const & y, - valType const & z, - valType const & w - ) - { - v.x = x; - v.y = y; - v.z = z; - v.w = w; - } -}//namespace glm diff --git a/glm/gtx/verbose_operator.hpp b/glm/gtx/verbose_operator.hpp deleted file mode 100644 index 9cf2dcb9..00000000 --- a/glm/gtx/verbose_operator.hpp +++ /dev/null @@ -1,83 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2013 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. -/// -/// 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 gtx_verbose_operator -/// @file glm/gtx/verbose_operator.hpp -/// @date 2007-05-21 / 2011-06-07 -/// @author Christophe Riccio -/// -/// @see core (dependence) -/// -/// @defgroup gtx_verbose_operator GLM_GTX_verbose_operator -/// @ingroup gtx -/// -/// @brief Use words to replace operators -/// -/// need to be included to use these functionalities. -/////////////////////////////////////////////////////////////////////////////////// - -#ifndef GLM_GTX_verbose_operator -#define GLM_GTX_verbose_operator GLM_VERSION - -// Dependency: -#include "../glm.hpp" - -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) -# pragma message("GLM: GLM_GTX_verbose_operator extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_verbose_operator - /// @{ - - //! Addition of two values - /// @see gtx_verbose_operator extension. - template - GLM_DEPRECATED genTypeT add(genTypeT const & a, genTypeU const & b); - - //! Substration of two values - /// @see gtx_verbose_operator extension. - template - GLM_DEPRECATED genTypeT sub(genTypeT const & a, genTypeU const & b); - - //! Multiplication of two values - /// @see gtx_verbose_operator extension. - template - GLM_DEPRECATED genTypeT mul(genTypeT const & a, genTypeU const & b); - - //! Division of two values - /// @see gtx_verbose_operator extension. - template - GLM_DEPRECATED genTypeT div(genTypeT const & a, genTypeU const & b); - - //! Multiplication and addition of three values - /// @see gtx_verbose_operator extension. - template - GLM_DEPRECATED genTypeT mad(genTypeT const & a, genTypeU const & b, genTypeV const & c); - - /// @} -}// namespace glm - -#include "verbose_operator.inl" - -#endif//GLM_GTX_verbose_operator diff --git a/glm/gtx/verbose_operator.inl b/glm/gtx/verbose_operator.inl deleted file mode 100644 index 18d37863..00000000 --- a/glm/gtx/verbose_operator.inl +++ /dev/null @@ -1,124 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2013 G-Truc Creation (www.g-truc.net) -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Created : 2006-04-20 -// Updated : 2008-09-29 -// Licence : This source is under MIT License -// File : glm/gtx/verbose_operator.inl -/////////////////////////////////////////////////////////////////////////////////////////////////// - -namespace glm -{ - template - GLM_FUNC_QUALIFIER genType add(genType const & a, genType const & b) - { - return a + b; - } - - template - GLM_FUNC_QUALIFIER genType sub(genType const & a, genType const & b) - { - return a - b; - } - - template - GLM_FUNC_QUALIFIER detail::tmat2x2 mul - ( - detail::tmat2x2 const & a, - detail::tmat2x2 const & b - ) - { - return a * b; - } - - template - GLM_FUNC_QUALIFIER detail::tmat3x3 mul - ( - detail::tmat3x3 const & a, - detail::tmat3x3 const & b - ) - { - return a * b; - } - - template - GLM_FUNC_QUALIFIER detail::tmat4x4 mul - ( - detail::tmat4x4 const & a, - detail::tmat4x4 const & b - ) - { - return a * b; - } - - template - GLM_FUNC_QUALIFIER detail::tvec2 mul - ( - detail::tmat2x2 const & m, - detail::tvec2 const & v - ) - { - return m * v; - } - - template - GLM_FUNC_QUALIFIER detail::tvec3 mul - ( - detail::tmat3x3 const & m, - detail::tvec3 const & v) - { - return m * v; - } - - template - GLM_FUNC_QUALIFIER detail::tvec4 mul - ( - detail::tmat4x4 const & m, - detail::tvec4 const & v - ) - { - return m * v; - } - - template - GLM_FUNC_QUALIFIER detail::tvec2 mul - ( - detail::tvec2 const & v, - detail::tmat2x2 const & m - ) - { - return v * m; - } - - template - GLM_FUNC_QUALIFIER detail::tvec3 mul - ( - detail::tvec3 const & v, - detail::tmat3x3 const & m - ) - { - return v * m; - } - - template - GLM_FUNC_QUALIFIER detail::tvec4 mul - ( - detail::tvec4 const & v, - detail::tmat4x4 const & m - ) - { - return v * m; - } - - template - GLM_FUNC_QUALIFIER genType div(genType const & a, genType const & b) - { - return a / b; - } - - template - GLM_FUNC_QUALIFIER genTypeT mad(genTypeT const & a, genTypeU const & b, genTypeV const & c) - { - return a * b + c; - } -}//namespace glm