08/01/2012 - GLM 0.9.3.0 released
- GLM 0.9.3.0 is finally released. Since the branch 0.9.2, the test bench and the Doxygen API documentation has been expend. -
- Swizzle operators are a challenging task to implement but thanks to the effort of many contributors, GLM 0.9.3.0 provides finally something interesting even if - not perfect but still a great improvement considering the incompatibilities with some external libraries. GLM 0.9.3 provides two implemetanations, one for C++ 98 +
09/01/2012 - GLM 0.9.3.0 released
+ GLM 0.9.3.0 is finally released. Since the branch 0.9.2, the test bench and the Doxygen API documentation has been expended significantly leading to an even more reliable implementation and hopefully an even smoother development experience. +
+ For the feature set, the GLSL noise functions are added, based on the implementation of webgl-noise. + Some users might prefer the promoted GLM_GTC_noise extension also based on webgl-noise but with a different interface and three noise methods: Perlin noise, periodic noise and simplex noise. +
+ Additionally, the random number generation functions (GLM_GTC_random) which provides various interesting distributions as illustrated below. + Also reaching GLM tool box, the new experimental extension GLM_GTX_constants provides a set of constants. +
+ Finally, swizzle operators are a challenging task to implement but thanks to the effort of many contributors, GLM 0.9.3.0 provides something interesting, but admittably + not perfect. The new implementation is a great improvement considering the incompatibilities with some external libraries in GLM 0.9.2.7. GLM 0.9.3 provides two implemetanations, one for C++ 98 compilers and one for C++ 11 compilers providing an implemetnation closer to what GLSL does. Indeed the C++ 98 implementation is compatible with C++ 11 compilers. -
- // To declare before including glm.hpp, to use the swizzle operators
- #define GLM_SWIZZLE
+ Implementation for C++ 98 compilers:
- // To declare before including glm.hpp, to use the swizzle operators
- #define GLM_SWIZZLE
- #include <glm/glm.hpp>
- void example_cpp98()
- { @@ -49,7 +55,7 @@
- glm::vec4 b = glm::vec4(0, 2, 0, 0);
- - glm::vec3 c = (a.zyx() + b.xyz()) * 0.5f; + glm::vec3 c = vec4((a.zyx() + b.xyz()).xyz() * 0.5f, 1.0f);
- glm::vec2 d = glm::normalize(glm::vec2(c.yz()));
- @@ -57,7 +63,7 @@
- }
- // To declare before including glm.hpp, to use the swizzle operators
- #define GLM_SWIZZLE -
- #include <glm/glm.hpp>
- void example_cpp98() +
- #include <glm/glm.hpp>
- void example_cpp11()
- {
- @@ -65,10 +71,10 @@
- glm::vec4 b = glm::vec4(0, 2, 0, 0);
- - glm::vec3 c = (a.zyx() + b.xyz()) * 0.5f; -
- + glm::vec4 c = glm::vec4((a.zyx() + b.xyz()).xyz * 0.5f, 1.0f); +
- // Before being pasted to a function, a swizzle operator needs to be cast into
- // a vector either explicitly or with the operator ()
- glm::vec2 d = glm::normalize(glm::vec2(c.yz)); -
- +
- // glm::vec2 d = glm::normalize(c.yz()); // Equivalent code
- a.xyzw = d.xyxy;
-
}
diff --git a/doc/src/data.xml b/doc/src/data.xml
index 4cf5c9dfc3881277dd5b0baac16f2f28189889c4..dd1a556cc923681503da7137bcaa88c2694010ee 100644
--- a/doc/src/data.xml
+++ b/doc/src/data.xml
@@ -3,7 +3,7 @@
- + @@ -73,7 +73,7 @@ - + @@ -175,24 +175,19 @@ GLM 0.9.3.0 is finally released. Since the branch 0.9.2, the test bench and the Doxygen API documentation has been expended significantly leading to an even more reliable implementation and hopefully an even smoother development experience. -<<<<<<< HEAD - From the many improvements, it is worth to acknowledge the addition of the core noise functions as defined by GLSL. The implementation is based on the promoted GLM_GTC_noise features which implement a perlin noise, periodic perlin noise and a simplex noise. The random number generation functions (GLM_GTC_random) which provides various interesting distributions as illustrated below. Reaching GLM tool box, the new experimental extension GLM_GTX_constants provides a set of constant. + For the feature set, the GLSL noise functions are added, based on the implementation of webgl-noise. + Some users might prefer the promoted GLM_GTC_noise extension also based on webgl-noise but with a different interface and three noise methods: Perlin noise, periodic noise and simplex noise. -+ - Swizzle operators are a challenging task to implement but thanks to the effort of many contributors, GLM 0.9.3.0 provides finally something interesting even if - not perfect but still a great improvement considering the incompatibilities with some external libraries. GLM 0.9.3 provides two implemetanations, one for C++ 98 - compilers and one for C++ 11 compilers providing an implemetnation closer to what GLSL does. Indeed the C++ 98 implementation is compatible with C++ 11 compilers. -======= - For the feature set, the GLSL noise functions have been implemented and based on the implementation of webgl-noise. - Some users might prefer the promoted GLM_GTC_noise extension also based on webgl-noise but different interface and three noise methods: Perlin noise, periodic noise and simplex noise. ->>>>>>> 6de0628bc9cdb995b33a67edcd2fd852a6ee4ef8 + Additionally, the random number generation functions (GLM_GTC_random) which provides various interesting distributions as illustrated below. + Also reaching GLM tool box, the new experimental extension GLM_GTX_constants provides a set of constants. -+ - Finally, swizzle operators are a challenging task to implement but thanks to the effort of many contributors, GLM 0.9.3.0 provides finally something interesting even if - not perfect but still a great improvement considering the incompatibilities with some external libraries. GLM 0.9.3 provides two implemetanations, one for C++ 98 + Finally, swizzle operators are a challenging task to implement but thanks to the effort of many contributors, GLM 0.9.3.0 provides something interesting, but admittably + not perfect. The new implementation is a great improvement considering the incompatibilities with some external libraries in GLM 0.9.2.7. GLM 0.9.3 provides two implemetanations, one for C++ 98 compilers and one for C++ 11 compilers providing an implemetnation closer to what GLSL does. Indeed the C++ 98 implementation is compatible with C++ 11 compilers. @@ -267,12 +262,12 @@ glm::vec4 c = glm::vec4((a.zyx() + b.xyz()).xyz * 0.5f, 1.0f);-<<<<<<< HEAD - +// Before being pasted to a function, a swizzle operator needs to be cast into a vector either explicitly or with the operator () -// Before being pasted to a function, a swizzle operator needs to be cast into + ++ // a vector either explicitly or with the operator () +-======= ->>>>>>> 6de0628bc9cdb995b33a67edcd2fd852a6ee4ef8 glm::vec2 d = glm::normalize(glm::vec2(c.yz)); diff --git a/doc/src/util.xsl b/doc/src/util.xsl index fbcc86f7cbfb4524e6d481145e5c839abce9f3f1..4fa1e689728318954264812a5f2add9abfde1291 100644 --- a/doc/src/util.xsl +++ b/doc/src/util.xsl @@ -18,7 +18,7 @@ + +++ +
+ ++++