mirror of
https://github.com/g-truc/glm.git
synced 2025-04-06 22:15:00 +00:00
Removed useless GTX extensions
This commit is contained in:
Christophe Riccio
parent
aa318f6a43
commit
420822704d
5 changed files with 0 additions and 347 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
///
|
||||
/// <glm/gtx/vector_access.hpp> 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 <typename valType>
|
||||
void set(
|
||||
detail::tvec2<T, P> & v,
|
||||
valType const & x,
|
||||
valType const & y);
|
||||
|
||||
//! Set values to a 3 components vector.
|
||||
/// @see gtx_vector_access extension.
|
||||
template <typename valType>
|
||||
void set(
|
||||
detail::tvec3<T, P> & v,
|
||||
valType const & x,
|
||||
valType const & y,
|
||||
valType const & z);
|
||||
|
||||
//! Set values to a 4 components vector.
|
||||
/// @see gtx_vector_access extension.
|
||||
template <typename valType>
|
||||
void set(
|
||||
detail::tvec4<T, P> & v,
|
||||
valType const & x,
|
||||
valType const & y,
|
||||
valType const & z,
|
||||
valType const & w);
|
||||
|
||||
/// @}
|
||||
}//namespace glm
|
||||
|
||||
#include "vector_access.inl"
|
||||
|
||||
#endif//GLM_GTX_vector_access
|
||||
|
|
@ -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 <typename valType>
|
||||
GLM_FUNC_QUALIFIER void set
|
||||
(
|
||||
detail::tvec2<T, P>& v,
|
||||
valType const & x,
|
||||
valType const & y
|
||||
)
|
||||
{
|
||||
v.x = x;
|
||||
v.y = y;
|
||||
}
|
||||
|
||||
template <typename valType>
|
||||
GLM_FUNC_QUALIFIER void set
|
||||
(
|
||||
detail::tvec3<T, P>& v,
|
||||
valType const & x,
|
||||
valType const & y,
|
||||
valType const & z
|
||||
)
|
||||
{
|
||||
v.x = x;
|
||||
v.y = y;
|
||||
v.z = z;
|
||||
}
|
||||
|
||||
template <typename valType>
|
||||
GLM_FUNC_QUALIFIER void set
|
||||
(
|
||||
detail::tvec4<T, P>& 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
|
||||
|
|
@ -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
|
||||
///
|
||||
/// <glm/gtx/verbose_operator.hpp> 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 <typename genTypeT, typename genTypeU>
|
||||
GLM_DEPRECATED genTypeT add(genTypeT const & a, genTypeU const & b);
|
||||
|
||||
//! Substration of two values
|
||||
/// @see gtx_verbose_operator extension.
|
||||
template <typename genTypeT, typename genTypeU>
|
||||
GLM_DEPRECATED genTypeT sub(genTypeT const & a, genTypeU const & b);
|
||||
|
||||
//! Multiplication of two values
|
||||
/// @see gtx_verbose_operator extension.
|
||||
template <typename genTypeT, typename genTypeU>
|
||||
GLM_DEPRECATED genTypeT mul(genTypeT const & a, genTypeU const & b);
|
||||
|
||||
//! Division of two values
|
||||
/// @see gtx_verbose_operator extension.
|
||||
template <typename genTypeT, typename genTypeU>
|
||||
GLM_DEPRECATED genTypeT div(genTypeT const & a, genTypeU const & b);
|
||||
|
||||
//! Multiplication and addition of three values
|
||||
/// @see gtx_verbose_operator extension.
|
||||
template <typename genTypeT, typename genTypeU, typename genTypeV>
|
||||
GLM_DEPRECATED genTypeT mad(genTypeT const & a, genTypeU const & b, genTypeV const & c);
|
||||
|
||||
/// @}
|
||||
}// namespace glm
|
||||
|
||||
#include "verbose_operator.inl"
|
||||
|
||||
#endif//GLM_GTX_verbose_operator
|
||||
|
|
@ -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 <typename genType>
|
||||
GLM_FUNC_QUALIFIER genType add(genType const & a, genType const & b)
|
||||
{
|
||||
return a + b;
|
||||
}
|
||||
|
||||
template <typename genType>
|
||||
GLM_FUNC_QUALIFIER genType sub(genType const & a, genType const & b)
|
||||
{
|
||||
return a - b;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER detail::tmat2x2<T, P> mul
|
||||
(
|
||||
detail::tmat2x2<T, P> const & a,
|
||||
detail::tmat2x2<T, P> const & b
|
||||
)
|
||||
{
|
||||
return a * b;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER detail::tmat3x3<T, P> mul
|
||||
(
|
||||
detail::tmat3x3<T, P> const & a,
|
||||
detail::tmat3x3<T, P> const & b
|
||||
)
|
||||
{
|
||||
return a * b;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER detail::tmat4x4<T, P> mul
|
||||
(
|
||||
detail::tmat4x4<T, P> const & a,
|
||||
detail::tmat4x4<T, P> const & b
|
||||
)
|
||||
{
|
||||
return a * b;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER detail::tvec2<T, P> mul
|
||||
(
|
||||
detail::tmat2x2<T, P> const & m,
|
||||
detail::tvec2<T, P> const & v
|
||||
)
|
||||
{
|
||||
return m * v;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER detail::tvec3<T, P> mul
|
||||
(
|
||||
detail::tmat3x3<T, P> const & m,
|
||||
detail::tvec3<T, P> const & v)
|
||||
{
|
||||
return m * v;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER detail::tvec4<T, P> mul
|
||||
(
|
||||
detail::tmat4x4<T, P> const & m,
|
||||
detail::tvec4<T, P> const & v
|
||||
)
|
||||
{
|
||||
return m * v;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER detail::tvec2<T, P> mul
|
||||
(
|
||||
detail::tvec2<T, P> const & v,
|
||||
detail::tmat2x2<T, P> const & m
|
||||
)
|
||||
{
|
||||
return v * m;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER detail::tvec3<T, P> mul
|
||||
(
|
||||
detail::tvec3<T, P> const & v,
|
||||
detail::tmat3x3<T, P> const & m
|
||||
)
|
||||
{
|
||||
return v * m;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER detail::tvec4<T, P> mul
|
||||
(
|
||||
detail::tvec4<T, P> const & v,
|
||||
detail::tmat4x4<T, P> const & m
|
||||
)
|
||||
{
|
||||
return v * m;
|
||||
}
|
||||
|
||||
template <typename genType>
|
||||
GLM_FUNC_QUALIFIER genType div(genType const & a, genType const & b)
|
||||
{
|
||||
return a / b;
|
||||
}
|
||||
|
||||
template <typename genTypeT, typename genTypeU, typename genTypeV>
|
||||
GLM_FUNC_QUALIFIER genTypeT mad(genTypeT const & a, genTypeU const & b, genTypeV const & c)
|
||||
{
|
||||
return a * b + c;
|
||||
}
|
||||
}//namespace glm
|
||||
Loading…
Add table
Reference in a new issue