diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f606c0f..62592ca5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,11 +2,10 @@ cmake_minimum_required(VERSION 2.6 FATAL_ERROR) cmake_policy(VERSION 2.6) project(glm) -#Delayed for GLM 0.9.2 -#enable_testing() +enable_testing() add_definitions(-D_CRT_SECURE_NO_WARNINGS) -add_definitions(-pedantic) +#add_definitions(-pedantic) #add_definitions(-S) #add_definitions(-s) add_definitions(-msse2) diff --git a/doc/about.html b/doc/about.html new file mode 100644 index 00000000..892ba229 --- /dev/null +++ b/doc/about.html @@ -0,0 +1,35 @@ + + +OpenGL Mathematics: About

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
Source snapshot


G-Truc

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


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

+ GLM provides classes and functions designed and + implemented with the same naming conventions + and functionalities than GLSL so that + when a programmer knows GLSL, he knows GLM as well which makes it really easy to use. +

+ This project isn't limited by GLSL features. + An extension system, based on the GLSL extension conventions, + provides extended capabilities: matrix transformations, + quaternions, half-based types, random numbers, etc... +

+ This library works perfectly with OpenGL but it also ensures interoperability with other third party libraries and SDKs. It is a good candidate for software rendering (Raytracing / Rasterisation), image processing, physic simulations and any context that requires a simple and convenient mathematics library. +

+ The source code is under the MIT license. +

+ 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. +

GLM is written as a platform independent library with no dependence and officially supports the following compilers:
  • GCC 3.4 and higher
  • LLVM 2.3 through GCC 4.2 front-end and higher
  • Visual C++ 2005 and higher
  • Any C++ compiler following C++98 norm
_________________

_________________

Copyright © 2005 - 2011G-Truc Creation
\ No newline at end of file diff --git a/doc/code.html b/doc/code.html new file mode 100644 index 00000000..c424b184 --- /dev/null +++ b/doc/code.html @@ -0,0 +1,189 @@ + + +OpenGL Mathematics: Code

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
Source snapshot


G-Truc

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


Compute a triangle normal:
  • #include <glm/glm.hpp>
  • void computeNormal(triangle & Triangle) +
  • + { +
  • + glm::vec3 const & a = Triangle.Position[0]; +
  • + glm::vec3 const & b = Triangle.Position[1]; +
  • + glm::vec3 const & c = Triangle.Position[2]; +
  • + Triangle.Normal = glm::normalize(glm::cross(c - a, b - a)); +
  • + } +
Matrix transform:
  • // glm::vec3, glm::vec4, glm::ivec4, glm::mat4
  • #include <glm/glm.hpp>
  • // glm::perspective
  • #include <glm/gtc/matrix_projection.hpp>
  • // glm::translate, glm::rotate, glm::scale
  • #include <glm/gtc/matrix_transform.hpp>
  • // glm::value_ptr
  • #include <glm/gtc/type_ptr.hpp>
  • + { +
  • + glm::mat4 Projection = +
  • + glm::perspective(45.0f, 4.0f / 3.0f, 0.1f, 100.f); +
  • + glm::mat4 ViewTranslate = glm::translate( +
  • + glm::mat4(1.0f), +
  • + glm::vec3(0.0f, 0.0f, -Translate)); +
  • + glm::mat4 ViewRotateX = glm::rotate( +
  • + ViewTranslate, +
  • + Rotate.y, glm::vec3(-1.0f, 0.0f, 0.0f)); +
  • + glm::mat4 View = glm::rotate( +
  • + ViewRotateX, +
  • + Rotate.x, glm::vec3(0.0f, 1.0f, 0.0f)); +
  • + glm::mat4 Model = glm::scale( +
  • + glm::mat4(1.0f), +
  • + glm::vec3(0.5f)); +
  • + glm::mat4 MVP = Projection * View * Model; +
  • + glUniformMatrix4fv( +
  • + LocationMVP, 1, GL_FALSE, glm::value_ptr(MVP)); +
  • + } +
Vector types:
  • #include <glm/glm.hpp>
  • #include <glm/gtx/type_precision.hpp>
  • + std::size_t const VertexCount = 4; +
  • // Float quad geometry
  • + std::size_t const PositionSizeF32 = VertexCount * sizeof(glm::vec2); +
  • + glm::vec2 const PositionDataF32[VertexCount] = +
  • + { +
  • + glm::vec2(-1.0f,-1.0f), +
  • + glm::vec2( 1.0f,-1.0f), +
  • + glm::vec2( 1.0f, 1.0f), +
  • + glm::vec2(-1.0f, 1.0f) +
  • + }; +
  • // Half-float quad geometry
  • + std::size_t const PositionSizeF16 = VertexCount * sizeof(glm::hvec2); +
  • + glm::hvec2 const PositionDataF16[VertexCount] = +
  • + { +
  • + glm::hvec2(-1.0f, -1.0f), +
  • + glm::hvec2( 1.0f, -1.0f), +
  • + glm::hvec2( 1.0f, 1.0f), +
  • + glm::hvec2(-1.0f, 1.0f) +
  • + }; +
  • // 8 bits signed integer quad geometry
  • + std::size_t const PositionSizeI8 = VertexCount * sizeof(glm::i8vec2); +
  • + glm::i8vec2 const PositionDataI8[VertexCount] = +
  • + { +
  • + glm::i8vec2(-1,-1), +
  • + glm::i8vec2( 1,-1), +
  • + glm::i8vec2( 1, 1), +
  • + glm::i8vec2(-1, 1) +
  • + }; +
  • // 32 bits signed integer quad geometry
  • + std::size_t const PositionSizeI32 = VertexCount * sizeof(glm::i32vec2); +
  • + glm::i32vec2 const PositionDataI32[VertexCount] = +
  • + { +
  • + glm::i32vec2 (-1,-1), +
  • + glm::i32vec2 ( 1,-1), +
  • + glm::i32vec2 ( 1, 1), +
  • + glm::i32vec2 (-1, 1) +
  • + }; +
