Clean up promoted extensions

This commit is contained in:
Christophe Riccio 2010-04-30 11:11:09 +01:00
parent bcd6716592
commit a68bb0c534
5 changed files with 11 additions and 148 deletions

View File

@ -2,7 +2,7 @@
// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) // OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net)
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
// Created : 2009-05-01 // Created : 2009-05-01
// Updated : 2010-02-20 // Updated : 2010-04-30
// Licence : This source is under MIT License // Licence : This source is under MIT License
// File : glm/ext.hpp // File : glm/ext.hpp
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
@ -10,16 +10,16 @@
#ifndef glm_ext #ifndef glm_ext
#define glm_ext #define glm_ext
#include "gtc/double_float.hpp" #include "./gtc/double_float.hpp"
#include "gtc/half_float.hpp" #include "./gtc/half_float.hpp"
#include "gtc/matrix_access.hpp" #include "./gtc/matrix_access.hpp"
#include "gtc/matrix_operation.hpp" #include "./gtc/matrix_operation.hpp"
#include "gtc/matrix_projection.hpp" #include "./gtc/matrix_projection.hpp"
#include "gtc/matrix_transform.hpp" #include "./gtc/matrix_transform.hpp"
#include "gtc/quaternion.hpp" #include "./gtc/quaternion.hpp"
#include "gtc/swizzle.hpp" #include "./gtc/swizzle.hpp"
#include "gtc/type_precision.hpp" #include "./gtc/type_precision.hpp"
#include "gtc/type_ptr.hpp" #include "./gtc/type_ptr.hpp"
#include "./gtx/associated_min_max.hpp" #include "./gtx/associated_min_max.hpp"
#include "./gtx/bit.hpp" #include "./gtx/bit.hpp"
@ -31,7 +31,6 @@
#include "./gtx/compatibility.hpp" #include "./gtx/compatibility.hpp"
#include "./gtx/component_wise.hpp" #include "./gtx/component_wise.hpp"
#include "./gtx/determinant.hpp" #include "./gtx/determinant.hpp"
#include "./gtx/double_float.hpp"
#include "./gtx/epsilon.hpp" #include "./gtx/epsilon.hpp"
#include "./gtx/euler_angles.hpp" #include "./gtx/euler_angles.hpp"
#include "./gtx/extend.hpp" #include "./gtx/extend.hpp"
@ -40,7 +39,6 @@
#include "./gtx/fast_square_root.hpp" #include "./gtx/fast_square_root.hpp"
#include "./gtx/fast_trigonometry.hpp" #include "./gtx/fast_trigonometry.hpp"
#include "./gtx/gradient_paint.hpp" #include "./gtx/gradient_paint.hpp"
#include "./gtx/half_float.hpp"
#include "./gtx/handed_coordinate_space.hpp" #include "./gtx/handed_coordinate_space.hpp"
#include "./gtx/inertia.hpp" #include "./gtx/inertia.hpp"
#include "./gtx/integer.hpp" #include "./gtx/integer.hpp"
@ -55,7 +53,6 @@
#include "./gtx/matrix_projection.hpp" #include "./gtx/matrix_projection.hpp"
#include "./gtx/matrix_query.hpp" #include "./gtx/matrix_query.hpp"
#include "./gtx/matrix_selection.hpp" #include "./gtx/matrix_selection.hpp"
//#include "./gtx/matx.hpp"
#include "./gtx/mixed_product.hpp" #include "./gtx/mixed_product.hpp"
#include "./gtx/norm.hpp" #include "./gtx/norm.hpp"
#include "./gtx/normal.hpp" #include "./gtx/normal.hpp"
@ -82,7 +79,6 @@
#include "./gtx/vector_access.hpp" #include "./gtx/vector_access.hpp"
#include "./gtx/vector_angle.hpp" #include "./gtx/vector_angle.hpp"
#include "./gtx/vector_query.hpp" #include "./gtx/vector_query.hpp"
//#include "./gtx/vecx.hpp"
#include "./gtx/verbose_operator.hpp" #include "./gtx/verbose_operator.hpp"
#include "./img/multiple.hpp" #include "./img/multiple.hpp"

View File

