From 4a9bd5c1394e537cc4da85731fa556d5906b9e07 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 9 Apr 2011 10:12:30 +0100 Subject: [PATCH 1/5] Updated revision number for release --- glm/core/setup.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index 07f32498..d8aac057 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -17,7 +17,7 @@ #define GLM_VERSION_MAJOR 0 #define GLM_VERSION_MINOR 9 #define GLM_VERSION_PATCH 1 -#define GLM_VERSION_REVISION 0 +#define GLM_VERSION_REVISION 2 /////////////////////////////////////////////////////////////////////////////////////////////////// // Compiler From 73f66c2260753f5b5cdd1247e021131145600f77 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 9 Apr 2011 10:16:18 +0100 Subject: [PATCH 2/5] Anticipate VC2011 --- glm/core/setup.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index d8aac057..2a1cd304 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -37,6 +37,7 @@ #define GLM_COMPILER_VC2005 0x01000070 #define GLM_COMPILER_VC2008 0x01000080 #define GLM_COMPILER_VC2010 0x01000090 +#define GLM_COMPILER_VC2011 0x010000A0 // GCC defines #define GLM_COMPILER_GCC 0x02000000 @@ -98,6 +99,8 @@ # define GLM_COMPILER GLM_COMPILER_VC2008 # elif _MSC_VER == 1600 # define GLM_COMPILER GLM_COMPILER_VC2010 +# elif _MSC_VER == 1700 +# define GLM_COMPILER GLM_COMPILER_VC2011 # else//_MSC_VER # define GLM_COMPILER GLM_COMPILER_VC # endif//_MSC_VER From 653eef73577b416482f9215c2bcf12dd4837cf90 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 9 Apr 2011 10:58:50 +0100 Subject: [PATCH 3/5] Updated test --- test/gtc/gtc_type_ptr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/gtc/gtc_type_ptr.cpp b/test/gtc/gtc_type_ptr.cpp index 0b9bc908..74efc2d0 100644 --- a/test/gtc/gtc_type_ptr.cpp +++ b/test/gtc/gtc_type_ptr.cpp @@ -4,12 +4,12 @@ // Created : 2010-09-16 // Updated : 2010-09-16 // Licence : This source is under MIT licence -// File : test/gtc/matrix_transform.cpp +// File : test/gtc/type_ptr.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// #define GLM_MESSAGES #include -#include +#include int main() { From 3ef449763504f790c6313e3b1804660446de3414 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 9 Apr 2011 11:01:42 +0100 Subject: [PATCH 4/5] Updated test --- test/gtc/gtc_type_ptr.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/gtc/gtc_type_ptr.cpp b/test/gtc/gtc_type_ptr.cpp index 0b9bc908..e80021d7 100644 --- a/test/gtc/gtc_type_ptr.cpp +++ b/test/gtc/gtc_type_ptr.cpp @@ -11,9 +11,17 @@ #include #include +bool test_make_pointer() +{ + float ArrayA[] = {1, 2, 3, 4}; + glm::vec4 Vec4A = glm::make_vec4(ArrayA); +} + int main() { int Failed = 0; + + Failed += test_make_pointer() ? 0 : 1; return Failed; } From 0089077931eab1aa9f41854f759223896ff4747d Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 9 Apr 2011 11:12:39 +0100 Subject: [PATCH 5/5] Completed make_xxx test --- test/gtc/gtc_type_ptr.cpp | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/test/gtc/gtc_type_ptr.cpp b/test/gtc/gtc_type_ptr.cpp index 56851cec..a6c59760 100644 --- a/test/gtc/gtc_type_ptr.cpp +++ b/test/gtc/gtc_type_ptr.cpp @@ -13,8 +13,33 @@ bool test_make_pointer() { - float ArrayA[] = {1, 2, 3, 4}; + float ArrayA[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; + int ArrayB[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; + bool ArrayC[] = {true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false}; + + glm::vec2 Vec2A = glm::make_vec2(ArrayA); + glm::vec3 Vec3A = glm::make_vec3(ArrayA); glm::vec4 Vec4A = glm::make_vec4(ArrayA); + + glm::ivec2 Vec2B = glm::make_vec2(ArrayB); + glm::ivec3 Vec3B = glm::make_vec3(ArrayB); + glm::ivec4 Vec4B = glm::make_vec4(ArrayB); + + glm::bvec2 Vec2C = glm::make_vec2(ArrayC); + glm::bvec3 Vec3C = glm::make_vec3(ArrayC); + glm::bvec4 Vec4C = glm::make_vec4(ArrayC); + + glm::mat2x2 Mat2x2A = glm::make_mat2x2(ArrayA); + glm::mat2x3 Mat2x3A = glm::make_mat2x3(ArrayA); + glm::mat2x4 Mat2x4A = glm::make_mat2x4(ArrayA); + glm::mat3x2 Mat3x2A = glm::make_mat3x2(ArrayA); + glm::mat3x3 Mat3x3A = glm::make_mat3x3(ArrayA); + glm::mat3x4 Mat3x4A = glm::make_mat3x4(ArrayA); + glm::mat4x2 Mat4x2A = glm::make_mat4x2(ArrayA); + glm::mat4x3 Mat4x3A = glm::make_mat4x3(ArrayA); + glm::mat4x4 Mat4x4A = glm::make_mat4x4(ArrayA); + + return true; } int main()