Lighting:
  • #include <glm/glm.hpp>
  • #include <glm/gtx/random.hpp>
  • + glm::vec3 lighting +
  • + ( +
  • + intersection const & Intersection, +
  • + material const & Material, +
  • + light const & Light, +
  • + glm::vec3 const & View +
  • + ) +
  • + { +
  • + glm::vec3 Color = glm::vec3(0.0f); +
  • + glm::vec3 LightVertor = glm::normalize( +
  • + Light.position() - Intersection.globalPosition() + +
  • + glm::vecRand3(0.0f, Light.inaccuracy()); +
  • if(!shadow( +
  • + Intersection.globalPosition(), +
  • + Light.position(), +
  • + LightVertor)) +
  • + { +
  • float Diffuse = glm::dot(Intersection.normal(), LightVector); +
  • if(Diffuse <= 0.0f) +
  • return Color; +
  • if(Material.isDiffuse()) +
  • + Color += Light.color() * Material.diffuse() * Diffuse; +
  • if(Material.isSpecular()) +
  • + { +
  • + glm::vec3 Reflect = glm::reflect( +
  • + glm::normalize(-LightVector), +
  • + glm::normalize(Intersection.normal())); +
  • float Dot = glm::dot(Reflect, View); +
  • float Base = Dot > 0.0f ? Dot : 0.0f; +
  • float Specular = glm::pow(Base, Material.exponent()); +
  • + Color += Material.specular() * Specular; +
  • + } +
  • + } +
Copyright © 2005 - 2011G-Truc Creation
\ No newline at end of file diff --git a/doc/download.html b/doc/download.html new file mode 100644 index 00000000..64430223 --- /dev/null +++ b/doc/download.html @@ -0,0 +1,133 @@ + + +OpenGL Mathematics: Downloads

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
Source snapshot


G-Truc

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


Current release
17/03/2010: + GLM 0.9.1.1 + (3.4 MB) +
_________________

GLM - zip files
17/03/2010: GLM 0.9.1.1 (3.4 MB) +
03/03/2010: GLM 0.9.1.0 (3.4 MB) +
13/02/2010: GLM 0.9.1.B (3.4 MB) +
13/02/2010: GLM 0.9.0.8 (3.3 MB) +
31/01/2010: GLM 0.9.1.A (3.0 MB) +
30/01/2010: GLM 0.9.0.7 (1.4 MB) +
21/12/2010: GLM 0.9.0.6 (2.2 MB) +
01/11/2010: GLM 0.9.0.5 (2.2 MB) +
04/10/2010: GLM 0.9.0.4 (1.5 MB) +
26/08/2010: GLM 0.9.0.3 (1.5 MB) +
08/07/2010: GLM 0.9.0.2 (809 KB) +
21/06/2010: GLM 0.9.0.1 (727 KB) +
25/05/2010: GLM 0.9.0.0 (1.0 MB) +
30/04/2010: GLM 0.9.B.2 (1.1 MB) +
03/04/2010: GLM 0.9.B.1 (964 KB) +
20/02/2010: GLM 0.9.A.2 (1.3 KB) +
09/02/2010: GLM 0.9.A.1 (952 KB) +
25/01/2010: GLM 0.8.4.4 (1.1 MB) +
14/11/2009: GLM 0.8.4.3 (1.1 MB) +
19/10/2009: GLM 0.8.4.2 (1.1 MB) +
03/10/2009: GLM 0.8.4.1 (1.1 MB) +
16/09/2009: GLM 0.8.4.0 (1.1 MB) +
11/08/2009: GLM 0.8.3.5 (971 KB) +
10/08/2009: GLM 0.8.3.4 (971 KB) +
25/06/2009: GLM 0.8.3.3 (971 KB) +
04/06/2009: GLM 0.8.3.2 (971 KB) +
21/05/2009: GLM 0.8.3.1 (945 KB) +
06/05/2009: GLM 0.8.3.0 (896 KB) +
01/04/2009: GLM 0.8.2.3 (961 KB) +
24/02/2009: GLM 0.8.2.2 (961 KB) +
13/02/2009: GLM 0.8.2.1 (963 KB) +
21/01/2009: GLM 0.8.2.0 (963 KB) +
30/10/2008: GLM 0.8.1.0 (938 KB) +
23/10/2008: GLM 0.8.0.0 (936 KB) +
08/08/2008: GLM 0.7.6.0 (907 KB) +
05/07/2008: GLM 0.7.5.0 (852 KB) +
06/01/2008: GLM 0.7.4.0 (859 KB) +
05/24/2008: GLM 0.7.3.0 (1.8 MB) +
04/27/2008: GLM 0.7.2.0 (1.8 MB) +
03/24/2008: GLM 0.7.1.0 (1.8 MB) +
03/22/2008: GLM 0.7.0.0 (1.8 MB) +
12/10/2007: GLM 0.6.4.0 (1.8 MB) +
11/05/2007: GLM 0.6.3.0 (1.8 MB) +
10/08/2007: GLM 0.6.2.0 (1.8 MB) +
10/07/2007: GLM 0.6.1.0 (1.8 MB) +
09/16/2007: GLM 0.6.0.0 (1.8 MB) +
02/19/2007: GLM 0.5.1.0 (2.3 MB) +
01/06/2007: GLM 0.5.0.0 (2.4 MB) +
05/22/2006: GLM 0.4.1.0 (1.6 MB) +
05/17/2006: GLM 0.4.0.0 (905 KB) +
04/22/2006: GLM 0.3.2.0 (955 KB) +
03/28/2006: GLM 0.3.1.0 (963 KB) +
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
17/03/2011: GLM 0.9.1.1 (2.1 MB) +
03/03/2011: GLM 0.9.1.0 (2.1 MB) +
13/02/2011: GLM 0.9.1.B (2.1 MB) +
13/02/2011: GLM 0.9.0.8 (1.9 MB) +
31/01/2011: GLM 0.9.1.A (2.0 MB) +
30/01/2011: GLM 0.9.0.7 (832 KB) +
21/12/2010: GLM 0.9.0.6 (1.6 MB) +
01/11/2010: GLM 0.9.0.5 (1.6 MB) +
04/10/2010: GLM 0.9.0.4 (1.5 MB) +
26/08/2010: GLM 0.9.0.3 (684 KB) +
08/07/2010: GLM 0.9.0.2 (651 KB) +
21/06/2010: GLM 0.9.0.1 (569 KB) +
25/05/2010: GLM 0.9.0.0 (514 KB) +
30/04/2010: GLM 0.9.B.2 (555 KB) +
03/04/2010: GLM 0.9.B.1 (414 KB) +
20/02/2010: GLM 0.9.A.2 (726 KB) +
09/02/2010: GLM 0.9.A.1 (391 KB) +
25/01/2010: GLM 0.8.4.4 (479 KB) +
14/11/2009: GLM 0.8.4.3 (443 KB) +
19/10/2009: GLM 0.8.4.2 (443 KB) +
03/10/2009: GLM 0.8.4.1 (443 KB) +
16/09/2009: GLM 0.8.4.0 (439 KB) +
11/08/2009: GLM 0.8.3.5 (405 KB) +
10/08/2009: GLM 0.8.3.4 (405 KB) +
25/06/2009: GLM 0.8.3.3 (405 KB) +
04/06/2009: GLM 0.8.3.2 (405 KB) +
21/05/2009: GLM 0.8.3.1 (399 KB) +
06/05/2009: GLM 0.8.3.0 (359 KB) +
01/04/2009: GLM 0.8.2.3 (378 KB) +
24/02/2009: GLM 0.8.2.2 (378 KB) +
13/02/2009: GLM 0.8.2.1 (381 KB) +
21/01/2009: GLM 0.8.2.0 (381 KB) +
30/10/2008: GLM 0.8.1.0 (372 KB) +
23/10/2008: GLM 0.8.0.0 (370 KB) +
08/08/2008: GLM 0.7.6.0 (387 KB) +
05/07/2008: GLM 0.7.5.0 (366 KB) +
06/01/2008: GLM 0.7.4.0 (372 KB) +
05/24/2008: GLM 0.7.3.0 (657 KB) +
04/27/2008: GLM 0.7.2.0 (646 KB) +
03/24/2008: GLM 0.7.1.0 (635 KB) +
03/22/2008: GLM 0.7.0.0 (635 KB) +
12/10/2007: GLM 0.6.4.0 (612 KB) +
11/05/2007: GLM 0.6.3.0 (633 KB) +
10/08/2007: GLM 0.6.2.0 (645 KB) +
10/07/2007: GLM 0.6.1.0 (645 KB) +
09/16/2007: GLM 0.6.0.0 (646 KB) +
02/19/2007: GLM 0.5.1.0 (807 KB) +
01/06/2007: GLM 0.5.0.0 (862 KB) +
05/22/2006: GLM 0.4.1.0 (533 KB) +
05/17/2006: GLM 0.4.0.0 (262 KB) +
_________________

Raytrace
16-09-2007: Raytrace v1.0 (exe) (766 KB) +
16-09-2007: Raytrace v1.0 (zip) (1.4 MB) +
06-01-2007: Raytrace b3.0 (exe) (751 KB) +
06-01-2007: Raytrace b3.0 (zip) (1.1 MB) +
19-02-2006: Raytrace b2.0 (exe) (1.0 MB) +
19-02-2006: Raytrace b2.0 (zip) (1.4 MB) +
05-05-2005: Raytrace b1.0 (zip) (1.3 MB) +
05-05-2005: Raytrace b1.0 (7z ) (808 KB) +
_________________

Humus's Framework
22-10-2008: AmbientApertureLighting (zip) (2.38 MB) +
_________________

Philip Rideout's Catmull-Clark Subdivision
24-01-2007: CatmullClark (zip) (605 KB) +
_________________

_________________

Copyright © 2005 - 2011G-Truc Creation
\ No newline at end of file diff --git a/doc/glm-0.9.1.pdf b/doc/glm-0.9.1.pdf new file mode 100644 index 00000000..88231829 Binary files /dev/null and b/doc/glm-0.9.1.pdf differ diff --git a/doc/goodies.html b/doc/goodies.html new file mode 100644 index 00000000..02ce9e5e --- /dev/null +++ b/doc/goodies.html @@ -0,0 +1,15 @@ + + +OpenGL Mathematics: Goodies

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
Source snapshot


G-Truc

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


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 - 2011G-Truc Creation
\ No newline at end of file diff --git a/doc/index.html b/doc/index.html new file mode 100644 index 00000000..61ac13eb --- /dev/null +++ b/doc/index.html @@ -0,0 +1,298 @@ + + +OpenGL Mathematics

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
Source snapshot


G-Truc

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


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

+ GLM provides classes and functions designed and + implemented with the same naming conventions + and functionalities than GLSL so that + when a programmer knows GLSL, he knows GLM as well which makes it really easy to use. +

+ This project isn't limited by GLSL features. + An extension system, based on the GLSL extension conventions, + provides extended capabilities: matrix transformations, + quaternions, half-based types, random numbers, etc... +

+ This library works perfectly with OpenGL but it also ensures interoperability with other third party libraries and SDKs. It is a good candidate for software rendering (Raytracing / Rasterisation), image processing, physic simulations and any context that requires a simple and convenient mathematics library. +

GLM is written as a platform independent library with no dependence and officially supports the following compilers:
  • GCC 3.4 and higher
  • LLVM 2.3 through GCC 4.2 front-end and higher
  • Visual C++ 2005 and higher
  • Any C++ compiler following C++98 norm

+ The source code is under the MIT license. +

+ 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. +


17/03/2011 - GLM 0.9.1.1 released

+ GLM 0.9.1.1 fixes some bugs, warnings on Clang C++ and clean up a bit the code. +

+ If you have uncounter any issue with GLM 0.9.1.0, please download this revision. +

+ Finally, the work has started for GLM 0.9.2 so if you have requests don't forget to submit them!

Download: GLM 0.9.1.1 (zip)
Download: GLM 0.9.1.1 (7z)
Link: Submit a bug report

03/03/2011 - GLM 0.9.1.0 final released

+ Finally, GLM 0.9.1 branch is reaching the status of stable with + GLM 0.9.1.0. +

+ From GLM 0.9.1 beta, mainly bugs has been fixed. GLM has evolved on many sides since GLM 0.9.0: + Improved documentation (manual and doxygen), better test framework, simplified setup/options/configration of GLM and new experimental SIMD API. +

+ GLM 0.9.1.0 is not 100% backward compatile with + GLM 0.9.0.8 + but mainly advanced usages should be affected by the differencies. + Have a look at the GLM manual for more information on how to use GLM 0.9.1. +

Download: GLM 0.9.1.0 (zip)
Download: GLM 0.9.1.0 (7z)
Link: GLM 0.9.1 manual
Link: Submit a bug report

13/02/2011 - GLM 0.9.0.8 and GLM 0.9.1 beta released

+ The stable version, GLM 0.9.0.8, adds the operator * for quaternion products and deprecated the cross function previously used for the same purpose. + Also, it clarifies that GLM is a header only library when a user try to build it. Once more, there is nothing to build. +

+ The development version, GLM 0.9.1 beta, provides an improved API documentation by + Alfonse Reinheart, + author of a great OpenGL tutorial which uses GLM. + This version also improves the SIMD extensions and it fixes many bugs. +

Download: GLM 0.9.1.B (zip)
Download: GLM 0.9.1.B (7z)
Link: GLM 0.9.1 manual
Download: GLM 0.9.0.8 (zip)
Download: GLM 0.9.0.8 (7z)
Link: GLM 0.9.0 manual
Link: Submit a bug report

31/01/2011 - GLM 0.9.1 alpha released

+ This new version of GLM is bringing a lot of improvements and maybe too many considering the development time it has required: + API exposing SIMD implementation but also some new, safe and feature complet swizzling functions and a new setup API. + All this is described in the largely updated GLM manual. +

+ With the new setup system, GLM detects automatically the compiler settings to adapt its implementation to the flag set at build time. + It will automatically enable C++0x features, SSE optimizations and the display configuration informations at build-time. + The automatic setup can be overdrive by the GLM user. +

+ The SIMD API maintly focus on vec4 and mat4 implementations that are embodied by the types simdVec4 and simdMat4. + The implemention cover most of the common functions, the geometry functions and the matrix functions as described in the GLSL specifications. + Because it is hight inefficient to access individual components of a SIMD register, the simdVec4 doesn't allow it. + To reflect this constraint, the simdVec4 has to be converted to vec4 first which would be effectively handle + by the compiler thank to the function simdCast. + Furthermore, GLM provides some specials functions like simdDot4 that returns a simdVec4 instead of a float + with the duplicated dot product value in each components + and ensure that no unnecessary component manipulations are performed (typically __m128 to float + and float to __m128). + This implementation can probably be improve in many ways so don't hesitate to send me some feedbacks. +

+ GLM 0.9.1 is not 100% backward compatible with GLM 0.9.0 but mostly advanced usages should be concerned by this compatibility issues. +


30/01/2011 - GLM 0.9.0.7 released

+ GLM 0.9.0.7 provides 2 main changes: GLSL 4.10 packing functions but also == and != operators for every types. +

Download: GLM 0.9.0.7 (zip, 1.4 MB)
Download: GLM 0.9.0.7 (7z, 832 KB)
Link: Submit a bug report

21/12/2010 - GLM 0.9.0.6 released

+ GLM 0.9.0.6 is a new update of GLM built over GLM's user bug reports. + It mainly fixes issues regarding non-squared matrices but also provides multiple extensions corrections as well. +

+ I expect to release GLM 0.9.1.0 in Junuary but I might continue to update GLM 0.9.0.X as there are minor incompatibilities. +

Download: GLM 0.9.0.6 (zip, 2.2 MB)
Download: GLM 0.9.0.6 (7z, 1.6 MB)
Link: Submit a bug report

01/11/2010 - GLM 0.9.0.5 released

+ GLM 0.9.0.5 fixes the usual set of bugs, some allowing a better Clang support. +

Download: GLM 0.9.0.5 (zip, 2.2 MB)
Download: GLM 0.9.0.5 (7z, 1.6 MB)
Link: Submit a bug report

04/10/2010 - GLM 0.9.0.4 released

+ GLM 0.9.0.4 revision mainly fixes bugs. + It also contains a contribution by Arnaud Masserann, a autoexp.dat file to make GLM looks nicer in Visual Studio debugger. + To take advantage of this file, edit ${VISUALSTUDIO_DIRECTORY}/common7/packages/debugger/autoexp.dat file and add the content of the file util/autoexp.txt + included in GLM 0.9.0.4. +

Download: GLM 0.9.0.4 (zip, 1.5 MB)
Download: GLM 0.9.0.4 (7z, 1.2 MB)
Link: Submit a bug report

26/08/2010 - GLM 0.9.0.3 released

+ GLM 0.9.0.3 fixes major issues on non-squared matrices. +

Download: GLM 0.9.0.3 (zip, 1.2 MB)
Download: GLM 0.9.0.3 (7z, 684 KB)
Link: Submit a bug report

08/07/2010 - GLM 0.9.0.2 released

+ Second update of GLM 0.9.0 with more bug fixes. + It also contains a new extension called GLM_GTX_int_10_10_10_2 to use GLM with OpenGL and + GL_ARB_vertex_type_2_10_10_10_rev. +

Download: GLM 0.9.0.2 (zip, 809 KB)
Download: GLM 0.9.0.2 (7z, 651 KB)
Link: Submit a bug report

21/06/2010 - GLM 0.9.0.1 released

+ This revision only fixes few extensions bugs. +

Download: GLM 0.9.0.1 (zip, 714 KB)
Download: GLM 0.9.0.1 (7z, 556 KB)
Link: Submit a bug report

25/05/2010 - GLM 0.9.0.0 released

+ GLM 0.9.0.0 is finally available! It brings various API changes from GLM 0.8.4.X branch which makes it not backward compatible. + GLM is now compatible with Objective C++ to be used for MacOS X and iPhone projects. +

+ To continue making GLM a better library, 2 mailing lists have been created for users and developers. +

Download: GLM 0.9.0.0 (zip, 1.0 MB)
Download: GLM 0.9.0.0 (7z, 514 KB)
Mailing list: Register to GLM mailing list for users
Mailing list: Register to GLM mailing list for developers
Link: Submit a bug report

30/04/2010 - GLM 0.9 Beta 2 released

+ GLM 0.9 Beta 2 is available and should be the last development release of GLM 0.9. +

+ The code has been moved from a SVN to Git repository which branching efficiency allowed to remove all the experimental code from this release. +

+ Various bug fixes and manual updates have been done too. +

Download: GLM 0.9.B.2 (zip, 1.07 MB)
Download: GLM 0.9.B.2 (7z, 555 KB)

03/04/2010 - GLM 0.9 Beta 1 released

+ A new development version of GLM 0.9 is available. +

+ This version is based on GLSL 4.0 and supports the new common and integer functions. + Also a long and frequently asked feature has been implemented: inplicit conversions. + However, the rules defining implicit conversions by GLSL 4.0 are quite weaked and can't really be apply in C++. +

+ Reaching the beta status, this new features close the feature list of GLM 0.9. + Further development releases may happen before the final release. +

Download: GLM 0.9.B.1 (zip, 964 KB)
Download: GLM 0.9.B.1 (7z, 414 KB)

20/02/2010 - GLM 0.9 Alpha 2 released

+ This update fixes some problem of Alpha 1 but also brings some improvements in case of errors when using GLM to provide more relevant messages. +

Download: GLM 0.9.A.2 (zip, 1.3 MB)
Download: GLM 0.9.A.2 (7z, 726 KB)

09/02/2010 - GLM 0.9 Alpha 1 released

+ First step until a major release for GLM with this first alpha of GLM 0.9. +

+ This version brings a large internal redesign to improve the library reliability and optimized some parts. + It removed the deprecated features and API which implies that GLM 0.9 isn't backward compatible. +

+ For most users the build issues when upgrading to GLM 0.9 should be reduced especially if they follow the deprecation policy. +

+ This release is still UNSTABLE and not recommanded for commertial products. +

Download: GLM 0.9.A.1 (zip, 950 KB)
Download: GLM 0.9.A.1 (7z, 391 KB)
Link: Full changelog

25/01/2010 - GLM 0.8.4.4 released

+ This update just removes some warnings +

+ By the way, if you have questions about GLM, a good place for those is the OpenGL.org Toolkits forum. +

Download: GLM 0.8.4.4 (zip, 1.1 MB)
Download: GLM 0.8.4.4 (7z, 479 KB)
Link: Full changelog

16/11/2009 - GLM 0.8.4.3 released

+ This version fixed half scalars and half vectors arithmetics. + This is a really slow practice that should be avoid. + Half floating point value should be use only to store GPU data. + GPUs have native support for half values, not x86 CPUs. +

Download: GLM 0.8.4.3 (zip, 1.1 MB)
Download: GLM 0.8.4.3 (7z, 463 KB)
Link: Full changelog

19/10/2009 - GLM 0.8.4.2 released

+ This version is a really minor updates, fixing single issue with half float types. +

Download: GLM 0.8.4.2 (zip, 1.1 MB)
Download: GLM 0.8.4.2 (7z, 443 KB)
Link: Full changelog

05/10/2009 - GLM 0.8.4.1 released

+ This version fixes few bugs and provides an major update of the manual thanks to Damian Trebilco. +

Download: GLM 0.8.4.1 (zip, 1.1 MB)
Download: GLM 0.8.4.1 (7z, 443 KB)
Link: Full changelog

16/09/2009 - GLM 0.8.4.0 released

+ This new version mainly adds support for Visual Studio 2010 and GCC 4.4. It also provides various code optimization, bug fixes and an extension. +

Download: GLM 0.8.4.0 (zip, 1.1 MB)
Download: GLM 0.8.4.0 (7z, 439 KB)
Link: Full changelog

11/08/2009 - GLM 0.8.3.5 released

+ Fixed extension bugs introduced by core update. +

Download: GLM 0.8.3.5 (zip, 971 KB)
Download: GLM 0.8.3.5 (7z, 405 KB)
Link: Full changelog

10/08/2009 - GLM 0.8.3.4 released

+ Fixed varius bugs. Move determinant fonction to core following GLSL 1.5 specification. +

Download: GLM 0.8.3.4 (zip, 971 KB)
Download: GLM 0.8.3.4 (7z, 405 KB)
Link: Full changelog

25/06/2009 - GLM 0.8.3.3 released

+ Fixed varius bugs. +

Download: GLM 0.8.3.3 (zip, 971 KB)
Download: GLM 0.8.3.3 (7z, 405 KB)
Link: Full changelog

04/06/2009 - GLM 0.8.3.2 released

+ Add GLM_GTC_quaternion and GLM_GTC_type_precision extensions both subset of GLM_GTX_quaternion and GLM_GTX_number_precision +

Download: GLM 0.8.3.2 (zip, 971 KB)
Download: GLM 0.8.3.2 (7z, 405 KB)
Link: Full changelog

21/05/2009 - GLM 0.8.3.1 released

+ The old way to use extensions have been fixed and GLM_GTX_bit extension gets updated with more functions to manipulate bit fields. +

Download: GLM 0.8.3.1 (zip, 954 KB)
Download: GLM 0.8.3.1 (7z, 402 KB)
Link: Full changelog

06/05/2009 - GLM 0.8.3.0 released

+ This version brings to main changed: Stable extensions and a new extension system. +

+ The first stable GLM extensions are: GLM_GTC_double_float and GLM_GTC_half_float for higher and lower vectors and matrices floating point precision. GLM_GTC_matrix_operation provides determinant and inverse matrix calculation. GLM_GTC_matrix_transform allows to build scale, rotate and translate matrices and GLM_GTC_matrix_projection provides varius functions to build projection matrices. Few stable extensions yet but the number is going to grow with the next release! +

+ Both GLM 0.8.2.x extensions use method are deprecated (but still working) and replace by a new one. If you wnat to use GLM_GTC_half_float just include "glm/gtc/half_float.hpp" and it is going to be included in GLM namespace. +

+ Finally, quite some file have been renamed, using "hpp" instead of ".h". Old file have been deprecated but are still available so that GLM 0.8.3.0 is fully compatible with GLM 0.8.2.x. +

Download: GLM 0.8.3.0 (zip, 896 KB)
Download: GLM 0.8.3.0 (7z, 359 KB)
Link: Code samples page
Link: Manual
Link: Full changelog

01/04/2009 - GLM 0.8.2.3 released


13/02/2009 - GLM 0.8.2.1 released

+ A new release is available and inogurate a patch number. The goal of this patch number is to release faster fixes from bug reports. +

Download: GLM 0.8.2.1 (zip, 963 KB)
Download: GLM 0.8.2.1 (7z, 381 KB)
Link: Manual
Link: Full changelog

21/01/2009 - GLM 0.8.2 released

+ This release only fixes bugs. Left sided swizzle operators, quaternion operators, vectors access operators for the main onces. +

Download: GLM 0.8.2 (zip, 963 KB)
Download: GLM 0.8.2 (7z, 381 KB)
Link: Manual
Link: Full changelog

19/11/2008 - GLM current developments

+ Some artifacts have been added to the tracker to give a picture of what you could expect for the next releases. +

+ If you need something else you can add some artifacts to the tracker. Any comment on added entries is welcome. +

+ Furthermore, no more release of GLM 0.7.x will be done. Please upgrade to GLM 0.8.1. +

+ Finally, a pack of programmable oriented OpenGL samples using GLM is under development and planed to be release in December. +

Link: Tracker

30/10/2008 - GLM 0.8.1 released

+ GLM 0.8.1 is released. This new version mainly fixes 64 bit integers with GCC and various bugs. +

Download: GLM 0.8.1 (zip, 938 KB)
Download: GLM 0.8.1 (7z, 372 KB)
Link: GLM 0.8.1 Manual
Link: Full changelog

23/10/2008 - GLM 0.8.0 final released

+ GLM 0.8.0 is released. This new version is now based on GLSL 1.30 specification which provided new functions and precision qualifiers. +

+ Beyond this, lot of changes have been done to make GLM easier to use, easier to develop, more reliable, more conform to C++ ISO98 standard and GLSL specifications. +

+ It involves that GLM 0.8.x is not backward compatible with GLM 0.7.x... However, an application port from GLM 0.7.x to GLM 0.8.x isn't a huge work and actually for some, it won’t be work at all. +

+ On GLM core side, based on GLSL features, vector types can't be automatically cast to pointer anymore for code safety purposes. Vector constructors require a single scalar parameter of the exact number of components. +

+ On GLM extension side, the mechanism to use them has changed. The old [__]***GTX way doesn't exist anymore. Have a look on the manual for more information. +

+ Have a look on the manual and the changelog for more information. Don't forget to send your feedback and enjoy! +

Download: GLM 0.8.0 (zip, 936 KB)
Download: GLM 0.8.0 (7z, 370 KB)
Link: GLM 0.8.0 Manual
Link: Full changelog
Link: Post a comment

22/10/2008 - A Humus demo to feature GLM 0.8.0

+ Ambient aperture lighting Humus demo have been updated to use GLM as math library. +

Download: Updated demo + all sources (zip, 2.38 MB)
Download: Original demo (zip, 1.40 MB)
Link: Post a comment

18/10/2008 - Webside updated

+ As you can see the website get a little update to prepare GLM 0.8.0 final release. +

+ GLM 0.8.0 final should be release during the week. +


10/10/2008 - GLM 0.8.0 beta 3 released

+ This release fixes some bugs and add few features though extensions. The development is now based on CMake to make easier cross platform tests and project management. +

Download: GLM 0.8.0 Beta 3 (zip, 819 KB)
Download: GLM 0.8.0 Beta 3 (7z, 345 KB)
Link: Full changelog
Link: Post a comment

04/10/2008 - GLM 0.8.0 beta 2 released

+ This release mainly improves half float vectors support. By default the low precission vectors are based on float numbers not on half numbers +

+ It also provides new setup options. GLM_USE_ONLY_XYZW to disable multiple names to access to a single vector component. GLM_USE_ANONYMOUS_UNION to allow multiple component names on half vectors with Visual C++. +

+ Various bugs and updates of extensions have been done too. Final release is coming... +

Download: GLM 0.8.0 Beta 2 (zip, 798 KB)
Download: GLM 0.8.0 Beta 2 (7z, 327 KB)
Link: Full changelog
Link: Post a comment

26/09/2008 - GLM 0.8.0 beta 1 released

+ GLM have been updated to support GLSL 1.30. API documentation had significant improvements to make easier finding of GLSL functions and types. +

+ GLM 0.8.x is NOT backward compatible with GLM 0.7.x. Upgrade to GLM 0.8.x could involve build errors for the following cases: A lot of improvements have been made to increase the conformance with GLSL specification. Lot of GLSL 1.30 features were already exposed in extensions that have been deleted. The extension syntaxe based on ARB convension is no long used. +

+ Due to the number of changes GLM 0.8.0 is release as beta first. The final release is schedule for october. +

Download: GLM 0.8.0 Beta 1 (zip, 786 KB)
Download: GLM 0.8.0 Beta 1 (7z, 321 KB)
Link: Full changelog
Link: Post a comment

08/08/2008 - GLM 0.7.6 released

+ GLM 0.7.6 provides a better C++ conformance so that you can build GLM with –pedantic G++ parameter or without Visual Studio extensions. To make GLM more reliable, BOOST_STATIC_ASSERT are used according developer wishes. +

Download: GLM 0.7.6 (zip, 907 KB)
Download: GLM 0.7.6 (7z, 387 KB)
Link: Full changelog
Link: Manual

05/07/2008 - GLM 0.7.5 released

+ GLM 0.7.5 is available and introduces a new build messsage system to get information of GLM build configuration with Visual Studio. This mechanism is documented in section 6 of GLM manual. Also, GLM can be built with GCC pedantic options. +

Download: GLM 0.7.5 (zip, 852 KB)
Download: GLM 0.7.5 (7z, 366 KB)
Link: Full changelog
Link: Manual

01/06/2008 - GLM 0.7.4 released

+ GLM 0.7.4 introduces a new system to manage external dependencies. +

+ It allows developing extension using external dependencies like GLEW, Boost, etc. without making required those dependencies for GLM programmer that doesn't need those external dependent extensions. +

+ The mechanism is described into the updated manual. +

Download: GLM 0.7.4 (zip, 859 KB)
Download: GLM 0.7.4 (7z, 372 KB)
Link: Full changelog
Link: Manual

24/05/2008 - GLM 0.7.3 released

+ GLM 0.7.3 is released. This version fixes few bugs and add few extensions +

Download: GLM 0.7.3 (zip, 1.8 MB)
Download: GLM 0.7.3 (7z, 635 KB)
Link: Full changelog

27/04/2008 - GLM 0.7.2 released

+ GLM 0.7.2 is released. The documentation have been completed again and several issues handle with precompiler options. +

+ #define GLM_SWIZZLE GLM_SWIZZLE_FUNC allows to use swizzle operators with internal functions. For example, glm::vec3(1, 2, 3).zyx is replaced by glm::vec3(1, 2, 3)._zyx() with this option. +

+ #define GLM_FORCE_NO_HALF allows to include all extensions (#include "glm/glmext.h") without any support of half-precision floating-point numbers. +

+ #define GLM_AUTO_CAST GLM_DISABLE allows to disable automatic cast (eg: glLoadMatrixf(glm::mat4(1.0))) which could involve unfortunate issues in some cases. +

+ More information on these topic are available in GLM manual section 5 "Known issues". +

Download: GLM 0.7.2 (zip, 1.8 MB)
Download: GLM 0.7.2 (7z, 635 KB)
Download: Full changelog

24/03/2008 - GLM 0.7.1 released

+ GLM 0.7.1 is available under MIT license. It fixes bugs with GCC. +

Download: GLM 0.7.1 (zip, 1.8 MB)
Download: GLM 0.7.1 (7z, 635 KB)
Download: Full changelog

22/03/2008 - GLM 0.7.0 released

+ GLM 0.7.0 is available under MIT license. LGPL lisence have been discard due to an issue of use for console development. This release contains a lot better documentation based on Doxygen. Lot of bugs have been fixed and the documentation completed. Thanks to all people that has contributed thought bug reports and ideas to make this version a lot better! +

Download: GLM 0.7.0 (zip, 1.8 MB)
Download: GLM 0.7.0 (7z, 635 KB)
Download: Full changelog

10/12/2007 - GLM 0.6.4 released

+ GLM 0.6.4 is available and fixes some swizzle operator issues. +

Download: GLM 0.6.4 (zip, 1.7 MB)
Download: GLM 0.6.4 (7z, 612 KB)
Download: Full changelog

05/11/2007 - GLM 0.6.3 released

+ GLM 0.6.3 fixes accesses of matrices and a 3DSMax SDK conflict. +

Download: GLM 0.6.3 (zip, 1.8 MB)
Download: GLM 0.6.3 (7z, 633 KB)
Download: Full changelog

08/10/2007 - GLM 0.6.2 released

+ GLM 0.6.2 fixes an error on an extension. +

Download: GLM 0.6.2 (zip, 1.8 MB)
Download: GLM 0.6.2 (7z, 632 KB)
Download: Full changelog

07/10/2007 - GLM 0.6.1 released

+ GLM 0.6.1 is a minor update that fix an issue on extension namespace and add two more extensions. +

Download: GLM 0.6.1 (zip, 1.8 MB)
Download: GLM 0.6.1 (7z, 632 KB)
Download: Full changelog

16/09/2007 - GLM 0.6.0 released

+ GLM 0.6.0 is available. For this release, work focus on extensions. A new mecanisum allows to integrate GLM extensions as it is actually done for GLSL extension by vendors. Lot of new extensions have been added. +

Download: GLM 0.6.0 (zip, 1.8 MB)
Download: GLM 0.6.0 (7z, 666 KB)
Download: Raytracer v1.0 (exe)
Download: Raytracer v1.0 (zip)
Download: Full changelog

19/02/2007 - GLM 0.5.1 released

+ This release fixes some issues with swizzle operators. +

Download: GLM 0.5.1 (zip, 2.3 MB)
Download: GLM 0.5.1 (7z, 789 KB)

26/01/2007 - Cattmull Clark subdivision sample

+ A new sample is available. It's an update of Philip Rideout's Catmull Clark subdivision program that uses GLM. Released with pleasant permission of Philip Rideout. +

Download: CatmullClark sample (zip, 605 KB)

06/01/2007 - GLM 0.5.0 released

+ This release include GLSL 1.2 new feature in the core implementation. Also, it includes swizzle read and write operators and a custom options system to setup GLM. +

+ It includes some new extensions to extend GLSL features but they remain experimental. The next release should provide the first stable extensions. +

+ The GLM 0.5.0 packages contain some basic samples and some documentation. The ray tracer sample has been updated to GLM 0.5.0. Except for specific cases, especially with extensions, GLM 0.5 is backward compatible. +

+ Now, GLM development is taking advantages of SourceForge.net services: a bug tracker system and the development source code is publicly available on SF.net SVN server. +

Download: GLM 0.5.0 (zip, 2.4 MB)
Download: GLM 0.5.0 (7z, 843 KB)
Download: Raytracer b3.0 (exe, 751 KB)
Download: Raytracer b3.0 (zip, 1.1 MB)

22/05/2006 - GLM 0.4.1 released

+ A GLM update is available. It simply includes some examples for a sweet start with GLM. +

+ The examples show how to use GLM with OpenGL intermediate mode and OpenGL vertex arrays. Also, they show how to use GLM extensions to replace GLU and OpenGL function witch could slightly increase performances by decreasing the number of OpenGL states changes. +

Download: GLM 0.4.1 (zip, 1.6 MB)
Download: GLM 0.4.1 (7z, 521 KB)

17/05/2006 - GLM 0.4.0 released

+ This release introduces first GLSL 1.2 features as planed. Also, various new extensions have been added and updated. Finally, it's not anymore required to include windows.h before glm.h when windows.h is required. +

+ The number of features of GLM, including extensions, start to really increase the compilation time. That's why it's recommended to use precompiled headers. +

Download: GLM 0.4.0

23/04/2006 - Roadmap for the years

+ Version 0.4 will complete matrices and vectors operators and will add GLSL 1.2 features. First, conversions simplifications will be integrated. Then, 4 per 3 matrices and outer product will be available from extensions. The transpose function is already available from extension. +

+ Version 0.5 will integrate GLSL 1.2 features to GLM core. +

+ Version 0.6 will add swizzle operators in reading and writing. (eg: vec3 v1(1.0, 2.0, 3.0); vec3 v2 = v1.xxx; v1.zyx = v;). +


22/04/2006 - GLM 0.3.2 released

+ This release corrects two main bugs. First, a bug of the imat4 and mat4 division operators and other correct the vectors components access from texture coordinate way. +

Download: GLM 0.3.2

28/03/2006 - GLM 0.3.1 released

+ This update adds GCC 4.0 support for MacOS X and Linux and GCC 4.1 under Linux. Also, its provides some optimisations. +

+ Further release will prodive GLSL 1.2 compliances. +

Download: GLM 0.3.1

19/02/2006 - GLM 0.3 released

+ A new release of GLM is now available. It improves GLSL data type conversion and construction compliance. Also, It's adds extensions like some to manage double-precision and half-precision float numbers. Finally a Doxygen documentation has been added. +

+ This new release have been tested under Visual C++ 7.1, Visual C++ 8.0, GCC 3.2.3 et GCC 3.4.2. +

Download: GLM 0.3
Download: Raytrace
Documentation: Online documentation

06/05/2005 - GLM 0.2 released

+ A new release of GLM is now available. A few bugs have been fixed, the portability of GLSL into C++ has been improved, and new experimental extensions have been implemented, enhancing GLSL features. +

+ Project now supports quaternions, adds new features to handle colors, vectors and matrices. For example, GLM allows base colors changing, vector projected operations, and 2D/3D transforms. +

+ To demo the features of this new version, a sample program is included. It is a simple Ray Tracer supporting reflected and refracted rays, three lights types (point, directionnal and spot), two objects types (sphere, plan), using all of the GLM possibilities. +


04/05/2005 - English pages

+ The english section of this site is now available. +


21/02/2005 - GLM 0.1 is available

+ This is the first public availability of GLM. This library supports part of GLSL specifications : All vectors and matrices types, and all the operators and associated functions. +

+ For now, there isn't detailed documentation, but you can freely have a look on GLSL specifications. Consider any incoherence with GLM as an error. Keep in mind the library is included in the namespace "glm". +

+ This project is multi platform and was successfully tested under Visual C++ 7.1, MinGW 3.4 and GCC 3.4. +

Download: GLM 0.1 User Release
Download: GLM 0.1 Contributor Release
Documentation: GLSL 1.10.59 specifications

Copyright © 2005 - 2011G-Truc Creation
\ No newline at end of file diff --git a/doc/src/data.xml b/doc/src/data.xml index b3afe3c6..50622cd3 100644 --- a/doc/src/data.xml +++ b/doc/src/data.xml @@ -3,7 +3,8 @@
- + + @@ -59,7 +60,8 @@
- + + @@ -148,6 +150,22 @@ + + + GLM 0.9.1.1 fixes some bugs, warnings on Clang C++ and clean up a bit the code. + + + If you have uncounter any issue with GLM 0.9.1.0, please download this revision. + + + Finally, the work has started for GLM 0.9.2 so if you have requests don't forget to submit them! + + + GLM 0.9.1.1 (zip) + GLM 0.9.1.1 (7z) + Submit a bug report + + Finally, GLM 0.9.1 branch is reaching the status of stable with diff --git a/glm/core/func_common.hpp b/glm/core/func_common.hpp index c9cdc8ba..00f9333c 100644 --- a/glm/core/func_common.hpp +++ b/glm/core/func_common.hpp @@ -249,21 +249,27 @@ namespace glm //! Splits x into a floating-point significand in the range //! [0.5, 1.0) and an integral exponent of two, such that: //! x = significand * exp(2, exponent) + //! //! The significand is returned by the function and the //! exponent is returned in the parameter exp. For a //! floating-point value of zero, the significant and exponent //! are both zero. For a floating-point value that is an //! infinity or is not a number, the results are undefined. - //! (From GLSL 4.00.08 specification, section 8.3) + //! + //! \li GLSL frexp man page + //! \li GLSL 4.00.08 specification, section 8.3 template genType frexp(genType const & x, genIType & exp); //! Builds a floating-point number from x and the //! corresponding integral exponent of two in exp, returning: //! significand * exp(2, exponent) + //! //! If this product is too large to be represented in the //! floating-point type, the result is undefined. - //! (From GLSL 4.00.08 specification, section 8.3) + //! + //! \li GLSL ldexp man page; + //! \li GLSL 4.00.08 specification, section 8.3 template genType ldexp(genType const & x, genIType const & exp); diff --git a/glm/core/func_common.inl b/glm/core/func_common.inl index 53990a6c..e2801089 100644 --- a/glm/core/func_common.inl +++ b/glm/core/func_common.inl @@ -1206,7 +1206,7 @@ namespace glm { GLM_STATIC_ASSERT(detail::type::is_float, "'mix' only accept floating-point inputs"); -#if(defined(GLM_COMPILER) && GLM_COMPILER & GLM_COMPILER_VC) +#if(GLM_COMPILER & GLM_COMPILER_VC) return typename genType::bool_type(_isnan(x)); #else return typename genType::bool_type(std::isnan(x)); @@ -1257,7 +1257,7 @@ namespace glm { GLM_STATIC_ASSERT(detail::type::is_float, "'isinf' only accept floating-point inputs"); -#if(defined(GLM_COMPILER) && GLM_COMPILER & GLM_COMPILER_VC) +#if(GLM_COMPILER & GLM_COMPILER_VC) return typename genType::bool_type(_fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF); #else return typename genType::bool_type(std::isinf(x)); diff --git a/glm/core/func_integer.inl b/glm/core/func_integer.inl index a07ed249..c5e6fe25 100644 --- a/glm/core/func_integer.inl +++ b/glm/core/func_integer.inl @@ -274,7 +274,7 @@ namespace glm Result |= (1 << (sizeof(genIUType) * 8 - 1)) & (1 << (Offset + Bits - 1)); genIUType Mask = 0; - for(std::size_t Bit = Offset; Bit < Bits; ++Bit) + for(int Bit = Offset; Bit < Bits; ++Bit) Mask |= (1 << Bit); return Result | ((Mask & Value) >> Offset); @@ -339,7 +339,7 @@ namespace glm return Base; genIUType Mask = 0; - for(std::size_t Bit = Offset; Bit < Offset + Bits; ++Bit) + for(int Bit = Offset; Bit < Offset + Bits; ++Bit) Mask |= (1 << Bit); return (Base & ~Mask) | (Insert & Mask); diff --git a/glm/core/intrinsic_matrix.inl b/glm/core/intrinsic_matrix.inl index 26011cd1..58e6bac4 100644 --- a/glm/core/intrinsic_matrix.inl +++ b/glm/core/intrinsic_matrix.inl @@ -1064,7 +1064,7 @@ inline void sse_rotate_ps(__m128 const in[4], float Angle, float const v[3], __m Result[0] = TmpA4; Result[1] = TmpB4; Result[2] = TmpC4; - Result[2] = _mm_set_ps(1, 0, 0, 0); + Result[3] = _mm_set_ps(1, 0, 0, 0); //detail::tmat4x4 Result(detail::tmat4x4::null); //Result[0] = m[0] * Rotate[0][0] + m[1] * Rotate[0][1] + m[2] * Rotate[0][2]; diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index 8b335788..01d7e13f 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -13,12 +13,13 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Version -#define GLM_VERSION 91 +#define GLM_VERSION 92 #define GLM_VERSION_MAJOR 0 #define GLM_VERSION_MINOR 9 -#define GLM_VERSION_PATCH 1 +#define GLM_VERSION_PATCH 2 #define GLM_VERSION_REVISION 0 + /////////////////////////////////////////////////////////////////////////////////////////////////// // Compiler @@ -37,6 +38,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 +100,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 @@ -167,13 +171,13 @@ // Report compiler detection #if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_COMPILER_DISPLAYED)) # define GLM_MESSAGE_COMPILER_DISPLAYED -# if(defined(GLM_COMPILER) && GLM_COMPILER & GLM_COMPILER_VC) +# if(GLM_COMPILER & GLM_COMPILER_VC) # pragma message("GLM: Visual C++ compiler detected") -# elif(defined(GLM_COMPILER) && GLM_COMPILER & GLM_COMPILER_GCC) +# elif(GLM_COMPILER & GLM_COMPILER_GCC) # pragma message("GLM: GCC compiler detected") -# elif(defined(GLM_COMPILER) && GLM_COMPILER & GLM_COMPILER_BC) +# elif(GLM_COMPILER & GLM_COMPILER_BC) # pragma message("GLM: Borland compiler detected but not supported") -# elif(defined(GLM_COMPILER) && GLM_COMPILER & GLM_COMPILER_CODEWARRIOR) +# elif(GLM_COMPILER & GLM_COMPILER_CODEWARRIOR) # pragma message("GLM: Codewarrior compiler detected but not supported") # else # pragma message("GLM: Compiler not detected") @@ -401,21 +405,4 @@ # endif #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 diff --git a/glm/core/type.hpp b/glm/core/type.hpp index 599163ba..0117c3c4 100644 --- a/glm/core/type.hpp +++ b/glm/core/type.hpp @@ -38,7 +38,7 @@ namespace type ////////////////////////// // Float definition -#if(defined(GLM_PRECISION) && GLM_PRECISION & GLM_PRECISION_HIGHP_FLOAT) +#if(defined(GLM_PRECISION_HIGHP_FLOAT)) typedef precision::highp_vec2 vec2; typedef precision::highp_vec3 vec3; typedef precision::highp_vec4 vec4; @@ -51,7 +51,7 @@ namespace type typedef precision::highp_mat4x2 mat4x2; typedef precision::highp_mat4x3 mat4x3; typedef precision::highp_mat4x4 mat4x4; -#elif(defined(GLM_PRECISION) && GLM_PRECISION & GLM_PRECISION_MEDIUMP_FLOAT) +#elif(defined(GLM_PRECISION_MEDIUMP_FLOAT)) typedef precision::mediump_vec2 vec2; typedef precision::mediump_vec3 vec3; typedef precision::mediump_vec4 vec4; @@ -64,7 +64,7 @@ namespace type typedef precision::mediump_mat4x2 mat4x2; typedef precision::mediump_mat4x3 mat4x3; typedef precision::mediump_mat4x4 mat4x4; -#elif(defined(GLM_PRECISION) && GLM_PRECISION & GLM_PRECISION_LOWP_FLOAT) +#elif(defined(GLM_PRECISION_LOWP_FLOAT)) typedef precision::lowp_vec2 vec2; typedef precision::lowp_vec3 vec3; typedef precision::lowp_vec4 vec4; @@ -158,15 +158,15 @@ namespace type ////////////////////////// // Signed integer definition -#if(defined(GLM_PRECISION) && GLM_PRECISION & GLM_PRECISION_HIGHP_INT) +#if(defined(GLM_PRECISION_HIGHP_INT)) typedef precision::highp_ivec2 ivec2; typedef precision::highp_ivec3 ivec3; typedef precision::highp_ivec4 ivec4; -#elif(defined(GLM_PRECISION) && GLM_PRECISION & GLM_PRECISION_MEDIUMP_INT) +#elif(defined(GLM_PRECISION_MEDIUMP_INT)) typedef precision::mediump_ivec2 ivec2; typedef precision::mediump_ivec3 ivec3; typedef precision::mediump_ivec4 ivec4; -#elif(defined(GLM_PRECISION) && GLM_PRECISION & GLM_PRECISION_LOWP_INT) +#elif(defined(GLM_PRECISION_LOWP_INT)) typedef precision::lowp_ivec2 ivec2; typedef precision::lowp_ivec3 ivec3; typedef precision::lowp_ivec4 ivec4; @@ -190,15 +190,15 @@ namespace type ////////////////////////// // Unsigned integer definition -#if(defined(GLM_PRECISION) && GLM_PRECISION & GLM_PRECISION_HIGHP_UINT) +#if(defined(GLM_PRECISION_HIGHP_UINT)) typedef precision::highp_uvec2 uvec2; typedef precision::highp_uvec3 uvec3; typedef precision::highp_uvec4 uvec4; -#elif(defined(GLM_PRECISION) && GLM_PRECISION & GLM_PRECISION_MEDIUMP_UINT) +#elif(defined(GLM_PRECISION_MEDIUMP_UINT)) typedef precision::mediump_uvec2 uvec2; typedef precision::mediump_uvec3 uvec3; typedef precision::mediump_uvec4 uvec4; -#elif(defined(GLM_PRECISION) && GLM_PRECISION & GLM_PRECISION_LOWP_UINT) +#elif(defined(GLM_PRECISION_LOWP_UINT)) typedef precision::lowp_uvec2 uvec2; typedef precision::lowp_uvec3 uvec3; typedef precision::lowp_uvec4 uvec4; diff --git a/glm/core/type_float.hpp b/glm/core/type_float.hpp index b62c7755..a615c0f3 100644 --- a/glm/core/type_float.hpp +++ b/glm/core/type_float.hpp @@ -46,7 +46,7 @@ namespace glm //! There is no guarantee on the actual precision. //! From GLSL 1.30.8 specification //! \ingroup core_precision - typedef mediump_float_t mediump_float; + typedef mediump_float_t mediump_float; //! High precision floating-point numbers. //! There is no guarantee on the actual precision. //! From GLSL 1.30.8 specification @@ -55,18 +55,17 @@ namespace glm } //namespace precision -#ifndef GLM_PRECISION - typedef precision::mediump_float float_t; -#elif(GLM_PRECISION & GLM_PRECISION_HIGHP_FLOAT) - typedef precision::highp_float float_t; -#elif(GLM_PRECISION & GLM_PRECISION_MEDIUMP_FLOAT) - typedef precision::mediump_float float_t; -#elif(GLM_PRECISION & GLM_PRECISION_LOWP_FLOAT) - typedef precision::lowp_float float_t; +#if(!defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT)) + typedef precision::mediump_float float_t; +#elif(defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT)) + typedef precision::highp_float float_t; +#elif(!defined(GLM_PRECISION_HIGHP_FLOAT) && defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT)) + typedef precision::mediump_float float_t; +#elif(!defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && defined(GLM_PRECISION_LOWP_FLOAT)) + typedef precision::lowp_float float_t; #else - # pragma message("GLM message: Precisson undefined for float numbers."); - typedef precision::mediump_float float_t; -#endif//GLM_PRECISION +# error "GLM error: multiple default precision requested for floating-point types" +#endif }//namespace type }//namespace core diff --git a/glm/core/type_int.hpp b/glm/core/type_int.hpp index 3bad8ce4..59abf8a4 100644 --- a/glm/core/type_int.hpp +++ b/glm/core/type_int.hpp @@ -54,7 +54,7 @@ namespace glm //! There is no guarantee on the actual precision. //! From GLSL 1.30.8 specification. //! \ingroup core_precision - typedef detail::mediump_int_t mediump_int; + typedef detail::mediump_int_t mediump_int; //! High precision signed integer. //! There is no guarantee on the actual precision. //! From GLSL 1.30.8 specification. @@ -75,35 +75,33 @@ namespace glm //! There is no guarantee on the actual precision. //! From GLSL 1.30.8 specification. //! \ingroup core_precision - typedef detail::highp_uint_t highp_uint; + typedef detail::highp_uint_t highp_uint; } //namespace precision -#ifndef GLM_PRECISION +#if(!defined(GLM_PRECISION_HIGHP_INT) && !defined(GLM_PRECISION_MEDIUMP_INT) && !defined(GLM_PRECISION_LOWP_INT)) typedef precision::mediump_int int_t; -#elif(GLM_PRECISION & GLM_PRECISION_HIGHP_INT) - typedef precision::highp_int int_t; -#elif(GLM_PRECISION & GLM_PRECISION_MEDIUMP_INT) +#elif(defined(GLM_PRECISION_HIGHP_INT) && !defined(GLM_PRECISION_MEDIUMP_INT) && !defined(GLM_PRECISION_LOWP_INT)) + typedef precision::highp_int int_t; +#elif(!defined(GLM_PRECISION_HIGHP_INT) && defined(GLM_PRECISION_MEDIUMP_INT) && !defined(GLM_PRECISION_LOWP_INT)) typedef precision::mediump_int int_t; -#elif(GLM_PRECISION & GLM_PRECISION_LOWP_INT) +#elif(!defined(GLM_PRECISION_HIGHP_INT) && !defined(GLM_PRECISION_MEDIUMP_INT) && defined(GLM_PRECISION_LOWP_INT)) typedef precision::lowp_int int_t; #else - typedef precision::mediump_int int_t; -# pragma message("GLM message: Precisson undefined for signed integer number."); -#endif//GLM_PRECISION +# error "GLM error: multiple default precision requested for signed interger types" +#endif -#ifndef GLM_PRECISION +#if(!defined(GLM_PRECISION_HIGHP_UINT) && !defined(GLM_PRECISION_MEDIUMP_UINT) && !defined(GLM_PRECISION_LOWP_UINT)) typedef precision::mediump_uint uint_t; -#elif(GLM_PRECISION & GLM_PRECISION_HIGHP_UINT) - typedef precision::highp_uint uint_t; -#elif(GLM_PRECISION & GLM_PRECISION_MEDIUMP_UINT) +#elif(defined(GLM_PRECISION_HIGHP_UINT) && !defined(GLM_PRECISION_MEDIUMP_UINT) && !defined(GLM_PRECISION_LOWP_UINT)) + typedef precision::highp_uint uint_t; +#elif(!defined(GLM_PRECISION_HIGHP_UINT) && defined(GLM_PRECISION_MEDIUMP_UINT) && !defined(GLM_PRECISION_LOWP_UINT)) typedef precision::mediump_uint uint_t; -#elif(GLM_PRECISION & GLM_PRECISION_LOWP_UINT) - typedef precision::lowp_uint uint_t; +#elif(!defined(GLM_PRECISION_HIGHP_UINT) && !defined(GLM_PRECISION_MEDIUMP_UINT) && defined(GLM_PRECISION_LOWP_UINT)) + typedef precision::lowp_uint uint_t; #else - typedef precision::mediump_uint uint_t; -# pragma message("GLM message: Precisson undefined for unsigned integer number."); -#endif//GLM_PRECISION +# error "GLM error: multiple default precision requested for unsigned interger types" +#endif //! Unsigned integer. //! From GLSL 1.30.8 specification section 4.1.3 Integers. diff --git a/glm/gtc/matrix_integer.hpp b/glm/gtc/matrix_integer.hpp index 079dafc8..cfd487b8 100644 --- a/glm/gtc/matrix_integer.hpp +++ b/glm/gtc/matrix_integer.hpp @@ -117,11 +117,10 @@ 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(defined(GLM_PRECISION) && (GLM_PRECISION & GLM_PRECISION_HIGHP_INT)) +#if(defined(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) @@ -131,8 +130,7 @@ 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(defined(GLM_PRECISION) && (GLM_PRECISION & GLM_PRECISION_LOWP_INT)) +#elif(defined(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) @@ -145,8 +143,7 @@ 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(defined(GLM_PRECISION) && (GLM_PRECISION & GLM_PRECISION_MEDIUMP_INT)) +#else //if(defined(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) @@ -161,7 +158,7 @@ namespace glm typedef mediump_imat4x4 imat4x4; //!< \brief Signed integer 4x4 matrix. (from GLM_GTC_matrix_integer extension) #endif//GLM_PRECISION -#if(defined(GLM_PRECISION) && (GLM_PRECISION & GLM_PRECISION_HIGHP_UINT)) +#if(defined(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) @@ -174,8 +171,7 @@ 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(defined(GLM_PRECISION) && (GLM_PRECISION & GLM_PRECISION_LOWP_UINT)) +#elif(defined(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) @@ -188,8 +184,7 @@ 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(defined(GLM_PRECISION) && (GLM_PRECISION & GLM_PRECISION_MEDIUMP_UINT)) +#else //if(defined(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/gtc/matrix_transform.inl b/glm/gtc/matrix_transform.inl index 93d845e6..cdf546c2 100644 --- a/glm/gtc/matrix_transform.inl +++ b/glm/gtc/matrix_transform.inl @@ -359,7 +359,7 @@ namespace matrix_transform // Translate and scale the picked region to the entire window Result = translate(Result, Temp); - return scale(Result, T(viewport[2]) / delta.x, T(viewport[3]) / delta.y, T(1)); + return scale(Result, detail::tvec3(T(viewport[2]) / delta.x, T(viewport[3]) / delta.y, T(1))); } template diff --git a/glm/gtc/type_ptr.hpp b/glm/gtc/type_ptr.hpp index 5aeea5af..cd137098 100644 --- a/glm/gtc/type_ptr.hpp +++ b/glm/gtc/type_ptr.hpp @@ -294,6 +294,151 @@ namespace glm return &(mat[0].x); } + //! Build a vector from a pointer. + //! From GLM_GTC_type_ptr extension. + template + inline detail::tvec2 make_vec2(T const * const ptr) + { + detail::tvec2 Result; + memcpy(value_ptr(Result), ptr, sizeof(detail::tvec2)); + return Result; + } + + //! Build a vector from a pointer. + //! From GLM_GTC_type_ptr extension. + template + inline detail::tvec3 make_vec3(T const * const ptr) + { + detail::tvec3 Result; + memcpy(value_ptr(Result), ptr, sizeof(detail::tvec3)); + return Result; + } + + //! Build a vector from a pointer. + //! From GLM_GTC_type_ptr extension. + template + inline detail::tvec4 make_vec4(T const * const ptr) + { + detail::tvec4 Result; + memcpy(value_ptr(Result), ptr, sizeof(detail::tvec4)); + return Result; + } + + //! Build a matrix from a pointer. + //! From GLM_GTC_type_ptr extension. + template + inline detail::tmat2x2 make_mat2x2(T const * const ptr) + { + detail::tmat2x2 Result; + memcpy(value_ptr(Result), ptr, sizeof(detail::tmat2x2)); + return Result; + } + + //! Build a matrix from a pointer. + //! From GLM_GTC_type_ptr extension. + template + inline detail::tmat2x3 make_mat2x3(T const * const ptr) + { + detail::tmat2x3 Result; + memcpy(value_ptr(Result), ptr, sizeof(detail::tmat2x3)); + return Result; + } + + //! Build a matrix from a pointer. + //! From GLM_GTC_type_ptr extension. + template + inline detail::tmat2x4 make_mat2x4(T const * const ptr) + { + detail::tmat2x4 Result; + memcpy(value_ptr(Result), ptr, sizeof(detail::tmat2x4)); + return Result; + } + + //! Build a matrix from a pointer. + //! From GLM_GTC_type_ptr extension. + template + inline detail::tmat3x2 make_mat3x2(T const * const ptr) + { + detail::tmat3x2 Result; + memcpy(value_ptr(Result), ptr, sizeof(detail::tmat3x2)); + return Result; + } + + //! Build a matrix from a pointer. + //! From GLM_GTC_type_ptr extension. + template + inline detail::tmat3x3 make_mat3x3(T const * const ptr) + { + detail::tmat3x3 Result; + memcpy(value_ptr(Result), ptr, sizeof(detail::tmat3x3)); + return Result; + } + + //! Build a matrix from a pointer. + //! From GLM_GTC_type_ptr extension. + template + inline detail::tmat3x4 make_mat3x4(T const * const ptr) + { + detail::tmat3x4 Result; + memcpy(value_ptr(Result), ptr, sizeof(detail::tmat3x4)); + return Result; + } + + + //! Build a matrix from a pointer. + //! From GLM_GTC_type_ptr extension. + template + inline detail::tmat4x2 make_mat4x2(T const * const ptr) + { + detail::tmat4x2 Result; + memcpy(value_ptr(Result), ptr, sizeof(detail::tmat4x2)); + return Result; + } + + //! Build a matrix from a pointer. + //! From GLM_GTC_type_ptr extension. + template + inline detail::tmat4x3 make_mat4x3(T const * const ptr) + { + detail::tmat4x3 Result; + memcpy(value_ptr(Result), ptr, sizeof(detail::tmat4x3)); + return Result; + } + + //! Build a matrix from a pointer. + //! From GLM_GTC_type_ptr extension. + template + inline detail::tmat4x4 make_mat4x4(T const * const ptr) + { + detail::tmat4x4 Result; + memcpy(value_ptr(Result), ptr, sizeof(detail::tmat4x4)); + return Result; + } + + //! Build a matrix from a pointer. + //! From GLM_GTC_type_ptr extension. + template + inline detail::tmat2x2 make_mat2(T const * const ptr) + { + return make_mat2x2(Result); + } + + //! Build a matrix from a pointer. + //! From GLM_GTC_type_ptr extension. + template + inline detail::tmat3 make_mat3(T const * const ptr) + { + return make_mat3x3(Result); + } + + //! Build a matrix from a pointer. + //! From GLM_GTC_type_ptr extension. + template + inline detail::tmat4 make_mat4(T const * const ptr) + { + return make_mat4x4(Result); + } + ///@} }//namespace type_ptr diff --git a/glm/gtx/bit.inl b/glm/gtx/bit.inl index 13b35ac7..ae746282 100644 --- a/glm/gtx/bit.inl +++ b/glm/gtx/bit.inl @@ -601,8 +601,8 @@ inline genType bitRevert(genType const & In) genType Out = 0; std::size_t BitSize = sizeof(genType) * 8; for(std::size_t i = 0; i < BitSize; ++i) - if(In & (1 << i)) - Out |= 1 << (BitSize - 1 - i); + if(In & (genType(1) << i)) + Out |= genType(1) << (BitSize - 1 - i); return Out; } diff --git a/glm/gtx/compatibility.inl b/glm/gtx/compatibility.inl index 85fb81b1..035e50d6 100644 --- a/glm/gtx/compatibility.inl +++ b/glm/gtx/compatibility.inl @@ -16,10 +16,10 @@ template inline bool isfinite( genType const & x) { -#ifdef GLM_COMPILER_VC +#if(GLM_COMPILER & GLM_COMPILER_VC) return _finite(x); -#else//GLM_COMPILER_GCC - return std::isfinite(x); +#else//(GLM_COMPILER & GLM_COMPILER_GCC) + return std::isfinite(x) != 0; #endif } @@ -58,10 +58,10 @@ template inline bool isinf( genType const & x) { -#if(defined(GLM_COMPILER) && (GLM_COMPILER & GLM_COMPILER_VC)) +#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 } @@ -99,10 +99,10 @@ inline detail::tvec4 isinf( template inline bool isnan(genType const & x) { -#if(defined(GLM_COMPILER) && (GLM_COMPILER & GLM_COMPILER_VC)) +#if(GLM_COMPILER & GLM_COMPILER_VC) return _isnan(x); #else - return std::isnan(x); + return std::isnan(x) != 0; #endif } diff --git a/glm/gtx/vec1.hpp b/glm/gtx/vec1.hpp index 0da37451..df7fb1d4 100644 --- a/glm/gtx/vec1.hpp +++ b/glm/gtx/vec1.hpp @@ -80,11 +80,11 @@ namespace glm //! From GLM_GTX_vec1 extension. typedef detail::tvec1 bvec1; -#if(defined(GLM_PRECISION) && GLM_PRECISION & GLM_PRECISION_HIGHP_FLOAT) +#if(defined(GLM_PRECISION_HIGHP_FLOAT)) typedef precision::highp_vec1 vec1; -#elif(defined(GLM_PRECISION) && GLM_PRECISION & GLM_PRECISION_MEDIUMP_FLOAT) +#elif(defined(GLM_PRECISION_MEDIUMP_FLOAT)) typedef precision::mediump_vec1 vec1; -#elif(defined(GLM_PRECISION) && GLM_PRECISION & GLM_PRECISION_LOWP_FLOAT) +#elif(defined(GLM_PRECISION_LOWP_FLOAT)) typedef precision::lowp_vec1 vec1; #else //! 1 component vector of floating-point numbers. @@ -92,11 +92,11 @@ namespace glm typedef precision::mediump_vec1 vec1; #endif//GLM_PRECISION -#if(defined(GLM_PRECISION) && GLM_PRECISION & GLM_PRECISION_HIGHP_INT) +#if(defined(GLM_PRECISION_HIGHP_INT)) typedef precision::highp_ivec1 ivec1; -#elif(defined(GLM_PRECISION) && GLM_PRECISION & GLM_PRECISION_MEDIUMP_INT) +#elif(defined(GLM_PRECISION_MEDIUMP_INT)) typedef precision::mediump_ivec1 ivec1; -#elif(defined(GLM_PRECISION) && GLM_PRECISION & GLM_PRECISION_LOWP_INT) +#elif(defined(GLM_PRECISION_LOWP_INT)) typedef precision::lowp_ivec1 ivec1; #else //! 1 component vector of signed integer numbers. @@ -104,11 +104,11 @@ namespace glm typedef precision::mediump_ivec1 ivec1; #endif//GLM_PRECISION -#if(defined(GLM_PRECISION) && GLM_PRECISION & GLM_PRECISION_HIGHP_UINT) +#if(defined(GLM_PRECISION_HIGHP_UINT)) typedef precision::highp_uvec1 uvec1; -#elif(defined(GLM_PRECISION) && GLM_PRECISION & GLM_PRECISION_MEDIUMP_UINT) +#elif(defined(GLM_PRECISION_MEDIUMP_UINT)) typedef precision::mediump_uvec1 uvec1; -#elif(defined(GLM_PRECISION) && GLM_PRECISION & GLM_PRECISION_LOWP_UINT) +#elif(defined(GLM_PRECISION_LOWP_UINT)) typedef precision::lowp_uvec1 uvec1; #else //! 1 component vector of unsigned integer numbers. diff --git a/glm/gtx/vector_query.inl b/glm/gtx/vector_query.inl index f9d02199..bbea611e 100644 --- a/glm/gtx/vector_query.inl +++ b/glm/gtx/vector_query.inl @@ -83,7 +83,7 @@ namespace vector_query typename genType::value_type const & epsilon ) { - return abs(length(v) - GLMvalType(1)) <= GLMvalType(2) * epsilon; + return abs(length(v) - typename genType::value_type(1)) <= typename genType::value_type(2) * epsilon; } template diff --git a/readme.txt b/readme.txt index 45bce812..90418ce0 100644 --- a/readme.txt +++ b/readme.txt @@ -11,10 +11,15 @@ GLM is a header only library, there is nothing to build, just include it. #include More informations in GLM manual: -http://glm.g-truc.net/glm-manual.pdf +http://glm.g-truc.net/glm-0.9.1.pdf ================================================================================ -GLM 0.9.1.0: 2010-03-02 +GLM 0.9.1.1: 2010-03-17 +-------------------------------------------------------------------------------- +- Fixed bugs + +================================================================================ +GLM 0.9.1.0: 2010-03-03 -------------------------------------------------------------------------------- - Fixed bugs diff --git a/test/core/core_type_mat4x4.cpp b/test/core/core_type_mat4x4.cpp index 65b85346..a821b91a 100644 --- a/test/core/core_type_mat4x4.cpp +++ b/test/core/core_type_mat4x4.cpp @@ -8,6 +8,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #define GLM_MESSAGES +#define GLM_PRECISION_HIGHP_FLOAT #include #include diff --git a/test/gtc/CMakeLists.txt b/test/gtc/CMakeLists.txt index 7dc18c00..aa58bcf0 100644 --- a/test/gtc/CMakeLists.txt +++ b/test/gtc/CMakeLists.txt @@ -1,2 +1,9 @@ -glmCreateTestGTC(gtc-integer-matrix) -glmCreateTestGTC(gtc-swizzle) \ No newline at end of file +glmCreateTestGTC(gtc_half_float) +glmCreateTestGTC(gtc_matrix_access) +glmCreateTestGTC(gtc_matrix_integer) +glmCreateTestGTC(gtc_matrix_inverse) +glmCreateTestGTC(gtc_matrix_transform) +glmCreateTestGTC(gtc_quaternion) +glmCreateTestGTC(gtc_swizzle) +glmCreateTestGTC(gtc_type_precision) +glmCreateTestGTC(gtc_type_ptr) diff --git a/test/gtc/gtc_half_float.cpp b/test/gtc/gtc_half_float.cpp new file mode 100644 index 00000000..0b9bc908 --- /dev/null +++ b/test/gtc/gtc_half_float.cpp @@ -0,0 +1,19 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Created : 2010-09-16 +// Updated : 2010-09-16 +// Licence : This source is under MIT licence +// File : test/gtc/matrix_transform.cpp +/////////////////////////////////////////////////////////////////////////////////////////////////// + +#define GLM_MESSAGES +#include +#include + +int main() +{ + int Failed = 0; + + return Failed; +} diff --git a/test/gtc/gtc_matrix_access.cpp b/test/gtc/gtc_matrix_access.cpp new file mode 100644 index 00000000..0b9bc908 --- /dev/null +++ b/test/gtc/gtc_matrix_access.cpp @@ -0,0 +1,19 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Created : 2010-09-16 +// Updated : 2010-09-16 +// Licence : This source is under MIT licence +// File : test/gtc/matrix_transform.cpp +/////////////////////////////////////////////////////////////////////////////////////////////////// + +#define GLM_MESSAGES +#include +#include + +int main() +{ + int Failed = 0; + + return Failed; +} diff --git a/test/gtc/gtc-integer-matrix.cpp b/test/gtc/gtc_matrix_integer.cpp similarity index 81% rename from test/gtc/gtc-integer-matrix.cpp rename to test/gtc/gtc_matrix_integer.cpp index b6b06c11..48686de0 100644 --- a/test/gtc/gtc-integer-matrix.cpp +++ b/test/gtc/gtc_matrix_integer.cpp @@ -4,26 +4,16 @@ // Created : 2010-09-16 // Updated : 2010-09-16 // Licence : This source is under MIT licence -// File : test/gtx/simd-mat4.cpp +// File : test/gtc/matrix_integer.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// #define GLM_MESSAGES #include #include -int test_int_matrix() -{ - { - glm::mediump_uint A(0); - } - - return 0; -} - int main() { int Failed = 0; - Failed += test_int_matrix(); return Failed; } diff --git a/test/gtc/gtc_matrix_inverse.cpp b/test/gtc/gtc_matrix_inverse.cpp new file mode 100644 index 00000000..0b9bc908 --- /dev/null +++ b/test/gtc/gtc_matrix_inverse.cpp @@ -0,0 +1,19 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Created : 2010-09-16 +// Updated : 2010-09-16 +// Licence : This source is under MIT licence +// File : test/gtc/matrix_transform.cpp +/////////////////////////////////////////////////////////////////////////////////////////////////// + +#define GLM_MESSAGES +#include +#include + +int main() +{ + int Failed = 0; + + return Failed; +} diff --git a/test/gtc/gtc_matrix_transform.cpp b/test/gtc/gtc_matrix_transform.cpp new file mode 100644 index 00000000..1ca84115 --- /dev/null +++ b/test/gtc/gtc_matrix_transform.cpp @@ -0,0 +1,21 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Created : 2010-09-16 +// Updated : 2010-09-16 +// Licence : This source is under MIT licence +// File : test/gtc/matrix_transform.cpp +/////////////////////////////////////////////////////////////////////////////////////////////////// + +#define GLM_MESSAGES +#include +#include + +int main() +{ + int Failed = 0; + + glm::mat4 Pick = glm::pickMatrix(glm::vec2(1, 2), glm::vec2(3, 4), glm::ivec4(0, 0, 320, 240)); + + return Failed; +} diff --git a/test/gtc/gtc_quaternion.cpp b/test/gtc/gtc_quaternion.cpp new file mode 100644 index 00000000..0b9bc908 --- /dev/null +++ b/test/gtc/gtc_quaternion.cpp @@ -0,0 +1,19 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Created : 2010-09-16 +// Updated : 2010-09-16 +// Licence : This source is under MIT licence +// File : test/gtc/matrix_transform.cpp +/////////////////////////////////////////////////////////////////////////////////////////////////// + +#define GLM_MESSAGES +#include +#include + +int main() +{ + int Failed = 0; + + return Failed; +} diff --git a/test/gtc/gtc-swizzle.cpp b/test/gtc/gtc_swizzle.cpp similarity index 98% rename from test/gtc/gtc-swizzle.cpp rename to test/gtc/gtc_swizzle.cpp index 917976d6..0371c20a 100644 --- a/test/gtc/gtc-swizzle.cpp +++ b/test/gtc/gtc_swizzle.cpp @@ -4,7 +4,7 @@ // Created : 2010-09-16 // Updated : 2010-09-16 // Licence : This source is under MIT licence -// File : test/gtx/simd-mat4.cpp +// File : test/gtc/swizzle.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// #define GLM_MESSAGES diff --git a/test/gtc/gtc_type_precision.cpp b/test/gtc/gtc_type_precision.cpp new file mode 100644 index 00000000..0b9bc908 --- /dev/null +++ b/test/gtc/gtc_type_precision.cpp @@ -0,0 +1,19 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Created : 2010-09-16 +// Updated : 2010-09-16 +// Licence : This source is under MIT licence +// File : test/gtc/matrix_transform.cpp +/////////////////////////////////////////////////////////////////////////////////////////////////// + +#define GLM_MESSAGES +#include +#include + +int main() +{ + int Failed = 0; + + return Failed; +} diff --git a/test/gtc/gtc_type_ptr.cpp b/test/gtc/gtc_type_ptr.cpp new file mode 100644 index 00000000..a6c59760 --- /dev/null +++ b/test/gtc/gtc_type_ptr.cpp @@ -0,0 +1,52 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Created : 2010-09-16 +// Updated : 2010-09-16 +// Licence : This source is under MIT licence +// File : test/gtc/type_ptr.cpp +/////////////////////////////////////////////////////////////////////////////////////////////////// + +#define GLM_MESSAGES +#include +#include + +bool test_make_pointer() +{ + 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() +{ + int Failed = 0; + + Failed += test_make_pointer() ? 0 : 1; + + return Failed; +}