Updated extensions list

This commit is contained in:
Christophe Riccio 2011-01-19 16:02:13 +00:00
parent 0ba4424d70
commit 1e9ef124e8
6 changed files with 29 additions and 38 deletions

View File

@ -16,10 +16,6 @@ file(GLOB_RECURSE GTX_SOURCE ./gtx/*.cpp)
file(GLOB_RECURSE GTX_INLINE ./gtx/*.inl)
file(GLOB_RECURSE GTX_HEADER ./gtx/*.hpp)
file(GLOB_RECURSE IMG_SOURCE ./img/*.cpp)
file(GLOB_RECURSE IMG_INLINE ./img/*.inl)
file(GLOB_RECURSE IMG_HEADER ./img/*.hpp)
file(GLOB_RECURSE VIRTREV_SOURCE ./virtrev/*.cpp)
file(GLOB_RECURSE VIRTREV_INLINE ./virtrev/*.inl)
file(GLOB_RECURSE VIRTREV_HEADER ./virtrev/*.hpp)
@ -33,9 +29,6 @@ source_group("GTC Files" FILES ${GTC_HEADER})
source_group("GTX Files" FILES ${GTX_SOURCE})
source_group("GTX Files" FILES ${GTX_INLINE})
source_group("GTX Files" FILES ${GTX_HEADER})
source_group("IMG Files" FILES ${IMG_SOURCE})
source_group("IMG Files" FILES ${IMG_INLINE})
source_group("IMG Files" FILES ${IMG_HEADER})
source_group("VIRTREV Files" FILES ${VIRTREV_SOURCE})
source_group("VIRTREV Files" FILES ${VIRTREV_INLINE})
source_group("VIRTREV Files" FILES ${VIRTREV_HEADER})
@ -47,5 +40,4 @@ add_executable(${NAME}
${CORE_SOURCE} ${CORE_INLINE} ${CORE_HEADER}
${GTC_SOURCE} ${GTC_INLINE} ${GTC_HEADER}
${GTX_SOURCE} ${GTX_INLINE} ${GTX_HEADER}
${IMG_SOURCE} ${IMG_INLINE} ${IMG_HEADER}
${VIRTREV_SOURCE} ${VIRTREV_INLINE} ${VIRTREV_HEADER})

View File

@ -52,6 +52,7 @@
#include "./gtx/matrix_operation.hpp"
#include "./gtx/matrix_query.hpp"
#include "./gtx/mixed_product.hpp"
#include "./gtx/multiple.hpp"
#include "./gtx/norm.hpp"
#include "./gtx/normal.hpp"
#include "./gtx/normalize_dot.hpp"
@ -78,9 +79,7 @@
#include "./gtx/vector_angle.hpp"
#include "./gtx/vector_query.hpp"
#include "./gtx/verbose_operator.hpp"
#include "./img/multiple.hpp"
#include "./img/wrap.hpp"
#include "./gtx/wrap.hpp"
#include "./virtrev/xstream.hpp"

View File

@ -4,14 +4,14 @@
// Created : 2009-10-26
// Updated : 2009-10-26
// Licence : This source is under MIT License
// File : glm/img/multiple.hpp
// File : glm/gtx/multiple.hpp
///////////////////////////////////////////////////////////////////////////////////////////////////
// Dependency:
// - GLM core
///////////////////////////////////////////////////////////////////////////////////////////////////
#ifndef glm_img_multiple
#define glm_img_multiple
#ifndef glm_gtx_multiple
#define glm_gtx_multiple
// Dependency:
#include "../glm.hpp"
@ -22,30 +22,30 @@ namespace glm
bool main_img_multiple();
}//namespace test
namespace img{
//! GLM_IMG_multiple: Find the closest number of a number multiple of other number.
namespace gtx{
//! GLM_GTX_multiple: Find the closest number of a number multiple of other number.
namespace multiple
{
//! Higher Multiple number of Source.
//! From GLM_IMG_multiple extension.
//! From GLM_GTX_multiple extension.
template <typename genType>
genType higherMultiple(
genType const & Source,
genType const & Multiple);
//! Lower Multiple number of Source.
//! From GLM_IMG_multiple extension.
//! From GLM_GTX_multiple extension.
template <typename genType>
genType lowerMultiple(
genType const & Source,
genType const & Multiple);
}//namespace multiple
}//namespace img
}//namespace gtx
}//namespace glm
#include "multiple.inl"
namespace glm{using namespace img::multiple;}
namespace glm{using namespace gtx::multiple;}
#endif//glm_img_multiple
#endif//glm_gtx_multiple

View File

@ -4,14 +4,14 @@
// Created : 2009-10-26
// Updated : 2009-10-26
// Licence : This source is under MIT License
// File : glm/img/multiple.inl
// File : glm/gtx/multiple.inl
///////////////////////////////////////////////////////////////////////////////////////////////////
// Dependency:
// - GLM core
///////////////////////////////////////////////////////////////////////////////////////////////////
namespace glm{
namespace img{
namespace gtx{
namespace multiple
{
//////////////////////
@ -187,5 +187,5 @@ namespace multiple
}
}//namespace multiple
}//namespace img
}//namespace gtx
}//namespace glm

View File

@ -4,14 +4,14 @@
// Created : 2009-11-25
// Updated : 2009-11-25
// Licence : This source is under MIT License
// File : glm/img/wrap.hpp
// File : glm/gtx/wrap.hpp
///////////////////////////////////////////////////////////////////////////////////////////////////
// Dependency:
// - GLM core
///////////////////////////////////////////////////////////////////////////////////////////////////
#ifndef glm_img_wrap
#define glm_img_wrap
#ifndef glm_gtx_wrap
#define glm_gtx_wrap
// Dependency:
#include "../glm.hpp"
@ -19,34 +19,34 @@
namespace glm
{
namespace test{
bool main_img_wrap();
bool main_gtx_wrap();
}//namespace test
namespace img{
//! GLM_IMG_wrap: Wrapping mode using my texture samping.
namespace gtx{
//! GLM_GTX_wrap: Wrapping mode using my texture samping.
namespace wrap
{
//! Simulate GL_CLAMP OpenGL wrap mode
//! From GLM_IMG_wrap extension.
//! From GLM_GTX_wrap extension.
template <typename genType>
genType clamp(genType const & Texcoord);
//! Simulate GL_REPEAT OpenGL wrap mode
//! From GLM_IMG_wrap extension.
//! From GLM_GTX_wrap extension.
template <typename genType>
genType repeat(genType const & Texcoord);
//! Simulate GL_MIRROR_REPEAT OpenGL wrap mode
//! From GLM_IMG_wrap extension.
//! From GLM_GTX_wrap extension.
template <typename genType>
genType mirrorRepeat(genType const & Texcoord);
}//namespace wrap
}//namespace img
}//namespace gtx
}//namespace glm
#include "wrap.inl"
namespace glm{using namespace img::wrap;}
namespace glm{using namespace gtx::wrap;}
#endif//glm_img_wrap

View File

@ -4,14 +4,14 @@
// Created : 2009-11-25
// Updated : 2010-02-13
// Licence : This source is under MIT License
// File : glm/img/wrap.inl
// File : glm/gtx/wrap.inl
///////////////////////////////////////////////////////////////////////////////////////////////////
// Dependency:
// - GLM core
///////////////////////////////////////////////////////////////////////////////////////////////////
namespace glm{
namespace img{
namespace gtx{
namespace wrap
{
////////////////////////
@ -169,5 +169,5 @@ namespace wrap
}
}//namespace wrap
}//namespace img
}//namespace gtx
}//namespace glm