diff --git a/doc/src/data.xml b/doc/src/data.xml index 50622cd3..2e68b38a 100644 --- a/doc/src/data.xml +++ b/doc/src/data.xml @@ -3,7 +3,8 @@
- + + @@ -60,7 +61,8 @@
- + + @@ -150,6 +152,16 @@ + + + Only bug fixes for GLM 0.9.1.2. + + + GLM 0.9.1.2 (zip) + GLM 0.9.1.2 (7z) + Submit a bug report + + GLM 0.9.1.1 fixes some bugs, warnings on Clang C++ and clean up a bit the code. diff --git a/glm/core/func_common.inl b/glm/core/func_common.inl index e2801089..2bc01a98 100644 --- a/glm/core/func_common.inl +++ b/glm/core/func_common.inl @@ -1402,18 +1402,6 @@ namespace glm return fi.f; } - inline float intBitsToFloat(uint const & value) - { - union - { - float f; - uint u; - } fu; - - fu.u = value; - return fu.f; - } - template inline detail::tvec2 intBitsToFloat ( @@ -1447,6 +1435,51 @@ namespace glm intBitsToFloat(value.y)); } + inline float uintBitsToFloat(uint const & value) + { + union + { + float f; + uint u; + } fu; + + fu.u = value; + return fu.f; + } + + template + inline detail::tvec2 uintBitsToFloat + ( + detail::tvec2 const & value + ) + { + return detail::tvec2( + uintBitsToFloat(value.x), + uintBitsToFloat(value.y)); + } + + template + inline detail::tvec3 uintBitsToFloat + ( + detail::tvec3 const & value + ) + { + return detail::tvec3( + uintBitsToFloat(value.x), + uintBitsToFloat(value.y)); + } + + template + inline detail::tvec4 uintBitsToFloat + ( + detail::tvec4 const & value + ) + { + return detail::tvec4( + uintBitsToFloat(value.x), + uintBitsToFloat(value.y)); + } + template inline genType fma ( diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index 07f32498..2a1cd304 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 @@ -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 diff --git a/glm/gtx/compatibility.inl b/glm/gtx/compatibility.inl index ef7d57c9..035e50d6 100644 --- a/glm/gtx/compatibility.inl +++ b/glm/gtx/compatibility.inl @@ -19,7 +19,7 @@ inline bool isfinite( #if(GLM_COMPILER & GLM_COMPILER_VC) return _finite(x); #else//(GLM_COMPILER & GLM_COMPILER_GCC) - return std::isfinite(x); + return std::isfinite(x) != 0; #endif } @@ -61,7 +61,7 @@ inline bool isinf( #if(GLM_COMPILER & GLM_COMPILER_VC) return _fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF; #else - return std::isinf(x); + return std::isinf(x) != 0; #endif } @@ -102,7 +102,7 @@ inline bool isnan(genType const & x) #if(GLM_COMPILER & GLM_COMPILER_VC) return _isnan(x); #else - return std::isnan(x); + return std::isnan(x) != 0; #endif } diff --git a/readme.txt b/readme.txt index 90418ce0..f7a8d2ec 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.2: 2010-04-12 +-------------------------------------------------------------------------------- +- Fixed bugs + ================================================================================ GLM 0.9.1.1: 2010-03-17 -------------------------------------------------------------------------------- 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() {