From 82f86a8057c169ae0d6c939dfa148970e97d6693 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 17 Mar 2012 00:04:21 +0000 Subject: [PATCH 1/5] Added GLM 0.9.3.2 release --- doc/about.html | 4 ++-- doc/code.html | 4 ++-- doc/download.html | 12 +++++++----- doc/goodies.html | 4 ++-- doc/index.html | 8 +++++--- doc/src/data.xml | 17 ++++++++++++++++- readme.txt | 7 +++++++ 7 files changed, 41 insertions(+), 15 deletions(-) diff --git a/doc/about.html b/doc/about.html index 3aa1a940..12bfeb42 100644 --- a/doc/about.html +++ b/doc/about.html @@ -11,8 +11,8 @@ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); -

GLM Logo


Front page
Downloads
OpenGL SDK page

GLM Manual
GLM API
Code samples
GLSL Specification
OpenGL.org Toolkits forum

Report a bug
SourceForge page
G-Truc Creation page
Browse Git repository
Master branch snapshot
0.9.3 branch snapshot
0.9.4 branch snapshot


G-Truc

OpenGL Mathematics
GLSL + Optional features = OpenGL Mathematics (GLM)
A C++ mathematics library for graphics programming


+

GLM Logo


Front page
Downloads
OpenGL SDK page

GLM Manual
GLM API
Code samples
GLSL Specification
OpenGL.org Toolkits forum

Report a bug
SourceForge page
G-Truc Creation page
Browse Git repository
Master branch snapshot
0.9.3 branch snapshot
0.9.4 branch snapshot


G-Truc

OpenGL Mathematics
GLSL + Optional features = OpenGL Mathematics (GLM)
A C++ mathematics library for graphics programming


OpenGL Mathematics (GLM) is a header only C++ mathematics library for graphics software based on the OpenGL Shading Language (GLSL) specification.

diff --git a/doc/code.html b/doc/code.html index a13db0bd..0276c8c4 100644 --- a/doc/code.html +++ b/doc/code.html @@ -11,8 +11,8 @@ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); -

GLM Logo


Front page
Downloads
OpenGL SDK page

GLM Manual
GLM API
Code samples
GLSL Specification
OpenGL.org Toolkits forum

Report a bug
SourceForge page
G-Truc Creation page
Browse Git repository
Master branch snapshot
0.9.3 branch snapshot
0.9.4 branch snapshot


G-Truc

OpenGL Mathematics
GLSL + Optional features = OpenGL Mathematics (GLM)
A C++ mathematics library for graphics programming


