From 56789da7f0dffa9ccb545a9ae77c06d2699eab23 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 20 Jan 2011 11:01:17 +0000 Subject: [PATCH 01/12] Fixed build --- doc/src/dummy.cpp | 1 - glm/core/_detail.hpp | 18 +----------------- glm/glm.hpp | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/doc/src/dummy.cpp b/doc/src/dummy.cpp index 1ff143a3..a9226b83 100644 --- a/doc/src/dummy.cpp +++ b/doc/src/dummy.cpp @@ -18,7 +18,6 @@ void computeNormal(triangle & Triangle) #include "../../glm/gtc/matrix_transform.hpp" // glm::translate, glm::rotate, glm::scale #include "../../glm/gtc/type_ptr.hpp" // glm::value_ptr #include "../../glm/gtc/quaternion.hpp" // glm::quat -#include "../../glm/gtx/comparison.hpp" // == != //#include "../../glm/ext.hpp" glm::vec4 const ClearColor = glm::vec4(glm::vec3(0.0f), 1.0f); diff --git a/glm/core/_detail.hpp b/glm/core/_detail.hpp index afb9ab06..3379dd70 100644 --- a/glm/core/_detail.hpp +++ b/glm/core/_detail.hpp @@ -320,26 +320,10 @@ namespace detail }//namespace detail }//namespace glm -//////////////////// -// check type sizes -GLM_STATIC_ASSERT(sizeof(glm::detail::int8) == 1, "int8 size isn't 1 byte on this platform"); -GLM_STATIC_ASSERT(sizeof(glm::detail::int16) == 2, "int16 size isn't 2 bytes on this platform"); -GLM_STATIC_ASSERT(sizeof(glm::detail::int32) == 4, "int32 size isn't 4 bytes on this platform"); -GLM_STATIC_ASSERT(sizeof(glm::detail::int64) == 8, "int64 size isn't 8 bytes on this platform"); - -GLM_STATIC_ASSERT(sizeof(glm::detail::uint8) == 1, "uint8 size isn't 1 byte on this platform"); -GLM_STATIC_ASSERT(sizeof(glm::detail::uint16) == 2, "uint16 size isn't 2 bytes on this platform"); -GLM_STATIC_ASSERT(sizeof(glm::detail::uint32) == 4, "uint32 size isn't 4 bytes on this platform"); -GLM_STATIC_ASSERT(sizeof(glm::detail::uint64) == 8, "uint64 size isn't 8 bytes on this platform"); - -GLM_STATIC_ASSERT(sizeof(glm::detail::float16) == 2, "float16 size isn't 2 bytes on this platform"); -GLM_STATIC_ASSERT(sizeof(glm::detail::float32) == 4, "float32 size isn't 4 bytes on this platform"); -GLM_STATIC_ASSERT(sizeof(glm::detail::float64) == 8, "float64 size isn't 8 bytes on this platform"); - #if((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2005)) # define GLM_DEPRECATED __declspec(deprecated) # define GLM_ALIGNED(keyword, x) __declspec(align(x)) keyword -# define GLM_DEPRECATED __declspec(restrict) +# define GLM_RESTRICT __declspec(restrict) # define GLM_RESTRICT_VAR __restrict #elif((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC31)) # define GLM_DEPRECATED __attribute__((__deprecated__)) diff --git a/glm/glm.hpp b/glm/glm.hpp index d58e6eda..2b516519 100644 --- a/glm/glm.hpp +++ b/glm/glm.hpp @@ -109,4 +109,20 @@ namespace glm #include "./core/func_noise.hpp" #include "./core/_swizzle.hpp" +//////////////////// +// check type sizes +GLM_STATIC_ASSERT(sizeof(glm::detail::int8) == 1, "int8 size isn't 1 byte on this platform"); +GLM_STATIC_ASSERT(sizeof(glm::detail::int16) == 2, "int16 size isn't 2 bytes on this platform"); +GLM_STATIC_ASSERT(sizeof(glm::detail::int32) == 4, "int32 size isn't 4 bytes on this platform"); +GLM_STATIC_ASSERT(sizeof(glm::detail::int64) == 8, "int64 size isn't 8 bytes on this platform"); + +GLM_STATIC_ASSERT(sizeof(glm::detail::uint8) == 1, "uint8 size isn't 1 byte on this platform"); +GLM_STATIC_ASSERT(sizeof(glm::detail::uint16) == 2, "uint16 size isn't 2 bytes on this platform"); +GLM_STATIC_ASSERT(sizeof(glm::detail::uint32) == 4, "uint32 size isn't 4 bytes on this platform"); +GLM_STATIC_ASSERT(sizeof(glm::detail::uint64) == 8, "uint64 size isn't 8 bytes on this platform"); + +GLM_STATIC_ASSERT(sizeof(glm::detail::float16) == 2, "float16 size isn't 2 bytes on this platform"); +GLM_STATIC_ASSERT(sizeof(glm::detail::float32) == 4, "float32 size isn't 4 bytes on this platform"); +GLM_STATIC_ASSERT(sizeof(glm::detail::float64) == 8, "float64 size isn't 8 bytes on this platform"); + #endif //glm_glm From c2250eba878ceff8e452696bc625a414c662872d Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 20 Jan 2011 11:02:39 +0000 Subject: [PATCH 02/12] Added matrix_integer draft --- glm/gtc/matrix_integer.hpp | 0 test/gtc/CMakeLists.txt | 1 + test/gtc/gtc-integer-matrix.cpp | 126 ++++++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+) create mode 100644 glm/gtc/matrix_integer.hpp create mode 100644 test/gtc/gtc-integer-matrix.cpp diff --git a/glm/gtc/matrix_integer.hpp b/glm/gtc/matrix_integer.hpp new file mode 100644 index 00000000..e69de29b diff --git a/test/gtc/CMakeLists.txt b/test/gtc/CMakeLists.txt index 3cbcd7fa..7dc18c00 100644 --- a/test/gtc/CMakeLists.txt +++ b/test/gtc/CMakeLists.txt @@ -1 +1,2 @@ +glmCreateTestGTC(gtc-integer-matrix) glmCreateTestGTC(gtc-swizzle) \ No newline at end of file diff --git a/test/gtc/gtc-integer-matrix.cpp b/test/gtc/gtc-integer-matrix.cpp new file mode 100644 index 00000000..e1a99c17 --- /dev/null +++ b/test/gtc/gtc-integer-matrix.cpp @@ -0,0 +1,126 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Created : 2010-09-16 +// Updated : 2010-09-16 +// Licence : This source is under MIT licence +// File : test/gtx/simd-mat4.cpp +/////////////////////////////////////////////////////////////////////////////////////////////////// + +#define GLM_MESSAGES +#include +#include + +int test_swizzle_vec4_ref_dynamic() +{ + { + glm::ivec4 A(0, 1, 2, 3); + glm::ivec4 B(2, 1, 0, 3); + glm::swizzle(A, glm::Z, glm::Y, glm::X, glm::W) = B; + assert(A.x == B.x && A.y == B.y && A.z == B.z && A.w == B.w); + } + + { + glm::ivec4 A(0, 1, 2, 3); + glm::ivec3 B(2, 1, 0); + glm::swizzle(A, glm::Z, glm::Y, glm::X) = B; + assert(A.x == B.x && A.y == B.y && A.z == B.z); + } + + { + glm::ivec4 A(0, 1, 2, 3); + glm::ivec2 B(2, 1); + glm::swizzle(A, glm::Z, glm::Y) = B; + assert(A.x == B.x && A.y == B.y); + } + + { + glm::ivec4 A(0, 1, 2, 3); + int B(2); + glm::swizzle(A, glm::Z) = B; + assert(A.x == B); + } + + return 0; +} + +int test_swizzle_vec4_ref_static() +{ + { + glm::ivec4 A(0, 1, 2, 3); + glm::ivec4 B(2, 1, 0, 3); + glm::swizzle(A) = B; + assert(A.x == B.x && A.y == B.y && A.z == B.z && A.w == B.w); + } + + { + glm::ivec4 A(0, 1, 2, 3); + glm::ivec3 B(2, 1, 0); + glm::swizzle(A) = B; + assert(A.x == B.x && A.y == B.y && A.z == B.z); + } + + { + glm::ivec4 A(0, 1, 2, 3); + glm::ivec2 B(2, 1); + glm::swizzle(A) = B; + assert(A.x == B.x && A.y == B.y); + } + + { + glm::ivec4 A(0, 1, 2, 3); + int B(2); + glm::swizzle(A) = B; + assert(A.x == B); + } + + return 0; +} + +int test_swizzle_vec4_const_dynamic() +{ + glm::ivec4 A(0, 1, 2, 3); + glm::ivec4 B = glm::swizzle(A, glm::B, glm::G, glm::R, glm::A); + assert(glm::all(glm::equal(A, B))); + + glm::ivec3 C = glm::swizzle(A, glm::W, glm::Y, glm::Z); + assert(glm::all(glm::equal(glm::ivec3(A), C))); + + glm::ivec2 D = glm::swizzle(A, glm::W, glm::X); + assert(glm::all(glm::equal(glm::ivec2(A), D))); + + int E = glm::swizzle(A, glm::Q); + assert(E == A.q); + + return 0; +} + +int test_swizzle_vec4_const_static() +{ + glm::ivec4 A(0, 1, 2, 3); + + glm::ivec4 B = glm::swizzle(A); + assert(glm::all(glm::equal(A, B))); + + glm::ivec3 C = glm::swizzle(A); + assert(glm::all(glm::equal(glm::ivec3(A), C))); + + glm::ivec2 D = glm::swizzle(A); + assert(glm::all(glm::equal(glm::ivec2(A), D))); + + int E = glm::swizzle(A); + assert(E == A.q); + + return 0; +} + +int main(int argc, void* argv[]) +{ + int Failed = 0; + Failed += test_swizzle_vec4_ref_dynamic(); + Failed += test_swizzle_vec4_ref_static(); + Failed += test_swizzle_vec4_const_dynamic(); + Failed += test_swizzle_vec4_const_static(); + + return Failed; +} From 4a66971f9641ba771808522ca0e5ca842cc7ca70 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 20 Jan 2011 11:38:39 +0000 Subject: [PATCH 03/12] Added precision based type integer matrices --- glm/gtc/matrix_integer.hpp | 81 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/glm/gtc/matrix_integer.hpp b/glm/gtc/matrix_integer.hpp index e69de29b..ae9ec997 100644 --- a/glm/gtc/matrix_integer.hpp +++ b/glm/gtc/matrix_integer.hpp @@ -0,0 +1,81 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Created : 2011-01-20 +// Updated : 2011-01-20 +// Licence : This source is under MIT License +// File : glm/gtc/matrix_integer.hpp +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Dependency: +// - GLM core +/////////////////////////////////////////////////////////////////////////////////////////////////// + +#ifndef glm_gtc_matrix_integer +#define glm_gtc_matrix_integer + +// Dependency: +#include "../glm.hpp" + +#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +# pragma message("GLM: GLM_GTC_matrix_integer extension included") +#endif + +namespace glm +{ + namespace test{ + bool main_gtc_matrix_integer(); + }//namespace test + + namespace gtc{ + //! GLM_GTC_matrix_integer extension: Add integer matrices + namespace matrix_integer + { + typedef detail::tmat2x2 highp_imat2; //!< \brief High-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x3 highp_imat3; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x4 highp_imat4; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) + + typedef detail::tmat2x2 highp_imat2x2; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x3 highp_imat2x3; //!< \brief Single-precision floating-point 2x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x4 highp_imat2x4; //!< \brief Single-precision floating-point 2x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x2 highp_imat3x2; //!< \brief Single-precision floating-point 3x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x3 highp_imat3x3; //!< \brief Single-precision floating-point 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x4 highp_imat3x4; //!< \brief Single-precision floating-point 3x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x2 highp_imat4x2; //!< \brief Single-precision floating-point 4x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x3 highp_imat4x3; //!< \brief Single-precision floating-point 4x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x4 highp_imat4x4; //!< \brief Single-precision floating-point 4x4 matrix. (from GLM_GTC_matrix_integer extension) + + typedef detail::tmat2x2 mediump_imat2; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x3 mediump_imat3; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x4 mediump_imat4; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) + + typedef detail::tmat2x2 mediump_imat2x2; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x3 mediump_imat2x3; //!< \brief Single-precision floating-point 2x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x4 mediump_imat2x4; //!< \brief Single-precision floating-point 2x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x2 mediump_imat3x2; //!< \brief Single-precision floating-point 3x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x3 mediump_imat3x3; //!< \brief Single-precision floating-point 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x4 mediump_imat3x4; //!< \brief Single-precision floating-point 3x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x2 mediump_imat4x2; //!< \brief Single-precision floating-point 4x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x3 mediump_imat4x3; //!< \brief Single-precision floating-point 4x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x4 mediump_imat4x4; //!< \brief Single-precision floating-point 4x4 matrix. (from GLM_GTC_matrix_integer extension) + + typedef detail::tmat2x2 lowp_imat2; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x3 lowp_imat3; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x4 lowp_imat4; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) + + typedef detail::tmat2x2 lowp_imat2x2; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x3 lowp_imat2x3; //!< \brief Single-precision floating-point 2x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x4 lowp_imat2x4; //!< \brief Single-precision floating-point 2x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x2 lowp_imat3x2; //!< \brief Single-precision floating-point 3x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x3 lowp_imat3x3; //!< \brief Single-precision floating-point 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x4 lowp_imat3x4; //!< \brief Single-precision floating-point 3x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x2 lowp_imat4x2; //!< \brief Single-precision floating-point 4x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x3 lowp_imat4x3; //!< \brief Single-precision floating-point 4x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x4 lowp_imat4x4; //!< \brief Single-precision floating-point 4x4 matrix. (from GLM_GTC_type_precision extension) + + }//namespace matrix_integer + }//namespace gtc +}//namespace glm + +namespace glm{using namespace gtc::matrix_integer;} + +#endif//glm_gtc_matrix_integer From e4421a9b0f91cb86d78cdcc83205ae484b33b6e8 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 20 Jan 2011 11:40:14 +0000 Subject: [PATCH 04/12] Updated copyright dates --- glm/core/_detail.hpp | 2 +- glm/core/_swizzle.hpp | 2 +- glm/core/_swizzle.inl | 2 +- glm/core/dummy.cpp | 2 +- glm/core/func_common.hpp | 2 +- glm/core/func_common.inl | 2 +- glm/core/func_exponential.hpp | 2 +- glm/core/func_exponential.inl | 2 +- glm/core/func_geometric.hpp | 2 +- glm/core/func_geometric.inl | 2 +- glm/core/func_integer.hpp | 2 +- glm/core/func_integer.inl | 2 +- glm/core/func_matrix.hpp | 2 +- glm/core/func_matrix.inl | 2 +- glm/core/func_noise.hpp | 2 +- glm/core/func_noise.inl | 2 +- glm/core/func_packing.hpp | 2 +- glm/core/func_packing.inl | 2 +- glm/core/func_trigonometric.hpp | 2 +- glm/core/func_trigonometric.inl | 2 +- glm/core/func_vector_relational.hpp | 2 +- glm/core/func_vector_relational.inl | 2 +- glm/core/hint.hpp | 2 +- glm/core/intrinsic_common.hpp | 2 +- glm/core/intrinsic_common.inl | 2 +- glm/core/intrinsic_exponential.hpp | 2 +- glm/core/intrinsic_geometric.hpp | 2 +- glm/core/intrinsic_geometric.inl | 2 +- glm/core/intrinsic_matrix.hpp | 2 +- glm/core/intrinsic_matrix.inl | 2 +- glm/core/intrinsic_trigonometric.hpp | 2 +- glm/core/intrinsic_vector_relational.hpp | 2 +- glm/core/intrinsic_vector_relational.inl | 2 +- glm/core/type.hpp | 2 +- glm/core/type_float.hpp | 2 +- glm/core/type_gentype.hpp | 2 +- glm/core/type_gentype.inl | 2 +- glm/core/type_half.hpp | 2 +- glm/core/type_half.inl | 2 +- glm/core/type_int.hpp | 2 +- glm/core/type_mat.hpp | 2 +- glm/core/type_mat2x2.hpp | 2 +- glm/core/type_mat2x2.inl | 2 +- glm/core/type_mat2x3.hpp | 2 +- glm/core/type_mat2x3.inl | 2 +- glm/core/type_mat2x4.hpp | 2 +- glm/core/type_mat2x4.inl | 2 +- glm/core/type_mat3x2.hpp | 2 +- glm/core/type_mat3x2.inl | 2 +- glm/core/type_mat3x3.hpp | 2 +- glm/core/type_mat3x3.inl | 2 +- glm/core/type_mat3x4.hpp | 2 +- glm/core/type_mat3x4.inl | 2 +- glm/core/type_mat4x2.hpp | 2 +- glm/core/type_mat4x2.inl | 2 +- glm/core/type_mat4x3.hpp | 2 +- glm/core/type_mat4x3.inl | 2 +- glm/core/type_mat4x4.hpp | 2 +- glm/core/type_mat4x4.inl | 2 +- glm/core/type_size.hpp | 2 +- glm/core/type_vec.hpp | 2 +- glm/core/type_vec1.hpp | 2 +- glm/core/type_vec1.inl | 2 +- glm/core/type_vec2.hpp | 2 +- glm/core/type_vec2.inl | 2 +- glm/core/type_vec3.hpp | 2 +- glm/core/type_vec3.inl | 2 +- glm/core/type_vec4.hpp | 2 +- glm/core/type_vec4.inl | 2 +- glm/ext.hpp | 2 +- glm/glm.hpp | 2 +- glm/gtc/half_float.hpp | 2 +- glm/gtc/half_float.inl | 2 +- glm/gtc/matrix_access.hpp | 2 +- glm/gtc/matrix_access.inl | 2 +- glm/gtc/matrix_inverse.hpp | 2 +- glm/gtc/matrix_inverse.inl | 2 +- glm/gtc/matrix_transform.hpp | 2 +- glm/gtc/matrix_transform.inl | 2 +- glm/gtc/quaternion.hpp | 2 +- glm/gtc/quaternion.inl | 2 +- glm/gtc/swizzle.hpp | 2 +- glm/gtc/swizzle.inl | 2 +- glm/gtc/type_precision.hpp | 2 +- glm/gtc/type_precision.inl | 2 +- glm/gtc/type_ptr.hpp | 2 +- glm/gtx/associated_min_max.hpp | 2 +- glm/gtx/associated_min_max.inl | 2 +- glm/gtx/bit.hpp | 2 +- glm/gtx/bit.inl | 2 +- glm/gtx/closest_point.hpp | 2 +- glm/gtx/closest_point.inl | 2 +- glm/gtx/color_cast.hpp | 2 +- glm/gtx/color_cast.inl | 2 +- glm/gtx/color_space.hpp | 2 +- glm/gtx/color_space.inl | 2 +- glm/gtx/color_space_YCoCg.hpp | 2 +- glm/gtx/color_space_YCoCg.inl | 2 +- glm/gtx/comparison.inl | 2 +- glm/gtx/compatibility.hpp | 2 +- glm/gtx/compatibility.inl | 2 +- glm/gtx/component_wise.hpp | 2 +- glm/gtx/component_wise.inl | 2 +- glm/gtx/epsilon.hpp | 2 +- glm/gtx/epsilon.inl | 2 +- glm/gtx/euler_angles.hpp | 2 +- glm/gtx/euler_angles.inl | 2 +- glm/gtx/extend.hpp | 2 +- glm/gtx/extend.inl | 2 +- glm/gtx/extented_min_max.hpp | 2 +- glm/gtx/extented_min_max.inl | 2 +- glm/gtx/fast_exponential.hpp | 2 +- glm/gtx/fast_exponential.inl | 2 +- glm/gtx/fast_square_root.hpp | 2 +- glm/gtx/fast_square_root.inl | 2 +- glm/gtx/fast_trigonometry.hpp | 2 +- glm/gtx/fast_trigonometry.inl | 2 +- glm/gtx/gradient_paint.hpp | 2 +- glm/gtx/gradient_paint.inl | 2 +- glm/gtx/handed_coordinate_space.hpp | 2 +- glm/gtx/handed_coordinate_space.inl | 2 +- glm/gtx/inertia.hpp | 2 +- glm/gtx/inertia.inl | 2 +- glm/gtx/int_10_10_10_2.hpp | 2 +- glm/gtx/int_10_10_10_2.inl | 2 +- glm/gtx/integer.hpp | 2 +- glm/gtx/integer.inl | 2 +- glm/gtx/intersect.hpp | 2 +- glm/gtx/intersect.inl | 2 +- glm/gtx/log_base.hpp | 2 +- glm/gtx/log_base.inl | 2 +- glm/gtx/matrix_cross_product.hpp | 2 +- glm/gtx/matrix_cross_product.inl | 2 +- glm/gtx/matrix_major_storage.hpp | 2 +- glm/gtx/matrix_major_storage.inl | 2 +- glm/gtx/matrix_operation.hpp | 2 +- glm/gtx/matrix_operation.inl | 2 +- glm/gtx/matrix_query.hpp | 2 +- glm/gtx/matrix_query.inl | 2 +- glm/gtx/mixed_product.hpp | 2 +- glm/gtx/mixed_product.inl | 2 +- glm/gtx/multiple.hpp | 2 +- glm/gtx/multiple.inl | 2 +- glm/gtx/norm.hpp | 2 +- glm/gtx/norm.inl | 2 +- glm/gtx/normal.hpp | 2 +- glm/gtx/normal.inl | 2 +- glm/gtx/normalize_dot.hpp | 2 +- glm/gtx/normalize_dot.inl | 2 +- glm/gtx/number_precision.hpp | 2 +- glm/gtx/number_precision.inl | 2 +- glm/gtx/ocl_type.hpp | 2 +- glm/gtx/optimum_pow.hpp | 2 +- glm/gtx/optimum_pow.inl | 2 +- glm/gtx/orthonormalize.hpp | 2 +- glm/gtx/orthonormalize.inl | 2 +- glm/gtx/perpendicular.hpp | 2 +- glm/gtx/perpendicular.inl | 2 +- glm/gtx/polar_coordinates.hpp | 2 +- glm/gtx/polar_coordinates.inl | 2 +- glm/gtx/projection.hpp | 2 +- glm/gtx/projection.inl | 2 +- glm/gtx/quaternion.hpp | 2 +- glm/gtx/quaternion.inl | 2 +- glm/gtx/random.hpp | 2 +- glm/gtx/random.inl | 2 +- glm/gtx/raw_data.hpp | 2 +- glm/gtx/raw_data.inl | 2 +- glm/gtx/reciprocal.hpp | 2 +- glm/gtx/reciprocal.inl | 2 +- glm/gtx/rotate_vector.hpp | 2 +- glm/gtx/rotate_vector.inl | 2 +- glm/gtx/simd_mat4.hpp | 2 +- glm/gtx/simd_mat4.inl | 2 +- glm/gtx/simd_vec4.hpp | 2 +- glm/gtx/simd_vec4.inl | 2 +- glm/gtx/spline.hpp | 2 +- glm/gtx/spline.inl | 2 +- glm/gtx/std_based_type.hpp | 2 +- glm/gtx/std_based_type.inl | 2 +- glm/gtx/string_cast.hpp | 2 +- glm/gtx/transform.hpp | 2 +- glm/gtx/transform.inl | 2 +- glm/gtx/transform2.hpp | 2 +- glm/gtx/transform2.inl | 2 +- glm/gtx/unsigned_int.hpp | 2 +- glm/gtx/unsigned_int.inl | 2 +- glm/gtx/vec1.hpp | 2 +- glm/gtx/vector_access.hpp | 2 +- glm/gtx/vector_access.inl | 2 +- glm/gtx/vector_angle.hpp | 2 +- glm/gtx/vector_angle.inl | 2 +- glm/gtx/vector_query.hpp | 2 +- glm/gtx/vector_query.inl | 2 +- glm/gtx/verbose_operator.hpp | 2 +- glm/gtx/verbose_operator.inl | 2 +- glm/gtx/wrap.hpp | 2 +- glm/gtx/wrap.inl | 2 +- glm/setup.hpp | 2 +- glm/virtrev/xstream.hpp | 2 +- test/core/core_func_common.cpp | 2 +- test/core/core_func_exponential.cpp | 2 +- test/core/core_func_geometric.cpp | 2 +- test/core/core_func_integer.cpp | 2 +- test/core/core_func_matrix.cpp | 2 +- test/core/core_func_noise.cpp | 2 +- test/core/core_func_packing.cpp | 2 +- test/core/core_func_trigonometric.cpp | 2 +- test/core/core_func_vector_relational.cpp | 2 +- test/core/core_type_float.cpp | 2 +- test/core/core_type_half.cpp | 2 +- test/core/core_type_int.cpp | 2 +- test/core/core_type_mat2x2.cpp | 2 +- test/core/core_type_mat2x3.cpp | 2 +- test/core/core_type_mat2x4.cpp | 2 +- test/core/core_type_mat3x2.cpp | 2 +- test/core/core_type_mat3x3.cpp | 2 +- test/core/core_type_mat3x4.cpp | 2 +- test/core/core_type_mat4x2.cpp | 2 +- test/core/core_type_mat4x3.cpp | 2 +- test/core/core_type_mat4x4.cpp | 2 +- test/core/core_type_vec1.cpp | 2 +- test/core/core_type_vec2.cpp | 2 +- test/core/core_type_vec3.cpp | 2 +- test/core/core_type_vec4.cpp | 2 +- test/gtc/gtc-integer-matrix.cpp | 2 +- test/gtc/gtc-swizzle.cpp | 2 +- test/gtx/gtx-bit.cpp | 2 +- test/gtx/gtx-simd-mat4.cpp | 2 +- test/gtx/gtx-simd-vec4.cpp | 2 +- 230 files changed, 230 insertions(+), 230 deletions(-) diff --git a/glm/core/_detail.hpp b/glm/core/_detail.hpp index 3379dd70..72885fc0 100644 --- a/glm/core/_detail.hpp +++ b/glm/core/_detail.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-07-24 // Updated : 2008-08-31 diff --git a/glm/core/_swizzle.hpp b/glm/core/_swizzle.hpp index 8274117b..ed7bcf9b 100644 --- a/glm/core/_swizzle.hpp +++ b/glm/core/_swizzle.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-04-20 // Updated : 2008-08-22 diff --git a/glm/core/_swizzle.inl b/glm/core/_swizzle.inl index 7be28ff0..8502d9e3 100644 --- a/glm/core/_swizzle.inl +++ b/glm/core/_swizzle.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-04-27 // Updated : 2006-04-27 diff --git a/glm/core/dummy.cpp b/glm/core/dummy.cpp index 36fa6278..3c603ff3 100644 --- a/glm/core/dummy.cpp +++ b/glm/core/dummy.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-01-19 // Updated : 2011-01-19 diff --git a/glm/core/func_common.hpp b/glm/core/func_common.hpp index d270eae3..df60a378 100644 --- a/glm/core/func_common.hpp +++ b/glm/core/func_common.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-03-08 // Updated : 2010-01-26 diff --git a/glm/core/func_common.inl b/glm/core/func_common.inl index 6833e2cc..4020c556 100644 --- a/glm/core/func_common.inl +++ b/glm/core/func_common.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-03 // Updated : 2010-01-26 diff --git a/glm/core/func_exponential.hpp b/glm/core/func_exponential.hpp index 09b11325..2197b0f7 100644 --- a/glm/core/func_exponential.hpp +++ b/glm/core/func_exponential.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-08 // Updated : 2010-02-04 diff --git a/glm/core/func_exponential.inl b/glm/core/func_exponential.inl index e825ca7a..22215ade 100644 --- a/glm/core/func_exponential.inl +++ b/glm/core/func_exponential.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-03 // Updated : 2010-02-04 diff --git a/glm/core/func_geometric.hpp b/glm/core/func_geometric.hpp index 82bf2776..24029994 100644 --- a/glm/core/func_geometric.hpp +++ b/glm/core/func_geometric.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-03 // Updated : 2010-02-04 diff --git a/glm/core/func_geometric.inl b/glm/core/func_geometric.inl index 83c6c9fd..6a259a13 100644 --- a/glm/core/func_geometric.inl +++ b/glm/core/func_geometric.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-03 // Updated : 2010-02-04 diff --git a/glm/core/func_integer.hpp b/glm/core/func_integer.hpp index 06e00323..03319f36 100644 --- a/glm/core/func_integer.hpp +++ b/glm/core/func_integer.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-03-17 // Updated : 2010-03-31 diff --git a/glm/core/func_integer.inl b/glm/core/func_integer.inl index 4c6bdbd1..a07ed249 100644 --- a/glm/core/func_integer.inl +++ b/glm/core/func_integer.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-03-17 // Updated : 2010-03-31 diff --git a/glm/core/func_matrix.hpp b/glm/core/func_matrix.hpp index a7cc5327..28ef155a 100644 --- a/glm/core/func_matrix.hpp +++ b/glm/core/func_matrix.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-03 // Updated : 2010-02-04 diff --git a/glm/core/func_matrix.inl b/glm/core/func_matrix.inl index 7801b622..7b7cc392 100644 --- a/glm/core/func_matrix.inl +++ b/glm/core/func_matrix.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-03-08 // Updated : 2010-02-04 diff --git a/glm/core/func_noise.hpp b/glm/core/func_noise.hpp index 1b1a7034..99600bad 100644 --- a/glm/core/func_noise.hpp +++ b/glm/core/func_noise.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-01 // Updated : 2008-09-10 diff --git a/glm/core/func_noise.inl b/glm/core/func_noise.inl index 2746932f..c780534e 100644 --- a/glm/core/func_noise.inl +++ b/glm/core/func_noise.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-01 // Updated : 2008-09-23 diff --git a/glm/core/func_packing.hpp b/glm/core/func_packing.hpp index 3dea30ad..26a5c87e 100644 --- a/glm/core/func_packing.hpp +++ b/glm/core/func_packing.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-03-17 // Updated : 2010-03-17 diff --git a/glm/core/func_packing.inl b/glm/core/func_packing.inl index 83e174d3..9f13cd21 100644 --- a/glm/core/func_packing.inl +++ b/glm/core/func_packing.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-03-17 // Updated : 2010-03-17 diff --git a/glm/core/func_trigonometric.hpp b/glm/core/func_trigonometric.hpp index 032ff74e..47a6e97a 100644 --- a/glm/core/func_trigonometric.hpp +++ b/glm/core/func_trigonometric.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-01 // Updated : 2008-09-10 diff --git a/glm/core/func_trigonometric.inl b/glm/core/func_trigonometric.inl index 39689b2f..bbb67545 100644 --- a/glm/core/func_trigonometric.inl +++ b/glm/core/func_trigonometric.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-03 // Updated : 2008-09-14 diff --git a/glm/core/func_vector_relational.hpp b/glm/core/func_vector_relational.hpp index 68e498c8..a6f5047d 100644 --- a/glm/core/func_vector_relational.hpp +++ b/glm/core/func_vector_relational.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-03 // Updated : 2008-09-09 diff --git a/glm/core/func_vector_relational.inl b/glm/core/func_vector_relational.inl index 17802c60..728c8049 100644 --- a/glm/core/func_vector_relational.inl +++ b/glm/core/func_vector_relational.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-03 // Updated : 2008-09-14 diff --git a/glm/core/hint.hpp b/glm/core/hint.hpp index 2d7817ea..d7efd589 100644 --- a/glm/core/hint.hpp +++ b/glm/core/hint.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-14 // Updated : 2008-08-14 diff --git a/glm/core/intrinsic_common.hpp b/glm/core/intrinsic_common.hpp index 40bbe454..81eec915 100644 --- a/glm/core/intrinsic_common.hpp +++ b/glm/core/intrinsic_common.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-05-11 // Updated : 2009-05-11 diff --git a/glm/core/intrinsic_common.inl b/glm/core/intrinsic_common.inl index d7c50bf3..ad0d01f0 100644 --- a/glm/core/intrinsic_common.inl +++ b/glm/core/intrinsic_common.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-05-08 // Updated : 2009-05-08 diff --git a/glm/core/intrinsic_exponential.hpp b/glm/core/intrinsic_exponential.hpp index 8659e31d..9ece1f80 100644 --- a/glm/core/intrinsic_exponential.hpp +++ b/glm/core/intrinsic_exponential.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-05-11 // Updated : 2009-05-11 diff --git a/glm/core/intrinsic_geometric.hpp b/glm/core/intrinsic_geometric.hpp index e2a6754a..d5f324c7 100644 --- a/glm/core/intrinsic_geometric.hpp +++ b/glm/core/intrinsic_geometric.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-05-08 // Updated : 2009-05-08 diff --git a/glm/core/intrinsic_geometric.inl b/glm/core/intrinsic_geometric.inl index 39f60644..4a2403c2 100644 --- a/glm/core/intrinsic_geometric.inl +++ b/glm/core/intrinsic_geometric.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-05-08 // Updated : 2009-05-08 diff --git a/glm/core/intrinsic_matrix.hpp b/glm/core/intrinsic_matrix.hpp index 9a639149..7615cddc 100644 --- a/glm/core/intrinsic_matrix.hpp +++ b/glm/core/intrinsic_matrix.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-06-05 // Updated : 2009-06-05 diff --git a/glm/core/intrinsic_matrix.inl b/glm/core/intrinsic_matrix.inl index e1ded4cf..a81f50b7 100644 --- a/glm/core/intrinsic_matrix.inl +++ b/glm/core/intrinsic_matrix.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-06-05 // Updated : 2009-06-05 diff --git a/glm/core/intrinsic_trigonometric.hpp b/glm/core/intrinsic_trigonometric.hpp index 36166100..458e3d92 100644 --- a/glm/core/intrinsic_trigonometric.hpp +++ b/glm/core/intrinsic_trigonometric.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-06-09 // Updated : 2009-06-09 diff --git a/glm/core/intrinsic_vector_relational.hpp b/glm/core/intrinsic_vector_relational.hpp index 7cce6705..260f28d6 100644 --- a/glm/core/intrinsic_vector_relational.hpp +++ b/glm/core/intrinsic_vector_relational.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-06-09 // Updated : 2009-06-09 diff --git a/glm/core/intrinsic_vector_relational.inl b/glm/core/intrinsic_vector_relational.inl index 28332e8d..e7703866 100644 --- a/glm/core/intrinsic_vector_relational.inl +++ b/glm/core/intrinsic_vector_relational.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-06-09 // Updated : 2009-06-09 diff --git a/glm/core/type.hpp b/glm/core/type.hpp index f81285d1..f4d9f042 100644 --- a/glm/core/type.hpp +++ b/glm/core/type.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-01-08 // Updated : 2008-01-08 diff --git a/glm/core/type_float.hpp b/glm/core/type_float.hpp index 97a7fda3..a274857d 100644 --- a/glm/core/type_float.hpp +++ b/glm/core/type_float.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-22 // Updated : 2010-02-08 diff --git a/glm/core/type_gentype.hpp b/glm/core/type_gentype.hpp index 8d1405df..fce3881a 100644 --- a/glm/core/type_gentype.hpp +++ b/glm/core/type_gentype.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-10-05 // Updated : 2010-01-26 diff --git a/glm/core/type_gentype.inl b/glm/core/type_gentype.inl index 64b5a4ee..64512787 100644 --- a/glm/core/type_gentype.inl +++ b/glm/core/type_gentype.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-10-05 // Updated : 2008-10-05 diff --git a/glm/core/type_half.hpp b/glm/core/type_half.hpp index eea4c451..d451e5d8 100644 --- a/glm/core/type_half.hpp +++ b/glm/core/type_half.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-17 // Updated : 2010-02-17 diff --git a/glm/core/type_half.inl b/glm/core/type_half.inl index 3db5723f..3fb0a4ce 100644 --- a/glm/core/type_half.inl +++ b/glm/core/type_half.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-17 // Updated : 2009-11-12 diff --git a/glm/core/type_int.hpp b/glm/core/type_int.hpp index 04ef2d19..2d046911 100644 --- a/glm/core/type_int.hpp +++ b/glm/core/type_int.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-22 // Updated : 2008-09-17 diff --git a/glm/core/type_mat.hpp b/glm/core/type_mat.hpp index afe632bc..78ff247c 100644 --- a/glm/core/type_mat.hpp +++ b/glm/core/type_mat.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-01-26 // Updated : 2010-01-26 diff --git a/glm/core/type_mat2x2.hpp b/glm/core/type_mat2x2.hpp index 61b78526..692ec5e8 100644 --- a/glm/core/type_mat2x2.hpp +++ b/glm/core/type_mat2x2.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-01-27 // Updated : 2010-02-11 diff --git a/glm/core/type_mat2x2.inl b/glm/core/type_mat2x2.inl index 6ab1260c..7d488297 100644 --- a/glm/core/type_mat2x2.inl +++ b/glm/core/type_mat2x2.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-01-16 // Updated : 2010-02-11 diff --git a/glm/core/type_mat2x3.hpp b/glm/core/type_mat2x3.hpp index 7641e57b..81b14ebf 100644 --- a/glm/core/type_mat2x3.hpp +++ b/glm/core/type_mat2x3.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-10-01 // Updated : 2010-02-03 diff --git a/glm/core/type_mat2x3.inl b/glm/core/type_mat2x3.inl index aa8a58a4..200fe7e9 100644 --- a/glm/core/type_mat2x3.inl +++ b/glm/core/type_mat2x3.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-08-05 // Updated : 2010-02-03 diff --git a/glm/core/type_mat2x4.hpp b/glm/core/type_mat2x4.hpp index 2d2d84c1..5b16b082 100644 --- a/glm/core/type_mat2x4.hpp +++ b/glm/core/type_mat2x4.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-08-05 // Updated : 2010-02-11 diff --git a/glm/core/type_mat2x4.inl b/glm/core/type_mat2x4.inl index 98b7069e..2ade9c3e 100644 --- a/glm/core/type_mat2x4.inl +++ b/glm/core/type_mat2x4.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-08-05 // Updated : 2010-02-03 diff --git a/glm/core/type_mat3x2.hpp b/glm/core/type_mat3x2.hpp index 1f35c63a..2fc42c52 100644 --- a/glm/core/type_mat3x2.hpp +++ b/glm/core/type_mat3x2.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-08-05 // Updated : 2010-02-05 diff --git a/glm/core/type_mat3x2.inl b/glm/core/type_mat3x2.inl index 4ac61ff4..8198574c 100644 --- a/glm/core/type_mat3x2.inl +++ b/glm/core/type_mat3x2.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-08-05 // Updated : 2010-01-05 diff --git a/glm/core/type_mat3x3.hpp b/glm/core/type_mat3x3.hpp index a8f09de4..30a12676 100644 --- a/glm/core/type_mat3x3.hpp +++ b/glm/core/type_mat3x3.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-01-27 // Updated : 2010-02-03 diff --git a/glm/core/type_mat3x3.inl b/glm/core/type_mat3x3.inl index 1fdc3f63..5ed21330 100644 --- a/glm/core/type_mat3x3.inl +++ b/glm/core/type_mat3x3.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-01-27 // Updated : 2010-02-03 diff --git a/glm/core/type_mat3x4.hpp b/glm/core/type_mat3x4.hpp index 01ac9da9..03b7e5f2 100644 --- a/glm/core/type_mat3x4.hpp +++ b/glm/core/type_mat3x4.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-08-05 // Updated : 2010-02-05 diff --git a/glm/core/type_mat3x4.inl b/glm/core/type_mat3x4.inl index f2ef904d..0f8a00cd 100644 --- a/glm/core/type_mat3x4.inl +++ b/glm/core/type_mat3x4.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-08-05 // Updated : 2010-02-05 diff --git a/glm/core/type_mat4x2.hpp b/glm/core/type_mat4x2.hpp index c229f34a..a705d127 100644 --- a/glm/core/type_mat4x2.hpp +++ b/glm/core/type_mat4x2.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-10-01 // Updated : 2010-02-11 diff --git a/glm/core/type_mat4x2.inl b/glm/core/type_mat4x2.inl index 7f6ed80a..e42a2ed1 100644 --- a/glm/core/type_mat4x2.inl +++ b/glm/core/type_mat4x2.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-10-01 // Updated : 2010-02-03 diff --git a/glm/core/type_mat4x3.hpp b/glm/core/type_mat4x3.hpp index 207cd9f8..2fb7bcef 100644 --- a/glm/core/type_mat4x3.hpp +++ b/glm/core/type_mat4x3.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-08-04 // Updated : 2010-02-11 diff --git a/glm/core/type_mat4x3.inl b/glm/core/type_mat4x3.inl index 080dbd8e..fa928ffd 100644 --- a/glm/core/type_mat4x3.inl +++ b/glm/core/type_mat4x3.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-04-17 // Updated : 2010-02-02 diff --git a/glm/core/type_mat4x4.hpp b/glm/core/type_mat4x4.hpp index b9a78bb8..47ca4a91 100644 --- a/glm/core/type_mat4x4.hpp +++ b/glm/core/type_mat4x4.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-01-27 // Updated : 2008-08-30 diff --git a/glm/core/type_mat4x4.inl b/glm/core/type_mat4x4.inl index a307d9e8..58260076 100644 --- a/glm/core/type_mat4x4.inl +++ b/glm/core/type_mat4x4.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-01-27 // Updated : 2010-02-05 diff --git a/glm/core/type_size.hpp b/glm/core/type_size.hpp index d0760bb7..8c1321cf 100644 --- a/glm/core/type_size.hpp +++ b/glm/core/type_size.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-10-05 // Updated : 2008-10-05 diff --git a/glm/core/type_vec.hpp b/glm/core/type_vec.hpp index 451019bd..59c7c0b7 100644 --- a/glm/core/type_vec.hpp +++ b/glm/core/type_vec.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-01-26 // Updated : 2010-02-04 diff --git a/glm/core/type_vec1.hpp b/glm/core/type_vec1.hpp index 6279b0cc..2b3ad663 100644 --- a/glm/core/type_vec1.hpp +++ b/glm/core/type_vec1.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-25 // Updated : 2010-02-04 diff --git a/glm/core/type_vec1.inl b/glm/core/type_vec1.inl index a64b93f3..e89d109c 100644 --- a/glm/core/type_vec1.inl +++ b/glm/core/type_vec1.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-25 // Updated : 2010-02-04 diff --git a/glm/core/type_vec2.hpp b/glm/core/type_vec2.hpp index 22c92ff2..91cdbc69 100644 --- a/glm/core/type_vec2.hpp +++ b/glm/core/type_vec2.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-18 // Updated : 2010-02-04 diff --git a/glm/core/type_vec2.inl b/glm/core/type_vec2.inl index ac40c966..e4c8dd96 100644 --- a/glm/core/type_vec2.inl +++ b/glm/core/type_vec2.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-18 // Updated : 2010-10-26 diff --git a/glm/core/type_vec3.hpp b/glm/core/type_vec3.hpp index fe723caf..2a3025db 100644 --- a/glm/core/type_vec3.hpp +++ b/glm/core/type_vec3.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-22 // Updated : 2010-02-03 diff --git a/glm/core/type_vec3.inl b/glm/core/type_vec3.inl index bd849208..e9416822 100644 --- a/glm/core/type_vec3.inl +++ b/glm/core/type_vec3.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-22 // Updated : 2010-02-04 diff --git a/glm/core/type_vec4.hpp b/glm/core/type_vec4.hpp index 576af2a3..02d88817 100644 --- a/glm/core/type_vec4.hpp +++ b/glm/core/type_vec4.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-22 // Updated : 2010-02-03 diff --git a/glm/core/type_vec4.inl b/glm/core/type_vec4.inl index 32782ea2..534d78bc 100644 --- a/glm/core/type_vec4.inl +++ b/glm/core/type_vec4.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-23 // Updated : 2010-02-05 diff --git a/glm/ext.hpp b/glm/ext.hpp index fa8f0d60..2f8461be 100644 --- a/glm/ext.hpp +++ b/glm/ext.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-05-01 // Updated : 2010-12-13 diff --git a/glm/glm.hpp b/glm/glm.hpp index 2b516519..b8bab955 100644 --- a/glm/glm.hpp +++ b/glm/glm.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-01-14 // Updated : 2011-01-19 diff --git a/glm/gtc/half_float.hpp b/glm/gtc/half_float.hpp index 5251a13a..afca7b8b 100644 --- a/glm/gtc/half_float.hpp +++ b/glm/gtc/half_float.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-04-29 // Updated : 2010-02-07 diff --git a/glm/gtc/half_float.inl b/glm/gtc/half_float.inl index d9af5b57..96201b40 100644 --- a/glm/gtc/half_float.inl +++ b/glm/gtc/half_float.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2010-02-07 diff --git a/glm/gtc/matrix_access.hpp b/glm/gtc/matrix_access.hpp index 6114420a..28fe3fa2 100644 --- a/glm/gtc/matrix_access.hpp +++ b/glm/gtc/matrix_access.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-27 // Updated : 2010-11-12 diff --git a/glm/gtc/matrix_access.inl b/glm/gtc/matrix_access.inl index 7ea6fdf1..8098f7fc 100644 --- a/glm/gtc/matrix_access.inl +++ b/glm/gtc/matrix_access.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-27 // Updated : 2010-11-12 diff --git a/glm/gtc/matrix_inverse.hpp b/glm/gtc/matrix_inverse.hpp index 3b68bedd..c2c6ecfd 100644 --- a/glm/gtc/matrix_inverse.hpp +++ b/glm/gtc/matrix_inverse.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2010-12-13 diff --git a/glm/gtc/matrix_inverse.inl b/glm/gtc/matrix_inverse.inl index 50793a8a..e27eb301 100644 --- a/glm/gtc/matrix_inverse.inl +++ b/glm/gtc/matrix_inverse.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2010-12-13 diff --git a/glm/gtc/matrix_transform.hpp b/glm/gtc/matrix_transform.hpp index 8b6d82c9..477dc2eb 100644 --- a/glm/gtc/matrix_transform.hpp +++ b/glm/gtc/matrix_transform.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-04-29 // Updated : 2009-04-29 diff --git a/glm/gtc/matrix_transform.inl b/glm/gtc/matrix_transform.inl index ba1f75dc..858fa68c 100644 --- a/glm/gtc/matrix_transform.inl +++ b/glm/gtc/matrix_transform.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-04-29 // Updated : 2009-04-29 diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp index 87b96991..ed57141f 100644 --- a/glm/gtc/quaternion.hpp +++ b/glm/gtc/quaternion.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-05-21 // Updated : 2010-02-04 diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl index e83ddc56..0c7cafef 100644 --- a/glm/gtc/quaternion.inl +++ b/glm/gtc/quaternion.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-05-21 // Updated : 2010-02-04 diff --git a/glm/gtc/swizzle.hpp b/glm/gtc/swizzle.hpp index 5d265874..5134a460 100644 --- a/glm/gtc/swizzle.hpp +++ b/glm/gtc/swizzle.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-02-20 // Updated : 2010-02-20 diff --git a/glm/gtc/swizzle.inl b/glm/gtc/swizzle.inl index 8d9c15c4..ed986e0c 100644 --- a/glm/gtc/swizzle.inl +++ b/glm/gtc/swizzle.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-01-15 // Updated : 2011-01-15 diff --git a/glm/gtc/type_precision.hpp b/glm/gtc/type_precision.hpp index b1635d79..5c51f280 100644 --- a/glm/gtc/type_precision.hpp +++ b/glm/gtc/type_precision.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-06-04 // Updated : 2009-06-04 diff --git a/glm/gtc/type_precision.inl b/glm/gtc/type_precision.inl index 7312bb48..8eb1ba21 100644 --- a/glm/gtc/type_precision.inl +++ b/glm/gtc/type_precision.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-06-14 // Updated : 2009-06-14 diff --git a/glm/gtc/type_ptr.hpp b/glm/gtc/type_ptr.hpp index 119538f8..887fcdfc 100644 --- a/glm/gtc/type_ptr.hpp +++ b/glm/gtc/type_ptr.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-05-06 // Updated : 2010-04-30 diff --git a/glm/gtx/associated_min_max.hpp b/glm/gtx/associated_min_max.hpp index 61fb7d7c..285be5e7 100644 --- a/glm/gtx/associated_min_max.hpp +++ b/glm/gtx/associated_min_max.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-03-10 // Updated : 2008-03-15 diff --git a/glm/gtx/associated_min_max.inl b/glm/gtx/associated_min_max.inl index 31231a30..718d0585 100644 --- a/glm/gtx/associated_min_max.inl +++ b/glm/gtx/associated_min_max.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-03-10 // Updated : 2008-03-15 diff --git a/glm/gtx/bit.hpp b/glm/gtx/bit.hpp index 644bd135..d011f7dd 100644 --- a/glm/gtx/bit.hpp +++ b/glm/gtx/bit.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-03-14 // Updated : 2008-11-14 diff --git a/glm/gtx/bit.inl b/glm/gtx/bit.inl index c3047b47..13b35ac7 100644 --- a/glm/gtx/bit.inl +++ b/glm/gtx/bit.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-03-14 // Updated : 2008-11-14 diff --git a/glm/gtx/closest_point.hpp b/glm/gtx/closest_point.hpp index cd0360cd..7e2da8f0 100644 --- a/glm/gtx/closest_point.hpp +++ b/glm/gtx/closest_point.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-30 // Updated : 2008-10-05 diff --git a/glm/gtx/closest_point.inl b/glm/gtx/closest_point.inl index cb4488e2..d7f5155d 100644 --- a/glm/gtx/closest_point.inl +++ b/glm/gtx/closest_point.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-30 // Updated : 2008-10-05 diff --git a/glm/gtx/color_cast.hpp b/glm/gtx/color_cast.hpp index 127e005c..0052be9e 100644 --- a/glm/gtx/color_cast.hpp +++ b/glm/gtx/color_cast.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-06-21 // Updated : 2009-06-05 diff --git a/glm/gtx/color_cast.inl b/glm/gtx/color_cast.inl index f002194a..54d5eaae 100644 --- a/glm/gtx/color_cast.inl +++ b/glm/gtx/color_cast.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-06-21 // Updated : 2007-08-03 diff --git a/glm/gtx/color_space.hpp b/glm/gtx/color_space.hpp index f776fbb6..081d9adf 100644 --- a/glm/gtx/color_space.hpp +++ b/glm/gtx/color_space.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2007-02-22 diff --git a/glm/gtx/color_space.inl b/glm/gtx/color_space.inl index 06a7a587..2328519c 100644 --- a/glm/gtx/color_space.inl +++ b/glm/gtx/color_space.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2007-02-22 diff --git a/glm/gtx/color_space_YCoCg.hpp b/glm/gtx/color_space_YCoCg.hpp index 8b1988da..5161aab5 100644 --- a/glm/gtx/color_space_YCoCg.hpp +++ b/glm/gtx/color_space_YCoCg.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-10-28 // Updated : 2008-10-28 diff --git a/glm/gtx/color_space_YCoCg.inl b/glm/gtx/color_space_YCoCg.inl index 7db2382a..0972de7c 100644 --- a/glm/gtx/color_space_YCoCg.inl +++ b/glm/gtx/color_space_YCoCg.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-10-28 // Updated : 2008-10-28 diff --git a/glm/gtx/comparison.inl b/glm/gtx/comparison.inl index 4b847246..0c8f8fa5 100644 --- a/glm/gtx/comparison.inl +++ b/glm/gtx/comparison.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-06-22 // Updated : 2008-10-27 diff --git a/glm/gtx/compatibility.hpp b/glm/gtx/compatibility.hpp index ef2cb84d..0e4487f2 100644 --- a/glm/gtx/compatibility.hpp +++ b/glm/gtx/compatibility.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-01-24 // Updated : 2008-10-24 diff --git a/glm/gtx/compatibility.inl b/glm/gtx/compatibility.inl index c9606966..85fb81b1 100644 --- a/glm/gtx/compatibility.inl +++ b/glm/gtx/compatibility.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-03-16 // Updated : 2008-10-24 diff --git a/glm/gtx/component_wise.hpp b/glm/gtx/component_wise.hpp index 08db24d2..612d5948 100644 --- a/glm/gtx/component_wise.hpp +++ b/glm/gtx/component_wise.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-05-21 // Updated : 2007-05-21 diff --git a/glm/gtx/component_wise.inl b/glm/gtx/component_wise.inl index 54ae35a9..e291859f 100644 --- a/glm/gtx/component_wise.inl +++ b/glm/gtx/component_wise.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-05-21 // Updated : 2010-02-12 diff --git a/glm/gtx/epsilon.hpp b/glm/gtx/epsilon.hpp index b482eb68..35e55170 100644 --- a/glm/gtx/epsilon.hpp +++ b/glm/gtx/epsilon.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2006-11-13 diff --git a/glm/gtx/epsilon.inl b/glm/gtx/epsilon.inl index b922586c..962a6391 100644 --- a/glm/gtx/epsilon.inl +++ b/glm/gtx/epsilon.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2006-01-16 diff --git a/glm/gtx/euler_angles.hpp b/glm/gtx/euler_angles.hpp index 3c41fd6c..df7dc994 100644 --- a/glm/gtx/euler_angles.hpp +++ b/glm/gtx/euler_angles.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2007-08-14 diff --git a/glm/gtx/euler_angles.inl b/glm/gtx/euler_angles.inl index 5033caa5..dfc62313 100644 --- a/glm/gtx/euler_angles.inl +++ b/glm/gtx/euler_angles.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2007-08-14 diff --git a/glm/gtx/extend.hpp b/glm/gtx/extend.hpp index ca304c76..cba75953 100644 --- a/glm/gtx/extend.hpp +++ b/glm/gtx/extend.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-01-07 // Updated : 2006-11-13 diff --git a/glm/gtx/extend.inl b/glm/gtx/extend.inl index 6fe2d59d..42eb3684 100644 --- a/glm/gtx/extend.inl +++ b/glm/gtx/extend.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-01-07 // Updated : 2008-10-05 diff --git a/glm/gtx/extented_min_max.hpp b/glm/gtx/extented_min_max.hpp index 70e072c6..6953be39 100644 --- a/glm/gtx/extented_min_max.hpp +++ b/glm/gtx/extented_min_max.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-03-14 // Updated : 2010-02-19 diff --git a/glm/gtx/extented_min_max.inl b/glm/gtx/extented_min_max.inl index 40b6b538..1e38f72e 100644 --- a/glm/gtx/extented_min_max.inl +++ b/glm/gtx/extented_min_max.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-03-14 // Updated : 2010-02-19 diff --git a/glm/gtx/fast_exponential.hpp b/glm/gtx/fast_exponential.hpp index 0c9a345d..64ac5c3a 100644 --- a/glm/gtx/fast_exponential.hpp +++ b/glm/gtx/fast_exponential.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-01-09 // Updated : 2006-11-13 diff --git a/glm/gtx/fast_exponential.inl b/glm/gtx/fast_exponential.inl index 9507f202..9343a35b 100644 --- a/glm/gtx/fast_exponential.inl +++ b/glm/gtx/fast_exponential.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-01-09 // Updated : 2006-01-09 diff --git a/glm/gtx/fast_square_root.hpp b/glm/gtx/fast_square_root.hpp index 8f639c60..66b7ec23 100644 --- a/glm/gtx/fast_square_root.hpp +++ b/glm/gtx/fast_square_root.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-01-04 // Updated : 2008-10-07 diff --git a/glm/gtx/fast_square_root.inl b/glm/gtx/fast_square_root.inl index f465d2f3..251e0df7 100644 --- a/glm/gtx/fast_square_root.inl +++ b/glm/gtx/fast_square_root.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-01-04 // Updated : 2008-10-07 diff --git a/glm/gtx/fast_trigonometry.hpp b/glm/gtx/fast_trigonometry.hpp index 1ac459be..3bf9a906 100644 --- a/glm/gtx/fast_trigonometry.hpp +++ b/glm/gtx/fast_trigonometry.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-01-08 // Updated : 2006-11-13 diff --git a/glm/gtx/fast_trigonometry.inl b/glm/gtx/fast_trigonometry.inl index a5d9f9b0..f34999c5 100644 --- a/glm/gtx/fast_trigonometry.inl +++ b/glm/gtx/fast_trigonometry.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-01-08 // Updated : 2006-01-08 diff --git a/glm/gtx/gradient_paint.hpp b/glm/gtx/gradient_paint.hpp index c316afda..5ada9760 100644 --- a/glm/gtx/gradient_paint.hpp +++ b/glm/gtx/gradient_paint.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-03-06 // Updated : 2009-03-09 diff --git a/glm/gtx/gradient_paint.inl b/glm/gtx/gradient_paint.inl index dc09639d..d3ad8004 100644 --- a/glm/gtx/gradient_paint.inl +++ b/glm/gtx/gradient_paint.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-03-06 // Updated : 2009-03-09 diff --git a/glm/gtx/handed_coordinate_space.hpp b/glm/gtx/handed_coordinate_space.hpp index b5b096f0..b7c13ca5 100644 --- a/glm/gtx/handed_coordinate_space.hpp +++ b/glm/gtx/handed_coordinate_space.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2009-02-19 diff --git a/glm/gtx/handed_coordinate_space.inl b/glm/gtx/handed_coordinate_space.inl index c247caef..429bafde 100644 --- a/glm/gtx/handed_coordinate_space.inl +++ b/glm/gtx/handed_coordinate_space.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2009-02-19 diff --git a/glm/gtx/inertia.hpp b/glm/gtx/inertia.hpp index 8fa5652a..2c29697f 100644 --- a/glm/gtx/inertia.hpp +++ b/glm/gtx/inertia.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-04-21 // Updated : 2006-11-13 diff --git a/glm/gtx/inertia.inl b/glm/gtx/inertia.inl index 439313cf..361765c2 100644 --- a/glm/gtx/inertia.inl +++ b/glm/gtx/inertia.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-04-21 // Updated : 2006-12-06 diff --git a/glm/gtx/int_10_10_10_2.hpp b/glm/gtx/int_10_10_10_2.hpp index da3d6e0e..38c2c736 100644 --- a/glm/gtx/int_10_10_10_2.hpp +++ b/glm/gtx/int_10_10_10_2.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-07-07 // Updated : 2010-07-07 diff --git a/glm/gtx/int_10_10_10_2.inl b/glm/gtx/int_10_10_10_2.inl index 446f5354..e9867cb7 100644 --- a/glm/gtx/int_10_10_10_2.inl +++ b/glm/gtx/int_10_10_10_2.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-07-07 // Updated : 2010-07-07 diff --git a/glm/gtx/integer.hpp b/glm/gtx/integer.hpp index 9d459f86..7afb1623 100644 --- a/glm/gtx/integer.hpp +++ b/glm/gtx/integer.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-24 // Updated : 2006-11-14 diff --git a/glm/gtx/integer.inl b/glm/gtx/integer.inl index 28914239..7028d509 100644 --- a/glm/gtx/integer.inl +++ b/glm/gtx/integer.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-24 // Updated : 2006-12-06 diff --git a/glm/gtx/intersect.hpp b/glm/gtx/intersect.hpp index 5028691b..5da484aa 100644 --- a/glm/gtx/intersect.hpp +++ b/glm/gtx/intersect.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-04-03 // Updated : 2009-01-20 diff --git a/glm/gtx/intersect.inl b/glm/gtx/intersect.inl index 91013948..86f34c3a 100644 --- a/glm/gtx/intersect.inl +++ b/glm/gtx/intersect.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-04-03 // Updated : 2009-01-20 diff --git a/glm/gtx/log_base.hpp b/glm/gtx/log_base.hpp index c3b63253..8002cb35 100644 --- a/glm/gtx/log_base.hpp +++ b/glm/gtx/log_base.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-10-24 // Updated : 2008-10-24 diff --git a/glm/gtx/log_base.inl b/glm/gtx/log_base.inl index 826b3689..671f1805 100644 --- a/glm/gtx/log_base.inl +++ b/glm/gtx/log_base.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-10-24 // Updated : 2008-10-24 diff --git a/glm/gtx/matrix_cross_product.hpp b/glm/gtx/matrix_cross_product.hpp index a575f175..91245c79 100644 --- a/glm/gtx/matrix_cross_product.hpp +++ b/glm/gtx/matrix_cross_product.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2006-11-13 diff --git a/glm/gtx/matrix_cross_product.inl b/glm/gtx/matrix_cross_product.inl index d46ca8e0..b4b543d6 100644 --- a/glm/gtx/matrix_cross_product.inl +++ b/glm/gtx/matrix_cross_product.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2005-12-21 diff --git a/glm/gtx/matrix_major_storage.hpp b/glm/gtx/matrix_major_storage.hpp index a4b32c4d..11a23500 100644 --- a/glm/gtx/matrix_major_storage.hpp +++ b/glm/gtx/matrix_major_storage.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-04-19 // Updated : 2009-02-19 diff --git a/glm/gtx/matrix_major_storage.inl b/glm/gtx/matrix_major_storage.inl index 8080f28e..d7983879 100644 --- a/glm/gtx/matrix_major_storage.inl +++ b/glm/gtx/matrix_major_storage.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-04-19 // Updated : 2009-02-19 diff --git a/glm/gtx/matrix_operation.hpp b/glm/gtx/matrix_operation.hpp index 97ad3502..6c3fa30d 100644 --- a/glm/gtx/matrix_operation.hpp +++ b/glm/gtx/matrix_operation.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-08-29 // Updated : 2009-08-29 diff --git a/glm/gtx/matrix_operation.inl b/glm/gtx/matrix_operation.inl index c9d1ae5d..3af709f1 100644 --- a/glm/gtx/matrix_operation.inl +++ b/glm/gtx/matrix_operation.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-08-29 // Updated : 2009-08-29 diff --git a/glm/gtx/matrix_query.hpp b/glm/gtx/matrix_query.hpp index 3994b3ed..9dcfec79 100644 --- a/glm/gtx/matrix_query.hpp +++ b/glm/gtx/matrix_query.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-03-05 // Updated : 2007-03-05 diff --git a/glm/gtx/matrix_query.inl b/glm/gtx/matrix_query.inl index 7628222a..50e6b5a6 100644 --- a/glm/gtx/matrix_query.inl +++ b/glm/gtx/matrix_query.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-03-05 // Updated : 2007-03-05 diff --git a/glm/gtx/mixed_product.hpp b/glm/gtx/mixed_product.hpp index 02799aa9..ca955c84 100644 --- a/glm/gtx/mixed_product.hpp +++ b/glm/gtx/mixed_product.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-04-03 // Updated : 2008-09-17 diff --git a/glm/gtx/mixed_product.inl b/glm/gtx/mixed_product.inl index 50ab8fb1..5c067609 100644 --- a/glm/gtx/mixed_product.inl +++ b/glm/gtx/mixed_product.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-04-03 // Updated : 2008-09-17 diff --git a/glm/gtx/multiple.hpp b/glm/gtx/multiple.hpp index 205fece6..5c406816 100644 --- a/glm/gtx/multiple.hpp +++ b/glm/gtx/multiple.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-10-26 // Updated : 2009-10-26 diff --git a/glm/gtx/multiple.inl b/glm/gtx/multiple.inl index 7f762135..19965aad 100644 --- a/glm/gtx/multiple.inl +++ b/glm/gtx/multiple.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-10-26 // Updated : 2009-10-26 diff --git a/glm/gtx/norm.hpp b/glm/gtx/norm.hpp index 764c607b..4384d107 100644 --- a/glm/gtx/norm.hpp +++ b/glm/gtx/norm.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2008-07-24 diff --git a/glm/gtx/norm.inl b/glm/gtx/norm.inl index 6b487ed7..8ff9b929 100644 --- a/glm/gtx/norm.inl +++ b/glm/gtx/norm.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2008-07-24 diff --git a/glm/gtx/normal.hpp b/glm/gtx/normal.hpp index 1a15526b..870a8517 100644 --- a/glm/gtx/normal.hpp +++ b/glm/gtx/normal.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2006-11-13 diff --git a/glm/gtx/normal.inl b/glm/gtx/normal.inl index c378469a..8ee670f3 100644 --- a/glm/gtx/normal.inl +++ b/glm/gtx/normal.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2005-12-21 diff --git a/glm/gtx/normalize_dot.hpp b/glm/gtx/normalize_dot.hpp index 4df8b9e6..c664717b 100644 --- a/glm/gtx/normalize_dot.hpp +++ b/glm/gtx/normalize_dot.hpp @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) ////////////////////////////////////////////////////////////////////////////////// // Created : 2007-09-28 // Updated : 2008-10-07 diff --git a/glm/gtx/normalize_dot.inl b/glm/gtx/normalize_dot.inl index ed24fda7..670c36a4 100644 --- a/glm/gtx/normalize_dot.inl +++ b/glm/gtx/normalize_dot.inl @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) ////////////////////////////////////////////////////////////////////////////////// // Created : 2007-09-28 // Updated : 2008-10-07 diff --git a/glm/gtx/number_precision.hpp b/glm/gtx/number_precision.hpp index 4f8a8220..22c6191c 100644 --- a/glm/gtx/number_precision.hpp +++ b/glm/gtx/number_precision.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-05-10 // Updated : 2009-06-04 diff --git a/glm/gtx/number_precision.inl b/glm/gtx/number_precision.inl index aa3733ec..e2de65e8 100644 --- a/glm/gtx/number_precision.inl +++ b/glm/gtx/number_precision.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-05-10 // Updated : 2007-05-10 diff --git a/glm/gtx/ocl_type.hpp b/glm/gtx/ocl_type.hpp index 4146dc86..f3341e9a 100644 --- a/glm/gtx/ocl_type.hpp +++ b/glm/gtx/ocl_type.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-05-07 // Updated : 2009-05-07 diff --git a/glm/gtx/optimum_pow.hpp b/glm/gtx/optimum_pow.hpp index e87e27a0..c9280547 100644 --- a/glm/gtx/optimum_pow.hpp +++ b/glm/gtx/optimum_pow.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2006-11-13 diff --git a/glm/gtx/optimum_pow.inl b/glm/gtx/optimum_pow.inl index aed550bb..d085a373 100644 --- a/glm/gtx/optimum_pow.inl +++ b/glm/gtx/optimum_pow.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2005-12-27 diff --git a/glm/gtx/orthonormalize.hpp b/glm/gtx/orthonormalize.hpp index 5c0a16d9..ef2d85cb 100644 --- a/glm/gtx/orthonormalize.hpp +++ b/glm/gtx/orthonormalize.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2006-11-13 diff --git a/glm/gtx/orthonormalize.inl b/glm/gtx/orthonormalize.inl index eef85fd2..80605fb4 100644 --- a/glm/gtx/orthonormalize.inl +++ b/glm/gtx/orthonormalize.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2005-12-21 diff --git a/glm/gtx/perpendicular.hpp b/glm/gtx/perpendicular.hpp index 0bc59b7a..e7b950f6 100644 --- a/glm/gtx/perpendicular.hpp +++ b/glm/gtx/perpendicular.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2009-03-06 diff --git a/glm/gtx/perpendicular.inl b/glm/gtx/perpendicular.inl index ad44727f..340e4d8b 100644 --- a/glm/gtx/perpendicular.inl +++ b/glm/gtx/perpendicular.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2009-03-06 diff --git a/glm/gtx/polar_coordinates.hpp b/glm/gtx/polar_coordinates.hpp index c23212c4..633d60a7 100644 --- a/glm/gtx/polar_coordinates.hpp +++ b/glm/gtx/polar_coordinates.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-03-06 // Updated : 2009-05-01 diff --git a/glm/gtx/polar_coordinates.inl b/glm/gtx/polar_coordinates.inl index e5215c2a..1246e737 100644 --- a/glm/gtx/polar_coordinates.inl +++ b/glm/gtx/polar_coordinates.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-03-06 // Updated : 2009-05-01 diff --git a/glm/gtx/projection.hpp b/glm/gtx/projection.hpp index 192d36e1..83401d68 100644 --- a/glm/gtx/projection.hpp +++ b/glm/gtx/projection.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2009-03-06 diff --git a/glm/gtx/projection.inl b/glm/gtx/projection.inl index 271dc793..5d087176 100644 --- a/glm/gtx/projection.inl +++ b/glm/gtx/projection.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2009-03-06 diff --git a/glm/gtx/quaternion.hpp b/glm/gtx/quaternion.hpp index aeab13ac..b0bda231 100644 --- a/glm/gtx/quaternion.hpp +++ b/glm/gtx/quaternion.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2009-05-21 diff --git a/glm/gtx/quaternion.inl b/glm/gtx/quaternion.inl index 3bec0f79..ba69b9d1 100644 --- a/glm/gtx/quaternion.inl +++ b/glm/gtx/quaternion.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2008-11-27 diff --git a/glm/gtx/random.hpp b/glm/gtx/random.hpp index b9cdbc18..aa871e20 100644 --- a/glm/gtx/random.hpp +++ b/glm/gtx/random.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-01-16 // Updated : 2007-08-30 diff --git a/glm/gtx/random.inl b/glm/gtx/random.inl index 8167d067..d32477d6 100644 --- a/glm/gtx/random.inl +++ b/glm/gtx/random.inl @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) ////////////////////////////////////////////////////////////////////////////////// // Created : 2006-01-16 // Updated : 2006-01-16 diff --git a/glm/gtx/raw_data.hpp b/glm/gtx/raw_data.hpp index 8cf8565e..6e7d3e7a 100644 --- a/glm/gtx/raw_data.hpp +++ b/glm/gtx/raw_data.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-11-19 // Updated : 2010-01-28 diff --git a/glm/gtx/raw_data.inl b/glm/gtx/raw_data.inl index 1532c5c2..93b2a55a 100644 --- a/glm/gtx/raw_data.inl +++ b/glm/gtx/raw_data.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-11-19 // Updated : 2008-11-19 diff --git a/glm/gtx/reciprocal.hpp b/glm/gtx/reciprocal.hpp index 908723f1..668666a1 100644 --- a/glm/gtx/reciprocal.hpp +++ b/glm/gtx/reciprocal.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-10-09 // Updated : 2008-10-09 diff --git a/glm/gtx/reciprocal.inl b/glm/gtx/reciprocal.inl index 8c62556b..d1e9cb5d 100644 --- a/glm/gtx/reciprocal.inl +++ b/glm/gtx/reciprocal.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-10-09 // Updated : 2008-10-09 diff --git a/glm/gtx/rotate_vector.hpp b/glm/gtx/rotate_vector.hpp index 29ebd117..618062ba 100644 --- a/glm/gtx/rotate_vector.hpp +++ b/glm/gtx/rotate_vector.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-11-02 // Updated : 2009-02-19 diff --git a/glm/gtx/rotate_vector.inl b/glm/gtx/rotate_vector.inl index 3846b196..80114ac2 100644 --- a/glm/gtx/rotate_vector.inl +++ b/glm/gtx/rotate_vector.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-11-02 // Updated : 2009-02-19 diff --git a/glm/gtx/simd_mat4.hpp b/glm/gtx/simd_mat4.hpp index aa14943d..6611b540 100644 --- a/glm/gtx/simd_mat4.hpp +++ b/glm/gtx/simd_mat4.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-05-07 // Updated : 2009-05-07 diff --git a/glm/gtx/simd_mat4.inl b/glm/gtx/simd_mat4.inl index a2169b5e..224055ec 100644 --- a/glm/gtx/simd_mat4.inl +++ b/glm/gtx/simd_mat4.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-05-19 // Updated : 2009-05-19 diff --git a/glm/gtx/simd_vec4.hpp b/glm/gtx/simd_vec4.hpp index 396b2728..a83dd6b6 100644 --- a/glm/gtx/simd_vec4.hpp +++ b/glm/gtx/simd_vec4.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-05-07 // Updated : 2009-05-07 diff --git a/glm/gtx/simd_vec4.inl b/glm/gtx/simd_vec4.inl index 950a8871..a5244d33 100644 --- a/glm/gtx/simd_vec4.inl +++ b/glm/gtx/simd_vec4.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-05-07 // Updated : 2009-05-07 diff --git a/glm/gtx/spline.hpp b/glm/gtx/spline.hpp index ddcb20ea..60a9f277 100644 --- a/glm/gtx/spline.hpp +++ b/glm/gtx/spline.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-01-25 // Updated : 2009-02-19 diff --git a/glm/gtx/spline.inl b/glm/gtx/spline.inl index 552f8438..7d94b12b 100644 --- a/glm/gtx/spline.inl +++ b/glm/gtx/spline.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-01-25 // Updated : 2009-02-19 diff --git a/glm/gtx/std_based_type.hpp b/glm/gtx/std_based_type.hpp index 5d69dd53..b70ebbe2 100644 --- a/glm/gtx/std_based_type.hpp +++ b/glm/gtx/std_based_type.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-06-08 // Updated : 2008-06-08 diff --git a/glm/gtx/std_based_type.inl b/glm/gtx/std_based_type.inl index 19fa39ba..5b735afe 100644 --- a/glm/gtx/std_based_type.inl +++ b/glm/gtx/std_based_type.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-06-08 // Updated : 2008-06-08 diff --git a/glm/gtx/string_cast.hpp b/glm/gtx/string_cast.hpp index 0c99ed3a..5e47dbfe 100644 --- a/glm/gtx/string_cast.hpp +++ b/glm/gtx/string_cast.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-04-26 // Updated : 2010-01-28 diff --git a/glm/gtx/transform.hpp b/glm/gtx/transform.hpp index be998e6b..fdb7f5e1 100644 --- a/glm/gtx/transform.hpp +++ b/glm/gtx/transform.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2009-04-29 diff --git a/glm/gtx/transform.inl b/glm/gtx/transform.inl index 4a8fd84f..e8cff7d7 100644 --- a/glm/gtx/transform.inl +++ b/glm/gtx/transform.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2009-04-29 diff --git a/glm/gtx/transform2.hpp b/glm/gtx/transform2.hpp index 9f05976c..f24ff729 100644 --- a/glm/gtx/transform2.hpp +++ b/glm/gtx/transform2.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2006-11-13 diff --git a/glm/gtx/transform2.inl b/glm/gtx/transform2.inl index 841d180c..1d703111 100644 --- a/glm/gtx/transform2.inl +++ b/glm/gtx/transform2.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-02-28 // Updated : 2005-04-23 diff --git a/glm/gtx/unsigned_int.hpp b/glm/gtx/unsigned_int.hpp index 5a4a69c5..9f43d94d 100644 --- a/glm/gtx/unsigned_int.hpp +++ b/glm/gtx/unsigned_int.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-24 // Updated : 2008-10-07 diff --git a/glm/gtx/unsigned_int.inl b/glm/gtx/unsigned_int.inl index 70fc7c69..15cccea1 100644 --- a/glm/gtx/unsigned_int.inl +++ b/glm/gtx/unsigned_int.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-24 // Updated : 2008-10-07 diff --git a/glm/gtx/vec1.hpp b/glm/gtx/vec1.hpp index 409a67e9..f47ee5b9 100644 --- a/glm/gtx/vec1.hpp +++ b/glm/gtx/vec1.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-02-08 // Updated : 2010-02-08 diff --git a/glm/gtx/vector_access.hpp b/glm/gtx/vector_access.hpp index cf587252..eb5688fc 100644 --- a/glm/gtx/vector_access.hpp +++ b/glm/gtx/vector_access.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-01-16 // Updated : 2008-10-07 diff --git a/glm/gtx/vector_access.inl b/glm/gtx/vector_access.inl index 06ffade0..b3cba865 100644 --- a/glm/gtx/vector_access.inl +++ b/glm/gtx/vector_access.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-01-16 // Updated : 2008-10-07 diff --git a/glm/gtx/vector_angle.hpp b/glm/gtx/vector_angle.hpp index 12e5cd21..48f6ade3 100644 --- a/glm/gtx/vector_angle.hpp +++ b/glm/gtx/vector_angle.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-30 // Updated : 2006-11-13 diff --git a/glm/gtx/vector_angle.inl b/glm/gtx/vector_angle.inl index c725d45f..903c93e9 100644 --- a/glm/gtx/vector_angle.inl +++ b/glm/gtx/vector_angle.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-30 // Updated : 2008-09-29 diff --git a/glm/gtx/vector_query.hpp b/glm/gtx/vector_query.hpp index 300bd4ea..1629c666 100644 --- a/glm/gtx/vector_query.hpp +++ b/glm/gtx/vector_query.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-03-05 // Updated : 2007-03-05 diff --git a/glm/gtx/vector_query.inl b/glm/gtx/vector_query.inl index 09a9dedc..b1e76ae2 100644 --- a/glm/gtx/vector_query.inl +++ b/glm/gtx/vector_query.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-03-05 // Updated : 2010-02-16 diff --git a/glm/gtx/verbose_operator.hpp b/glm/gtx/verbose_operator.hpp index 833dd46e..1ac56b2e 100644 --- a/glm/gtx/verbose_operator.hpp +++ b/glm/gtx/verbose_operator.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-05-21 // Updated : 2007-05-21 diff --git a/glm/gtx/verbose_operator.inl b/glm/gtx/verbose_operator.inl index 32821811..8af7442e 100644 --- a/glm/gtx/verbose_operator.inl +++ b/glm/gtx/verbose_operator.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-04-20 // Updated : 2008-09-29 diff --git a/glm/gtx/wrap.hpp b/glm/gtx/wrap.hpp index dd37e87d..67bfd401 100644 --- a/glm/gtx/wrap.hpp +++ b/glm/gtx/wrap.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-11-25 // Updated : 2009-11-25 diff --git a/glm/gtx/wrap.inl b/glm/gtx/wrap.inl index a565d65d..48af7875 100644 --- a/glm/gtx/wrap.inl +++ b/glm/gtx/wrap.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-11-25 // Updated : 2010-02-13 diff --git a/glm/setup.hpp b/glm/setup.hpp index 5c1868ef..a5b664ca 100644 --- a/glm/setup.hpp +++ b/glm/setup.hpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-11-13 // Updated : 2010-01-28 diff --git a/glm/virtrev/xstream.hpp b/glm/virtrev/xstream.hpp index b0b2f219..1f19dae2 100644 --- a/glm/virtrev/xstream.hpp +++ b/glm/virtrev/xstream.hpp @@ -2,7 +2,7 @@ #define GLM_EXT_VIRTREV_XSTREAM_HPP /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) // Virtrev SDK copyright matrem (matrem84.free.fr) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-05-24 diff --git a/test/core/core_func_common.cpp b/test/core/core_func_common.cpp index 8e25e51d..7ea129a1 100644 --- a/test/core/core_func_common.cpp +++ b/test/core/core_func_common.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-01-15 // Updated : 2011-01-15 diff --git a/test/core/core_func_exponential.cpp b/test/core/core_func_exponential.cpp index 8e25e51d..7ea129a1 100644 --- a/test/core/core_func_exponential.cpp +++ b/test/core/core_func_exponential.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-01-15 // Updated : 2011-01-15 diff --git a/test/core/core_func_geometric.cpp b/test/core/core_func_geometric.cpp index 8e25e51d..7ea129a1 100644 --- a/test/core/core_func_geometric.cpp +++ b/test/core/core_func_geometric.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-01-15 // Updated : 2011-01-15 diff --git a/test/core/core_func_integer.cpp b/test/core/core_func_integer.cpp index 8e25e51d..7ea129a1 100644 --- a/test/core/core_func_integer.cpp +++ b/test/core/core_func_integer.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-01-15 // Updated : 2011-01-15 diff --git a/test/core/core_func_matrix.cpp b/test/core/core_func_matrix.cpp index 8e25e51d..7ea129a1 100644 --- a/test/core/core_func_matrix.cpp +++ b/test/core/core_func_matrix.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-01-15 // Updated : 2011-01-15 diff --git a/test/core/core_func_noise.cpp b/test/core/core_func_noise.cpp index 8e25e51d..7ea129a1 100644 --- a/test/core/core_func_noise.cpp +++ b/test/core/core_func_noise.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-01-15 // Updated : 2011-01-15 diff --git a/test/core/core_func_packing.cpp b/test/core/core_func_packing.cpp index 8e25e51d..7ea129a1 100644 --- a/test/core/core_func_packing.cpp +++ b/test/core/core_func_packing.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-01-15 // Updated : 2011-01-15 diff --git a/test/core/core_func_trigonometric.cpp b/test/core/core_func_trigonometric.cpp index 8e25e51d..7ea129a1 100644 --- a/test/core/core_func_trigonometric.cpp +++ b/test/core/core_func_trigonometric.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-01-15 // Updated : 2011-01-15 diff --git a/test/core/core_func_vector_relational.cpp b/test/core/core_func_vector_relational.cpp index 8e25e51d..7ea129a1 100644 --- a/test/core/core_func_vector_relational.cpp +++ b/test/core/core_func_vector_relational.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-01-15 // Updated : 2011-01-15 diff --git a/test/core/core_type_float.cpp b/test/core/core_type_float.cpp index 2a5f3067..5295658a 100644 --- a/test/core/core_type_float.cpp +++ b/test/core/core_type_float.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 diff --git a/test/core/core_type_half.cpp b/test/core/core_type_half.cpp index c6503a56..fbbb1a30 100644 --- a/test/core/core_type_half.cpp +++ b/test/core/core_type_half.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2010-08-25 diff --git a/test/core/core_type_int.cpp b/test/core/core_type_int.cpp index eb295543..b1e4b147 100644 --- a/test/core/core_type_int.cpp +++ b/test/core/core_type_int.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 diff --git a/test/core/core_type_mat2x2.cpp b/test/core/core_type_mat2x2.cpp index b537a43f..ce188d8a 100644 --- a/test/core/core_type_mat2x2.cpp +++ b/test/core/core_type_mat2x2.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 diff --git a/test/core/core_type_mat2x3.cpp b/test/core/core_type_mat2x3.cpp index e275edde..92331d8e 100644 --- a/test/core/core_type_mat2x3.cpp +++ b/test/core/core_type_mat2x3.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 diff --git a/test/core/core_type_mat2x4.cpp b/test/core/core_type_mat2x4.cpp index 1e077ed5..f13db087 100644 --- a/test/core/core_type_mat2x4.cpp +++ b/test/core/core_type_mat2x4.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 diff --git a/test/core/core_type_mat3x2.cpp b/test/core/core_type_mat3x2.cpp index 8f56fd71..8e9c8da8 100644 --- a/test/core/core_type_mat3x2.cpp +++ b/test/core/core_type_mat3x2.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 diff --git a/test/core/core_type_mat3x3.cpp b/test/core/core_type_mat3x3.cpp index a9eb3325..4daa1929 100644 --- a/test/core/core_type_mat3x3.cpp +++ b/test/core/core_type_mat3x3.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 diff --git a/test/core/core_type_mat3x4.cpp b/test/core/core_type_mat3x4.cpp index 5aef20e6..69a0ccad 100644 --- a/test/core/core_type_mat3x4.cpp +++ b/test/core/core_type_mat3x4.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 diff --git a/test/core/core_type_mat4x2.cpp b/test/core/core_type_mat4x2.cpp index eaf972ac..83a69d40 100644 --- a/test/core/core_type_mat4x2.cpp +++ b/test/core/core_type_mat4x2.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 diff --git a/test/core/core_type_mat4x3.cpp b/test/core/core_type_mat4x3.cpp index 60758edb..893b67a4 100644 --- a/test/core/core_type_mat4x3.cpp +++ b/test/core/core_type_mat4x3.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 diff --git a/test/core/core_type_mat4x4.cpp b/test/core/core_type_mat4x4.cpp index ed235ecd..65b85346 100644 --- a/test/core/core_type_mat4x4.cpp +++ b/test/core/core_type_mat4x4.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 diff --git a/test/core/core_type_vec1.cpp b/test/core/core_type_vec1.cpp index 9ac34442..9d31fcdd 100644 --- a/test/core/core_type_vec1.cpp +++ b/test/core/core_type_vec1.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 diff --git a/test/core/core_type_vec2.cpp b/test/core/core_type_vec2.cpp index c45ad499..ab9db689 100644 --- a/test/core/core_type_vec2.cpp +++ b/test/core/core_type_vec2.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 diff --git a/test/core/core_type_vec3.cpp b/test/core/core_type_vec3.cpp index 249cc693..5b2f20f1 100644 --- a/test/core/core_type_vec3.cpp +++ b/test/core/core_type_vec3.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 diff --git a/test/core/core_type_vec4.cpp b/test/core/core_type_vec4.cpp index afd16066..a307130f 100644 --- a/test/core/core_type_vec4.cpp +++ b/test/core/core_type_vec4.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 diff --git a/test/gtc/gtc-integer-matrix.cpp b/test/gtc/gtc-integer-matrix.cpp index e1a99c17..d482260a 100644 --- a/test/gtc/gtc-integer-matrix.cpp +++ b/test/gtc/gtc-integer-matrix.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-09-16 // Updated : 2010-09-16 diff --git a/test/gtc/gtc-swizzle.cpp b/test/gtc/gtc-swizzle.cpp index e1a99c17..d482260a 100644 --- a/test/gtc/gtc-swizzle.cpp +++ b/test/gtc/gtc-swizzle.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-09-16 // Updated : 2010-09-16 diff --git a/test/gtx/gtx-bit.cpp b/test/gtx/gtx-bit.cpp index c557ac48..8f210199 100644 --- a/test/gtx/gtx-bit.cpp +++ b/test/gtx/gtx-bit.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-09-16 // Updated : 2010-09-16 diff --git a/test/gtx/gtx-simd-mat4.cpp b/test/gtx/gtx-simd-mat4.cpp index e280eb9d1..cd36c754 100644 --- a/test/gtx/gtx-simd-mat4.cpp +++ b/test/gtx/gtx-simd-mat4.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-09-16 // Updated : 2010-09-16 diff --git a/test/gtx/gtx-simd-vec4.cpp b/test/gtx/gtx-simd-vec4.cpp index 3fcdea9c..24f7fe31 100644 --- a/test/gtx/gtx-simd-vec4.cpp +++ b/test/gtx/gtx-simd-vec4.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-09-16 // Updated : 2010-09-16 From 4f91b87f9bd6e2b5e53fc1f6b0e08b89122fa253 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 20 Jan 2011 12:15:56 +0000 Subject: [PATCH 05/12] Updated copyright dates --- doc/src/data.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/data.xml b/doc/src/data.xml index a813cc8e..ec185ef6 100644 --- a/doc/src/data.xml +++ b/doc/src/data.xml @@ -1,6 +1,6 @@ - +
From d8606d1825fc4714aa333741f6e8304165e24cdb Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 20 Jan 2011 12:16:28 +0000 Subject: [PATCH 06/12] Updated integer matrix implementation --- glm/ext.hpp | 1 + glm/glm.hpp | 7 ++ glm/gtc/matrix_integer.hpp | 202 ++++++++++++++++++++++++++------ test/gtc/gtc-integer-matrix.cpp | 105 +---------------- 4 files changed, 178 insertions(+), 137 deletions(-) diff --git a/glm/ext.hpp b/glm/ext.hpp index 2f8461be..2e7a3798 100644 --- a/glm/ext.hpp +++ b/glm/ext.hpp @@ -17,6 +17,7 @@ #include "./gtc/half_float.hpp" #include "./gtc/matrix_access.hpp" +#include "./gtc/matrix_integer.hpp" #include "./gtc/matrix_inverse.hpp" #include "./gtc/matrix_transform.hpp" #include "./gtc/quaternion.hpp" diff --git a/glm/glm.hpp b/glm/glm.hpp index b8bab955..0dc9b3e5 100644 --- a/glm/glm.hpp +++ b/glm/glm.hpp @@ -109,6 +109,13 @@ namespace glm #include "./core/func_noise.hpp" #include "./core/_swizzle.hpp" +namespace glm +{ + using namespace core::type; + using namespace core::type::precision; + using namespace core::function; +} //namespace glm + //////////////////// // check type sizes GLM_STATIC_ASSERT(sizeof(glm::detail::int8) == 1, "int8 size isn't 1 byte on this platform"); diff --git a/glm/gtc/matrix_integer.hpp b/glm/gtc/matrix_integer.hpp index ae9ec997..f51ffa1e 100644 --- a/glm/gtc/matrix_integer.hpp +++ b/glm/gtc/matrix_integer.hpp @@ -30,47 +30,177 @@ namespace glm //! GLM_GTC_matrix_integer extension: Add integer matrices namespace matrix_integer { - typedef detail::tmat2x2 highp_imat2; //!< \brief High-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat3x3 highp_imat3; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat4x4 highp_imat4; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x2 highp_imat2; //!< \brief High-precision signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x3 highp_imat3; //!< \brief High-precision signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x4 highp_imat4; //!< \brief High-precision signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat2x2 highp_imat2x2; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat2x3 highp_imat2x3; //!< \brief Single-precision floating-point 2x3 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat2x4 highp_imat2x4; //!< \brief Single-precision floating-point 2x4 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat3x2 highp_imat3x2; //!< \brief Single-precision floating-point 3x2 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat3x3 highp_imat3x3; //!< \brief Single-precision floating-point 3x3 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat3x4 highp_imat3x4; //!< \brief Single-precision floating-point 3x4 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat4x2 highp_imat4x2; //!< \brief Single-precision floating-point 4x2 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat4x3 highp_imat4x3; //!< \brief Single-precision floating-point 4x3 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat4x4 highp_imat4x4; //!< \brief Single-precision floating-point 4x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x2 highp_imat2x2; //!< \brief High-precision signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x3 highp_imat2x3; //!< \brief High-precision signed integer 2x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x4 highp_imat2x4; //!< \brief High-precision signed integer 2x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x2 highp_imat3x2; //!< \brief High-precision signed integer 3x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x3 highp_imat3x3; //!< \brief High-precision signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x4 highp_imat3x4; //!< \brief High-precision signed integer 3x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x2 highp_imat4x2; //!< \brief High-precision signed integer 4x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x3 highp_imat4x3; //!< \brief High-precision signed integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x4 highp_imat4x4; //!< \brief High-precision signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat2x2 mediump_imat2; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat3x3 mediump_imat3; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat4x4 mediump_imat4; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x2 mediump_imat2; //!< \brief Medium-precision signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x3 mediump_imat3; //!< \brief Medium-precision signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x4 mediump_imat4; //!< \brief Medium-precision signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat2x2 mediump_imat2x2; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat2x3 mediump_imat2x3; //!< \brief Single-precision floating-point 2x3 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat2x4 mediump_imat2x4; //!< \brief Single-precision floating-point 2x4 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat3x2 mediump_imat3x2; //!< \brief Single-precision floating-point 3x2 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat3x3 mediump_imat3x3; //!< \brief Single-precision floating-point 3x3 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat3x4 mediump_imat3x4; //!< \brief Single-precision floating-point 3x4 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat4x2 mediump_imat4x2; //!< \brief Single-precision floating-point 4x2 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat4x3 mediump_imat4x3; //!< \brief Single-precision floating-point 4x3 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat4x4 mediump_imat4x4; //!< \brief Single-precision floating-point 4x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x2 mediump_imat2x2; //!< \brief Medium-precision signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x3 mediump_imat2x3; //!< \brief Medium-precision signed integer 2x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x4 mediump_imat2x4; //!< \brief Medium-precision signed integer 2x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x2 mediump_imat3x2; //!< \brief Medium-precision signed integer 3x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x3 mediump_imat3x3; //!< \brief Medium-precision signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x4 mediump_imat3x4; //!< \brief Medium-precision signed integer 3x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x2 mediump_imat4x2; //!< \brief Medium-precision signed integer 4x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x3 mediump_imat4x3; //!< \brief Medium-precision signed integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x4 mediump_imat4x4; //!< \brief Medium-precision signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat2x2 lowp_imat2; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat3x3 lowp_imat3; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat4x4 lowp_imat4; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x2 lowp_imat2; //!< \brief Low-precision signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x3 lowp_imat3; //!< \brief Low-precision signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x4 lowp_imat4; //!< \brief Low-precision signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat2x2 lowp_imat2x2; //!< \brief Single-precision floating-point 2x2 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat2x3 lowp_imat2x3; //!< \brief Single-precision floating-point 2x3 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat2x4 lowp_imat2x4; //!< \brief Single-precision floating-point 2x4 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat3x2 lowp_imat3x2; //!< \brief Single-precision floating-point 3x2 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat3x3 lowp_imat3x3; //!< \brief Single-precision floating-point 3x3 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat3x4 lowp_imat3x4; //!< \brief Single-precision floating-point 3x4 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat4x2 lowp_imat4x2; //!< \brief Single-precision floating-point 4x2 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat4x3 lowp_imat4x3; //!< \brief Single-precision floating-point 4x3 matrix. (from GLM_GTC_matrix_integer extension) - typedef detail::tmat4x4 lowp_imat4x4; //!< \brief Single-precision floating-point 4x4 matrix. (from GLM_GTC_type_precision extension) + typedef detail::tmat2x2 lowp_imat2x2; //!< \brief Low-precision signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x3 lowp_imat2x3; //!< \brief Low-precision signed integer 2x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x4 lowp_imat2x4; //!< \brief Low-precision signed integer 2x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x2 lowp_imat3x2; //!< \brief Low-precision signed integer 3x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x3 lowp_imat3x3; //!< \brief Low-precision signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x4 lowp_imat3x4; //!< \brief Low-precision signed integer 3x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x2 lowp_imat4x2; //!< \brief Low-precision signed integer 4x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x3 lowp_imat4x3; //!< \brief Low-precision signed integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x4 lowp_imat4x4; //!< \brief Low-precision signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) + + typedef detail::tmat2x2 highp_umat2; //!< \brief High-precision signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x3 highp_umat3; //!< \brief High-precision signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x4 highp_umat4; //!< \brief High-precision signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) + + typedef detail::tmat2x2 highp_umat2x2; //!< \brief High-precision signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x3 highp_umat2x3; //!< \brief High-precision signed integer 2x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x4 highp_umat2x4; //!< \brief High-precision signed integer 2x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x2 highp_umat3x2; //!< \brief High-precision signed integer 3x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x3 highp_umat3x3; //!< \brief High-precision signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x4 highp_umat3x4; //!< \brief High-precision signed integer 3x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x2 highp_umat4x2; //!< \brief High-precision signed integer 4x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x3 highp_umat4x3; //!< \brief High-precision signed integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x4 highp_umat4x4; //!< \brief High-precision signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) + + typedef detail::tmat2x2 mediump_umat2; //!< \brief Medium-precision signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x3 mediump_umat3; //!< \brief Medium-precision signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x4 mediump_umat4; //!< \brief Medium-precision signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) + + typedef detail::tmat2x2 mediump_umat2x2; //!< \brief Medium-precision signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x3 mediump_umat2x3; //!< \brief Medium-precision signed integer 2x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x4 mediump_umat2x4; //!< \brief Medium-precision signed integer 2x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x2 mediump_umat3x2; //!< \brief Medium-precision signed integer 3x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x3 mediump_umat3x3; //!< \brief Medium-precision signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x4 mediump_umat3x4; //!< \brief Medium-precision signed integer 3x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x2 mediump_umat4x2; //!< \brief Medium-precision signed integer 4x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x3 mediump_umat4x3; //!< \brief Medium-precision signed integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x4 mediump_umat4x4; //!< \brief Medium-precision signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) + + typedef detail::tmat2x2 lowp_umat2; //!< \brief Low-precision signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x3 lowp_umat3; //!< \brief Low-precision signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x4 lowp_umat4; //!< \brief Low-precision signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) + + typedef detail::tmat2x2 lowp_umat2x2; //!< \brief Low-precision signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x3 lowp_umat2x3; //!< \brief Low-precision signed integer 2x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat2x4 lowp_umat2x4; //!< \brief Low-precision signed integer 2x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x2 lowp_umat3x2; //!< \brief Low-precision signed integer 3x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x3 lowp_umat3x3; //!< \brief Low-precision signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat3x4 lowp_umat3x4; //!< \brief Low-precision signed integer 3x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x2 lowp_umat4x2; //!< \brief Low-precision signed integer 4x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x3 lowp_umat4x3; //!< \brief Low-precision signed integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef detail::tmat4x4 lowp_umat4x4; //!< \brief Low-precision signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) + +#if(GLM_PRECISION & GLM_PRECISION_HIGHP_INT) + typedef highp_imat2 imat2; //!< \brief Signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef highp_imat3 imat3; //!< \brief Signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef highp_imat4 imat4; //!< \brief Signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) + + typedef highp_imat2x2 imat2x2; //!< \brief Signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef highp_imat2x3 imat2x3; //!< \brief Signed integer 2x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef highp_imat2x4 imat2x4; //!< \brief Signed integer 2x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef highp_imat3x2 imat3x2; //!< \brief Signed integer 3x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef highp_imat3x3 imat3x3; //!< \brief Signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef highp_imat3x4 imat3x4; //!< \brief Signed integer 3x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef highp_imat4x2 imat4x2; //!< \brief Signed integer 4x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef highp_imat4x3 imat4x3; //!< \brief Signed integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef highp_imat4x4 imat4x4; //!< \brief Signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) +#elif(GLM_PRECISION & GLM_PRECISION_LOWP_INT) + typedef lowp_imat2 imat2; //!< \brief Signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef lowp_imat3 imat3; //!< \brief Signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef lowp_imat4 imat4; //!< \brief Signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) + + typedef lowp_imat2x2 imat2x2; //!< \brief Signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef lowp_imat2x3 imat2x3; //!< \brief Signed integer 2x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef lowp_imat2x4 imat2x4; //!< \brief Signed integer 2x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef lowp_imat3x2 imat3x2; //!< \brief Signed integer 3x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef lowp_imat3x3 imat3x3; //!< \brief Signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef lowp_imat3x4 imat3x4; //!< \brief Signed integer 3x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef lowp_imat4x2 imat4x2; //!< \brief Signed integer 4x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef lowp_imat4x3 imat4x3; //!< \brief Signed integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef lowp_imat4x4 imat4x4; //!< \brief Signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) +#else //if(GLM_PRECISION & GLM_PRECISION_MEDIUMP_INT) + typedef mediump_imat2 imat2; //!< \brief Signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef mediump_imat3 imat3; //!< \brief Signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef mediump_imat4 imat4; //!< \brief Signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) + + typedef mediump_imat2x2 imat2x2; //!< \brief Signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef mediump_imat2x3 imat2x3; //!< \brief Signed integer 2x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef mediump_imat2x4 imat2x4; //!< \brief Signed integer 2x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef mediump_imat3x2 imat3x2; //!< \brief Signed integer 3x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef mediump_imat3x3 imat3x3; //!< \brief Signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef mediump_imat3x4 imat3x4; //!< \brief Signed integer 3x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef mediump_imat4x2 imat4x2; //!< \brief Signed integer 4x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef mediump_imat4x3 imat4x3; //!< \brief Signed integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef mediump_imat4x4 imat4x4; //!< \brief Signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) +#endif//GLM_PRECISION + +#if(GLM_PRECISION & GLM_PRECISION_HIGHP_UINT) + typedef highp_umat2 umat2; //!< \brief Unsigned integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef highp_umat3 umat3; //!< \brief Unsigned integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef highp_umat4 umat4; //!< \brief Unsigned integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) + + typedef highp_umat2x2 umat2x2; //!< \brief Unsigned integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef highp_umat2x3 umat2x3; //!< \brief Unsigned integer 2x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef highp_umat2x4 umat2x4; //!< \brief Unsigned integer 2x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef highp_umat3x2 umat3x2; //!< \brief Unsigned integer 3x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef highp_umat3x3 umat3x3; //!< \brief Unsigned integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef highp_umat3x4 umat3x4; //!< \brief Unsigned integer 3x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef highp_umat4x2 umat4x2; //!< \brief Unsigned integer 4x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef highp_umat4x3 umat4x3; //!< \brief Unsigned integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef highp_umat4x4 umat4x4; //!< \brief Unsigned integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) +#elif(GLM_PRECISION & GLM_PRECISION_LOWP_UINT) + typedef lowp_umat2 umat2; //!< \brief Unsigned integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef lowp_umat3 umat3; //!< \brief Unsigned integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef lowp_umat4 umat4; //!< \brief Unsigned integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) + + typedef lowp_umat2x2 umat2x2; //!< \brief Unsigned integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef lowp_umat2x3 umat2x3; //!< \brief Unsigned integer 2x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef lowp_umat2x4 umat2x4; //!< \brief Unsigned integer 2x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef lowp_umat3x2 umat3x2; //!< \brief Unsigned integer 3x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef lowp_umat3x3 umat3x3; //!< \brief Unsigned integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef lowp_umat3x4 umat3x4; //!< \brief Unsigned integer 3x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef lowp_umat4x2 umat4x2; //!< \brief Unsigned integer 4x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef lowp_umat4x3 umat4x3; //!< \brief Unsigned integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef lowp_umat4x4 umat4x4; //!< \brief Unsigned integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) +#else //if(GLM_PRECISION & GLM_PRECISION_MEDIUMP_UINT) + typedef mediump_umat2 umat2; //!< \brief Unsigned integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef mediump_umat3 umat3; //!< \brief Unsigned integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef mediump_umat4 umat4; //!< \brief Unsigned integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) + + typedef mediump_umat2x2 umat2x2; //!< \brief Unsigned integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef mediump_umat2x3 umat2x3; //!< \brief Unsigned integer 2x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef mediump_umat2x4 umat2x4; //!< \brief Unsigned integer 2x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef mediump_umat3x2 umat3x2; //!< \brief Unsigned integer 3x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef mediump_umat3x3 umat3x3; //!< \brief Unsigned integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef mediump_umat3x4 umat3x4; //!< \brief Unsigned integer 3x4 matrix. (from GLM_GTC_matrix_integer extension) + typedef mediump_umat4x2 umat4x2; //!< \brief Unsigned integer 4x2 matrix. (from GLM_GTC_matrix_integer extension) + typedef mediump_umat4x3 umat4x3; //!< \brief Unsigned integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) + typedef mediump_umat4x4 umat4x4; //!< \brief Unsigned integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) +#endif//GLM_PRECISION }//namespace matrix_integer }//namespace gtc diff --git a/test/gtc/gtc-integer-matrix.cpp b/test/gtc/gtc-integer-matrix.cpp index d482260a..79074875 100644 --- a/test/gtc/gtc-integer-matrix.cpp +++ b/test/gtc/gtc-integer-matrix.cpp @@ -9,118 +9,21 @@ #define GLM_MESSAGES #include -#include +#include -int test_swizzle_vec4_ref_dynamic() +int test_int_matrix() { { - glm::ivec4 A(0, 1, 2, 3); - glm::ivec4 B(2, 1, 0, 3); - glm::swizzle(A, glm::Z, glm::Y, glm::X, glm::W) = B; - assert(A.x == B.x && A.y == B.y && A.z == B.z && A.w == B.w); + glm::mediump_uint A(0); } - { - glm::ivec4 A(0, 1, 2, 3); - glm::ivec3 B(2, 1, 0); - glm::swizzle(A, glm::Z, glm::Y, glm::X) = B; - assert(A.x == B.x && A.y == B.y && A.z == B.z); - } - - { - glm::ivec4 A(0, 1, 2, 3); - glm::ivec2 B(2, 1); - glm::swizzle(A, glm::Z, glm::Y) = B; - assert(A.x == B.x && A.y == B.y); - } - - { - glm::ivec4 A(0, 1, 2, 3); - int B(2); - glm::swizzle(A, glm::Z) = B; - assert(A.x == B); - } - - return 0; -} - -int test_swizzle_vec4_ref_static() -{ - { - glm::ivec4 A(0, 1, 2, 3); - glm::ivec4 B(2, 1, 0, 3); - glm::swizzle(A) = B; - assert(A.x == B.x && A.y == B.y && A.z == B.z && A.w == B.w); - } - - { - glm::ivec4 A(0, 1, 2, 3); - glm::ivec3 B(2, 1, 0); - glm::swizzle(A) = B; - assert(A.x == B.x && A.y == B.y && A.z == B.z); - } - - { - glm::ivec4 A(0, 1, 2, 3); - glm::ivec2 B(2, 1); - glm::swizzle(A) = B; - assert(A.x == B.x && A.y == B.y); - } - - { - glm::ivec4 A(0, 1, 2, 3); - int B(2); - glm::swizzle(A) = B; - assert(A.x == B); - } - - return 0; -} - -int test_swizzle_vec4_const_dynamic() -{ - glm::ivec4 A(0, 1, 2, 3); - glm::ivec4 B = glm::swizzle(A, glm::B, glm::G, glm::R, glm::A); - assert(glm::all(glm::equal(A, B))); - - glm::ivec3 C = glm::swizzle(A, glm::W, glm::Y, glm::Z); - assert(glm::all(glm::equal(glm::ivec3(A), C))); - - glm::ivec2 D = glm::swizzle(A, glm::W, glm::X); - assert(glm::all(glm::equal(glm::ivec2(A), D))); - - int E = glm::swizzle(A, glm::Q); - assert(E == A.q); - - return 0; -} - -int test_swizzle_vec4_const_static() -{ - glm::ivec4 A(0, 1, 2, 3); - - glm::ivec4 B = glm::swizzle(A); - assert(glm::all(glm::equal(A, B))); - - glm::ivec3 C = glm::swizzle(A); - assert(glm::all(glm::equal(glm::ivec3(A), C))); - - glm::ivec2 D = glm::swizzle(A); - assert(glm::all(glm::equal(glm::ivec2(A), D))); - - int E = glm::swizzle(A); - assert(E == A.q); - return 0; } int main(int argc, void* argv[]) { int Failed = 0; - Failed += test_swizzle_vec4_ref_dynamic(); - Failed += test_swizzle_vec4_ref_static(); - Failed += test_swizzle_vec4_const_dynamic(); - Failed += test_swizzle_vec4_const_static(); + Failed += test_int_matrix(); return Failed; } From 17234f68e06cb522b226cd281fce2fb9cbb04810 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 20 Jan 2011 12:22:43 +0000 Subject: [PATCH 07/12] Clean up --- glm/gtc/matrix_integer.hpp | 9 ++++----- glm/setup.hpp | 10 ++-------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/glm/gtc/matrix_integer.hpp b/glm/gtc/matrix_integer.hpp index f51ffa1e..fa777395 100644 --- a/glm/gtc/matrix_integer.hpp +++ b/glm/gtc/matrix_integer.hpp @@ -128,11 +128,11 @@ namespace glm typedef highp_imat4x2 imat4x2; //!< \brief Signed integer 4x2 matrix. (from GLM_GTC_matrix_integer extension) typedef highp_imat4x3 imat4x3; //!< \brief Signed integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) typedef highp_imat4x4 imat4x4; //!< \brief Signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) + #elif(GLM_PRECISION & GLM_PRECISION_LOWP_INT) typedef lowp_imat2 imat2; //!< \brief Signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) typedef lowp_imat3 imat3; //!< \brief Signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) typedef lowp_imat4 imat4; //!< \brief Signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) - typedef lowp_imat2x2 imat2x2; //!< \brief Signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) typedef lowp_imat2x3 imat2x3; //!< \brief Signed integer 2x3 matrix. (from GLM_GTC_matrix_integer extension) typedef lowp_imat2x4 imat2x4; //!< \brief Signed integer 2x4 matrix. (from GLM_GTC_matrix_integer extension) @@ -142,11 +142,11 @@ namespace glm typedef lowp_imat4x2 imat4x2; //!< \brief Signed integer 4x2 matrix. (from GLM_GTC_matrix_integer extension) typedef lowp_imat4x3 imat4x3; //!< \brief Signed integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) typedef lowp_imat4x4 imat4x4; //!< \brief Signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) + #else //if(GLM_PRECISION & GLM_PRECISION_MEDIUMP_INT) typedef mediump_imat2 imat2; //!< \brief Signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) typedef mediump_imat3 imat3; //!< \brief Signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) typedef mediump_imat4 imat4; //!< \brief Signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) - typedef mediump_imat2x2 imat2x2; //!< \brief Signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) typedef mediump_imat2x3 imat2x3; //!< \brief Signed integer 2x3 matrix. (from GLM_GTC_matrix_integer extension) typedef mediump_imat2x4 imat2x4; //!< \brief Signed integer 2x4 matrix. (from GLM_GTC_matrix_integer extension) @@ -162,7 +162,6 @@ namespace glm typedef highp_umat2 umat2; //!< \brief Unsigned integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) typedef highp_umat3 umat3; //!< \brief Unsigned integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) typedef highp_umat4 umat4; //!< \brief Unsigned integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) - typedef highp_umat2x2 umat2x2; //!< \brief Unsigned integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) typedef highp_umat2x3 umat2x3; //!< \brief Unsigned integer 2x3 matrix. (from GLM_GTC_matrix_integer extension) typedef highp_umat2x4 umat2x4; //!< \brief Unsigned integer 2x4 matrix. (from GLM_GTC_matrix_integer extension) @@ -172,11 +171,11 @@ namespace glm typedef highp_umat4x2 umat4x2; //!< \brief Unsigned integer 4x2 matrix. (from GLM_GTC_matrix_integer extension) typedef highp_umat4x3 umat4x3; //!< \brief Unsigned integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) typedef highp_umat4x4 umat4x4; //!< \brief Unsigned integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) + #elif(GLM_PRECISION & GLM_PRECISION_LOWP_UINT) typedef lowp_umat2 umat2; //!< \brief Unsigned integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) typedef lowp_umat3 umat3; //!< \brief Unsigned integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) typedef lowp_umat4 umat4; //!< \brief Unsigned integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) - typedef lowp_umat2x2 umat2x2; //!< \brief Unsigned integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) typedef lowp_umat2x3 umat2x3; //!< \brief Unsigned integer 2x3 matrix. (from GLM_GTC_matrix_integer extension) typedef lowp_umat2x4 umat2x4; //!< \brief Unsigned integer 2x4 matrix. (from GLM_GTC_matrix_integer extension) @@ -186,11 +185,11 @@ namespace glm typedef lowp_umat4x2 umat4x2; //!< \brief Unsigned integer 4x2 matrix. (from GLM_GTC_matrix_integer extension) typedef lowp_umat4x3 umat4x3; //!< \brief Unsigned integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) typedef lowp_umat4x4 umat4x4; //!< \brief Unsigned integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) + #else //if(GLM_PRECISION & GLM_PRECISION_MEDIUMP_UINT) typedef mediump_umat2 umat2; //!< \brief Unsigned integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) typedef mediump_umat3 umat3; //!< \brief Unsigned integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) typedef mediump_umat4 umat4; //!< \brief Unsigned integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) - typedef mediump_umat2x2 umat2x2; //!< \brief Unsigned integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) typedef mediump_umat2x3 umat2x3; //!< \brief Unsigned integer 2x3 matrix. (from GLM_GTC_matrix_integer extension) typedef mediump_umat2x4 umat2x4; //!< \brief Unsigned integer 2x4 matrix. (from GLM_GTC_matrix_integer extension) diff --git a/glm/setup.hpp b/glm/setup.hpp index a5b664ca..1e2f9401 100644 --- a/glm/setup.hpp +++ b/glm/setup.hpp @@ -19,12 +19,6 @@ #define GLM_VERSION_PATCH 1 #define GLM_VERSION_REVISION 0 -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Common values - -#define GLM_DISABLE 0x00000000 -#define GLM_ENABLE 0x00000001 - /////////////////////////////////////////////////////////////////////////////////////////////////// // Precision @@ -237,8 +231,8 @@ ///////////////// // C++ Version // -#define GLM_LANG_CXX98 1 -#define GLM_LANG_CXX0X 2 +#define GLM_LANG_CXX98 1 +#define GLM_LANG_CXX0X 2 #if((GLM_COMPILER & GLM_COMPILER_GCC) && defined(__GXX_EXPERIMENTAL_CXX0X__)) // -std=c++0x or -std=gnu++0x # define GLM_LANG GLM_LANG_CXX0X From 53b7a7c64b263cdced725b97abd782e106210b19 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 20 Jan 2011 13:50:03 +0000 Subject: [PATCH 08/12] Added packing function implementations --- glm/core/func_packing.hpp | 16 ++++----- glm/core/func_packing.inl | 71 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 78 insertions(+), 9 deletions(-) diff --git a/glm/core/func_packing.hpp b/glm/core/func_packing.hpp index 26a5c87e..619b9391 100644 --- a/glm/core/func_packing.hpp +++ b/glm/core/func_packing.hpp @@ -21,16 +21,16 @@ namespace glm //! Define packing functions from section 8.4 floating-point pack and unpack functions of GLSL 4.00.8 specification namespace packing { - uint packUnorm2x16(vec2 const & v); - uint packUnorm4x8(vec4 const & v); - uint packSnorm4x8(vec4 const & v); + detail::uint32 packUnorm2x16(detail::tvec2 const & v); + detail::uint32 packUnorm4x8(detail::tvec4 const & v); + detail::uint32 packSnorm4x8(detail::tvec4 const & v); - vec2 unpackUnorm2x16(uint const & p); - vec4 unpackUnorm4x8(uint const & p); - vec4 unpackSnorm4x8(uint const & p); + detail::tvec2 unpackUnorm2x16(detail::uint32 const & p); + detail::tvec4 unpackUnorm4x8(detail::uint32 const & p); + detail::tvec4 unpackSnorm4x8(detail::uint32 const & p); - double packDouble2x32(uvec2 const & v); - uvec2 unpackDouble2x32(double const & v); + double packDouble2x32(detail::tvec2 const & v); + detail::tvec2 unpackDouble2x32(double const & v); }//namespace packing }//namespace function diff --git a/glm/core/func_packing.inl b/glm/core/func_packing.inl index 9f13cd21..96317284 100644 --- a/glm/core/func_packing.inl +++ b/glm/core/func_packing.inl @@ -16,8 +16,77 @@ namespace glm namespace core{ namespace function{ - namespace packing{ + namespace packing + { + inline detail::uint32 packUnorm2x16(detail::tvec2 const & v) + { + detail::uint16 A((detail::uint16)round(clamp(v.x, 0.0f, 1.0f) * 65535.0f)); + detail::uint16 B((detail::uint16)round(clamp(v.y, 0.0f, 1.0f) * 65535.0f)); + return detail::uint32((B << 16) | A); + } + inline detail::uint32 packUnorm4x8(detail::tvec4 const & v) + { + detail::uint8 A((detail::uint8)round(clamp(v.x, 0.0f, 1.0f) * 255.0f)); + detail::uint8 B((detail::uint8)round(clamp(v.y, 0.0f, 1.0f) * 255.0f)); + detail::uint8 C((detail::uint8)round(clamp(v.z, 0.0f, 1.0f) * 255.0f)); + detail::uint8 D((detail::uint8)round(clamp(v.w, 0.0f, 1.0f) * 255.0f)); + return detail::uint32((D << 24) | (C << 16) | (B << 8) | A); + } + + inline detail::uint32 packSnorm4x8(detail::tvec4 const & v) + { + detail::uint8 A((detail::uint8)round(clamp(v.x,-1.0f, 1.0f) * 255.0f)); + detail::uint8 B((detail::uint8)round(clamp(v.y,-1.0f, 1.0f) * 255.0f)); + detail::uint8 C((detail::uint8)round(clamp(v.z,-1.0f, 1.0f) * 255.0f)); + detail::uint8 D((detail::uint8)round(clamp(v.w,-1.0f, 1.0f) * 255.0f)); + return detail::uint32((D << 24) | (C << 16) | (B << 8) | A); + } + + inline detail::tvec2 unpackUnorm2x16(detail::uint32 const & p) + { + detail::uint16 A(detail::uint16(p >> 0)); + detail::uint16 B(detail::uint16(p >> 16)); + return detail::tvec2( + A * 1.0f / 65535.0f, + B * 1.0f / 65535.0f); + } + + inline detail::tvec4 unpackUnorm4x8(detail::uint32 const & p) + { + detail::uint8 A(detail::uint8(p >> 0)); + detail::uint8 B(detail::uint8(p >> 8)); + detail::uint8 C(detail::uint8(p >> 16)); + detail::uint8 D(detail::uint8(p >> 24)); + return detail::tvec4( + A * 1.0f / 255.0f, + B * 1.0f / 255.0f, + C * 1.0f / 255.0f, + D * 1.0f / 255.0f); + } + + inline detail::tvec4 unpackSnorm4x8(detail::uint32 const & p) + { + detail::uint8 A(detail::uint8(p >> 0)); + detail::uint8 B(detail::uint8(p >> 8)); + detail::uint8 C(detail::uint8(p >> 16)); + detail::uint8 D(detail::uint8(p >> 24)); + return clamp(detail::tvec4( + A * 1.0f / 127.0f, + B * 1.0f / 127.0f, + C * 1.0f / 127.0f, + D * 1.0f / 127.0f), -1.0f, 1.0f); + } + + inline double packDouble2x32(detail::tvec2 const & v) + { + return *(double*)&v; + } + + inline detail::tvec2 unpackDouble2x32(double const & v) + { + return *(detail::tvec2*)&v; + } }//namespace packing }//namespace function From dc979ddfaf02ee2ea73d838d6a171695e1b0007d Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 20 Jan 2011 14:06:56 +0000 Subject: [PATCH 09/12] Updated architechture detection and checking --- glm/gtx/simd_mat4.hpp | 5 +++++ glm/gtx/simd_vec4.hpp | 5 +++++ glm/setup.hpp | 48 +++++++++++++++++++------------------------ 3 files changed, 31 insertions(+), 27 deletions(-) diff --git a/glm/gtx/simd_mat4.hpp b/glm/gtx/simd_mat4.hpp index 6611b540..442fbd41 100644 --- a/glm/gtx/simd_mat4.hpp +++ b/glm/gtx/simd_mat4.hpp @@ -16,6 +16,11 @@ // Dependency: #include "../glm.hpp" + +#if(!(GLM_ARCH & GLM_ARCH_SSE2)) +#error "GLM: GLM_GTX_simd_mat4 requires compiler support of SSE2 through intrinsics" +#endif + #include "../core/intrinsic_matrix.hpp" #include "../gtx/simd_vec4.hpp" diff --git a/glm/gtx/simd_vec4.hpp b/glm/gtx/simd_vec4.hpp index a83dd6b6..2c9de23b 100644 --- a/glm/gtx/simd_vec4.hpp +++ b/glm/gtx/simd_vec4.hpp @@ -16,6 +16,11 @@ // Dependency: #include "../glm.hpp" + +#if(!(GLM_ARCH & GLM_ARCH_SSE2)) +#error "GLM: GLM_GTX_simd_vec4 requires compiler support of SSE2 through intrinsics" +#endif + #include "../core/intrinsic_common.hpp" #include "../core/intrinsic_geometric.hpp" diff --git a/glm/setup.hpp b/glm/setup.hpp index 1e2f9401..6d5a1c66 100644 --- a/glm/setup.hpp +++ b/glm/setup.hpp @@ -254,54 +254,48 @@ ///////////////// // Platform -#define GLM_SUPPORT_PURE 0 -#define GLM_SUPPORT_SSE2 1 -#define GLM_SUPPORT_SSE3 2 -#define GLM_SUPPORT_AVX 3 +#define GLM_ARCH_PURE 0x0000 +#define GLM_ARCH_SSE2 0x0001 +#define GLM_ARCH_SSE3 0x0002 | GLM_ARCH_SSE2 +#define GLM_ARCH_AVX 0x0004 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2 #if((GLM_COMPILER & GLM_COMPILER_VC) && defined(_M_IX86)) # if(GLM_COMPILER >= GLM_COMPILER_VC2010) # if(_M_IX86_FP == 3) //AVX -# define GLM_SUPPORT GLM_SUPPORT_AVX //GLM_SUPPORT_AVX (Require SP1) +# define GLM_ARCH GLM_ARCH_AVX //GLM_ARCH_AVX (Require SP1) # else -# define GLM_SUPPORT GLM_SUPPORT_SSE3 +# define GLM_ARCH GLM_ARCH_SSE3 # endif # elif(GLM_COMPILER >= GLM_COMPILER_VC2008) -# define GLM_SUPPORT GLM_SUPPORT_SSE3 +# define GLM_ARCH GLM_ARCH_SSE3 # elif(GLM_COMPILER >= GLM_COMPILER_VC2005) -# define GLM_SUPPORT GLM_SUPPORT_SSE2 +# define GLM_ARCH GLM_ARCH_SSE2 # else -# define GLM_SUPPORT GLM_SUPPORT_PURE +# define GLM_ARCH GLM_ARCH_PURE # endif #elif((GLM_COMPILER & GLM_COMPILER_GCC) && (defined(__i386__) || defined(__x86_64__))) # if(GLM_COMPILER >= GLM_COMPILER_GCC44) -# define GLM_SUPPORT GLM_SUPPORT_AVX +# define GLM_ARCH GLM_ARCH_AVX # elif(GLM_COMPILER >= GLM_COMPILER_GCC40) -# define GLM_SUPPORT GLM_SUPPORT_SSE3 +# define GLM_ARCH GLM_ARCH_SSE3 # else -# define GLM_SUPPORT GLM_SUPPORT_PURE +# define GLM_ARCH GLM_ARCH_PURE # endif #else -# define GLM_SUPPORT GLM_SUPPORT_PURE +# define GLM_ARCH GLM_ARCH_PURE #endif -#define GLM_ARCH_PURE 0 -#define GLM_ARCH_SSE2 1 -#define GLM_ARCH_SSE3 2 -#define GLM_ARCH_AVX 3 - -#if(GLM_SUPPORT == GLM_SUPPORT_AVX) +#if(GLM_ARCH != GLM_ARCH_PURE) +#if(GLM_ARCH & GLM_ARCH_AVX) # include -# define GLM_ARCH GLM_ARCH_AVX -#elif(GLM_SUPPORT == GLM_SUPPORT_SSE3) +#endif//GLM_ARCH +#if(GLM_ARCH & GLM_ARCH_SSE3) # include -# define GLM_ARCH GLM_ARCH_SSE3 -#elif((GLM_SUPPORT == GLM_SUPPORT_SSE2) || (GLM_MODEL == GLM_MODEL_64)) +#endif//GLM_ARCH +#if(GLM_ARCH & GLM_ARCH_SSE2) # include -# define GLM_ARCH GLM_ARCH_SSE2 -#else -# define GLM_ARCH GLM_ARCH_PURE -#endif//GLM_SUPPORT +#endif//GLM_ARCH +#endif//(GLM_ARCH != GLM_ARCH_PURE) #if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_ARCH_DISPLAYED)) # define GLM_MESSAGE_ARCH_DISPLAYED From b0325a97147cdf12cc96ac8a2e9c94e260e3b1ad Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 20 Jan 2011 18:26:24 +0000 Subject: [PATCH 10/12] Clean up --- glm/gtc/matrix_integer.hpp | 12 +-- glm/setup.hpp | 154 ++++++++++++++----------------------- 2 files changed, 64 insertions(+), 102 deletions(-) diff --git a/glm/gtc/matrix_integer.hpp b/glm/gtc/matrix_integer.hpp index fa777395..9c1c455c 100644 --- a/glm/gtc/matrix_integer.hpp +++ b/glm/gtc/matrix_integer.hpp @@ -114,7 +114,7 @@ namespace glm typedef detail::tmat4x3 lowp_umat4x3; //!< \brief Low-precision signed integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) typedef detail::tmat4x4 lowp_umat4x4; //!< \brief Low-precision signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) -#if(GLM_PRECISION & GLM_PRECISION_HIGHP_INT) +#if(defined(GLM_PRECISION) && (GLM_PRECISION & GLM_PRECISION_HIGHP_INT)) typedef highp_imat2 imat2; //!< \brief Signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) typedef highp_imat3 imat3; //!< \brief Signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) typedef highp_imat4 imat4; //!< \brief Signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) @@ -129,7 +129,7 @@ namespace glm typedef highp_imat4x3 imat4x3; //!< \brief Signed integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) typedef highp_imat4x4 imat4x4; //!< \brief Signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) -#elif(GLM_PRECISION & GLM_PRECISION_LOWP_INT) +#elif(defined(GLM_PRECISION) && (GLM_PRECISION & GLM_PRECISION_LOWP_INT)) typedef lowp_imat2 imat2; //!< \brief Signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) typedef lowp_imat3 imat3; //!< \brief Signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) typedef lowp_imat4 imat4; //!< \brief Signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) @@ -143,7 +143,7 @@ namespace glm typedef lowp_imat4x3 imat4x3; //!< \brief Signed integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) typedef lowp_imat4x4 imat4x4; //!< \brief Signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) -#else //if(GLM_PRECISION & GLM_PRECISION_MEDIUMP_INT) +#else //if(defined(GLM_PRECISION) && (GLM_PRECISION & GLM_PRECISION_MEDIUMP_INT)) typedef mediump_imat2 imat2; //!< \brief Signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) typedef mediump_imat3 imat3; //!< \brief Signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) typedef mediump_imat4 imat4; //!< \brief Signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) @@ -158,7 +158,7 @@ namespace glm typedef mediump_imat4x4 imat4x4; //!< \brief Signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) #endif//GLM_PRECISION -#if(GLM_PRECISION & GLM_PRECISION_HIGHP_UINT) +#if(defined(GLM_PRECISION) && (GLM_PRECISION & GLM_PRECISION_HIGHP_UINT)) typedef highp_umat2 umat2; //!< \brief Unsigned integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) typedef highp_umat3 umat3; //!< \brief Unsigned integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) typedef highp_umat4 umat4; //!< \brief Unsigned integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) @@ -172,7 +172,7 @@ namespace glm typedef highp_umat4x3 umat4x3; //!< \brief Unsigned integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) typedef highp_umat4x4 umat4x4; //!< \brief Unsigned integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) -#elif(GLM_PRECISION & GLM_PRECISION_LOWP_UINT) +#elif(defined(GLM_PRECISION) && (GLM_PRECISION & GLM_PRECISION_LOWP_UINT)) typedef lowp_umat2 umat2; //!< \brief Unsigned integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) typedef lowp_umat3 umat3; //!< \brief Unsigned integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) typedef lowp_umat4 umat4; //!< \brief Unsigned integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) @@ -186,7 +186,7 @@ namespace glm typedef lowp_umat4x3 umat4x3; //!< \brief Unsigned integer 4x3 matrix. (from GLM_GTC_matrix_integer extension) typedef lowp_umat4x4 umat4x4; //!< \brief Unsigned integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) -#else //if(GLM_PRECISION & GLM_PRECISION_MEDIUMP_UINT) +#else //if(defined(GLM_PRECISION) && (GLM_PRECISION & GLM_PRECISION_MEDIUMP_UINT)) typedef mediump_umat2 umat2; //!< \brief Unsigned integer 2x2 matrix. (from GLM_GTC_matrix_integer extension) typedef mediump_umat3 umat3; //!< \brief Unsigned integer 3x3 matrix. (from GLM_GTC_matrix_integer extension) typedef mediump_umat4 umat4; //!< \brief Unsigned integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) diff --git a/glm/setup.hpp b/glm/setup.hpp index 6d5a1c66..36034ad6 100644 --- a/glm/setup.hpp +++ b/glm/setup.hpp @@ -19,23 +19,6 @@ #define GLM_VERSION_PATCH 1 #define GLM_VERSION_REVISION 0 -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Precision - -#define GLM_PRECISION_NONE 0x00000000 - -#define GLM_PRECISION_LOWP_FLOAT 0x00000011 -#define GLM_PRECISION_MEDIUMP_FLOAT 0x00000012 -#define GLM_PRECISION_HIGHP_FLOAT 0x00000013 - -#define GLM_PRECISION_LOWP_INT 0x00001100 -#define GLM_PRECISION_MEDIUMP_INT 0x00001200 -#define GLM_PRECISION_HIGHP_INT 0x00001300 - -#define GLM_PRECISION_LOWP_UINT 0x00110000 -#define GLM_PRECISION_MEDIUMP_UINT 0x00120000 -#define GLM_PRECISION_HIGHP_UINT 0x00130000 - /////////////////////////////////////////////////////////////////////////////////////////////////// // Compiler @@ -87,13 +70,14 @@ #define GLM_MODEL_32 0x00000010 #define GLM_MODEL_64 0x00000020 -#ifndef GLM_COMPILER - // CodeWarrior #define GLM_COMPILER_CODEWARRIOR 0x04000000 +// Force generic C++ compiler +#ifdef GLM_FORCE_COMPILER_UNKNOWNED +# define GLM_COMPILER GLM_COMPILER_UNKNOWNED // Visual C++ -#ifdef _MSC_VER +#elif defined(_MSC_VER) # if _MSC_VER == 900 # define GLM_COMPILER GLM_COMPILER_VC2 # elif _MSC_VER == 1000 @@ -174,8 +158,6 @@ # define GLM_COMPILER GLM_COMPILER_UNKNOWNED #endif -#endif//GLM_COMPILER - #ifndef GLM_COMPILER #error "GLM_COMPILER undefined, your compiler may not be supported by GLM. Add #define GLM_COMPILER 0 to ignore this message." #endif//GLM_COMPILER @@ -234,7 +216,9 @@ #define GLM_LANG_CXX98 1 #define GLM_LANG_CXX0X 2 -#if((GLM_COMPILER & GLM_COMPILER_GCC) && defined(__GXX_EXPERIMENTAL_CXX0X__)) // -std=c++0x or -std=gnu++0x +#if(defined(GLM_FORCE_CXX98)) +# define GLM_LANG GLM_LANG_CXX98 +#elif((GLM_COMPILER & GLM_COMPILER_GCC) && defined(__GXX_EXPERIMENTAL_CXX0X__)) // -std=c++0x or -std=gnu++0x # define GLM_LANG GLM_LANG_CXX0X #elif GLM_COMPILER & GLM_COMPILER_VC2010 //_MSC_EXTENSIONS for MS language extensions # define GLM_LANG GLM_LANG_CXX0X @@ -259,9 +243,13 @@ #define GLM_ARCH_SSE3 0x0002 | GLM_ARCH_SSE2 #define GLM_ARCH_AVX 0x0004 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2 -#if((GLM_COMPILER & GLM_COMPILER_VC) && defined(_M_IX86)) -# if(GLM_COMPILER >= GLM_COMPILER_VC2010) -# if(_M_IX86_FP == 3) //AVX +#if(defined(GLM_FORCE_PURE)) +# define GLM_ARCH GLM_ARCH_PURE +#elif((GLM_COMPILER & GLM_COMPILER_VC) && defined(_M_IX86)) +# if(defined(_M_CEE_PURE)) +# define GLM_ARCH GLM_ARCH_PURE +# elif(GLM_COMPILER >= GLM_COMPILER_VC2010) +# if(_MSC_FULL_VER >= 160031118) //160031118: VC2010 SP1 beta full version # define GLM_ARCH GLM_ARCH_AVX //GLM_ARCH_AVX (Require SP1) # else # define GLM_ARCH GLM_ARCH_SSE3 @@ -310,76 +298,6 @@ # endif//GLM_ARCH #endif//GLM_MESSAGE -/* -#if(GLM_INSTRUCTION_SET != GLM_INSTRUCTION_SET_NULL) -# if(GLM_INSTRUCTION_SET & GLM_INSTRUCTION_SET_MMX) -# include -# endif -# if(GLM_INSTRUCTION_SET & GLM_INSTRUCTION_SET_3DNOW) -# include -# endif -# if(GLM_INSTRUCTION_SET & GLM_INSTRUCTION_SET_SSE) -# include -# endif -# if(GLM_INSTRUCTION_SET & GLM_INSTRUCTION_SET_SSE2) -# include -# endif -# if(GLM_INSTRUCTION_SET & GLM_INSTRUCTION_SET_SSE3) -# include -# endif -# if(GLM_INSTRUCTION_SET & GLM_INSTRUCTION_SET_SSSE3) -# include -# endif -# if(GLM_INSTRUCTION_SET & GLM_INSTRUCTION_SET_POPCNT) -//# include -# endif -# if(GLM_INSTRUCTION_SET & GLM_INSTRUCTION_SET_SSE4A) -//# include -# endif -# if(GLM_INSTRUCTION_SET & GLM_INSTRUCTION_SET_SSE4_1) -# include -# endif -# if(GLM_INSTRUCTION_SET & GLM_INSTRUCTION_SET_SSE4_2) -# include -# endif -# if(GLM_INSTRUCTION_SET & GLM_INSTRUCTION_SET_AES) -# include -# endif -# if(GLM_INSTRUCTION_SET & GLM_INSTRUCTION_SET_PCLMUL) -# include -# endif -# if(GLM_INSTRUCTION_SET & GLM_INSTRUCTION_SET_AVX) -# include -# endif -#endif -*/ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Swizzle operators - -#define GLM_SWIZZLE_NONE 0x00000000 -#define GLM_SWIZZLE_XYZW 0x00000002 -#define GLM_SWIZZLE_RGBA 0x00000004 -#define GLM_SWIZZLE_STQP 0x00000008 -#define GLM_SWIZZLE_FULL (GLM_SWIZZLE_XYZW | GLM_SWIZZLE_RGBA | GLM_SWIZZLE_STQP) - -//! By default: -// #define GLM_SWIZZLE GLM_SWIZZLE_NONE - -#ifndef GLM_SWIZZLE -# define GLM_SWIZZLE GLM_SWIZZLE_NONE -#endif//GLM_SWIZZLE - -#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_SWIZZLE_DISPLAYED)) -# define GLM_MESSAGE_SWIZZLE_DISPLAYED -# if !defined(GLM_SWIZZLE)|| (defined(GLM_SWIZZLE) && GLM_SWIZZLE == GLM_SWIZZLE_NONE) -# pragma message("GLM: No swizzling operator enabled") -# elif(defined(GLM_SWIZZLE) && GLM_SWIZZLE == GLM_SWIZZLE_FULL) -# pragma message("GLM: Full swizzling operator enabled") -# elif(defined(GLM_SWIZZLE) && GLM_SWIZZLE & GLM_SWIZZLE_FULL) -# pragma message("GLM: Partial swizzling operator enabled") -# endif//GLM_SWIZZLE -#endif//GLM_MESSAGE - /////////////////////////////////////////////////////////////////////////////////////////////////// // Components @@ -426,6 +344,50 @@ # define GLM_STATIC_ASSERT(x, message) typedef char __CASSERT__##__LINE__[(x) ? 1 : -1] #endif//GLM_LANG +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Swizzle operators + +#define GLM_SWIZZLE_NONE 0x00000000 +#define GLM_SWIZZLE_XYZW 0x00000002 +#define GLM_SWIZZLE_RGBA 0x00000004 +#define GLM_SWIZZLE_STQP 0x00000008 +#define GLM_SWIZZLE_FULL (GLM_SWIZZLE_XYZW | GLM_SWIZZLE_RGBA | GLM_SWIZZLE_STQP) + +//! By default: +// #define GLM_SWIZZLE GLM_SWIZZLE_NONE + +//#ifndef GLM_SWIZZLE +//# define GLM_SWIZZLE GLM_SWIZZLE_NONE +//#endif//GLM_SWIZZLE + +#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_SWIZZLE_DISPLAYED)) +# define GLM_MESSAGE_SWIZZLE_DISPLAYED +# if !defined(GLM_SWIZZLE)|| (defined(GLM_SWIZZLE) && GLM_SWIZZLE == GLM_SWIZZLE_NONE) +# pragma message("GLM: No swizzling operator enabled") +# elif(defined(GLM_SWIZZLE) && GLM_SWIZZLE == GLM_SWIZZLE_FULL) +# pragma message("GLM: Full swizzling operator enabled") +# elif(defined(GLM_SWIZZLE) && GLM_SWIZZLE & GLM_SWIZZLE_FULL) +# pragma message("GLM: Partial swizzling operator enabled") +# endif//GLM_SWIZZLE +#endif//GLM_MESSAGE + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Precision + +#define GLM_PRECISION_NONE 0x00000000 + +#define GLM_PRECISION_LOWP_FLOAT 0x00000011 +#define GLM_PRECISION_MEDIUMP_FLOAT 0x00000012 +#define GLM_PRECISION_HIGHP_FLOAT 0x00000013 + +#define GLM_PRECISION_LOWP_INT 0x00001100 +#define GLM_PRECISION_MEDIUMP_INT 0x00001200 +#define GLM_PRECISION_HIGHP_INT 0x00001300 + +#define GLM_PRECISION_LOWP_UINT 0x00110000 +#define GLM_PRECISION_MEDIUMP_UINT 0x00120000 +#define GLM_PRECISION_HIGHP_UINT 0x00130000 + /////////////////////////////////////////////////////////////////////////////////////////////////// #endif//glm_setup From a00f95d2b59bdca45512932d5428d18e99acd00e Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 20 Jan 2011 23:11:55 +0000 Subject: [PATCH 11/12] Fixed 64 bits in Visual C++ --- glm/gtx/simd_vec4.hpp | 2 +- glm/setup.hpp | 10 +++++----- test/gtx/gtx-simd-mat4.cpp | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/glm/gtx/simd_vec4.hpp b/glm/gtx/simd_vec4.hpp index 2c9de23b..9441b878 100644 --- a/glm/gtx/simd_vec4.hpp +++ b/glm/gtx/simd_vec4.hpp @@ -18,7 +18,7 @@ #include "../glm.hpp" #if(!(GLM_ARCH & GLM_ARCH_SSE2)) -#error "GLM: GLM_GTX_simd_vec4 requires compiler support of SSE2 through intrinsics" +# error "GLM: GLM_GTX_simd_vec4 requires compiler support of SSE2 through intrinsics" #endif #include "../core/intrinsic_common.hpp" diff --git a/glm/setup.hpp b/glm/setup.hpp index 36034ad6..33f11f2e 100644 --- a/glm/setup.hpp +++ b/glm/setup.hpp @@ -238,14 +238,14 @@ ///////////////// // Platform -#define GLM_ARCH_PURE 0x0000 -#define GLM_ARCH_SSE2 0x0001 -#define GLM_ARCH_SSE3 0x0002 | GLM_ARCH_SSE2 -#define GLM_ARCH_AVX 0x0004 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2 +#define GLM_ARCH_PURE 0x0000 //(0x0000) +#define GLM_ARCH_SSE2 0x0001 //(0x0001) +#define GLM_ARCH_SSE3 0x0003 //(0x0002 | GLM_ARCH_SSE2) +#define GLM_ARCH_AVX 0x0007 //(0x0004 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2) #if(defined(GLM_FORCE_PURE)) # define GLM_ARCH GLM_ARCH_PURE -#elif((GLM_COMPILER & GLM_COMPILER_VC) && defined(_M_IX86)) +#elif((GLM_COMPILER & GLM_COMPILER_VC) && (defined(_M_IX86) || defined(_M_X64))) # if(defined(_M_CEE_PURE)) # define GLM_ARCH GLM_ARCH_PURE # elif(GLM_COMPILER >= GLM_COMPILER_VC2010) diff --git a/test/gtx/gtx-simd-mat4.cpp b/test/gtx/gtx-simd-mat4.cpp index cd36c754..48b672c0 100644 --- a/test/gtx/gtx-simd-mat4.cpp +++ b/test/gtx/gtx-simd-mat4.cpp @@ -7,7 +7,6 @@ // File : test/gtx/simd-mat4.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// -#define GLM_INSTRUCTION_SET GLM_PLATFORM_SSE3 | GLM_PLATFORM_SSE2 #include #include #include From d8ddba592fedd998afcd6885344bd636a7c42953 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 20 Jan 2011 23:28:33 +0000 Subject: [PATCH 12/12] Fixed Visual C++ build --- glm/setup.hpp | 10 +++++----- test/gtx/gtx-simd-mat4.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/glm/setup.hpp b/glm/setup.hpp index 33f11f2e..f10552d9 100644 --- a/glm/setup.hpp +++ b/glm/setup.hpp @@ -218,9 +218,9 @@ #if(defined(GLM_FORCE_CXX98)) # define GLM_LANG GLM_LANG_CXX98 -#elif((GLM_COMPILER & GLM_COMPILER_GCC) && defined(__GXX_EXPERIMENTAL_CXX0X__)) // -std=c++0x or -std=gnu++0x +#elif(((GLM_COMPILER & GLM_COMPILER_GCC) == GLM_COMPILER_GCC) && defined(__GXX_EXPERIMENTAL_CXX0X__)) // -std=c++0x or -std=gnu++0x # define GLM_LANG GLM_LANG_CXX0X -#elif GLM_COMPILER & GLM_COMPILER_VC2010 //_MSC_EXTENSIONS for MS language extensions +#elif(GLM_COMPILER == GLM_COMPILER_VC2010) //_MSC_EXTENSIONS for MS language extensions # define GLM_LANG GLM_LANG_CXX0X #else # define GLM_LANG GLM_LANG_CXX98 @@ -274,13 +274,13 @@ #endif #if(GLM_ARCH != GLM_ARCH_PURE) -#if(GLM_ARCH & GLM_ARCH_AVX) +#if((GLM_ARCH & GLM_ARCH_AVX) == GLM_ARCH_AVX) # include #endif//GLM_ARCH -#if(GLM_ARCH & GLM_ARCH_SSE3) +#if((GLM_ARCH & GLM_ARCH_SSE3) == GLM_ARCH_SSE3) # include #endif//GLM_ARCH -#if(GLM_ARCH & GLM_ARCH_SSE2) +#if((GLM_ARCH & GLM_ARCH_SSE2) == GLM_ARCH_SSE2) # include #endif//GLM_ARCH #endif//(GLM_ARCH != GLM_ARCH_PURE) diff --git a/test/gtx/gtx-simd-mat4.cpp b/test/gtx/gtx-simd-mat4.cpp index 48b672c0..66a24d4b 100644 --- a/test/gtx/gtx-simd-mat4.cpp +++ b/test/gtx/gtx-simd-mat4.cpp @@ -223,7 +223,7 @@ int test_compute_gtx() int main(int argc, void* argv[]) { - int Failed = 0; + int Failed = GLM_COMPILER; std::vector Data(1024 * 1024 * 8); for(std::size_t i = 0; i < Data.size(); ++i)