-
OpenGL Mathematics (GLM) is a header only C++ mathematics library for graphics software based on the OpenGL Shading Language (GLSL) specification.
+
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 to GLSL features. An extension system, based on the GLSL extension conventions, provides extended capabilities: matrix transformations, quaternions, half-based types, random numbers, noise, etc...
This library works perfectly with OpenGL but it also ensures interoperability with other third party libraries and SDK. It is a good candidate for software rendering (raytracing / rasterisation), image processing, physic simulations and any development context that requires a simple and convenient mathematics library.
GLM is written in C++98 but can take advantage of C++11 when supported by the compiler. It is a platform independent library with no dependence and it officially supports the following compilers:
-- Apple Clang 4.0 and higher
-- CUDA 4.0 and higher
-- GCC 4.2 and higher
-- LLVM 3.0 and higher
-- Intel C++ Composer XE 2013 and higher
-- Visual Studio 2010 and higher
+- Apple Clang 4.0 and higher
+- CUDA 4.0 and higher
+- GCC 4.2 and higher
+- LLVM 3.0 and higher
+- Intel C++ Composer XE 2013 and higher
+- Visual Studio 2010 and higher
- Any conform C++98 compiler
- Note
- The Doxygen-generated documentation will often state that a type or function is defined in a namespace that is a child of the glm namespace. Please ignore this; All publicly available types and functions can be accessed as a direct children of the glm namespace.
-
The source code is licenced under the MIT licence.
+
The source code is licenced under the Happy Bunny License (Modified MIT).
These pages are the API reference only. For more information about how to use GLM, please have a look at the manual.
Thanks for contributing to the project by submitting tickets for bug reports and feature requests. Any feedback is welcome at glm@g.nosp@m.-tru.nosp@m.c.net.
diff --git a/doc/glm.docx b/doc/glm.docx
index be32bfe0..363dc21b 100644
Binary files a/doc/glm.docx and b/doc/glm.docx differ
diff --git a/doc/glm.pdf b/doc/glm.pdf
index 78c48500..399709e8 100644
Binary files a/doc/glm.pdf and b/doc/glm.pdf differ
diff --git a/doc/pages.doxy b/doc/pages.doxy
index 148df167..461f26be 100644
--- a/doc/pages.doxy
+++ b/doc/pages.doxy
@@ -1,7 +1,7 @@
/*!
@mainpage OpenGL Mathematics
- OpenGL Mathematics (GLM) is a header only C++ mathematics library for graphics software based on the OpenGL Shading Language (GLSL) specification.
+
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.
@@ -10,12 +10,12 @@
This library works perfectly with OpenGL but it also ensures interoperability with other third party libraries and SDK. It is a good candidate for software rendering (raytracing / rasterisation), image processing, physic simulations and any development context that requires a simple and convenient mathematics library.
GLM is written in C++98 but can take advantage of C++11 when supported by the compiler. It is a platform independent library with no dependence and it officially supports the following compilers:
- - Apple Clang 4.0 and higher
- - CUDA 4.0 and higher
- - GCC 4.2 and higher
- - LLVM 3.0 and higher
- - Intel C++ Composer XE 2013 and higher
- - Visual Studio 2010 and higher
+ -
Apple Clang 4.0 and higher
+ -
CUDA 4.0 and higher
+ -
GCC 4.2 and higher
+ -
LLVM 3.0 and higher
+ -
Intel C++ Composer XE 2013 and higher
+ -
Visual Studio 2010 and higher
- Any conform C++98 compiler
@note The Doxygen-generated documentation will often state that a type or function
@@ -23,7 +23,7 @@
Please ignore this; All publicly available types and functions can be accessed as a direct children
of the glm namespace.
- The source code is licenced under the
MIT licence.
+ The source code is licenced under the
Happy Bunny License (Modified MIT).
These pages are the API reference only. For more information about how to use GLM, please have a look at
the manual.
diff --git a/readme.txt b/readme.txt
index d456f022..3c4546e4 100644
--- a/readme.txt
+++ b/readme.txt
@@ -19,6 +19,10 @@ furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
+Restrictions:
+ By making use of the Software for military purposes, you choose to make
+ a Bunny unhappy.
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -37,7 +41,7 @@ More informations in GLM manual:
http://glm.g-truc.net/glm.pdf
================================================================================
-GLM 0.9.6.0: 2014-11-XX
+GLM 0.9.6.0: 2014-11-30
--------------------------------------------------------------------------------
Features:
- Added transparent use of SIMD instructions for vec4 and mat4 types
diff --git a/test/core/core_type_mat4x4.cpp b/test/core/core_type_mat4x4.cpp
index cd1239a7..ad6fdc78 100644
--- a/test/core/core_type_mat4x4.cpp
+++ b/test/core/core_type_mat4x4.cpp
@@ -243,6 +243,15 @@ int test_ctr()
return Error;
}
+int perf_mul()
+{
+ int Error = 0;
+
+
+
+ return Error;
+}
+
int main()
{
int Error = 0;
@@ -253,5 +262,7 @@ int main()
Error += test_operators();
Error += test_inverse();
+ Error += perf_mul();
+
return Error;
}
diff --git a/test/gtx/gtx_type_aligned.cpp b/test/gtx/gtx_type_aligned.cpp
index 061cf3f5..bddb6cba 100644
--- a/test/gtx/gtx_type_aligned.cpp
+++ b/test/gtx/gtx_type_aligned.cpp
@@ -87,11 +87,36 @@ int test_decl()
return Error;
}
+template
+void print(genType const & Mat0)
+{
+ printf("mat4(\n");
+ printf("\tvec4(%2.9f, %2.9f, %2.9f, %2.9f)\n", Mat0[0][0], Mat0[0][1], Mat0[0][2], Mat0[0][3]);
+ printf("\tvec4(%2.9f, %2.9f, %2.9f, %2.9f)\n", Mat0[1][0], Mat0[1][1], Mat0[1][2], Mat0[1][3]);
+ printf("\tvec4(%2.9f, %2.9f, %2.9f, %2.9f)\n", Mat0[2][0], Mat0[2][1], Mat0[2][2], Mat0[2][3]);
+ printf("\tvec4(%2.9f, %2.9f, %2.9f, %2.9f))\n\n", Mat0[3][0], Mat0[3][1], Mat0[3][2], Mat0[3][3]);
+}
+
+int perf_mul()
+{
+ int Error = 0;
+
+ glm::mat4 A(1.0f);
+ glm::mat4 B(1.0f);
+
+ glm::mat4 C = A * B;
+
+ print(C);
+
+ return Error;
+}
+
int main()
{
int Error(0);
Error += test_decl();
+ Error += perf_mul();
return Error;
}