Compute a triangle normal:
  • #include <glm/glm.hpp>
  • void computeNormal(triangle & Triangle) +

    GLM Logo


    Front page
    Downloads
    OpenGL SDK page

    GLM Manual
    GLM API
    Code samples
    GLSL Specification
    OpenGL.org Toolkits forum

    Report a bug
    SourceForge page
    G-Truc Creation page
    Browse Git repository
    Master branch snapshot
    0.9.3 branch snapshot
    0.9.4 branch snapshot


    G-Truc

    OpenGL Mathematics
    GLSL + Optional features = OpenGL Mathematics (GLM)
    A C++ mathematics library for graphics programming


    Compute a triangle normal:
    • #include <glm/glm.hpp>
    • void computeNormal(triangle & Triangle)
    • {
    • diff --git a/doc/download.html b/doc/download.html index f192f761..912d2b0c 100644 --- a/doc/download.html +++ b/doc/download.html @@ -11,11 +11,12 @@ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); -

      GLM Logo


      Front page
      Downloads
      OpenGL SDK page

      GLM Manual
      GLM API
      Code samples
      GLSL Specification
      OpenGL.org Toolkits forum

      Report a bug
      SourceForge page
      G-Truc Creation page
      Browse Git repository
      Master branch snapshot
      0.9.3 branch snapshot
      0.9.4 branch snapshot


      G-Truc

      OpenGL Mathematics
      GLSL + Optional features = OpenGL Mathematics (GLM)
      A C++ mathematics library for graphics programming


      Current release
      25/01/2012: - GLM 0.9.3.1 +

      GLM Logo


      Front page
      Downloads
      OpenGL SDK page

      GLM Manual
      GLM API
      Code samples
      GLSL Specification
      OpenGL.org Toolkits forum

      Report a bug
      SourceForge page
      G-Truc Creation page
      Browse Git repository
      Master branch snapshot
      0.9.3 branch snapshot
      0.9.4 branch snapshot


      G-Truc

      OpenGL Mathematics
      GLSL + Optional features = OpenGL Mathematics (GLM)
      A C++ mathematics library for graphics programming


      Current release
      15/03/2012: + GLM 0.9.3.2 (3.9 MB) -
      _________________

      GLM - zip files
      25/01/2012: GLM 0.9.3.1 (3.9 MB) +
      _________________

      GLM - zip files
      15/03/2012: GLM 0.9.3.2 (3.9 MB) +
      25/01/2012: GLM 0.9.3.1 (3.9 MB)
      09/01/2012: GLM 0.9.3.0 (3.9 MB)
      12/12/2011: GLM 0.9.3.B (4.3 MB)
      11/11/2011: GLM 0.9.3.A (4.3 MB) @@ -84,7 +85,8 @@
      02/19/2006: GLM 0.3.0.0 (945 KB)
      05/05/2005: GLM 0.2.0.0 (194 KB)
      02/21/2005: GLM 0.1.0.0 (29.2 KB) -
      _________________

      GLM - 7z files
      25/01/2012: GLM 0.9.3.1 (2.7 MB) +
      _________________

      GLM - 7z files
      15/03/2012: GLM 0.9.3.2 (2.7 MB) +
      25/01/2012: GLM 0.9.3.1 (2.7 MB)
      09/01/2012: GLM 0.9.3.0 (2.7 MB)
      12/12/2011: GLM 0.9.3.B (2.8 MB)
      11/11/2011: GLM 0.9.3.A (2.8 MB) diff --git a/doc/goodies.html b/doc/goodies.html index 2b769187..d4194706 100644 --- a/doc/goodies.html +++ b/doc/goodies.html @@ -11,5 +11,5 @@ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); -

      GLM Logo


      Front page
      Downloads
      OpenGL SDK page

      GLM Manual
      GLM API
      Code samples
      GLSL Specification
      OpenGL.org Toolkits forum

      Report a bug
      SourceForge page
      G-Truc Creation page
      Browse Git repository
      Master branch snapshot
      0.9.3 branch snapshot
      0.9.4 branch snapshot


      G-Truc

      OpenGL Mathematics
      GLSL + Optional features = OpenGL Mathematics (GLM)
      A C++ mathematics library for graphics programming


      16/10/2008
      GLM Logo

      Download: 2560x1600
      Download: 1920x1200
      Download: 1600x1000
      Download: 1280x0800
      Download: 1024x0640
      _________________

      16/10/2008
      GLM Font

      Download: Font (.otf)
      _________________

      _________________

      Copyright © 2005 - 2012G-Truc Creation
      \ No newline at end of file +

      GLM Logo


      Front page
      Downloads
      OpenGL SDK page

      GLM Manual
      GLM API
      Code samples
      GLSL Specification
      OpenGL.org Toolkits forum

      Report a bug
      SourceForge page
      G-Truc Creation page
      Browse Git repository
      Master branch snapshot
      0.9.3 branch snapshot
      0.9.4 branch snapshot


      G-Truc

      OpenGL Mathematics
      GLSL + Optional features = OpenGL Mathematics (GLM)
      A C++ mathematics library for graphics programming


      16/10/2008
      GLM Logo

      Download: 2560x1600
      Download: 1920x1200
      Download: 1600x1000
      Download: 1280x0800
      Download: 1024x0640
      _________________

      16/10/2008
      GLM Font

      Download: Font (.otf)
      _________________

      _________________

      Copyright © 2005 - 2012G-Truc Creation
      \ No newline at end of file diff --git a/doc/index.html b/doc/index.html index e52e3b80..72990851 100644 --- a/doc/index.html +++ b/doc/index.html @@ -11,8 +11,8 @@ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); -

      GLM Logo


      Front page
      Downloads
      OpenGL SDK page

      GLM Manual
      GLM API
      Code samples
      GLSL Specification
      OpenGL.org Toolkits forum

      Report a bug
      SourceForge page
      G-Truc Creation page
      Browse Git repository
      Master branch snapshot
      0.9.3 branch snapshot
      0.9.4 branch snapshot


      G-Truc

      OpenGL Mathematics
      GLSL + Optional features = OpenGL Mathematics (GLM)
      A C++ mathematics library for graphics programming


      +

      GLM Logo


      Front page
      Downloads
      OpenGL SDK page

      GLM Manual
      GLM API
      Code samples
      GLSL Specification
      OpenGL.org Toolkits forum

      Report a bug
      SourceForge page
      G-Truc Creation page
      Browse Git repository
      Master branch snapshot
      0.9.3 branch snapshot
      0.9.4 branch snapshot


      G-Truc

      OpenGL Mathematics
      GLSL + Optional features = OpenGL Mathematics (GLM)
      A C++ mathematics library for graphics programming


      OpenGL Mathematics (GLM) is a header only C++ mathematics library for graphics software based on the OpenGL Shading Language (GLSL) specification.

      @@ -34,7 +34,9 @@

      Thanks for contributing to the project by submitting tickets for bug reports and feature requests. (SF.net account required). Any feedback is welcome at glm@g-truc.net. -


      10/03/2012 - GLM on GitHub

      +


      15/03/2012 - GLM 0.9.3.2 released

      + Just a regular revision fixing the only three minor issues reported since last release. +

      Download: GLM 0.9.3.2 (zip)
      Download: GLM 0.9.3.2 (7z)
      Link: Submit a bug report
      Link: GLM 0.9.3 Manual
      Link: GLM 0.9.3 API

      10/03/2012 - GLM on GitHub

      After years of using SourceForge.net, GLM is moving to GitHub, as least for its repository. GitHub provides easy ways to clone the repository and submit pull requests which seems a definity advantage for the community contribution. It also allows to download snapshots of every branches. diff --git a/doc/src/data.xml b/doc/src/data.xml index 27a53af1..8b2f7982 100644 --- a/doc/src/data.xml +++ b/doc/src/data.xml @@ -3,6 +3,7 @@

      + @@ -74,6 +75,7 @@
      + @@ -172,6 +174,19 @@ + + + + Just a regular revision fixing the only three minor issues reported since last release. + + + GLM 0.9.3.2 (zip) + GLM 0.9.3.2 (7z) + Submit a bug report + GLM 0.9.3 Manual + GLM 0.9.3 API + + After years of using SourceForge.net, GLM is moving to GitHub, @@ -179,7 +194,7 @@ It also allows to download snapshots of every branches. - Browse GLM repository on GitHub + Browse GLM repository on GitHub GLM master branch snapshot GLM 0.9.3 branch snapshot GLM 0.9.4 branch snapshot diff --git a/readme.txt b/readme.txt index 5c7f91fa..f13ad9b3 100644 --- a/readme.txt +++ b/readme.txt @@ -36,6 +36,13 @@ 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.3.pdf +================================================================================ +GLM 0.9.3.2: 2012-03-15 +-------------------------------------------------------------------------------- +- Fixed doxygen documentation +- Fixed Clang version detection +- Fixed simd mat4 /= operator + ================================================================================ GLM 0.9.3.1: 2012-01-25 -------------------------------------------------------------------------------- From 4479150858af7f2a596c52a0ea94b43d81e420dc Mon Sep 17 00:00:00 2001 From: Meng Zhu Date: Sat, 24 Mar 2012 17:25:33 +0800 Subject: [PATCH 2/5] Fixed a bug in test/gtx_simd_mat4->test_mulD --- test/gtx/gtx_simd_mat4.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/gtx/gtx_simd_mat4.cpp b/test/gtx/gtx_simd_mat4.cpp index 44a6426a..fbfa6af4 100644 --- a/test/gtx/gtx_simd_mat4.cpp +++ b/test/gtx/gtx_simd_mat4.cpp @@ -181,7 +181,9 @@ void test_mulD(std::vector const & Data, std::vector & Out { _mm_prefetch((char*)&Data[i + 1], _MM_HINT_T0); glm::simdMat4 m(Data[i]); - glm::detail::sse_mul_ps((__m128 const * const)&m, (__m128 const * const)&m, (__m128*)&Out[i]); + glm::simdMat4 o; + glm::detail::sse_mul_ps((__m128 const * const)&m, (__m128 const * const)&m, (__m128*)&o); + Out[i] = *(glm::mat4*)&o; } std::clock_t TimeEnd = clock(); From fa84c6d1b099222aab8f89e286475af081e6dfe6 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 31 Mar 2012 11:19:20 +0100 Subject: [PATCH 3/5] Added length implementation --- glm/gtc/quaternion.inl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl index 3cb4a604..e24dc2c1 100644 --- a/glm/gtc/quaternion.inl +++ b/glm/gtc/quaternion.inl @@ -31,6 +31,12 @@ namespace glm{ namespace detail { + template + GLM_FUNC_QUALIFIER typename tquat::size_type tquat::length() const + { + return 4; + } + template GLM_FUNC_QUALIFIER tquat::tquat() : x(0), From 7373e7b8da7d54ac917139a4f3201260fea77543 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 1 Apr 2012 18:19:09 +0100 Subject: [PATCH 4/5] Promote eulerAngles to GTC quaternion extension --- glm/gtc/quaternion.hpp | 7 +++++++ glm/gtc/quaternion.inl | 9 +++++++++ glm/gtx/quaternion.hpp | 6 ------ glm/gtx/quaternion.inl | 9 --------- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp index 5b669c8b..037d16c7 100644 --- a/glm/gtc/quaternion.hpp +++ b/glm/gtc/quaternion.hpp @@ -204,6 +204,13 @@ namespace detail typename detail::tquat::value_type const & angle, detail::tvec3 const & v); + /// Returns euler angles, yitch as x, yaw as y, roll as z. + /// + /// @see gtc_quaternion + template + detail::tvec3 eulerAngles( + detail::tquat const & x); + /// Converts a quaternion to a 3 * 3 matrix. /// /// @see gtc_quaternion diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl index e24dc2c1..607a7209 100644 --- a/glm/gtc/quaternion.inl +++ b/glm/gtc/quaternion.inl @@ -500,6 +500,15 @@ namespace detail //return gtc::quaternion::cross(q, detail::tquat(cos(AngleRad * T(0.5)), Tmp.x * fSin, Tmp.y * fSin, Tmp.z * fSin)); } + template + GLM_FUNC_QUALIFIER detail::tvec3 eulerAngles + ( + detail::tquat const & x + ) + { + return detail::tvec3(pitch(x), yaw(x), roll(x)); + } + template GLM_FUNC_QUALIFIER detail::tmat3x3 mat3_cast ( diff --git a/glm/gtx/quaternion.hpp b/glm/gtx/quaternion.hpp index e5e3e404..78e6ffd3 100644 --- a/glm/gtx/quaternion.hpp +++ b/glm/gtx/quaternion.hpp @@ -176,12 +176,6 @@ namespace glm template valType yaw( detail::tquat const & x); - - //! Returns euler angles, yitch as x, yaw as y, roll as z. - //! From GLM_GTX_quaternion extension. - template - detail::tvec3 eulerAngles( - detail::tquat const & x); //! Converts a quaternion to a 3 * 3 matrix. //! From GLM_GTX_quaternion extension. diff --git a/glm/gtx/quaternion.inl b/glm/gtx/quaternion.inl index b8805a14..e2a4007d 100644 --- a/glm/gtx/quaternion.inl +++ b/glm/gtx/quaternion.inl @@ -234,15 +234,6 @@ namespace glm return glm::degrees(asin(valType(-2) * (q.x * q.z - q.w * q.y))); } - template - GLM_FUNC_QUALIFIER detail::tvec3 eulerAngles - ( - detail::tquat const & x - ) - { - return detail::tvec3(pitch(x), yaw(x), roll(x)); - } - template GLM_FUNC_QUALIFIER detail::tquat shortMix ( From 17563f9a28a898a2eb83589e7720cd891fc4efe8 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Fri, 6 Apr 2012 13:52:43 +0100 Subject: [PATCH 5/5] Fixed perspectiveFov --- glm/gtc/matrix_transform.inl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glm/gtc/matrix_transform.inl b/glm/gtc/matrix_transform.inl index f5dbe78b..0e4a4fa6 100644 --- a/glm/gtc/matrix_transform.inl +++ b/glm/gtc/matrix_transform.inl @@ -260,9 +260,9 @@ namespace glm detail::tmat4x4 Result(valType(0)); Result[0][0] = w; Result[1][1] = h; - Result[2][2] = (zFar + zNear) / (zFar - zNear); - Result[2][3] = -valType(1); - Result[3][2] = (valType(2) * zFar * zNear) / (zFar - zNear); + Result[2][2] = - (zFar + zNear) / (zFar - zNear); + Result[2][3] = - valType(1); + Result[3][2] = - (valType(2) * zFar * zNear) / (zFar - zNear); return Result; }