Skip to content

GitLab

A
acgl
Commit 8e451e99 authored by Philip Trettner's avatar Philip Trettner
Browse files
Options

Updated GLM to 0.9.7.2

parent cbfd4f79
Pipeline #729 passed with stage
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 59690 additions and 57728 deletions
    include/glm/common.hpp
    View file @ 8e451e99
    ///////////////////////////////////////////////////////////////////////////////////
    /// OpenGL Mathematics (glm.g-truc.net)
    ///
    /// Copyright (c) 2005 - 2015 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
    /// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    /// copies of the Software, and to permit persons to whom the Software is
    /// furnished to do so, subject to the following conditions:
    ///
    /// The above copyright notice and this permission notice shall be included in
    /// all copies or substantial portions of the Software.
    ///
    /// Restrictions:
    /// By making use of the Software for military purposes, you choose to make
    /// a Bunny unhappy.
    ///
    /// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    /// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    /// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    /// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    /// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
    /// THE SOFTWARE.
    ///
    /// @ref core
    /// @file glm/common.hpp
    /// @date 2013-12-24 / 2013-12-24
    /// @author Christophe Riccio
    ///////////////////////////////////////////////////////////////////////////////////
    #pragma once
    #include "detail/func_common.hpp"
    ///////////////////////////////////////////////////////////////////////////////////
    /// OpenGL Mathematics (glm.g-truc.net)
    ///
    /// Copyright (c) 2005 - 2015 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
    /// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    /// copies of the Software, and to permit persons to whom the Software is
    /// furnished to do so, subject to the following conditions:
    ///
    /// The above copyright notice and this permission notice shall be included in
    /// all copies or substantial portions of the Software.
    ///
    /// Restrictions:
    /// By making use of the Software for military purposes, you choose to make
    /// a Bunny unhappy.
    ///
    /// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    /// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    /// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    /// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    /// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
    /// THE SOFTWARE.
    ///
    /// @ref core
    /// @file glm/common.hpp
    /// @date 2013-12-24 / 2013-12-24
    /// @author Christophe Riccio
    ///////////////////////////////////////////////////////////////////////////////////
    #pragma once
    #include "detail/func_common.hpp"
    include/glm/detail/_features.hpp
    View file @ 8e451e99
    This diff is collapsed.
    include/glm/detail/_fixes.hpp
    View file @ 8e451e99
    ///////////////////////////////////////////////////////////////////////////////////
    /// OpenGL Mathematics (glm.g-truc.net)
    ///
    /// Copyright (c) 2005 - 2015 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
    /// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    /// copies of the Software, and to permit persons to whom the Software is
    /// furnished to do so, subject to the following conditions:
    ///
    /// The above copyright notice and this permission notice shall be included in
    /// all copies or substantial portions of the Software.
    ///
    /// Restrictions:
    /// By making use of the Software for military purposes, you choose to make
    /// a Bunny unhappy.
    ///
    /// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    /// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    /// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    /// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    /// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
    /// THE SOFTWARE.
    ///
    /// @ref core
    /// @file glm/detail/_fixes.hpp
    /// @date 2011-02-21 / 2011-11-22
    /// @author Christophe Riccio
    ///////////////////////////////////////////////////////////////////////////////////
    #include <cmath>
    //! Workaround for compatibility with other libraries
    #ifdef max
    #undef max
    #endif
    //! Workaround for compatibility with other libraries
    #ifdef min
    #undef min
    #endif
    //! Workaround for Android
    #ifdef isnan
    #undef isnan
    #endif
    //! Workaround for Android
    #ifdef isinf
    #undef isinf
    #endif
    //! Workaround for Chrone Native Client
    #ifdef log2
    #undef log2
    #endif
    ///////////////////////////////////////////////////////////////////////////////////
    /// OpenGL Mathematics (glm.g-truc.net)
    ///
    /// Copyright (c) 2005 - 2015 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
    /// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    /// copies of the Software, and to permit persons to whom the Software is
    /// furnished to do so, subject to the following conditions:
    ///
    /// The above copyright notice and this permission notice shall be included in
    /// all copies or substantial portions of the Software.
    ///
    /// Restrictions:
    /// By making use of the Software for military purposes, you choose to make
    /// a Bunny unhappy.
    ///
    /// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    /// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    /// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    /// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    /// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
    /// THE SOFTWARE.
    ///
    /// @ref core
    /// @file glm/detail/_fixes.hpp
    /// @date 2011-02-21 / 2011-11-22
    /// @author Christophe Riccio
    ///////////////////////////////////////////////////////////////////////////////////
    #include <cmath>
    //! Workaround for compatibility with other libraries
    #ifdef max
    #undef max
    #endif
    //! Workaround for compatibility with other libraries
    #ifdef min
    #undef min
    #endif
    //! Workaround for Android
    #ifdef isnan
    #undef isnan
    #endif
    //! Workaround for Android
    #ifdef isinf
    #undef isinf
    #endif
    //! Workaround for Chrone Native Client
    #ifdef log2
    #undef log2
    #endif
    include/glm/detail/_noise.hpp
    View file @ 8e451e99
    ///////////////////////////////////////////////////////////////////////////////////
    /// OpenGL Mathematics (glm.g-truc.net)
    ///
    /// Copyright (c) 2005 - 2015 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
    /// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    /// copies of the Software, and to permit persons to whom the Software is
    /// furnished to do so, subject to the following conditions:
    ///
    /// The above copyright notice and this permission notice shall be included in
    /// all copies or substantial portions of the Software.
    ///
    /// Restrictions:
    /// By making use of the Software for military purposes, you choose to make
    /// a Bunny unhappy.
    ///
    /// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    /// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    /// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    /// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    /// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
    /// THE SOFTWARE.
    ///
    /// @ref core
    /// @file glm/detail/_noise.hpp
    /// @date 2013-12-24 / 2013-12-24
    /// @author Christophe Riccio
    ///////////////////////////////////////////////////////////////////////////////////
    #pragma once
    #include "../vec2.hpp"
    #include "../vec3.hpp"
    #include "../vec4.hpp"
    #include "../common.hpp"
    namespace glm{
    namespace detail
    {
    template <typename T>
    GLM_FUNC_QUALIFIER T mod289(T const & x)
    {
    return x - floor(x * static_cast<T>(1.0) / static_cast<T>(289.0)) * static_cast<T>(289.0);
    }
    template <typename T>
    GLM_FUNC_QUALIFIER T permute(T const & x)
    {
    return mod289(((x * static_cast<T>(34)) + static_cast<T>(1)) * x);
    }
    template <typename T, precision P>
    GLM_FUNC_QUALIFIER tvec2<T, P> permute(tvec2<T, P> const & x)
    {
    return mod289(((x * static_cast<T>(34)) + static_cast<T>(1)) * x);
    }
    template <typename T, precision P>
    GLM_FUNC_QUALIFIER tvec3<T, P> permute(tvec3<T, P> const & x)
    {
    return mod289(((x * static_cast<T>(34)) + static_cast<T>(1)) * x);
    }
    template <typename T, precision P>
    GLM_FUNC_QUALIFIER tvec4<T, P> permute(tvec4<T, P> const & x)
    {
    return mod289(((x * static_cast<T>(34)) + static_cast<T>(1)) * x);
    }
    /*
    template <typename T, precision P, template<typename> class vecType>
    GLM_FUNC_QUALIFIER vecType<T, P> permute(vecType<T, P> const & x)
    {
    return mod289(((x * T(34)) + T(1)) * x);
    }
    */
    template <typename T>
    GLM_FUNC_QUALIFIER T taylorInvSqrt(T const & r)
    {
    return T(1.79284291400159) - T(0.85373472095314) * r;
    }
    template <typename T, precision P>
    GLM_FUNC_QUALIFIER tvec2<T, P> taylorInvSqrt(tvec2<T, P> const & r)
    {
    return T(1.79284291400159) - T(0.85373472095314) * r;
    }
    template <typename T, precision P>
    GLM_FUNC_QUALIFIER tvec3<T, P> taylorInvSqrt(tvec3<T, P> const & r)
    {
    return T(1.79284291400159) - T(0.85373472095314) * r;
    }
    template <typename T, precision P>
    GLM_FUNC_QUALIFIER tvec4<T, P> taylorInvSqrt(tvec4<T, P> const & r)
    {
    return T(1.79284291400159) - T(0.85373472095314) * r;
    }
    /*
    template <typename T, precision P, template<typename> class vecType>
    GLM_FUNC_QUALIFIER vecType<T, P> taylorInvSqrt(vecType<T, P> const & r)
    {
    return T(1.79284291400159) - T(0.85373472095314) * r;
    }
    */
    template <typename T, precision P>
    GLM_FUNC_QUALIFIER tvec2<T, P> fade(tvec2<T, P> const & t)
    {
    return (t * t * t) * (t * (t * T(6) - T(15)) + T(10));
    }
    template <typename T, precision P>
    GLM_FUNC_QUALIFIER tvec3<T, P> fade(tvec3<T, P> const & t)
    {
    return (t * t * t) * (t * (t * T(6) - T(15)) + T(10));
    }
    template <typename T, precision P>
    GLM_FUNC_QUALIFIER tvec4<T, P> fade(tvec4<T, P> const & t)
    {
    return (t * t * t) * (t * (t * T(6) - T(15)) + T(10));
    }
    /*
    template <typename T, precision P, template <typename> class vecType>
    GLM_FUNC_QUALIFIER vecType<T, P> fade(vecType<T, P> const & t)
    {
    return (t * t * t) * (t * (t * T(6) - T(15)) + T(10));
    }
    */
    }//namespace detail
    }//namespace glm
    ///////////////////////////////////////////////////////////////////////////////////
    /// OpenGL Mathematics (glm.g-truc.net)
    ///
    /// Copyright (c) 2005 - 2015 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
    /// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    /// copies of the Software, and to permit persons to whom the Software is
    /// furnished to do so, subject to the following conditions:
    ///
    /// The above copyright notice and this permission notice shall be included in
    /// all copies or substantial portions of the Software.
    ///
    /// Restrictions:
    /// By making use of the Software for military purposes, you choose to make
    /// a Bunny unhappy.
    ///
    /// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    /// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    /// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    /// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    /// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
    /// THE SOFTWARE.
    ///
    /// @ref core
    /// @file glm/detail/_noise.hpp
    /// @date 2013-12-24 / 2013-12-24
    /// @author Christophe Riccio
    ///////////////////////////////////////////////////////////////////////////////////
    #pragma once
    #include "../vec2.hpp"
    #include "../vec3.hpp"
    #include "../vec4.hpp"
    #include "../common.hpp"
    namespace glm{
    namespace detail
    {
    template <typename T>
    GLM_FUNC_QUALIFIER T mod289(T const & x)
    {
    return x - floor(x * static_cast<T>(1.0) / static_cast<T>(289.0)) * static_cast<T>(289.0);
    }
    template <typename T>
    GLM_FUNC_QUALIFIER T permute(T const & x)
    {
    return mod289(((x * static_cast<T>(34)) + static_cast<T>(1)) * x);
    }
    template <typename T, precision P>
    GLM_FUNC_QUALIFIER tvec2<T, P> permute(tvec2<T, P> const & x)
    {
    return mod289(((x * static_cast<T>(34)) + static_cast<T>(1)) * x);
    }
    template <typename T, precision P>
    GLM_FUNC_QUALIFIER tvec3<T, P> permute(tvec3<T, P> const & x)
    {
    return mod289(((x * static_cast<T>(34)) + static_cast<T>(1)) * x);
    }
    template <typename T, precision P>
    GLM_FUNC_QUALIFIER tvec4<T, P> permute(tvec4<T, P> const & x)
    {
    return mod289(((x * static_cast<T>(34)) + static_cast<T>(1)) * x);
    }
    /*
    template <typename T, precision P, template<typename> class vecType>
    GLM_FUNC_QUALIFIER vecType<T, P> permute(vecType<T, P> const & x)
    {
    return mod289(((x * T(34)) + T(1)) * x);
    }
    */
    template <typename T>
    GLM_FUNC_QUALIFIER T taylorInvSqrt(T const & r)
    {
    return T(1.79284291400159) - T(0.85373472095314) * r;
    }
    template <typename T, precision P>
    GLM_FUNC_QUALIFIER tvec2<T, P> taylorInvSqrt(tvec2<T, P> const & r)
    {
    return T(1.79284291400159) - T(0.85373472095314) * r;
    }
    template <typename T, precision P>
    GLM_FUNC_QUALIFIER tvec3<T, P> taylorInvSqrt(tvec3<T, P> const & r)
    {
    return T(1.79284291400159) - T(0.85373472095314) * r;
    }
    template <typename T, precision P>
    GLM_FUNC_QUALIFIER tvec4<T, P> taylorInvSqrt(tvec4<T, P> const & r)
    {
    return T(1.79284291400159) - T(0.85373472095314) * r;
    }
    /*
    template <typename T, precision P, template<typename> class vecType>
    GLM_FUNC_QUALIFIER vecType<T, P> taylorInvSqrt(vecType<T, P> const & r)
    {
    return T(1.79284291400159) - T(0.85373472095314) * r;
    }
    */
    template <typename T, precision P>
    GLM_FUNC_QUALIFIER tvec2<T, P> fade(tvec2<T, P> const & t)
    {
    return (t * t * t) * (t * (t * T(6) - T(15)) + T(10));
    }
    template <typename T, precision P>
    GLM_FUNC_QUALIFIER tvec3<T, P> fade(tvec3<T, P> const & t)
    {
    return (t * t * t) * (t * (t * T(6) - T(15)) + T(10));
    }
    template <typename T, precision P>
    GLM_FUNC_QUALIFIER tvec4<T, P> fade(tvec4<T, P> const & t)
    {
    return (t * t * t) * (t * (t * T(6) - T(15)) + T(10));
    }
    /*
    template <typename T, precision P, template <typename> class vecType>
    GLM_FUNC_QUALIFIER vecType<T, P> fade(vecType<T, P> const & t)
    {
    return (t * t * t) * (t * (t * T(6) - T(15)) + T(10));
    }
    */
    }//namespace detail
    }//namespace glm
    include/glm/detail/_swizzle.hpp
    View file @ 8e451e99
    This diff is collapsed.
    include/glm/detail/_swizzle_func.hpp
    View file @ 8e451e99
    This diff is collapsed.
    include/glm/detail/_vectorize.hpp
    View file @ 8e451e99
    ///////////////////////////////////////////////////////////////////////////////////
    /// OpenGL Mathematics (glm.g-truc.net)
    ///
    /// Copyright (c) 2005 - 2015 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
    /// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    /// copies of the Software, and to permit persons to whom the Software is
    /// furnished to do so, subject to the following conditions:
    ///
    /// The above copyright notice and this permission notice shall be included in
    /// all copies or substantial portions of the Software.
    ///
    /// Restrictions:
    /// By making use of the Software for military purposes, you choose to make
    /// a Bunny unhappy.
    ///
    /// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    /// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    /// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    /// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    /// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
    /// THE SOFTWARE.
    ///
    /// @ref core
    /// @file glm/detail/_vectorize.hpp
    /// @date 2011-10-14 / 2011-10-14
    /// @author Christophe Riccio
    ///////////////////////////////////////////////////////////////////////////////////
    #pragma once
    #include "type_vec1.hpp"
    #include "type_vec2.hpp"
    #include "type_vec3.hpp"
    #include "type_vec4.hpp"
    namespace glm{
    namespace detail
    {
    template <typename R, typename T, precision P, template <typename, precision> class vecType>
    struct functor1{};
    template <typename R, typename T, precision P>
    struct functor1<R, T, P, tvec1>
    {
    GLM_FUNC_QUALIFIER static tvec1<R, P> call(R (*Func) (T x), tvec1<T, P> const & v)
    {
    return tvec1<R, P>(Func(v.x));
    }
    };
    template <typename R, typename T, precision P>
    struct functor1<R, T, P, tvec2>
    {
    GLM_FUNC_QUALIFIER static tvec2<R, P> call(R (*Func) (T x), tvec2<T, P> const & v)
    {
    return tvec2<R, P>(Func(v.x), Func(v.y));