This commit is contained in:
Christophe Riccio 2011-06-02 13:06:24 +01:00
parent 852ada9c3d
commit ebba087843
22 changed files with 2650 additions and 2784 deletions

View File

@ -12,14 +12,9 @@
namespace glm
{
namespace test{
void main_core_func_geometric();
}//namespace test
namespace core{
namespace function{
//! Define all geometric functions from Section 8.4 of GLSL 1.30.8 specification. Included in glm namespace.
namespace geometric{
namespace geometric{ //!< Define all geometric functions from Section 8.4 of GLSL 1.30.8 specification. Included in glm namespace.
/// \addtogroup core_funcs
///@{

View File

@ -12,10 +12,6 @@
namespace glm
{
namespace test{
void main_core_func_integer();
}//namespace test
namespace core{
namespace function{
//! Define integer functions from Section 8.8 of GLSL 4.00.8 specification.

View File

@ -12,10 +12,6 @@
namespace glm
{
namespace test{
void main_core_func_matrix();
}//namespace test
namespace core{
namespace function{
//! Define all matrix functions from Section 8.5 of GLSL 1.30.8 specification. Included in glm namespace.

View File

@ -12,10 +12,6 @@
namespace glm
{
namespace test{
void main_core_func_noise();
}//namespace test
namespace core{
namespace function{
// Define all noise functions from Section 8.9 of GLSL 1.30.8 specification. Included in glm namespace.

View File

@ -12,10 +12,6 @@
namespace glm
{
namespace test{
void main_core_func_packing();
}//namespace test
namespace core{
namespace function{
//! Define packing functions from section 8.4 floating-point pack and unpack functions of GLSL 4.00.8 specification

View File

@ -12,10 +12,6 @@
namespace glm
{
namespace test{
void main_core_func_trigonometric();
}//namespace test
namespace core{
namespace function{
//! Define Angle and trigonometry functions

View File

@ -14,10 +14,6 @@
namespace glm
{
namespace test{
void main_core_func_vector_relational();
}//namespace test
namespace core{
namespace function{
//! Define vector relational functions from Section 8.6 of GLSL 1.30.8 specification.

View File

@ -12,14 +12,7 @@
#include <cstdlib>
namespace glm
{
namespace test
{
bool main_type_half();
}//namespace test
namespace glm{
namespace detail
{
typedef short hdata;
@ -78,8 +71,6 @@ namespace glm
thalf operator++ (thalf const & s, int);
}//namespace detail
}//namespace glm
#include "type_half.inl"

View File

@ -13,8 +13,7 @@
#include "setup.hpp"
#include "_detail.hpp"
namespace glm
{
namespace glm{
namespace detail
{
typedef signed short lowp_int_t;
@ -36,14 +35,11 @@ namespace glm
GLM_DETAIL_IS_UINT(unsigned int);
GLM_DETAIL_IS_UINT(unsigned long);
GLM_DETAIL_IS_UINT(highp_uint_t);
}
//namespace detail
}//namespace detail
namespace core{
namespace type{
///namespace for precision stuff.
namespace precision
namespace precision //!< Namespace for precision stuff.
{
//! Low precision signed integer.
//! There is no guarantee on the actual precision.
@ -76,8 +72,7 @@ namespace glm
//! From GLSL 1.30.8 specification.
//! \ingroup core_precision
typedef detail::highp_uint_t highp_uint;
}
//namespace precision
}//namespace precision
#if(!defined(GLM_PRECISION_HIGHP_INT) && !defined(GLM_PRECISION_MEDIUMP_INT) && !defined(GLM_PRECISION_LOWP_INT))
typedef precision::mediump_int int_t;

View File

@ -12,13 +12,7 @@
#include "type_mat.hpp"
namespace glm
{
namespace test
{
void main_mat2x2();
}//namespace test
namespace glm{
namespace detail
{
template <typename T> struct tvec1;
@ -233,12 +227,10 @@ namespace glm
tmat2x2<T> const operator++ (
tmat2x2<T> const & m,
int);
} //namespace detail
namespace core{
namespace type{
namespace precision
{
//! 2 columns of 2 components matrix of low precision floating-point numbers.
@ -276,9 +268,8 @@ namespace glm
//! From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers
//! \ingroup core_precision
typedef detail::tmat2x2<highp_float> highp_mat2x2;
}
//namespace precision
}//namespace precision
}//namespace type
}//namespace core
}//namespace glm

View File

@ -12,13 +12,7 @@
#include "type_mat.hpp"
namespace glm
{
namespace test
{
void main_mat2x3();
}//namespace test
namespace glm{
namespace detail
{
template <typename T> struct tvec1;
@ -204,7 +198,6 @@ namespace glm
namespace core{
namespace type{
namespace precision
{
//! 2 columns of 3 components matrix of low precision floating-point numbers.
@ -222,9 +215,7 @@ namespace glm
//! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers)
//! \ingroup core_precision
typedef detail::tmat2x3<highp_float> highp_mat2x3;
}
//namespace precision
}//namespace precision
}//namespace type
}//namespace core
}//namespace glm

View File

@ -12,13 +12,7 @@
#include "type_mat.hpp"
namespace glm
{
namespace test
{
void main_mat2x4();
}//namespace test
namespace glm{
namespace detail
{
template <typename T> struct tvec1;
@ -205,7 +199,6 @@ namespace glm
namespace core{
namespace type{
namespace precision
{
//! 2 columns of 4 components matrix of low precision floating-point numbers.
@ -220,9 +213,7 @@ namespace glm
//! There is no guarantee on the actual precision.
//! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers)
typedef detail::tmat2x4<highp_float> highp_mat2x4;
}
//namespace precision
}//namespace precision
}//namespace type
}//namespace core
}//namespace glm

View File

@ -12,13 +12,7 @@
#include "type_mat.hpp"
namespace glm
{
namespace test
{
void main_mat3x2();
}//namespace test
namespace glm{
namespace detail
{
template <typename T> struct tvec1;
@ -211,7 +205,6 @@ namespace glm
namespace core{
namespace type{
namespace precision
{
//! 3 columns of 2 components matrix of low precision floating-point numbers.
@ -226,9 +219,7 @@ namespace glm
//! There is no guarantee on the actual precision.
//! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers)
typedef detail::tmat3x2<highp_float> highp_mat3x2;
}
//namespace precision
}//namespace precision
}//namespace type
}//namespace core
}//namespace glm

View File

@ -12,13 +12,7 @@
#include "type_mat.hpp"
namespace glm
{
namespace test
{
void main_mat3x3();
}//namespace test
namespace glm{
namespace detail
{
template <typename T> struct tvec1;
@ -241,7 +235,6 @@ namespace glm
namespace core{
namespace type{
namespace precision
{
//! 3 columns of 3 components matrix of low precision floating-point numbers.
@ -277,9 +270,8 @@ namespace glm
//! From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers
//! \ingroup core_precision
typedef detail::tmat3x3<highp_float> highp_mat3x3;
}
//namespace precision
}//namespace precision
}//namespace type
}//namespace core
}//namespace glm

View File

@ -12,13 +12,7 @@
#include "type_mat.hpp"
namespace glm
{
namespace test
{
void main_mat3x4();
}//namespace test
namespace glm{
namespace detail
{
template <typename T> struct tvec1;
@ -211,7 +205,6 @@ namespace glm
namespace core{
namespace type{
namespace precision
{
//! 3 columns of 4 components matrix of low precision floating-point numbers.
@ -226,9 +219,8 @@ namespace glm
//! There is no guarantee on the actual precision.
//! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers)
typedef detail::tmat3x4<highp_float> highp_mat3x4;
}
//namespace precision
}//namespace precision
}//namespace type
}//namespace core
}//namespace glm

View File

@ -12,13 +12,7 @@
#include "type_mat.hpp"
namespace glm
{
namespace test
{
void main_mat4x2();
}//namespace test
namespace glm{
namespace detail
{
template <typename T> struct tvec1;
@ -216,7 +210,6 @@ namespace glm
namespace core{
namespace type{
namespace precision
{
//! 4 columns of 2 components matrix of low precision floating-point numbers.
@ -224,19 +217,20 @@ namespace glm
//! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers)
//! \ingroup core_precision
typedef detail::tmat4x2<lowp_float> lowp_mat4x2;
//! 4 columns of 2 components matrix of medium precision floating-point numbers.
//! There is no guarantee on the actual precision.
//! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers)
//! \ingroup core_precision
typedef detail::tmat4x2<mediump_float> mediump_mat4x2;
//! 4 columns of 2 components matrix of high precision floating-point numbers.
//! There is no guarantee on the actual precision.
//! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers)
//! \ingroup core_precision
typedef detail::tmat4x2<highp_float> highp_mat4x2;
}
//namespace precision
}//namespace precision
}//namespace type
}//namespace core
}//namespace glm

View File

@ -12,13 +12,7 @@
#include "type_mat.hpp"
namespace glm
{
namespace test
{
void main_mat4x3();
}//namespace test
namespace glm{
namespace detail
{
template <typename T> struct tvec1;
@ -214,7 +208,6 @@ namespace glm
namespace core{
namespace type{
namespace precision
{
//! 4 columns of 3 components matrix of low precision floating-point numbers.
@ -222,25 +215,26 @@ namespace glm
//! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers)
//! \ingroup core_precision
typedef detail::tmat4x3<lowp_float> lowp_mat4x3;
//! 4 columns of 3 components matrix of medium precision floating-point numbers.
//! There is no guarantee on the actual precision.
//! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers)
//! \ingroup core_precision
typedef detail::tmat4x3<mediump_float> mediump_mat4x3;
//! 4 columns of 3 components matrix of high precision floating-point numbers.
//! There is no guarantee on the actual precision.
//! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers)
//! \ingroup core_precision
typedef detail::tmat4x3<highp_float> highp_mat4x3;
}
//namespace precision
}//namespace precision
}//namespace type
}//namespace core
}//namespace glm
#ifndef GLM_EXTERNAL_TEMPLATE
#include "type_mat4x3.inl"
#endif
#endif //GLM_EXTERNAL_TEMPLATE
#endif//glm_core_type_mat4x3

View File

@ -2,7 +2,7 @@
// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net)
///////////////////////////////////////////////////////////////////////////////////////////////////
// Created : 2005-01-27
// Updated : 2008-08-30
// Updated : 2011-06-02
// Licence : This source is under MIT License
// File : glm/core/type_mat4x4.hpp
///////////////////////////////////////////////////////////////////////////////////////////////////
@ -12,13 +12,7 @@
#include "type_mat.hpp"
namespace glm
{
namespace test
{
void main_mat4x4();
}//namespace test
namespace glm{
namespace detail
{
template <typename T> struct tvec1;
@ -242,7 +236,6 @@ namespace glm
namespace core{
namespace type{
namespace precision
{
//! 4 columns of 4 components matrix of low precision floating-point numbers.
@ -280,15 +273,14 @@ namespace glm
//! From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers
//! \ingroup core_precision
typedef detail::tmat4x4<highp_float> highp_mat4x4;
}
//namespace precision
}//namespace precision
}//namespace type
}//namespace core
}//namespace glm
#ifndef GLM_EXTERNAL_TEMPLATE
#include "type_mat4x4.inl"
#endif
#endif//GLM_EXTERNAL_TEMPLATE
#endif//glm_core_type_mat4x4

View File

@ -16,13 +16,7 @@
#include "type_size.hpp"
#include "_swizzle.hpp"
namespace glm
{
namespace test
{
void main_vec1();
}//namespace test
namespace glm{
namespace detail
{
template <typename T> struct tref1;
@ -173,6 +167,6 @@ namespace glm
#ifndef GLM_EXTERNAL_TEMPLATE
#include "type_vec1.inl"
#endif
#endif//GLM_EXTERNAL_TEMPLATE
#endif//glm_core_type_gentype1

View File

@ -16,14 +16,7 @@
#include "type_size.hpp"
#include "_swizzle.hpp"
namespace glm
{
namespace test
{
void main_vec2();
}
//namespace test
namespace glm{
namespace detail
{
template <typename T> struct tref2;
@ -202,7 +195,6 @@ namespace glm
namespace core{
namespace type{
namespace precision
{
//! 2 components vector of high precision floating-point numbers.
@ -210,11 +202,13 @@ namespace glm
//! From GLSL 1.30.8 specification, section 4.5.2 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec2<highp_float> highp_vec2;
//! 2 components vector of medium precision floating-point numbers.
//! There is no guarantee on the actual precision.
//! From GLSL 1.30.8 specification, section 4.5.2 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec2<mediump_float> mediump_vec2;
//! 2 components vector of low precision floating-point numbers.
//! There is no guarantee on the actual precision.
//! From GLSL 1.30.8 specification, section 4.5.2 Precision Qualifiers.
@ -226,11 +220,13 @@ namespace glm
//! From GLSL 1.30.8 specification, section 4.1.5 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec2<highp_int> highp_ivec2;
//! 2 components vector of medium precision signed integer numbers.
//! There is no guarantee on the actual precision.
//! From GLSL 1.30.8 specification, section 4.1.5 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec2<mediump_int> mediump_ivec2;
//! 2 components vector of low precision signed integer numbers.
//! There is no guarantee on the actual precision.
//! From GLSL 1.30.8 specification, section 4.1.5 Precision Qualifiers.
@ -242,25 +238,26 @@ namespace glm
//! From GLSL 1.30.8 specification, section 4.1.5 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec2<highp_uint> highp_uvec2;
//! 2 components vector of medium precision unsigned integer numbers.
//! There is no guarantee on the actual precision.
//! From GLSL 1.30.8 specification, section 4.1.5 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec2<mediump_uint> mediump_uvec2;
//! 2 components vector of low precision unsigned integer numbers.
//! There is no guarantee on the actual precision.
//! From GLSL 1.30.8 specification, section 4.1.5 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec2<lowp_uint> lowp_uvec2;
}
//namespace precision
}//namespace precision
}//namespace type
}//namespace core
}//namespace glm
#ifndef GLM_EXTERNAL_TEMPLATE
#include "type_vec2.inl"
#endif
#endif//GLM_EXTERNAL_TEMPLATE
#endif//glm_core_type_gentype2

View File

@ -16,13 +16,7 @@
#include "type_size.hpp"
#include "_swizzle.hpp"
namespace glm
{
namespace test
{
void main_vec3();
}//namespace test
namespace glm{
namespace detail
{
template <typename T> struct tref2;
@ -207,7 +201,6 @@ namespace glm
namespace core{
namespace type{
namespace precision
{
//! 3 components vector of high precision floating-point numbers.
@ -215,11 +208,13 @@ namespace glm
//! From GLSL 1.30.8 specification, section 4.5.2 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec3<highp_float> highp_vec3;
//! 3 components vector of medium precision floating-point numbers.
//! There is no guarantee on the actual precision.
//! From GLSL 1.30.8 specification, section 4.5.2 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec3<mediump_float> mediump_vec3;
//! 3 components vector of low precision floating-point numbers.
//! There is no guarantee on the actual precision.
//! From GLSL 1.30.8 specification, section 4.5.2 Precision Qualifiers.
@ -231,11 +226,13 @@ namespace glm
//! From GLSL 1.30.8 specification, section 4.1.5 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec3<highp_int> highp_ivec3;
//! 3 components vector of medium precision signed integer numbers.
//! There is no guarantee on the actual precision.
//! From GLSL 1.30.8 specification, section 4.1.5 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec3<mediump_int> mediump_ivec3;
//! 3 components vector of low precision signed integer numbers.
//! There is no guarantee on the actual precision.
//! From GLSL 1.30.8 specification, section 4.1.5 Precision Qualifiers.
@ -247,25 +244,26 @@ namespace glm
//! From GLSL 1.30.8 specification, section 4.1.5 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec3<highp_uint> highp_uvec3;
//! 3 components vector of medium precision unsigned integer numbers.
//! There is no guarantee on the actual precision.
//! From GLSL 1.30.8 specification, section 4.1.5 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec3<mediump_uint> mediump_uvec3;
//! 3 components vector of low precision unsigned integer numbers.
//! There is no guarantee on the actual precision.
//! From GLSL 1.30.8 specification, section 4.1.5 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec3<lowp_uint> lowp_uvec3;
}
//namespace precision
}//namespace precision
}//namespace type
}//namespace core
}//namespace glm
#ifndef GLM_EXTERNAL_TEMPLATE
#include "type_vec3.inl"
#endif
#endif//GLM_EXTERNAL_TEMPLATE
#endif//glm_core_type_gentype3

View File

@ -16,13 +16,7 @@
#include "type_size.hpp"
#include "_swizzle.hpp"
namespace glm
{
namespace test
{
void main_vec4();
}//namespace test
namespace glm{
namespace detail
{
template <typename T> struct tref2;
@ -220,10 +214,6 @@ namespace glm
namespace core{
namespace type{
//////////////////////////
// Float definition
namespace precision
{
//! 4 components vector of high precision floating-point numbers.
@ -231,11 +221,13 @@ namespace glm
//! From GLSL 1.30.8 specification, section 4.5.2 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec4<highp_float> highp_vec4;
//! 4 components vector of medium precision floating-point numbers.
//! There is no guarantee on the actual precision.
//! From GLSL 1.30.8 specification, section 4.5.2 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec4<mediump_float> mediump_vec4;
//! 4 components vector of low precision floating-point numbers.
//! There is no guarantee on the actual precision.
//! From GLSL 1.30.8 specification, section 4.5.2 Precision Qualifiers.
@ -247,11 +239,13 @@ namespace glm
//! From GLSL 1.30.8 specification, section 4.1.5 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec4<highp_int> highp_ivec4;
//! 4 components vector of medium precision signed integer numbers.
//! There is no guarantee on the actual precision.
//! From GLSL 1.30.8 specification, section 4.1.5 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec4<mediump_int> mediump_ivec4;
//! 4 components vector of low precision signed integer numbers.
//! There is no guarantee on the actual precision.
//! From GLSL 1.30.8 specification, section 4.1.5 Precision Qualifiers.
@ -263,28 +257,26 @@ namespace glm
//! From GLSL 1.30.8 specification, section 4.1.5 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec4<highp_uint> highp_uvec4;
//! 4 components vector of medium precision unsigned integer numbers.
//! There is no guarantee on the actual precision.
//! From GLSL 1.30.8 specification, section 4.1.5 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec4<mediump_uint> mediump_uvec4;
//! 4 components vector of low precision unsigned integer numbers.
//! There is no guarantee on the actual precision.
//! From GLSL 1.30.8 specification, section 4.1.5 Precision Qualifiers.
//! \ingroup core_precision
typedef detail::tvec4<lowp_uint> lowp_uvec4;
}
//namespace precision
}//namespace precision
}//namespace type
}//namespace core
using namespace core::type;
}//namespace glm
#ifndef GLM_EXTERNAL_TEMPLATE
#include "type_vec4.inl"
#endif
#endif//GLM_EXTERNAL_TEMPLATE
#endif//glm_core_type_gentype4