anulax
/
glm
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Cleanup deprecated extensions

Browse Source
master
Christophe Riccio ago%!(EXTRA string=14 years)
parent 7c177c0ea3
commit abcefb9e77
5 changed files with 4 additions and 260 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      glm/ext.hpp
  2. 2
      glm/setup.hpp
  3. 189
      glm/virtrev/address.hpp
  4. 68
      glm/virtrev/equal_operator.hpp
  5. 4
      glm/virtrev/xstream.hpp

1
glm/ext.hpp
Unescape View File

@ -79,6 +79,7 @@
#include "./virtrev/address.hpp" #include "./virtrev/address.hpp"
#include "./virtrev/equal_operator.hpp" #include "./virtrev/equal_operator.hpp"
#include "./virtrev/xstream.hpp"
//const float goldenRatio = 1.618033988749894848f; //const float goldenRatio = 1.618033988749894848f;
//const float pi = 3.141592653589793238f; //const float pi = 3.141592653589793238f;

2
glm/setup.hpp
Unescape View File

@ -409,7 +409,7 @@
#if((GLM_COMPONENT == GLM_COMPONENT_MS_EXT) && !(GLM_COMPILER & GLM_COMPILER_VC)) #if((GLM_COMPONENT == GLM_COMPONENT_MS_EXT) && !(GLM_COMPILER & GLM_COMPILER_VC))
# error "GLM_COMPONENT value is GLM_COMPONENT_MS_EXT but this is not allowed with the current compiler." # error "GLM_COMPONENT value is GLM_COMPONENT_MS_EXT but this is not allowed with the current compiler."
#endif//GLM_USE_ANONYMOUS_UNION #endif
#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_COMPONENT_DISPLAYED)) #if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_COMPONENT_DISPLAYED))
# define GLM_MESSAGE_COMPONENT_DISPLAYED # define GLM_MESSAGE_COMPONENT_DISPLAYED

189
glm/virtrev/address.hpp
Unescape View File

@ -1,189 +0,0 @@
#ifndef GLM_EXT_VIRTREV_ADDRESS_HPP
#define GLM_EXT_VIRTREV_ADDRESS_HPP
///////////////////////////////////////////////////////////////////////////////////////////////////
// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net)
// Virtrev SDK copyright matrem (matrem84.free.fr)
///////////////////////////////////////////////////////////////////////////////////////////////////
// Created : 2008-10-07
// Updated :
// Licence : This source is under MIT License
// File : glm/ext/virtrev/address.h
///////////////////////////////////////////////////////////////////////////////////////////////////
// Dependency:
// - GLM core
///////////////////////////////////////////////////////////////////////////////////////////////////
#include "../glm.hpp"
namespace glm
{
namespace virtrev_glmext
{
//! GLM_VIRTREV_address extension: Vector & matrix content address (T const * type pointer).
namespace address
{
/** Get the const address of the vector content. */
template<typename T>
T const * address(detail::tvec2<T> const & vec)
{
return &(vec.x);
}
/** Get the address of the vector content. */
template<typename T>
T * address(detail::tvec2<T> & vec)
{
return &(vec.x);
}
/** Get the const address of the vector content. */
template<typename T>
T const * address(detail::tvec3<T> const & vec)
{
return &(vec.x);
}
/** Get the address of the vector content. */
template<typename T>
T * address(detail::tvec3<T> & vec)
{
return &(vec.x);
}
/** Get the const address of the vector content. */
template<typename T>
T const * address(detail::tvec4<T> const & vec)
{
return &(vec.x);
}
/** Get the address of the vector content. */
template<typename T>
T * address(detail::tvec4<T> & vec)
{
return &(vec.x);
}
/** Get the const address of the matrix content. */
template<typename T>
T const * address(detail::tmat2x2<T> const & mat)
{
return &(mat[0].x);
}
/** Get the address of the matrix content. */
template<typename T>
T * address(detail::tmat2x2<T> & mat)
{
return &(mat[0].x);
}
/** Get the const address of the matrix content. */
template<typename T>
T const * address(detail::tmat3x3<T> const & mat)
{
return &(mat[0].x);
}
/** Get the address of the matrix content. */
template<typename T>
T * address(detail::tmat3x3<T> & mat)
{
return &(mat[0].x);
}
/** Get the const address of the matrix content. */
template<typename T>
T const * address(detail::tmat4x4<T> const & mat)
{
return &(mat[0].x);
}
/** Get the address of the matrix content. */
template<typename T>
T * address(detail::tmat4x4<T> & mat)
{
return &(mat[0].x);
}
/** Get the const address of the matrix content. */
template<typename T>
T const * address(detail::tmat2x3<T> const & mat)
{
return &(mat[0].x);
}
/** Get the address of the matrix content. */
template<typename T>
T * address(detail::tmat2x3<T> & mat)
{
return &(mat[0].x);
}
/** Get the const address of the matrix content. */
template<typename T>
T const * address(detail::tmat3x2<T> const & mat)
{
return &(mat[0].x);
}
/** Get the address of the matrix content. */
template<typename T>
T * address(detail::tmat3x2<T> & mat)
{
return &(mat[0].x);
}
/** Get the const address of the matrix content. */
template<typename T>
T const * address(detail::tmat2x4<T> const & mat)
{
return &(mat[0].x);
}
/** Get the address of the matrix content. */
template<typename T>
T * address(detail::tmat2x4<T> & mat)
{
return &(mat[0].x);
}
/** Get the const address of the matrix content. */
template<typename T>
T const * address(detail::tmat4x2<T> const & mat)
{
return &(mat[0].x);
}
/** Get the address of the matrix content. */
template<typename T>
T * address(detail::tmat4x2<T> & mat)
{
return &(mat[0].x);
}
/** Get the const address of the matrix content. */
template<typename T>
T const * address(detail::tmat3x4<T> const & mat)
{
return &(mat[0].x);
}
/** Get the address of the matrix content. */
template<typename T>
T * address(detail::tmat3x4<T> & mat)
{
return &(mat[0].x);
}
/** Get the const address of the matrix content. */
template<typename T>
T const * address(detail::tmat4x3<T> const & mat)
{
return &(mat[0].x);
}
/** Get the address of the matrix content. */
template<typename T>
T * address(detail::tmat4x3<T> & mat)
{
return &(mat[0].x);
}
}
}
}
namespace glm{using namespace virtrev_glmext::address;}
#endif//GLM_EXT_VIRTREV_ADDRESS_HPP