@ -1,56 +0,0 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
// OpenGL Mathematics Copyright (c) 2005 - 2009 G-Truc Creation (www.g-truc.net)
///////////////////////////////////////////////////////////////////////////////////////////////////
// Created : 2005-12-21
// Updated : 2008-10-05
// Licence : This source is under MIT License
// File : glm/gtx/double_float.h
///////////////////////////////////////////////////////////////////////////////////////////////////
// Dependency:
// - GLM core
// - GLM_GTC_double_float
// - GLM_GTX_quaternion
///////////////////////////////////////////////////////////////////////////////////////////////////
// Note:
// - This implementation doesn't need to redefine all build-in functions to
// support double based type.
///////////////////////////////////////////////////////////////////////////////////////////////////
#ifndef glm_gtx_double_float
#define glm_gtx_double_float
// Dependency:
#include "../glm.hpp"
#include "../gtc/double_float.hpp"
#include "../gtx/quaternion.hpp"
namespace glm
{
namespace test{
void main_gtx_double_float();
}//namespace test
namespace gtx{
//! GLM_GTX_double_float extension: Add support for double precision flotting-point types
namespace double_float
{
//! Quaternion of single-precision floating-point numbers.
//! From GLM_GTX_double extension.
typedef detail::tquat<float> fquat;
//! Quaternion of double-precision floating-point numbers.
//! From GLM_GTX_double extension.
typedef detail::tquat<double> dquat;
}//namespace double_float
}//namespace gtx
}//namespace glm
#define GLM_GTX_double_float namespace gtc::double_float; using namespace gtx::double_float
#ifndef GLM_GTX_GLOBAL
namespace glm {using GLM_GTX_double_float;}
#endif//GLM_GTX_GLOBAL
#include "double_float.inl"
#endif//glm_gtx_double_float

View File

@ -1,13 +0,0 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
// OpenGL Mathematics Copyright (c) 2005 - 2009 G-Truc Creation (www.g-truc.net)
///////////////////////////////////////////////////////////////////////////////////////////////////
// Created : 2009-04-29
// Updated : 2009-04-29
// Licence : This source is under MIT License
// File : glm/gtc/double_float.inl
///////////////////////////////////////////////////////////////////////////////////////////////////
namespace glm
{
}

View File

@ -1,48 +0,0 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
// OpenGL Mathematics Copyright (c) 2005 - 2009 G-Truc Creation (www.g-truc.net)
///////////////////////////////////////////////////////////////////////////////////////////////////
// Created : 2005-12-21
// Updated : 2009-04-29
// Licence : This source is under MIT License
// File : glm/gtx/half_float.hpp
///////////////////////////////////////////////////////////////////////////////////////////////////
// Dependency:
// - GLM core
// - GLM_GTC_half_float
// - GLM_GTX_quaternion
///////////////////////////////////////////////////////////////////////////////////////////////////
#ifndef glm_gtx_half_float
#define glm_gtx_half_float
// Dependency:
#include "../glm.hpp"
#include "../gtc/half_float.hpp"
#include "../gtx/quaternion.hpp"
namespace glm
{
namespace test{
void main_ext_gtx_half_float();
}//namespace test
namespace gtx{
//! GLM_GTX_half_float extension: Add support for half precision flotting-point types
namespace half_float
{
//! Quaternion of half-precision floating-point numbers.
//! From GLM_GTX_half_float extension.
typedef detail::tquat<detail::thalf> hquat;
}//namespace half_float
}//namespace gtx
}//namespace glm
#define GLM_GTX_half_float namespace gtc::half_float; using namespace gtx::half_float; using namespace gtx::quaternion
#ifndef GLM_GTX_GLOBAL
namespace glm {using GLM_GTX_half_float;}
#endif//GLM_GTX_GLOBAL
#include "half_float.inl"
#endif//glm_gtx_half_float

View File

@ -1,16 +0,0 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
// OpenGL Mathematics Copyright (c) 2005 - 2009 G-Truc Creation (www.g-truc.net)
///////////////////////////////////////////////////////////////////////////////////////////////////
// Created : 2005-12-21
// Updated : 2008-10-02
// Licence : This source is under MIT License
// File : glm/gtx/half.inl
///////////////////////////////////////////////////////////////////////////////////////////////////
namespace glm{
namespace detail{
}//namespace detail
}//namespace glm