diff --git a/doc/src/data.xml b/doc/src/data.xml index d44b6190..47a2de72 100644 --- a/doc/src/data.xml +++ b/doc/src/data.xml @@ -3,8 +3,9 @@
- - + + + @@ -61,8 +62,9 @@
+ - + @@ -152,6 +154,16 @@ + + + Various bugs fixed with GLM 0.9.1.3. + + + GLM 0.9.1.3 (zip) + GLM 0.9.1.3 (7z) + Submit a bug report + + Bug fixes Only for GLM 0.9.1.2. diff --git a/glm/core/_detail.hpp b/glm/core/_detail.hpp index 9b36a921..dbf1ab1b 100644 --- a/glm/core/_detail.hpp +++ b/glm/core/_detail.hpp @@ -18,19 +18,15 @@ namespace detail { class thalf; -#if(GLM_COMPILER & GLM_COMPILER_VC) +#if(__STDC_VERSION__ >= 199901L) // C99 detected, 64 bit types available + typedef int64_t sint64; + typedef uint64_t uint64; +#elif(GLM_COMPILER & GLM_COMPILER_VC) typedef signed __int64 sint64; typedef unsigned __int64 uint64; #elif(GLM_COMPILER & GLM_COMPILER_GCC) __extension__ typedef signed long long sint64; __extension__ typedef unsigned long long uint64; -//# if GLM_MODEL == GLM_MODEL_64 -// typedef signed long highp_int_t; -// typedef unsigned long highp_uint_t; -//# elif GLM_MODEL == GLM_MODEL_32 -// __extension__ typedef signed long long highp_int_t; -// __extension__ typedef unsigned long long highp_uint_t; -//# endif//GLM_MODEL #elif(GLM_COMPILER & GLM_COMPILER_BC) typedef Int64 sint64; typedef Uint64 uint64; diff --git a/glm/core/func_matrix.inl b/glm/core/func_matrix.inl index 7b7cc392..3dfe2a75 100644 --- a/glm/core/func_matrix.inl +++ b/glm/core/func_matrix.inl @@ -466,8 +466,8 @@ namespace glm detail::tmat2x2 Inverse( + m[1][1] / Determinant, - - m[1][0] / Determinant, - m[0][1] / Determinant, + - m[1][0] / Determinant, + m[0][0] / Determinant); return Inverse; diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl index 24f6a377..b6e5e0e8 100644 --- a/glm/gtc/quaternion.inl +++ b/glm/gtc/quaternion.inl @@ -422,7 +422,7 @@ namespace quaternion{ detail::tquat const & q ) { - return gtc::quaternion::conjugate(q) / gtc::quaternion::length(q); + return gtc::quaternion::conjugate(q) / gtc::quaternion::dot(q, q); } template diff --git a/glm/gtx/simd_vec4.inl b/glm/gtx/simd_vec4.inl index e8261fcb..1f108095 100644 --- a/glm/gtx/simd_vec4.inl +++ b/glm/gtx/simd_vec4.inl @@ -275,7 +275,7 @@ namespace glm detail::fvec4SIMD const & x ) { - GLM_ALIGN(4) detail::tvec4 Result; + GLM_ALIGN(16) detail::tvec4 Result; _mm_store_ps(&Result[0], x.Data); return Result; } diff --git a/readme.txt b/readme.txt index d85ec123..412e491e 100644 --- a/readme.txt +++ b/readme.txt @@ -13,6 +13,11 @@ GLM is a header only library, there is nothing to build, just include it. More informations in GLM manual: http://glm.g-truc.net/glm-0.9.1.pdf +================================================================================ +GLM 0.9.1.3: 2010-05-07 +-------------------------------------------------------------------------------- +- Fixed bugs + ================================================================================ GLM 0.9.1.2: 2010-04-15 -------------------------------------------------------------------------------- diff --git a/test/core/core_func_matrix.cpp b/test/core/core_func_matrix.cpp index 5c3f3cc0..a555f714 100644 --- a/test/core/core_func_matrix.cpp +++ b/test/core/core_func_matrix.cpp @@ -4,145 +4,79 @@ // Created : 2011-01-15 // Updated : 2011-01-15 // Licence : This source is under MIT licence -// File : test/gtx/simd-mat4.cpp +// File : test/core/func_matrix.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// -#define GLM_INSTRUCTION_SET GLM_PLATFORM_SSE3 | GLM_PLATFORM_SSE2 #include -int test_static_assert() +int test_matrixCompMult() { - //glm::lessThan(glm::mat4(0), glm::mat4(4)); + return 0; } -int test_lessThan_vec2() +int test_outerProduct() { - glm::bvec2 O = glm::bvec2(true, false); - glm::bvec2 A = glm::lessThan(glm::vec2(0, 6), glm::vec2(4, 2)); - assert(glm::all(glm::equal(O, A))); - - glm::bvec2 B = glm::lessThan(glm::ivec2(0, 6), glm::ivec2(4, 2)); - assert(glm::all(glm::equal(O, B))); - - glm::bvec2 C = glm::lessThan(glm::uvec2(0, 6), glm::uvec2(4, 2)); - assert(glm::all(glm::equal(O, C))); return 0; } -int test_lessThan_vec3() +int test_transpose() { - glm::bvec3 O = glm::bvec3(true, true, false); - glm::bvec3 A = glm::lessThan(glm::vec3(0, 1, 6), glm::vec3(4, 5, 2)); - assert(glm::all(glm::equal(O, A))); - - glm::bvec3 B = glm::lessThan(glm::ivec3(0, 1, 6), glm::ivec3(4, 5, 2)); - assert(glm::all(glm::equal(O, B))); - - glm::bvec3 C = glm::lessThan(glm::uvec3(0, 1, 6), glm::uvec3(4, 5, 2)); - assert(glm::all(glm::equal(O, C))); return 0; } -int test_lessThan_vec4() +int test_determinant() { - glm::bvec4 O = glm::bvec4(true, true, false, false); - glm::bvec4 A = glm::lessThan(glm::vec4(0, 1, 6, 7), glm::vec4(4, 5, 2, 3)); - assert(glm::all(glm::equal(O, A))); - - glm::bvec4 B = glm::lessThan(glm::ivec4(0, 1, 6, 7), glm::ivec4(4, 5, 2, 3)); - assert(glm::all(glm::equal(O, B))); - - glm::bvec4 C = glm::lessThan(glm::uvec4(0, 1, 6, 7), glm::uvec4(4, 5, 2, 3)); - assert(glm::all(glm::equal(O, C))); return 0; } -int test_greaterThanEqual_vec2() +int test_inverse() { - glm::bvec2 O = glm::bvec2(false, true); + int Failed(0); - glm::bvec2 A = glm::greaterThanEqual(glm::vec2(0, 6), glm::vec2(4, 2)); - assert(glm::all(glm::equal(O, A))); + glm::mat4x4 A4x4( + glm::vec4(1, 0, 1, 0), + glm::vec4(0, 1, 0, 0), + glm::vec4(0, 0, 1, 0), + glm::vec4(0, 0, 0, 1)); + glm::mat4x4 B4x4 = glm::inverse(A4x4); + glm::mat4x4 I4x4 = A4x4 * B4x4; + Failed += I4x4 == glm::mat4x4(1) ? 0 : 1; - glm::bvec2 B = glm::greaterThanEqual(glm::ivec2(0, 6), glm::ivec2(4, 2)); - assert(glm::all(glm::equal(O, B))); + glm::mat3x3 A3x3( + glm::vec3(1, 0, 1), + glm::vec3(0, 1, 0), + glm::vec3(0, 0, 1)); + glm::mat3x3 B3x3 = glm::inverse(A3x3); + glm::mat3x3 I3x3 = A3x3 * B3x3; + Failed += I3x3 == glm::mat3x3(1) ? 0 : 1; - glm::bvec2 C = glm::greaterThanEqual(glm::uvec2(0, 6), glm::uvec2(4, 2)); - assert(glm::all(glm::equal(O, C))); + glm::mat2x2 A2x2( + glm::vec2(1, 1), + glm::vec2(0, 1)); + glm::mat2x2 B2x2 = glm::inverse(A2x2); + glm::mat2x2 I2x2 = A2x2 * B2x2; + Failed += I2x2 == glm::mat2x2(1) ? 0 : 1; - return 0; -} - -int test_greaterThanEqual_vec3() -{ - glm::bvec3 O = glm::bvec3(false, false, true); - - glm::bvec3 A = glm::greaterThanEqual(glm::vec3(0, 1, 6), glm::vec3(4, 5, 2)); - assert(glm::all(glm::equal(O, A))); - - glm::bvec3 B = glm::greaterThanEqual(glm::ivec3(0, 1, 6), glm::ivec3(4, 5, 2)); - assert(glm::all(glm::equal(O, B))); - - glm::bvec3 C = glm::greaterThanEqual(glm::uvec3(0, 1, 6), glm::uvec3(4, 5, 2)); - assert(glm::all(glm::equal(O, C))); - - return 0; -} - -int test_greaterThanEqual_vec4() -{ - glm::bvec4 O = glm::bvec4(false, false, true, true); - - glm::bvec4 A = glm::greaterThanEqual(glm::vec4(0, 1, 6, 7), glm::vec4(4, 5, 2, 3)); - assert(glm::all(glm::equal(O, A))); - - glm::bvec4 B = glm::greaterThanEqual(glm::ivec4(0, 1, 6, 7), glm::ivec4(4, 5, 2, 3)); - assert(glm::all(glm::equal(O, B))); - - glm::bvec4 C = glm::greaterThanEqual(glm::uvec4(0, 1, 6, 7), glm::uvec4(4, 5, 2, 3)); - assert(glm::all(glm::equal(O, C))); - - return 0; -} - -int test_all() -{ - assert(glm::all(glm::bvec2(true, true))); - assert(!glm::all(glm::bvec2(true, false))); - assert(!glm::all(glm::bvec2(false, false))); - - assert(glm::all(glm::bvec3(true, true, true))); - assert(!glm::all(glm::bvec3(true, false, true))); - assert(!glm::all(glm::bvec3(false, false, false))); - - assert(glm::all(glm::bvec4(true, true, true, true))); - assert(!glm::all(glm::bvec4(true, false, true, false))); - assert(!glm::all(glm::bvec4(false, false, false, false))); - - return 0; + return Failed; } int main() { int Failed = 0; - Failed += test_static_assert(); - Failed += test_lessThan_vec2(); - Failed += test_lessThan_vec3(); - Failed += test_lessThan_vec4(); - Failed += test_greaterThanEqual_vec2(); - Failed += test_greaterThanEqual_vec3(); - Failed += test_greaterThanEqual_vec4(); - Failed += test_all(); - + Failed += test_matrixCompMult(); + Failed += test_outerProduct(); + Failed += test_transpose(); + Failed += test_determinant(); + Failed += test_inverse(); return Failed; }