68
glm/virtrev/equal_operator.hpp
Unescape View File

@ -1,68 +0,0 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net)
// VirtreV SDK copyright matrem (matrem84.free.fr)
///////////////////////////////////////////////////////////////////////////////////////////////////
// Created : 2008-09-23
// Updated :
// Licence : This source is under MIT License
// File : glm/ext/virtrev/equal_operator.hpp
///////////////////////////////////////////////////////////////////////////////////////////////////
// Dependency:
// - GLM core
///////////////////////////////////////////////////////////////////////////////////////////////////
#ifndef glm_virtrev_equal_operator
#define glm_virtrev_equal_operator
#include "../glm.hpp"
namespace glm
{
namespace virtrev_glmext
{
//! GLM_VIRTREV_equal_operator extension: equal operator for vectors.
namespace equal_operator
{
template<typename T>
inline bool operator == (glm::detail::tvec2<T> const & v1, glm::detail::tvec2<T> const & v2)
{
return v1.x==v2.x && v1.y==v2.y;
}
template<typename T>
inline bool operator == (glm::detail::tvec3<T> const & v1, glm::detail::tvec3<T> const & v2)
{
return v1.x==v2.x && v1.y==v2.y && v1.z==v2.z;
}
template<typename T>
inline bool operator == (glm::detail::tvec4<T> const & v1, glm::detail::tvec4<T> const & v2)
{
return v1.x==v2.x && v1.y==v2.y && v1.z==v2.z && v1.w==v2.w;
}
template<typename T>
inline bool operator != (glm::detail::tvec2<T> const & v1, glm::detail::tvec2<T> const & v2)
{
return v1.x!=v2.x || v1.y!=v2.y;
}
template<typename T>
inline bool operator != (glm::detail::tvec3<T> const & v1, glm::detail::tvec3<T> const & v2)
{
return v1.x!=v2.x || v1.y!=v2.y || v1.z!=v2.z;
}
template<typename T>
inline bool operator != (glm::detail::tvec4<T> const & v1, glm::detail::tvec4<T> const & v2)
{
return v1.x!=v2.x || v1.y!=v2.y || v1.z!=v2.z || v1.w!=v2.w;
}
}
}
}
namespace glm {using namespace virtrev_glmext::equal_operator;}
#endif//glm_virtrev_equal_operator

4
glm/virtrev/xstream.hpp
Unescape View File

@ -8,7 +8,7 @@
// Created : 2008-05-24 // Created : 2008-05-24
// Updated : 2008-05-26 // Updated : 2008-05-26
// Licence : This source is under MIT License // Licence : This source is under MIT License
// File : glm/ext/virtrev/xstream.h // File : glm/ext/virtrev/xstream.hpp
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
// Dependency: // Dependency:
// - GLM core // - GLM core
@ -131,7 +131,7 @@ namespace glm
stream << "z=\"" << glm::row(mat, 3)[2] << "\" "; stream << "z=\"" << glm::row(mat, 3)[2] << "\" ";
stream << "w=\"" << glm::row(mat, 3)[3] << "\" "; stream << "w=\"" << glm::row(mat, 3)[3] << "\" ";
stream << "/>" << std::endl; stream << "/>" << std::endl;
stream << "</glm_mat3>"; stream << "</glm_mat4>";
return stream; return stream;
} }

Write Preview
Loading…
Cancel
Save