diff --git a/copying.txt b/copying.txt index 058348f14..124698ccf 100644 --- a/copying.txt +++ b/copying.txt @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2005 - 2011 G-Truc Creation +Copyright (c) 2005 - 2012 G-Truc Creation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/doc/about.html b/doc/about.html index 689dbab51..e33647d59 100644 --- a/doc/about.html +++ b/doc/about.html @@ -11,8 +11,8 @@ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); -

GLM Logo


Front page
Downloads
OpenGL SDK page

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

Report a bug
SourceForge page
G-Truc Creation page
Browse Git repository
Source snapshot


G-Truc

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


+

GLM Logo


Front page
Downloads
OpenGL SDK page

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

Report a bug
SourceForge page
G-Truc Creation page
Browse Git repository
Source snapshot


G-Truc

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


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

@@ -32,4 +32,4 @@ 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 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 officially supports the following compilers:
  • Clang 2.6 and higher
  • CUDA 3.0 and higher -
  • GCC 3.4 and higher
  • LLVM 2.3 through GCC 4.2 front-end and higher
  • Visual C++ 2005 and higher
  • Any conform C++98 or C++11 compiler
_________________

_________________

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

  • GCC 3.4 and higher
  • LLVM 2.3 through GCC 4.2 front-end and higher
  • Visual C++ 2005 and higher
  • Any conform C++98 or C++11 compiler
    • _________________

    _________________

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

    GLM Logo


    Front page
    Downloads
    OpenGL SDK page

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

    Report a bug
    SourceForge page
    G-Truc Creation page
    Browse Git repository
    Source snapshot


    G-Truc

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


    Compute a triangle normal:
    Copyright © 2005 - 2012G-Truc Creation
    \ No newline at end of file diff --git a/doc/common/style.css b/doc/common/style.css index 36d4a28df..39633db61 100644 --- a/doc/common/style.css +++ b/doc/common/style.css @@ -115,6 +115,36 @@ div.image text-align:right; } +div.post-image-white, +div.post-image-black +{ + width:100%; + padding-top:32px; + padding-bottom:32px; + text-align:center; + margin-left:auto; + margin-right:auto; + /*border-radius:0px;*/ +} + +div.post-image-black +{ + background-color:#000000; +} + +div.post-image-white +{ + background-color:#ffffff; +} + +div.post-image-title +{ + display:block; + font-style:italic; + text-align:center; + padding-bottom:32px; +} + img.menu-img { text-align:center; diff --git a/doc/download.html b/doc/download.html index 2894a32cc..d93a962d6 100644 --- a/doc/download.html +++ b/doc/download.html @@ -11,12 +11,12 @@ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); -

    GLM Logo


    Front page
    Downloads
    OpenGL SDK page

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

    Report a bug
    SourceForge page
    G-Truc Creation page
    Browse Git repository
    Source snapshot


    G-Truc

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


    Current release
    12/12/2011: - GLM 0.9.3.B +

    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 graphics programming


    Current release
    09/01/2012: + GLM 0.9.3.0 (4.3 MB) -
    _________________

    GLM - zip files
    12/12/2011: GLM 0.9.3.B (4.3 MB) -
    12/12/2011: GLM 0.9.2.8 (3.4 MB) +
    _________________

    GLM - zip files
    09/01/2012: GLM 0.9.3.0 (4.3 MB) +
    12/12/2011: GLM 0.9.3.B (4.3 MB)
    11/11/2011: GLM 0.9.3.A (4.3 MB)
    24/10/2011: GLM 0.9.2.7 (3.4 MB)
    01/10/2011: GLM 0.9.2.6 (3.4 MB) @@ -83,8 +83,8 @@
    02/19/2006: GLM 0.3.0.0 (945 KB)
    05/05/2005: GLM 0.2.0.0 (194 KB)
    02/21/2005: GLM 0.1.0.0 (29.2 KB) -
    _________________

    GLM - 7z files
    12/12/2011: GLM 0.9.3.B (2.8 MB) -
    12/12/2011: GLM 0.9.2.8 (2.1 MB) +
    _________________

    GLM - 7z files
    09/01/2012: GLM 0.9.3.0 (2.8 MB) +
    12/12/2011: GLM 0.9.3.B (2.8 MB)
    11/11/2011: GLM 0.9.3.A (2.8 MB)
    24/10/2011: GLM 0.9.2.7 (2.1 MB)
    01/10/2011: GLM 0.9.2.6 (2.1 MB) @@ -156,4 +156,4 @@
    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 +
    _________________

    _________________

    Copyright © 2005 - 2012G-Truc Creation
    \ No newline at end of file diff --git a/doc/glm-0.9.3.pdf b/doc/glm-0.9.3.pdf index 587329931..4766d06bb 100644 Binary files a/doc/glm-0.9.3.pdf and b/doc/glm-0.9.3.pdf differ diff --git a/doc/goodies.html b/doc/goodies.html index 05efa03db..bc5fe3c88 100644 --- a/doc/goodies.html +++ b/doc/goodies.html @@ -11,5 +11,5 @@ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); -

    GLM Logo


    Front page
    Downloads
    OpenGL SDK page

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

    Report a bug
    SourceForge page
    G-Truc Creation page
    Browse Git repository
    Source snapshot


    G-Truc

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


    16/10/2008
    GLM Logo

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

    16/10/2008
    GLM Font

    Download: Font (.otf)
    _________________

    _________________

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

    GLM Logo


    Front page
    Downloads
    OpenGL SDK page

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

    Report a bug
    SourceForge page
    G-Truc Creation page
    Browse Git repository
    Source snapshot


    G-Truc

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


    16/10/2008
    GLM Logo

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

    16/10/2008
    GLM Font

    Download: Font (.otf)
    _________________

    _________________

    Copyright © 2005 - 2012G-Truc Creation
    \ No newline at end of file diff --git a/doc/image/0075-1.jpg b/doc/image/0075-1.jpg new file mode 100644 index 000000000..125ce06db Binary files /dev/null and b/doc/image/0075-1.jpg differ diff --git a/doc/image/0075-2.jpg b/doc/image/0075-2.jpg new file mode 100644 index 000000000..a32c9e39b Binary files /dev/null and b/doc/image/0075-2.jpg differ diff --git a/doc/index.html b/doc/index.html index c0afce4e3..15b9bd9b2 100644 --- a/doc/index.html +++ b/doc/index.html @@ -11,8 +11,8 @@ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); -

    GLM Logo


    Front page
    Downloads
    OpenGL SDK page

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

    Report a bug
    SourceForge page
    G-Truc Creation page
    Browse Git repository
    Source snapshot


    G-Truc

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


    +

    GLM Logo


    Front page
    Downloads
    OpenGL SDK page

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

    Report a bug
    SourceForge page
    G-Truc Creation page
    Browse Git repository
    Source snapshot


    G-Truc

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


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

    @@ -34,10 +34,52 @@

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


    12/12/2011 - GLM 0.9.3 beta released

    - GLM 0.9.3 beta fixes various bugs and add support for Chrome Native Client

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

    12/12/2011 - GLM 0.9.2.8 released

    - This updated fixes bugs on the modf, step and outerProduct functions. -

    Download: GLM 0.9.2.8 (zip)
    Download: GLM 0.9.2.8 (7z)
    Link: Submit a bug report
    Link: GLM 0.9.2 Manual
    Link: GLM 0.9.2 API

    11/11/2011 - GLM 0.9.3 alpha released

    +


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

    2D simplex noise with GLM_GTC_noise
    2D simplex noise with GLM_GTC_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. +

    Spherical random distribution with GLM_GTC_random
    Spherical random distribution with GLM_GTC_random

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

    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() +
    • + { +
    • + glm::vec4 a = glm::vec4(2, 0, 0, 0); +
    • + glm::vec4 b = glm::vec4(0, 2, 0, 0); +
    • + glm::vec3 c = vec4((a.zyx() + b.xyz()).xyz() * 0.5f, 1.0f); +
    • + glm::vec2 d = glm::normalize(glm::vec2(c.yz())); +
    • + a.xyzw() = d.xyxy(); +
    • + } +
    Implementation for C++ 11 compilers:
    • // To declare before including glm.hpp, to use the swizzle operators
    • #define GLM_SWIZZLE +
    • #include <glm/glm.hpp>
    • void example_cpp11() +
    • + { +
    • + glm::vec4 a = glm::vec4(2, 0, 0, 0); +
    • + glm::vec4 b = glm::vec4(0, 2, 0, 0); +
    • + 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; +
    • + } +
    Download: GLM 0.9.3.0 (zip)
    Download: GLM 0.9.3.0 (7z)
    Link: Submit a bug report
    Link: GLM 0.9.3 Manual
    Link: GLM 0.9.3 API

    12/12/2011 - GLM 0.9.3 beta released

    + GLM 0.9.3 beta fixes various bugs and add support for Chrome Native Client

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

    11/11/2011 - GLM 0.9.3 alpha released

    GLM 0.9.3 is making progress which is illustrated by the release of this first alpha.

    Changelog:
    • Improved doxygen documentation @@ -406,4 +448,4 @@ 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 +

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

    Copyright © 2005 - 2012G-Truc Creation
    \ No newline at end of file diff --git a/doc/src/data.xml b/doc/src/data.xml index 45f88d14e..dd1a556cc 100644 --- a/doc/src/data.xml +++ b/doc/src/data.xml @@ -1,10 +1,10 @@ - +
    + - @@ -73,8 +73,8 @@
    - - + + @@ -170,7 +170,125 @@ - + + + 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 + + + #include + <glm/glm.hpp> + + + + + + void example_cpp98() + + + { + + + glm::vec4 a = glm::vec4(2, 0, 0, 0); + + + glm::vec4 b = glm::vec4(0, 2, 0, 0); + + + glm::vec3 c = vec4((a.zyx() + b.xyz()).xyz() * 0.5f, 1.0f); + + + glm::vec2 d = glm::normalize(glm::vec2(c.yz())); + + + a.xyzw() = d.xyxy(); + + + } + + + + + + // To declare before including glm.hpp, to use the swizzle operators + + + #define GLM_SWIZZLE + + + #include + <glm/glm.hpp> + + + + + + void example_cpp11() + + + { + + + glm::vec4 a = glm::vec4(2, 0, 0, 0); + + + glm::vec4 b = glm::vec4(0, 2, 0, 0); + + // To use a swizzle operator with an operator, it needs to be cast into a vector either explicitly or with the operator () + + 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; + + + } + + + + GLM 0.9.3.0 (zip) + GLM 0.9.3.0 (7z) + Submit a bug report + GLM 0.9.3 Manual + GLM 0.9.3 API + + + GLM 0.9.3 beta fixes various bugs and add support for Chrome Native Client @@ -181,18 +299,6 @@ GLM 0.9.3 Manual GLM 0.9.3 API - - - - This updated fixes bugs on the modf, step and outerProduct functions. - - - GLM 0.9.2.8 (zip) - GLM 0.9.2.8 (7z) - Submit a bug report - GLM 0.9.2 Manual - GLM 0.9.2 API - diff --git a/doc/src/util.xsl b/doc/src/util.xsl index fbcc86f7c..4fa1e6897 100644 --- a/doc/src/util.xsl +++ b/doc/src/util.xsl @@ -18,7 +18,7 @@ - + - + + + +
    + + {./@title} + +
    +     + +
    + + {./@title} + +
    +     +     + +
    + +
    +     +     + +
    diff --git a/glm/core/_detail.hpp b/glm/core/_detail.hpp index 6870db053..b842dea2b 100644 --- a/glm/core/_detail.hpp +++ b/glm/core/_detail.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights @@ -357,82 +357,82 @@ namespace detail { enum { - ERROR, - FLOAT, - INT + GLM_ERROR, + GLM_FLOAT, + GLM_INT }; }; template struct float_or_int_trait { - enum{ID = float_or_int_value::ERROR}; + enum{ID = float_or_int_value::GLM_ERROR}; }; template <> struct float_or_int_trait { - enum{ID = float_or_int_value::INT}; + enum{ID = float_or_int_value::GLM_INT}; }; template <> struct float_or_int_trait { - enum{ID = float_or_int_value::INT}; + enum{ID = float_or_int_value::GLM_INT}; }; template <> struct float_or_int_trait { - enum{ID = float_or_int_value::INT}; + enum{ID = float_or_int_value::GLM_INT}; }; template <> struct float_or_int_trait { - enum{ID = float_or_int_value::INT}; + enum{ID = float_or_int_value::GLM_INT}; }; template <> struct float_or_int_trait { - enum{ID = float_or_int_value::INT}; + enum{ID = float_or_int_value::GLM_INT}; }; template <> struct float_or_int_trait { - enum{ID = float_or_int_value::INT}; + enum{ID = float_or_int_value::GLM_INT}; }; template <> struct float_or_int_trait { - enum{ID = float_or_int_value::INT}; + enum{ID = float_or_int_value::GLM_INT}; }; template <> struct float_or_int_trait { - enum{ID = float_or_int_value::INT}; + enum{ID = float_or_int_value::GLM_INT}; }; template <> struct float_or_int_trait { - enum{ID = float_or_int_value::FLOAT}; + enum{ID = float_or_int_value::GLM_FLOAT}; }; template <> struct float_or_int_trait { - enum{ID = float_or_int_value::FLOAT}; + enum{ID = float_or_int_value::GLM_FLOAT}; }; template <> struct float_or_int_trait { - enum{ID = float_or_int_value::FLOAT}; + enum{ID = float_or_int_value::GLM_FLOAT}; }; }//namespace detail diff --git a/glm/core/_fixes.hpp b/glm/core/_fixes.hpp index 0ad430487..d85ea048d 100644 --- a/glm/core/_fixes.hpp +++ b/glm/core/_fixes.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/_swizzle.hpp b/glm/core/_swizzle.hpp index e58074b98..5e9d24a74 100644 --- a/glm/core/_swizzle.hpp +++ b/glm/core/_swizzle.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/_swizzle_func.hpp b/glm/core/_swizzle_func.hpp index b9df96a89..255a3ec98 100644 --- a/glm/core/_swizzle_func.hpp +++ b/glm/core/_swizzle_func.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/_vectorize.hpp b/glm/core/_vectorize.hpp index 24140dd31..e69d80910 100644 --- a/glm/core/_vectorize.hpp +++ b/glm/core/_vectorize.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/dummy.cpp b/glm/core/dummy.cpp index 695af54bc..443c072f3 100644 --- a/glm/core/dummy.cpp +++ b/glm/core/dummy.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/func_common.hpp b/glm/core/func_common.hpp index 6ac5c18e8..3c268190f 100644 --- a/glm/core/func_common.hpp +++ b/glm/core/func_common.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/func_common.inl b/glm/core/func_common.inl index 7535b1f9b..f075f209c 100644 --- a/glm/core/func_common.inl +++ b/glm/core/func_common.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights @@ -880,8 +880,8 @@ namespace detail ) { return typename detail::tvec2::bool_type( - isnan(x.x), - isnan(x.y)); + isinf(x.x), + isinf(x.y)); } template @@ -891,9 +891,9 @@ namespace detail ) { return typename detail::tvec3::bool_type( - isnan(x.x), - isnan(x.y), - isnan(x.z)); + isinf(x.x), + isinf(x.y), + isinf(x.z)); } template @@ -903,10 +903,10 @@ namespace detail ) { return typename detail::tvec4::bool_type( - isnan(x.x), - isnan(x.y), - isnan(x.z), - isnan(x.w)); + isinf(x.x), + isinf(x.y), + isinf(x.z), + isinf(x.w)); } GLM_FUNC_QUALIFIER int floatBitsToInt(float const & value) diff --git a/glm/core/func_exponential.hpp b/glm/core/func_exponential.hpp index d3f06612f..69399e86d 100644 --- a/glm/core/func_exponential.hpp +++ b/glm/core/func_exponential.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/func_exponential.inl b/glm/core/func_exponential.inl index c57852c1d..5ad49b7bc 100644 --- a/glm/core/func_exponential.inl +++ b/glm/core/func_exponential.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights @@ -87,29 +87,32 @@ namespace glm VECTORIZE_VEC(exp2) -namespace detail +namespace _detail { - template - struct compute_log2 + template + struct _compute_log2 { template - T operator() (T const & Value) const + T operator() (T const & Value) const; +/* { GLM_STATIC_ASSERT(0, "'log2' parameter has an invalid template parameter type. GLM core features only supports floating-point types, include for integer types support. Others types are not supported."); return Value; } +*/ }; template <> - struct compute_log2 + struct _compute_log2 { template T operator() (T const & Value) const { - return ::std::log(Value) / T(0.69314718055994530941723212145818); + return T(::std::log(Value)) / T(0.69314718055994530941723212145818); } }; -}//namespace detail + +}//namespace _detail // log2, ln2 = 0.69314718055994530941723212145818f template @@ -119,7 +122,7 @@ namespace detail ) { assert(x > genType(0)); // log2 is only defined on the range (0, inf] - return detail::compute_log2::ID>()(x); + return _detail::_compute_log2::ID>()(x); } VECTORIZE_VEC(log2) diff --git a/glm/core/func_geometric.hpp b/glm/core/func_geometric.hpp index bb9f24883..d24a9c86b 100644 --- a/glm/core/func_geometric.hpp +++ b/glm/core/func_geometric.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/func_geometric.inl b/glm/core/func_geometric.inl index 8d4792103..ccc5bbc52 100644 --- a/glm/core/func_geometric.inl +++ b/glm/core/func_geometric.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/func_integer.hpp b/glm/core/func_integer.hpp index 66f03a954..c9ae0c093 100644 --- a/glm/core/func_integer.hpp +++ b/glm/core/func_integer.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/func_integer.inl b/glm/core/func_integer.inl index 185f082d2..013197ce1 100644 --- a/glm/core/func_integer.inl +++ b/glm/core/func_integer.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/func_matrix.hpp b/glm/core/func_matrix.hpp index 8e88c519b..41acf5965 100644 --- a/glm/core/func_matrix.hpp +++ b/glm/core/func_matrix.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/func_matrix.inl b/glm/core/func_matrix.inl index 4bbfc511c..78f26cf82 100644 --- a/glm/core/func_matrix.inl +++ b/glm/core/func_matrix.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/func_noise.hpp b/glm/core/func_noise.hpp index 662f963cc..296554e18 100644 --- a/glm/core/func_noise.hpp +++ b/glm/core/func_noise.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/func_noise.inl b/glm/core/func_noise.inl index 91e0eb3d0..af197e418 100644 --- a/glm/core/func_noise.inl +++ b/glm/core/func_noise.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/func_packing.hpp b/glm/core/func_packing.hpp index 73363a8b9..91582b23a 100644 --- a/glm/core/func_packing.hpp +++ b/glm/core/func_packing.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/func_packing.inl b/glm/core/func_packing.inl index 844b5c53a..b025895a2 100644 --- a/glm/core/func_packing.inl +++ b/glm/core/func_packing.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights @@ -146,13 +146,33 @@ namespace glm GLM_FUNC_QUALIFIER uint packHalf2x16(detail::tvec2 const & v) { - detail::tvec2 Pack(detail::toFloat16(v.x), detail::toFloat16(v.y)); + union helper + { + uint other; + struct + { + detail::hdata a, b; + } orig; + } Pack; + + Pack.orig.a = detail::toFloat16(v.x); + Pack.orig.b = detail::toFloat16(v.y); return *(uint*)&Pack; } GLM_FUNC_QUALIFIER vec2 unpackHalf2x16(uint const & v) { - detail::tvec2 Unpack = *(detail::tvec2*)&v; - return vec2(detail::toFloat32(Unpack.x), detail::toFloat32(Unpack.y)); + union helper + { + uint other; + struct + { + detail::hdata a, b; + } orig; + } Unpack; + Unpack.other = v; + + return vec2(detail::toFloat32(Unpack.orig.a), detail::toFloat32(Unpack.orig.b)); } }//namespace glm + diff --git a/glm/core/func_trigonometric.hpp b/glm/core/func_trigonometric.hpp index 1ed682009..ba57cb67d 100644 --- a/glm/core/func_trigonometric.hpp +++ b/glm/core/func_trigonometric.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/func_trigonometric.inl b/glm/core/func_trigonometric.inl index b77ceb958..6d87bf3eb 100644 --- a/glm/core/func_trigonometric.inl +++ b/glm/core/func_trigonometric.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/func_vector_relational.hpp b/glm/core/func_vector_relational.hpp index d483eedc0..8afba3803 100644 --- a/glm/core/func_vector_relational.hpp +++ b/glm/core/func_vector_relational.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/func_vector_relational.inl b/glm/core/func_vector_relational.inl index a797063f0..0ef817af7 100644 --- a/glm/core/func_vector_relational.inl +++ b/glm/core/func_vector_relational.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/hint.hpp b/glm/core/hint.hpp index 086a65f1a..8776c7760 100644 --- a/glm/core/hint.hpp +++ b/glm/core/hint.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/intrinsic_common.hpp b/glm/core/intrinsic_common.hpp index 11f0ab347..c0e940152 100644 --- a/glm/core/intrinsic_common.hpp +++ b/glm/core/intrinsic_common.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/intrinsic_common.inl b/glm/core/intrinsic_common.inl index f9ad0f346..713d6635a 100644 --- a/glm/core/intrinsic_common.inl +++ b/glm/core/intrinsic_common.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/intrinsic_exponential.hpp b/glm/core/intrinsic_exponential.hpp index fb0859952..35341b967 100644 --- a/glm/core/intrinsic_exponential.hpp +++ b/glm/core/intrinsic_exponential.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/intrinsic_exponential.inl b/glm/core/intrinsic_exponential.inl index afa626969..7f5623b4e 100644 --- a/glm/core/intrinsic_exponential.inl +++ b/glm/core/intrinsic_exponential.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/intrinsic_geometric.hpp b/glm/core/intrinsic_geometric.hpp index 9d4bea206..8dfda2384 100644 --- a/glm/core/intrinsic_geometric.hpp +++ b/glm/core/intrinsic_geometric.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/intrinsic_geometric.inl b/glm/core/intrinsic_geometric.inl index 732f4b29e..aaaeb3667 100644 --- a/glm/core/intrinsic_geometric.inl +++ b/glm/core/intrinsic_geometric.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/intrinsic_matrix.hpp b/glm/core/intrinsic_matrix.hpp index 5765f5594..496741797 100644 --- a/glm/core/intrinsic_matrix.hpp +++ b/glm/core/intrinsic_matrix.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/intrinsic_matrix.inl b/glm/core/intrinsic_matrix.inl index 3fd86b061..6f0fdb7f0 100644 --- a/glm/core/intrinsic_matrix.inl +++ b/glm/core/intrinsic_matrix.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/intrinsic_trigonometric.hpp b/glm/core/intrinsic_trigonometric.hpp index c271c5575..6594b90f5 100644 --- a/glm/core/intrinsic_trigonometric.hpp +++ b/glm/core/intrinsic_trigonometric.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/intrinsic_trigonometric.inl b/glm/core/intrinsic_trigonometric.inl index 60b98772e..39d10e67d 100644 --- a/glm/core/intrinsic_trigonometric.inl +++ b/glm/core/intrinsic_trigonometric.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/intrinsic_vector_relational.hpp b/glm/core/intrinsic_vector_relational.hpp index 0bab1858a..8ca06a8fe 100644 --- a/glm/core/intrinsic_vector_relational.hpp +++ b/glm/core/intrinsic_vector_relational.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/intrinsic_vector_relational.inl b/glm/core/intrinsic_vector_relational.inl index 37354c712..0e8f97cd2 100644 --- a/glm/core/intrinsic_vector_relational.inl +++ b/glm/core/intrinsic_vector_relational.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index 5d6e46275..43f38f574 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights @@ -393,18 +393,10 @@ ///////////////// // Build model // -#if(GLM_COMPILER & GLM_COMPILER_VC) -# if defined(_M_X64) +#if((defined(__WORDSIZE) && (__WORDSIZE == 64)) || defined(__arch64__) || defined(__LP64__) || defined(_M_X64) || defined(__ppc64__) || defined(__x86_64__)) # define GLM_MODEL GLM_MODEL_64 -# else -# define GLM_MODEL GLM_MODEL_32 -# endif//_M_X64 -#elif(GLM_COMPILER & GLM_COMPILER_GCC) -# if(defined(__WORDSIZE) && (__WORDSIZE == 64)) || defined(__arch64__) || defined(__LP64__) || defined(__x86_64__) -# define GLM_MODEL GLM_MODEL_64 -# else -# define GLM_MODEL GLM_MODEL_32 -# endif// +#elif(defined(__i386__) || defined(__ppc__)) +# define GLM_MODEL GLM_MODEL_32 #else # define GLM_MODEL GLM_MODEL_32 #endif// diff --git a/glm/core/type.hpp b/glm/core/type.hpp index b4810a891..3bfe6cf51 100644 --- a/glm/core/type.hpp +++ b/glm/core/type.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_float.hpp b/glm/core/type_float.hpp index e82ab6c9c..b906dbb6e 100644 --- a/glm/core/type_float.hpp +++ b/glm/core/type_float.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_gentype.hpp b/glm/core/type_gentype.hpp index a617e8cbc..50e0ca01d 100644 --- a/glm/core/type_gentype.hpp +++ b/glm/core/type_gentype.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_gentype.inl b/glm/core/type_gentype.inl index b280eb8d6..cbad2732a 100644 --- a/glm/core/type_gentype.inl +++ b/glm/core/type_gentype.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_half.hpp b/glm/core/type_half.hpp index 5a14dcd49..1d933511b 100644 --- a/glm/core/type_half.hpp +++ b/glm/core/type_half.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_half.inl b/glm/core/type_half.inl index a9d5b9a62..046fec099 100644 --- a/glm/core/type_half.inl +++ b/glm/core/type_half.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_int.hpp b/glm/core/type_int.hpp index a413f7518..6a97ea693 100644 --- a/glm/core/type_int.hpp +++ b/glm/core/type_int.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_mat.hpp b/glm/core/type_mat.hpp index 4dc9d64c5..cbf0c205a 100644 --- a/glm/core/type_mat.hpp +++ b/glm/core/type_mat.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_mat.inl b/glm/core/type_mat.inl index 9b34e8f3f..06ce8f665 100644 --- a/glm/core/type_mat.inl +++ b/glm/core/type_mat.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_mat2x2.hpp b/glm/core/type_mat2x2.hpp index 1bec2e174..23781135f 100644 --- a/glm/core/type_mat2x2.hpp +++ b/glm/core/type_mat2x2.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_mat2x2.inl b/glm/core/type_mat2x2.inl index 079411b3b..a6227297c 100644 --- a/glm/core/type_mat2x2.inl +++ b/glm/core/type_mat2x2.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_mat2x3.hpp b/glm/core/type_mat2x3.hpp index 31fe18ab1..c76e27863 100644 --- a/glm/core/type_mat2x3.hpp +++ b/glm/core/type_mat2x3.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_mat2x3.inl b/glm/core/type_mat2x3.inl index 9bb4a449c..492460873 100644 --- a/glm/core/type_mat2x3.inl +++ b/glm/core/type_mat2x3.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_mat2x4.hpp b/glm/core/type_mat2x4.hpp index 13405d8ab..8003d4695 100644 --- a/glm/core/type_mat2x4.hpp +++ b/glm/core/type_mat2x4.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_mat2x4.inl b/glm/core/type_mat2x4.inl index 6ec1cd484..39c82251c 100644 --- a/glm/core/type_mat2x4.inl +++ b/glm/core/type_mat2x4.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_mat3x2.hpp b/glm/core/type_mat3x2.hpp index a19dc5093..6aee19665 100644 --- a/glm/core/type_mat3x2.hpp +++ b/glm/core/type_mat3x2.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_mat3x2.inl b/glm/core/type_mat3x2.inl index 011ee3300..05c7ed61b 100644 --- a/glm/core/type_mat3x2.inl +++ b/glm/core/type_mat3x2.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_mat3x3.hpp b/glm/core/type_mat3x3.hpp index e3eb61eaa..bd4d55294 100644 --- a/glm/core/type_mat3x3.hpp +++ b/glm/core/type_mat3x3.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_mat3x3.inl b/glm/core/type_mat3x3.inl index 72098aaf2..d94ad05cf 100644 --- a/glm/core/type_mat3x3.inl +++ b/glm/core/type_mat3x3.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_mat3x4.hpp b/glm/core/type_mat3x4.hpp index 38874b29d..fd1ffa2a6 100644 --- a/glm/core/type_mat3x4.hpp +++ b/glm/core/type_mat3x4.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_mat3x4.inl b/glm/core/type_mat3x4.inl index d4f5e2a3b..caf5a8b94 100644 --- a/glm/core/type_mat3x4.inl +++ b/glm/core/type_mat3x4.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_mat4x2.hpp b/glm/core/type_mat4x2.hpp index 586d4c535..96905f7aa 100644 --- a/glm/core/type_mat4x2.hpp +++ b/glm/core/type_mat4x2.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_mat4x2.inl b/glm/core/type_mat4x2.inl index 73c780cb5..582bb3c80 100644 --- a/glm/core/type_mat4x2.inl +++ b/glm/core/type_mat4x2.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_mat4x3.hpp b/glm/core/type_mat4x3.hpp index 4d61328cb..345bd3d81 100644 --- a/glm/core/type_mat4x3.hpp +++ b/glm/core/type_mat4x3.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_mat4x3.inl b/glm/core/type_mat4x3.inl index db823e0ee..badd92ebd 100644 --- a/glm/core/type_mat4x3.inl +++ b/glm/core/type_mat4x3.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_mat4x4.hpp b/glm/core/type_mat4x4.hpp index c4e5852f3..b0ebb39a1 100644 --- a/glm/core/type_mat4x4.hpp +++ b/glm/core/type_mat4x4.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_mat4x4.inl b/glm/core/type_mat4x4.inl index daa3c8c79..47cc30a6b 100644 --- a/glm/core/type_mat4x4.inl +++ b/glm/core/type_mat4x4.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_size.hpp b/glm/core/type_size.hpp index 1a4436744..c68a1f9b6 100644 --- a/glm/core/type_size.hpp +++ b/glm/core/type_size.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_vec.hpp b/glm/core/type_vec.hpp index 9630e5309..b3fdc9f3f 100644 --- a/glm/core/type_vec.hpp +++ b/glm/core/type_vec.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_vec.inl b/glm/core/type_vec.inl index f744dc714..fbaf08e75 100644 --- a/glm/core/type_vec.inl +++ b/glm/core/type_vec.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_vec1.hpp b/glm/core/type_vec1.hpp index f0393ab12..2011e3fff 100644 --- a/glm/core/type_vec1.hpp +++ b/glm/core/type_vec1.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_vec1.inl b/glm/core/type_vec1.inl index 07433aafc..781f89da3 100644 --- a/glm/core/type_vec1.inl +++ b/glm/core/type_vec1.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_vec2.hpp b/glm/core/type_vec2.hpp index 650786f97..e9020ef6c 100644 --- a/glm/core/type_vec2.hpp +++ b/glm/core/type_vec2.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_vec2.inl b/glm/core/type_vec2.inl index 3ffb7b71c..ac2b0b5e0 100644 --- a/glm/core/type_vec2.inl +++ b/glm/core/type_vec2.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_vec3.hpp b/glm/core/type_vec3.hpp index 4e19f4b9b..7a542c9d4 100644 --- a/glm/core/type_vec3.hpp +++ b/glm/core/type_vec3.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_vec3.inl b/glm/core/type_vec3.inl index 6628ebd13..3fe670b6c 100644 --- a/glm/core/type_vec3.inl +++ b/glm/core/type_vec3.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_vec4.hpp b/glm/core/type_vec4.hpp index b877aa521..424a178a0 100644 --- a/glm/core/type_vec4.hpp +++ b/glm/core/type_vec4.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/core/type_vec4.inl b/glm/core/type_vec4.inl index c4c0a26fc..b8ca8427b 100644 --- a/glm/core/type_vec4.inl +++ b/glm/core/type_vec4.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/ext.hpp b/glm/ext.hpp index 5c9b0fe51..be7b21766 100644 --- a/glm/ext.hpp +++ b/glm/ext.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/glm.hpp b/glm/glm.hpp index 00c147f08..d38b1bb29 100644 --- a/glm/glm.hpp +++ b/glm/glm.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtc/half_float.hpp b/glm/gtc/half_float.hpp index 7ceb8aeb6..30aabab60 100644 --- a/glm/gtc/half_float.hpp +++ b/glm/gtc/half_float.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtc/half_float.inl b/glm/gtc/half_float.inl index e4fd7fae0..8b5045182 100644 --- a/glm/gtc/half_float.inl +++ b/glm/gtc/half_float.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtc/matrix_access.hpp b/glm/gtc/matrix_access.hpp index d190d16d5..3085bf10a 100644 --- a/glm/gtc/matrix_access.hpp +++ b/glm/gtc/matrix_access.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights @@ -50,14 +50,14 @@ namespace glm /// @{ /// Get a specific row of a matrix. - /// @see - gtc_matrix_access + /// @see gtc_matrix_access template typename genType::row_type row( genType const & m, int index); /// Set a specific row to a matrix. - /// @see - gtc_matrix_access + /// @see gtc_matrix_access template genType row( genType const & m, @@ -65,14 +65,14 @@ namespace glm typename genType::row_type const & x); /// Get a specific column of a matrix. - /// @see - gtc_matrix_access + /// @see gtc_matrix_access template typename genType::col_type column( genType const & m, int index); /// Set a specific column to a matrix. - /// @see - gtc_matrix_access + /// @see gtc_matrix_access template genType column( genType const & m, diff --git a/glm/gtc/matrix_access.inl b/glm/gtc/matrix_access.inl index 1c327dc62..2f3f5009e 100644 --- a/glm/gtc/matrix_access.inl +++ b/glm/gtc/matrix_access.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtc/matrix_integer.hpp b/glm/gtc/matrix_integer.hpp index e4bef058a..190cdc6e6 100644 --- a/glm/gtc/matrix_integer.hpp +++ b/glm/gtc/matrix_integer.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights @@ -50,300 +50,300 @@ namespace glm /// @{ /// High-precision signed integer 2x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x2 highp_imat2; /// High-precision signed integer 3x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x3 highp_imat3; /// High-precision signed integer 4x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x4 highp_imat4; /// High-precision signed integer 2x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x2 highp_imat2x2; /// High-precision signed integer 2x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x3 highp_imat2x3; /// High-precision signed integer 2x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x4 highp_imat2x4; /// High-precision signed integer 3x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x2 highp_imat3x2; /// High-precision signed integer 3x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x3 highp_imat3x3; /// High-precision signed integer 3x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x4 highp_imat3x4; /// High-precision signed integer 4x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x2 highp_imat4x2; /// High-precision signed integer 4x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x3 highp_imat4x3; /// High-precision signed integer 4x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x4 highp_imat4x4; /// Medium-precision signed integer 2x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x2 mediump_imat2; /// Medium-precision signed integer 3x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x3 mediump_imat3; /// Medium-precision signed integer 4x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x4 mediump_imat4; /// Medium-precision signed integer 2x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x2 mediump_imat2x2; /// Medium-precision signed integer 2x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x3 mediump_imat2x3; /// Medium-precision signed integer 2x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x4 mediump_imat2x4; /// Medium-precision signed integer 3x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x2 mediump_imat3x2; /// Medium-precision signed integer 3x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x3 mediump_imat3x3; /// Medium-precision signed integer 3x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x4 mediump_imat3x4; /// Medium-precision signed integer 4x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x2 mediump_imat4x2; /// Medium-precision signed integer 4x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x3 mediump_imat4x3; /// Medium-precision signed integer 4x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x4 mediump_imat4x4; /// Low-precision signed integer 2x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x2 lowp_imat2; /// Low-precision signed integer 3x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x3 lowp_imat3; /// Low-precision signed integer 4x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x4 lowp_imat4; /// Low-precision signed integer 2x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x2 lowp_imat2x2; /// Low-precision signed integer 2x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x3 lowp_imat2x3; /// Low-precision signed integer 2x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x4 lowp_imat2x4; /// Low-precision signed integer 3x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x2 lowp_imat3x2; /// Low-precision signed integer 3x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x3 lowp_imat3x3; /// Low-precision signed integer 3x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x4 lowp_imat3x4; /// Low-precision signed integer 4x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x2 lowp_imat4x2; /// Low-precision signed integer 4x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x3 lowp_imat4x3; /// Low-precision signed integer 4x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x4 lowp_imat4x4; /// High-precision unsigned integer 2x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x2 highp_umat2; /// High-precision unsigned integer 3x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x3 highp_umat3; /// High-precision unsigned integer 4x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x4 highp_umat4; /// High-precision unsigned integer 2x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x2 highp_umat2x2; /// High-precision unsigned integer 2x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x3 highp_umat2x3; /// High-precision unsigned integer 2x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x4 highp_umat2x4; /// High-precision unsigned integer 3x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x2 highp_umat3x2; /// High-precision unsigned integer 3x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x3 highp_umat3x3; /// High-precision unsigned integer 3x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x4 highp_umat3x4; /// High-precision unsigned integer 4x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x2 highp_umat4x2; /// High-precision unsigned integer 4x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x3 highp_umat4x3; /// High-precision unsigned integer 4x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x4 highp_umat4x4; /// Medium-precision unsigned integer 2x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x2 mediump_umat2; /// Medium-precision unsigned integer 3x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x3 mediump_umat3; /// Medium-precision unsigned integer 4x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x4 mediump_umat4; /// Medium-precision unsigned integer 2x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x2 mediump_umat2x2; /// Medium-precision unsigned integer 2x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x3 mediump_umat2x3; /// Medium-precision unsigned integer 2x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x4 mediump_umat2x4; /// Medium-precision unsigned integer 3x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x2 mediump_umat3x2; /// Medium-precision unsigned integer 3x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x3 mediump_umat3x3; /// Medium-precision unsigned integer 3x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x4 mediump_umat3x4; /// Medium-precision unsigned integer 4x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x2 mediump_umat4x2; /// Medium-precision unsigned integer 4x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x3 mediump_umat4x3; /// Medium-precision unsigned integer 4x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x4 mediump_umat4x4; /// Low-precision unsigned integer 2x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x2 lowp_umat2; /// Low-precision unsigned integer 3x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x3 lowp_umat3; /// Low-precision unsigned integer 4x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x4 lowp_umat4; /// Low-precision unsigned integer 2x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x2 lowp_umat2x2; /// Low-precision unsigned integer 2x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x3 lowp_umat2x3; /// Low-precision unsigned integer 2x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat2x4 lowp_umat2x4; /// Low-precision unsigned integer 3x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x2 lowp_umat3x2; /// Low-precision unsigned integer 3x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x3 lowp_umat3x3; /// Low-precision unsigned integer 3x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat3x4 lowp_umat3x4; /// Low-precision unsigned integer 4x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x2 lowp_umat4x2; /// Low-precision unsigned integer 4x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x3 lowp_umat4x3; /// Low-precision unsigned integer 4x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef detail::tmat4x4 lowp_umat4x4; #if(defined(GLM_PRECISION_HIGHP_INT)) @@ -375,51 +375,51 @@ namespace glm #else //if(defined(GLM_PRECISION_MEDIUMP_INT)) /// Signed integer 2x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_imat2 imat2; /// Signed integer 3x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_imat3 imat3; /// Signed integer 4x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_imat4 imat4; /// Signed integer 2x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_imat2x2 imat2x2; /// Signed integer 2x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_imat2x3 imat2x3; /// Signed integer 2x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_imat2x4 imat2x4; /// Signed integer 3x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_imat3x2 imat3x2; /// Signed integer 3x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_imat3x3 imat3x3; /// Signed integer 3x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_imat3x4 imat3x4; /// Signed integer 4x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_imat4x2 imat4x2; /// Signed integer 4x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_imat4x3 imat4x3; /// Signed integer 4x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_imat4x4 imat4x4; #endif//GLM_PRECISION @@ -450,52 +450,53 @@ namespace glm typedef lowp_umat4x3 umat4x3; typedef lowp_umat4x4 umat4x4; #else //if(defined(GLM_PRECISION_MEDIUMP_UINT)) - /// Unsigned integer 2x2 matrix. - /// @see - gtc_matrix_integer + + /// Unsigned integer 2x2 matrix. + /// @see gtc_matrix_integer typedef mediump_umat2 umat2; /// Unsigned integer 3x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_umat3 umat3; /// Unsigned integer 4x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_umat4 umat4; /// Unsigned integer 2x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_umat2x2 umat2x2; /// Unsigned integer 2x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_umat2x3 umat2x3; /// Unsigned integer 2x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_umat2x4 umat2x4; /// Unsigned integer 3x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_umat3x2 umat3x2; /// Unsigned integer 3x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_umat3x3 umat3x3; /// Unsigned integer 3x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_umat3x4 umat3x4; /// Unsigned integer 4x2 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_umat4x2 umat4x2; /// Unsigned integer 4x3 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_umat4x3 umat4x3; /// Unsigned integer 4x4 matrix. - /// @see - gtc_matrix_integer + /// @see gtc_matrix_integer typedef mediump_umat4x4 umat4x4; #endif//GLM_PRECISION diff --git a/glm/gtc/matrix_inverse.hpp b/glm/gtc/matrix_inverse.hpp index 8a4d355cc..b7ca7c4d5 100644 --- a/glm/gtc/matrix_inverse.hpp +++ b/glm/gtc/matrix_inverse.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtc/matrix_inverse.inl b/glm/gtc/matrix_inverse.inl index 7d338fed0..c6deb061d 100644 --- a/glm/gtc/matrix_inverse.inl +++ b/glm/gtc/matrix_inverse.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtc/matrix_transform.hpp b/glm/gtc/matrix_transform.hpp index 66a2b5614..b4ec5e22e 100644 --- a/glm/gtc/matrix_transform.hpp +++ b/glm/gtc/matrix_transform.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtc/matrix_transform.inl b/glm/gtc/matrix_transform.inl index b1b19bfcd..f5dbe78b0 100644 --- a/glm/gtc/matrix_transform.inl +++ b/glm/gtc/matrix_transform.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights @@ -261,8 +261,8 @@ namespace glm Result[0][0] = w; Result[1][1] = h; Result[2][2] = (zFar + zNear) / (zFar - zNear); - Result[2][3] = valType(1); - Result[3][2] = -(valType(2) * zFar * zNear) / (zFar - zNear); + Result[2][3] = -valType(1); + Result[3][2] = (valType(2) * zFar * zNear) / (zFar - zNear); return Result; } diff --git a/glm/gtc/noise.hpp b/glm/gtc/noise.hpp index f41c9749e..d63ce48f7 100644 --- a/glm/gtc/noise.hpp +++ b/glm/gtc/noise.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtc/noise.inl b/glm/gtc/noise.inl index 9bfab8b26..25b96b53c 100644 --- a/glm/gtc/noise.inl +++ b/glm/gtc/noise.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Based on the work of Stefan Gustavson and Ashima Arts on "webgl-noise": // https://github.com/ashima/webgl-noise diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp index d01ae7cae..5b669c8bc 100644 --- a/glm/gtc/quaternion.hpp +++ b/glm/gtc/quaternion.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl index 1a220ad51..3cb4a604a 100644 --- a/glm/gtc/quaternion.inl +++ b/glm/gtc/quaternion.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtc/random.hpp b/glm/gtc/random.hpp index 688426ab4..3599d200c 100644 --- a/glm/gtc/random.hpp +++ b/glm/gtc/random.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtc/random.inl b/glm/gtc/random.inl index 981760431..9f9bb25f3 100644 --- a/glm/gtc/random.inl +++ b/glm/gtc/random.inl @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) ////////////////////////////////////////////////////////////////////////////////// // Created : 2011-09-19 // Updated : 2011-09-19 @@ -17,13 +17,15 @@ namespace detail struct compute_linearRand { template - GLM_FUNC_QUALIFIER T operator() (T const & Min, T const & Max) const + GLM_FUNC_QUALIFIER T operator() (T const & Min, T const & Max) const; +/* { GLM_STATIC_ASSERT(0, "'linearRand' invalid template parameter type. GLM_GTC_random only supports floating-point template types."); return Min; } +*/ }; - + template <> GLM_FUNC_QUALIFIER half compute_linearRand::operator() (half const & Min, half const & Max) const { @@ -41,6 +43,12 @@ namespace detail { return double(std::rand()) / double(RAND_MAX) * (Max - Min) + Min; } + + template <> + GLM_FUNC_QUALIFIER long double compute_linearRand::operator() (long double const & Min, long double const & Max) const + { + return (long double)(std::rand()) / (long double)(RAND_MAX) * (Max - Min) + Min; + } }//namespace detail template diff --git a/glm/gtc/swizzle.hpp b/glm/gtc/swizzle.hpp index e09d03e01..f2792aa8d 100644 --- a/glm/gtc/swizzle.hpp +++ b/glm/gtc/swizzle.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights @@ -51,11 +51,19 @@ namespace glm /// @addtogroup gtc_swizzle /// @{ + template class vecType> T const & swizzle( vecType const & v, comp x); + /// + /// + /// @param v Vector source + /// @param x + /// @tparam T + /// @tparam vecType + /// @see gtc_swizzle template class vecType> detail::tvec2 const & swizzle( vecType const & v, diff --git a/glm/gtc/swizzle.inl b/glm/gtc/swizzle.inl index 528e446d9..159d1132d 100644 --- a/glm/gtc/swizzle.inl +++ b/glm/gtc/swizzle.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtc/type_precision.hpp b/glm/gtc/type_precision.hpp index b02cd18b8..e33acce6f 100644 --- a/glm/gtc/type_precision.hpp +++ b/glm/gtc/type_precision.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtc/type_precision.inl b/glm/gtc/type_precision.inl index d1361bcf8..ea5b2faac 100644 --- a/glm/gtc/type_precision.inl +++ b/glm/gtc/type_precision.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtc/type_ptr.hpp b/glm/gtc/type_ptr.hpp index 8ae4e9dac..f4e9b70ce 100644 --- a/glm/gtc/type_ptr.hpp +++ b/glm/gtc/type_ptr.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtc/type_ptr.inl b/glm/gtc/type_ptr.inl index 24712e67d..f1638d287 100644 --- a/glm/gtc/type_ptr.inl +++ b/glm/gtc/type_ptr.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtc/ulp.hpp b/glm/gtc/ulp.hpp index ea05332e7..efcb4a5c3 100644 --- a/glm/gtc/ulp.hpp +++ b/glm/gtc/ulp.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtc/ulp.inl b/glm/gtc/ulp.inl index 10d9129c0..252978dcd 100644 --- a/glm/gtc/ulp.inl +++ b/glm/gtc/ulp.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-03-07 // Updated : 2011-12-12 diff --git a/glm/gtx/associated_min_max.hpp b/glm/gtx/associated_min_max.hpp index 8864034b7..14eaceb95 100644 --- a/glm/gtx/associated_min_max.hpp +++ b/glm/gtx/associated_min_max.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/associated_min_max.inl b/glm/gtx/associated_min_max.inl index e6684021f..eea04cd49 100644 --- a/glm/gtx/associated_min_max.inl +++ b/glm/gtx/associated_min_max.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-03-10 // Updated : 2008-03-15 diff --git a/glm/gtx/bit.hpp b/glm/gtx/bit.hpp index 43380df11..7916c5035 100644 --- a/glm/gtx/bit.hpp +++ b/glm/gtx/bit.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/bit.inl b/glm/gtx/bit.inl index 7f15dea7a..491d1bdaf 100644 --- a/glm/gtx/bit.inl +++ b/glm/gtx/bit.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-03-14 // Updated : 2008-11-14 diff --git a/glm/gtx/closest_point.hpp b/glm/gtx/closest_point.hpp index 5410a7949..08ec8099e 100644 --- a/glm/gtx/closest_point.hpp +++ b/glm/gtx/closest_point.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/closest_point.inl b/glm/gtx/closest_point.inl index 91aaed2ca..0f223b8c5 100644 --- a/glm/gtx/closest_point.inl +++ b/glm/gtx/closest_point.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-30 // Updated : 2008-10-05 diff --git a/glm/gtx/color_cast.hpp b/glm/gtx/color_cast.hpp index 82f1c1280..dc751132c 100644 --- a/glm/gtx/color_cast.hpp +++ b/glm/gtx/color_cast.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/color_cast.inl b/glm/gtx/color_cast.inl index 04752c6f9..00d5ed2d1 100644 --- a/glm/gtx/color_cast.inl +++ b/glm/gtx/color_cast.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-06-21 // Updated : 2007-08-03 diff --git a/glm/gtx/color_space.hpp b/glm/gtx/color_space.hpp index 188e9ce1d..b51e7599b 100644 --- a/glm/gtx/color_space.hpp +++ b/glm/gtx/color_space.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/color_space.inl b/glm/gtx/color_space.inl index 89f4e6dda..fb5a7ed95 100644 --- a/glm/gtx/color_space.inl +++ b/glm/gtx/color_space.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2007-02-22 diff --git a/glm/gtx/color_space_YCoCg.hpp b/glm/gtx/color_space_YCoCg.hpp index 83f8e9016..61ed4f6a1 100644 --- a/glm/gtx/color_space_YCoCg.hpp +++ b/glm/gtx/color_space_YCoCg.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/color_space_YCoCg.inl b/glm/gtx/color_space_YCoCg.inl index 23aa0e4b7..2c7dbf451 100644 --- a/glm/gtx/color_space_YCoCg.inl +++ b/glm/gtx/color_space_YCoCg.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-10-28 // Updated : 2008-10-28 diff --git a/glm/gtx/compatibility.hpp b/glm/gtx/compatibility.hpp index 448b570ea..9cc0d2813 100644 --- a/glm/gtx/compatibility.hpp +++ b/glm/gtx/compatibility.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/compatibility.inl b/glm/gtx/compatibility.inl index d266f18d2..5ad69af33 100644 --- a/glm/gtx/compatibility.inl +++ b/glm/gtx/compatibility.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-03-16 // Updated : 2008-10-24 diff --git a/glm/gtx/component_wise.hpp b/glm/gtx/component_wise.hpp index 6f3b969be..31cef7654 100644 --- a/glm/gtx/component_wise.hpp +++ b/glm/gtx/component_wise.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/component_wise.inl b/glm/gtx/component_wise.inl index 699dafc57..fbff05f41 100644 --- a/glm/gtx/component_wise.inl +++ b/glm/gtx/component_wise.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-05-21 // Updated : 2010-02-12 diff --git a/glm/gtx/constants.hpp b/glm/gtx/constants.hpp index e7e2169a2..173af69e7 100644 --- a/glm/gtx/constants.hpp +++ b/glm/gtx/constants.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/constants.inl b/glm/gtx/constants.inl index ffdebcf28..7494875db 100644 --- a/glm/gtx/constants.inl +++ b/glm/gtx/constants.inl @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/epsilon.hpp b/glm/gtx/epsilon.hpp index 962d35672..6537db647 100644 --- a/glm/gtx/epsilon.hpp +++ b/glm/gtx/epsilon.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/epsilon.inl b/glm/gtx/epsilon.inl index 7ebc69ae6..7a82f7cd8 100644 --- a/glm/gtx/epsilon.inl +++ b/glm/gtx/epsilon.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2011-06-07 diff --git a/glm/gtx/euler_angles.hpp b/glm/gtx/euler_angles.hpp index d63e3e937..7a129b4a7 100644 --- a/glm/gtx/euler_angles.hpp +++ b/glm/gtx/euler_angles.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/euler_angles.inl b/glm/gtx/euler_angles.inl index 3322e410b..896ec0602 100644 --- a/glm/gtx/euler_angles.inl +++ b/glm/gtx/euler_angles.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2007-08-14 diff --git a/glm/gtx/extend.hpp b/glm/gtx/extend.hpp index d2a207a8f..81ce08734 100644 --- a/glm/gtx/extend.hpp +++ b/glm/gtx/extend.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/extend.inl b/glm/gtx/extend.inl index 97f1c0c0c..b65a69f25 100644 --- a/glm/gtx/extend.inl +++ b/glm/gtx/extend.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-01-07 // Updated : 2008-10-05 diff --git a/glm/gtx/extented_min_max.hpp b/glm/gtx/extented_min_max.hpp index ab2e698a1..c547134a9 100644 --- a/glm/gtx/extented_min_max.hpp +++ b/glm/gtx/extented_min_max.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/extented_min_max.inl b/glm/gtx/extented_min_max.inl index 2c641851c..5102c9a04 100644 --- a/glm/gtx/extented_min_max.inl +++ b/glm/gtx/extented_min_max.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-03-14 // Updated : 2010-02-19 diff --git a/glm/gtx/fast_exponential.hpp b/glm/gtx/fast_exponential.hpp index 16af191d8..f89ed7f6b 100644 --- a/glm/gtx/fast_exponential.hpp +++ b/glm/gtx/fast_exponential.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/fast_exponential.inl b/glm/gtx/fast_exponential.inl index 519d39745..4f0c5ad30 100644 --- a/glm/gtx/fast_exponential.inl +++ b/glm/gtx/fast_exponential.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-01-09 // Updated : 2006-01-09 diff --git a/glm/gtx/fast_square_root.hpp b/glm/gtx/fast_square_root.hpp index 3dba8591c..4b8f9ed8a 100644 --- a/glm/gtx/fast_square_root.hpp +++ b/glm/gtx/fast_square_root.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/fast_square_root.inl b/glm/gtx/fast_square_root.inl index e993d4067..bbab99392 100644 --- a/glm/gtx/fast_square_root.inl +++ b/glm/gtx/fast_square_root.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-01-04 // Updated : 2011-10-14 diff --git a/glm/gtx/fast_trigonometry.hpp b/glm/gtx/fast_trigonometry.hpp index 5913f51bf..3c182e243 100644 --- a/glm/gtx/fast_trigonometry.hpp +++ b/glm/gtx/fast_trigonometry.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/fast_trigonometry.inl b/glm/gtx/fast_trigonometry.inl index c516ea360..aa2d1cef2 100644 --- a/glm/gtx/fast_trigonometry.inl +++ b/glm/gtx/fast_trigonometry.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-01-08 // Updated : 2011-10-14 diff --git a/glm/gtx/gradient_paint.hpp b/glm/gtx/gradient_paint.hpp index 746e32a7d..818c68506 100644 --- a/glm/gtx/gradient_paint.hpp +++ b/glm/gtx/gradient_paint.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/gradient_paint.inl b/glm/gtx/gradient_paint.inl index d482e6ded..e5fed92bb 100644 --- a/glm/gtx/gradient_paint.inl +++ b/glm/gtx/gradient_paint.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-03-06 // Updated : 2009-03-09 diff --git a/glm/gtx/handed_coordinate_space.hpp b/glm/gtx/handed_coordinate_space.hpp index e69c5e631..0859a32a4 100644 --- a/glm/gtx/handed_coordinate_space.hpp +++ b/glm/gtx/handed_coordinate_space.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/handed_coordinate_space.inl b/glm/gtx/handed_coordinate_space.inl index c2e1e6474..2b3778af8 100644 --- a/glm/gtx/handed_coordinate_space.inl +++ b/glm/gtx/handed_coordinate_space.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2009-02-19 diff --git a/glm/gtx/inertia.hpp b/glm/gtx/inertia.hpp index bda6f3235..6381f4b28 100644 --- a/glm/gtx/inertia.hpp +++ b/glm/gtx/inertia.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/inertia.inl b/glm/gtx/inertia.inl index d2f9e0ac9..f6eeb48db 100644 --- a/glm/gtx/inertia.inl +++ b/glm/gtx/inertia.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-04-21 // Updated : 2006-12-06 diff --git a/glm/gtx/int_10_10_10_2.hpp b/glm/gtx/int_10_10_10_2.hpp index 5b49fe072..6e5c5e881 100644 --- a/glm/gtx/int_10_10_10_2.hpp +++ b/glm/gtx/int_10_10_10_2.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/int_10_10_10_2.inl b/glm/gtx/int_10_10_10_2.inl index 9632d544b..f6b15d7cb 100644 --- a/glm/gtx/int_10_10_10_2.inl +++ b/glm/gtx/int_10_10_10_2.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-07-07 // Updated : 2010-07-07 diff --git a/glm/gtx/integer.hpp b/glm/gtx/integer.hpp index 7ad8dc9c3..3fddf212c 100644 --- a/glm/gtx/integer.hpp +++ b/glm/gtx/integer.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/integer.inl b/glm/gtx/integer.inl index 4342cf1a4..fe630dca6 100644 --- a/glm/gtx/integer.inl +++ b/glm/gtx/integer.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-24 // Updated : 2011-10-13 @@ -38,7 +38,7 @@ namespace glm } // Henry Gordon Dietz: http://aggregate.org/MAGIC/ -namespace detail +namespace _detail { GLM_FUNC_QUALIFIER unsigned int ones32(unsigned int x) { @@ -55,19 +55,22 @@ namespace detail } template <> - struct compute_log2 + struct _compute_log2 { template T operator() (T const & Value) const { -#if(GLM_COMPILER & (GLM_COMPILER_VC | GLM_COMPILER_GCC)) +#if(GLM_COMPILER & GLM_COMPILER_VC) return Value <= T(1) ? T(0) : T(32) - nlz(Value - T(1)); +#elif(GLM_COMPILER & GLM_COMPILER_GCC) + return Value <= T(1) ? T(0) : nlz(Value - T(1)) + 1; #else return T(32) - nlz(Value - T(1)); #endif } }; -}//namespace detail + +}//namespace _detail // Henry Gordon Dietz: http://aggregate.org/MAGIC/ unsigned int floor_log2(unsigned int x) @@ -78,7 +81,7 @@ namespace detail x |= (x >> 8); x |= (x >> 16); - return(detail::ones32(x) - 1); + return(_detail::ones32(x) - 1); } // mod diff --git a/glm/gtx/intersect.hpp b/glm/gtx/intersect.hpp index 3a87e0bd3..1c090b678 100644 --- a/glm/gtx/intersect.hpp +++ b/glm/gtx/intersect.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/intersect.inl b/glm/gtx/intersect.inl index 80cc60e34..ad55837fd 100644 --- a/glm/gtx/intersect.inl +++ b/glm/gtx/intersect.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-04-03 // Updated : 2009-01-20 diff --git a/glm/gtx/log_base.hpp b/glm/gtx/log_base.hpp index e1caeea22..3be1ec605 100644 --- a/glm/gtx/log_base.hpp +++ b/glm/gtx/log_base.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/log_base.inl b/glm/gtx/log_base.inl index ec2fe8118..44a684146 100644 --- a/glm/gtx/log_base.inl +++ b/glm/gtx/log_base.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-10-24 // Updated : 2008-10-24 diff --git a/glm/gtx/matrix_cross_product.hpp b/glm/gtx/matrix_cross_product.hpp index 978172d82..8f682ec3e 100644 --- a/glm/gtx/matrix_cross_product.hpp +++ b/glm/gtx/matrix_cross_product.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/matrix_cross_product.inl b/glm/gtx/matrix_cross_product.inl index ea0fa02e7..e5f48e884 100644 --- a/glm/gtx/matrix_cross_product.inl +++ b/glm/gtx/matrix_cross_product.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2005-12-21 diff --git a/glm/gtx/matrix_interpolation.hpp b/glm/gtx/matrix_interpolation.hpp index df9be92fd..d842986f3 100644 --- a/glm/gtx/matrix_interpolation.hpp +++ b/glm/gtx/matrix_interpolation.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/matrix_interpolation.inl b/glm/gtx/matrix_interpolation.inl index c3df381c4..92deb2e33 100644 --- a/glm/gtx/matrix_interpolation.inl +++ b/glm/gtx/matrix_interpolation.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-03-05 // Updated : 2011-03-05 diff --git a/glm/gtx/matrix_major_storage.hpp b/glm/gtx/matrix_major_storage.hpp index 165fae88d..a971a02c1 100644 --- a/glm/gtx/matrix_major_storage.hpp +++ b/glm/gtx/matrix_major_storage.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/matrix_major_storage.inl b/glm/gtx/matrix_major_storage.inl index eec99855c..78ba72f8e 100644 --- a/glm/gtx/matrix_major_storage.inl +++ b/glm/gtx/matrix_major_storage.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-04-19 // Updated : 2009-02-19 diff --git a/glm/gtx/matrix_operation.hpp b/glm/gtx/matrix_operation.hpp index ad224459b..f665ac2c3 100644 --- a/glm/gtx/matrix_operation.hpp +++ b/glm/gtx/matrix_operation.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/matrix_operation.inl b/glm/gtx/matrix_operation.inl index 04093b0b1..159b75257 100644 --- a/glm/gtx/matrix_operation.inl +++ b/glm/gtx/matrix_operation.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-08-29 // Updated : 2009-08-29 diff --git a/glm/gtx/matrix_query.hpp b/glm/gtx/matrix_query.hpp index 4f356c71c..fbf6597a0 100644 --- a/glm/gtx/matrix_query.hpp +++ b/glm/gtx/matrix_query.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/matrix_query.inl b/glm/gtx/matrix_query.inl index 647c96778..52eabe98a 100644 --- a/glm/gtx/matrix_query.inl +++ b/glm/gtx/matrix_query.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-03-05 // Updated : 2007-03-05 diff --git a/glm/gtx/mixed_product.hpp b/glm/gtx/mixed_product.hpp index e8ecc0287..816ae5263 100644 --- a/glm/gtx/mixed_product.hpp +++ b/glm/gtx/mixed_product.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/mixed_product.inl b/glm/gtx/mixed_product.inl index c6bb200d0..c07895de9 100644 --- a/glm/gtx/mixed_product.inl +++ b/glm/gtx/mixed_product.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-04-03 // Updated : 2008-09-17 diff --git a/glm/gtx/multiple.hpp b/glm/gtx/multiple.hpp index f6ec25355..02383e2f1 100644 --- a/glm/gtx/multiple.hpp +++ b/glm/gtx/multiple.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/multiple.inl b/glm/gtx/multiple.inl index e2cf531be..599549420 100644 --- a/glm/gtx/multiple.inl +++ b/glm/gtx/multiple.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-10-26 // Updated : 2011-06-07 diff --git a/glm/gtx/noise.hpp b/glm/gtx/noise.hpp index c417eb650..704de26e6 100644 --- a/glm/gtx/noise.hpp +++ b/glm/gtx/noise.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/noise.inl b/glm/gtx/noise.inl index 389e48009..b12318466 100644 --- a/glm/gtx/noise.inl +++ b/glm/gtx/noise.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Based on the work of Stefan Gustavson and Ashima Arts on "webgl-noise": // https://github.com/ashima/webgl-noise diff --git a/glm/gtx/norm.hpp b/glm/gtx/norm.hpp index a96aa90bd..a34efe057 100644 --- a/glm/gtx/norm.hpp +++ b/glm/gtx/norm.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/norm.inl b/glm/gtx/norm.inl index 92d12fcdf..a44201f8c 100644 --- a/glm/gtx/norm.inl +++ b/glm/gtx/norm.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2008-07-24 diff --git a/glm/gtx/normal.hpp b/glm/gtx/normal.hpp index 6893cefd4..4da35866e 100644 --- a/glm/gtx/normal.hpp +++ b/glm/gtx/normal.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/normal.inl b/glm/gtx/normal.inl index 6d002cb68..ee8f8167f 100644 --- a/glm/gtx/normal.inl +++ b/glm/gtx/normal.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2011-06-07 diff --git a/glm/gtx/normalize_dot.hpp b/glm/gtx/normalize_dot.hpp index 617491af7..ab84baaa8 100644 --- a/glm/gtx/normalize_dot.hpp +++ b/glm/gtx/normalize_dot.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/normalize_dot.inl b/glm/gtx/normalize_dot.inl index 5d73b025b..a492d4bcc 100644 --- a/glm/gtx/normalize_dot.inl +++ b/glm/gtx/normalize_dot.inl @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) ////////////////////////////////////////////////////////////////////////////////// // Created : 2007-09-28 // Updated : 2008-10-07 diff --git a/glm/gtx/number_precision.hpp b/glm/gtx/number_precision.hpp index 8f1e8c0cb..a6dc65627 100644 --- a/glm/gtx/number_precision.hpp +++ b/glm/gtx/number_precision.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/number_precision.inl b/glm/gtx/number_precision.inl index e2de65e81..9dff374e8 100644 --- a/glm/gtx/number_precision.inl +++ b/glm/gtx/number_precision.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-05-10 // Updated : 2007-05-10 diff --git a/glm/gtx/ocl_type.hpp b/glm/gtx/ocl_type.hpp index 4df825353..e5bb381be 100644 --- a/glm/gtx/ocl_type.hpp +++ b/glm/gtx/ocl_type.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/optimum_pow.hpp b/glm/gtx/optimum_pow.hpp index 90b0cab79..d5175c3b1 100644 --- a/glm/gtx/optimum_pow.hpp +++ b/glm/gtx/optimum_pow.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/optimum_pow.inl b/glm/gtx/optimum_pow.inl index 91ab09289..12476977b 100644 --- a/glm/gtx/optimum_pow.inl +++ b/glm/gtx/optimum_pow.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2005-12-27 diff --git a/glm/gtx/orthonormalize.hpp b/glm/gtx/orthonormalize.hpp index 02c92958d..c9211a817 100644 --- a/glm/gtx/orthonormalize.hpp +++ b/glm/gtx/orthonormalize.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/orthonormalize.inl b/glm/gtx/orthonormalize.inl index 008e2d807..559a3aea5 100644 --- a/glm/gtx/orthonormalize.inl +++ b/glm/gtx/orthonormalize.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2005-12-21 diff --git a/glm/gtx/perpendicular.hpp b/glm/gtx/perpendicular.hpp index cef3ae2a8..f7f657c27 100644 --- a/glm/gtx/perpendicular.hpp +++ b/glm/gtx/perpendicular.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/perpendicular.inl b/glm/gtx/perpendicular.inl index cae91bcb0..fe3334619 100644 --- a/glm/gtx/perpendicular.inl +++ b/glm/gtx/perpendicular.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2009-03-06 diff --git a/glm/gtx/polar_coordinates.hpp b/glm/gtx/polar_coordinates.hpp index 2fbae567e..8b3668e44 100644 --- a/glm/gtx/polar_coordinates.hpp +++ b/glm/gtx/polar_coordinates.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/polar_coordinates.inl b/glm/gtx/polar_coordinates.inl index 360c0356d..173fbaea2 100644 --- a/glm/gtx/polar_coordinates.inl +++ b/glm/gtx/polar_coordinates.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-03-06 // Updated : 2009-05-01 diff --git a/glm/gtx/projection.hpp b/glm/gtx/projection.hpp index 177b60d9d..2aa18745b 100644 --- a/glm/gtx/projection.hpp +++ b/glm/gtx/projection.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/projection.inl b/glm/gtx/projection.inl index c8dbe77bc..263b75709 100644 --- a/glm/gtx/projection.inl +++ b/glm/gtx/projection.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2009-03-06 diff --git a/glm/gtx/quaternion.hpp b/glm/gtx/quaternion.hpp index 4c471d603..e5e3e404a 100644 --- a/glm/gtx/quaternion.hpp +++ b/glm/gtx/quaternion.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/quaternion.inl b/glm/gtx/quaternion.inl index ce7f932b1..1c2e5056e 100644 --- a/glm/gtx/quaternion.inl +++ b/glm/gtx/quaternion.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2008-11-27 diff --git a/glm/gtx/random.hpp b/glm/gtx/random.hpp index 9b70c35a9..fd3bc5703 100644 --- a/glm/gtx/random.hpp +++ b/glm/gtx/random.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/random.inl b/glm/gtx/random.inl index 2b0fa9d7a..0c2442293 100644 --- a/glm/gtx/random.inl +++ b/glm/gtx/random.inl @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) ////////////////////////////////////////////////////////////////////////////////// // Created : 2006-01-16 // Updated : 2006-01-16 diff --git a/glm/gtx/raw_data.hpp b/glm/gtx/raw_data.hpp index c3691a13c..e1fd5150a 100644 --- a/glm/gtx/raw_data.hpp +++ b/glm/gtx/raw_data.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/raw_data.inl b/glm/gtx/raw_data.inl index 93b2a55a5..7573120c6 100644 --- a/glm/gtx/raw_data.inl +++ b/glm/gtx/raw_data.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-11-19 // Updated : 2008-11-19 diff --git a/glm/gtx/reciprocal.hpp b/glm/gtx/reciprocal.hpp index 31ace5a9c..8c328aed5 100644 --- a/glm/gtx/reciprocal.hpp +++ b/glm/gtx/reciprocal.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/reciprocal.inl b/glm/gtx/reciprocal.inl index ac2f1ce67..d3ae48ac1 100644 --- a/glm/gtx/reciprocal.inl +++ b/glm/gtx/reciprocal.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-10-09 // Updated : 2011-10-14 diff --git a/glm/gtx/rotate_vector.hpp b/glm/gtx/rotate_vector.hpp index 14628b208..136e27a01 100644 --- a/glm/gtx/rotate_vector.hpp +++ b/glm/gtx/rotate_vector.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/rotate_vector.inl b/glm/gtx/rotate_vector.inl index 631063455..4a934ac50 100644 --- a/glm/gtx/rotate_vector.inl +++ b/glm/gtx/rotate_vector.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-11-02 // Updated : 2009-02-19 diff --git a/glm/gtx/simd_mat4.hpp b/glm/gtx/simd_mat4.hpp index 1569a03eb..8b0ab1199 100644 --- a/glm/gtx/simd_mat4.hpp +++ b/glm/gtx/simd_mat4.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/simd_mat4.inl b/glm/gtx/simd_mat4.inl index c71593fa3..62e1c1f47 100644 --- a/glm/gtx/simd_mat4.inl +++ b/glm/gtx/simd_mat4.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-05-19 // Updated : 2009-05-19 diff --git a/glm/gtx/simd_vec4.hpp b/glm/gtx/simd_vec4.hpp index c08fe51dd..e35efc8cf 100644 --- a/glm/gtx/simd_vec4.hpp +++ b/glm/gtx/simd_vec4.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/simd_vec4.inl b/glm/gtx/simd_vec4.inl index 4d8819a20..321ce4f46 100644 --- a/glm/gtx/simd_vec4.inl +++ b/glm/gtx/simd_vec4.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-05-07 // Updated : 2009-05-07 diff --git a/glm/gtx/spline.hpp b/glm/gtx/spline.hpp index 4580f3899..c21c70383 100644 --- a/glm/gtx/spline.hpp +++ b/glm/gtx/spline.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/spline.inl b/glm/gtx/spline.inl index d836a313d..23f895c7d 100644 --- a/glm/gtx/spline.inl +++ b/glm/gtx/spline.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-01-25 // Updated : 2009-02-19 diff --git a/glm/gtx/std_based_type.hpp b/glm/gtx/std_based_type.hpp index 5a94fdab9..327939f87 100644 --- a/glm/gtx/std_based_type.hpp +++ b/glm/gtx/std_based_type.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/std_based_type.inl b/glm/gtx/std_based_type.inl index 5b735afe4..67e7ad02c 100644 --- a/glm/gtx/std_based_type.inl +++ b/glm/gtx/std_based_type.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-06-08 // Updated : 2008-06-08 diff --git a/glm/gtx/string_cast.hpp b/glm/gtx/string_cast.hpp index 6d025b752..69d370ae8 100644 --- a/glm/gtx/string_cast.hpp +++ b/glm/gtx/string_cast.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/transform.hpp b/glm/gtx/transform.hpp index 71495aeff..f9600ca53 100644 --- a/glm/gtx/transform.hpp +++ b/glm/gtx/transform.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/transform.inl b/glm/gtx/transform.inl index f78bfb715..3b6fde949 100644 --- a/glm/gtx/transform.inl +++ b/glm/gtx/transform.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-21 // Updated : 2009-04-29 diff --git a/glm/gtx/transform2.hpp b/glm/gtx/transform2.hpp index 87de811a8..9d0a08d19 100644 --- a/glm/gtx/transform2.hpp +++ b/glm/gtx/transform2.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/transform2.inl b/glm/gtx/transform2.inl index 4c75e9dfd..aa1c1ed3d 100644 --- a/glm/gtx/transform2.inl +++ b/glm/gtx/transform2.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-02-28 // Updated : 2005-04-23 diff --git a/glm/gtx/unsigned_int.hpp b/glm/gtx/unsigned_int.hpp index d494905f6..c17719d86 100644 --- a/glm/gtx/unsigned_int.hpp +++ b/glm/gtx/unsigned_int.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/unsigned_int.inl b/glm/gtx/unsigned_int.inl index f40158b6a..b73461d4f 100644 --- a/glm/gtx/unsigned_int.inl +++ b/glm/gtx/unsigned_int.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-24 // Updated : 2008-10-07 diff --git a/glm/gtx/vec1.hpp b/glm/gtx/vec1.hpp index c001b3937..84a6217d0 100644 --- a/glm/gtx/vec1.hpp +++ b/glm/gtx/vec1.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/vector_access.hpp b/glm/gtx/vector_access.hpp index e3e4575d3..88cc25617 100644 --- a/glm/gtx/vector_access.hpp +++ b/glm/gtx/vector_access.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/vector_access.inl b/glm/gtx/vector_access.inl index e4906eeec..8ccb5558e 100644 --- a/glm/gtx/vector_access.inl +++ b/glm/gtx/vector_access.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-01-16 // Updated : 2008-10-07 diff --git a/glm/gtx/vector_angle.hpp b/glm/gtx/vector_angle.hpp index ec0804ddc..1906fa577 100644 --- a/glm/gtx/vector_angle.hpp +++ b/glm/gtx/vector_angle.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/vector_angle.inl b/glm/gtx/vector_angle.inl index bf01b4d8e..f15206bef 100644 --- a/glm/gtx/vector_angle.inl +++ b/glm/gtx/vector_angle.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2005-12-30 // Updated : 2008-09-29 diff --git a/glm/gtx/vector_query.hpp b/glm/gtx/vector_query.hpp index e200a2ab7..7459c27f8 100644 --- a/glm/gtx/vector_query.hpp +++ b/glm/gtx/vector_query.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/vector_query.inl b/glm/gtx/vector_query.inl index dc92896d6..d0906e1cf 100644 --- a/glm/gtx/vector_query.inl +++ b/glm/gtx/vector_query.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2007-03-05 // Updated : 2010-02-16 diff --git a/glm/gtx/verbose_operator.hpp b/glm/gtx/verbose_operator.hpp index 2475df871..d2ef8e516 100644 --- a/glm/gtx/verbose_operator.hpp +++ b/glm/gtx/verbose_operator.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/verbose_operator.inl b/glm/gtx/verbose_operator.inl index 8f2c90c0a..1193efb19 100644 --- a/glm/gtx/verbose_operator.inl +++ b/glm/gtx/verbose_operator.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2006-04-20 // Updated : 2008-09-29 diff --git a/glm/gtx/wrap.hpp b/glm/gtx/wrap.hpp index 79937932d..3f93973ca 100644 --- a/glm/gtx/wrap.hpp +++ b/glm/gtx/wrap.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/glm/gtx/wrap.inl b/glm/gtx/wrap.inl index d66e62e7d..bd3f12565 100644 --- a/glm/gtx/wrap.inl +++ b/glm/gtx/wrap.inl @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-11-25 // Updated : 2010-02-13 diff --git a/glm/virtrev/xstream.hpp b/glm/virtrev/xstream.hpp index 8d79cac10..b056a7f6b 100644 --- a/glm/virtrev/xstream.hpp +++ b/glm/virtrev/xstream.hpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////// /// OpenGL Mathematics (glm.g-truc.net) /// -/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /// Permission is hereby granted, free of charge, to any person obtaining a copy /// of this software and associated documentation files (the "Software"), to deal /// in the Software without restriction, including without limitation the rights diff --git a/readme.txt b/readme.txt index bb7344e0d..44400b1c3 100644 --- a/readme.txt +++ b/readme.txt @@ -7,7 +7,7 @@ glm@g-truc.net ================================================================================ The MIT License -------------------------------------------------------------------------------- -Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -37,17 +37,22 @@ More informations in GLM manual: http://glm.g-truc.net/glm-0.9.3.pdf ================================================================================ -GLM 0.9.3.B: 2011-12-13 +GLM 0.9.3.0: 2012-01-09 +-------------------------------------------------------------------------------- +- Added CPP Check project +- Fixed conflict with Windows headers +- Fixed isinf implementation +- Fixed Boost conflict +- Fixed warnings + +================================================================================ +GLM 0.9.3.B: 2011-12-12 -------------------------------------------------------------------------------- - Added support for Chrone Native Client - Added epsilon constant - Removed value_size function from vector types - Fixed roundEven on GCC - Improved API documentation - -================================================================================ -GLM 0.9.2.8: 2011-12-12 --------------------------------------------------------------------------------- - Fixed modf implementation - Fixed step function accuracy - Fixed outerProduct diff --git a/test/core/core_func_common.cpp b/test/core/core_func_common.cpp index 13d3faced..fd22dc7fb 100644 --- a/test/core/core_func_common.cpp +++ b/test/core/core_func_common.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-01-15 // Updated : 2011-09-13 @@ -7,7 +7,11 @@ // File : test/core/func_common.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// +//#include +//#include +//#include #include +#include #include #include diff --git a/test/core/core_func_exponential.cpp b/test/core/core_func_exponential.cpp index b7d267cae..a75bfaf3e 100644 --- a/test/core/core_func_exponential.cpp +++ b/test/core/core_func_exponential.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-01-15 // Updated : 2011-09-13 diff --git a/test/core/core_func_geometric.cpp b/test/core/core_func_geometric.cpp index b7e8f991d..d6b32761c 100644 --- a/test/core/core_func_geometric.cpp +++ b/test/core/core_func_geometric.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-01-15 // Updated : 2011-11-14 diff --git a/test/core/core_func_integer.cpp b/test/core/core_func_integer.cpp index 8fa70fc73..e931e6ae9 100644 --- a/test/core/core_func_integer.cpp +++ b/test/core/core_func_integer.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-05-03 // Updated : 2011-05-03 diff --git a/test/core/core_func_matrix.cpp b/test/core/core_func_matrix.cpp index a555f7147..cbdb6d0e4 100644 --- a/test/core/core_func_matrix.cpp +++ b/test/core/core_func_matrix.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-01-15 // Updated : 2011-01-15 diff --git a/test/core/core_func_noise.cpp b/test/core/core_func_noise.cpp index d21af461b..26f095f16 100644 --- a/test/core/core_func_noise.cpp +++ b/test/core/core_func_noise.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-01-15 // Updated : 2011-09-13 diff --git a/test/core/core_func_packing.cpp b/test/core/core_func_packing.cpp index 7676f9754..fa70e4f84 100644 --- a/test/core/core_func_packing.cpp +++ b/test/core/core_func_packing.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-01-15 // Updated : 2011-09-13 diff --git a/test/core/core_func_swizzle.cpp b/test/core/core_func_swizzle.cpp index b56b707ca..0a86ba71e 100644 --- a/test/core/core_func_swizzle.cpp +++ b/test/core/core_func_swizzle.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-10-16 // Updated : 2011-10-16 diff --git a/test/core/core_func_trigonometric.cpp b/test/core/core_func_trigonometric.cpp index eb4741fef..648e6883c 100644 --- a/test/core/core_func_trigonometric.cpp +++ b/test/core/core_func_trigonometric.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-01-15 // Updated : 2011-09-13 diff --git a/test/core/core_func_vector_relational.cpp b/test/core/core_func_vector_relational.cpp index 746b14125..4462ff99f 100644 --- a/test/core/core_func_vector_relational.cpp +++ b/test/core/core_func_vector_relational.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-01-15 // Updated : 2011-09-13 diff --git a/test/core/core_setup_message.cpp b/test/core/core_setup_message.cpp index a1bb420da..0a2029a75 100644 --- a/test/core/core_setup_message.cpp +++ b/test/core/core_setup_message.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-05-31 // Updated : 2011-05-31 @@ -13,7 +13,7 @@ int test_compiler() { - int Error = 0; + int Error(0); switch(GLM_COMPILER) { diff --git a/test/core/core_setup_precision.cpp b/test/core/core_setup_precision.cpp index 05decb5ff..977950d76 100644 --- a/test/core/core_setup_precision.cpp +++ b/test/core/core_setup_precision.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-05-31 // Updated : 2011-05-31 diff --git a/test/core/core_type_float.cpp b/test/core/core_type_float.cpp index 7d4c5b4d2..5958984a3 100644 --- a/test/core/core_type_float.cpp +++ b/test/core/core_type_float.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2011-05-06 diff --git a/test/core/core_type_half.cpp b/test/core/core_type_half.cpp index 0598ab4d0..2a9a5fe21 100644 --- a/test/core/core_type_half.cpp +++ b/test/core/core_type_half.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2011-09-20 diff --git a/test/core/core_type_int.cpp b/test/core/core_type_int.cpp index 035622dfe..9437de8f6 100644 --- a/test/core/core_type_int.cpp +++ b/test/core/core_type_int.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2011-05-06 diff --git a/test/core/core_type_length.cpp b/test/core/core_type_length.cpp index 7b4961733..4f8e2db52 100644 --- a/test/core/core_type_length.cpp +++ b/test/core/core_type_length.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-05-25 // Updated : 2011-05-25 diff --git a/test/core/core_type_mat2x2.cpp b/test/core/core_type_mat2x2.cpp index 23b6bd813..fc2cd5b24 100644 --- a/test/core/core_type_mat2x2.cpp +++ b/test/core/core_type_mat2x2.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 @@ -11,6 +11,7 @@ static int test_operators() { + glm::mat2x2 l(1.0f); glm::mat2x2 m(1.0f); glm::vec2 u(1.0f); glm::vec2 v(1.0f); @@ -22,7 +23,7 @@ static int test_operators() glm::mat2x2 p = x * m; glm::mat2x2 q = m * x; bool R = m != q; - bool S = m == m; + bool S = m == l; return (S && !R) ? 0 : 1; } diff --git a/test/core/core_type_mat2x3.cpp b/test/core/core_type_mat2x3.cpp index f6311b96c..be1f95fa4 100644 --- a/test/core/core_type_mat2x3.cpp +++ b/test/core/core_type_mat2x3.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 @@ -11,6 +11,7 @@ static int test_operators() { + glm::mat2x3 l(1.0f); glm::mat2x3 m(1.0f); glm::vec2 u(1.0f); glm::vec3 v(1.0f); @@ -22,7 +23,7 @@ static int test_operators() glm::mat2x3 p = x * m; glm::mat2x3 q = m * x; bool R = m != q; - bool S = m == m; + bool S = m == l; return (S && !R) ? 0 : 1; } diff --git a/test/core/core_type_mat2x4.cpp b/test/core/core_type_mat2x4.cpp index fad79409b..f213dc799 100644 --- a/test/core/core_type_mat2x4.cpp +++ b/test/core/core_type_mat2x4.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 @@ -11,6 +11,7 @@ static int test_operators() { + glm::mat2x4 l(1.0f); glm::mat2x4 m(1.0f); glm::vec2 u(1.0f); glm::vec4 v(1.0f); @@ -22,7 +23,7 @@ static int test_operators() glm::mat2x4 p = x * m; glm::mat2x4 q = m * x; bool R = m != q; - bool S = m == m; + bool S = m == l; return (S && !R) ? 0 : 1; } diff --git a/test/core/core_type_mat3x2.cpp b/test/core/core_type_mat3x2.cpp index 7193cd8ad..75880f74a 100644 --- a/test/core/core_type_mat3x2.cpp +++ b/test/core/core_type_mat3x2.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 @@ -11,6 +11,7 @@ static bool test_operators() { + glm::mat3x2 l(1.0f); glm::mat3x2 m(1.0f); glm::vec3 u(1.0f); glm::vec2 v(1.0f); @@ -22,7 +23,7 @@ static bool test_operators() glm::mat3x2 p = x * m; glm::mat3x2 q = m * x; bool R = m != q; - bool S = m == m; + bool S = m == l; return (S && !R) ? 0 : 1; } diff --git a/test/core/core_type_mat3x3.cpp b/test/core/core_type_mat3x3.cpp index 26a4933c6..46fbdafc9 100644 --- a/test/core/core_type_mat3x3.cpp +++ b/test/core/core_type_mat3x3.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 @@ -36,6 +36,7 @@ int test_mat3x3() static int test_operators() { + glm::mat3x3 l(1.0f); glm::mat3x3 m(1.0f); glm::vec3 u(1.0f); glm::vec3 v(1.0f); @@ -47,7 +48,7 @@ static int test_operators() glm::mat3x3 p = x * m; glm::mat3x3 q = m * x; bool R = m != q; - bool S = m == m; + bool S = m == l; return (S && !R) ? 0 : 1; } diff --git a/test/core/core_type_mat3x4.cpp b/test/core/core_type_mat3x4.cpp index 8e36b67ac..a787465e0 100644 --- a/test/core/core_type_mat3x4.cpp +++ b/test/core/core_type_mat3x4.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 @@ -11,6 +11,7 @@ static bool test_operators() { + glm::mat3x4 l(1.0f); glm::mat3x4 m(1.0f); glm::vec3 u(1.0f); glm::vec4 v(1.0f); @@ -22,7 +23,7 @@ static bool test_operators() glm::mat3x4 p = x * m; glm::mat3x4 q = m * x; bool R = m != q; - bool S = m == m; + bool S = m == l; return (S && !R) ? 0 : 1; } diff --git a/test/core/core_type_mat4x2.cpp b/test/core/core_type_mat4x2.cpp index 989acee15..939d18d3c 100644 --- a/test/core/core_type_mat4x2.cpp +++ b/test/core/core_type_mat4x2.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 @@ -11,6 +11,7 @@ static int test_operators() { + glm::mat4x2 l(1.0f); glm::mat4x2 m(1.0f); glm::vec4 u(1.0f); glm::vec2 v(1.0f); @@ -22,7 +23,7 @@ static int test_operators() glm::mat4x2 p = x * m; glm::mat4x2 q = m * x; bool R = m != q; - bool S = m == m; + bool S = m == l; return (S && !R) ? 0 : 1; } diff --git a/test/core/core_type_mat4x3.cpp b/test/core/core_type_mat4x3.cpp index cc46e8d49..09f27ff44 100644 --- a/test/core/core_type_mat4x3.cpp +++ b/test/core/core_type_mat4x3.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 @@ -11,6 +11,7 @@ static int test_operators() { + glm::mat4x3 l(1.0f); glm::mat4x3 m(1.0f); glm::vec4 u(1.0f); glm::vec3 v(1.0f); @@ -22,7 +23,7 @@ static int test_operators() glm::mat4x3 p = x * m; glm::mat4x3 q = m * x; bool R = m != q; - bool S = m == m; + bool S = m == l; return (S && !R) ? 0 : 1; } diff --git a/test/core/core_type_mat4x4.cpp b/test/core/core_type_mat4x4.cpp index 577aac241..f771224c2 100644 --- a/test/core/core_type_mat4x4.cpp +++ b/test/core/core_type_mat4x4.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 @@ -39,6 +39,7 @@ int test_mat4x4() static bool test_operators() { + glm::mat4x4 l(1.0f); glm::mat4x4 m(1.0f); glm::vec4 u(1.0f); glm::vec4 v(1.0f); @@ -50,7 +51,7 @@ static bool test_operators() glm::mat4x4 p = x * m; glm::mat4x4 q = m * x; bool R = m != q; - bool S = m == m; + bool S = m == l; return (S && !R) ? 0 : 1; } diff --git a/test/core/core_type_vec1.cpp b/test/core/core_type_vec1.cpp index 3921bc93f..122ff4d55 100644 --- a/test/core/core_type_vec1.cpp +++ b/test/core/core_type_vec1.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 diff --git a/test/core/core_type_vec2.cpp b/test/core/core_type_vec2.cpp index b67c99c6a..63f74a6f5 100644 --- a/test/core/core_type_vec2.cpp +++ b/test/core/core_type_vec2.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2011-05-31 diff --git a/test/core/core_type_vec3.cpp b/test/core/core_type_vec3.cpp index 46b79e494..9e3d3b435 100644 --- a/test/core/core_type_vec3.cpp +++ b/test/core/core_type_vec3.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2011-09-19 diff --git a/test/core/core_type_vec4.cpp b/test/core/core_type_vec4.cpp index f4038f043..687c7cae6 100644 --- a/test/core/core_type_vec4.cpp +++ b/test/core/core_type_vec4.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 // Updated : 2008-08-31 diff --git a/test/glm.cppcheck b/test/glm.cppcheck index 6ce27f27f..12081fe17 100644 --- a/test/glm.cppcheck +++ b/test/glm.cppcheck @@ -1,10 +1,6 @@ - - + - - - diff --git a/test/gtc/gtc_half_float.cpp b/test/gtc/gtc_half_float.cpp index ec34d6f06..cfc5f1b2d 100644 --- a/test/gtc/gtc_half_float.cpp +++ b/test/gtc/gtc_half_float.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-05-32 // Updated : 2011-05-32 diff --git a/test/gtc/gtc_matrix_access.cpp b/test/gtc/gtc_matrix_access.cpp index b853b5069..1732a20eb 100644 --- a/test/gtc/gtc_matrix_access.cpp +++ b/test/gtc/gtc_matrix_access.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-09-16 // Updated : 2011-05-07 diff --git a/test/gtc/gtc_matrix_integer.cpp b/test/gtc/gtc_matrix_integer.cpp index 2e8aa78a2..24b5b4b6e 100644 --- a/test/gtc/gtc_matrix_integer.cpp +++ b/test/gtc/gtc_matrix_integer.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-09-16 // Updated : 2010-09-16 diff --git a/test/gtc/gtc_matrix_inverse.cpp b/test/gtc/gtc_matrix_inverse.cpp index 324900f40..7207db58a 100644 --- a/test/gtc/gtc_matrix_inverse.cpp +++ b/test/gtc/gtc_matrix_inverse.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-09-16 // Updated : 2010-09-16 diff --git a/test/gtc/gtc_matrix_transform.cpp b/test/gtc/gtc_matrix_transform.cpp index 43ae2bae4..b91bcc926 100644 --- a/test/gtc/gtc_matrix_transform.cpp +++ b/test/gtc/gtc_matrix_transform.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-09-16 // Updated : 2010-09-16 diff --git a/test/gtc/gtc_noise.cpp b/test/gtc/gtc_noise.cpp index d82273b4a..8f5346d45 100644 --- a/test/gtc/gtc_noise.cpp +++ b/test/gtc/gtc_noise.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-04-21 // Updated : 2011-04-26 diff --git a/test/gtc/gtc_quaternion.cpp b/test/gtc/gtc_quaternion.cpp index d59fb1a39..4fdc39680 100644 --- a/test/gtc/gtc_quaternion.cpp +++ b/test/gtc/gtc_quaternion.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-09-16 // Updated : 2011-05-25 diff --git a/test/gtc/gtc_random.cpp b/test/gtc/gtc_random.cpp index 08f3cec25..a9a9afed1 100644 --- a/test/gtc/gtc_random.cpp +++ b/test/gtc/gtc_random.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-09-19 // Updated : 2011-09-19 diff --git a/test/gtc/gtc_swizzle.cpp b/test/gtc/gtc_swizzle.cpp index 2520243b2..609a6419d 100644 --- a/test/gtc/gtc_swizzle.cpp +++ b/test/gtc/gtc_swizzle.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-09-16 // Updated : 2010-09-16 diff --git a/test/gtc/gtc_type_precision.cpp b/test/gtc/gtc_type_precision.cpp index af82f94ea..b9c43e84e 100644 --- a/test/gtc/gtc_type_precision.cpp +++ b/test/gtc/gtc_type_precision.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-09-16 // Updated : 2011-05-08 diff --git a/test/gtc/gtc_type_ptr.cpp b/test/gtc/gtc_type_ptr.cpp index 105552545..e31f2601a 100644 --- a/test/gtc/gtc_type_ptr.cpp +++ b/test/gtc/gtc_type_ptr.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-09-16 // Updated : 2011-05-27 diff --git a/test/gtx/gtx_bit.cpp b/test/gtx/gtx_bit.cpp index 75ec4d8cf..487b217fb 100644 --- a/test/gtx/gtx_bit.cpp +++ b/test/gtx/gtx_bit.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-09-16 // Updated : 2010-09-16 diff --git a/test/gtx/gtx_gradient_paint.cpp b/test/gtx/gtx_gradient_paint.cpp index 85de7b9d8..52ec94484 100644 --- a/test/gtx/gtx_gradient_paint.cpp +++ b/test/gtx/gtx_gradient_paint.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-10-13 // Updated : 2011-10-13 @@ -15,6 +15,7 @@ int test_radialGradient() int Error = 0; float Gradient = glm::radialGradient(glm::vec2(0), 1.0f, glm::vec2(1), glm::vec2(0.5)); + Error += Gradient != 0.0f ? 0 : 1; return Error; } @@ -24,6 +25,7 @@ int test_linearGradient() int Error = 0; float Gradient = glm::linearGradient(glm::vec2(0), glm::vec2(1), glm::vec2(0.5)); + Error += Gradient != 0.0f ? 0 : 1; return Error; } diff --git a/test/gtx/gtx_integer.cpp b/test/gtx/gtx_integer.cpp index 5d115cbbb..9c97e7a53 100644 --- a/test/gtx/gtx_integer.cpp +++ b/test/gtx/gtx_integer.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-10-11 // Updated : 2011-10-11 @@ -32,15 +32,20 @@ int test_log2() { int Error = 0; - for(std::size_t i = 1; i < 1000000; ++i) + for(std::size_t i = 1; i < 24; ++i) { - glm::uint A = glm::log2(glm::uint(i)); - double B = glm::log2(double(i)); + glm::uint A = glm::log2(glm::uint(1 << i)); + glm::uint B = glm::uint(glm::log2(double(1 << i))); - Error += glm::equalEpsilon(double(A), B, 1.0) ? 0 : 1; - //assert(!Error); + //Error += glm::equalEpsilon(double(A), B, 1.0) ? 0 : 1; + Error += glm::abs(double(A) - B) <= 24 ? 0 : 1; + assert(!Error); + + printf("Log2(%d) Error: %d, %d\n", 1 << i, A, B); } + printf("log2 error: %d\n", Error); + return Error; } @@ -49,7 +54,8 @@ int test_nlz() int Error = 0; for(std::size_t i = 1; i < 33; ++i) - printf("%d, %d\n", glm::nlz(i), 31u - glm::findMSB(i)); + Error += glm::nlz(i) == 31u - glm::findMSB(i) ? 0 : 1; + //printf("%d, %d\n", glm::nlz(i), 31u - glm::findMSB(i)); return Error; } diff --git a/test/gtx/gtx_matrix_query.cpp b/test/gtx/gtx_matrix_query.cpp index ecf286a81..8eccc0452 100644 --- a/test/gtx/gtx_matrix_query.cpp +++ b/test/gtx/gtx_matrix_query.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-11-22 // Updated : 2011-11-22 diff --git a/test/gtx/gtx_noise.cpp b/test/gtx/gtx_noise.cpp index d82273b4a..8f5346d45 100644 --- a/test/gtx/gtx_noise.cpp +++ b/test/gtx/gtx_noise.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-04-21 // Updated : 2011-04-26 diff --git a/test/gtx/gtx_quaternion.cpp b/test/gtx/gtx_quaternion.cpp index bfe1221ac..2cc275716 100644 --- a/test/gtx/gtx_quaternion.cpp +++ b/test/gtx/gtx_quaternion.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-05-25 // Updated : 2011-05-31 diff --git a/test/gtx/gtx_random.cpp b/test/gtx/gtx_random.cpp index 27115af76..e562c3145 100644 --- a/test/gtx/gtx_random.cpp +++ b/test/gtx/gtx_random.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-05-31 // Updated : 2011-05-31 diff --git a/test/gtx/gtx_rotate_vector.cpp b/test/gtx/gtx_rotate_vector.cpp index 256cab6e4..7da245ebc 100644 --- a/test/gtx/gtx_rotate_vector.cpp +++ b/test/gtx/gtx_rotate_vector.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-05-16 // Updated : 2011-05-16 diff --git a/test/gtx/gtx_simd_mat4.cpp b/test/gtx/gtx_simd_mat4.cpp index 7563f38e4..44a6426a2 100644 --- a/test/gtx/gtx_simd_mat4.cpp +++ b/test/gtx/gtx_simd_mat4.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-09-16 // Updated : 2010-09-16 diff --git a/test/gtx/gtx_simd_vec4.cpp b/test/gtx/gtx_simd_vec4.cpp index 078a782fc..02de5f4ee 100644 --- a/test/gtx/gtx_simd_vec4.cpp +++ b/test/gtx/gtx_simd_vec4.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-09-16 // Updated : 2010-09-16 diff --git a/test/gtx/gtx_string_cast.cpp b/test/gtx/gtx_string_cast.cpp index 730861575..5c405246f 100644 --- a/test/gtx/gtx_string_cast.cpp +++ b/test/gtx/gtx_string_cast.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-09-01 // Updated : 2011-09-01 diff --git a/test/gtx/gtx_ulp.cpp b/test/gtx/gtx_ulp.cpp index 2de895d50..5c32a0a1b 100644 --- a/test/gtx/gtx_ulp.cpp +++ b/test/gtx/gtx_ulp.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-04-26 // Updated : 2011-04-26 diff --git a/test/gtx/gtx_vector_angle.cpp b/test/gtx/gtx_vector_angle.cpp index a75666a4f..6d5785208 100644 --- a/test/gtx/gtx_vector_angle.cpp +++ b/test/gtx/gtx_vector_angle.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-05-15 // Updated : 2011-05-15 diff --git a/test/gtx/gtx_vector_query.cpp b/test/gtx/gtx_vector_query.cpp index 17b9e53cd..551ae79a5 100644 --- a/test/gtx/gtx_vector_query.cpp +++ b/test/gtx/gtx_vector_query.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2011-11-23 // Updated : 2011-11-23