diff options
Diffstat (limited to 'depedencies/include/glm/gtx')
117 files changed, 0 insertions, 14418 deletions
diff --git a/depedencies/include/glm/gtx/associated_min_max.hpp b/depedencies/include/glm/gtx/associated_min_max.hpp deleted file mode 100644 index eb9d721..0000000 --- a/depedencies/include/glm/gtx/associated_min_max.hpp +++ /dev/null @@ -1,202 +0,0 @@ -/// @ref gtx_associated_min_max -/// @file glm/gtx/associated_min_max.hpp -/// -/// @see core (dependence) -/// @see gtx_extented_min_max (dependence) -/// -/// @defgroup gtx_associated_min_max GLM_GTX_associated_min_max -/// @ingroup gtx -/// -/// @brief Min and max functions that return associated values not the compared onces. -/// <glm/gtx/associated_min_max.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_associated_min_max extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_associated_min_max - /// @{ - - /// Minimum comparison between 2 variables and returns 2 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U, precision P> - GLM_FUNC_DECL U associatedMin(T x, U a, T y, U b); - - /// Minimum comparison between 2 variables and returns 2 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL tvec2<U, P> associatedMin( - vecType<T, P> const & x, vecType<U, P> const & a, - vecType<T, P> const & y, vecType<U, P> const & b); - - /// Minimum comparison between 2 variables and returns 2 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<U, P> associatedMin( - T x, const vecType<U, P>& a, - T y, const vecType<U, P>& b); - - /// Minimum comparison between 2 variables and returns 2 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<U, P> associatedMin( - vecType<T, P> const & x, U a, - vecType<T, P> const & y, U b); - - /// Minimum comparison between 3 variables and returns 3 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U> - GLM_FUNC_DECL U associatedMin( - T x, U a, - T y, U b, - T z, U c); - - /// Minimum comparison between 3 variables and returns 3 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<U, P> associatedMin( - vecType<T, P> const & x, vecType<U, P> const & a, - vecType<T, P> const & y, vecType<U, P> const & b, - vecType<T, P> const & z, vecType<U, P> const & c); - - /// Minimum comparison between 4 variables and returns 4 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U> - GLM_FUNC_DECL U associatedMin( - T x, U a, - T y, U b, - T z, U c, - T w, U d); - - /// Minimum comparison between 4 variables and returns 4 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<U, P> associatedMin( - vecType<T, P> const & x, vecType<U, P> const & a, - vecType<T, P> const & y, vecType<U, P> const & b, - vecType<T, P> const & z, vecType<U, P> const & c, - vecType<T, P> const & w, vecType<U, P> const & d); - - /// Minimum comparison between 4 variables and returns 4 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<U, P> associatedMin( - T x, vecType<U, P> const & a, - T y, vecType<U, P> const & b, - T z, vecType<U, P> const & c, - T w, vecType<U, P> const & d); - - /// Minimum comparison between 4 variables and returns 4 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<U, P> associatedMin( - vecType<T, P> const & x, U a, - vecType<T, P> const & y, U b, - vecType<T, P> const & z, U c, - vecType<T, P> const & w, U d); - - /// Maximum comparison between 2 variables and returns 2 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U> - GLM_FUNC_DECL U associatedMax(T x, U a, T y, U b); - - /// Maximum comparison between 2 variables and returns 2 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL tvec2<U, P> associatedMax( - vecType<T, P> const & x, vecType<U, P> const & a, - vecType<T, P> const & y, vecType<U, P> const & b); - - /// Maximum comparison between 2 variables and returns 2 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<T, P> associatedMax( - T x, vecType<U, P> const & a, - T y, vecType<U, P> const & b); - - /// Maximum comparison between 2 variables and returns 2 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<U, P> associatedMax( - vecType<T, P> const & x, U a, - vecType<T, P> const & y, U b); - - /// Maximum comparison between 3 variables and returns 3 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U> - GLM_FUNC_DECL U associatedMax( - T x, U a, - T y, U b, - T z, U c); - - /// Maximum comparison between 3 variables and returns 3 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<U, P> associatedMax( - vecType<T, P> const & x, vecType<U, P> const & a, - vecType<T, P> const & y, vecType<U, P> const & b, - vecType<T, P> const & z, vecType<U, P> const & c); - - /// Maximum comparison between 3 variables and returns 3 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<T, P> associatedMax( - T x, vecType<U, P> const & a, - T y, vecType<U, P> const & b, - T z, vecType<U, P> const & c); - - /// Maximum comparison between 3 variables and returns 3 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<U, P> associatedMax( - vecType<T, P> const & x, U a, - vecType<T, P> const & y, U b, - vecType<T, P> const & z, U c); - - /// Maximum comparison between 4 variables and returns 4 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U> - GLM_FUNC_DECL U associatedMax( - T x, U a, - T y, U b, - T z, U c, - T w, U d); - - /// Maximum comparison between 4 variables and returns 4 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<U, P> associatedMax( - vecType<T, P> const & x, vecType<U, P> const & a, - vecType<T, P> const & y, vecType<U, P> const & b, - vecType<T, P> const & z, vecType<U, P> const & c, - vecType<T, P> const & w, vecType<U, P> const & d); - - /// Maximum comparison between 4 variables and returns 4 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<U, P> associatedMax( - T x, vecType<U, P> const & a, - T y, vecType<U, P> const & b, - T z, vecType<U, P> const & c, - T w, vecType<U, P> const & d); - - /// Maximum comparison between 4 variables and returns 4 associated variable values - /// @see gtx_associated_min_max - template<typename T, typename U, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<U, P> associatedMax( - vecType<T, P> const & x, U a, - vecType<T, P> const & y, U b, - vecType<T, P> const & z, U c, - vecType<T, P> const & w, U d); - - /// @} -} //namespace glm - -#include "associated_min_max.inl" diff --git a/depedencies/include/glm/gtx/associated_min_max.inl b/depedencies/include/glm/gtx/associated_min_max.inl deleted file mode 100644 index 6a57d48..0000000 --- a/depedencies/include/glm/gtx/associated_min_max.inl +++ /dev/null @@ -1,355 +0,0 @@ -/// @ref gtx_associated_min_max -/// @file glm/gtx/associated_min_max.inl - -namespace glm{ - -// Min comparison between 2 variables -template<typename T, typename U, precision P> -GLM_FUNC_QUALIFIER U associatedMin(T x, U a, T y, U b) -{ - return x < y ? a : b; -} - -template<typename T, typename U, precision P, template <typename, precision> class vecType> -GLM_FUNC_QUALIFIER tvec2<U, P> associatedMin -( - vecType<T, P> const & x, vecType<U, P> const & a, - vecType<T, P> const & y, vecType<U, P> const & b -) -{ - vecType<U, P> Result(uninitialize); - for(length_t i = 0, n = Result.length(); i < n; ++i) - Result[i] = x[i] < y[i] ? a[i] : b[i]; - return Result; -} - -template<typename T, typename U, precision P, template <typename, precision> class vecType> -GLM_FUNC_QUALIFIER vecType<U, P> associatedMin -( - T x, const vecType<U, P>& a, - T y, const vecType<U, P>& b -) -{ - vecType<U, P> Result(uninitialize); - for(length_t i = 0, n = Result.length(); i < n; ++i) - Result[i] = x < y ? a[i] : b[i]; - return Result; -} - -template<typename T, typename U, precision P, template <typename, precision> class vecType> -GLM_FUNC_QUALIFIER vecType<U, P> associatedMin -( - vecType<T, P> const & x, U a, - vecType<T, P> const & y, U b -) -{ - vecType<U, P> Result(uninitialize); - for(length_t i = 0, n = Result.length(); i < n; ++i) - Result[i] = x[i] < y[i] ? a : b; - return Result; -} - -// Min comparison between 3 variables -template<typename T, typename U> -GLM_FUNC_QUALIFIER U associatedMin -( - T x, U a, - T y, U b, - T z, U c -) -{ - U Result = x < y ? (x < z ? a : c) : (y < z ? b : c); - return Result; -} - -template<typename T, typename U, precision P, template <typename, precision> class vecType> -GLM_FUNC_QUALIFIER vecType<U, P> associatedMin -( - vecType<T, P> const & x, vecType<U, P> const & a, - vecType<T, P> const & y, vecType<U, P> const & b, - vecType<T, P> const & z, vecType<U, P> const & c -) -{ - vecType<U, P> Result(uninitialize); - for(length_t i = 0, n = Result.length(); i < n; ++i) - Result[i] = x[i] < y[i] ? (x[i] < z[i] ? a[i] : c[i]) : (y[i] < z[i] ? b[i] : c[i]); - return Result; -} - -// Min comparison between 4 variables -template<typename T, typename U> -GLM_FUNC_QUALIFIER U associatedMin -( - T x, U a, - T y, U b, - T z, U c, - T w, U d -) -{ - T Test1 = min(x, y); - T Test2 = min(z, w);; - U Result1 = x < y ? a : b; - U Result2 = z < w ? c : d; - U Result = Test1 < Test2 ? Result1 : Result2; - return Result; -} - -// Min comparison between 4 variables -template<typename T, typename U, precision P, template <typename, precision> class vecType> -GLM_FUNC_QUALIFIER vecType<U, P> associatedMin -( - vecType<T, P> const & x, vecType<U, P> const & a, - vecType<T, P> const & y, vecType<U, P> const & b, - vecType<T, P> const & z, vecType<U, P> const & c, - vecType<T, P> const & w, vecType<U, P> const & d -) -{ - vecType<U, P> Result(uninitialize); - for(length_t i = 0, n = Result.length(); i < n; ++i) - { - T Test1 = min(x[i], y[i]); - T Test2 = min(z[i], w[i]); - U Result1 = x[i] < y[i] ? a[i] : b[i]; - U Result2 = z[i] < w[i] ? c[i] : d[i]; - Result[i] = Test1 < Test2 ? Result1 : Result2; - } - return Result; -} - -// Min comparison between 4 variables -template<typename T, typename U, precision P, template <typename, precision> class vecType> -GLM_FUNC_QUALIFIER vecType<U, P> associatedMin -( - T x, vecType<U, P> const & a, - T y, vecType<U, P> const & b, - T z, vecType<U, P> const & c, - T w, vecType<U, P> const & d -) -{ - T Test1 = min(x, y); - T Test2 = min(z, w); - - vecType<U, P> Result(uninitialize); - for(length_t i = 0, n = Result.length(); i < n; ++i) - { - U Result1 = x < y ? a[i] : b[i]; - U Result2 = z < w ? c[i] : d[i]; - Result[i] = Test1 < Test2 ? Result1 : Result2; - } - return Result; -} - -// Min comparison between 4 variables -template<typename T, typename U, precision P, template <typename, precision> class vecType> -GLM_FUNC_QUALIFIER vecType<U, P> associatedMin -( - vecType<T, P> const & x, U a, - vecType<T, P> const & y, U b, - vecType<T, P> const & z, U c, - vecType<T, P> const & w, U d -) -{ - vecType<U, P> Result(uninitialize); - for(length_t i = 0, n = Result.length(); i < n; ++i) - { - T Test1 = min(x[i], y[i]); - T Test2 = min(z[i], w[i]);; - U Result1 = x[i] < y[i] ? a : b; - U Result2 = z[i] < w[i] ? c : d; - Result[i] = Test1 < Test2 ? Result1 : Result2; - } - return Result; -} - -// Max comparison between 2 variables -template<typename T, typename U> -GLM_FUNC_QUALIFIER U associatedMax(T x, U a, T y, U b) -{ - return x > y ? a : b; -} - -// Max comparison between 2 variables -template<typename T, typename U, precision P, template <typename, precision> class vecType> -GLM_FUNC_QUALIFIER tvec2<U, P> associatedMax -( - vecType<T, P> const & x, vecType<U, P> const & a, - vecType<T, P> const & y, vecType<U, P> const & b -) -{ - vecType<U, P> Result(uninitialize); - for(length_t i = 0, n = Result.length(); i < n; ++i) - Result[i] = x[i] > y[i] ? a[i] : b[i]; - return Result; -} - -// Max comparison between 2 variables -template<typename T, typename U, precision P, template <typename, precision> class vecType> -GLM_FUNC_QUALIFIER vecType<T, P> associatedMax -( - T x, vecType<U, P> const & a, - T y, vecType<U, P> const & b -) -{ - vecType<U, P> Result(uninitialize); - for(length_t i = 0, n = Result.length(); i < n; ++i) - Result[i] = x > y ? a[i] : b[i]; - return Result; -} - -// Max comparison between 2 variables -template<typename T, typename U, precision P, template <typename, precision> class vecType> -GLM_FUNC_QUALIFIER vecType<U, P> associatedMax -( - vecType<T, P> const & x, U a, - vecType<T, P> const & y, U b -) -{ - vecType<T, P> Result(uninitialize); - for(length_t i = 0, n = Result.length(); i < n; ++i) - Result[i] = x[i] > y[i] ? a : b; - return Result; -} - -// Max comparison between 3 variables -template<typename T, typename U> -GLM_FUNC_QUALIFIER U associatedMax -( - T x, U a, - T y, U b, - T z, U c -) -{ - U Result = x > y ? (x > z ? a : c) : (y > z ? b : c); - return Result; -} - -// Max comparison between 3 variables -template<typename T, typename U, precision P, template <typename, precision> class vecType> -GLM_FUNC_QUALIFIER vecType<U, P> associatedMax -( - vecType<T, P> const & x, vecType<U, P> const & a, - vecType<T, P> const & y, vecType<U, P> const & b, - vecType<T, P> const & z, vecType<U, P> const & c -) -{ - vecType<U, P> Result(uninitialize); - for(length_t i = 0, n = Result.length(); i < n; ++i) - Result[i] = x[i] > y[i] ? (x[i] > z[i] ? a[i] : c[i]) : (y[i] > z[i] ? b[i] : c[i]); - return Result; -} - -// Max comparison between 3 variables -template<typename T, typename U, precision P, template <typename, precision> class vecType> -GLM_FUNC_QUALIFIER vecType<T, P> associatedMax -( - T x, vecType<U, P> const & a, - T y, vecType<U, P> const & b, - T z, vecType<U, P> const & c -) -{ - vecType<U, P> Result(uninitialize); - for(length_t i = 0, n = Result.length(); i < n; ++i) - Result[i] = x > y ? (x > z ? a[i] : c[i]) : (y > z ? b[i] : c[i]); - return Result; -} - -// Max comparison between 3 variables -template<typename T, typename U, precision P, template <typename, precision> class vecType> -GLM_FUNC_QUALIFIER vecType<U, P> associatedMax -( - vecType<T, P> const & x, U a, - vecType<T, P> const & y, U b, - vecType<T, P> const & z, U c -) -{ - vecType<T, P> Result(uninitialize); - for(length_t i = 0, n = Result.length(); i < n; ++i) - Result[i] = x[i] > y[i] ? (x[i] > z[i] ? a : c) : (y[i] > z[i] ? b : c); - return Result; -} - -// Max comparison between 4 variables -template<typename T, typename U> -GLM_FUNC_QUALIFIER U associatedMax -( - T x, U a, - T y, U b, - T z, U c, - T w, U d -) -{ - T Test1 = max(x, y); - T Test2 = max(z, w);; - U Result1 = x > y ? a : b; - U Result2 = z > w ? c : d; - U Result = Test1 > Test2 ? Result1 : Result2; - return Result; -} - -// Max comparison between 4 variables -template<typename T, typename U, precision P, template <typename, precision> class vecType> -GLM_FUNC_QUALIFIER vecType<U, P> associatedMax -( - vecType<T, P> const & x, vecType<U, P> const & a, - vecType<T, P> const & y, vecType<U, P> const & b, - vecType<T, P> const & z, vecType<U, P> const & c, - vecType<T, P> const & w, vecType<U, P> const & d -) -{ - vecType<U, P> Result(uninitialize); - for(length_t i = 0, n = Result.length(); i < n; ++i) - { - T Test1 = max(x[i], y[i]); - T Test2 = max(z[i], w[i]); - U Result1 = x[i] > y[i] ? a[i] : b[i]; - U Result2 = z[i] > w[i] ? c[i] : d[i]; - Result[i] = Test1 > Test2 ? Result1 : Result2; - } - return Result; -} - -// Max comparison between 4 variables -template<typename T, typename U, precision P, template <typename, precision> class vecType> -GLM_FUNC_QUALIFIER vecType<U, P> associatedMax -( - T x, vecType<U, P> const & a, - T y, vecType<U, P> const & b, - T z, vecType<U, P> const & c, - T w, vecType<U, P> const & d -) -{ - T Test1 = max(x, y); - T Test2 = max(z, w); - - vecType<U, P> Result(uninitialize); - for(length_t i = 0, n = Result.length(); i < n; ++i) - { - U Result1 = x > y ? a[i] : b[i]; - U Result2 = z > w ? c[i] : d[i]; - Result[i] = Test1 > Test2 ? Result1 : Result2; - } - return Result; -} - -// Max comparison between 4 variables -template<typename T, typename U, precision P, template <typename, precision> class vecType> -GLM_FUNC_QUALIFIER vecType<U, P> associatedMax -( - vecType<T, P> const & x, U a, - vecType<T, P> const & y, U b, - vecType<T, P> const & z, U c, - vecType<T, P> const & w, U d -) -{ - vecType<U, P> Result(uninitialize); - for(length_t i = 0, n = Result.length(); i < n; ++i) - { - T Test1 = max(x[i], y[i]); - T Test2 = max(z[i], w[i]);; - U Result1 = x[i] > y[i] ? a : b; - U Result2 = z[i] > w[i] ? c : d; - Result[i] = Test1 > Test2 ? Result1 : Result2; - } - return Result; -} -}//namespace glm diff --git a/depedencies/include/glm/gtx/bit.hpp b/depedencies/include/glm/gtx/bit.hpp deleted file mode 100644 index 17378f3..0000000 --- a/depedencies/include/glm/gtx/bit.hpp +++ /dev/null @@ -1,95 +0,0 @@ -/// @ref gtx_bit -/// @file glm/gtx/bit.hpp -/// -/// @see core (dependence) -/// @see gtc_half_float (dependence) -/// -/// @defgroup gtx_bit GLM_GTX_bit -/// @ingroup gtx -/// -/// @brief Allow to perform bit operations on integer values -/// -/// <glm/gtx/bit.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependencies -#include "../gtc/bitfield.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_bit extension is deprecated, include GLM_GTC_bitfield and GLM_GTC_integer instead") -#endif - -namespace glm -{ - /// @addtogroup gtx_bit - /// @{ - - /// @see gtx_bit - template <typename genIUType> - GLM_FUNC_DECL genIUType highestBitValue(genIUType Value); - - /// @see gtx_bit - template <typename genIUType> - GLM_FUNC_DECL genIUType lowestBitValue(genIUType Value); - - /// Find the highest bit set to 1 in a integer variable and return its value. - /// - /// @see gtx_bit - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<T, P> highestBitValue(vecType<T, P> const & value); - - /// Return the power of two number which value is just higher the input value. - /// Deprecated, use ceilPowerOfTwo from GTC_round instead - /// - /// @see gtc_round - /// @see gtx_bit - template <typename genIUType> - GLM_DEPRECATED GLM_FUNC_DECL genIUType powerOfTwoAbove(genIUType Value); - - /// Return the power of two number which value is just higher the input value. - /// Deprecated, use ceilPowerOfTwo from GTC_round instead - /// - /// @see gtc_round - /// @see gtx_bit - template <typename T, precision P, template <typename, precision> class vecType> - GLM_DEPRECATED GLM_FUNC_DECL vecType<T, P> powerOfTwoAbove(vecType<T, P> const & value); - - /// Return the power of two number which value is just lower the input value. - /// Deprecated, use floorPowerOfTwo from GTC_round instead - /// - /// @see gtc_round - /// @see gtx_bit - template <typename genIUType> - GLM_DEPRECATED GLM_FUNC_DECL genIUType powerOfTwoBelow(genIUType Value); - - /// Return the power of two number which value is just lower the input value. - /// Deprecated, use floorPowerOfTwo from GTC_round instead - /// - /// @see gtc_round - /// @see gtx_bit - template <typename T, precision P, template <typename, precision> class vecType> - GLM_DEPRECATED GLM_FUNC_DECL vecType<T, P> powerOfTwoBelow(vecType<T, P> const & value); - - /// Return the power of two number which value is the closet to the input value. - /// Deprecated, use roundPowerOfTwo from GTC_round instead - /// - /// @see gtc_round - /// @see gtx_bit - template <typename genIUType> - GLM_DEPRECATED GLM_FUNC_DECL genIUType powerOfTwoNearest(genIUType Value); - - /// Return the power of two number which value is the closet to the input value. - /// Deprecated, use roundPowerOfTwo from GTC_round instead - /// - /// @see gtc_round - /// @see gtx_bit - template <typename T, precision P, template <typename, precision> class vecType> - GLM_DEPRECATED GLM_FUNC_DECL vecType<T, P> powerOfTwoNearest(vecType<T, P> const & value); - - /// @} -} //namespace glm - - -#include "bit.inl" - diff --git a/depedencies/include/glm/gtx/bit.inl b/depedencies/include/glm/gtx/bit.inl deleted file mode 100644 index 10d5f7f..0000000 --- a/depedencies/include/glm/gtx/bit.inl +++ /dev/null @@ -1,93 +0,0 @@ -/// @ref gtx_bit -/// @file glm/gtx/bit.inl - -namespace glm -{ - /////////////////// - // highestBitValue - - template <typename genIUType> - GLM_FUNC_QUALIFIER genIUType highestBitValue(genIUType Value) - { - genIUType tmp = Value; - genIUType result = genIUType(0); - while(tmp) - { - result = (tmp & (~tmp + 1)); // grab lowest bit - tmp &= ~result; // clear lowest bit - } - return result; - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> highestBitValue(vecType<T, P> const & v) - { - return detail::functor1<T, T, P, vecType>::call(highestBitValue, v); - } - - /////////////////// - // lowestBitValue - - template <typename genIUType> - GLM_FUNC_QUALIFIER genIUType lowestBitValue(genIUType Value) - { - return (Value & (~Value + 1)); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> lowestBitValue(vecType<T, P> const & v) - { - return detail::functor1<T, T, P, vecType>::call(lowestBitValue, v); - } - - /////////////////// - // powerOfTwoAbove - - template <typename genType> - GLM_FUNC_QUALIFIER genType powerOfTwoAbove(genType value) - { - return isPowerOfTwo(value) ? value : highestBitValue(value) << 1; - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> powerOfTwoAbove(vecType<T, P> const & v) - { - return detail::functor1<T, T, P, vecType>::call(powerOfTwoAbove, v); - } - - /////////////////// - // powerOfTwoBelow - - template <typename genType> - GLM_FUNC_QUALIFIER genType powerOfTwoBelow(genType value) - { - return isPowerOfTwo(value) ? value : highestBitValue(value); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> powerOfTwoBelow(vecType<T, P> const & v) - { - return detail::functor1<T, T, P, vecType>::call(powerOfTwoBelow, v); - } - - ///////////////////// - // powerOfTwoNearest - - template <typename genType> - GLM_FUNC_QUALIFIER genType powerOfTwoNearest(genType value) - { - if(isPowerOfTwo(value)) - return value; - - genType const prev = highestBitValue(value); - genType const next = prev << 1; - return (next - value) < (value - prev) ? next : prev; - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> powerOfTwoNearest(vecType<T, P> const & v) - { - return detail::functor1<T, T, P, vecType>::call(powerOfTwoNearest, v); - } - -}//namespace glm diff --git a/depedencies/include/glm/gtx/closest_point.hpp b/depedencies/include/glm/gtx/closest_point.hpp deleted file mode 100644 index 8d435b8..0000000 --- a/depedencies/include/glm/gtx/closest_point.hpp +++ /dev/null @@ -1,45 +0,0 @@ -/// @ref gtx_closest_point -/// @file glm/gtx/closest_point.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_closest_point GLM_GTX_closest_point -/// @ingroup gtx -/// -/// @brief Find the point on a straight line which is the closet of a point. -/// -/// <glm/gtx/closest_point.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_closest_point extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_closest_point - /// @{ - - /// Find the point on a straight line which is the closet of a point. - /// @see gtx_closest_point - template <typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> closestPointOnLine( - tvec3<T, P> const & point, - tvec3<T, P> const & a, - tvec3<T, P> const & b); - - /// 2d lines work as well - template <typename T, precision P> - GLM_FUNC_DECL tvec2<T, P> closestPointOnLine( - tvec2<T, P> const & point, - tvec2<T, P> const & a, - tvec2<T, P> const & b); - - /// @} -}// namespace glm - -#include "closest_point.inl" diff --git a/depedencies/include/glm/gtx/closest_point.inl b/depedencies/include/glm/gtx/closest_point.inl deleted file mode 100644 index ccda9ab..0000000 --- a/depedencies/include/glm/gtx/closest_point.inl +++ /dev/null @@ -1,46 +0,0 @@ -/// @ref gtx_closest_point -/// @file glm/gtx/closest_point.inl - -namespace glm -{ - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> closestPointOnLine - ( - tvec3<T, P> const & point, - tvec3<T, P> const & a, - tvec3<T, P> const & b - ) - { - T LineLength = distance(a, b); - tvec3<T, P> Vector = point - a; - tvec3<T, P> LineDirection = (b - a) / LineLength; - - // Project Vector3 to LineDirection to get the distance of point from a - T Distance = dot(Vector, LineDirection); - - if(Distance <= T(0)) return a; - if(Distance >= LineLength) return b; - return a + LineDirection * Distance; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec2<T, P> closestPointOnLine - ( - tvec2<T, P> const & point, - tvec2<T, P> const & a, - tvec2<T, P> const & b - ) - { - T LineLength = distance(a, b); - tvec2<T, P> Vector = point - a; - tvec2<T, P> LineDirection = (b - a) / LineLength; - - // Project Vector3 to LineDirection to get the distance of point from a - T Distance = dot(Vector3, LineDirection); - - if(Distance <= T(0)) return a; - if(Distance >= LineLength) return b; - return a + LineDirection * Distance; - } - -}//namespace glm diff --git a/depedencies/include/glm/gtx/color_space.hpp b/depedencies/include/glm/gtx/color_space.hpp deleted file mode 100644 index 9ff08dc..0000000 --- a/depedencies/include/glm/gtx/color_space.hpp +++ /dev/null @@ -1,68 +0,0 @@ -/// @ref gtx_color_space -/// @file glm/gtx/color_space.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_color_space GLM_GTX_color_space -/// @ingroup gtx -/// -/// @brief Related to RGB to HSV conversions and operations. -/// -/// <glm/gtx/color_space.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_color_space extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_color_space - /// @{ - - /// Converts a color from HSV color space to its color in RGB color space. - /// @see gtx_color_space - template <typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> rgbColor( - tvec3<T, P> const & hsvValue); - - /// Converts a color from RGB color space to its color in HSV color space. - /// @see gtx_color_space - template <typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> hsvColor( - tvec3<T, P> const & rgbValue); - - /// Build a saturation matrix. - /// @see gtx_color_space - template <typename T> - GLM_FUNC_DECL tmat4x4<T, defaultp> saturation( - T const s); - - /// Modify the saturation of a color. - /// @see gtx_color_space - template <typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> saturation( - T const s, - tvec3<T, P> const & color); - - /// Modify the saturation of a color. - /// @see gtx_color_space - template <typename T, precision P> - GLM_FUNC_DECL tvec4<T, P> saturation( - T const s, - tvec4<T, P> const & color); - - /// Compute color luminosity associating ratios (0.33, 0.59, 0.11) to RGB canals. - /// @see gtx_color_space - template <typename T, precision P> - GLM_FUNC_DECL T luminosity( - tvec3<T, P> const & color); - - /// @} -}//namespace glm - -#include "color_space.inl" diff --git a/depedencies/include/glm/gtx/color_space.inl b/depedencies/include/glm/gtx/color_space.inl deleted file mode 100644 index e7cd58d..0000000 --- a/depedencies/include/glm/gtx/color_space.inl +++ /dev/null @@ -1,141 +0,0 @@ -/// @ref gtx_color_space -/// @file glm/gtx/color_space.inl - -namespace glm -{ - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> rgbColor(const tvec3<T, P>& hsvColor) - { - tvec3<T, P> hsv = hsvColor; - tvec3<T, P> rgbColor; - - if(hsv.y == static_cast<T>(0)) - // achromatic (grey) - rgbColor = tvec3<T, P>(hsv.z); - else - { - T sector = floor(hsv.x / T(60)); - T frac = (hsv.x / T(60)) - sector; - // factorial part of h - T o = hsv.z * (T(1) - hsv.y); - T p = hsv.z * (T(1) - hsv.y * frac); - T q = hsv.z * (T(1) - hsv.y * (T(1) - frac)); - - switch(int(sector)) - { - default: - case 0: - rgbColor.r = hsv.z; - rgbColor.g = q; - rgbColor.b = o; - break; - case 1: - rgbColor.r = p; - rgbColor.g = hsv.z; - rgbColor.b = o; - break; - case 2: - rgbColor.r = o; - rgbColor.g = hsv.z; - rgbColor.b = q; - break; - case 3: - rgbColor.r = o; - rgbColor.g = p; - rgbColor.b = hsv.z; - break; - case 4: - rgbColor.r = q; - rgbColor.g = o; - rgbColor.b = hsv.z; - break; - case 5: - rgbColor.r = hsv.z; - rgbColor.g = o; - rgbColor.b = p; - break; - } - } - - return rgbColor; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> hsvColor(const tvec3<T, P>& rgbColor) - { - tvec3<T, P> hsv = rgbColor; - float Min = min(min(rgbColor.r, rgbColor.g), rgbColor.b); - float Max = max(max(rgbColor.r, rgbColor.g), rgbColor.b); - float Delta = Max - Min; - - hsv.z = Max; - - if(Max != static_cast<T>(0)) - { - hsv.y = Delta / hsv.z; - T h = static_cast<T>(0); - - if(rgbColor.r == Max) - // between yellow & magenta - h = static_cast<T>(0) + T(60) * (rgbColor.g - rgbColor.b) / Delta; - else if(rgbColor.g == Max) - // between cyan & yellow - h = static_cast<T>(120) + T(60) * (rgbColor.b - rgbColor.r) / Delta; - else - // between magenta & cyan - h = static_cast<T>(240) + T(60) * (rgbColor.r - rgbColor.g) / Delta; - - if(h < T(0)) - hsv.x = h + T(360); - else - hsv.x = h; - } - else - { - // If r = g = b = 0 then s = 0, h is undefined - hsv.y = static_cast<T>(0); - hsv.x = static_cast<T>(0); - } - - return hsv; - } - - template <typename T> - GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> saturation(T const s) - { - tvec3<T, defaultp> rgbw = tvec3<T, defaultp>(T(0.2126), T(0.7152), T(0.0722)); - - tvec3<T, defaultp> const col((T(1) - s) * rgbw); - - tmat4x4<T, defaultp> result(T(1)); - result[0][0] = col.x + s; - result[0][1] = col.x; - result[0][2] = col.x; - result[1][0] = col.y; - result[1][1] = col.y + s; - result[1][2] = col.y; - result[2][0] = col.z; - result[2][1] = col.z; - result[2][2] = col.z + s; - return result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> saturation(const T s, const tvec3<T, P>& color) - { - return tvec3<T, P>(saturation(s) * tvec4<T, P>(color, T(0))); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec4<T, P> saturation(const T s, const tvec4<T, P>& color) - { - return saturation(s) * color; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER T luminosity(const tvec3<T, P>& color) - { - const tvec3<T, P> tmp = tvec3<T, P>(0.33, 0.59, 0.11); - return dot(color, tmp); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/color_space_YCoCg.hpp b/depedencies/include/glm/gtx/color_space_YCoCg.hpp deleted file mode 100644 index 428ca6d..0000000 --- a/depedencies/include/glm/gtx/color_space_YCoCg.hpp +++ /dev/null @@ -1,56 +0,0 @@ -/// @ref gtx_color_space_YCoCg -/// @file glm/gtx/color_space_YCoCg.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_color_space_YCoCg GLM_GTX_color_space_YCoCg -/// @ingroup gtx -/// -/// @brief RGB to YCoCg conversions and operations -/// -/// <glm/gtx/color_space_YCoCg.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_color_space_YCoCg extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_color_space_YCoCg - /// @{ - - /// Convert a color from RGB color space to YCoCg color space. - /// @see gtx_color_space_YCoCg - template <typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> rgb2YCoCg( - tvec3<T, P> const & rgbColor); - - /// Convert a color from YCoCg color space to RGB color space. - /// @see gtx_color_space_YCoCg - template <typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> YCoCg2rgb( - tvec3<T, P> const & YCoCgColor); - - /// Convert a color from RGB color space to YCoCgR color space. - /// @see "YCoCg-R: A Color Space with RGB Reversibility and Low Dynamic Range" - /// @see gtx_color_space_YCoCg - template <typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> rgb2YCoCgR( - tvec3<T, P> const & rgbColor); - - /// Convert a color from YCoCgR color space to RGB color space. - /// @see "YCoCg-R: A Color Space with RGB Reversibility and Low Dynamic Range" - /// @see gtx_color_space_YCoCg - template <typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> YCoCgR2rgb( - tvec3<T, P> const & YCoCgColor); - - /// @} -}//namespace glm - -#include "color_space_YCoCg.inl" diff --git a/depedencies/include/glm/gtx/color_space_YCoCg.inl b/depedencies/include/glm/gtx/color_space_YCoCg.inl deleted file mode 100644 index 1ca2e5b..0000000 --- a/depedencies/include/glm/gtx/color_space_YCoCg.inl +++ /dev/null @@ -1,108 +0,0 @@ -/// @ref gtx_color_space_YCoCg -/// @file glm/gtx/color_space_YCoCg.inl - -namespace glm -{ - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> rgb2YCoCg - ( - tvec3<T, P> const & rgbColor - ) - { - tvec3<T, P> result; - result.x/*Y */ = rgbColor.r / T(4) + rgbColor.g / T(2) + rgbColor.b / T(4); - result.y/*Co*/ = rgbColor.r / T(2) + rgbColor.g * T(0) - rgbColor.b / T(2); - result.z/*Cg*/ = - rgbColor.r / T(4) + rgbColor.g / T(2) - rgbColor.b / T(4); - return result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> YCoCg2rgb - ( - tvec3<T, P> const & YCoCgColor - ) - { - tvec3<T, P> result; - result.r = YCoCgColor.x + YCoCgColor.y - YCoCgColor.z; - result.g = YCoCgColor.x + YCoCgColor.z; - result.b = YCoCgColor.x - YCoCgColor.y - YCoCgColor.z; - return result; - } - - template <typename T, precision P, bool isInteger> - class compute_YCoCgR { - public: - static GLM_FUNC_QUALIFIER tvec3<T, P> rgb2YCoCgR - ( - tvec3<T, P> const & rgbColor - ) - { - tvec3<T, P> result; - result.x/*Y */ = rgbColor.g / T(2) + (rgbColor.r + rgbColor.b) / T(4); - result.y/*Co*/ = rgbColor.r - rgbColor.b; - result.z/*Cg*/ = rgbColor.g - (rgbColor.r + rgbColor.b) / T(2); - return result; - } - - static GLM_FUNC_QUALIFIER tvec3<T, P> YCoCgR2rgb - ( - tvec3<T, P> const & YCoCgRColor - ) - { - tvec3<T, P> result; - T tmp = YCoCgRColor.x - (YCoCgRColor.z / T(2)); - result.g = YCoCgRColor.z + tmp; - result.b = tmp - (YCoCgRColor.y / T(2)); - result.r = result.b + YCoCgRColor.y; - return result; - } - }; - - template <typename T, precision P> - class compute_YCoCgR<T, P, true> { - public: - static GLM_FUNC_QUALIFIER tvec3<T, P> rgb2YCoCgR - ( - tvec3<T, P> const & rgbColor - ) - { - tvec3<T, P> result; - result.y/*Co*/ = rgbColor.r - rgbColor.b; - T tmp = rgbColor.b + (result.y >> 1); - result.z/*Cg*/ = rgbColor.g - tmp; - result.x/*Y */ = tmp + (result.z >> 1); - return result; - } - - static GLM_FUNC_QUALIFIER tvec3<T, P> YCoCgR2rgb - ( - tvec3<T, P> const & YCoCgRColor - ) - { - tvec3<T, P> result; - T tmp = YCoCgRColor.x - (YCoCgRColor.z >> 1); - result.g = YCoCgRColor.z + tmp; - result.b = tmp - (YCoCgRColor.y >> 1); - result.r = result.b + YCoCgRColor.y; - return result; - } - }; - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> rgb2YCoCgR - ( - tvec3<T, P> const & rgbColor - ) - { - return compute_YCoCgR<T, P, std::numeric_limits<T>::is_integer>::rgb2YCoCgR(rgbColor); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> YCoCgR2rgb - ( - tvec3<T, P> const & YCoCgRColor - ) - { - return compute_YCoCgR<T, P, std::numeric_limits<T>::is_integer>::YCoCgR2rgb(YCoCgRColor); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/common.hpp b/depedencies/include/glm/gtx/common.hpp deleted file mode 100644 index 6533a54..0000000 --- a/depedencies/include/glm/gtx/common.hpp +++ /dev/null @@ -1,53 +0,0 @@ -/// @ref gtx_common -/// @file glm/gtx/common.hpp -/// -/// @see core (dependence) -/// @see gtc_half_float (dependence) -/// -/// @defgroup gtx_common GLM_GTX_common -/// @ingroup gtx -/// -/// @brief Provide functions to increase the compatibility with Cg and HLSL languages -/// -/// <glm/gtx/common.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependencies: -#include "../vec2.hpp" -#include "../vec3.hpp" -#include "../vec4.hpp" -#include "../gtc/vec1.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_common extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_common - /// @{ - - /// Returns true if x is a denormalized number - /// Numbers whose absolute value is too small to be represented in the normal format are represented in an alternate, denormalized format. - /// This format is less precise but can represent values closer to zero. - /// - /// @tparam genType Floating-point scalar or vector types. - /// - /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/isnan.xml">GLSL isnan man page</a> - /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a> - template <typename genType> - GLM_FUNC_DECL typename genType::bool_type isdenormal(genType const & x); - - /// Similar to 'mod' but with a different rounding and integer support. - /// Returns 'x - y * trunc(x/y)' instead of 'x - y * floor(x/y)' - /// - /// @see <a href="http://stackoverflow.com/questions/7610631/glsl-mod-vs-hlsl-fmod">GLSL mod vs HLSL fmod</a> - /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mod.xml">GLSL mod man page</a> - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<T, P> fmod(vecType<T, P> const & v); - - /// @} -}//namespace glm - -#include "common.inl" diff --git a/depedencies/include/glm/gtx/common.inl b/depedencies/include/glm/gtx/common.inl deleted file mode 100644 index 6c9cb65..0000000 --- a/depedencies/include/glm/gtx/common.inl +++ /dev/null @@ -1,112 +0,0 @@ -/// @ref gtx_common -/// @file glm/gtx/common.inl - -#include <cmath> - -namespace glm{ -namespace detail -{ - template <typename T, precision P, template <class, precision> class vecType, bool isFloat = true> - struct compute_fmod - { - GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & a, vecType<T, P> const & b) - { - return detail::functor2<T, P, vecType>::call(std::fmod, a, b); - } - }; - - template <typename T, precision P, template <class, precision> class vecType> - struct compute_fmod<T, P, vecType, false> - { - GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & a, vecType<T, P> const & b) - { - return a % b; - } - }; -}//namespace detail - - template <typename T> - GLM_FUNC_QUALIFIER bool isdenormal(T const & x) - { - GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isdenormal' only accept floating-point inputs"); - -# if GLM_HAS_CXX11_STL - return std::fpclassify(x) == FP_SUBNORMAL; -# else - return x != static_cast<T>(0) && std::fabs(x) < std::numeric_limits<T>::min(); -# endif - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER typename tvec1<T, P>::bool_type isdenormal - ( - tvec1<T, P> const & x - ) - { - GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isdenormal' only accept floating-point inputs"); - - return typename tvec1<T, P>::bool_type( - isdenormal(x.x)); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER typename tvec2<T, P>::bool_type isdenormal - ( - tvec2<T, P> const & x - ) - { - GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isdenormal' only accept floating-point inputs"); - - return typename tvec2<T, P>::bool_type( - isdenormal(x.x), - isdenormal(x.y)); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER typename tvec3<T, P>::bool_type isdenormal - ( - tvec3<T, P> const & x - ) - { - GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isdenormal' only accept floating-point inputs"); - - return typename tvec3<T, P>::bool_type( - isdenormal(x.x), - isdenormal(x.y), - isdenormal(x.z)); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER typename tvec4<T, P>::bool_type isdenormal - ( - tvec4<T, P> const & x - ) - { - GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isdenormal' only accept floating-point inputs"); - - return typename tvec4<T, P>::bool_type( - isdenormal(x.x), - isdenormal(x.y), - isdenormal(x.z), - isdenormal(x.w)); - } - - // fmod - template <typename genType> - GLM_FUNC_QUALIFIER genType fmod(genType x, genType y) - { - return fmod(tvec1<genType>(x), y).x; - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> fmod(vecType<T, P> const & x, T y) - { - return detail::compute_fmod<T, P, vecType, std::numeric_limits<T>::is_iec559>::call(x, vecType<T, P>(y)); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> fmod(vecType<T, P> const & x, vecType<T, P> const & y) - { - return detail::compute_fmod<T, P, vecType, std::numeric_limits<T>::is_iec559>::call(x, y); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/compatibility.hpp b/depedencies/include/glm/gtx/compatibility.hpp deleted file mode 100644 index 9f4819a..0000000 --- a/depedencies/include/glm/gtx/compatibility.hpp +++ /dev/null @@ -1,130 +0,0 @@ -/// @ref gtx_compatibility -/// @file glm/gtx/compatibility.hpp -/// -/// @see core (dependence) -/// @see gtc_half_float (dependence) -/// -/// @defgroup gtx_compatibility GLM_GTX_compatibility -/// @ingroup gtx -/// -/// @brief Provide functions to increase the compatibility with Cg and HLSL languages -/// -/// <glm/gtx/compatibility.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" -#include "../gtc/quaternion.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_compatibility extension included") -#endif - -#if GLM_COMPILER & GLM_COMPILER_VC -# include <cfloat> -#elif GLM_COMPILER & GLM_COMPILER_GCC -# include <cmath> -# if(GLM_PLATFORM & GLM_PLATFORM_ANDROID) -# undef isfinite -# endif -#endif//GLM_COMPILER - -namespace glm -{ - /// @addtogroup gtx_compatibility - /// @{ - - template <typename T> GLM_FUNC_QUALIFIER T lerp(T x, T y, T a){return mix(x, y, a);} //!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility) - template <typename T, precision P> GLM_FUNC_QUALIFIER tvec2<T, P> lerp(const tvec2<T, P>& x, const tvec2<T, P>& y, T a){return mix(x, y, a);} //!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility) - - template <typename T, precision P> GLM_FUNC_QUALIFIER tvec3<T, P> lerp(const tvec3<T, P>& x, const tvec3<T, P>& y, T a){return mix(x, y, a);} //!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility) - template <typename T, precision P> GLM_FUNC_QUALIFIER tvec4<T, P> lerp(const tvec4<T, P>& x, const tvec4<T, P>& y, T a){return mix(x, y, a);} //!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility) - template <typename T, precision P> GLM_FUNC_QUALIFIER tvec2<T, P> lerp(const tvec2<T, P>& x, const tvec2<T, P>& y, const tvec2<T, P>& a){return mix(x, y, a);} //!< \brief Returns the component-wise result of x * (1.0 - a) + y * a, i.e., the linear blend of x and y using vector a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility) - template <typename T, precision P> GLM_FUNC_QUALIFIER tvec3<T, P> lerp(const tvec3<T, P>& x, const tvec3<T, P>& y, const tvec3<T, P>& a){return mix(x, y, a);} //!< \brief Returns the component-wise result of x * (1.0 - a) + y * a, i.e., the linear blend of x and y using vector a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility) - template <typename T, precision P> GLM_FUNC_QUALIFIER tvec4<T, P> lerp(const tvec4<T, P>& x, const tvec4<T, P>& y, const tvec4<T, P>& a){return mix(x, y, a);} //!< \brief Returns the component-wise result of x * (1.0 - a) + y * a, i.e., the linear blend of x and y using vector a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility) - - template <typename T, precision P> GLM_FUNC_QUALIFIER T saturate(T x){return clamp(x, T(0), T(1));} //!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility) - template <typename T, precision P> GLM_FUNC_QUALIFIER tvec2<T, P> saturate(const tvec2<T, P>& x){return clamp(x, T(0), T(1));} //!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility) - template <typename T, precision P> GLM_FUNC_QUALIFIER tvec3<T, P> saturate(const tvec3<T, P>& x){return clamp(x, T(0), T(1));} //!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility) - template <typename T, precision P> GLM_FUNC_QUALIFIER tvec4<T, P> saturate(const tvec4<T, P>& x){return clamp(x, T(0), T(1));} //!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility) - - template <typename T, precision P> GLM_FUNC_QUALIFIER T atan2(T x, T y){return atan(x, y);} //!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility) - template <typename T, precision P> GLM_FUNC_QUALIFIER tvec2<T, P> atan2(const tvec2<T, P>& x, const tvec2<T, P>& y){return atan(x, y);} //!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility) - template <typename T, precision P> GLM_FUNC_QUALIFIER tvec3<T, P> atan2(const tvec3<T, P>& x, const tvec3<T, P>& y){return atan(x, y);} //!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility) - template <typename T, precision P> GLM_FUNC_QUALIFIER tvec4<T, P> atan2(const tvec4<T, P>& x, const tvec4<T, P>& y){return atan(x, y);} //!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility) - - template <typename genType> GLM_FUNC_DECL bool isfinite(genType const & x); //!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility) - template <typename T, precision P> GLM_FUNC_DECL tvec1<bool, P> isfinite(const tvec1<T, P>& x); //!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility) - template <typename T, precision P> GLM_FUNC_DECL tvec2<bool, P> isfinite(const tvec2<T, P>& x); //!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility) - template <typename T, precision P> GLM_FUNC_DECL tvec3<bool, P> isfinite(const tvec3<T, P>& x); //!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility) - template <typename T, precision P> GLM_FUNC_DECL tvec4<bool, P> isfinite(const tvec4<T, P>& x); //!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility) - - typedef bool bool1; //!< \brief boolean type with 1 component. (From GLM_GTX_compatibility extension) - typedef tvec2<bool, highp> bool2; //!< \brief boolean type with 2 components. (From GLM_GTX_compatibility extension) - typedef tvec3<bool, highp> bool3; //!< \brief boolean type with 3 components. (From GLM_GTX_compatibility extension) - typedef tvec4<bool, highp> bool4; //!< \brief boolean type with 4 components. (From GLM_GTX_compatibility extension) - - typedef bool bool1x1; //!< \brief boolean matrix with 1 x 1 component. (From GLM_GTX_compatibility extension) - typedef tmat2x2<bool, highp> bool2x2; //!< \brief boolean matrix with 2 x 2 components. (From GLM_GTX_compatibility extension) - typedef tmat2x3<bool, highp> bool2x3; //!< \brief boolean matrix with 2 x 3 components. (From GLM_GTX_compatibility extension) - typedef tmat2x4<bool, highp> bool2x4; //!< \brief boolean matrix with 2 x 4 components. (From GLM_GTX_compatibility extension) - typedef tmat3x2<bool, highp> bool3x2; //!< \brief boolean matrix with 3 x 2 components. (From GLM_GTX_compatibility extension) - typedef tmat3x3<bool, highp> bool3x3; //!< \brief boolean matrix with 3 x 3 components. (From GLM_GTX_compatibility extension) - typedef tmat3x4<bool, highp> bool3x4; //!< \brief boolean matrix with 3 x 4 components. (From GLM_GTX_compatibility extension) - typedef tmat4x2<bool, highp> bool4x2; //!< \brief boolean matrix with 4 x 2 components. (From GLM_GTX_compatibility extension) - typedef tmat4x3<bool, highp> bool4x3; //!< \brief boolean matrix with 4 x 3 components. (From GLM_GTX_compatibility extension) - typedef tmat4x4<bool, highp> bool4x4; //!< \brief boolean matrix with 4 x 4 components. (From GLM_GTX_compatibility extension) - - typedef int int1; //!< \brief integer vector with 1 component. (From GLM_GTX_compatibility extension) - typedef tvec2<int, highp> int2; //!< \brief integer vector with 2 components. (From GLM_GTX_compatibility extension) - typedef tvec3<int, highp> int3; //!< \brief integer vector with 3 components. (From GLM_GTX_compatibility extension) - typedef tvec4<int, highp> int4; //!< \brief integer vector with 4 components. (From GLM_GTX_compatibility extension) - - typedef int int1x1; //!< \brief integer matrix with 1 component. (From GLM_GTX_compatibility extension) - typedef tmat2x2<int, highp> int2x2; //!< \brief integer matrix with 2 x 2 components. (From GLM_GTX_compatibility extension) - typedef tmat2x3<int, highp> int2x3; //!< \brief integer matrix with 2 x 3 components. (From GLM_GTX_compatibility extension) - typedef tmat2x4<int, highp> int2x4; //!< \brief integer matrix with 2 x 4 components. (From GLM_GTX_compatibility extension) - typedef tmat3x2<int, highp> int3x2; //!< \brief integer matrix with 3 x 2 components. (From GLM_GTX_compatibility extension) - typedef tmat3x3<int, highp> int3x3; //!< \brief integer matrix with 3 x 3 components. (From GLM_GTX_compatibility extension) - typedef tmat3x4<int, highp> int3x4; //!< \brief integer matrix with 3 x 4 components. (From GLM_GTX_compatibility extension) - typedef tmat4x2<int, highp> int4x2; //!< \brief integer matrix with 4 x 2 components. (From GLM_GTX_compatibility extension) - typedef tmat4x3<int, highp> int4x3; //!< \brief integer matrix with 4 x 3 components. (From GLM_GTX_compatibility extension) - typedef tmat4x4<int, highp> int4x4; //!< \brief integer matrix with 4 x 4 components. (From GLM_GTX_compatibility extension) - - typedef float float1; //!< \brief single-precision floating-point vector with 1 component. (From GLM_GTX_compatibility extension) - typedef tvec2<float, highp> float2; //!< \brief single-precision floating-point vector with 2 components. (From GLM_GTX_compatibility extension) - typedef tvec3<float, highp> float3; //!< \brief single-precision floating-point vector with 3 components. (From GLM_GTX_compatibility extension) - typedef tvec4<float, highp> float4; //!< \brief single-precision floating-point vector with 4 components. (From GLM_GTX_compatibility extension) - - typedef float float1x1; //!< \brief single-precision floating-point matrix with 1 component. (From GLM_GTX_compatibility extension) - typedef tmat2x2<float, highp> float2x2; //!< \brief single-precision floating-point matrix with 2 x 2 components. (From GLM_GTX_compatibility extension) - typedef tmat2x3<float, highp> float2x3; //!< \brief single-precision floating-point matrix with 2 x 3 components. (From GLM_GTX_compatibility extension) - typedef tmat2x4<float, highp> float2x4; //!< \brief single-precision floating-point matrix with 2 x 4 components. (From GLM_GTX_compatibility extension) - typedef tmat3x2<float, highp> float3x2; //!< \brief single-precision floating-point matrix with 3 x 2 components. (From GLM_GTX_compatibility extension) - typedef tmat3x3<float, highp> float3x3; //!< \brief single-precision floating-point matrix with 3 x 3 components. (From GLM_GTX_compatibility extension) - typedef tmat3x4<float, highp> float3x4; //!< \brief single-precision floating-point matrix with 3 x 4 components. (From GLM_GTX_compatibility extension) - typedef tmat4x2<float, highp> float4x2; //!< \brief single-precision floating-point matrix with 4 x 2 components. (From GLM_GTX_compatibility extension) - typedef tmat4x3<float, highp> float4x3; //!< \brief single-precision floating-point matrix with 4 x 3 components. (From GLM_GTX_compatibility extension) - typedef tmat4x4<float, highp> float4x4; //!< \brief single-precision floating-point matrix with 4 x 4 components. (From GLM_GTX_compatibility extension) - - typedef double double1; //!< \brief double-precision floating-point vector with 1 component. (From GLM_GTX_compatibility extension) - typedef tvec2<double, highp> double2; //!< \brief double-precision floating-point vector with 2 components. (From GLM_GTX_compatibility extension) - typedef tvec3<double, highp> double3; //!< \brief double-precision floating-point vector with 3 components. (From GLM_GTX_compatibility extension) - typedef tvec4<double, highp> double4; //!< \brief double-precision floating-point vector with 4 components. (From GLM_GTX_compatibility extension) - - typedef double double1x1; //!< \brief double-precision floating-point matrix with 1 component. (From GLM_GTX_compatibility extension) - typedef tmat2x2<double, highp> double2x2; //!< \brief double-precision floating-point matrix with 2 x 2 components. (From GLM_GTX_compatibility extension) - typedef tmat2x3<double, highp> double2x3; //!< \brief double-precision floating-point matrix with 2 x 3 components. (From GLM_GTX_compatibility extension) - typedef tmat2x4<double, highp> double2x4; //!< \brief double-precision floating-point matrix with 2 x 4 components. (From GLM_GTX_compatibility extension) - typedef tmat3x2<double, highp> double3x2; //!< \brief double-precision floating-point matrix with 3 x 2 components. (From GLM_GTX_compatibility extension) - typedef tmat3x3<double, highp> double3x3; //!< \brief double-precision floating-point matrix with 3 x 3 components. (From GLM_GTX_compatibility extension) - typedef tmat3x4<double, highp> double3x4; //!< \brief double-precision floating-point matrix with 3 x 4 components. (From GLM_GTX_compatibility extension) - typedef tmat4x2<double, highp> double4x2; //!< \brief double-precision floating-point matrix with 4 x 2 components. (From GLM_GTX_compatibility extension) - typedef tmat4x3<double, highp> double4x3; //!< \brief double-precision floating-point matrix with 4 x 3 components. (From GLM_GTX_compatibility extension) - typedef tmat4x4<double, highp> double4x4; //!< \brief double-precision floating-point matrix with 4 x 4 components. (From GLM_GTX_compatibility extension) - - /// @} -}//namespace glm - -#include "compatibility.inl" diff --git a/depedencies/include/glm/gtx/compatibility.inl b/depedencies/include/glm/gtx/compatibility.inl deleted file mode 100644 index 368527a..0000000 --- a/depedencies/include/glm/gtx/compatibility.inl +++ /dev/null @@ -1,65 +0,0 @@ -/// @ref gtx_compatibility -/// @file glm/gtx/compatibility.inl - -#include <limits> - -namespace glm -{ - // isfinite - template <typename genType> - GLM_FUNC_QUALIFIER bool isfinite( - genType const & x) - { -# if GLM_HAS_CXX11_STL - return std::isfinite(x) != 0; -# elif GLM_COMPILER & GLM_COMPILER_VC - return _finite(x); -# elif GLM_COMPILER & GLM_COMPILER_GCC && GLM_PLATFORM & GLM_PLATFORM_ANDROID - return _isfinite(x) != 0; -# else - if (std::numeric_limits<genType>::is_integer || std::denorm_absent == std::numeric_limits<genType>::has_denorm) - return std::numeric_limits<genType>::min() <= x && std::numeric_limits<genType>::max() >= x; - else - return -std::numeric_limits<genType>::max() <= x && std::numeric_limits<genType>::max() >= x; -# endif - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec1<bool, P> isfinite( - tvec1<T, P> const & x) - { - return tvec1<bool, P>( - isfinite(x.x)); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec2<bool, P> isfinite( - tvec2<T, P> const & x) - { - return tvec2<bool, P>( - isfinite(x.x), - isfinite(x.y)); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<bool, P> isfinite( - tvec3<T, P> const & x) - { - return tvec3<bool, P>( - isfinite(x.x), - isfinite(x.y), - isfinite(x.z)); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec4<bool, P> isfinite( - tvec4<T, P> const & x) - { - return tvec4<bool, P>( - isfinite(x.x), - isfinite(x.y), - isfinite(x.z), - isfinite(x.w)); - } - -}//namespace glm diff --git a/depedencies/include/glm/gtx/component_wise.hpp b/depedencies/include/glm/gtx/component_wise.hpp deleted file mode 100644 index c316f9e..0000000 --- a/depedencies/include/glm/gtx/component_wise.hpp +++ /dev/null @@ -1,65 +0,0 @@ -/// @ref gtx_component_wise -/// @file glm/gtx/component_wise.hpp -/// @date 2007-05-21 / 2011-06-07 -/// @author Christophe Riccio -/// -/// @see core (dependence) -/// -/// @defgroup gtx_component_wise GLM_GTX_component_wise -/// @ingroup gtx -/// -/// @brief Operations between components of a type -/// -/// <glm/gtx/component_wise.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependencies -#include "../detail/setup.hpp" -#include "../detail/precision.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_component_wise extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_component_wise - /// @{ - - /// Convert an integer vector to a normalized float vector. - /// If the parameter value type is already a floating precision type, the value is passed through. - /// @see gtx_component_wise - template <typename floatType, typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<floatType, P> compNormalize(vecType<T, P> const & v); - - /// Convert a normalized float vector to an integer vector. - /// If the parameter value type is already a floating precision type, the value is passed through. - /// @see gtx_component_wise - template <typename T, typename floatType, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<T, P> compScale(vecType<floatType, P> const & v); - - /// Add all vector components together. - /// @see gtx_component_wise - template <typename genType> - GLM_FUNC_DECL typename genType::value_type compAdd(genType const & v); - - /// Multiply all vector components together. - /// @see gtx_component_wise - template <typename genType> - GLM_FUNC_DECL typename genType::value_type compMul(genType const & v); - - /// Find the minimum value between single vector components. - /// @see gtx_component_wise - template <typename genType> - GLM_FUNC_DECL typename genType::value_type compMin(genType const & v); - - /// Find the maximum value between single vector components. - /// @see gtx_component_wise - template <typename genType> - GLM_FUNC_DECL typename genType::value_type compMax(genType const & v); - - /// @} -}//namespace glm - -#include "component_wise.inl" diff --git a/depedencies/include/glm/gtx/component_wise.inl b/depedencies/include/glm/gtx/component_wise.inl deleted file mode 100644 index add3969..0000000 --- a/depedencies/include/glm/gtx/component_wise.inl +++ /dev/null @@ -1,128 +0,0 @@ -/// @ref gtx_component_wise -/// @file glm/gtx/component_wise.inl - -#include <limits> - -namespace glm{ -namespace detail -{ - template <typename T, typename floatType, precision P, template <typename, precision> class vecType, bool isInteger, bool signedType> - struct compute_compNormalize - {}; - - template <typename T, typename floatType, precision P, template <typename, precision> class vecType> - struct compute_compNormalize<T, floatType, P, vecType, true, true> - { - GLM_FUNC_QUALIFIER static vecType<floatType, P> call(vecType<T, P> const & v) - { - floatType const Min = static_cast<floatType>(std::numeric_limits<T>::min()); - floatType const Max = static_cast<floatType>(std::numeric_limits<T>::max()); - return (vecType<floatType, P>(v) - Min) / (Max - Min) * static_cast<floatType>(2) - static_cast<floatType>(1); - } - }; - - template <typename T, typename floatType, precision P, template <typename, precision> class vecType> - struct compute_compNormalize<T, floatType, P, vecType, true, false> - { - GLM_FUNC_QUALIFIER static vecType<floatType, P> call(vecType<T, P> const & v) - { - return vecType<floatType, P>(v) / static_cast<floatType>(std::numeric_limits<T>::max()); - } - }; - - template <typename T, typename floatType, precision P, template <typename, precision> class vecType> - struct compute_compNormalize<T, floatType, P, vecType, false, true> - { - GLM_FUNC_QUALIFIER static vecType<floatType, P> call(vecType<T, P> const & v) - { - return v; - } - }; - - template <typename T, typename floatType, precision P, template <typename, precision> class vecType, bool isInteger, bool signedType> - struct compute_compScale - {}; - - template <typename T, typename floatType, precision P, template <typename, precision> class vecType> - struct compute_compScale<T, floatType, P, vecType, true, true> - { - GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<floatType, P> const & v) - { - floatType const Max = static_cast<floatType>(std::numeric_limits<T>::max()) + static_cast<floatType>(0.5); - vecType<floatType, P> const Scaled(v * Max); - vecType<T, P> const Result(Scaled - static_cast<floatType>(0.5)); - return Result; - } - }; - - template <typename T, typename floatType, precision P, template <typename, precision> class vecType> - struct compute_compScale<T, floatType, P, vecType, true, false> - { - GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<floatType, P> const & v) - { - return vecType<T, P>(vecType<floatType, P>(v) * static_cast<floatType>(std::numeric_limits<T>::max())); - } - }; - - template <typename T, typename floatType, precision P, template <typename, precision> class vecType> - struct compute_compScale<T, floatType, P, vecType, false, true> - { - GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<floatType, P> const & v) - { - return v; - } - }; -}//namespace detail - - template <typename floatType, typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<floatType, P> compNormalize(vecType<T, P> const & v) - { - GLM_STATIC_ASSERT(std::numeric_limits<floatType>::is_iec559, "'compNormalize' accepts only floating-point types for 'floatType' template parameter"); - - return detail::compute_compNormalize<T, floatType, P, vecType, std::numeric_limits<T>::is_integer, std::numeric_limits<T>::is_signed>::call(v); - } - - template <typename T, typename floatType, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> compScale(vecType<floatType, P> const & v) - { - GLM_STATIC_ASSERT(std::numeric_limits<floatType>::is_iec559, "'compScale' accepts only floating-point types for 'floatType' template parameter"); - - return detail::compute_compScale<T, floatType, P, vecType, std::numeric_limits<T>::is_integer, std::numeric_limits<T>::is_signed>::call(v); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER T compAdd(vecType<T, P> const & v) - { - T Result(0); - for(length_t i = 0, n = v.length(); i < n; ++i) - Result += v[i]; - return Result; - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER T compMul(vecType<T, P> const & v) - { - T Result(1); - for(length_t i = 0, n = v.length(); i < n; ++i) - Result *= v[i]; - return Result; - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER T compMin(vecType<T, P> const & v) - { - T Result(v[0]); - for(length_t i = 1, n = v.length(); i < n; ++i) - Result = min(Result, v[i]); - return Result; - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER T compMax(vecType<T, P> const & v) - { - T Result(v[0]); - for(length_t i = 1, n = v.length(); i < n; ++i) - Result = max(Result, v[i]); - return Result; - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/dual_quaternion.hpp b/depedencies/include/glm/gtx/dual_quaternion.hpp deleted file mode 100644 index 4d7b61e..0000000 --- a/depedencies/include/glm/gtx/dual_quaternion.hpp +++ /dev/null @@ -1,266 +0,0 @@ -/// @ref gtx_dual_quaternion -/// @file glm/gtx/dual_quaternion.hpp -/// @author Maksim Vorobiev (msomeone@gmail.com) -/// -/// @see core (dependence) -/// @see gtc_half_float (dependence) -/// @see gtc_constants (dependence) -/// @see gtc_quaternion (dependence) -/// -/// @defgroup gtx_dual_quaternion GLM_GTX_dual_quaternion -/// @ingroup gtx -/// -/// @brief Defines a templated dual-quaternion type and several dual-quaternion operations. -/// -/// <glm/gtx/dual_quaternion.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" -#include "../gtc/constants.hpp" -#include "../gtc/quaternion.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_dual_quaternion extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_dual_quaternion - /// @{ - - template <typename T, precision P = defaultp> - struct tdualquat - { - // -- Implementation detail -- - - typedef T value_type; - typedef glm::tquat<T, P> part_type; - - // -- Data -- - - glm::tquat<T, P> real, dual; - - // -- Component accesses -- - - typedef length_t length_type; - /// Return the count of components of a dual quaternion - GLM_FUNC_DECL static length_type length(){return 2;} - - GLM_FUNC_DECL part_type & operator[](length_type i); - GLM_FUNC_DECL part_type const & operator[](length_type i) const; - - // -- Implicit basic constructors -- - - GLM_FUNC_DECL GLM_CONSTEXPR tdualquat() GLM_DEFAULT_CTOR; - GLM_FUNC_DECL GLM_CONSTEXPR tdualquat(tdualquat<T, P> const & d) GLM_DEFAULT; - template <precision Q> - GLM_FUNC_DECL GLM_CONSTEXPR tdualquat(tdualquat<T, Q> const & d); - - // -- Explicit basic constructors -- - - GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tdualquat(ctor); - GLM_FUNC_DECL GLM_CONSTEXPR tdualquat(tquat<T, P> const & real); - GLM_FUNC_DECL GLM_CONSTEXPR tdualquat(tquat<T, P> const & orientation, tvec3<T, P> const & translation); - GLM_FUNC_DECL GLM_CONSTEXPR tdualquat(tquat<T, P> const & real, tquat<T, P> const & dual); - - // -- Conversion constructors -- - - template <typename U, precision Q> - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tdualquat(tdualquat<U, Q> const & q); - - GLM_FUNC_DECL GLM_EXPLICIT tdualquat(tmat2x4<T, P> const & holder_mat); - GLM_FUNC_DECL GLM_EXPLICIT tdualquat(tmat3x4<T, P> const & aug_mat); - - // -- Unary arithmetic operators -- - - GLM_FUNC_DECL tdualquat<T, P> & operator=(tdualquat<T, P> const & m) GLM_DEFAULT; - - template <typename U> - GLM_FUNC_DECL tdualquat<T, P> & operator=(tdualquat<U, P> const & m); - template <typename U> - GLM_FUNC_DECL tdualquat<T, P> & operator*=(U s); - template <typename U> - GLM_FUNC_DECL tdualquat<T, P> & operator/=(U s); - }; - - // -- Unary bit operators -- - - template <typename T, precision P> - GLM_FUNC_DECL tdualquat<T, P> operator+(tdualquat<T, P> const & q); - - template <typename T, precision P> - GLM_FUNC_DECL tdualquat<T, P> operator-(tdualquat<T, P> const & q); - - // -- Binary operators -- - - template <typename T, precision P> - GLM_FUNC_DECL tdualquat<T, P> operator+(tdualquat<T, P> const & q, tdualquat<T, P> const & p); - - template <typename T, precision P> - GLM_FUNC_DECL tdualquat<T, P> operator*(tdualquat<T, P> const & q, tdualquat<T, P> const & p); - - template <typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> operator*(tdualquat<T, P> const & q, tvec3<T, P> const & v); - - template <typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> operator*(tvec3<T, P> const & v, tdualquat<T, P> const & q); - - template <typename T, precision P> - GLM_FUNC_DECL tvec4<T, P> operator*(tdualquat<T, P> const & q, tvec4<T, P> const & v); - - template <typename T, precision P> - GLM_FUNC_DECL tvec4<T, P> operator*(tvec4<T, P> const & v, tdualquat<T, P> const & q); - - template <typename T, precision P> - GLM_FUNC_DECL tdualquat<T, P> operator*(tdualquat<T, P> const & q, T const & s); - - template <typename T, precision P> - GLM_FUNC_DECL tdualquat<T, P> operator*(T const & s, tdualquat<T, P> const & q); - - template <typename T, precision P> - GLM_FUNC_DECL tdualquat<T, P> operator/(tdualquat<T, P> const & q, T const & s); - - // -- Boolean operators -- - - template <typename T, precision P> - GLM_FUNC_DECL bool operator==(tdualquat<T, P> const & q1, tdualquat<T, P> const & q2); - - template <typename T, precision P> - GLM_FUNC_DECL bool operator!=(tdualquat<T, P> const & q1, tdualquat<T, P> const & q2); - - /// Returns the normalized quaternion. - /// - /// @see gtx_dual_quaternion - template <typename T, precision P> - GLM_FUNC_DECL tdualquat<T, P> normalize(tdualquat<T, P> const & q); - - /// Returns the linear interpolation of two dual quaternion. - /// - /// @see gtc_dual_quaternion - template <typename T, precision P> - GLM_FUNC_DECL tdualquat<T, P> lerp(tdualquat<T, P> const & x, tdualquat<T, P> const & y, T const & a); - - /// Returns the q inverse. - /// - /// @see gtx_dual_quaternion - template <typename T, precision P> - GLM_FUNC_DECL tdualquat<T, P> inverse(tdualquat<T, P> const & q); - - /// Converts a quaternion to a 2 * 4 matrix. - /// - /// @see gtx_dual_quaternion - template <typename T, precision P> - GLM_FUNC_DECL tmat2x4<T, P> mat2x4_cast(tdualquat<T, P> const & x); - - /// Converts a quaternion to a 3 * 4 matrix. - /// - /// @see gtx_dual_quaternion - template <typename T, precision P> - GLM_FUNC_DECL tmat3x4<T, P> mat3x4_cast(tdualquat<T, P> const & x); - - /// Converts a 2 * 4 matrix (matrix which holds real and dual parts) to a quaternion. - /// - /// @see gtx_dual_quaternion - template <typename T, precision P> - GLM_FUNC_DECL tdualquat<T, P> dualquat_cast(tmat2x4<T, P> const & x); - - /// Converts a 3 * 4 matrix (augmented matrix rotation + translation) to a quaternion. - /// - /// @see gtx_dual_quaternion - template <typename T, precision P> - GLM_FUNC_DECL tdualquat<T, P> dualquat_cast(tmat3x4<T, P> const & x); - - - /// Dual-quaternion of low single-precision floating-point numbers. - /// - /// @see gtx_dual_quaternion - typedef tdualquat<float, lowp> lowp_dualquat; - - /// Dual-quaternion of medium single-precision floating-point numbers. - /// - /// @see gtx_dual_quaternion - typedef tdualquat<float, mediump> mediump_dualquat; - - /// Dual-quaternion of high single-precision floating-point numbers. - /// - /// @see gtx_dual_quaternion - typedef tdualquat<float, highp> highp_dualquat; - - - /// Dual-quaternion of low single-precision floating-point numbers. - /// - /// @see gtx_dual_quaternion - typedef tdualquat<float, lowp> lowp_fdualquat; - - /// Dual-quaternion of medium single-precision floating-point numbers. - /// - /// @see gtx_dual_quaternion - typedef tdualquat<float, mediump> mediump_fdualquat; - - /// Dual-quaternion of high single-precision floating-point numbers. - /// - /// @see gtx_dual_quaternion - typedef tdualquat<float, highp> highp_fdualquat; - - - /// Dual-quaternion of low double-precision floating-point numbers. - /// - /// @see gtx_dual_quaternion - typedef tdualquat<double, lowp> lowp_ddualquat; - - /// Dual-quaternion of medium double-precision floating-point numbers. - /// - /// @see gtx_dual_quaternion - typedef tdualquat<double, mediump> mediump_ddualquat; - - /// Dual-quaternion of high double-precision floating-point numbers. - /// - /// @see gtx_dual_quaternion - typedef tdualquat<double, highp> highp_ddualquat; - - -#if(!defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT)) - /// Dual-quaternion of floating-point numbers. - /// - /// @see gtx_dual_quaternion - typedef highp_fdualquat dualquat; - - /// Dual-quaternion of single-precision floating-point numbers. - /// - /// @see gtx_dual_quaternion - typedef highp_fdualquat fdualquat; -#elif(defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT)) - typedef highp_fdualquat dualquat; - typedef highp_fdualquat fdualquat; -#elif(!defined(GLM_PRECISION_HIGHP_FLOAT) && defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT)) - typedef mediump_fdualquat dualquat; - typedef mediump_fdualquat fdualquat; -#elif(!defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && defined(GLM_PRECISION_LOWP_FLOAT)) - typedef lowp_fdualquat dualquat; - typedef lowp_fdualquat fdualquat; -#else -# error "GLM error: multiple default precision requested for single-precision floating-point types" -#endif - - -#if(!defined(GLM_PRECISION_HIGHP_DOUBLE) && !defined(GLM_PRECISION_MEDIUMP_DOUBLE) && !defined(GLM_PRECISION_LOWP_DOUBLE)) - /// Dual-quaternion of default double-precision floating-point numbers. - /// - /// @see gtx_dual_quaternion - typedef highp_ddualquat ddualquat; -#elif(defined(GLM_PRECISION_HIGHP_DOUBLE) && !defined(GLM_PRECISION_MEDIUMP_DOUBLE) && !defined(GLM_PRECISION_LOWP_DOUBLE)) - typedef highp_ddualquat ddualquat; -#elif(!defined(GLM_PRECISION_HIGHP_DOUBLE) && defined(GLM_PRECISION_MEDIUMP_DOUBLE) && !defined(GLM_PRECISION_LOWP_DOUBLE)) - typedef mediump_ddualquat ddualquat; -#elif(!defined(GLM_PRECISION_HIGHP_DOUBLE) && !defined(GLM_PRECISION_MEDIUMP_DOUBLE) && defined(GLM_PRECISION_LOWP_DOUBLE)) - typedef lowp_ddualquat ddualquat; -#else -# error "GLM error: Multiple default precision requested for double-precision floating-point types" -#endif - - /// @} -} //namespace glm - -#include "dual_quaternion.inl" diff --git a/depedencies/include/glm/gtx/dual_quaternion.inl b/depedencies/include/glm/gtx/dual_quaternion.inl deleted file mode 100644 index c3f2bc6..0000000 --- a/depedencies/include/glm/gtx/dual_quaternion.inl +++ /dev/null @@ -1,351 +0,0 @@ -/// @ref gtx_dual_quaternion -/// @file glm/gtx/dual_quaternion.inl - -#include "../geometric.hpp" -#include <limits> - -namespace glm -{ - // -- Component accesses -- - - template <typename T, precision P> - GLM_FUNC_QUALIFIER typename tdualquat<T, P>::part_type & tdualquat<T, P>::operator[](typename tdualquat<T, P>::length_type i) - { - assert(i >= 0 && i < this->length()); - return (&real)[i]; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER typename tdualquat<T, P>::part_type const & tdualquat<T, P>::operator[](typename tdualquat<T, P>::length_type i) const - { - assert(i >= 0 && i < this->length()); - return (&real)[i]; - } - - // -- Implicit basic constructors -- - -# if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) - template <typename T, precision P> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat() -# ifndef GLM_FORCE_NO_CTOR_INIT - : real(tquat<T, P>()) - , dual(tquat<T, P>(0, 0, 0, 0)) -# endif - {} -# endif - -# if !GLM_HAS_DEFAULTED_FUNCTIONS - template <typename T, precision P> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(tdualquat<T, P> const & d) - : real(d.real) - , dual(d.dual) - {} -# endif//!GLM_HAS_DEFAULTED_FUNCTIONS - - template <typename T, precision P> - template <precision Q> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(tdualquat<T, Q> const & d) - : real(d.real) - , dual(d.dual) - {} - - // -- Explicit basic constructors -- - - template <typename T, precision P> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tdualquat<T, P>::tdualquat(ctor) - {} - - template <typename T, precision P> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(tquat<T, P> const & r) - : real(r), dual(tquat<T, P>(0, 0, 0, 0)) - {} - - template <typename T, precision P> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(tquat<T, P> const & q, tvec3<T, P> const& p) - : real(q), dual( - T(-0.5) * ( p.x*q.x + p.y*q.y + p.z*q.z), - T(+0.5) * ( p.x*q.w + p.y*q.z - p.z*q.y), - T(+0.5) * (-p.x*q.z + p.y*q.w + p.z*q.x), - T(+0.5) * ( p.x*q.y - p.y*q.x + p.z*q.w)) - {} - - template <typename T, precision P> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(tquat<T, P> const & r, tquat<T, P> const & d) - : real(r), dual(d) - {} - - // -- Conversion constructors -- - - template <typename T, precision P> - template <typename U, precision Q> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(tdualquat<U, Q> const & q) - : real(q.real) - , dual(q.dual) - {} - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tdualquat<T, P>::tdualquat(tmat2x4<T, P> const & m) - { - *this = dualquat_cast(m); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tdualquat<T, P>::tdualquat(tmat3x4<T, P> const & m) - { - *this = dualquat_cast(m); - } - - // -- Unary arithmetic operators -- - -# if !GLM_HAS_DEFAULTED_FUNCTIONS - template <typename T, precision P> - GLM_FUNC_QUALIFIER tdualquat<T, P> & tdualquat<T, P>::operator=(tdualquat<T, P> const & q) - { - this->real = q.real; - this->dual = q.dual; - return *this; - } -# endif//!GLM_HAS_DEFAULTED_FUNCTIONS - - template <typename T, precision P> - template <typename U> - GLM_FUNC_QUALIFIER tdualquat<T, P> & tdualquat<T, P>::operator=(tdualquat<U, P> const & q) - { - this->real = q.real; - this->dual = q.dual; - return *this; - } - - template <typename T, precision P> - template <typename U> - GLM_FUNC_QUALIFIER tdualquat<T, P> & tdualquat<T, P>::operator*=(U s) - { - this->real *= static_cast<T>(s); - this->dual *= static_cast<T>(s); - return *this; - } - - template <typename T, precision P> - template <typename U> - GLM_FUNC_QUALIFIER tdualquat<T, P> & tdualquat<T, P>::operator/=(U s) - { - this->real /= static_cast<T>(s); - this->dual /= static_cast<T>(s); - return *this; - } - - // -- Unary bit operators -- - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tdualquat<T, P> operator+(tdualquat<T, P> const & q) - { - return q; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tdualquat<T, P> operator-(tdualquat<T, P> const & q) - { - return tdualquat<T, P>(-q.real, -q.dual); - } - - // -- Binary operators -- - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tdualquat<T, P> operator+(tdualquat<T, P> const & q, tdualquat<T, P> const & p) - { - return tdualquat<T, P>(q.real + p.real,q.dual + p.dual); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tdualquat<T, P> operator*(tdualquat<T, P> const & p, tdualquat<T, P> const & o) - { - return tdualquat<T, P>(p.real * o.real,p.real * o.dual + p.dual * o.real); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> operator*(tdualquat<T, P> const & q, tvec3<T, P> const & v) - { - tvec3<T, P> const real_v3(q.real.x,q.real.y,q.real.z); - tvec3<T, P> const dual_v3(q.dual.x,q.dual.y,q.dual.z); - return (cross(real_v3, cross(real_v3,v) + v * q.real.w + dual_v3) + dual_v3 * q.real.w - real_v3 * q.dual.w) * T(2) + v; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> operator*(tvec3<T, P> const & v, tdualquat<T, P> const & q) - { - return glm::inverse(q) * v; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec4<T, P> operator*(tdualquat<T, P> const & q, tvec4<T, P> const & v) - { - return tvec4<T, P>(q * tvec3<T, P>(v), v.w); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec4<T, P> operator*(tvec4<T, P> const & v, tdualquat<T, P> const & q) - { - return glm::inverse(q) * v; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tdualquat<T, P> operator*(tdualquat<T, P> const & q, T const & s) - { - return tdualquat<T, P>(q.real * s, q.dual * s); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tdualquat<T, P> operator*(T const & s, tdualquat<T, P> const & q) - { - return q * s; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tdualquat<T, P> operator/(tdualquat<T, P> const & q, T const & s) - { - return tdualquat<T, P>(q.real / s, q.dual / s); - } - - // -- Boolean operators -- - - template <typename T, precision P> - GLM_FUNC_QUALIFIER bool operator==(tdualquat<T, P> const & q1, tdualquat<T, P> const & q2) - { - return (q1.real == q2.real) && (q1.dual == q2.dual); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER bool operator!=(tdualquat<T, P> const & q1, tdualquat<T, P> const & q2) - { - return (q1.real != q2.dual) || (q1.real != q2.dual); - } - - // -- Operations -- - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tdualquat<T, P> normalize(tdualquat<T, P> const & q) - { - return q / length(q.real); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tdualquat<T, P> lerp(tdualquat<T, P> const & x, tdualquat<T, P> const & y, T const & a) - { - // Dual Quaternion Linear blend aka DLB: - // Lerp is only defined in [0, 1] - assert(a >= static_cast<T>(0)); - assert(a <= static_cast<T>(1)); - T const k = dot(x.real,y.real) < static_cast<T>(0) ? -a : a; - T const one(1); - return tdualquat<T, P>(x * (one - a) + y * k); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tdualquat<T, P> inverse(tdualquat<T, P> const & q) - { - const glm::tquat<T, P> real = conjugate(q.real); - const glm::tquat<T, P> dual = conjugate(q.dual); - return tdualquat<T, P>(real, dual + (real * (-2.0f * dot(real,dual)))); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat2x4<T, P> mat2x4_cast(tdualquat<T, P> const & x) - { - return tmat2x4<T, P>( x[0].x, x[0].y, x[0].z, x[0].w, x[1].x, x[1].y, x[1].z, x[1].w ); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x4<T, P> mat3x4_cast(tdualquat<T, P> const & x) - { - tquat<T, P> r = x.real / length2(x.real); - - tquat<T, P> const rr(r.w * x.real.w, r.x * x.real.x, r.y * x.real.y, r.z * x.real.z); - r *= static_cast<T>(2); - - T const xy = r.x * x.real.y; - T const xz = r.x * x.real.z; - T const yz = r.y * x.real.z; - T const wx = r.w * x.real.x; - T const wy = r.w * x.real.y; - T const wz = r.w * x.real.z; - - tvec4<T, P> const a( - rr.w + rr.x - rr.y - rr.z, - xy - wz, - xz + wy, - -(x.dual.w * r.x - x.dual.x * r.w + x.dual.y * r.z - x.dual.z * r.y)); - - tvec4<T, P> const b( - xy + wz, - rr.w + rr.y - rr.x - rr.z, - yz - wx, - -(x.dual.w * r.y - x.dual.x * r.z - x.dual.y * r.w + x.dual.z * r.x)); - - tvec4<T, P> const c( - xz - wy, - yz + wx, - rr.w + rr.z - rr.x - rr.y, - -(x.dual.w * r.z + x.dual.x * r.y - x.dual.y * r.x - x.dual.z * r.w)); - - return tmat3x4<T, P>(a, b, c); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tdualquat<T, P> dualquat_cast(tmat2x4<T, P> const & x) - { - return tdualquat<T, P>( - tquat<T, P>( x[0].w, x[0].x, x[0].y, x[0].z ), - tquat<T, P>( x[1].w, x[1].x, x[1].y, x[1].z )); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tdualquat<T, P> dualquat_cast(tmat3x4<T, P> const & x) - { - tquat<T, P> real(uninitialize); - - T const trace = x[0].x + x[1].y + x[2].z; - if(trace > static_cast<T>(0)) - { - T const r = sqrt(T(1) + trace); - T const invr = static_cast<T>(0.5) / r; - real.w = static_cast<T>(0.5) * r; - real.x = (x[2].y - x[1].z) * invr; - real.y = (x[0].z - x[2].x) * invr; - real.z = (x[1].x - x[0].y) * invr; - } - else if(x[0].x > x[1].y && x[0].x > x[2].z) - { - T const r = sqrt(T(1) + x[0].x - x[1].y - x[2].z); - T const invr = static_cast<T>(0.5) / r; - real.x = static_cast<T>(0.5)*r; - real.y = (x[1].x + x[0].y) * invr; - real.z = (x[0].z + x[2].x) * invr; - real.w = (x[2].y - x[1].z) * invr; - } - else if(x[1].y > x[2].z) - { - T const r = sqrt(T(1) + x[1].y - x[0].x - x[2].z); - T const invr = static_cast<T>(0.5) / r; - real.x = (x[1].x + x[0].y) * invr; - real.y = static_cast<T>(0.5) * r; - real.z = (x[2].y + x[1].z) * invr; - real.w = (x[0].z - x[2].x) * invr; - } - else - { - T const r = sqrt(T(1) + x[2].z - x[0].x - x[1].y); - T const invr = static_cast<T>(0.5) / r; - real.x = (x[0].z + x[2].x) * invr; - real.y = (x[2].y + x[1].z) * invr; - real.z = static_cast<T>(0.5) * r; - real.w = (x[1].x - x[0].y) * invr; - } - - tquat<T, P> dual(uninitialize); - dual.x = static_cast<T>(0.5) * ( x[0].w * real.w + x[1].w * real.z - x[2].w * real.y); - dual.y = static_cast<T>(0.5) * (-x[0].w * real.z + x[1].w * real.w + x[2].w * real.x); - dual.z = static_cast<T>(0.5) * ( x[0].w * real.y - x[1].w * real.x + x[2].w * real.w); - dual.w = -static_cast<T>(0.5) * ( x[0].w * real.x + x[1].w * real.y + x[2].w * real.z); - return tdualquat<T, P>(real, dual); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/euler_angles.hpp b/depedencies/include/glm/gtx/euler_angles.hpp deleted file mode 100644 index fdc4f26..0000000 --- a/depedencies/include/glm/gtx/euler_angles.hpp +++ /dev/null @@ -1,143 +0,0 @@ -/// @ref gtx_euler_angles -/// @file glm/gtx/euler_angles.hpp -/// -/// @see core (dependence) -/// @see gtc_half_float (dependence) -/// -/// @defgroup gtx_euler_angles GLM_GTX_euler_angles -/// @ingroup gtx -/// -/// @brief Build matrices from Euler angles. -/// -/// <glm/gtx/euler_angles.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_euler_angles extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_euler_angles - /// @{ - - /// Creates a 3D 4 * 4 homogeneous rotation matrix from an euler angle X. - /// @see gtx_euler_angles - template <typename T> - GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleX( - T const & angleX); - - /// Creates a 3D 4 * 4 homogeneous rotation matrix from an euler angle Y. - /// @see gtx_euler_angles - template <typename T> - GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleY( - T const & angleY); - - /// Creates a 3D 4 * 4 homogeneous rotation matrix from an euler angle Z. - /// @see gtx_euler_angles - template <typename T> - GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleZ( - T const & angleZ); - - /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (X * Y). - /// @see gtx_euler_angles - template <typename T> - GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleXY( - T const & angleX, - T const & angleY); - - /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * X). - /// @see gtx_euler_angles - template <typename T> - GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleYX( - T const & angleY, - T const & angleX); - - /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (X * Z). - /// @see gtx_euler_angles - template <typename T> - GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleXZ( - T const & angleX, - T const & angleZ); - - /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Z * X). - /// @see gtx_euler_angles - template <typename T> - GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleZX( - T const & angle, - T const & angleX); - - /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * Z). - /// @see gtx_euler_angles - template <typename T> - GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleYZ( - T const & angleY, - T const & angleZ); - - /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Z * Y). - /// @see gtx_euler_angles - template <typename T> - GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleZY( - T const & angleZ, - T const & angleY); - - /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (X * Y * Z). - /// @see gtx_euler_angles - template <typename T> - GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleXYZ( - T const & t1, - T const & t2, - T const & t3); - - /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * X * Z). - /// @see gtx_euler_angles - template <typename T> - GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleYXZ( - T const & yaw, - T const & pitch, - T const & roll); - - /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * X * Z). - /// @see gtx_euler_angles - template <typename T> - GLM_FUNC_DECL tmat4x4<T, defaultp> yawPitchRoll( - T const & yaw, - T const & pitch, - T const & roll); - - /// Creates a 2D 2 * 2 rotation matrix from an euler angle. - /// @see gtx_euler_angles - template <typename T> - GLM_FUNC_DECL tmat2x2<T, defaultp> orientate2(T const & angle); - - /// Creates a 2D 4 * 4 homogeneous rotation matrix from an euler angle. - /// @see gtx_euler_angles - template <typename T> - GLM_FUNC_DECL tmat3x3<T, defaultp> orientate3(T const & angle); - - /// Creates a 3D 3 * 3 rotation matrix from euler angles (Y * X * Z). - /// @see gtx_euler_angles - template <typename T, precision P> - GLM_FUNC_DECL tmat3x3<T, P> orientate3(tvec3<T, P> const & angles); - - /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * X * Z). - /// @see gtx_euler_angles - template <typename T, precision P> - GLM_FUNC_DECL tmat4x4<T, P> orientate4(tvec3<T, P> const & angles); - - /// Extracts the (X * Y * Z) Euler angles from the rotation matrix M - /// @see gtx_euler_angles - template <typename T> - GLM_FUNC_DECL void extractEulerAngleXYZ(tmat4x4<T, defaultp> const & M, - T & t1, - T & t2, - T & t3); - - /// @} -}//namespace glm - -#include "euler_angles.inl" diff --git a/depedencies/include/glm/gtx/euler_angles.inl b/depedencies/include/glm/gtx/euler_angles.inl deleted file mode 100644 index dbe0a48..0000000 --- a/depedencies/include/glm/gtx/euler_angles.inl +++ /dev/null @@ -1,312 +0,0 @@ -/// @ref gtx_euler_angles -/// @file glm/gtx/euler_angles.inl - -#include "compatibility.hpp" // glm::atan2 - -namespace glm -{ - template <typename T> - GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleX - ( - T const & angleX - ) - { - T cosX = glm::cos(angleX); - T sinX = glm::sin(angleX); - - return tmat4x4<T, defaultp>( - T(1), T(0), T(0), T(0), - T(0), cosX, sinX, T(0), - T(0),-sinX, cosX, T(0), - T(0), T(0), T(0), T(1)); - } - - template <typename T> - GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleY - ( - T const & angleY - ) - { - T cosY = glm::cos(angleY); - T sinY = glm::sin(angleY); - - return tmat4x4<T, defaultp>( - cosY, T(0), -sinY, T(0), - T(0), T(1), T(0), T(0), - sinY, T(0), cosY, T(0), - T(0), T(0), T(0), T(1)); - } - - template <typename T> - GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleZ - ( - T const & angleZ - ) - { - T cosZ = glm::cos(angleZ); - T sinZ = glm::sin(angleZ); - - return tmat4x4<T, defaultp>( - cosZ, sinZ, T(0), T(0), - -sinZ, cosZ, T(0), T(0), - T(0), T(0), T(1), T(0), - T(0), T(0), T(0), T(1)); - } - - template <typename T> - GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleXY - ( - T const & angleX, - T const & angleY - ) - { - T cosX = glm::cos(angleX); - T sinX = glm::sin(angleX); - T cosY = glm::cos(angleY); - T sinY = glm::sin(angleY); - - return tmat4x4<T, defaultp>( - cosY, -sinX * -sinY, cosX * -sinY, T(0), - T(0), cosX, sinX, T(0), - sinY, -sinX * cosY, cosX * cosY, T(0), - T(0), T(0), T(0), T(1)); - } - - template <typename T> - GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleYX - ( - T const & angleY, - T const & angleX - ) - { - T cosX = glm::cos(angleX); - T sinX = glm::sin(angleX); - T cosY = glm::cos(angleY); - T sinY = glm::sin(angleY); - - return tmat4x4<T, defaultp>( - cosY, 0, -sinY, T(0), - sinY * sinX, cosX, cosY * sinX, T(0), - sinY * cosX, -sinX, cosY * cosX, T(0), - T(0), T(0), T(0), T(1)); - } - - template <typename T> - GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleXZ - ( - T const & angleX, - T const & angleZ - ) - { - return eulerAngleX(angleX) * eulerAngleZ(angleZ); - } - - template <typename T> - GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleZX - ( - T const & angleZ, - T const & angleX - ) - { - return eulerAngleZ(angleZ) * eulerAngleX(angleX); - } - - template <typename T> - GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleYZ - ( - T const & angleY, - T const & angleZ - ) - { - return eulerAngleY(angleY) * eulerAngleZ(angleZ); - } - - template <typename T> - GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleZY - ( - T const & angleZ, - T const & angleY - ) - { - return eulerAngleZ(angleZ) * eulerAngleY(angleY); - } - - template <typename T> - GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleXYZ - ( - T const & t1, - T const & t2, - T const & t3 - ) - { - T c1 = glm::cos(-t1); - T c2 = glm::cos(-t2); - T c3 = glm::cos(-t3); - T s1 = glm::sin(-t1); - T s2 = glm::sin(-t2); - T s3 = glm::sin(-t3); - - tmat4x4<T, defaultp> Result; - Result[0][0] = c2 * c3; - Result[0][1] =-c1 * s3 + s1 * s2 * c3; - Result[0][2] = s1 * s3 + c1 * s2 * c3; - Result[0][3] = static_cast<T>(0); - Result[1][0] = c2 * s3; - Result[1][1] = c1 * c3 + s1 * s2 * s3; - Result[1][2] =-s1 * c3 + c1 * s2 * s3; - Result[1][3] = static_cast<T>(0); - Result[2][0] =-s2; - Result[2][1] = s1 * c2; - Result[2][2] = c1 * c2; - Result[2][3] = static_cast<T>(0); - Result[3][0] = static_cast<T>(0); - Result[3][1] = static_cast<T>(0); - Result[3][2] = static_cast<T>(0); - Result[3][3] = static_cast<T>(1); - return Result; - } - - template <typename T> - GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleYXZ - ( - T const & yaw, - T const & pitch, - T const & roll - ) - { - T tmp_ch = glm::cos(yaw); - T tmp_sh = glm::sin(yaw); - T tmp_cp = glm::cos(pitch); - T tmp_sp = glm::sin(pitch); - T tmp_cb = glm::cos(roll); - T tmp_sb = glm::sin(roll); - - tmat4x4<T, defaultp> Result; - Result[0][0] = tmp_ch * tmp_cb + tmp_sh * tmp_sp * tmp_sb; - Result[0][1] = tmp_sb * tmp_cp; - Result[0][2] = -tmp_sh * tmp_cb + tmp_ch * tmp_sp * tmp_sb; - Result[0][3] = static_cast<T>(0); - Result[1][0] = -tmp_ch * tmp_sb + tmp_sh * tmp_sp * tmp_cb; - Result[1][1] = tmp_cb * tmp_cp; - Result[1][2] = tmp_sb * tmp_sh + tmp_ch * tmp_sp * tmp_cb; - Result[1][3] = static_cast<T>(0); - Result[2][0] = tmp_sh * tmp_cp; - Result[2][1] = -tmp_sp; - Result[2][2] = tmp_ch * tmp_cp; - Result[2][3] = static_cast<T>(0); - Result[3][0] = static_cast<T>(0); - Result[3][1] = static_cast<T>(0); - Result[3][2] = static_cast<T>(0); - Result[3][3] = static_cast<T>(1); - return Result; - } - - template <typename T> - GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> yawPitchRoll - ( - T const & yaw, - T const & pitch, - T const & roll - ) - { - T tmp_ch = glm::cos(yaw); - T tmp_sh = glm::sin(yaw); - T tmp_cp = glm::cos(pitch); - T tmp_sp = glm::sin(pitch); - T tmp_cb = glm::cos(roll); - T tmp_sb = glm::sin(roll); - - tmat4x4<T, defaultp> Result; - Result[0][0] = tmp_ch * tmp_cb + tmp_sh * tmp_sp * tmp_sb; - Result[0][1] = tmp_sb * tmp_cp; - Result[0][2] = -tmp_sh * tmp_cb + tmp_ch * tmp_sp * tmp_sb; - Result[0][3] = static_cast<T>(0); - Result[1][0] = -tmp_ch * tmp_sb + tmp_sh * tmp_sp * tmp_cb; - Result[1][1] = tmp_cb * tmp_cp; - Result[1][2] = tmp_sb * tmp_sh + tmp_ch * tmp_sp * tmp_cb; - Result[1][3] = static_cast<T>(0); - Result[2][0] = tmp_sh * tmp_cp; - Result[2][1] = -tmp_sp; - Result[2][2] = tmp_ch * tmp_cp; - Result[2][3] = static_cast<T>(0); - Result[3][0] = static_cast<T>(0); - Result[3][1] = static_cast<T>(0); - Result[3][2] = static_cast<T>(0); - Result[3][3] = static_cast<T>(1); - return Result; - } - - template <typename T> - GLM_FUNC_QUALIFIER tmat2x2<T, defaultp> orientate2 - ( - T const & angle - ) - { - T c = glm::cos(angle); - T s = glm::sin(angle); - - tmat2x2<T, defaultp> Result; - Result[0][0] = c; - Result[0][1] = s; - Result[1][0] = -s; - Result[1][1] = c; - return Result; - } - - template <typename T> - GLM_FUNC_QUALIFIER tmat3x3<T, defaultp> orientate3 - ( - T const & angle - ) - { - T c = glm::cos(angle); - T s = glm::sin(angle); - - tmat3x3<T, defaultp> Result; - Result[0][0] = c; - Result[0][1] = s; - Result[0][2] = 0.0f; - Result[1][0] = -s; - Result[1][1] = c; - Result[1][2] = 0.0f; - Result[2][0] = 0.0f; - Result[2][1] = 0.0f; - Result[2][2] = 1.0f; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> orientate3 - ( - tvec3<T, P> const & angles - ) - { - return tmat3x3<T, P>(yawPitchRoll(angles.z, angles.x, angles.y)); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> orientate4 - ( - tvec3<T, P> const & angles - ) - { - return yawPitchRoll(angles.z, angles.x, angles.y); - } - - template <typename T> - GLM_FUNC_DECL void extractEulerAngleXYZ(tmat4x4<T, defaultp> const & M, - T & t1, - T & t2, - T & t3) - { - float T1 = glm::atan2<T, defaultp>(M[2][1], M[2][2]); - float C2 = glm::sqrt(M[0][0]*M[0][0] + M[1][0]*M[1][0]); - float T2 = glm::atan2<T, defaultp>(-M[2][0], C2); - float S1 = glm::sin(T1); - float C1 = glm::cos(T1); - float T3 = glm::atan2<T, defaultp>(S1*M[0][2] - C1*M[0][1], C1*M[1][1] - S1*M[1][2 ]); - t1 = -T1; - t2 = -T2; - t3 = -T3; - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/extend.hpp b/depedencies/include/glm/gtx/extend.hpp deleted file mode 100644 index 26837a8..0000000 --- a/depedencies/include/glm/gtx/extend.hpp +++ /dev/null @@ -1,38 +0,0 @@ -/// @ref gtx_extend -/// @file glm/gtx/extend.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_extend GLM_GTX_extend -/// @ingroup gtx -/// -/// @brief Extend a position from a source to a position at a defined length. -/// -/// <glm/gtx/extend.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_extend extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_extend - /// @{ - - /// Extends of Length the Origin position using the (Source - Origin) direction. - /// @see gtx_extend - template <typename genType> - GLM_FUNC_DECL genType extend( - genType const & Origin, - genType const & Source, - typename genType::value_type const Length); - - /// @} -}//namespace glm - -#include "extend.inl" diff --git a/depedencies/include/glm/gtx/extend.inl b/depedencies/include/glm/gtx/extend.inl deleted file mode 100644 index 3155583..0000000 --- a/depedencies/include/glm/gtx/extend.inl +++ /dev/null @@ -1,49 +0,0 @@ -/// @ref gtx_extend -/// @file glm/gtx/extend.inl - -namespace glm -{ - template <typename genType> - GLM_FUNC_QUALIFIER genType extend - ( - genType const & Origin, - genType const & Source, - genType const & Distance - ) - { - return Origin + (Source - Origin) * Distance; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec2<T, P> extend - ( - tvec2<T, P> const & Origin, - tvec2<T, P> const & Source, - T const & Distance - ) - { - return Origin + (Source - Origin) * Distance; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> extend - ( - tvec3<T, P> const & Origin, - tvec3<T, P> const & Source, - T const & Distance - ) - { - return Origin + (Source - Origin) * Distance; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec4<T, P> extend - ( - tvec4<T, P> const & Origin, - tvec4<T, P> const & Source, - T const & Distance - ) - { - return Origin + (Source - Origin) * Distance; - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/extended_min_max.hpp b/depedencies/include/glm/gtx/extended_min_max.hpp deleted file mode 100644 index f4d8859..0000000 --- a/depedencies/include/glm/gtx/extended_min_max.hpp +++ /dev/null @@ -1,133 +0,0 @@ -/// @ref gtx_extended_min_max -/// @file glm/gtx/extended_min_max.hpp -/// -/// @see core (dependence) -/// @see gtx_half_float (dependence) -/// -/// @defgroup gtx_extented_min_max GLM_GTX_extented_min_max -/// @ingroup gtx -/// -/// Min and max functions for 3 to 4 parameters. -/// -/// <glm/gtx/extented_min_max.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_extented_min_max extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_extented_min_max - /// @{ - - /// Return the minimum component-wise values of 3 inputs - /// @see gtx_extented_min_max - template <typename T> - GLM_FUNC_DECL T min( - T const & x, - T const & y, - T const & z); - - /// Return the minimum component-wise values of 3 inputs - /// @see gtx_extented_min_max - template <typename T, template <typename> class C> - GLM_FUNC_DECL C<T> min( - C<T> const & x, - typename C<T>::T const & y, - typename C<T>::T const & z); - - /// Return the minimum component-wise values of 3 inputs - /// @see gtx_extented_min_max - template <typename T, template <typename> class C> - GLM_FUNC_DECL C<T> min( - C<T> const & x, - C<T> const & y, - C<T> const & z); - - /// Return the minimum component-wise values of 4 inputs - /// @see gtx_extented_min_max - template <typename T> - GLM_FUNC_DECL T min( - T const & x, - T const & y, - T const & z, - T const & w); - - /// Return the minimum component-wise values of 4 inputs - /// @see gtx_extented_min_max - template <typename T, template <typename> class C> - GLM_FUNC_DECL C<T> min( - C<T> const & x, - typename C<T>::T const & y, - typename C<T>::T const & z, - typename C<T>::T const & w); - - /// Return the minimum component-wise values of 4 inputs - /// @see gtx_extented_min_max - template <typename T, template <typename> class C> - GLM_FUNC_DECL C<T> min( - C<T> const & x, - C<T> const & y, - C<T> const & z, - C<T> const & w); - - /// Return the maximum component-wise values of 3 inputs - /// @see gtx_extented_min_max - template <typename T> - GLM_FUNC_DECL T max( - T const & x, - T const & y, - T const & z); - - /// Return the maximum component-wise values of 3 inputs - /// @see gtx_extented_min_max - template <typename T, template <typename> class C> - GLM_FUNC_DECL C<T> max( - C<T> const & x, - typename C<T>::T const & y, - typename C<T>::T const & z); - - /// Return the maximum component-wise values of 3 inputs - /// @see gtx_extented_min_max - template <typename T, template <typename> class C> - GLM_FUNC_DECL C<T> max( - C<T> const & x, - C<T> const & y, - C<T> const & z); - - /// Return the maximum component-wise values of 4 inputs - /// @see gtx_extented_min_max - template <typename T> - GLM_FUNC_DECL T max( - T const & x, - T const & y, - T const & z, - T const & w); - - /// Return the maximum component-wise values of 4 inputs - /// @see gtx_extented_min_max - template <typename T, template <typename> class C> - GLM_FUNC_DECL C<T> max( - C<T> const & x, - typename C<T>::T const & y, - typename C<T>::T const & z, - typename C<T>::T const & w); - - /// Return the maximum component-wise values of 4 inputs - /// @see gtx_extented_min_max - template <typename T, template <typename> class C> - GLM_FUNC_DECL C<T> max( - C<T> const & x, - C<T> const & y, - C<T> const & z, - C<T> const & w); - - /// @} -}//namespace glm - -#include "extended_min_max.inl" diff --git a/depedencies/include/glm/gtx/extended_min_max.inl b/depedencies/include/glm/gtx/extended_min_max.inl deleted file mode 100644 index 64ea445..0000000 --- a/depedencies/include/glm/gtx/extended_min_max.inl +++ /dev/null @@ -1,140 +0,0 @@ -/// @ref gtx_extended_min_max -/// @file glm/gtx/extended_min_max.inl - -namespace glm -{ - template <typename T> - GLM_FUNC_QUALIFIER T min( - T const & x, - T const & y, - T const & z) - { - return glm::min(glm::min(x, y), z); - } - - template <typename T, template <typename> class C> - GLM_FUNC_QUALIFIER C<T> min - ( - C<T> const & x, - typename C<T>::T const & y, - typename C<T>::T const & z - ) - { - return glm::min(glm::min(x, y), z); - } - - template <typename T, template <typename> class C> - GLM_FUNC_QUALIFIER C<T> min - ( - C<T> const & x, - C<T> const & y, - C<T> const & z - ) - { - return glm::min(glm::min(x, y), z); - } - - template <typename T> - GLM_FUNC_QUALIFIER T min - ( - T const & x, - T const & y, - T const & z, - T const & w - ) - { - return glm::min(glm::min(x, y), glm::min(z, w)); - } - - template <typename T, template <typename> class C> - GLM_FUNC_QUALIFIER C<T> min - ( - C<T> const & x, - typename C<T>::T const & y, - typename C<T>::T const & z, - typename C<T>::T const & w - ) - { - return glm::min(glm::min(x, y), glm::min(z, w)); - } - - template <typename T, template <typename> class C> - GLM_FUNC_QUALIFIER C<T> min - ( - C<T> const & x, - C<T> const & y, - C<T> const & z, - C<T> const & w - ) - { - return glm::min(glm::min(x, y), glm::min(z, w)); - } - - template <typename T> - GLM_FUNC_QUALIFIER T max( - T const & x, - T const & y, - T const & z) - { - return glm::max(glm::max(x, y), z); - } - - template <typename T, template <typename> class C> - GLM_FUNC_QUALIFIER C<T> max - ( - C<T> const & x, - typename C<T>::T const & y, - typename C<T>::T const & z - ) - { - return glm::max(glm::max(x, y), z); - } - - template <typename T, template <typename> class C> - GLM_FUNC_QUALIFIER C<T> max - ( - C<T> const & x, - C<T> const & y, - C<T> const & z - ) - { - return glm::max(glm::max(x, y), z); - } - - template <typename T> - GLM_FUNC_QUALIFIER T max - ( - T const & x, - T const & y, - T const & z, - T const & w - ) - { - return glm::max(glm::max(x, y), glm::max(z, w)); - } - - template <typename T, template <typename> class C> - GLM_FUNC_QUALIFIER C<T> max - ( - C<T> const & x, - typename C<T>::T const & y, - typename C<T>::T const & z, - typename C<T>::T const & w - ) - { - return glm::max(glm::max(x, y), glm::max(z, w)); - } - - template <typename T, template <typename> class C> - GLM_FUNC_QUALIFIER C<T> max - ( - C<T> const & x, - C<T> const & y, - C<T> const & z, - C<T> const & w - ) - { - return glm::max(glm::max(x, y), glm::max(z, w)); - } - -}//namespace glm diff --git a/depedencies/include/glm/gtx/fast_exponential.hpp b/depedencies/include/glm/gtx/fast_exponential.hpp deleted file mode 100644 index ed64a27..0000000 --- a/depedencies/include/glm/gtx/fast_exponential.hpp +++ /dev/null @@ -1,91 +0,0 @@ -/// @ref gtx_fast_exponential -/// @file glm/gtx/fast_exponential.hpp -/// -/// @see core (dependence) -/// @see gtx_half_float (dependence) -/// -/// @defgroup gtx_fast_exponential GLM_GTX_fast_exponential -/// @ingroup gtx -/// -/// @brief Fast but less accurate implementations of exponential based functions. -/// -/// <glm/gtx/fast_exponential.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_fast_exponential extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_fast_exponential - /// @{ - - /// Faster than the common pow function but less accurate. - /// @see gtx_fast_exponential - template <typename genType> - GLM_FUNC_DECL genType fastPow(genType x, genType y); - - /// Faster than the common pow function but less accurate. - /// @see gtx_fast_exponential - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<T, P> fastPow(vecType<T, P> const & x, vecType<T, P> const & y); - - /// Faster than the common pow function but less accurate. - /// @see gtx_fast_exponential - template <typename genTypeT, typename genTypeU> - GLM_FUNC_DECL genTypeT fastPow(genTypeT x, genTypeU y); - - /// Faster than the common pow function but less accurate. - /// @see gtx_fast_exponential - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<T, P> fastPow(vecType<T, P> const & x); - - /// Faster than the common exp function but less accurate. - /// @see gtx_fast_exponential - template <typename T> - GLM_FUNC_DECL T fastExp(T x); - - /// Faster than the common exp function but less accurate. - /// @see gtx_fast_exponential - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<T, P> fastExp(vecType<T, P> const & x); - - /// Faster than the common log function but less accurate. - /// @see gtx_fast_exponential - template <typename T> - GLM_FUNC_DECL T fastLog(T x); - - /// Faster than the common exp2 function but less accurate. - /// @see gtx_fast_exponential - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<T, P> fastLog(vecType<T, P> const & x); - - /// Faster than the common exp2 function but less accurate. - /// @see gtx_fast_exponential - template <typename T> - GLM_FUNC_DECL T fastExp2(T x); - - /// Faster than the common exp2 function but less accurate. - /// @see gtx_fast_exponential - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<T, P> fastExp2(vecType<T, P> const & x); - - /// Faster than the common log2 function but less accurate. - /// @see gtx_fast_exponential - template <typename T> - GLM_FUNC_DECL T fastLog2(T x); - - /// Faster than the common log2 function but less accurate. - /// @see gtx_fast_exponential - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<T, P> fastLog2(vecType<T, P> const & x); - - /// @} -}//namespace glm - -#include "fast_exponential.inl" diff --git a/depedencies/include/glm/gtx/fast_exponential.inl b/depedencies/include/glm/gtx/fast_exponential.inl deleted file mode 100644 index 72f9f8f..0000000 --- a/depedencies/include/glm/gtx/fast_exponential.inl +++ /dev/null @@ -1,137 +0,0 @@ -/// @ref gtx_fast_exponential -/// @file glm/gtx/fast_exponential.inl - -namespace glm -{ - // fastPow: - template <typename genType> - GLM_FUNC_QUALIFIER genType fastPow(genType x, genType y) - { - return exp(y * log(x)); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> fastPow(vecType<T, P> const & x, vecType<T, P> const & y) - { - return exp(y * log(x)); - } - - template <typename T> - GLM_FUNC_QUALIFIER T fastPow(T x, int y) - { - T f = static_cast<T>(1); - for(int i = 0; i < y; ++i) - f *= x; - return f; - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> fastPow(vecType<T, P> const & x, vecType<int, P> const & y) - { - vecType<T, P> Result(uninitialize); - for(length_t i = 0, n = x.length(); i < n; ++i) - Result[i] = fastPow(x[i], y[i]); - return Result; - } - - // fastExp - // Note: This function provides accurate results only for value between -1 and 1, else avoid it. - template <typename T> - GLM_FUNC_QUALIFIER T fastExp(T x) - { - // This has a better looking and same performance in release mode than the following code. However, in debug mode it's slower. - // return 1.0f + x * (1.0f + x * 0.5f * (1.0f + x * 0.3333333333f * (1.0f + x * 0.25 * (1.0f + x * 0.2f)))); - T x2 = x * x; - T x3 = x2 * x; - T x4 = x3 * x; - T x5 = x4 * x; - return T(1) + x + (x2 * T(0.5)) + (x3 * T(0.1666666667)) + (x4 * T(0.041666667)) + (x5 * T(0.008333333333)); - } - /* // Try to handle all values of float... but often shower than std::exp, glm::floor and the loop kill the performance - GLM_FUNC_QUALIFIER float fastExp(float x) - { - const float e = 2.718281828f; - const float IntegerPart = floor(x); - const float FloatPart = x - IntegerPart; - float z = 1.f; - - for(int i = 0; i < int(IntegerPart); ++i) - z *= e; - - const float x2 = FloatPart * FloatPart; - const float x3 = x2 * FloatPart; - const float x4 = x3 * FloatPart; - const float x5 = x4 * FloatPart; - return z * (1.0f + FloatPart + (x2 * 0.5f) + (x3 * 0.1666666667f) + (x4 * 0.041666667f) + (x5 * 0.008333333333f)); - } - - // Increase accuracy on number bigger that 1 and smaller than -1 but it's not enough for high and negative numbers - GLM_FUNC_QUALIFIER float fastExp(float x) - { - // This has a better looking and same performance in release mode than the following code. However, in debug mode it's slower. - // return 1.0f + x * (1.0f + x * 0.5f * (1.0f + x * 0.3333333333f * (1.0f + x * 0.25 * (1.0f + x * 0.2f)))); - float x2 = x * x; - float x3 = x2 * x; - float x4 = x3 * x; - float x5 = x4 * x; - float x6 = x5 * x; - float x7 = x6 * x; - float x8 = x7 * x; - return 1.0f + x + (x2 * 0.5f) + (x3 * 0.1666666667f) + (x4 * 0.041666667f) + (x5 * 0.008333333333f)+ (x6 * 0.00138888888888f) + (x7 * 0.000198412698f) + (x8 * 0.0000248015873f);; - } - */ - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> fastExp(vecType<T, P> const & x) - { - return detail::functor1<T, T, P, vecType>::call(fastExp, x); - } - - // fastLog - template <typename genType> - GLM_FUNC_QUALIFIER genType fastLog(genType x) - { - return std::log(x); - } - - /* Slower than the VC7.1 function... - GLM_FUNC_QUALIFIER float fastLog(float x) - { - float y1 = (x - 1.0f) / (x + 1.0f); - float y2 = y1 * y1; - return 2.0f * y1 * (1.0f + y2 * (0.3333333333f + y2 * (0.2f + y2 * 0.1428571429f))); - } - */ - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> fastLog(vecType<T, P> const & x) - { - return detail::functor1<T, T, P, vecType>::call(fastLog, x); - } - - //fastExp2, ln2 = 0.69314718055994530941723212145818f - template <typename genType> - GLM_FUNC_QUALIFIER genType fastExp2(genType x) - { - return fastExp(0.69314718055994530941723212145818f * x); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> fastExp2(vecType<T, P> const & x) - { - return detail::functor1<T, T, P, vecType>::call(fastExp2, x); - } - - // fastLog2, ln2 = 0.69314718055994530941723212145818f - template <typename genType> - GLM_FUNC_QUALIFIER genType fastLog2(genType x) - { - return fastLog(x) / 0.69314718055994530941723212145818f; - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> fastLog2(vecType<T, P> const & x) - { - return detail::functor1<T, T, P, vecType>::call(fastLog2, x); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/fast_square_root.hpp b/depedencies/include/glm/gtx/fast_square_root.hpp deleted file mode 100644 index 35aa7f3..0000000 --- a/depedencies/include/glm/gtx/fast_square_root.hpp +++ /dev/null @@ -1,88 +0,0 @@ -/// @ref gtx_fast_square_root -/// @file glm/gtx/fast_square_root.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_fast_square_root GLM_GTX_fast_square_root -/// @ingroup gtx -/// -/// @brief Fast but less accurate implementations of square root based functions. -/// - Sqrt optimisation based on Newton's method, -/// www.gamedev.net/community/forums/topic.asp?topic id=139956 -/// -/// <glm/gtx/fast_square_root.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../common.hpp" -#include "../exponential.hpp" -#include "../geometric.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_fast_square_root extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_fast_square_root - /// @{ - - /// Faster than the common sqrt function but less accurate. - /// - /// @see gtx_fast_square_root extension. - template <typename genType> - GLM_FUNC_DECL genType fastSqrt(genType x); - - /// Faster than the common sqrt function but less accurate. - /// - /// @see gtx_fast_square_root extension. - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<T, P> fastSqrt(vecType<T, P> const & x); - - /// Faster than the common inversesqrt function but less accurate. - /// - /// @see gtx_fast_square_root extension. - template <typename genType> - GLM_FUNC_DECL genType fastInverseSqrt(genType x); - - /// Faster than the common inversesqrt function but less accurate. - /// - /// @see gtx_fast_square_root extension. - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<T, P> fastInverseSqrt(vecType<T, P> const & x); - - /// Faster than the common length function but less accurate. - /// - /// @see gtx_fast_square_root extension. - template <typename genType> - GLM_FUNC_DECL genType fastLength(genType x); - - /// Faster than the common length function but less accurate. - /// - /// @see gtx_fast_square_root extension. - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL T fastLength(vecType<T, P> const & x); - - /// Faster than the common distance function but less accurate. - /// - /// @see gtx_fast_square_root extension. - template <typename genType> - GLM_FUNC_DECL genType fastDistance(genType x, genType y); - - /// Faster than the common distance function but less accurate. - /// - /// @see gtx_fast_square_root extension. - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL T fastDistance(vecType<T, P> const & x, vecType<T, P> const & y); - - /// Faster than the common normalize function but less accurate. - /// - /// @see gtx_fast_square_root extension. - template <typename genType> - GLM_FUNC_DECL genType fastNormalize(genType const & x); - - /// @} -}// namespace glm - -#include "fast_square_root.inl" diff --git a/depedencies/include/glm/gtx/fast_square_root.inl b/depedencies/include/glm/gtx/fast_square_root.inl deleted file mode 100644 index 73950ae..0000000 --- a/depedencies/include/glm/gtx/fast_square_root.inl +++ /dev/null @@ -1,81 +0,0 @@ -/// @ref gtx_fast_square_root -/// @file glm/gtx/fast_square_root.inl - -namespace glm -{ - // fastSqrt - template <typename genType> - GLM_FUNC_QUALIFIER genType fastSqrt(genType x) - { - GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'fastSqrt' only accept floating-point input"); - - return genType(1) / fastInverseSqrt(x); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> fastSqrt(vecType<T, P> const & x) - { - return detail::functor1<T, T, P, vecType>::call(fastSqrt, x); - } - - // fastInversesqrt - template <typename genType> - GLM_FUNC_QUALIFIER genType fastInverseSqrt(genType x) - { -# ifdef __CUDACC__ // Wordaround for a CUDA compiler bug up to CUDA6 - tvec1<T, P> tmp(detail::compute_inversesqrt<tvec1, genType, lowp, detail::is_aligned<lowp>::value>::call(tvec1<genType, lowp>(x))); - return tmp.x; -# else - return detail::compute_inversesqrt<tvec1, genType, highp, detail::is_aligned<highp>::value>::call(tvec1<genType, lowp>(x)).x; -# endif - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> fastInverseSqrt(vecType<T, P> const & x) - { - return detail::compute_inversesqrt<vecType, T, P, detail::is_aligned<P>::value>::call(x); - } - - // fastLength - template <typename genType> - GLM_FUNC_QUALIFIER genType fastLength(genType x) - { - GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'fastLength' only accept floating-point inputs"); - - return abs(x); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER T fastLength(vecType<T, P> const & x) - { - GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'fastLength' only accept floating-point inputs"); - - return fastSqrt(dot(x, x)); - } - - // fastDistance - template <typename genType> - GLM_FUNC_QUALIFIER genType fastDistance(genType x, genType y) - { - return fastLength(y - x); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER T fastDistance(vecType<T, P> const & x, vecType<T, P> const & y) - { - return fastLength(y - x); - } - - // fastNormalize - template <typename genType> - GLM_FUNC_QUALIFIER genType fastNormalize(genType x) - { - return x > genType(0) ? genType(1) : -genType(1); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> fastNormalize(vecType<T, P> const & x) - { - return x * fastInverseSqrt(dot(x, x)); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/fast_trigonometry.hpp b/depedencies/include/glm/gtx/fast_trigonometry.hpp deleted file mode 100644 index ccb1d22..0000000 --- a/depedencies/include/glm/gtx/fast_trigonometry.hpp +++ /dev/null @@ -1,75 +0,0 @@ -/// @ref gtx_fast_trigonometry -/// @file glm/gtx/fast_trigonometry.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_fast_trigonometry GLM_GTX_fast_trigonometry -/// @ingroup gtx -/// -/// @brief Fast but less accurate implementations of trigonometric functions. -/// -/// <glm/gtx/fast_trigonometry.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../gtc/constants.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_fast_trigonometry extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_fast_trigonometry - /// @{ - - /// Wrap an angle to [0 2pi[ - /// From GLM_GTX_fast_trigonometry extension. - template <typename T> - GLM_FUNC_DECL T wrapAngle(T angle); - - /// Faster than the common sin function but less accurate. - /// From GLM_GTX_fast_trigonometry extension. - template <typename T> - GLM_FUNC_DECL T fastSin(T angle); - - /// Faster than the common cos function but less accurate. - /// From GLM_GTX_fast_trigonometry extension. - template <typename T> - GLM_FUNC_DECL T fastCos(T angle); - - /// Faster than the common tan function but less accurate. - /// Defined between -2pi and 2pi. - /// From GLM_GTX_fast_trigonometry extension. - template <typename T> - GLM_FUNC_DECL T fastTan(T angle); - - /// Faster than the common asin function but less accurate. - /// Defined between -2pi and 2pi. - /// From GLM_GTX_fast_trigonometry extension. - template <typename T> - GLM_FUNC_DECL T fastAsin(T angle); - - /// Faster than the common acos function but less accurate. - /// Defined between -2pi and 2pi. - /// From GLM_GTX_fast_trigonometry extension. - template <typename T> - GLM_FUNC_DECL T fastAcos(T angle); - - /// Faster than the common atan function but less accurate. - /// Defined between -2pi and 2pi. - /// From GLM_GTX_fast_trigonometry extension. - template <typename T> - GLM_FUNC_DECL T fastAtan(T y, T x); - - /// Faster than the common atan function but less accurate. - /// Defined between -2pi and 2pi. - /// From GLM_GTX_fast_trigonometry extension. - template <typename T> - GLM_FUNC_DECL T fastAtan(T angle); - - /// @} -}//namespace glm - -#include "fast_trigonometry.inl" diff --git a/depedencies/include/glm/gtx/fast_trigonometry.inl b/depedencies/include/glm/gtx/fast_trigonometry.inl deleted file mode 100644 index f576c17..0000000 --- a/depedencies/include/glm/gtx/fast_trigonometry.inl +++ /dev/null @@ -1,143 +0,0 @@ -/// @ref gtx_fast_trigonometry -/// @file glm/gtx/fast_trigonometry.inl - -namespace glm{ -namespace detail -{ - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> taylorCos(vecType<T, P> const & x) - { - return static_cast<T>(1) - - (x * x) / 2.f - + (x * x * x * x) / 24.f - - (x * x * x * x * x * x) / 720.f - + (x * x * x * x * x * x * x * x) / 40320.f; - } - - template <typename T> - GLM_FUNC_QUALIFIER T cos_52s(T x) - { - T const xx(x * x); - return (T(0.9999932946) + xx * (T(-0.4999124376) + xx * (T(0.0414877472) + xx * T(-0.0012712095)))); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> cos_52s(vecType<T, P> const & x) - { - return detail::functor1<T, T, P, vecType>::call(cos_52s, x); - } -}//namespace detail - - // wrapAngle - template <typename T> - GLM_FUNC_QUALIFIER T wrapAngle(T angle) - { - return abs<T>(mod<T>(angle, two_pi<T>())); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> wrapAngle(vecType<T, P> const & x) - { - return detail::functor1<T, T, P, vecType>::call(wrapAngle, x); - } - - // cos - template <typename T> - GLM_FUNC_QUALIFIER T fastCos(T x) - { - T const angle(wrapAngle<T>(x)); - - if(angle < half_pi<T>()) - return detail::cos_52s(angle); - if(angle < pi<T>()) - return -detail::cos_52s(pi<T>() - angle); - if(angle < (T(3) * half_pi<T>())) - return -detail::cos_52s(angle - pi<T>()); - - return detail::cos_52s(two_pi<T>() - angle); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> fastCos(vecType<T, P> const & x) - { - return detail::functor1<T, T, P, vecType>::call(fastCos, x); - } - - // sin - template <typename T> - GLM_FUNC_QUALIFIER T fastSin(T x) - { - return fastCos<T>(half_pi<T>() - x); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> fastSin(vecType<T, P> const & x) - { - return detail::functor1<T, T, P, vecType>::call(fastSin, x); - } - - // tan - template <typename T> - GLM_FUNC_QUALIFIER T fastTan(T x) - { - return x + (x * x * x * T(0.3333333333)) + (x * x * x * x * x * T(0.1333333333333)) + (x * x * x * x * x * x * x * T(0.0539682539)); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> fastTan(vecType<T, P> const & x) - { - return detail::functor1<T, T, P, vecType>::call(fastTan, x); - } - - // asin - template <typename T> - GLM_FUNC_QUALIFIER T fastAsin(T x) - { - return x + (x * x * x * T(0.166666667)) + (x * x * x * x * x * T(0.075)) + (x * x * x * x * x * x * x * T(0.0446428571)) + (x * x * x * x * x * x * x * x * x * T(0.0303819444));// + (x * x * x * x * x * x * x * x * x * x * x * T(0.022372159)); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> fastAsin(vecType<T, P> const & x) - { - return detail::functor1<T, T, P, vecType>::call(fastAsin, x); - } - - // acos - template <typename T> - GLM_FUNC_QUALIFIER T fastAcos(T x) - { - return T(1.5707963267948966192313216916398) - fastAsin(x); //(PI / 2) - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> fastAcos(vecType<T, P> const & x) - { - return detail::functor1<T, T, P, vecType>::call(fastAcos, x); - } - - // atan - template <typename T> - GLM_FUNC_QUALIFIER T fastAtan(T y, T x) - { - T sgn = sign(y) * sign(x); - return abs(fastAtan(y / x)) * sgn; - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> fastAtan(vecType<T, P> const & y, vecType<T, P> const & x) - { - return detail::functor2<T, P, vecType>::call(fastAtan, y, x); - } - - template <typename T> - GLM_FUNC_QUALIFIER T fastAtan(T x) - { - return x - (x * x * x * T(0.333333333333)) + (x * x * x * x * x * T(0.2)) - (x * x * x * x * x * x * x * T(0.1428571429)) + (x * x * x * x * x * x * x * x * x * T(0.111111111111)) - (x * x * x * x * x * x * x * x * x * x * x * T(0.0909090909)); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> fastAtan(vecType<T, P> const & x) - { - return detail::functor1<T, T, P, vecType>::call(fastAtan, x); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/float_notmalize.inl b/depedencies/include/glm/gtx/float_notmalize.inl deleted file mode 100644 index 4dde025..0000000 --- a/depedencies/include/glm/gtx/float_notmalize.inl +++ /dev/null @@ -1,14 +0,0 @@ -/// @ref gtx_float_normalize -/// @file glm/gtx/float_normalize.inl - -#include <limits> - -namespace glm -{ - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<float, P> floatNormalize(vecType<T, P> const & v) - { - return vecType<float, P>(v) / static_cast<float>(std::numeric_limits<T>::max()); - } - -}//namespace glm diff --git a/depedencies/include/glm/gtx/gradient_paint.hpp b/depedencies/include/glm/gtx/gradient_paint.hpp deleted file mode 100644 index de1f18d..0000000 --- a/depedencies/include/glm/gtx/gradient_paint.hpp +++ /dev/null @@ -1,48 +0,0 @@ -/// @ref gtx_gradient_paint -/// @file glm/gtx/gradient_paint.hpp -/// -/// @see core (dependence) -/// @see gtx_optimum_pow (dependence) -/// -/// @defgroup gtx_gradient_paint GLM_GTX_gradient_paint -/// @ingroup gtx -/// -/// @brief Functions that return the color of procedural gradient for specific coordinates. -/// <glm/gtx/gradient_paint.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" -#include "../gtx/optimum_pow.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_gradient_paint extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_gradient_paint - /// @{ - - /// Return a color from a radial gradient. - /// @see - gtx_gradient_paint - template <typename T, precision P> - GLM_FUNC_DECL T radialGradient( - tvec2<T, P> const & Center, - T const & Radius, - tvec2<T, P> const & Focal, - tvec2<T, P> const & Position); - - /// Return a color from a linear gradient. - /// @see - gtx_gradient_paint - template <typename T, precision P> - GLM_FUNC_DECL T linearGradient( - tvec2<T, P> const & Point0, - tvec2<T, P> const & Point1, - tvec2<T, P> const & Position); - - /// @} -}// namespace glm - -#include "gradient_paint.inl" diff --git a/depedencies/include/glm/gtx/gradient_paint.inl b/depedencies/include/glm/gtx/gradient_paint.inl deleted file mode 100644 index aaa5ce1..0000000 --- a/depedencies/include/glm/gtx/gradient_paint.inl +++ /dev/null @@ -1,37 +0,0 @@ -/// @ref gtx_gradient_paint -/// @file glm/gtx/gradient_paint.inl - -namespace glm -{ - template <typename T, precision P> - GLM_FUNC_QUALIFIER T radialGradient - ( - tvec2<T, P> const & Center, - T const & Radius, - tvec2<T, P> const & Focal, - tvec2<T, P> const & Position - ) - { - tvec2<T, P> F = Focal - Center; - tvec2<T, P> D = Position - Focal; - T Radius2 = pow2(Radius); - T Fx2 = pow2(F.x); - T Fy2 = pow2(F.y); - - T Numerator = (D.x * F.x + D.y * F.y) + sqrt(Radius2 * (pow2(D.x) + pow2(D.y)) - pow2(D.x * F.y - D.y * F.x)); - T Denominator = Radius2 - (Fx2 + Fy2); - return Numerator / Denominator; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER T linearGradient - ( - tvec2<T, P> const & Point0, - tvec2<T, P> const & Point1, - tvec2<T, P> const & Position - ) - { - tvec2<T, P> Dist = Point1 - Point0; - return (Dist.x * (Position.x - Point0.x) + Dist.y * (Position.y - Point0.y)) / glm::dot(Dist, Dist); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/handed_coordinate_space.hpp b/depedencies/include/glm/gtx/handed_coordinate_space.hpp deleted file mode 100644 index 2ee5175..0000000 --- a/depedencies/include/glm/gtx/handed_coordinate_space.hpp +++ /dev/null @@ -1,46 +0,0 @@ -/// @ref gtx_handed_coordinate_space -/// @file glm/gtx/handed_coordinate_space.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_handed_coordinate_space GLM_GTX_handed_coordinate_space -/// @ingroup gtx -/// -/// @brief To know if a set of three basis vectors defines a right or left-handed coordinate system. -/// -/// <glm/gtx/handed_coordinate_system.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_handed_coordinate_space extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_handed_coordinate_space - /// @{ - - //! Return if a trihedron right handed or not. - //! From GLM_GTX_handed_coordinate_space extension. - template <typename T, precision P> - GLM_FUNC_DECL bool rightHanded( - tvec3<T, P> const & tangent, - tvec3<T, P> const & binormal, - tvec3<T, P> const & normal); - - //! Return if a trihedron left handed or not. - //! From GLM_GTX_handed_coordinate_space extension. - template <typename T, precision P> - GLM_FUNC_DECL bool leftHanded( - tvec3<T, P> const & tangent, - tvec3<T, P> const & binormal, - tvec3<T, P> const & normal); - - /// @} -}// namespace glm - -#include "handed_coordinate_space.inl" diff --git a/depedencies/include/glm/gtx/handed_coordinate_space.inl b/depedencies/include/glm/gtx/handed_coordinate_space.inl deleted file mode 100644 index 2e55653..0000000 --- a/depedencies/include/glm/gtx/handed_coordinate_space.inl +++ /dev/null @@ -1,27 +0,0 @@ -/// @ref gtx_handed_coordinate_space -/// @file glm/gtx/handed_coordinate_space.inl - -namespace glm -{ - template <typename T, precision P> - GLM_FUNC_QUALIFIER bool rightHanded - ( - tvec3<T, P> const & tangent, - tvec3<T, P> const & binormal, - tvec3<T, P> const & normal - ) - { - return dot(cross(normal, tangent), binormal) > T(0); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER bool leftHanded - ( - tvec3<T, P> const & tangent, - tvec3<T, P> const & binormal, - tvec3<T, P> const & normal - ) - { - return dot(cross(normal, tangent), binormal) < T(0); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/hash.hpp b/depedencies/include/glm/gtx/hash.hpp deleted file mode 100644 index 2262618..0000000 --- a/depedencies/include/glm/gtx/hash.hpp +++ /dev/null @@ -1,134 +0,0 @@ -/// @ref gtx_hash -/// @file glm/gtx/hash.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_hash GLM_GTX_hash -/// @ingroup gtx -/// -/// @brief Add std::hash support for glm types -/// -/// <glm/gtx/hash.hpp> need to be included to use these functionalities. - -#pragma once - -#include <functional> - -#include "../vec2.hpp" -#include "../vec3.hpp" -#include "../vec4.hpp" -#include "../gtc/vec1.hpp" - -#include "../gtc/quaternion.hpp" -#include "../gtx/dual_quaternion.hpp" - -#include "../mat2x2.hpp" -#include "../mat2x3.hpp" -#include "../mat2x4.hpp" - -#include "../mat3x2.hpp" -#include "../mat3x3.hpp" -#include "../mat3x4.hpp" - -#include "../mat4x2.hpp" -#include "../mat4x3.hpp" -#include "../mat4x4.hpp" - -#if !GLM_HAS_CXX11_STL -# error "GLM_GTX_hash requires C++11 standard library support" -#endif - -namespace std -{ - template <typename T, glm::precision P> - struct hash<glm::tvec1<T,P> > - { - GLM_FUNC_DECL size_t operator()(glm::tvec1<T, P> const & v) const; - }; - - template <typename T, glm::precision P> - struct hash<glm::tvec2<T,P> > - { - GLM_FUNC_DECL size_t operator()(glm::tvec2<T, P> const & v) const; - }; - - template <typename T, glm::precision P> - struct hash<glm::tvec3<T,P> > - { - GLM_FUNC_DECL size_t operator()(glm::tvec3<T, P> const & v) const; - }; - - template <typename T, glm::precision P> - struct hash<glm::tvec4<T,P> > - { - GLM_FUNC_DECL size_t operator()(glm::tvec4<T, P> const & v) const; - }; - - template <typename T, glm::precision P> - struct hash<glm::tquat<T,P>> - { - GLM_FUNC_DECL size_t operator()(glm::tquat<T, P> const & q) const; - }; - - template <typename T, glm::precision P> - struct hash<glm::tdualquat<T,P> > - { - GLM_FUNC_DECL size_t operator()(glm::tdualquat<T,P> const & q) const; - }; - - template <typename T, glm::precision P> - struct hash<glm::tmat2x2<T,P> > - { - GLM_FUNC_DECL size_t operator()(glm::tmat2x2<T,P> const & m) const; - }; - - template <typename T, glm::precision P> - struct hash<glm::tmat2x3<T,P> > - { - GLM_FUNC_DECL size_t operator()(glm::tmat2x3<T,P> const & m) const; - }; - - template <typename T, glm::precision P> - struct hash<glm::tmat2x4<T,P> > - { - GLM_FUNC_DECL size_t operator()(glm::tmat2x4<T,P> const & m) const; - }; - - template <typename T, glm::precision P> - struct hash<glm::tmat3x2<T,P> > - { - GLM_FUNC_DECL size_t operator()(glm::tmat3x2<T,P> const & m) const; - }; - - template <typename T, glm::precision P> - struct hash<glm::tmat3x3<T,P> > - { - GLM_FUNC_DECL size_t operator()(glm::tmat3x3<T,P> const & m) const; - }; - - template <typename T, glm::precision P> - struct hash<glm::tmat3x4<T,P> > - { - GLM_FUNC_DECL size_t operator()(glm::tmat3x4<T,P> const & m) const; - }; - - template <typename T, glm::precision P> - struct hash<glm::tmat4x2<T,P> > - { - GLM_FUNC_DECL size_t operator()(glm::tmat4x2<T,P> const & m) const; - }; - - template <typename T, glm::precision P> - struct hash<glm::tmat4x3<T,P> > - { - GLM_FUNC_DECL size_t operator()(glm::tmat4x3<T,P> const & m) const; - }; - - template <typename T, glm::precision P> - struct hash<glm::tmat4x4<T,P> > - { - GLM_FUNC_DECL size_t operator()(glm::tmat4x4<T,P> const & m) const; - }; -} // namespace std - -#include "hash.inl" diff --git a/depedencies/include/glm/gtx/hash.inl b/depedencies/include/glm/gtx/hash.inl deleted file mode 100644 index c42f4f0..0000000 --- a/depedencies/include/glm/gtx/hash.inl +++ /dev/null @@ -1,185 +0,0 @@ -/// @ref gtx_hash -/// @file glm/gtx/hash.inl -/// -/// @see core (dependence) -/// -/// @defgroup gtx_hash GLM_GTX_hash -/// @ingroup gtx -/// -/// @brief Add std::hash support for glm types -/// -/// <glm/gtx/hash.inl> need to be included to use these functionalities. - -namespace glm { -namespace detail -{ - GLM_INLINE void hash_combine(size_t &seed, size_t hash) - { - hash += 0x9e3779b9 + (seed << 6) + (seed >> 2); - seed ^= hash; - } -}} - -namespace std -{ - template <typename T, glm::precision P> - GLM_FUNC_QUALIFIER size_t hash<glm::tvec1<T, P>>::operator()(glm::tvec1<T, P> const & v) const - { - hash<T> hasher; - return hasher(v.x); - } - - template <typename T, glm::precision P> - GLM_FUNC_QUALIFIER size_t hash<glm::tvec2<T, P>>::operator()(glm::tvec2<T, P> const & v) const - { - size_t seed = 0; - hash<T> hasher; - glm::detail::hash_combine(seed, hasher(v.x)); - glm::detail::hash_combine(seed, hasher(v.y)); - return seed; - } - - template <typename T, glm::precision P> - GLM_FUNC_QUALIFIER size_t hash<glm::tvec3<T, P>>::operator()(glm::tvec3<T, P> const & v) const - { - size_t seed = 0; - hash<T> hasher; - glm::detail::hash_combine(seed, hasher(v.x)); - glm::detail::hash_combine(seed, hasher(v.y)); - glm::detail::hash_combine(seed, hasher(v.z)); - return seed; - } - - template <typename T, glm::precision P> - GLM_FUNC_QUALIFIER size_t hash<glm::tvec4<T, P>>::operator()(glm::tvec4<T, P> const & v) const - { - size_t seed = 0; - hash<T> hasher; - glm::detail::hash_combine(seed, hasher(v.x)); - glm::detail::hash_combine(seed, hasher(v.y)); - glm::detail::hash_combine(seed, hasher(v.z)); - glm::detail::hash_combine(seed, hasher(v.w)); - return seed; - } - - template <typename T, glm::precision P> - GLM_FUNC_QUALIFIER size_t hash<glm::tquat<T, P>>::operator()(glm::tquat<T,P> const & q) const - { - size_t seed = 0; - hash<T> hasher; - glm::detail::hash_combine(seed, hasher(q.x)); - glm::detail::hash_combine(seed, hasher(q.y)); - glm::detail::hash_combine(seed, hasher(q.z)); - glm::detail::hash_combine(seed, hasher(q.w)); - return seed; - } - - template <typename T, glm::precision P> - GLM_FUNC_QUALIFIER size_t hash<glm::tdualquat<T, P>>::operator()(glm::tdualquat<T, P> const & q) const - { - size_t seed = 0; - hash<glm::tquat<T, P>> hasher; - glm::detail::hash_combine(seed, hasher(q.real)); - glm::detail::hash_combine(seed, hasher(q.dual)); - return seed; - } - - template <typename T, glm::precision P> - GLM_FUNC_QUALIFIER size_t hash<glm::tmat2x2<T, P>>::operator()(glm::tmat2x2<T, P> const & m) const - { - size_t seed = 0; - hash<glm::tvec2<T, P>> hasher; - glm::detail::hash_combine(seed, hasher(m[0])); - glm::detail::hash_combine(seed, hasher(m[1])); - return seed; - } - - template <typename T, glm::precision P> - GLM_FUNC_QUALIFIER size_t hash<glm::tmat2x3<T, P>>::operator()(glm::tmat2x3<T, P> const & m) const - { - size_t seed = 0; - hash<glm::tvec3<T, P>> hasher; - glm::detail::hash_combine(seed, hasher(m[0])); - glm::detail::hash_combine(seed, hasher(m[1])); - return seed; - } - - template <typename T, glm::precision P> - GLM_FUNC_QUALIFIER size_t hash<glm::tmat2x4<T, P>>::operator()(glm::tmat2x4<T, P> const & m) const - { - size_t seed = 0; - hash<glm::tvec4<T, P>> hasher; - glm::detail::hash_combine(seed, hasher(m[0])); - glm::detail::hash_combine(seed, hasher(m[1])); - return seed; - } - - template <typename T, glm::precision P> - GLM_FUNC_QUALIFIER size_t hash<glm::tmat3x2<T, P>>::operator()(glm::tmat3x2<T, P> const & m) const - { - size_t seed = 0; - hash<glm::tvec2<T, P>> hasher; - glm::detail::hash_combine(seed, hasher(m[0])); - glm::detail::hash_combine(seed, hasher(m[1])); - glm::detail::hash_combine(seed, hasher(m[2])); - return seed; - } - - template <typename T, glm::precision P> - GLM_FUNC_QUALIFIER size_t hash<glm::tmat3x3<T, P>>::operator()(glm::tmat3x3<T, P> const & m) const - { - size_t seed = 0; - hash<glm::tvec3<T, P>> hasher; - glm::detail::hash_combine(seed, hasher(m[0])); - glm::detail::hash_combine(seed, hasher(m[1])); - glm::detail::hash_combine(seed, hasher(m[2])); - return seed; - } - - template <typename T, glm::precision P> - GLM_FUNC_QUALIFIER size_t hash<glm::tmat3x4<T, P>>::operator()(glm::tmat3x4<T, P> const & m) const - { - size_t seed = 0; - hash<glm::tvec4<T, P>> hasher; - glm::detail::hash_combine(seed, hasher(m[0])); - glm::detail::hash_combine(seed, hasher(m[1])); - glm::detail::hash_combine(seed, hasher(m[2])); - return seed; - } - - template <typename T, glm::precision P> - GLM_FUNC_QUALIFIER size_t hash<glm::tmat4x2<T,P>>::operator()(glm::tmat4x2<T,P> const & m) const - { - size_t seed = 0; - hash<glm::tvec2<T, P>> hasher; - glm::detail::hash_combine(seed, hasher(m[0])); - glm::detail::hash_combine(seed, hasher(m[1])); - glm::detail::hash_combine(seed, hasher(m[2])); - glm::detail::hash_combine(seed, hasher(m[3])); - return seed; - } - - template <typename T, glm::precision P> - GLM_FUNC_QUALIFIER size_t hash<glm::tmat4x3<T,P>>::operator()(glm::tmat4x3<T,P> const & m) const - { - size_t seed = 0; - hash<glm::tvec3<T, P>> hasher; - glm::detail::hash_combine(seed, hasher(m[0])); - glm::detail::hash_combine(seed, hasher(m[1])); - glm::detail::hash_combine(seed, hasher(m[2])); - glm::detail::hash_combine(seed, hasher(m[3])); - return seed; - } - - template <typename T, glm::precision P> - GLM_FUNC_QUALIFIER size_t hash<glm::tmat4x4<T,P>>::operator()(glm::tmat4x4<T, P> const & m) const - { - size_t seed = 0; - hash<glm::tvec4<T, P>> hasher; - glm::detail::hash_combine(seed, hasher(m[0])); - glm::detail::hash_combine(seed, hasher(m[1])); - glm::detail::hash_combine(seed, hasher(m[2])); - glm::detail::hash_combine(seed, hasher(m[3])); - return seed; - } -} diff --git a/depedencies/include/glm/gtx/integer.hpp b/depedencies/include/glm/gtx/integer.hpp deleted file mode 100644 index 1173a58..0000000 --- a/depedencies/include/glm/gtx/integer.hpp +++ /dev/null @@ -1,72 +0,0 @@ -/// @ref gtx_integer -/// @file glm/gtx/integer.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_integer GLM_GTX_integer -/// @ingroup gtx -/// -/// @brief Add support for integer for core functions -/// -/// <glm/gtx/integer.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" -#include "../gtc/integer.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_integer extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_integer - /// @{ - - //! Returns x raised to the y power. - //! From GLM_GTX_integer extension. - GLM_FUNC_DECL int pow(int x, int y); - - //! Returns the positive square root of x. - //! From GLM_GTX_integer extension. - GLM_FUNC_DECL int sqrt(int x); - - //! Returns the floor log2 of x. - //! From GLM_GTX_integer extension. - GLM_FUNC_DECL unsigned int floor_log2(unsigned int x); - - //! Modulus. Returns x - y * floor(x / y) for each component in x using the floating point value y. - //! From GLM_GTX_integer extension. - GLM_FUNC_DECL int mod(int x, int y); - - //! Return the factorial value of a number (!12 max, integer only) - //! From GLM_GTX_integer extension. - template <typename genType> - GLM_FUNC_DECL genType factorial(genType const & x); - - //! 32bit signed integer. - //! From GLM_GTX_integer extension. - typedef signed int sint; - - //! Returns x raised to the y power. - //! From GLM_GTX_integer extension. - GLM_FUNC_DECL uint pow(uint x, uint y); - - //! Returns the positive square root of x. - //! From GLM_GTX_integer extension. - GLM_FUNC_DECL uint sqrt(uint x); - - //! Modulus. Returns x - y * floor(x / y) for each component in x using the floating point value y. - //! From GLM_GTX_integer extension. - GLM_FUNC_DECL uint mod(uint x, uint y); - - //! Returns the number of leading zeros. - //! From GLM_GTX_integer extension. - GLM_FUNC_DECL uint nlz(uint x); - - /// @} -}//namespace glm - -#include "integer.inl" diff --git a/depedencies/include/glm/gtx/integer.inl b/depedencies/include/glm/gtx/integer.inl deleted file mode 100644 index 3a479e6..0000000 --- a/depedencies/include/glm/gtx/integer.inl +++ /dev/null @@ -1,182 +0,0 @@ -/// @ref gtx_integer -/// @file glm/gtx/integer.inl - -namespace glm -{ - // pow - GLM_FUNC_QUALIFIER int pow(int x, int y) - { - if(y == 0) - return 1; - int result = x; - for(int i = 1; i < y; ++i) - result *= x; - return result; - } - - // sqrt: From Christopher J. Musial, An integer square root, Graphics Gems, 1990, page 387 - GLM_FUNC_QUALIFIER int sqrt(int x) - { - if(x <= 1) return x; - - int NextTrial = x >> 1; - int CurrentAnswer; - - do - { - CurrentAnswer = NextTrial; - NextTrial = (NextTrial + x / NextTrial) >> 1; - } while(NextTrial < CurrentAnswer); - - return CurrentAnswer; - } - -// Henry Gordon Dietz: http://aggregate.org/MAGIC/ -namespace detail -{ - GLM_FUNC_QUALIFIER unsigned int ones32(unsigned int x) - { - /* 32-bit recursive reduction using SWAR... - but first step is mapping 2-bit values - into sum of 2 1-bit values in sneaky way - */ - x -= ((x >> 1) & 0x55555555); - x = (((x >> 2) & 0x33333333) + (x & 0x33333333)); - x = (((x >> 4) + x) & 0x0f0f0f0f); - x += (x >> 8); - x += (x >> 16); - return(x & 0x0000003f); - } -}//namespace detail - - // Henry Gordon Dietz: http://aggregate.org/MAGIC/ -/* - GLM_FUNC_QUALIFIER unsigned int floor_log2(unsigned int x) - { - x |= (x >> 1); - x |= (x >> 2); - x |= (x >> 4); - x |= (x >> 8); - x |= (x >> 16); - - return _detail::ones32(x) >> 1; - } -*/ - // mod - GLM_FUNC_QUALIFIER int mod(int x, int y) - { - return x - y * (x / y); - } - - // factorial (!12 max, integer only) - template <typename genType> - GLM_FUNC_QUALIFIER genType factorial(genType const & x) - { - genType Temp = x; - genType Result; - for(Result = 1; Temp > 1; --Temp) - Result *= Temp; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec2<T, P> factorial( - tvec2<T, P> const & x) - { - return tvec2<T, P>( - factorial(x.x), - factorial(x.y)); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> factorial( - tvec3<T, P> const & x) - { - return tvec3<T, P>( - factorial(x.x), - factorial(x.y), - factorial(x.z)); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec4<T, P> factorial( - tvec4<T, P> const & x) - { - return tvec4<T, P>( - factorial(x.x), - factorial(x.y), - factorial(x.z), - factorial(x.w)); - } - - GLM_FUNC_QUALIFIER uint pow(uint x, uint y) - { - uint result = x; - for(uint i = 1; i < y; ++i) - result *= x; - return result; - } - - GLM_FUNC_QUALIFIER uint sqrt(uint x) - { - if(x <= 1) return x; - - uint NextTrial = x >> 1; - uint CurrentAnswer; - - do - { - CurrentAnswer = NextTrial; - NextTrial = (NextTrial + x / NextTrial) >> 1; - } while(NextTrial < CurrentAnswer); - - return CurrentAnswer; - } - - GLM_FUNC_QUALIFIER uint mod(uint x, uint y) - { - return x - y * (x / y); - } - -#if(GLM_COMPILER & (GLM_COMPILER_VC | GLM_COMPILER_GCC)) - - GLM_FUNC_QUALIFIER unsigned int nlz(unsigned int x) - { - return 31u - findMSB(x); - } - -#else - - // Hackers Delight: http://www.hackersdelight.org/HDcode/nlz.c.txt - GLM_FUNC_QUALIFIER unsigned int nlz(unsigned int x) - { - int y, m, n; - - y = -int(x >> 16); // If left half of x is 0, - m = (y >> 16) & 16; // set n = 16. If left half - n = 16 - m; // is nonzero, set n = 0 and - x = x >> m; // shift x right 16. - // Now x is of the form 0000xxxx. - y = x - 0x100; // If positions 8-15 are 0, - m = (y >> 16) & 8; // add 8 to n and shift x left 8. - n = n + m; - x = x << m; - - y = x - 0x1000; // If positions 12-15 are 0, - m = (y >> 16) & 4; // add 4 to n and shift x left 4. - n = n + m; - x = x << m; - - y = x - 0x4000; // If positions 14-15 are 0, - m = (y >> 16) & 2; // add 2 to n and shift x left 2. - n = n + m; - x = x << m; - - y = x >> 14; // Set y = 0, 1, 2, or 3. - m = y & ~(y >> 1); // Set m = 0, 1, 2, or 2 resp. - return unsigned(n + 2 - m); - } - -#endif//(GLM_COMPILER) - -}//namespace glm diff --git a/depedencies/include/glm/gtx/intersect.hpp b/depedencies/include/glm/gtx/intersect.hpp deleted file mode 100644 index 33b6e99..0000000 --- a/depedencies/include/glm/gtx/intersect.hpp +++ /dev/null @@ -1,87 +0,0 @@ -/// @ref gtx_intersect -/// @file glm/gtx/intersect.hpp -/// -/// @see core (dependence) -/// @see gtx_closest_point (dependence) -/// -/// @defgroup gtx_intersect GLM_GTX_intersect -/// @ingroup gtx -/// -/// @brief Add intersection functions -/// -/// <glm/gtx/intersect.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include <cfloat> -#include <limits> -#include "../glm.hpp" -#include "../geometric.hpp" -#include "../gtx/closest_point.hpp" -#include "../gtx/vector_query.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_closest_point extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_intersect - /// @{ - - //! Compute the intersection of a ray and a plane. - //! Ray direction and plane normal must be unit length. - //! From GLM_GTX_intersect extension. - template <typename genType> - GLM_FUNC_DECL bool intersectRayPlane( - genType const & orig, genType const & dir, - genType const & planeOrig, genType const & planeNormal, - typename genType::value_type & intersectionDistance); - - //! Compute the intersection of a ray and a triangle. - //! From GLM_GTX_intersect extension. - template <typename genType> - GLM_FUNC_DECL bool intersectRayTriangle( - genType const & orig, genType const & dir, - genType const & vert0, genType const & vert1, genType const & vert2, - genType & baryPosition); - - //! Compute the intersection of a line and a triangle. - //! From GLM_GTX_intersect extension. - template <typename genType> - GLM_FUNC_DECL bool intersectLineTriangle( - genType const & orig, genType const & dir, - genType const & vert0, genType const & vert1, genType const & vert2, - genType & position); - - //! Compute the intersection distance of a ray and a sphere. - //! The ray direction vector is unit length. - //! From GLM_GTX_intersect extension. - template <typename genType> - GLM_FUNC_DECL bool intersectRaySphere( - genType const & rayStarting, genType const & rayNormalizedDirection, - genType const & sphereCenter, typename genType::value_type const sphereRadiusSquered, - typename genType::value_type & intersectionDistance); - - //! Compute the intersection of a ray and a sphere. - //! From GLM_GTX_intersect extension. - template <typename genType> - GLM_FUNC_DECL bool intersectRaySphere( - genType const & rayStarting, genType const & rayNormalizedDirection, - genType const & sphereCenter, const typename genType::value_type sphereRadius, - genType & intersectionPosition, genType & intersectionNormal); - - //! Compute the intersection of a line and a sphere. - //! From GLM_GTX_intersect extension - template <typename genType> - GLM_FUNC_DECL bool intersectLineSphere( - genType const & point0, genType const & point1, - genType const & sphereCenter, typename genType::value_type sphereRadius, - genType & intersectionPosition1, genType & intersectionNormal1, - genType & intersectionPosition2 = genType(), genType & intersectionNormal2 = genType()); - - /// @} -}//namespace glm - -#include "intersect.inl" diff --git a/depedencies/include/glm/gtx/intersect.inl b/depedencies/include/glm/gtx/intersect.inl deleted file mode 100644 index 904d6cc..0000000 --- a/depedencies/include/glm/gtx/intersect.inl +++ /dev/null @@ -1,170 +0,0 @@ -/// @ref gtx_intersect -/// @file glm/gtx/intersect.inl - -namespace glm -{ - template <typename genType> - GLM_FUNC_QUALIFIER bool intersectRayPlane - ( - genType const & orig, genType const & dir, - genType const & planeOrig, genType const & planeNormal, - typename genType::value_type & intersectionDistance - ) - { - typename genType::value_type d = glm::dot(dir, planeNormal); - typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon(); - - if(d < -Epsilon) - { - intersectionDistance = glm::dot(planeOrig - orig, planeNormal) / d; - return true; - } - - return false; - } - - template <typename genType> - GLM_FUNC_QUALIFIER bool intersectRayTriangle - ( - genType const & orig, genType const & dir, - genType const & v0, genType const & v1, genType const & v2, - genType & baryPosition - ) - { - genType e1 = v1 - v0; - genType e2 = v2 - v0; - - genType p = glm::cross(dir, e2); - - typename genType::value_type a = glm::dot(e1, p); - - typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon(); - if(a < Epsilon && a > -Epsilon) - return false; - - typename genType::value_type f = typename genType::value_type(1.0f) / a; - - genType s = orig - v0; - baryPosition.x = f * glm::dot(s, p); - if(baryPosition.x < typename genType::value_type(0.0f)) - return false; - if(baryPosition.x > typename genType::value_type(1.0f)) - return false; - - genType q = glm::cross(s, e1); - baryPosition.y = f * glm::dot(dir, q); - if(baryPosition.y < typename genType::value_type(0.0f)) - return false; - if(baryPosition.y + baryPosition.x > typename genType::value_type(1.0f)) - return false; - - baryPosition.z = f * glm::dot(e2, q); - - return baryPosition.z >= typename genType::value_type(0.0f); - } - - template <typename genType> - GLM_FUNC_QUALIFIER bool intersectLineTriangle - ( - genType const & orig, genType const & dir, - genType const & vert0, genType const & vert1, genType const & vert2, - genType & position - ) - { - typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon(); - - genType edge1 = vert1 - vert0; - genType edge2 = vert2 - vert0; - - genType pvec = cross(dir, edge2); - - float det = dot(edge1, pvec); - - if (det > -Epsilon && det < Epsilon) - return false; - float inv_det = typename genType::value_type(1) / det; - - genType tvec = orig - vert0; - - position.y = dot(tvec, pvec) * inv_det; - if (position.y < typename genType::value_type(0) || position.y > typename genType::value_type(1)) - return false; - - genType qvec = cross(tvec, edge1); - - position.z = dot(dir, qvec) * inv_det; - if (position.z < typename genType::value_type(0) || position.y + position.z > typename genType::value_type(1)) - return false; - - position.x = dot(edge2, qvec) * inv_det; - - return true; - } - - template <typename genType> - GLM_FUNC_QUALIFIER bool intersectRaySphere - ( - genType const & rayStarting, genType const & rayNormalizedDirection, - genType const & sphereCenter, const typename genType::value_type sphereRadiusSquered, - typename genType::value_type & intersectionDistance - ) - { - typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon(); - genType diff = sphereCenter - rayStarting; - typename genType::value_type t0 = dot(diff, rayNormalizedDirection); - typename genType::value_type dSquared = dot(diff, diff) - t0 * t0; - if( dSquared > sphereRadiusSquered ) - { - return false; - } - typename genType::value_type t1 = sqrt( sphereRadiusSquered - dSquared ); - intersectionDistance = t0 > t1 + Epsilon ? t0 - t1 : t0 + t1; - return intersectionDistance > Epsilon; - } - - template <typename genType> - GLM_FUNC_QUALIFIER bool intersectRaySphere - ( - genType const & rayStarting, genType const & rayNormalizedDirection, - genType const & sphereCenter, const typename genType::value_type sphereRadius, - genType & intersectionPosition, genType & intersectionNormal - ) - { - typename genType::value_type distance; - if( intersectRaySphere( rayStarting, rayNormalizedDirection, sphereCenter, sphereRadius * sphereRadius, distance ) ) - { - intersectionPosition = rayStarting + rayNormalizedDirection * distance; - intersectionNormal = (intersectionPosition - sphereCenter) / sphereRadius; - return true; - } - return false; - } - - template <typename genType> - GLM_FUNC_QUALIFIER bool intersectLineSphere - ( - genType const & point0, genType const & point1, - genType const & sphereCenter, typename genType::value_type sphereRadius, - genType & intersectionPoint1, genType & intersectionNormal1, - genType & intersectionPoint2, genType & intersectionNormal2 - ) - { - typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon(); - genType dir = normalize(point1 - point0); - genType diff = sphereCenter - point0; - typename genType::value_type t0 = dot(diff, dir); - typename genType::value_type dSquared = dot(diff, diff) - t0 * t0; - if( dSquared > sphereRadius * sphereRadius ) - { - return false; - } - typename genType::value_type t1 = sqrt( sphereRadius * sphereRadius - dSquared ); - if( t0 < t1 + Epsilon ) - t1 = -t1; - intersectionPoint1 = point0 + dir * (t0 - t1); - intersectionNormal1 = (intersectionPoint1 - sphereCenter) / sphereRadius; - intersectionPoint2 = point0 + dir * (t0 + t1); - intersectionNormal2 = (intersectionPoint2 - sphereCenter) / sphereRadius; - return true; - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/io.hpp b/depedencies/include/glm/gtx/io.hpp deleted file mode 100644 index 6aa8415..0000000 --- a/depedencies/include/glm/gtx/io.hpp +++ /dev/null @@ -1,197 +0,0 @@ -/// @ref gtx_io -/// @file glm/gtx/io.hpp -/// @author Jan P Springer (regnirpsj@gmail.com) -/// -/// @see core (dependence) -/// @see gtc_matrix_access (dependence) -/// @see gtc_quaternion (dependence) -/// -/// @defgroup gtx_io GLM_GTX_io -/// @ingroup gtx -/// -/// @brief std::[w]ostream support for glm types -/// -/// std::[w]ostream support for glm types + precision/width/etc. manipulators -/// based on howard hinnant's std::chrono io proposal -/// [http://home.roadrunner.com/~hinnant/bloomington/chrono_io.html] -/// -/// <glm/gtx/io.hpp> needs to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" -#include "../gtx/quaternion.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_io extension included") -#endif - -#include <iosfwd> // std::basic_ostream<> (fwd) -#include <locale> // std::locale, std::locale::facet, std::locale::id -#include <utility> // std::pair<> - -namespace glm -{ - /// @addtogroup gtx_io - /// @{ - - namespace io - { - enum order_type { column_major, row_major}; - - template <typename CTy> - class format_punct : public std::locale::facet - { - typedef CTy char_type; - - public: - - static std::locale::id id; - - bool formatted; - unsigned precision; - unsigned width; - char_type separator; - char_type delim_left; - char_type delim_right; - char_type space; - char_type newline; - order_type order; - - GLM_FUNC_DECL explicit format_punct(size_t a = 0); - GLM_FUNC_DECL explicit format_punct(format_punct const&); - }; - - template <typename CTy, typename CTr = std::char_traits<CTy> > - class basic_state_saver { - - public: - - GLM_FUNC_DECL explicit basic_state_saver(std::basic_ios<CTy,CTr>&); - GLM_FUNC_DECL ~basic_state_saver(); - - private: - - typedef ::std::basic_ios<CTy,CTr> state_type; - typedef typename state_type::char_type char_type; - typedef ::std::ios_base::fmtflags flags_type; - typedef ::std::streamsize streamsize_type; - typedef ::std::locale const locale_type; - - state_type& state_; - flags_type flags_; - streamsize_type precision_; - streamsize_type width_; - char_type fill_; - locale_type locale_; - - GLM_FUNC_DECL basic_state_saver& operator=(basic_state_saver const&); - }; - - typedef basic_state_saver<char> state_saver; - typedef basic_state_saver<wchar_t> wstate_saver; - - template <typename CTy, typename CTr = std::char_traits<CTy> > - class basic_format_saver - { - public: - - GLM_FUNC_DECL explicit basic_format_saver(std::basic_ios<CTy,CTr>&); - GLM_FUNC_DECL ~basic_format_saver(); - - private: - - basic_state_saver<CTy> const bss_; - - GLM_FUNC_DECL basic_format_saver& operator=(basic_format_saver const&); - }; - - typedef basic_format_saver<char> format_saver; - typedef basic_format_saver<wchar_t> wformat_saver; - - struct precision - { - unsigned value; - - GLM_FUNC_DECL explicit precision(unsigned); - }; - - struct width - { - unsigned value; - - GLM_FUNC_DECL explicit width(unsigned); - }; - - template <typename CTy> - struct delimeter - { - CTy value[3]; - - GLM_FUNC_DECL explicit delimeter(CTy /* left */, CTy /* right */, CTy /* separator */ = ','); - }; - - struct order - { - order_type value; - - GLM_FUNC_DECL explicit order(order_type); - }; - - // functions, inlined (inline) - - template <typename FTy, typename CTy, typename CTr> - FTy const& get_facet(std::basic_ios<CTy,CTr>&); - template <typename FTy, typename CTy, typename CTr> - std::basic_ios<CTy,CTr>& formatted(std::basic_ios<CTy,CTr>&); - template <typename FTy, typename CTy, typename CTr> - std::basic_ios<CTy,CTr>& unformattet(std::basic_ios<CTy,CTr>&); - - template <typename CTy, typename CTr> - std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, precision const&); - template <typename CTy, typename CTr> - std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, width const&); - template <typename CTy, typename CTr> - std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, delimeter<CTy> const&); - template <typename CTy, typename CTr> - std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, order const&); - }//namespace io - - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tquat<T,P> const&); - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tvec1<T,P> const&); - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tvec2<T,P> const&); - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tvec3<T,P> const&); - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tvec4<T,P> const&); - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat2x2<T,P> const&); - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat2x3<T,P> const&); - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat2x4<T,P> const&); - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat3x2<T,P> const&); - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat3x3<T,P> const&); - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat3x4<T,P> const&); - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat4x2<T,P> const&); - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat4x3<T,P> const&); - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat4x4<T,P> const&); - - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_DECL std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr> &, - std::pair<tmat4x4<T,P> const, tmat4x4<T,P> const> const &); - - /// @} -}//namespace glm - -#include "io.inl" diff --git a/depedencies/include/glm/gtx/io.inl b/depedencies/include/glm/gtx/io.inl deleted file mode 100644 index 9b70a5f..0000000 --- a/depedencies/include/glm/gtx/io.inl +++ /dev/null @@ -1,441 +0,0 @@ -/// @ref gtx_io -/// @file glm/gtx/io.inl -/// @author Jan P Springer (regnirpsj@gmail.com) - -#include <iomanip> // std::fixed, std::setfill<>, std::setprecision, std::right, std::setw -#include <ostream> // std::basic_ostream<> -#include "../gtc/matrix_access.hpp" // glm::col, glm::row -#include "../gtx/type_trait.hpp" // glm::type<> - -namespace glm{ -namespace io -{ - template <typename CTy> - GLM_FUNC_QUALIFIER format_punct<CTy>::format_punct(size_t a) - : std::locale::facet(a) - , formatted(true) - , precision(3) - , width(1 + 4 + 1 + precision) - , separator(',') - , delim_left('[') - , delim_right(']') - , space(' ') - , newline('\n') - , order(column_major) - {} - - template <typename CTy> - GLM_FUNC_QUALIFIER format_punct<CTy>::format_punct(format_punct const& a) - : std::locale::facet(0) - , formatted(a.formatted) - , precision(a.precision) - , width(a.width) - , separator(a.separator) - , delim_left(a.delim_left) - , delim_right(a.delim_right) - , space(a.space) - , newline(a.newline) - , order(a.order) - {} - - template <typename CTy> std::locale::id format_punct<CTy>::id; - - template <typename CTy, typename CTr> - GLM_FUNC_QUALIFIER basic_state_saver<CTy, CTr>::basic_state_saver(std::basic_ios<CTy, CTr>& a) - : state_(a) - , flags_(a.flags()) - , precision_(a.precision()) - , width_(a.width()) - , fill_(a.fill()) - , locale_(a.getloc()) - {} - - template <typename CTy, typename CTr> - GLM_FUNC_QUALIFIER basic_state_saver<CTy, CTr>::~basic_state_saver() - { - state_.imbue(locale_); - state_.fill(fill_); - state_.width(width_); - state_.precision(precision_); - state_.flags(flags_); - } - - template <typename CTy, typename CTr> - GLM_FUNC_QUALIFIER basic_format_saver<CTy, CTr>::basic_format_saver(std::basic_ios<CTy, CTr>& a) - : bss_(a) - { - a.imbue(std::locale(a.getloc(), new format_punct<CTy>(get_facet<format_punct<CTy> >(a)))); - } - - template <typename CTy, typename CTr> - GLM_FUNC_QUALIFIER - basic_format_saver<CTy, CTr>::~basic_format_saver() - {} - - GLM_FUNC_QUALIFIER precision::precision(unsigned a) - : value(a) - {} - - GLM_FUNC_QUALIFIER width::width(unsigned a) - : value(a) - {} - - template <typename CTy> - GLM_FUNC_QUALIFIER delimeter<CTy>::delimeter(CTy a, CTy b, CTy c) - : value() - { - value[0] = a; - value[1] = b; - value[2] = c; - } - - GLM_FUNC_QUALIFIER order::order(order_type a) - : value(a) - {} - - template <typename FTy, typename CTy, typename CTr> - GLM_FUNC_QUALIFIER FTy const& get_facet(std::basic_ios<CTy, CTr>& ios) - { - if(!std::has_facet<FTy>(ios.getloc())) - ios.imbue(std::locale(ios.getloc(), new FTy)); - - return std::use_facet<FTy>(ios.getloc()); - } - - template <typename CTy, typename CTr> - GLM_FUNC_QUALIFIER std::basic_ios<CTy, CTr>& formatted(std::basic_ios<CTy, CTr>& ios) - { - const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(ios)).formatted = true; - return ios; - } - - template <typename CTy, typename CTr> - GLM_FUNC_QUALIFIER std::basic_ios<CTy, CTr>& unformatted(std::basic_ios<CTy, CTr>& ios) - { - const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(ios)).formatted = false; - return ios; - } - - template <typename CTy, typename CTr> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, precision const& a) - { - const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)).precision = a.value; - return os; - } - - template <typename CTy, typename CTr> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, width const& a) - { - const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)).width = a.value; - return os; - } - - template <typename CTy, typename CTr> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, delimeter<CTy> const& a) - { - format_punct<CTy> & fmt(const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os))); - - fmt.delim_left = a.value[0]; - fmt.delim_right = a.value[1]; - fmt.separator = a.value[2]; - - return os; - } - - template <typename CTy, typename CTr> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, order const& a) - { - const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)).order = a.value; - return os; - } -} // namespace io - -namespace detail -{ - template <typename CTy, typename CTr, template <typename, precision> class V, typename T, precision P> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& - print_vector_on(std::basic_ostream<CTy, CTr>& os, V<T,P> const& a) - { - typename std::basic_ostream<CTy, CTr>::sentry const cerberus(os); - - if(cerberus) - { - io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os)); - - length_t const& components(type<V, T, P>::components); - - if(fmt.formatted) - { - io::basic_state_saver<CTy> const bss(os); - - os << std::fixed << std::right << std::setprecision(fmt.precision) << std::setfill(fmt.space) << fmt.delim_left; - - for(length_t i(0); i < components; ++i) - { - os << std::setw(fmt.width) << a[i]; - if(components-1 != i) - os << fmt.separator; - } - - os << fmt.delim_right; - } - else - { - for(length_t i(0); i < components; ++i) - { - os << a[i]; - - if(components-1 != i) - os << fmt.space; - } - } - } - - return os; - } -}//namespace detail - - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tquat<T,P> const& a) - { - return detail::print_vector_on(os, a); - } - - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tvec1<T,P> const& a) - { - return detail::print_vector_on(os, a); - } - - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tvec2<T,P> const& a) - { - return detail::print_vector_on(os, a); - } - - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tvec3<T,P> const& a) - { - return detail::print_vector_on(os, a); - } - - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tvec4<T,P> const& a) - { - return detail::print_vector_on(os, a); - } - -namespace detail -{ - template <typename CTy, typename CTr, template <typename, precision> class M, typename T, precision P> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& print_matrix_on(std::basic_ostream<CTy, CTr>& os, M<T,P> const& a) - { - typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os); - - if(cerberus) - { - io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os)); - - length_t const& cols(type<M, T, P>::cols); - length_t const& rows(type<M, T, P>::rows); - - if(fmt.formatted) - { - os << fmt.newline << fmt.delim_left; - - switch(fmt.order) - { - case io::column_major: - { - for(length_t i(0); i < rows; ++i) - { - if (0 != i) - os << fmt.space; - - os << row(a, i); - - if(rows-1 != i) - os << fmt.newline; - } - } - break; - - case io::row_major: - { - for(length_t i(0); i < cols; ++i) - { - if(0 != i) - os << fmt.space; - - os << column(a, i); - - if(cols-1 != i) - os << fmt.newline; - } - } - break; - } - - os << fmt.delim_right; - } - else - { - switch (fmt.order) - { - case io::column_major: - { - for(length_t i(0); i < cols; ++i) - { - os << column(a, i); - - if(cols - 1 != i) - os << fmt.space; - } - } - break; - - case io::row_major: - { - for (length_t i(0); i < rows; ++i) - { - os << row(a, i); - - if (rows-1 != i) - os << fmt.space; - } - } - break; - } - } - } - - return os; - } -}//namespace detail - - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat2x2<T,P> const& a) - { - return detail::print_matrix_on(os, a); - } - - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat2x3<T,P> const& a) - { - return detail::print_matrix_on(os, a); - } - - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat2x4<T,P> const& a) - { - return detail::print_matrix_on(os, a); - } - - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat3x2<T,P> const& a) - { - return detail::print_matrix_on(os, a); - } - - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat3x3<T,P> const& a) - { - return detail::print_matrix_on(os, a); - } - - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, tmat3x4<T,P> const& a) - { - return detail::print_matrix_on(os, a); - } - - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, tmat4x2<T,P> const& a) - { - return detail::print_matrix_on(os, a); - } - - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, tmat4x3<T,P> const& a) - { - return detail::print_matrix_on(os, a); - } - - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, tmat4x4<T,P> const& a) - { - return detail::print_matrix_on(os, a); - } - -namespace detail -{ - template <typename CTy, typename CTr, template <typename, precision> class M, typename T, precision P> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& print_matrix_pair_on(std::basic_ostream<CTy, CTr>& os, std::pair<M<T, P> const, M<T, P> const> const& a) - { - typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os); - - if(cerberus) - { - io::format_punct<CTy> const& fmt(io::get_facet<io::format_punct<CTy> >(os)); - M<T,P> const& ml(a.first); - M<T,P> const& mr(a.second); - length_t const& cols(type<M, T, P>::cols); - length_t const& rows(type<M, T, P>::rows); - - if(fmt.formatted) - { - os << fmt.newline << fmt.delim_left; - - switch(fmt.order) - { - case io::column_major: - { - for(length_t i(0); i < rows; ++i) - { - if(0 != i) - os << fmt.space; - - os << row(ml, i) << ((rows-1 != i) ? fmt.space : fmt.delim_right) << fmt.space << ((0 != i) ? fmt.space : fmt.delim_left) << row(mr, i); - - if(rows-1 != i) - os << fmt.newline; - } - } - break; - case io::row_major: - { - for(length_t i(0); i < cols; ++i) - { - if(0 != i) - os << fmt.space; - - os << column(ml, i) << ((cols-1 != i) ? fmt.space : fmt.delim_right) << fmt.space << ((0 != i) ? fmt.space : fmt.delim_left) << column(mr, i); - - if(cols-1 != i) - os << fmt.newline; - } - } - break; - } - - os << fmt.delim_right; - } - else - { - os << ml << fmt.space << mr; - } - } - - return os; - } -}//namespace detail - - template <typename CTy, typename CTr, typename T, precision P> - GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<( - std::basic_ostream<CTy, CTr> & os, - std::pair<tmat4x4<T, P> const, - tmat4x4<T, P> const> const& a) - { - return detail::print_matrix_pair_on(os, a); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/log_base.hpp b/depedencies/include/glm/gtx/log_base.hpp deleted file mode 100644 index 7958fc3..0000000 --- a/depedencies/include/glm/gtx/log_base.hpp +++ /dev/null @@ -1,44 +0,0 @@ -/// @ref gtx_log_base -/// @file glm/gtx/log_base.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_log_base GLM_GTX_log_base -/// @ingroup gtx -/// -/// @brief Logarithm for any base. base can be a vector or a scalar. -/// -/// <glm/gtx/log_base.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_log_base extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_log_base - /// @{ - - /// Logarithm for any base. - /// From GLM_GTX_log_base. - template <typename genType> - GLM_FUNC_DECL genType log( - genType const & x, - genType const & base); - - /// Logarithm for any base. - /// From GLM_GTX_log_base. - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<T, P> sign( - vecType<T, P> const & x, - vecType<T, P> const & base); - - /// @} -}//namespace glm - -#include "log_base.inl" diff --git a/depedencies/include/glm/gtx/log_base.inl b/depedencies/include/glm/gtx/log_base.inl deleted file mode 100644 index 8005d1b..0000000 --- a/depedencies/include/glm/gtx/log_base.inl +++ /dev/null @@ -1,18 +0,0 @@ -/// @ref gtx_log_base -/// @file glm/gtx/log_base.inl - -namespace glm -{ - template <typename genType> - GLM_FUNC_QUALIFIER genType log(genType const & x, genType const & base) - { - assert(x != genType(0)); - return glm::log(x) / glm::log(base); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> log(vecType<T, P> const & x, vecType<T, P> const & base) - { - return glm::log(x) / glm::log(base); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/matrix_cross_product.hpp b/depedencies/include/glm/gtx/matrix_cross_product.hpp deleted file mode 100644 index d920f4e..0000000 --- a/depedencies/include/glm/gtx/matrix_cross_product.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/// @ref gtx_matrix_cross_product -/// @file glm/gtx/matrix_cross_product.hpp -/// -/// @see core (dependence) -/// @see gtx_extented_min_max (dependence) -/// -/// @defgroup gtx_matrix_cross_product GLM_GTX_matrix_cross_product -/// @ingroup gtx -/// -/// @brief Build cross product matrices -/// -/// <glm/gtx/matrix_cross_product.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_matrix_cross_product extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_matrix_cross_product - /// @{ - - //! Build a cross product matrix. - //! From GLM_GTX_matrix_cross_product extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat3x3<T, P> matrixCross3( - tvec3<T, P> const & x); - - //! Build a cross product matrix. - //! From GLM_GTX_matrix_cross_product extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat4x4<T, P> matrixCross4( - tvec3<T, P> const & x); - - /// @} -}//namespace glm - -#include "matrix_cross_product.inl" diff --git a/depedencies/include/glm/gtx/matrix_cross_product.inl b/depedencies/include/glm/gtx/matrix_cross_product.inl deleted file mode 100644 index 16f07e9..0000000 --- a/depedencies/include/glm/gtx/matrix_cross_product.inl +++ /dev/null @@ -1,38 +0,0 @@ -/// @ref gtx_matrix_cross_product -/// @file glm/gtx/matrix_cross_product.inl - -namespace glm -{ - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> matrixCross3 - ( - tvec3<T, P> const & x - ) - { - tmat3x3<T, P> Result(T(0)); - Result[0][1] = x.z; - Result[1][0] = -x.z; - Result[0][2] = -x.y; - Result[2][0] = x.y; - Result[1][2] = x.x; - Result[2][1] = -x.x; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> matrixCross4 - ( - tvec3<T, P> const & x - ) - { - tmat4x4<T, P> Result(T(0)); - Result[0][1] = x.z; - Result[1][0] = -x.z; - Result[0][2] = -x.y; - Result[2][0] = x.y; - Result[1][2] = x.x; - Result[2][1] = -x.x; - return Result; - } - -}//namespace glm diff --git a/depedencies/include/glm/gtx/matrix_decompose.hpp b/depedencies/include/glm/gtx/matrix_decompose.hpp deleted file mode 100644 index e163f5a..0000000 --- a/depedencies/include/glm/gtx/matrix_decompose.hpp +++ /dev/null @@ -1,42 +0,0 @@ -/// @ref gtx_matrix_decompose -/// @file glm/gtx/matrix_decompose.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_matrix_decompose GLM_GTX_matrix_decompose -/// @ingroup gtx -/// -/// @brief Decomposes a model matrix to translations, rotation and scale components -/// -/// <glm/gtx/matrix_decompose.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependencies -#include "../mat4x4.hpp" -#include "../vec3.hpp" -#include "../vec4.hpp" -#include "../geometric.hpp" -#include "../gtc/quaternion.hpp" -#include "../gtc/matrix_transform.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_matrix_decompose extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_matrix_decompose - /// @{ - - /// Decomposes a model matrix to translations, rotation and scale components - /// @see gtx_matrix_decompose - template <typename T, precision P> - GLM_FUNC_DECL bool decompose( - tmat4x4<T, P> const & modelMatrix, - tvec3<T, P> & scale, tquat<T, P> & orientation, tvec3<T, P> & translation, tvec3<T, P> & skew, tvec4<T, P> & perspective); - - /// @} -}//namespace glm - -#include "matrix_decompose.inl" diff --git a/depedencies/include/glm/gtx/matrix_decompose.inl b/depedencies/include/glm/gtx/matrix_decompose.inl deleted file mode 100644 index 7194e9d..0000000 --- a/depedencies/include/glm/gtx/matrix_decompose.inl +++ /dev/null @@ -1,194 +0,0 @@ -/// @ref gtx_matrix_decompose -/// @file glm/gtx/matrix_decompose.inl - -namespace glm{ -namespace detail -{ - /// Make a linear combination of two vectors and return the result. - // result = (a * ascl) + (b * bscl) - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> combine( - tvec3<T, P> const & a, - tvec3<T, P> const & b, - T ascl, T bscl) - { - return (a * ascl) + (b * bscl); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> scale(tvec3<T, P> const& v, T desiredLength) - { - return v * desiredLength / length(v); - } -}//namespace detail - - // Matrix decompose - // http://www.opensource.apple.com/source/WebCore/WebCore-514/platform/graphics/transforms/TransformationMatrix.cpp - // Decomposes the mode matrix to translations,rotation scale components - - template <typename T, precision P> - GLM_FUNC_QUALIFIER bool decompose(tmat4x4<T, P> const & ModelMatrix, tvec3<T, P> & Scale, tquat<T, P> & Orientation, tvec3<T, P> & Translation, tvec3<T, P> & Skew, tvec4<T, P> & Perspective) - { - tmat4x4<T, P> LocalMatrix(ModelMatrix); - - // Normalize the matrix. - if(LocalMatrix[3][3] == static_cast<T>(0)) - return false; - - for(length_t i = 0; i < 4; ++i) - for(length_t j = 0; j < 4; ++j) - LocalMatrix[i][j] /= LocalMatrix[3][3]; - - // perspectiveMatrix is used to solve for perspective, but it also provides - // an easy way to test for singularity of the upper 3x3 component. - tmat4x4<T, P> PerspectiveMatrix(LocalMatrix); - - for(length_t i = 0; i < 3; i++) - PerspectiveMatrix[i][3] = static_cast<T>(0); - PerspectiveMatrix[3][3] = static_cast<T>(1); - - /// TODO: Fixme! - if(determinant(PerspectiveMatrix) == static_cast<T>(0)) - return false; - - // First, isolate perspective. This is the messiest. - if(LocalMatrix[0][3] != static_cast<T>(0) || LocalMatrix[1][3] != static_cast<T>(0) || LocalMatrix[2][3] != static_cast<T>(0)) - { - // rightHandSide is the right hand side of the equation. - tvec4<T, P> RightHandSide; - RightHandSide[0] = LocalMatrix[0][3]; - RightHandSide[1] = LocalMatrix[1][3]; - RightHandSide[2] = LocalMatrix[2][3]; - RightHandSide[3] = LocalMatrix[3][3]; - - // Solve the equation by inverting PerspectiveMatrix and multiplying - // rightHandSide by the inverse. (This is the easiest way, not - // necessarily the best.) - tmat4x4<T, P> InversePerspectiveMatrix = glm::inverse(PerspectiveMatrix);// inverse(PerspectiveMatrix, inversePerspectiveMatrix); - tmat4x4<T, P> TransposedInversePerspectiveMatrix = glm::transpose(InversePerspectiveMatrix);// transposeMatrix4(inversePerspectiveMatrix, transposedInversePerspectiveMatrix); - - Perspective = TransposedInversePerspectiveMatrix * RightHandSide; - // v4MulPointByMatrix(rightHandSide, transposedInversePerspectiveMatrix, perspectivePoint); - - // Clear the perspective partition - LocalMatrix[0][3] = LocalMatrix[1][3] = LocalMatrix[2][3] = static_cast<T>(0); - LocalMatrix[3][3] = static_cast<T>(1); - } - else - { - // No perspective. - Perspective = tvec4<T, P>(0, 0, 0, 1); - } - - // Next take care of translation (easy). - Translation = tvec3<T, P>(LocalMatrix[3]); - LocalMatrix[3] = tvec4<T, P>(0, 0, 0, LocalMatrix[3].w); - - tvec3<T, P> Row[3], Pdum3; - - // Now get scale and shear. - for(length_t i = 0; i < 3; ++i) - for(int j = 0; j < 3; ++j) - Row[i][j] = LocalMatrix[i][j]; - - // Compute X scale factor and normalize first row. - Scale.x = length(Row[0]);// v3Length(Row[0]); - - Row[0] = detail::scale(Row[0], static_cast<T>(1)); - - // Compute XY shear factor and make 2nd row orthogonal to 1st. - Skew.z = dot(Row[0], Row[1]); - Row[1] = detail::combine(Row[1], Row[0], static_cast<T>(1), -Skew.z); - - // Now, compute Y scale and normalize 2nd row. - Scale.y = length(Row[1]); - Row[1] = detail::scale(Row[1], static_cast<T>(1)); - Skew.z /= Scale.y; - - // Compute XZ and YZ shears, orthogonalize 3rd row. - Skew.y = glm::dot(Row[0], Row[2]); - Row[2] = detail::combine(Row[2], Row[0], static_cast<T>(1), -Skew.y); - Skew.x = glm::dot(Row[1], Row[2]); - Row[2] = detail::combine(Row[2], Row[1], static_cast<T>(1), -Skew.x); - - // Next, get Z scale and normalize 3rd row. - Scale.z = length(Row[2]); - Row[2] = detail::scale(Row[2], static_cast<T>(1)); - Skew.y /= Scale.z; - Skew.x /= Scale.z; - - // At this point, the matrix (in rows[]) is orthonormal. - // Check for a coordinate system flip. If the determinant - // is -1, then negate the matrix and the scaling factors. - Pdum3 = cross(Row[1], Row[2]); // v3Cross(row[1], row[2], Pdum3); - if(dot(Row[0], Pdum3) < 0) - { - for(length_t i = 0; i < 3; i++) - { - Scale[i] *= static_cast<T>(-1); - Row[i] *= static_cast<T>(-1); - } - } - - // Now, get the rotations out, as described in the gem. - - // FIXME - Add the ability to return either quaternions (which are - // easier to recompose with) or Euler angles (rx, ry, rz), which - // are easier for authors to deal with. The latter will only be useful - // when we fix https://bugs.webkit.org/show_bug.cgi?id=23799, so I - // will leave the Euler angle code here for now. - - // ret.rotateY = asin(-Row[0][2]); - // if (cos(ret.rotateY) != 0) { - // ret.rotateX = atan2(Row[1][2], Row[2][2]); - // ret.rotateZ = atan2(Row[0][1], Row[0][0]); - // } else { - // ret.rotateX = atan2(-Row[2][0], Row[1][1]); - // ret.rotateZ = 0; - // } - - T s, t, x, y, z, w; - - t = Row[0][0] + Row[1][1] + Row[2][2] + static_cast<T>(1); - - if(t > static_cast<T>(1e-4)) - { - s = static_cast<T>(0.5) / sqrt(t); - w = static_cast<T>(0.25) / s; - x = (Row[2][1] - Row[1][2]) * s; - y = (Row[0][2] - Row[2][0]) * s; - z = (Row[1][0] - Row[0][1]) * s; - } - else if(Row[0][0] > Row[1][1] && Row[0][0] > Row[2][2]) - { - s = sqrt (static_cast<T>(1) + Row[0][0] - Row[1][1] - Row[2][2]) * static_cast<T>(2); // S=4*qx - x = static_cast<T>(0.25) * s; - y = (Row[0][1] + Row[1][0]) / s; - z = (Row[0][2] + Row[2][0]) / s; - w = (Row[2][1] - Row[1][2]) / s; - } - else if(Row[1][1] > Row[2][2]) - { - s = sqrt (static_cast<T>(1) + Row[1][1] - Row[0][0] - Row[2][2]) * static_cast<T>(2); // S=4*qy - x = (Row[0][1] + Row[1][0]) / s; - y = static_cast<T>(0.25) * s; - z = (Row[1][2] + Row[2][1]) / s; - w = (Row[0][2] - Row[2][0]) / s; - } - else - { - s = sqrt(static_cast<T>(1) + Row[2][2] - Row[0][0] - Row[1][1]) * static_cast<T>(2); // S=4*qz - x = (Row[0][2] + Row[2][0]) / s; - y = (Row[1][2] + Row[2][1]) / s; - z = static_cast<T>(0.25) * s; - w = (Row[1][0] - Row[0][1]) / s; - } - - Orientation.x = x; - Orientation.y = y; - Orientation.z = z; - Orientation.w = w; - - return true; - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/matrix_interpolation.hpp b/depedencies/include/glm/gtx/matrix_interpolation.hpp deleted file mode 100644 index 77a69ea..0000000 --- a/depedencies/include/glm/gtx/matrix_interpolation.hpp +++ /dev/null @@ -1,61 +0,0 @@ -/// @ref gtx_matrix_interpolation -/// @file glm/gtx/matrix_interpolation.hpp -/// @author Ghenadii Ursachi (the.asteroth@gmail.com) -/// -/// @see core (dependence) -/// -/// @defgroup gtx_matrix_interpolation GLM_GTX_matrix_interpolation -/// @ingroup gtx -/// -/// @brief Allows to directly interpolate two exiciting matrices. -/// -/// <glm/gtx/matrix_interpolation.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_matrix_interpolation extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_matrix_interpolation - /// @{ - - /// Get the axis and angle of the rotation from a matrix. - /// From GLM_GTX_matrix_interpolation extension. - template <typename T, precision P> - GLM_FUNC_DECL void axisAngle( - tmat4x4<T, P> const & mat, - tvec3<T, P> & axis, - T & angle); - - /// Build a matrix from axis and angle. - /// From GLM_GTX_matrix_interpolation extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat4x4<T, P> axisAngleMatrix( - tvec3<T, P> const & axis, - T const angle); - - /// Extracts the rotation part of a matrix. - /// From GLM_GTX_matrix_interpolation extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat4x4<T, P> extractMatrixRotation( - tmat4x4<T, P> const & mat); - - /// Build a interpolation of 4 * 4 matrixes. - /// From GLM_GTX_matrix_interpolation extension. - /// Warning! works only with rotation and/or translation matrixes, scale will generate unexpected results. - template <typename T, precision P> - GLM_FUNC_DECL tmat4x4<T, P> interpolate( - tmat4x4<T, P> const & m1, - tmat4x4<T, P> const & m2, - T const delta); - - /// @} -}//namespace glm - -#include "matrix_interpolation.inl" diff --git a/depedencies/include/glm/gtx/matrix_interpolation.inl b/depedencies/include/glm/gtx/matrix_interpolation.inl deleted file mode 100644 index 8645f96..0000000 --- a/depedencies/include/glm/gtx/matrix_interpolation.inl +++ /dev/null @@ -1,134 +0,0 @@ -/// @ref gtx_matrix_interpolation -/// @file glm/gtx/matrix_interpolation.hpp - -namespace glm -{ - template <typename T, precision P> - GLM_FUNC_QUALIFIER void axisAngle - ( - tmat4x4<T, P> const & mat, - tvec3<T, P> & axis, - T & angle - ) - { - T epsilon = (T)0.01; - T epsilon2 = (T)0.1; - - if((abs(mat[1][0] - mat[0][1]) < epsilon) && (abs(mat[2][0] - mat[0][2]) < epsilon) && (abs(mat[2][1] - mat[1][2]) < epsilon)) - { - if ((abs(mat[1][0] + mat[0][1]) < epsilon2) && (abs(mat[2][0] + mat[0][2]) < epsilon2) && (abs(mat[2][1] + mat[1][2]) < epsilon2) && (abs(mat[0][0] + mat[1][1] + mat[2][2] - (T)3.0) < epsilon2)) - { - angle = (T)0.0; - axis.x = (T)1.0; - axis.y = (T)0.0; - axis.z = (T)0.0; - return; - } - angle = static_cast<T>(3.1415926535897932384626433832795); - T xx = (mat[0][0] + (T)1.0) / (T)2.0; - T yy = (mat[1][1] + (T)1.0) / (T)2.0; - T zz = (mat[2][2] + (T)1.0) / (T)2.0; - T xy = (mat[1][0] + mat[0][1]) / (T)4.0; - T xz = (mat[2][0] + mat[0][2]) / (T)4.0; - T yz = (mat[2][1] + mat[1][2]) / (T)4.0; - if((xx > yy) && (xx > zz)) - { - if (xx < epsilon) { - axis.x = (T)0.0; - axis.y = (T)0.7071; - axis.z = (T)0.7071; - } else { - axis.x = sqrt(xx); - axis.y = xy / axis.x; - axis.z = xz / axis.x; - } - } - else if (yy > zz) - { - if (yy < epsilon) { - axis.x = (T)0.7071; - axis.y = (T)0.0; - axis.z = (T)0.7071; - } else { - axis.y = sqrt(yy); - axis.x = xy / axis.y; - axis.z = yz / axis.y; - } - } - else - { - if (zz < epsilon) { - axis.x = (T)0.7071; - axis.y = (T)0.7071; - axis.z = (T)0.0; - } else { - axis.z = sqrt(zz); - axis.x = xz / axis.z; - axis.y = yz / axis.z; - } - } - return; - } - T s = sqrt((mat[2][1] - mat[1][2]) * (mat[2][1] - mat[1][2]) + (mat[2][0] - mat[0][2]) * (mat[2][0] - mat[0][2]) + (mat[1][0] - mat[0][1]) * (mat[1][0] - mat[0][1])); - if (glm::abs(s) < T(0.001)) - s = (T)1.0; - angle = acos((mat[0][0] + mat[1][1] + mat[2][2] - (T)1.0) / (T)2.0); - axis.x = (mat[1][2] - mat[2][1]) / s; - axis.y = (mat[2][0] - mat[0][2]) / s; - axis.z = (mat[0][1] - mat[1][0]) / s; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> axisAngleMatrix - ( - tvec3<T, P> const & axis, - T const angle - ) - { - T c = cos(angle); - T s = sin(angle); - T t = static_cast<T>(1) - c; - tvec3<T, P> n = normalize(axis); - - return tmat4x4<T, P>( - t * n.x * n.x + c, t * n.x * n.y + n.z * s, t * n.x * n.z - n.y * s, T(0), - t * n.x * n.y - n.z * s, t * n.y * n.y + c, t * n.y * n.z + n.x * s, T(0), - t * n.x * n.z + n.y * s, t * n.y * n.z - n.x * s, t * n.z * n.z + c, T(0), - T(0), T(0), T(0), T(1) - ); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> extractMatrixRotation - ( - tmat4x4<T, P> const & mat - ) - { - return tmat4x4<T, P>( - mat[0][0], mat[0][1], mat[0][2], 0.0, - mat[1][0], mat[1][1], mat[1][2], 0.0, - mat[2][0], mat[2][1], mat[2][2], 0.0, - 0.0, 0.0, 0.0, 1.0 - ); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> interpolate - ( - tmat4x4<T, P> const & m1, - tmat4x4<T, P> const & m2, - T const delta - ) - { - tmat4x4<T, P> m1rot = extractMatrixRotation(m1); - tmat4x4<T, P> dltRotation = m2 * transpose(m1rot); - tvec3<T, P> dltAxis; - T dltAngle; - axisAngle(dltRotation, dltAxis, dltAngle); - tmat4x4<T, P> out = axisAngleMatrix(dltAxis, dltAngle * delta) * m1rot; - out[3][0] = m1[3][0] + delta * (m2[3][0] - m1[3][0]); - out[3][1] = m1[3][1] + delta * (m2[3][1] - m1[3][1]); - out[3][2] = m1[3][2] + delta * (m2[3][2] - m1[3][2]); - return out; - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/matrix_major_storage.hpp b/depedencies/include/glm/gtx/matrix_major_storage.hpp deleted file mode 100644 index 9402abe..0000000 --- a/depedencies/include/glm/gtx/matrix_major_storage.hpp +++ /dev/null @@ -1,115 +0,0 @@ -/// @ref gtx_matrix_major_storage -/// @file glm/gtx/matrix_major_storage.hpp -/// -/// @see core (dependence) -/// @see gtx_extented_min_max (dependence) -/// -/// @defgroup gtx_matrix_major_storage GLM_GTX_matrix_major_storage -/// @ingroup gtx -/// -/// @brief Build matrices with specific matrix order, row or column -/// -/// <glm/gtx/matrix_major_storage.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_matrix_major_storage extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_matrix_major_storage - /// @{ - - //! Build a row major matrix from row vectors. - //! From GLM_GTX_matrix_major_storage extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat2x2<T, P> rowMajor2( - tvec2<T, P> const & v1, - tvec2<T, P> const & v2); - - //! Build a row major matrix from other matrix. - //! From GLM_GTX_matrix_major_storage extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat2x2<T, P> rowMajor2( - tmat2x2<T, P> const & m); - - //! Build a row major matrix from row vectors. - //! From GLM_GTX_matrix_major_storage extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat3x3<T, P> rowMajor3( - tvec3<T, P> const & v1, - tvec3<T, P> const & v2, - tvec3<T, P> const & v3); - - //! Build a row major matrix from other matrix. - //! From GLM_GTX_matrix_major_storage extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat3x3<T, P> rowMajor3( - tmat3x3<T, P> const & m); - - //! Build a row major matrix from row vectors. - //! From GLM_GTX_matrix_major_storage extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat4x4<T, P> rowMajor4( - tvec4<T, P> const & v1, - tvec4<T, P> const & v2, - tvec4<T, P> const & v3, - tvec4<T, P> const & v4); - - //! Build a row major matrix from other matrix. - //! From GLM_GTX_matrix_major_storage extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat4x4<T, P> rowMajor4( - tmat4x4<T, P> const & m); - - //! Build a column major matrix from column vectors. - //! From GLM_GTX_matrix_major_storage extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat2x2<T, P> colMajor2( - tvec2<T, P> const & v1, - tvec2<T, P> const & v2); - - //! Build a column major matrix from other matrix. - //! From GLM_GTX_matrix_major_storage extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat2x2<T, P> colMajor2( - tmat2x2<T, P> const & m); - - //! Build a column major matrix from column vectors. - //! From GLM_GTX_matrix_major_storage extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat3x3<T, P> colMajor3( - tvec3<T, P> const & v1, - tvec3<T, P> const & v2, - tvec3<T, P> const & v3); - - //! Build a column major matrix from other matrix. - //! From GLM_GTX_matrix_major_storage extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat3x3<T, P> colMajor3( - tmat3x3<T, P> const & m); - - //! Build a column major matrix from column vectors. - //! From GLM_GTX_matrix_major_storage extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat4x4<T, P> colMajor4( - tvec4<T, P> const & v1, - tvec4<T, P> const & v2, - tvec4<T, P> const & v3, - tvec4<T, P> const & v4); - - //! Build a column major matrix from other matrix. - //! From GLM_GTX_matrix_major_storage extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat4x4<T, P> colMajor4( - tmat4x4<T, P> const & m); - - /// @} -}//namespace glm - -#include "matrix_major_storage.inl" diff --git a/depedencies/include/glm/gtx/matrix_major_storage.inl b/depedencies/include/glm/gtx/matrix_major_storage.inl deleted file mode 100644 index 7097739..0000000 --- a/depedencies/include/glm/gtx/matrix_major_storage.inl +++ /dev/null @@ -1,167 +0,0 @@ -/// @ref gtx_matrix_major_storage -/// @file glm/gtx/matrix_major_storage.hpp - -namespace glm -{ - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat2x2<T, P> rowMajor2 - ( - tvec2<T, P> const & v1, - tvec2<T, P> const & v2 - ) - { - tmat2x2<T, P> Result; - Result[0][0] = v1.x; - Result[1][0] = v1.y; - Result[0][1] = v2.x; - Result[1][1] = v2.y; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat2x2<T, P> rowMajor2( - const tmat2x2<T, P>& m) - { - tmat2x2<T, P> Result; - Result[0][0] = m[0][0]; - Result[0][1] = m[1][0]; - Result[1][0] = m[0][1]; - Result[1][1] = m[1][1]; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> rowMajor3( - const tvec3<T, P>& v1, - const tvec3<T, P>& v2, - const tvec3<T, P>& v3) - { - tmat3x3<T, P> Result; - Result[0][0] = v1.x; - Result[1][0] = v1.y; - Result[2][0] = v1.z; - Result[0][1] = v2.x; - Result[1][1] = v2.y; - Result[2][1] = v2.z; - Result[0][2] = v3.x; - Result[1][2] = v3.y; - Result[2][2] = v3.z; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> rowMajor3( - const tmat3x3<T, P>& m) - { - tmat3x3<T, P> Result; - Result[0][0] = m[0][0]; - Result[0][1] = m[1][0]; - Result[0][2] = m[2][0]; - Result[1][0] = m[0][1]; - Result[1][1] = m[1][1]; - Result[1][2] = m[2][1]; - Result[2][0] = m[0][2]; - Result[2][1] = m[1][2]; - Result[2][2] = m[2][2]; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> rowMajor4( - const tvec4<T, P>& v1, - const tvec4<T, P>& v2, - const tvec4<T, P>& v3, - const tvec4<T, P>& v4) - { - tmat4x4<T, P> Result; - Result[0][0] = v1.x; - Result[1][0] = v1.y; - Result[2][0] = v1.z; - Result[3][0] = v1.w; - Result[0][1] = v2.x; - Result[1][1] = v2.y; - Result[2][1] = v2.z; - Result[3][1] = v2.w; - Result[0][2] = v3.x; - Result[1][2] = v3.y; - Result[2][2] = v3.z; - Result[3][2] = v3.w; - Result[0][3] = v4.x; - Result[1][3] = v4.y; - Result[2][3] = v4.z; - Result[3][3] = v4.w; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> rowMajor4( - const tmat4x4<T, P>& m) - { - tmat4x4<T, P> Result; - Result[0][0] = m[0][0]; - Result[0][1] = m[1][0]; - Result[0][2] = m[2][0]; - Result[0][3] = m[3][0]; - Result[1][0] = m[0][1]; - Result[1][1] = m[1][1]; - Result[1][2] = m[2][1]; - Result[1][3] = m[3][1]; - Result[2][0] = m[0][2]; - Result[2][1] = m[1][2]; - Result[2][2] = m[2][2]; - Result[2][3] = m[3][2]; - Result[3][0] = m[0][3]; - Result[3][1] = m[1][3]; - Result[3][2] = m[2][3]; - Result[3][3] = m[3][3]; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat2x2<T, P> colMajor2( - const tvec2<T, P>& v1, - const tvec2<T, P>& v2) - { - return tmat2x2<T, P>(v1, v2); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat2x2<T, P> colMajor2( - const tmat2x2<T, P>& m) - { - return tmat2x2<T, P>(m); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> colMajor3( - const tvec3<T, P>& v1, - const tvec3<T, P>& v2, - const tvec3<T, P>& v3) - { - return tmat3x3<T, P>(v1, v2, v3); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> colMajor3( - const tmat3x3<T, P>& m) - { - return tmat3x3<T, P>(m); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> colMajor4( - const tvec4<T, P>& v1, - const tvec4<T, P>& v2, - const tvec4<T, P>& v3, - const tvec4<T, P>& v4) - { - return tmat4x4<T, P>(v1, v2, v3, v4); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> colMajor4( - const tmat4x4<T, P>& m) - { - return tmat4x4<T, P>(m); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/matrix_operation.hpp b/depedencies/include/glm/gtx/matrix_operation.hpp deleted file mode 100644 index 3192ae5..0000000 --- a/depedencies/include/glm/gtx/matrix_operation.hpp +++ /dev/null @@ -1,84 +0,0 @@ -/// @ref gtx_matrix_operation -/// @file glm/gtx/matrix_operation.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_matrix_operation GLM_GTX_matrix_operation -/// @ingroup gtx -/// -/// @brief Build diagonal matrices from vectors. -/// -/// <glm/gtx/matrix_operation.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_matrix_operation extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_matrix_operation - /// @{ - - //! Build a diagonal matrix. - //! From GLM_GTX_matrix_operation extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat2x2<T, P> diagonal2x2( - tvec2<T, P> const & v); - - //! Build a diagonal matrix. - //! From GLM_GTX_matrix_operation extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat2x3<T, P> diagonal2x3( - tvec2<T, P> const & v); - - //! Build a diagonal matrix. - //! From GLM_GTX_matrix_operation extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat2x4<T, P> diagonal2x4( - tvec2<T, P> const & v); - - //! Build a diagonal matrix. - //! From GLM_GTX_matrix_operation extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat3x2<T, P> diagonal3x2( - tvec2<T, P> const & v); - - //! Build a diagonal matrix. - //! From GLM_GTX_matrix_operation extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat3x3<T, P> diagonal3x3( - tvec3<T, P> const & v); - - //! Build a diagonal matrix. - //! From GLM_GTX_matrix_operation extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat3x4<T, P> diagonal3x4( - tvec3<T, P> const & v); - - //! Build a diagonal matrix. - //! From GLM_GTX_matrix_operation extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat4x2<T, P> diagonal4x2( - tvec2<T, P> const & v); - - //! Build a diagonal matrix. - //! From GLM_GTX_matrix_operation extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat4x3<T, P> diagonal4x3( - tvec3<T, P> const & v); - - //! Build a diagonal matrix. - //! From GLM_GTX_matrix_operation extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat4x4<T, P> diagonal4x4( - tvec4<T, P> const & v); - - /// @} -}//namespace glm - -#include "matrix_operation.inl" diff --git a/depedencies/include/glm/gtx/matrix_operation.inl b/depedencies/include/glm/gtx/matrix_operation.inl deleted file mode 100644 index 1553215..0000000 --- a/depedencies/include/glm/gtx/matrix_operation.inl +++ /dev/null @@ -1,118 +0,0 @@ -/// @ref gtx_matrix_operation -/// @file glm/gtx/matrix_operation.inl - -namespace glm -{ - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat2x2<T, P> diagonal2x2 - ( - tvec2<T, P> const & v - ) - { - tmat2x2<T, P> Result(static_cast<T>(1)); - Result[0][0] = v[0]; - Result[1][1] = v[1]; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat2x3<T, P> diagonal2x3 - ( - tvec2<T, P> const & v - ) - { - tmat2x3<T, P> Result(static_cast<T>(1)); - Result[0][0] = v[0]; - Result[1][1] = v[1]; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat2x4<T, P> diagonal2x4 - ( - tvec2<T, P> const & v - ) - { - tmat2x4<T, P> Result(static_cast<T>(1)); - Result[0][0] = v[0]; - Result[1][1] = v[1]; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x2<T, P> diagonal3x2 - ( - tvec2<T, P> const & v - ) - { - tmat3x2<T, P> Result(static_cast<T>(1)); - Result[0][0] = v[0]; - Result[1][1] = v[1]; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> diagonal3x3 - ( - tvec3<T, P> const & v - ) - { - tmat3x3<T, P> Result(static_cast<T>(1)); - Result[0][0] = v[0]; - Result[1][1] = v[1]; - Result[2][2] = v[2]; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x4<T, P> diagonal3x4 - ( - tvec3<T, P> const & v - ) - { - tmat3x4<T, P> Result(static_cast<T>(1)); - Result[0][0] = v[0]; - Result[1][1] = v[1]; - Result[2][2] = v[2]; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> diagonal4x4 - ( - tvec4<T, P> const & v - ) - { - tmat4x4<T, P> Result(static_cast<T>(1)); - Result[0][0] = v[0]; - Result[1][1] = v[1]; - Result[2][2] = v[2]; - Result[3][3] = v[3]; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x3<T, P> diagonal4x3 - ( - tvec3<T, P> const & v - ) - { - tmat4x3<T, P> Result(static_cast<T>(1)); - Result[0][0] = v[0]; - Result[1][1] = v[1]; - Result[2][2] = v[2]; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x2<T, P> diagonal4x2 - ( - tvec2<T, P> const & v - ) - { - tmat4x2<T, P> Result(static_cast<T>(1)); - Result[0][0] = v[0]; - Result[1][1] = v[1]; - return Result; - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/matrix_query.hpp b/depedencies/include/glm/gtx/matrix_query.hpp deleted file mode 100644 index 2518274..0000000 --- a/depedencies/include/glm/gtx/matrix_query.hpp +++ /dev/null @@ -1,73 +0,0 @@ -/// @ref gtx_matrix_query -/// @file glm/gtx/matrix_query.hpp -/// -/// @see core (dependence) -/// @see gtx_vector_query (dependence) -/// -/// @defgroup gtx_matrix_query GLM_GTX_matrix_query -/// @ingroup gtx -/// -/// @brief Query to evaluate matrix properties -/// -/// <glm/gtx/matrix_query.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" -#include "../gtx/vector_query.hpp" -#include <limits> - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_matrix_query extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_matrix_query - /// @{ - - /// Return whether a matrix a null matrix. - /// From GLM_GTX_matrix_query extension. - template<typename T, precision P> - GLM_FUNC_DECL bool isNull(tmat2x2<T, P> const & m, T const & epsilon); - - /// Return whether a matrix a null matrix. - /// From GLM_GTX_matrix_query extension. - template<typename T, precision P> - GLM_FUNC_DECL bool isNull(tmat3x3<T, P> const & m, T const & epsilon); - - /// Return whether a matrix is a null matrix. - /// From GLM_GTX_matrix_query extension. - template<typename T, precision P> - GLM_FUNC_DECL bool isNull(tmat4x4<T, P> const & m, T const & epsilon); - - /// Return whether a matrix is an identity matrix. - /// From GLM_GTX_matrix_query extension. - template<typename T, precision P, template <typename, precision> class matType> - GLM_FUNC_DECL bool isIdentity(matType<T, P> const & m, T const & epsilon); - - /// Return whether a matrix is a normalized matrix. - /// From GLM_GTX_matrix_query extension. - template<typename T, precision P> - GLM_FUNC_DECL bool isNormalized(tmat2x2<T, P> const & m, T const & epsilon); - - /// Return whether a matrix is a normalized matrix. - /// From GLM_GTX_matrix_query extension. - template<typename T, precision P> - GLM_FUNC_DECL bool isNormalized(tmat3x3<T, P> const & m, T const & epsilon); - - /// Return whether a matrix is a normalized matrix. - /// From GLM_GTX_matrix_query extension. - template<typename T, precision P> - GLM_FUNC_DECL bool isNormalized(tmat4x4<T, P> const & m, T const & epsilon); - - /// Return whether a matrix is an orthonormalized matrix. - /// From GLM_GTX_matrix_query extension. - template<typename T, precision P, template <typename, precision> class matType> - GLM_FUNC_DECL bool isOrthogonal(matType<T, P> const & m, T const & epsilon); - - /// @} -}//namespace glm - -#include "matrix_query.inl" diff --git a/depedencies/include/glm/gtx/matrix_query.inl b/depedencies/include/glm/gtx/matrix_query.inl deleted file mode 100644 index 491b774..0000000 --- a/depedencies/include/glm/gtx/matrix_query.inl +++ /dev/null @@ -1,114 +0,0 @@ -/// @ref gtx_matrix_query -/// @file glm/gtx/matrix_query.inl - -namespace glm -{ - template<typename T, precision P> - GLM_FUNC_QUALIFIER bool isNull(tmat2x2<T, P> const & m, T const & epsilon) - { - bool result = true; - for(length_t i = 0; result && i < m.length() ; ++i) - result = isNull(m[i], epsilon); - return result; - } - - template<typename T, precision P> - GLM_FUNC_QUALIFIER bool isNull(tmat3x3<T, P> const & m, T const & epsilon) - { - bool result = true; - for(length_t i = 0; result && i < m.length() ; ++i) - result = isNull(m[i], epsilon); - return result; - } - - template<typename T, precision P> - GLM_FUNC_QUALIFIER bool isNull(tmat4x4<T, P> const & m, T const & epsilon) - { - bool result = true; - for(length_t i = 0; result && i < m.length() ; ++i) - result = isNull(m[i], epsilon); - return result; - } - - template<typename T, precision P, template <typename, precision> class matType> - GLM_FUNC_QUALIFIER bool isIdentity(matType<T, P> const & m, T const & epsilon) - { - bool result = true; - for(length_t i = 0; result && i < m[0].length() ; ++i) - { - for(length_t j = 0; result && j < i ; ++j) - result = abs(m[i][j]) <= epsilon; - if(result) - result = abs(m[i][i] - 1) <= epsilon; - for(length_t j = i + 1; result && j < m.length(); ++j) - result = abs(m[i][j]) <= epsilon; - } - return result; - } - - template<typename T, precision P> - GLM_FUNC_QUALIFIER bool isNormalized(tmat2x2<T, P> const & m, T const & epsilon) - { - bool result(true); - for(length_t i = 0; result && i < m.length(); ++i) - result = isNormalized(m[i], epsilon); - for(length_t i = 0; result && i < m.length(); ++i) - { - typename tmat2x2<T, P>::col_type v; - for(length_t j = 0; j < m.length(); ++j) - v[j] = m[j][i]; - result = isNormalized(v, epsilon); - } - return result; - } - - template<typename T, precision P> - GLM_FUNC_QUALIFIER bool isNormalized(tmat3x3<T, P> const & m, T const & epsilon) - { - bool result(true); - for(length_t i = 0; result && i < m.length(); ++i) - result = isNormalized(m[i], epsilon); - for(length_t i = 0; result && i < m.length(); ++i) - { - typename tmat3x3<T, P>::col_type v; - for(length_t j = 0; j < m.length(); ++j) - v[j] = m[j][i]; - result = isNormalized(v, epsilon); - } - return result; - } - - template<typename T, precision P> - GLM_FUNC_QUALIFIER bool isNormalized(tmat4x4<T, P> const & m, T const & epsilon) - { - bool result(true); - for(length_t i = 0; result && i < m.length(); ++i) - result = isNormalized(m[i], epsilon); - for(length_t i = 0; result && i < m.length(); ++i) - { - typename tmat4x4<T, P>::col_type v; - for(length_t j = 0; j < m.length(); ++j) - v[j] = m[j][i]; - result = isNormalized(v, epsilon); - } - return result; - } - - template<typename T, precision P, template <typename, precision> class matType> - GLM_FUNC_QUALIFIER bool isOrthogonal(matType<T, P> const & m, T const & epsilon) - { - bool result(true); - for(length_t i(0); result && i < m.length() - 1; ++i) - for(length_t j(i + 1); result && j < m.length(); ++j) - result = areOrthogonal(m[i], m[j], epsilon); - - if(result) - { - matType<T, P> tmp = transpose(m); - for(length_t i(0); result && i < m.length() - 1 ; ++i) - for(length_t j(i + 1); result && j < m.length(); ++j) - result = areOrthogonal(tmp[i], tmp[j], epsilon); - } - return result; - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/matrix_transform_2d.hpp b/depedencies/include/glm/gtx/matrix_transform_2d.hpp deleted file mode 100644 index 91f4834..0000000 --- a/depedencies/include/glm/gtx/matrix_transform_2d.hpp +++ /dev/null @@ -1,78 +0,0 @@ -/// @ref gtx_matrix_transform_2d -/// @file glm/gtx/matrix_transform_2d.hpp -/// @author Miguel Ángel Pérez Martínez -/// -/// @see core (dependence) -/// -/// @defgroup gtx_matrix_transform_2d GLM_GTX_matrix_transform_2d -/// @ingroup gtx -/// -/// @brief Defines functions that generate common 2d transformation matrices. -/// -/// <glm/gtx/matrix_transform_2d.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../mat3x3.hpp" -#include "../vec2.hpp" - - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_matrix_transform_2d extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_matrix_transform_2d - /// @{ - - /// Builds a translation 3 * 3 matrix created from a vector of 2 components. - /// - /// @param m Input matrix multiplied by this translation matrix. - /// @param v Coordinates of a translation vector. - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> translate( - tmat3x3<T, P> const & m, - tvec2<T, P> const & v); - - /// Builds a rotation 3 * 3 matrix created from an angle. - /// - /// @param m Input matrix multiplied by this translation matrix. - /// @param angle Rotation angle expressed in radians if GLM_FORCE_RADIANS is defined or degrees otherwise. - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> rotate( - tmat3x3<T, P> const & m, - T angle); - - /// Builds a scale 3 * 3 matrix created from a vector of 2 components. - /// - /// @param m Input matrix multiplied by this translation matrix. - /// @param v Coordinates of a scale vector. - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> scale( - tmat3x3<T, P> const & m, - tvec2<T, P> const & v); - - /// Builds an horizontal (parallel to the x axis) shear 3 * 3 matrix. - /// - /// @param m Input matrix multiplied by this translation matrix. - /// @param y Shear factor. - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> shearX( - tmat3x3<T, P> const & m, - T y); - - /// Builds a vertical (parallel to the y axis) shear 3 * 3 matrix. - /// - /// @param m Input matrix multiplied by this translation matrix. - /// @param x Shear factor. - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> shearY( - tmat3x3<T, P> const & m, - T x); - - /// @} -}//namespace glm - -#include "matrix_transform_2d.inl" diff --git a/depedencies/include/glm/gtx/matrix_transform_2d.inl b/depedencies/include/glm/gtx/matrix_transform_2d.inl deleted file mode 100644 index bea5670..0000000 --- a/depedencies/include/glm/gtx/matrix_transform_2d.inl +++ /dev/null @@ -1,69 +0,0 @@ -/// @ref gtx_matrix_transform_2d -/// @file glm/gtc/matrix_transform_2d.inl -/// @author Miguel Ángel Pérez Martínez - -#include "../trigonometric.hpp" - -namespace glm -{ - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> translate( - tmat3x3<T, P> const & m, - tvec2<T, P> const & v) - { - tmat3x3<T, P> Result(m); - Result[2] = m[0] * v[0] + m[1] * v[1] + m[2]; - return Result; - } - - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> rotate( - tmat3x3<T, P> const & m, - T angle) - { - T const a = angle; - T const c = cos(a); - T const s = sin(a); - - tmat3x3<T, P> Result(uninitialize); - Result[0] = m[0] * c + m[1] * s; - Result[1] = m[0] * -s + m[1] * c; - Result[2] = m[2]; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> scale( - tmat3x3<T, P> const & m, - tvec2<T, P> const & v) - { - tmat3x3<T, P> Result(uninitialize); - Result[0] = m[0] * v[0]; - Result[1] = m[1] * v[1]; - Result[2] = m[2]; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> shearX( - tmat3x3<T, P> const & m, - T y) - { - tmat3x3<T, P> Result(1); - Result[0][1] = y; - return m * Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> shearY( - tmat3x3<T, P> const & m, - T x) - { - tmat3x3<T, P> Result(1); - Result[1][0] = x; - return m * Result; - } - -}//namespace glm diff --git a/depedencies/include/glm/gtx/mixed_product.hpp b/depedencies/include/glm/gtx/mixed_product.hpp deleted file mode 100644 index 65861f7..0000000 --- a/depedencies/include/glm/gtx/mixed_product.hpp +++ /dev/null @@ -1,37 +0,0 @@ -/// @ref gtx_mixed_product -/// @file glm/gtx/mixed_product.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_mixed_product GLM_GTX_mixed_producte -/// @ingroup gtx -/// -/// @brief Mixed product of 3 vectors. -/// -/// <glm/gtx/mixed_product.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_mixed_product extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_mixed_product - /// @{ - - /// @brief Mixed product of 3 vectors (from GLM_GTX_mixed_product extension) - template <typename T, precision P> - GLM_FUNC_DECL T mixedProduct( - tvec3<T, P> const & v1, - tvec3<T, P> const & v2, - tvec3<T, P> const & v3); - - /// @} -}// namespace glm - -#include "mixed_product.inl" diff --git a/depedencies/include/glm/gtx/mixed_product.inl b/depedencies/include/glm/gtx/mixed_product.inl deleted file mode 100644 index a6ede59..0000000 --- a/depedencies/include/glm/gtx/mixed_product.inl +++ /dev/null @@ -1,16 +0,0 @@ -/// @ref gtx_mixed_product -/// @file glm/gtx/mixed_product.inl - -namespace glm -{ - template <typename T, precision P> - GLM_FUNC_QUALIFIER T mixedProduct - ( - tvec3<T, P> const & v1, - tvec3<T, P> const & v2, - tvec3<T, P> const & v3 - ) - { - return dot(cross(v1, v2), v3); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/norm.hpp b/depedencies/include/glm/gtx/norm.hpp deleted file mode 100644 index b3cb528..0000000 --- a/depedencies/include/glm/gtx/norm.hpp +++ /dev/null @@ -1,86 +0,0 @@ -/// @ref gtx_norm -/// @file glm/gtx/norm.hpp -/// -/// @see core (dependence) -/// @see gtx_quaternion (dependence) -/// -/// @defgroup gtx_norm GLM_GTX_norm -/// @ingroup gtx -/// -/// @brief Various ways to compute vector norms. -/// -/// <glm/gtx/norm.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../detail/func_geometric.hpp" -#include "../gtx/quaternion.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_norm extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_norm - /// @{ - - /// Returns the squared length of x. - /// From GLM_GTX_norm extension. - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL T length2( - vecType<T, P> const & x); - - /// Returns the squared distance between p0 and p1, i.e., length2(p0 - p1). - /// From GLM_GTX_norm extension. - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL T distance2( - vecType<T, P> const & p0, - vecType<T, P> const & p1); - - //! Returns the L1 norm between x and y. - //! From GLM_GTX_norm extension. - template <typename T, precision P> - GLM_FUNC_DECL T l1Norm( - tvec3<T, P> const & x, - tvec3<T, P> const & y); - - //! Returns the L1 norm of v. - //! From GLM_GTX_norm extension. - template <typename T, precision P> - GLM_FUNC_DECL T l1Norm( - tvec3<T, P> const & v); - - //! Returns the L2 norm between x and y. - //! From GLM_GTX_norm extension. - template <typename T, precision P> - GLM_FUNC_DECL T l2Norm( - tvec3<T, P> const & x, - tvec3<T, P> const & y); - - //! Returns the L2 norm of v. - //! From GLM_GTX_norm extension. - template <typename T, precision P> - GLM_FUNC_DECL T l2Norm( - tvec3<T, P> const & x); - - //! Returns the L norm between x and y. - //! From GLM_GTX_norm extension. - template <typename T, precision P> - GLM_FUNC_DECL T lxNorm( - tvec3<T, P> const & x, - tvec3<T, P> const & y, - unsigned int Depth); - - //! Returns the L norm of v. - //! From GLM_GTX_norm extension. - template <typename T, precision P> - GLM_FUNC_DECL T lxNorm( - tvec3<T, P> const & x, - unsigned int Depth); - - /// @} -}//namespace glm - -#include "norm.inl" diff --git a/depedencies/include/glm/gtx/norm.inl b/depedencies/include/glm/gtx/norm.inl deleted file mode 100644 index 20954ec..0000000 --- a/depedencies/include/glm/gtx/norm.inl +++ /dev/null @@ -1,106 +0,0 @@ -/// @ref gtx_norm -/// @file glm/gtx/norm.inl - -#include "../detail/precision.hpp" - -namespace glm{ -namespace detail -{ - template <template <typename, precision> class vecType, typename T, precision P, bool Aligned> - struct compute_length2 - { - GLM_FUNC_QUALIFIER static T call(vecType<T, P> const & v) - { - return dot(v, v); - } - }; -}//namespace detail - - template <typename genType> - GLM_FUNC_QUALIFIER genType length2(genType x) - { - GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'length2' accepts only floating-point inputs"); - return x * x; - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER T length2(vecType<T, P> const & v) - { - GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'length2' accepts only floating-point inputs"); - return detail::compute_length2<vecType, T, P, detail::is_aligned<P>::value>::call(v); - } - - template <typename T> - GLM_FUNC_QUALIFIER T distance2(T p0, T p1) - { - GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'distance2' accepts only floating-point inputs"); - return length2(p1 - p0); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER T distance2(vecType<T, P> const & p0, vecType<T, P> const & p1) - { - GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'distance2' accepts only floating-point inputs"); - return length2(p1 - p0); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER T l1Norm - ( - tvec3<T, P> const & a, - tvec3<T, P> const & b - ) - { - return abs(b.x - a.x) + abs(b.y - a.y) + abs(b.z - a.z); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER T l1Norm - ( - tvec3<T, P> const & v - ) - { - return abs(v.x) + abs(v.y) + abs(v.z); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER T l2Norm - ( - tvec3<T, P> const & a, - tvec3<T, P> const & b - ) - { - return length(b - a); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER T l2Norm - ( - tvec3<T, P> const & v - ) - { - return length(v); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER T lxNorm - ( - tvec3<T, P> const & x, - tvec3<T, P> const & y, - unsigned int Depth - ) - { - return pow(pow(y.x - x.x, T(Depth)) + pow(y.y - x.y, T(Depth)) + pow(y.z - x.z, T(Depth)), T(1) / T(Depth)); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER T lxNorm - ( - tvec3<T, P> const & v, - unsigned int Depth - ) - { - return pow(pow(v.x, T(Depth)) + pow(v.y, T(Depth)) + pow(v.z, T(Depth)), T(1) / T(Depth)); - } - -}//namespace glm diff --git a/depedencies/include/glm/gtx/normal.hpp b/depedencies/include/glm/gtx/normal.hpp deleted file mode 100644 index 2e0044e..0000000 --- a/depedencies/include/glm/gtx/normal.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/// @ref gtx_normal -/// @file glm/gtx/normal.hpp -/// -/// @see core (dependence) -/// @see gtx_extented_min_max (dependence) -/// -/// @defgroup gtx_normal GLM_GTX_normal -/// @ingroup gtx -/// -/// @brief Compute the normal of a triangle. -/// -/// <glm/gtx/normal.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_normal extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_normal - /// @{ - - //! Computes triangle normal from triangle points. - //! From GLM_GTX_normal extension. - template <typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> triangleNormal( - tvec3<T, P> const & p1, - tvec3<T, P> const & p2, - tvec3<T, P> const & p3); - - /// @} -}//namespace glm - -#include "normal.inl" diff --git a/depedencies/include/glm/gtx/normal.inl b/depedencies/include/glm/gtx/normal.inl deleted file mode 100644 index e442317..0000000 --- a/depedencies/include/glm/gtx/normal.inl +++ /dev/null @@ -1,16 +0,0 @@ -/// @ref gtx_normal -/// @file glm/gtx/normal.inl - -namespace glm -{ - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> triangleNormal - ( - tvec3<T, P> const & p1, - tvec3<T, P> const & p2, - tvec3<T, P> const & p3 - ) - { - return normalize(cross(p1 - p2, p1 - p3)); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/normalize_dot.hpp b/depedencies/include/glm/gtx/normalize_dot.hpp deleted file mode 100644 index de650d3..0000000 --- a/depedencies/include/glm/gtx/normalize_dot.hpp +++ /dev/null @@ -1,45 +0,0 @@ -/// @ref gtx_normalize_dot -/// @file glm/gtx/normalize_dot.hpp -/// -/// @see core (dependence) -/// @see gtx_fast_square_root (dependence) -/// -/// @defgroup gtx_normalize_dot GLM_GTX_normalize_dot -/// @ingroup gtx -/// -/// @brief Dot product of vectors that need to be normalize with a single square root. -/// -/// <glm/gtx/normalized_dot.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../gtx/fast_square_root.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_normalize_dot extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_normalize_dot - /// @{ - - /// Normalize parameters and returns the dot product of x and y. - /// It's faster that dot(normalize(x), normalize(y)). - /// - /// @see gtx_normalize_dot extension. - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL T normalizeDot(vecType<T, P> const & x, vecType<T, P> const & y); - - /// Normalize parameters and returns the dot product of x and y. - /// Faster that dot(fastNormalize(x), fastNormalize(y)). - /// - /// @see gtx_normalize_dot extension. - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL T fastNormalizeDot(vecType<T, P> const & x, vecType<T, P> const & y); - - /// @} -}//namespace glm - -#include "normalize_dot.inl" diff --git a/depedencies/include/glm/gtx/normalize_dot.inl b/depedencies/include/glm/gtx/normalize_dot.inl deleted file mode 100644 index 0d01ffe..0000000 --- a/depedencies/include/glm/gtx/normalize_dot.inl +++ /dev/null @@ -1,17 +0,0 @@ -/// @ref gtx_normalize_dot -/// @file glm/gtx/normalize_dot.inl - -namespace glm -{ - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER T normalizeDot(vecType<T, P> const & x, vecType<T, P> const & y) - { - return glm::dot(x, y) * glm::inversesqrt(glm::dot(x, x) * glm::dot(y, y)); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER T fastNormalizeDot(vecType<T, P> const & x, vecType<T, P> const & y) - { - return glm::dot(x, y) * glm::fastInverseSqrt(glm::dot(x, x) * glm::dot(y, y)); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/number_precision.hpp b/depedencies/include/glm/gtx/number_precision.hpp deleted file mode 100644 index 736d035..0000000 --- a/depedencies/include/glm/gtx/number_precision.hpp +++ /dev/null @@ -1,57 +0,0 @@ -/// @ref gtx_number_precision -/// @file glm/gtx/number_precision.hpp -/// -/// @see core (dependence) -/// @see gtc_type_precision (dependence) -/// @see gtc_quaternion (dependence) -/// -/// @defgroup gtx_number_precision GLM_GTX_number_precision -/// @ingroup gtx -/// -/// @brief Defined size types. -/// -/// <glm/gtx/number_precision.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" -#include "../gtc/type_precision.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_number_precision extension included") -#endif - -namespace glm{ -namespace gtx -{ - ///////////////////////////// - // Unsigned int vector types - - /// @addtogroup gtx_number_precision - /// @{ - - typedef u8 u8vec1; //!< \brief 8bit unsigned integer scalar. (from GLM_GTX_number_precision extension) - typedef u16 u16vec1; //!< \brief 16bit unsigned integer scalar. (from GLM_GTX_number_precision extension) - typedef u32 u32vec1; //!< \brief 32bit unsigned integer scalar. (from GLM_GTX_number_precision extension) - typedef u64 u64vec1; //!< \brief 64bit unsigned integer scalar. (from GLM_GTX_number_precision extension) - - ////////////////////// - // Float vector types - - typedef f32 f32vec1; //!< \brief Single-precision floating-point scalar. (from GLM_GTX_number_precision extension) - typedef f64 f64vec1; //!< \brief Single-precision floating-point scalar. (from GLM_GTX_number_precision extension) - - ////////////////////// - // Float matrix types - - typedef f32 f32mat1; //!< \brief Single-precision floating-point scalar. (from GLM_GTX_number_precision extension) - typedef f32 f32mat1x1; //!< \brief Single-precision floating-point scalar. (from GLM_GTX_number_precision extension) - typedef f64 f64mat1; //!< \brief Double-precision floating-point scalar. (from GLM_GTX_number_precision extension) - typedef f64 f64mat1x1; //!< \brief Double-precision floating-point scalar. (from GLM_GTX_number_precision extension) - - /// @} -}//namespace gtx -}//namespace glm - -#include "number_precision.inl" diff --git a/depedencies/include/glm/gtx/number_precision.inl b/depedencies/include/glm/gtx/number_precision.inl deleted file mode 100644 index b54cf66..0000000 --- a/depedencies/include/glm/gtx/number_precision.inl +++ /dev/null @@ -1,7 +0,0 @@ -/// @ref gtx_number_precision -/// @file glm/gtx/number_precision.inl - -namespace glm -{ - -} diff --git a/depedencies/include/glm/gtx/optimum_pow.hpp b/depedencies/include/glm/gtx/optimum_pow.hpp deleted file mode 100644 index e9510c4..0000000 --- a/depedencies/include/glm/gtx/optimum_pow.hpp +++ /dev/null @@ -1,50 +0,0 @@ -/// @ref gtx_optimum_pow -/// @file glm/gtx/optimum_pow.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_optimum_pow GLM_GTX_optimum_pow -/// @ingroup gtx -/// -/// @brief Integer exponentiation of power functions. -/// -/// <glm/gtx/optimum_pow.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_optimum_pow extension included") -#endif - -namespace glm{ -namespace gtx -{ - /// @addtogroup gtx_optimum_pow - /// @{ - - /// Returns x raised to the power of 2. - /// - /// @see gtx_optimum_pow - template <typename genType> - GLM_FUNC_DECL genType pow2(genType const & x); - - /// Returns x raised to the power of 3. - /// - /// @see gtx_optimum_pow - template <typename genType> - GLM_FUNC_DECL genType pow3(genType const & x); - - /// Returns x raised to the power of 4. - /// - /// @see gtx_optimum_pow - template <typename genType> - GLM_FUNC_DECL genType pow4(genType const & x); - - /// @} -}//namespace gtx -}//namespace glm - -#include "optimum_pow.inl" diff --git a/depedencies/include/glm/gtx/optimum_pow.inl b/depedencies/include/glm/gtx/optimum_pow.inl deleted file mode 100644 index 2216a74..0000000 --- a/depedencies/include/glm/gtx/optimum_pow.inl +++ /dev/null @@ -1,23 +0,0 @@ -/// @ref gtx_optimum_pow -/// @file glm/gtx/optimum_pow.inl - -namespace glm -{ - template <typename genType> - GLM_FUNC_QUALIFIER genType pow2(genType const & x) - { - return x * x; - } - - template <typename genType> - GLM_FUNC_QUALIFIER genType pow3(genType const & x) - { - return x * x * x; - } - - template <typename genType> - GLM_FUNC_QUALIFIER genType pow4(genType const & x) - { - return (x * x) * (x * x); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/orthonormalize.hpp b/depedencies/include/glm/gtx/orthonormalize.hpp deleted file mode 100644 index 4bea449..0000000 --- a/depedencies/include/glm/gtx/orthonormalize.hpp +++ /dev/null @@ -1,45 +0,0 @@ -/// @ref gtx_orthonormalize -/// @file glm/gtx/orthonormalize.hpp -/// -/// @see core (dependence) -/// @see gtx_extented_min_max (dependence) -/// -/// @defgroup gtx_orthonormalize GLM_GTX_orthonormalize -/// @ingroup gtx -/// -/// @brief Orthonormalize matrices. -/// -/// <glm/gtx/orthonormalize.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../vec3.hpp" -#include "../mat3x3.hpp" -#include "../geometric.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_orthonormalize extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_orthonormalize - /// @{ - - /// Returns the orthonormalized matrix of m. - /// - /// @see gtx_orthonormalize - template <typename T, precision P> - GLM_FUNC_DECL tmat3x3<T, P> orthonormalize(tmat3x3<T, P> const & m); - - /// Orthonormalizes x according y. - /// - /// @see gtx_orthonormalize - template <typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> orthonormalize(tvec3<T, P> const & x, tvec3<T, P> const & y); - - /// @} -}//namespace glm - -#include "orthonormalize.inl" diff --git a/depedencies/include/glm/gtx/orthonormalize.inl b/depedencies/include/glm/gtx/orthonormalize.inl deleted file mode 100644 index 4796384..0000000 --- a/depedencies/include/glm/gtx/orthonormalize.inl +++ /dev/null @@ -1,30 +0,0 @@ -/// @ref gtx_orthonormalize -/// @file glm/gtx/orthonormalize.inl - -namespace glm -{ - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> orthonormalize(tmat3x3<T, P> const & m) - { - tmat3x3<T, P> r = m; - - r[0] = normalize(r[0]); - - T d0 = dot(r[0], r[1]); - r[1] -= r[0] * d0; - r[1] = normalize(r[1]); - - T d1 = dot(r[1], r[2]); - d0 = dot(r[0], r[2]); - r[2] -= r[0] * d0 + r[1] * d1; - r[2] = normalize(r[2]); - - return r; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> orthonormalize(tvec3<T, P> const & x, tvec3<T, P> const & y) - { - return normalize(x - y * dot(y, x)); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/perpendicular.hpp b/depedencies/include/glm/gtx/perpendicular.hpp deleted file mode 100644 index 8b6260a..0000000 --- a/depedencies/include/glm/gtx/perpendicular.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/// @ref gtx_perpendicular -/// @file glm/gtx/perpendicular.hpp -/// -/// @see core (dependence) -/// @see gtx_projection (dependence) -/// -/// @defgroup gtx_perpendicular GLM_GTX_perpendicular -/// @ingroup gtx -/// -/// @brief Perpendicular of a vector from other one -/// -/// <glm/gtx/perpendicular.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" -#include "../gtx/projection.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_perpendicular extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_perpendicular - /// @{ - - //! Projects x a perpendicular axis of Normal. - //! From GLM_GTX_perpendicular extension. - template <typename vecType> - GLM_FUNC_DECL vecType perp( - vecType const & x, - vecType const & Normal); - - /// @} -}//namespace glm - -#include "perpendicular.inl" diff --git a/depedencies/include/glm/gtx/perpendicular.inl b/depedencies/include/glm/gtx/perpendicular.inl deleted file mode 100644 index 08a7a81..0000000 --- a/depedencies/include/glm/gtx/perpendicular.inl +++ /dev/null @@ -1,15 +0,0 @@ -/// @ref gtx_perpendicular -/// @file glm/gtx/perpendicular.inl - -namespace glm -{ - template <typename vecType> - GLM_FUNC_QUALIFIER vecType perp - ( - vecType const & x, - vecType const & Normal - ) - { - return x - proj(x, Normal); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/polar_coordinates.hpp b/depedencies/include/glm/gtx/polar_coordinates.hpp deleted file mode 100644 index c647c0f..0000000 --- a/depedencies/include/glm/gtx/polar_coordinates.hpp +++ /dev/null @@ -1,44 +0,0 @@ -/// @ref gtx_polar_coordinates -/// @file glm/gtx/polar_coordinates.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_polar_coordinates GLM_GTX_polar_coordinates -/// @ingroup gtx -/// -/// @brief Conversion from Euclidean space to polar space and revert. -/// -/// <glm/gtx/polar_coordinates.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_polar_coordinates extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_polar_coordinates - /// @{ - - /// Convert Euclidean to Polar coordinates, x is the xz distance, y, the latitude and z the longitude. - /// - /// @see gtx_polar_coordinates - template <typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> polar( - tvec3<T, P> const & euclidean); - - /// Convert Polar to Euclidean coordinates. - /// - /// @see gtx_polar_coordinates - template <typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> euclidean( - tvec2<T, P> const & polar); - - /// @} -}//namespace glm - -#include "polar_coordinates.inl" diff --git a/depedencies/include/glm/gtx/polar_coordinates.inl b/depedencies/include/glm/gtx/polar_coordinates.inl deleted file mode 100644 index afc9d2b..0000000 --- a/depedencies/include/glm/gtx/polar_coordinates.inl +++ /dev/null @@ -1,37 +0,0 @@ -/// @ref gtx_polar_coordinates -/// @file glm/gtx/polar_coordinates.inl - -namespace glm -{ - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> polar - ( - tvec3<T, P> const & euclidean - ) - { - T const Length(length(euclidean)); - tvec3<T, P> const tmp(euclidean / Length); - T const xz_dist(sqrt(tmp.x * tmp.x + tmp.z * tmp.z)); - - return tvec3<T, P>( - asin(tmp.y), // latitude - atan(tmp.x, tmp.z), // longitude - xz_dist); // xz distance - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> euclidean - ( - tvec2<T, P> const & polar - ) - { - T const latitude(polar.x); - T const longitude(polar.y); - - return tvec3<T, P>( - cos(latitude) * sin(longitude), - sin(latitude), - cos(latitude) * cos(longitude)); - } - -}//namespace glm diff --git a/depedencies/include/glm/gtx/projection.hpp b/depedencies/include/glm/gtx/projection.hpp deleted file mode 100644 index fcddae8..0000000 --- a/depedencies/include/glm/gtx/projection.hpp +++ /dev/null @@ -1,36 +0,0 @@ -/// @ref gtx_projection -/// @file glm/gtx/projection.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_projection GLM_GTX_projection -/// @ingroup gtx -/// -/// @brief Projection of a vector to other one -/// -/// <glm/gtx/projection.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../geometric.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_projection extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_projection - /// @{ - - /// Projects x on Normal. - /// - /// @see gtx_projection - template <typename vecType> - GLM_FUNC_DECL vecType proj(vecType const & x, vecType const & Normal); - - /// @} -}//namespace glm - -#include "projection.inl" diff --git a/depedencies/include/glm/gtx/projection.inl b/depedencies/include/glm/gtx/projection.inl deleted file mode 100644 index d21fe83..0000000 --- a/depedencies/include/glm/gtx/projection.inl +++ /dev/null @@ -1,11 +0,0 @@ -/// @ref gtx_projection -/// @file glm/gtx/projection.inl - -namespace glm -{ - template <typename vecType> - GLM_FUNC_QUALIFIER vecType proj(vecType const & x, vecType const & Normal) - { - return glm::dot(x, Normal) / glm::dot(Normal, Normal) * Normal; - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/quaternion.hpp b/depedencies/include/glm/gtx/quaternion.hpp deleted file mode 100644 index 674d7e7..0000000 --- a/depedencies/include/glm/gtx/quaternion.hpp +++ /dev/null @@ -1,185 +0,0 @@ -/// @ref gtx_quaternion -/// @file glm/gtx/quaternion.hpp -/// -/// @see core (dependence) -/// @see gtx_extented_min_max (dependence) -/// -/// @defgroup gtx_quaternion GLM_GTX_quaternion -/// @ingroup gtx -/// -/// @brief Extented quaternion types and functions -/// -/// <glm/gtx/quaternion.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" -#include "../gtc/constants.hpp" -#include "../gtc/quaternion.hpp" -#include "../gtx/norm.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_quaternion extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_quaternion - /// @{ - - /// Compute a cross product between a quaternion and a vector. - /// - /// @see gtx_quaternion - template<typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> cross( - tquat<T, P> const & q, - tvec3<T, P> const & v); - - //! Compute a cross product between a vector and a quaternion. - /// - /// @see gtx_quaternion - template<typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> cross( - tvec3<T, P> const & v, - tquat<T, P> const & q); - - //! Compute a point on a path according squad equation. - //! q1 and q2 are control points; s1 and s2 are intermediate control points. - /// - /// @see gtx_quaternion - template<typename T, precision P> - GLM_FUNC_DECL tquat<T, P> squad( - tquat<T, P> const & q1, - tquat<T, P> const & q2, - tquat<T, P> const & s1, - tquat<T, P> const & s2, - T const & h); - - //! Returns an intermediate control point for squad interpolation. - /// - /// @see gtx_quaternion - template<typename T, precision P> - GLM_FUNC_DECL tquat<T, P> intermediate( - tquat<T, P> const & prev, - tquat<T, P> const & curr, - tquat<T, P> const & next); - - //! Returns a exp of a quaternion. - /// - /// @see gtx_quaternion - template<typename T, precision P> - GLM_FUNC_DECL tquat<T, P> exp( - tquat<T, P> const & q); - - //! Returns a log of a quaternion. - /// - /// @see gtx_quaternion - template<typename T, precision P> - GLM_FUNC_DECL tquat<T, P> log( - tquat<T, P> const & q); - - /// Returns x raised to the y power. - /// - /// @see gtx_quaternion - template<typename T, precision P> - GLM_FUNC_DECL tquat<T, P> pow( - tquat<T, P> const & x, - T const & y); - - //! Returns quarternion square root. - /// - /// @see gtx_quaternion - //template<typename T, precision P> - //tquat<T, P> sqrt( - // tquat<T, P> const & q); - - //! Rotates a 3 components vector by a quaternion. - /// - /// @see gtx_quaternion - template<typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> rotate( - tquat<T, P> const & q, - tvec3<T, P> const & v); - - /// Rotates a 4 components vector by a quaternion. - /// - /// @see gtx_quaternion - template<typename T, precision P> - GLM_FUNC_DECL tvec4<T, P> rotate( - tquat<T, P> const & q, - tvec4<T, P> const & v); - - /// Extract the real component of a quaternion. - /// - /// @see gtx_quaternion - template<typename T, precision P> - GLM_FUNC_DECL T extractRealComponent( - tquat<T, P> const & q); - - /// Converts a quaternion to a 3 * 3 matrix. - /// - /// @see gtx_quaternion - template<typename T, precision P> - GLM_FUNC_DECL tmat3x3<T, P> toMat3( - tquat<T, P> const & x){return mat3_cast(x);} - - /// Converts a quaternion to a 4 * 4 matrix. - /// - /// @see gtx_quaternion - template<typename T, precision P> - GLM_FUNC_DECL tmat4x4<T, P> toMat4( - tquat<T, P> const & x){return mat4_cast(x);} - - /// Converts a 3 * 3 matrix to a quaternion. - /// - /// @see gtx_quaternion - template<typename T, precision P> - GLM_FUNC_DECL tquat<T, P> toQuat( - tmat3x3<T, P> const & x){return quat_cast(x);} - - /// Converts a 4 * 4 matrix to a quaternion. - /// - /// @see gtx_quaternion - template<typename T, precision P> - GLM_FUNC_DECL tquat<T, P> toQuat( - tmat4x4<T, P> const & x){return quat_cast(x);} - - /// Quaternion interpolation using the rotation short path. - /// - /// @see gtx_quaternion - template<typename T, precision P> - GLM_FUNC_DECL tquat<T, P> shortMix( - tquat<T, P> const & x, - tquat<T, P> const & y, - T const & a); - - /// Quaternion normalized linear interpolation. - /// - /// @see gtx_quaternion - template<typename T, precision P> - GLM_FUNC_DECL tquat<T, P> fastMix( - tquat<T, P> const & x, - tquat<T, P> const & y, - T const & a); - - /// Compute the rotation between two vectors. - /// param orig vector, needs to be normalized - /// param dest vector, needs to be normalized - /// - /// @see gtx_quaternion - template<typename T, precision P> - GLM_FUNC_DECL tquat<T, P> rotation( - tvec3<T, P> const & orig, - tvec3<T, P> const & dest); - - /// Returns the squared length of x. - /// - /// @see gtx_quaternion - template<typename T, precision P> - GLM_FUNC_DECL T length2(tquat<T, P> const & q); - - /// @} -}//namespace glm - -#include "quaternion.inl" diff --git a/depedencies/include/glm/gtx/quaternion.inl b/depedencies/include/glm/gtx/quaternion.inl deleted file mode 100644 index c86ec18..0000000 --- a/depedencies/include/glm/gtx/quaternion.inl +++ /dev/null @@ -1,212 +0,0 @@ -/// @ref gtx_quaternion -/// @file glm/gtx/quaternion.inl - -#include <limits> -#include "../gtc/constants.hpp" - -namespace glm -{ - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> cross(tvec3<T, P> const& v, tquat<T, P> const& q) - { - return inverse(q) * v; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> cross(tquat<T, P> const& q, tvec3<T, P> const& v) - { - return q * v; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tquat<T, P> squad - ( - tquat<T, P> const & q1, - tquat<T, P> const & q2, - tquat<T, P> const & s1, - tquat<T, P> const & s2, - T const & h) - { - return mix(mix(q1, q2, h), mix(s1, s2, h), static_cast<T>(2) * (static_cast<T>(1) - h) * h); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tquat<T, P> intermediate - ( - tquat<T, P> const & prev, - tquat<T, P> const & curr, - tquat<T, P> const & next - ) - { - tquat<T, P> invQuat = inverse(curr); - return exp((log(next + invQuat) + log(prev + invQuat)) / static_cast<T>(-4)) * curr; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tquat<T, P> exp(tquat<T, P> const& q) - { - tvec3<T, P> u(q.x, q.y, q.z); - T const Angle = glm::length(u); - if (Angle < epsilon<T>()) - return tquat<T, P>(); - - tvec3<T, P> const v(u / Angle); - return tquat<T, P>(cos(Angle), sin(Angle) * v); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tquat<T, P> log(tquat<T, P> const& q) - { - tvec3<T, P> u(q.x, q.y, q.z); - T Vec3Len = length(u); - - if (Vec3Len < epsilon<T>()) - { - if(q.w > static_cast<T>(0)) - return tquat<T, P>(log(q.w), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0)); - else if(q.w < static_cast<T>(0)) - return tquat<T, P>(log(-q.w), pi<T>(), static_cast<T>(0), static_cast<T>(0)); - else - return tquat<T, P>(std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity()); - } - else - { - T t = atan(Vec3Len, T(q.w)) / Vec3Len; - T QuatLen2 = Vec3Len * Vec3Len + q.w * q.w; - return tquat<T, P>(static_cast<T>(0.5) * log(QuatLen2), t * q.x, t * q.y, t * q.z); - } - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tquat<T, P> pow(tquat<T, P> const & x, T const & y) - { - //Raising to the power of 0 should yield 1 - //Needed to prevent a division by 0 error later on - if(y > -epsilon<T>() && y < epsilon<T>()) - return tquat<T, P>(1,0,0,0); - - //To deal with non-unit quaternions - T magnitude = sqrt(x.x * x.x + x.y * x.y + x.z * x.z + x.w *x.w); - - //Equivalent to raising a real number to a power - //Needed to prevent a division by 0 error later on - if(abs(x.w / magnitude) > static_cast<T>(1) - epsilon<T>() && abs(x.w / magnitude) < static_cast<T>(1) + epsilon<T>()) - return tquat<T, P>(pow(x.w, y),0,0,0); - - T Angle = acos(x.w / magnitude); - T NewAngle = Angle * y; - T Div = sin(NewAngle) / sin(Angle); - T Mag = pow(magnitude, y - static_cast<T>(1)); - - return tquat<T, P>(cos(NewAngle) * magnitude * Mag, x.x * Div * Mag, x.y * Div * Mag, x.z * Div * Mag); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> rotate(tquat<T, P> const& q, tvec3<T, P> const& v) - { - return q * v; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec4<T, P> rotate(tquat<T, P> const& q, tvec4<T, P> const& v) - { - return q * v; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER T extractRealComponent(tquat<T, P> const& q) - { - T w = static_cast<T>(1) - q.x * q.x - q.y * q.y - q.z * q.z; - if(w < T(0)) - return T(0); - else - return -sqrt(w); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER T length2(tquat<T, P> const& q) - { - return q.x * q.x + q.y * q.y + q.z * q.z + q.w * q.w; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tquat<T, P> shortMix(tquat<T, P> const& x, tquat<T, P> const& y, T const& a) - { - if(a <= static_cast<T>(0)) return x; - if(a >= static_cast<T>(1)) return y; - - T fCos = dot(x, y); - tquat<T, P> y2(y); //BUG!!! tquat<T> y2; - if(fCos < static_cast<T>(0)) - { - y2 = -y; - fCos = -fCos; - } - - //if(fCos > 1.0f) // problem - T k0, k1; - if(fCos > (static_cast<T>(1) - epsilon<T>())) - { - k0 = static_cast<T>(1) - a; - k1 = static_cast<T>(0) + a; //BUG!!! 1.0f + a; - } - else - { - T fSin = sqrt(T(1) - fCos * fCos); - T fAngle = atan(fSin, fCos); - T fOneOverSin = static_cast<T>(1) / fSin; - k0 = sin((static_cast<T>(1) - a) * fAngle) * fOneOverSin; - k1 = sin((static_cast<T>(0) + a) * fAngle) * fOneOverSin; - } - - return tquat<T, P>( - k0 * x.w + k1 * y2.w, - k0 * x.x + k1 * y2.x, - k0 * x.y + k1 * y2.y, - k0 * x.z + k1 * y2.z); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tquat<T, P> fastMix(tquat<T, P> const& x, tquat<T, P> const& y, T const & a) - { - return glm::normalize(x * (static_cast<T>(1) - a) + (y * a)); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tquat<T, P> rotation(tvec3<T, P> const& orig, tvec3<T, P> const& dest) - { - T cosTheta = dot(orig, dest); - tvec3<T, P> rotationAxis; - - if(cosTheta >= static_cast<T>(1) - epsilon<T>()) - return quat(); - - if(cosTheta < static_cast<T>(-1) + epsilon<T>()) - { - // special case when vectors in opposite directions : - // there is no "ideal" rotation axis - // So guess one; any will do as long as it's perpendicular to start - // This implementation favors a rotation around the Up axis (Y), - // since it's often what you want to do. - rotationAxis = cross(tvec3<T, P>(0, 0, 1), orig); - if(length2(rotationAxis) < epsilon<T>()) // bad luck, they were parallel, try again! - rotationAxis = cross(tvec3<T, P>(1, 0, 0), orig); - - rotationAxis = normalize(rotationAxis); - return angleAxis(pi<T>(), rotationAxis); - } - - // Implementation from Stan Melax's Game Programming Gems 1 article - rotationAxis = cross(orig, dest); - - T s = sqrt((T(1) + cosTheta) * static_cast<T>(2)); - T invs = static_cast<T>(1) / s; - - return tquat<T, P>( - s * static_cast<T>(0.5f), - rotationAxis.x * invs, - rotationAxis.y * invs, - rotationAxis.z * invs); - } - -}//namespace glm diff --git a/depedencies/include/glm/gtx/range.hpp b/depedencies/include/glm/gtx/range.hpp deleted file mode 100644 index 00d78b4..0000000 --- a/depedencies/include/glm/gtx/range.hpp +++ /dev/null @@ -1,85 +0,0 @@ -/// @ref gtx_range -/// @file glm/gtx/range.hpp -/// @author Joshua Moerman -/// -/// @defgroup gtx_range GLM_GTX_range -/// @ingroup gtx -/// -/// @brief Defines begin and end for vectors and matrices. Useful for range-based for loop. -/// The range is defined over the elements, not over columns or rows (e.g. mat4 has 16 elements). -/// -/// <glm/gtx/range.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependencies -#include "../detail/setup.hpp" - -#if !GLM_HAS_RANGE_FOR -# error "GLM_GTX_range requires C++11 suppport or 'range for'" -#endif - -#include "../gtc/type_ptr.hpp" -#include "../gtc/vec1.hpp" - -namespace glm -{ - /// @addtogroup gtx_range - /// @{ - - template <typename T, precision P> - inline length_t components(tvec1<T, P> const & v) - { - return v.length(); - } - - template <typename T, precision P> - inline length_t components(tvec2<T, P> const & v) - { - return v.length(); - } - - template <typename T, precision P> - inline length_t components(tvec3<T, P> const & v) - { - return v.length(); - } - - template <typename T, precision P> - inline length_t components(tvec4<T, P> const & v) - { - return v.length(); - } - - template <typename genType> - inline length_t components(genType const & m) - { - return m.length() * m[0].length(); - } - - template <typename genType> - inline typename genType::value_type const * begin(genType const & v) - { - return value_ptr(v); - } - - template <typename genType> - inline typename genType::value_type const * end(genType const & v) - { - return begin(v) + components(v); - } - - template <typename genType> - inline typename genType::value_type * begin(genType& v) - { - return value_ptr(v); - } - - template <typename genType> - inline typename genType::value_type * end(genType& v) - { - return begin(v) + components(v); - } - - /// @} -}//namespace glm diff --git a/depedencies/include/glm/gtx/raw_data.hpp b/depedencies/include/glm/gtx/raw_data.hpp deleted file mode 100644 index 2625fd1..0000000 --- a/depedencies/include/glm/gtx/raw_data.hpp +++ /dev/null @@ -1,47 +0,0 @@ -/// @ref gtx_raw_data -/// @file glm/gtx/raw_data.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_raw_data GLM_GTX_raw_data -/// @ingroup gtx -/// -/// @brief Projection of a vector to other one -/// -/// <glm/gtx/raw_data.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependencies -#include "../detail/setup.hpp" -#include "../detail/type_int.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_raw_data extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_raw_data - /// @{ - - //! Type for byte numbers. - //! From GLM_GTX_raw_data extension. - typedef detail::uint8 byte; - - //! Type for word numbers. - //! From GLM_GTX_raw_data extension. - typedef detail::uint16 word; - - //! Type for dword numbers. - //! From GLM_GTX_raw_data extension. - typedef detail::uint32 dword; - - //! Type for qword numbers. - //! From GLM_GTX_raw_data extension. - typedef detail::uint64 qword; - - /// @} -}// namespace glm - -#include "raw_data.inl" diff --git a/depedencies/include/glm/gtx/raw_data.inl b/depedencies/include/glm/gtx/raw_data.inl deleted file mode 100644 index 29af148..0000000 --- a/depedencies/include/glm/gtx/raw_data.inl +++ /dev/null @@ -1,2 +0,0 @@ -/// @ref gtx_raw_data -/// @file glm/gtx/raw_data.inl diff --git a/depedencies/include/glm/gtx/rotate_normalized_axis.hpp b/depedencies/include/glm/gtx/rotate_normalized_axis.hpp deleted file mode 100644 index f1dfa7b..0000000 --- a/depedencies/include/glm/gtx/rotate_normalized_axis.hpp +++ /dev/null @@ -1,64 +0,0 @@ -/// @ref gtx_rotate_normalized_axis -/// @file glm/gtx/rotate_normalized_axis.hpp -/// -/// @see core (dependence) -/// @see gtc_matrix_transform -/// @see gtc_quaternion -/// -/// @defgroup gtx_rotate_normalized_axis GLM_GTX_rotate_normalized_axis -/// @ingroup gtx -/// -/// @brief Quaternions and matrices rotations around normalized axis. -/// -/// <glm/gtx/rotate_normalized_axis.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" -#include "../gtc/epsilon.hpp" -#include "../gtc/quaternion.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_rotate_normalized_axis extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_rotate_normalized_axis - /// @{ - - /// Builds a rotation 4 * 4 matrix created from a normalized axis and an angle. - /// - /// @param m Input matrix multiplied by this rotation matrix. - /// @param angle Rotation angle expressed in radians if GLM_FORCE_RADIANS is define or degrees otherwise. - /// @param axis Rotation axis, must be normalized. - /// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double. - /// - /// @see gtx_rotate_normalized_axis - /// @see - rotate(T angle, T x, T y, T z) - /// @see - rotate(tmat4x4<T, P> const & m, T angle, T x, T y, T z) - /// @see - rotate(T angle, tvec3<T, P> const & v) - template <typename T, precision P> - GLM_FUNC_DECL tmat4x4<T, P> rotateNormalizedAxis( - tmat4x4<T, P> const & m, - T const & angle, - tvec3<T, P> const & axis); - - /// Rotates a quaternion from a vector of 3 components normalized axis and an angle. - /// - /// @param q Source orientation - /// @param angle Angle expressed in radians if GLM_FORCE_RADIANS is define or degrees otherwise. - /// @param axis Normalized axis of the rotation, must be normalized. - /// - /// @see gtx_rotate_normalized_axis - template <typename T, precision P> - GLM_FUNC_DECL tquat<T, P> rotateNormalizedAxis( - tquat<T, P> const & q, - T const & angle, - tvec3<T, P> const & axis); - - /// @} -}//namespace glm - -#include "rotate_normalized_axis.inl" diff --git a/depedencies/include/glm/gtx/rotate_normalized_axis.inl b/depedencies/include/glm/gtx/rotate_normalized_axis.inl deleted file mode 100644 index dc1b1a8..0000000 --- a/depedencies/include/glm/gtx/rotate_normalized_axis.inl +++ /dev/null @@ -1,59 +0,0 @@ -/// @ref gtx_rotate_normalized_axis -/// @file glm/gtx/rotate_normalized_axis.inl - -namespace glm -{ - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> rotateNormalizedAxis - ( - tmat4x4<T, P> const & m, - T const & angle, - tvec3<T, P> const & v - ) - { - T const a = angle; - T const c = cos(a); - T const s = sin(a); - - tvec3<T, P> const axis(v); - - tvec3<T, P> const temp((static_cast<T>(1) - c) * axis); - - tmat4x4<T, P> Rotate(uninitialize); - Rotate[0][0] = c + temp[0] * axis[0]; - Rotate[0][1] = 0 + temp[0] * axis[1] + s * axis[2]; - Rotate[0][2] = 0 + temp[0] * axis[2] - s * axis[1]; - - Rotate[1][0] = 0 + temp[1] * axis[0] - s * axis[2]; - Rotate[1][1] = c + temp[1] * axis[1]; - Rotate[1][2] = 0 + temp[1] * axis[2] + s * axis[0]; - - Rotate[2][0] = 0 + temp[2] * axis[0] + s * axis[1]; - Rotate[2][1] = 0 + temp[2] * axis[1] - s * axis[0]; - Rotate[2][2] = c + temp[2] * axis[2]; - - tmat4x4<T, P> Result(uninitialize); - Result[0] = m[0] * Rotate[0][0] + m[1] * Rotate[0][1] + m[2] * Rotate[0][2]; - Result[1] = m[0] * Rotate[1][0] + m[1] * Rotate[1][1] + m[2] * Rotate[1][2]; - Result[2] = m[0] * Rotate[2][0] + m[1] * Rotate[2][1] + m[2] * Rotate[2][2]; - Result[3] = m[3]; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tquat<T, P> rotateNormalizedAxis - ( - tquat<T, P> const & q, - T const & angle, - tvec3<T, P> const & v - ) - { - tvec3<T, P> const Tmp(v); - - T const AngleRad(angle); - T const Sin = sin(AngleRad * T(0.5)); - - return q * tquat<T, P>(cos(AngleRad * static_cast<T>(0.5)), Tmp.x * Sin, Tmp.y * Sin, Tmp.z * Sin); - //return gtc::quaternion::cross(q, tquat<T, P>(cos(AngleRad * T(0.5)), Tmp.x * fSin, Tmp.y * fSin, Tmp.z * fSin)); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/rotate_vector.hpp b/depedencies/include/glm/gtx/rotate_vector.hpp deleted file mode 100644 index 91d1784..0000000 --- a/depedencies/include/glm/gtx/rotate_vector.hpp +++ /dev/null @@ -1,117 +0,0 @@ -/// @ref gtx_rotate_vector -/// @file glm/gtx/rotate_vector.hpp -/// -/// @see core (dependence) -/// @see gtx_transform (dependence) -/// -/// @defgroup gtx_rotate_vector GLM_GTX_rotate_vector -/// @ingroup gtx -/// -/// @brief Function to directly rotate a vector -/// -/// <glm/gtx/rotate_vector.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" -#include "../gtx/transform.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_rotate_vector extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_rotate_vector - /// @{ - - /// Returns Spherical interpolation between two vectors - /// - /// @param x A first vector - /// @param y A second vector - /// @param a Interpolation factor. The interpolation is defined beyond the range [0, 1]. - /// - /// @see gtx_rotate_vector - template <typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> slerp( - tvec3<T, P> const & x, - tvec3<T, P> const & y, - T const & a); - - //! Rotate a two dimensional vector. - //! From GLM_GTX_rotate_vector extension. - template <typename T, precision P> - GLM_FUNC_DECL tvec2<T, P> rotate( - tvec2<T, P> const & v, - T const & angle); - - //! Rotate a three dimensional vector around an axis. - //! From GLM_GTX_rotate_vector extension. - template <typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> rotate( - tvec3<T, P> const & v, - T const & angle, - tvec3<T, P> const & normal); - - //! Rotate a four dimensional vector around an axis. - //! From GLM_GTX_rotate_vector extension. - template <typename T, precision P> - GLM_FUNC_DECL tvec4<T, P> rotate( - tvec4<T, P> const & v, - T const & angle, - tvec3<T, P> const & normal); - - //! Rotate a three dimensional vector around the X axis. - //! From GLM_GTX_rotate_vector extension. - template <typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> rotateX( - tvec3<T, P> const & v, - T const & angle); - - //! Rotate a three dimensional vector around the Y axis. - //! From GLM_GTX_rotate_vector extension. - template <typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> rotateY( - tvec3<T, P> const & v, - T const & angle); - - //! Rotate a three dimensional vector around the Z axis. - //! From GLM_GTX_rotate_vector extension. - template <typename T, precision P> - GLM_FUNC_DECL tvec3<T, P> rotateZ( - tvec3<T, P> const & v, - T const & angle); - - //! Rotate a four dimentionnals vector around the X axis. - //! From GLM_GTX_rotate_vector extension. - template <typename T, precision P> - GLM_FUNC_DECL tvec4<T, P> rotateX( - tvec4<T, P> const & v, - T const & angle); - - //! Rotate a four dimensional vector around the X axis. - //! From GLM_GTX_rotate_vector extension. - template <typename T, precision P> - GLM_FUNC_DECL tvec4<T, P> rotateY( - tvec4<T, P> const & v, - T const & angle); - - //! Rotate a four dimensional vector around the X axis. - //! From GLM_GTX_rotate_vector extension. - template <typename T, precision P> - GLM_FUNC_DECL tvec4<T, P> rotateZ( - tvec4<T, P> const & v, - T const & angle); - - //! Build a rotation matrix from a normal and a up vector. - //! From GLM_GTX_rotate_vector extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat4x4<T, P> orientation( - tvec3<T, P> const & Normal, - tvec3<T, P> const & Up); - - /// @} -}//namespace glm - -#include "rotate_vector.inl" diff --git a/depedencies/include/glm/gtx/rotate_vector.inl b/depedencies/include/glm/gtx/rotate_vector.inl deleted file mode 100644 index 5620e96..0000000 --- a/depedencies/include/glm/gtx/rotate_vector.inl +++ /dev/null @@ -1,188 +0,0 @@ -/// @ref gtx_rotate_vector -/// @file glm/gtx/rotate_vector.inl - -namespace glm -{ - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> slerp - ( - tvec3<T, P> const & x, - tvec3<T, P> const & y, - T const & a - ) - { - // get cosine of angle between vectors (-1 -> 1) - T CosAlpha = dot(x, y); - // get angle (0 -> pi) - T Alpha = acos(CosAlpha); - // get sine of angle between vectors (0 -> 1) - T SinAlpha = sin(Alpha); - // this breaks down when SinAlpha = 0, i.e. Alpha = 0 or pi - T t1 = sin((static_cast<T>(1) - a) * Alpha) / SinAlpha; - T t2 = sin(a * Alpha) / SinAlpha; - - // interpolate src vectors - return x * t1 + y * t2; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec2<T, P> rotate - ( - tvec2<T, P> const & v, - T const & angle - ) - { - tvec2<T, P> Result; - T const Cos(cos(angle)); - T const Sin(sin(angle)); - - Result.x = v.x * Cos - v.y * Sin; - Result.y = v.x * Sin + v.y * Cos; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> rotate - ( - tvec3<T, P> const & v, - T const & angle, - tvec3<T, P> const & normal - ) - { - return tmat3x3<T, P>(glm::rotate(angle, normal)) * v; - } - /* - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> rotateGTX( - const tvec3<T, P>& x, - T angle, - const tvec3<T, P>& normal) - { - const T Cos = cos(radians(angle)); - const T Sin = sin(radians(angle)); - return x * Cos + ((x * normal) * (T(1) - Cos)) * normal + cross(x, normal) * Sin; - } - */ - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec4<T, P> rotate - ( - tvec4<T, P> const & v, - T const & angle, - tvec3<T, P> const & normal - ) - { - return rotate(angle, normal) * v; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> rotateX - ( - tvec3<T, P> const & v, - T const & angle - ) - { - tvec3<T, P> Result(v); - T const Cos(cos(angle)); - T const Sin(sin(angle)); - - Result.y = v.y * Cos - v.z * Sin; - Result.z = v.y * Sin + v.z * Cos; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> rotateY - ( - tvec3<T, P> const & v, - T const & angle - ) - { - tvec3<T, P> Result = v; - T const Cos(cos(angle)); - T const Sin(sin(angle)); - - Result.x = v.x * Cos + v.z * Sin; - Result.z = -v.x * Sin + v.z * Cos; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<T, P> rotateZ - ( - tvec3<T, P> const & v, - T const & angle - ) - { - tvec3<T, P> Result = v; - T const Cos(cos(angle)); - T const Sin(sin(angle)); - - Result.x = v.x * Cos - v.y * Sin; - Result.y = v.x * Sin + v.y * Cos; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec4<T, P> rotateX - ( - tvec4<T, P> const & v, - T const & angle - ) - { - tvec4<T, P> Result = v; - T const Cos(cos(angle)); - T const Sin(sin(angle)); - - Result.y = v.y * Cos - v.z * Sin; - Result.z = v.y * Sin + v.z * Cos; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec4<T, P> rotateY - ( - tvec4<T, P> const & v, - T const & angle - ) - { - tvec4<T, P> Result = v; - T const Cos(cos(angle)); - T const Sin(sin(angle)); - - Result.x = v.x * Cos + v.z * Sin; - Result.z = -v.x * Sin + v.z * Cos; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec4<T, P> rotateZ - ( - tvec4<T, P> const & v, - T const & angle - ) - { - tvec4<T, P> Result = v; - T const Cos(cos(angle)); - T const Sin(sin(angle)); - - Result.x = v.x * Cos - v.y * Sin; - Result.y = v.x * Sin + v.y * Cos; - return Result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> orientation - ( - tvec3<T, P> const & Normal, - tvec3<T, P> const & Up - ) - { - if(all(equal(Normal, Up))) - return tmat4x4<T, P>(T(1)); - - tvec3<T, P> RotationAxis = cross(Up, Normal); - T Angle = acos(dot(Normal, Up)); - - return rotate(Angle, RotationAxis); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/scalar_multiplication.hpp b/depedencies/include/glm/gtx/scalar_multiplication.hpp deleted file mode 100644 index 695e841..0000000 --- a/depedencies/include/glm/gtx/scalar_multiplication.hpp +++ /dev/null @@ -1,69 +0,0 @@ -/// @ref gtx -/// @file glm/gtx/scalar_multiplication.hpp -/// @author Joshua Moerman -/// -/// @brief Enables scalar multiplication for all types -/// -/// Since GLSL is very strict about types, the following (often used) combinations do not work: -/// double * vec4 -/// int * vec4 -/// vec4 / int -/// So we'll fix that! Of course "float * vec4" should remain the same (hence the enable_if magic) - -#pragma once - -#include "../detail/setup.hpp" - -#if !GLM_HAS_TEMPLATE_ALIASES && !(GLM_COMPILER & GLM_COMPILER_GCC) -# error "GLM_GTX_scalar_multiplication requires C++11 support or alias templates and if not support for GCC" -#endif - -#include "../vec2.hpp" -#include "../vec3.hpp" -#include "../vec4.hpp" -#include "../mat2x2.hpp" -#include <type_traits> - -namespace glm -{ - template <typename T, typename Vec> - using return_type_scalar_multiplication = typename std::enable_if< - !std::is_same<T, float>::value // T may not be a float - && std::is_arithmetic<T>::value, Vec // But it may be an int or double (no vec3 or mat3, ...) - >::type; - -#define GLM_IMPLEMENT_SCAL_MULT(Vec) \ - template <typename T> \ - return_type_scalar_multiplication<T, Vec> \ - operator*(T const & s, Vec rh){ \ - return rh *= static_cast<float>(s); \ - } \ - \ - template <typename T> \ - return_type_scalar_multiplication<T, Vec> \ - operator*(Vec lh, T const & s){ \ - return lh *= static_cast<float>(s); \ - } \ - \ - template <typename T> \ - return_type_scalar_multiplication<T, Vec> \ - operator/(Vec lh, T const & s){ \ - return lh *= 1.0f / s; \ - } - -GLM_IMPLEMENT_SCAL_MULT(vec2) -GLM_IMPLEMENT_SCAL_MULT(vec3) -GLM_IMPLEMENT_SCAL_MULT(vec4) - -GLM_IMPLEMENT_SCAL_MULT(mat2) -GLM_IMPLEMENT_SCAL_MULT(mat2x3) -GLM_IMPLEMENT_SCAL_MULT(mat2x4) -GLM_IMPLEMENT_SCAL_MULT(mat3x2) -GLM_IMPLEMENT_SCAL_MULT(mat3) -GLM_IMPLEMENT_SCAL_MULT(mat3x4) -GLM_IMPLEMENT_SCAL_MULT(mat4x2) -GLM_IMPLEMENT_SCAL_MULT(mat4x3) -GLM_IMPLEMENT_SCAL_MULT(mat4) - -#undef GLM_IMPLEMENT_SCAL_MULT -} // namespace glm diff --git a/depedencies/include/glm/gtx/scalar_relational.hpp b/depedencies/include/glm/gtx/scalar_relational.hpp deleted file mode 100644 index 9695716..0000000 --- a/depedencies/include/glm/gtx/scalar_relational.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/// @ref gtx_scalar_relational -/// @file glm/gtx/scalar_relational.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_scalar_relational GLM_GTX_scalar_relational -/// @ingroup gtx -/// -/// @brief Extend a position from a source to a position at a defined length. -/// -/// <glm/gtx/scalar_relational.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_extend extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_scalar_relational - /// @{ - - - - /// @} -}//namespace glm - -#include "scalar_relational.inl" diff --git a/depedencies/include/glm/gtx/scalar_relational.inl b/depedencies/include/glm/gtx/scalar_relational.inl deleted file mode 100644 index 709da04..0000000 --- a/depedencies/include/glm/gtx/scalar_relational.inl +++ /dev/null @@ -1,89 +0,0 @@ -/// @ref gtx_scalar_relational -/// @file glm/gtx/scalar_relational.inl - -namespace glm -{ - template <typename T> - GLM_FUNC_QUALIFIER bool lessThan - ( - T const & x, - T const & y - ) - { - return x < y; - } - - template <typename T> - GLM_FUNC_QUALIFIER bool lessThanEqual - ( - T const & x, - T const & y - ) - { - return x <= y; - } - - template <typename T> - GLM_FUNC_QUALIFIER bool greaterThan - ( - T const & x, - T const & y - ) - { - return x > y; - } - - template <typename T> - GLM_FUNC_QUALIFIER bool greaterThanEqual - ( - T const & x, - T const & y - ) - { - return x >= y; - } - - template <typename T> - GLM_FUNC_QUALIFIER bool equal - ( - T const & x, - T const & y - ) - { - return x == y; - } - - template <typename T> - GLM_FUNC_QUALIFIER bool notEqual - ( - T const & x, - T const & y - ) - { - return x != y; - } - - GLM_FUNC_QUALIFIER bool any - ( - bool const & x - ) - { - return x; - } - - GLM_FUNC_QUALIFIER bool all - ( - bool const & x - ) - { - return x; - } - - GLM_FUNC_QUALIFIER bool not_ - ( - bool const & x - ) - { - return !x; - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/simd_mat4.hpp b/depedencies/include/glm/gtx/simd_mat4.hpp deleted file mode 100644 index a68220c..0000000 --- a/depedencies/include/glm/gtx/simd_mat4.hpp +++ /dev/null @@ -1,182 +0,0 @@ -/// @ref gtx_simd_mat4 -/// @file glm/gtx/simd_mat4.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_simd_mat4 GLM_GTX_simd_mat4 -/// @ingroup gtx -/// -/// @brief SIMD implementation of mat4 type. -/// -/// <glm/gtx/simd_mat4.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependencies -#include "../detail/setup.hpp" - -#if(GLM_ARCH != GLM_ARCH_PURE) - -#if(GLM_ARCH & GLM_ARCH_SSE2_BIT) -# include "../detail/intrinsic_matrix.hpp" -# include "../gtx/simd_vec4.hpp" -#else -# error "GLM: GLM_GTX_simd_mat4 requires compiler support of SSE2 through intrinsics" -#endif - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_simd_mat4 extension included") -# pragma message("GLM: GLM_GTX_simd_mat4 extension is deprecated and will be removed in GLM 0.9.9. Use mat4 instead and use compiler SIMD arguments.") -#endif - -namespace glm{ -namespace detail -{ - /// 4x4 Matrix implemented using SIMD SEE intrinsics. - /// \ingroup gtx_simd_mat4 - GLM_ALIGNED_STRUCT(16) fmat4x4SIMD - { - typedef float value_type; - typedef fvec4SIMD col_type; - typedef fvec4SIMD row_type; - typedef std::size_t size_type; - typedef fmat4x4SIMD type; - typedef fmat4x4SIMD transpose_type; - - typedef tmat4x4<float, defaultp> pure_type; - typedef tvec4<float, defaultp> pure_row_type; - typedef tvec4<float, defaultp> pure_col_type; - typedef tmat4x4<float, defaultp> pure_transpose_type; - - GLM_FUNC_DECL length_t length() const; - - fvec4SIMD Data[4]; - - ////////////////////////////////////// - // Constructors - - fmat4x4SIMD() GLM_DEFAULT_CTOR; - explicit fmat4x4SIMD(float const & s); - explicit fmat4x4SIMD( - float const & x0, float const & y0, float const & z0, float const & w0, - float const & x1, float const & y1, float const & z1, float const & w1, - float const & x2, float const & y2, float const & z2, float const & w2, - float const & x3, float const & y3, float const & z3, float const & w3); - explicit fmat4x4SIMD( - fvec4SIMD const & v0, - fvec4SIMD const & v1, - fvec4SIMD const & v2, - fvec4SIMD const & v3); - explicit fmat4x4SIMD( - mat4x4 const & m); - explicit fmat4x4SIMD( - __m128 const in[4]); - - // Conversions - //template <typename U> - //explicit tmat4x4(tmat4x4<U> const & m); - - //explicit tmat4x4(tmat2x2<T> const & x); - //explicit tmat4x4(tmat3x3<T> const & x); - //explicit tmat4x4(tmat2x3<T> const & x); - //explicit tmat4x4(tmat3x2<T> const & x); - //explicit tmat4x4(tmat2x4<T> const & x); - //explicit tmat4x4(tmat4x2<T> const & x); - //explicit tmat4x4(tmat3x4<T> const & x); - //explicit tmat4x4(tmat4x3<T> const & x); - - // Accesses - fvec4SIMD & operator[](length_t i); - fvec4SIMD const & operator[](length_t i) const; - - // Unary updatable operators - fmat4x4SIMD & operator= (fmat4x4SIMD const & m) GLM_DEFAULT; - fmat4x4SIMD & operator+= (float const & s); - fmat4x4SIMD & operator+= (fmat4x4SIMD const & m); - fmat4x4SIMD & operator-= (float const & s); - fmat4x4SIMD & operator-= (fmat4x4SIMD const & m); - fmat4x4SIMD & operator*= (float const & s); - fmat4x4SIMD & operator*= (fmat4x4SIMD const & m); - fmat4x4SIMD & operator/= (float const & s); - fmat4x4SIMD & operator/= (fmat4x4SIMD const & m); - fmat4x4SIMD & operator++ (); - fmat4x4SIMD & operator-- (); - }; - - // Binary operators - fmat4x4SIMD operator+ (fmat4x4SIMD const & m, float const & s); - fmat4x4SIMD operator+ (float const & s, fmat4x4SIMD const & m); - fmat4x4SIMD operator+ (fmat4x4SIMD const & m1, fmat4x4SIMD const & m2); - - fmat4x4SIMD operator- (fmat4x4SIMD const & m, float const & s); - fmat4x4SIMD operator- (float const & s, fmat4x4SIMD const & m); - fmat4x4SIMD operator- (fmat4x4SIMD const & m1, fmat4x4SIMD const & m2); - - fmat4x4SIMD operator* (fmat4x4SIMD const & m, float const & s); - fmat4x4SIMD operator* (float const & s, fmat4x4SIMD const & m); - - fvec4SIMD operator* (fmat4x4SIMD const & m, fvec4SIMD const & v); - fvec4SIMD operator* (fvec4SIMD const & v, fmat4x4SIMD const & m); - - fmat4x4SIMD operator* (fmat4x4SIMD const & m1, fmat4x4SIMD const & m2); - - fmat4x4SIMD operator/ (fmat4x4SIMD const & m, float const & s); - fmat4x4SIMD operator/ (float const & s, fmat4x4SIMD const & m); - - fvec4SIMD operator/ (fmat4x4SIMD const & m, fvec4SIMD const & v); - fvec4SIMD operator/ (fvec4SIMD const & v, fmat4x4SIMD const & m); - - fmat4x4SIMD operator/ (fmat4x4SIMD const & m1, fmat4x4SIMD const & m2); - - // Unary constant operators - fmat4x4SIMD const operator- (fmat4x4SIMD const & m); - fmat4x4SIMD const operator-- (fmat4x4SIMD const & m, int); - fmat4x4SIMD const operator++ (fmat4x4SIMD const & m, int); -}//namespace detail - - typedef detail::fmat4x4SIMD simdMat4; - - /// @addtogroup gtx_simd_mat4 - /// @{ - - //! Convert a simdMat4 to a mat4. - //! (From GLM_GTX_simd_mat4 extension) - mat4 mat4_cast( - detail::fmat4x4SIMD const & x); - - //! Multiply matrix x by matrix y component-wise, i.e., - //! result[i][j] is the scalar product of x[i][j] and y[i][j]. - //! (From GLM_GTX_simd_mat4 extension). - detail::fmat4x4SIMD matrixCompMult( - detail::fmat4x4SIMD const & x, - detail::fmat4x4SIMD const & y); - - //! Treats the first parameter c as a column vector - //! and the second parameter r as a row vector - //! and does a linear algebraic matrix multiply c * r. - //! (From GLM_GTX_simd_mat4 extension). - detail::fmat4x4SIMD outerProduct( - detail::fvec4SIMD const & c, - detail::fvec4SIMD const & r); - - //! Returns the transposed matrix of x - //! (From GLM_GTX_simd_mat4 extension). - detail::fmat4x4SIMD transpose( - detail::fmat4x4SIMD const & x); - - //! Return the determinant of a mat4 matrix. - //! (From GLM_GTX_simd_mat4 extension). - float determinant( - detail::fmat4x4SIMD const & m); - - //! Return the inverse of a mat4 matrix. - //! (From GLM_GTX_simd_mat4 extension). - detail::fmat4x4SIMD inverse( - detail::fmat4x4SIMD const & m); - - /// @} -}// namespace glm - -#include "simd_mat4.inl" - -#endif//(GLM_ARCH != GLM_ARCH_PURE) diff --git a/depedencies/include/glm/gtx/simd_mat4.inl b/depedencies/include/glm/gtx/simd_mat4.inl deleted file mode 100644 index 9643255..0000000 --- a/depedencies/include/glm/gtx/simd_mat4.inl +++ /dev/null @@ -1,577 +0,0 @@ -/// @ref gtx_simd_mat4 -/// @file glm/gtx/simd_mat4.inl - -namespace glm{ -namespace detail{ - -GLM_FUNC_QUALIFIER length_t fmat4x4SIMD::length() const -{ - return 4; -} - -////////////////////////////////////// -// Accesses - -GLM_FUNC_QUALIFIER fvec4SIMD & fmat4x4SIMD::operator[] -( - length_t i -) -{ - assert(i < this->length()); - - return this->Data[i]; -} - -GLM_FUNC_QUALIFIER fvec4SIMD const & fmat4x4SIMD::operator[] -( - length_t i -) const -{ - assert(i < this->length()); - - return this->Data[i]; -} - -////////////////////////////////////////////////////////////// -// Constructors - -#if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) - GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD() - { -# ifndef GLM_FORCE_NO_CTOR_INIT - this->Data[0] = fvec4SIMD(1, 0, 0, 0); - this->Data[1] = fvec4SIMD(0, 1, 0, 0); - this->Data[2] = fvec4SIMD(0, 0, 1, 0); - this->Data[3] = fvec4SIMD(0, 0, 0, 1); -# endif - } -# endif//!GLM_HAS_DEFAULTED_FUNCTIONS - -GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD(float const & s) -{ - this->Data[0] = fvec4SIMD(s, 0, 0, 0); - this->Data[1] = fvec4SIMD(0, s, 0, 0); - this->Data[2] = fvec4SIMD(0, 0, s, 0); - this->Data[3] = fvec4SIMD(0, 0, 0, s); -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD -( - float const & x0, float const & y0, float const & z0, float const & w0, - float const & x1, float const & y1, float const & z1, float const & w1, - float const & x2, float const & y2, float const & z2, float const & w2, - float const & x3, float const & y3, float const & z3, float const & w3 -) -{ - this->Data[0] = fvec4SIMD(x0, y0, z0, w0); - this->Data[1] = fvec4SIMD(x1, y1, z1, w1); - this->Data[2] = fvec4SIMD(x2, y2, z2, w2); - this->Data[3] = fvec4SIMD(x3, y3, z3, w3); -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD -( - fvec4SIMD const & v0, - fvec4SIMD const & v1, - fvec4SIMD const & v2, - fvec4SIMD const & v3 -) -{ - this->Data[0] = v0; - this->Data[1] = v1; - this->Data[2] = v2; - this->Data[3] = v3; -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD -( - mat4 const & m -) -{ - this->Data[0] = fvec4SIMD(m[0]); - this->Data[1] = fvec4SIMD(m[1]); - this->Data[2] = fvec4SIMD(m[2]); - this->Data[3] = fvec4SIMD(m[3]); -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD -( - __m128 const in[4] -) -{ - this->Data[0] = in[0]; - this->Data[1] = in[1]; - this->Data[2] = in[2]; - this->Data[3] = in[3]; -} - -////////////////////////////////////////////////////////////// -// mat4 operators - -#if !GLM_HAS_DEFAULTED_FUNCTIONS - GLM_FUNC_QUALIFIER fmat4x4SIMD& fmat4x4SIMD::operator= - ( - fmat4x4SIMD const & m - ) - { - this->Data[0] = m[0]; - this->Data[1] = m[1]; - this->Data[2] = m[2]; - this->Data[3] = m[3]; - return *this; - } -#endif//!GLM_HAS_DEFAULTED_FUNCTIONS - -GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator+= -( - fmat4x4SIMD const & m -) -{ - this->Data[0].Data = _mm_add_ps(this->Data[0].Data, m[0].Data); - this->Data[1].Data = _mm_add_ps(this->Data[1].Data, m[1].Data); - this->Data[2].Data = _mm_add_ps(this->Data[2].Data, m[2].Data); - this->Data[3].Data = _mm_add_ps(this->Data[3].Data, m[3].Data); - return *this; -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator-= -( - fmat4x4SIMD const & m -) -{ - this->Data[0].Data = _mm_sub_ps(this->Data[0].Data, m[0].Data); - this->Data[1].Data = _mm_sub_ps(this->Data[1].Data, m[1].Data); - this->Data[2].Data = _mm_sub_ps(this->Data[2].Data, m[2].Data); - this->Data[3].Data = _mm_sub_ps(this->Data[3].Data, m[3].Data); - - return *this; -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator*= -( - fmat4x4SIMD const & m -) -{ - sse_mul_ps(&this->Data[0].Data, &m.Data[0].Data, &this->Data[0].Data); - return *this; -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator/= -( - fmat4x4SIMD const & m -) -{ - __m128 Inv[4]; - sse_inverse_ps(&m.Data[0].Data, Inv); - sse_mul_ps(&this->Data[0].Data, Inv, &this->Data[0].Data); - return *this; -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator+= -( - float const & s -) -{ - __m128 Operand = _mm_set_ps1(s); - this->Data[0].Data = _mm_add_ps(this->Data[0].Data, Operand); - this->Data[1].Data = _mm_add_ps(this->Data[1].Data, Operand); - this->Data[2].Data = _mm_add_ps(this->Data[2].Data, Operand); - this->Data[3].Data = _mm_add_ps(this->Data[3].Data, Operand); - return *this; -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator-= -( - float const & s -) -{ - __m128 Operand = _mm_set_ps1(s); - this->Data[0].Data = _mm_sub_ps(this->Data[0].Data, Operand); - this->Data[1].Data = _mm_sub_ps(this->Data[1].Data, Operand); - this->Data[2].Data = _mm_sub_ps(this->Data[2].Data, Operand); - this->Data[3].Data = _mm_sub_ps(this->Data[3].Data, Operand); - return *this; -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator*= -( - float const & s -) -{ - __m128 Operand = _mm_set_ps1(s); - this->Data[0].Data = _mm_mul_ps(this->Data[0].Data, Operand); - this->Data[1].Data = _mm_mul_ps(this->Data[1].Data, Operand); - this->Data[2].Data = _mm_mul_ps(this->Data[2].Data, Operand); - this->Data[3].Data = _mm_mul_ps(this->Data[3].Data, Operand); - return *this; -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator/= -( - float const & s -) -{ - __m128 Operand = _mm_div_ps(one, _mm_set_ps1(s)); - this->Data[0].Data = _mm_mul_ps(this->Data[0].Data, Operand); - this->Data[1].Data = _mm_mul_ps(this->Data[1].Data, Operand); - this->Data[2].Data = _mm_mul_ps(this->Data[2].Data, Operand); - this->Data[3].Data = _mm_mul_ps(this->Data[3].Data, Operand); - return *this; -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator++ () -{ - this->Data[0].Data = _mm_add_ps(this->Data[0].Data, one); - this->Data[1].Data = _mm_add_ps(this->Data[1].Data, one); - this->Data[2].Data = _mm_add_ps(this->Data[2].Data, one); - this->Data[3].Data = _mm_add_ps(this->Data[3].Data, one); - return *this; -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator-- () -{ - this->Data[0].Data = _mm_sub_ps(this->Data[0].Data, one); - this->Data[1].Data = _mm_sub_ps(this->Data[1].Data, one); - this->Data[2].Data = _mm_sub_ps(this->Data[2].Data, one); - this->Data[3].Data = _mm_sub_ps(this->Data[3].Data, one); - return *this; -} - - -////////////////////////////////////////////////////////////// -// Binary operators - -GLM_FUNC_QUALIFIER fmat4x4SIMD operator+ -( - const fmat4x4SIMD &m, - float const & s -) -{ - return detail::fmat4x4SIMD - ( - m[0] + s, - m[1] + s, - m[2] + s, - m[3] + s - ); -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD operator+ -( - float const & s, - const fmat4x4SIMD &m -) -{ - return detail::fmat4x4SIMD - ( - m[0] + s, - m[1] + s, - m[2] + s, - m[3] + s - ); -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD operator+ -( - const fmat4x4SIMD &m1, - const fmat4x4SIMD &m2 -) -{ - return detail::fmat4x4SIMD - ( - m1[0] + m2[0], - m1[1] + m2[1], - m1[2] + m2[2], - m1[3] + m2[3] - ); -} - - -GLM_FUNC_QUALIFIER fmat4x4SIMD operator- -( - const fmat4x4SIMD &m, - float const & s -) -{ - return detail::fmat4x4SIMD - ( - m[0] - s, - m[1] - s, - m[2] - s, - m[3] - s - ); -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD operator- -( - float const & s, - const fmat4x4SIMD &m -) -{ - return detail::fmat4x4SIMD - ( - s - m[0], - s - m[1], - s - m[2], - s - m[3] - ); -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD operator- -( - const fmat4x4SIMD &m1, - const fmat4x4SIMD &m2 -) -{ - return detail::fmat4x4SIMD - ( - m1[0] - m2[0], - m1[1] - m2[1], - m1[2] - m2[2], - m1[3] - m2[3] - ); -} - - -GLM_FUNC_QUALIFIER fmat4x4SIMD operator* -( - const fmat4x4SIMD &m, - float const & s -) -{ - return detail::fmat4x4SIMD - ( - m[0] * s, - m[1] * s, - m[2] * s, - m[3] * s - ); -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD operator* -( - float const & s, - const fmat4x4SIMD &m -) -{ - return detail::fmat4x4SIMD - ( - m[0] * s, - m[1] * s, - m[2] * s, - m[3] * s - ); -} - -GLM_FUNC_QUALIFIER fvec4SIMD operator* -( - const fmat4x4SIMD &m, - fvec4SIMD const & v -) -{ - return sse_mul_ps(&m.Data[0].Data, v.Data); -} - -GLM_FUNC_QUALIFIER fvec4SIMD operator* -( - fvec4SIMD const & v, - const fmat4x4SIMD &m -) -{ - return sse_mul_ps(v.Data, &m.Data[0].Data); -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD operator* -( - const fmat4x4SIMD &m1, - const fmat4x4SIMD &m2 -) -{ - fmat4x4SIMD result; - sse_mul_ps(&m1.Data[0].Data, &m2.Data[0].Data, &result.Data[0].Data); - - return result; -} - - - -GLM_FUNC_QUALIFIER fmat4x4SIMD operator/ -( - const fmat4x4SIMD &m, - float const & s -) -{ - return detail::fmat4x4SIMD - ( - m[0] / s, - m[1] / s, - m[2] / s, - m[3] / s - ); -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD operator/ -( - float const & s, - const fmat4x4SIMD &m -) -{ - return detail::fmat4x4SIMD - ( - s / m[0], - s / m[1], - s / m[2], - s / m[3] - ); -} - -GLM_FUNC_QUALIFIER detail::fmat4x4SIMD inverse(detail::fmat4x4SIMD const & m) -{ - detail::fmat4x4SIMD result; - detail::sse_inverse_ps(&m[0].Data, &result[0].Data); - return result; -} - -GLM_FUNC_QUALIFIER fvec4SIMD operator/ -( - const fmat4x4SIMD & m, - fvec4SIMD const & v -) -{ - return inverse(m) * v; -} - -GLM_FUNC_QUALIFIER fvec4SIMD operator/ -( - fvec4SIMD const & v, - const fmat4x4SIMD &m -) -{ - return v * inverse(m); -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD operator/ -( - const fmat4x4SIMD &m1, - const fmat4x4SIMD &m2 -) -{ - __m128 result[4]; - __m128 inv[4]; - - sse_inverse_ps(&m2.Data[0].Data, inv); - sse_mul_ps(&m1.Data[0].Data, inv, result); - - return fmat4x4SIMD(result); -} - - -////////////////////////////////////////////////////////////// -// Unary constant operators -GLM_FUNC_QUALIFIER fmat4x4SIMD const operator- -( - fmat4x4SIMD const & m -) -{ - return detail::fmat4x4SIMD - ( - -m[0], - -m[1], - -m[2], - -m[3] - ); -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD const operator-- -( - fmat4x4SIMD const & m, - int -) -{ - return detail::fmat4x4SIMD - ( - m[0] - 1.0f, - m[1] - 1.0f, - m[2] - 1.0f, - m[3] - 1.0f - ); -} - -GLM_FUNC_QUALIFIER fmat4x4SIMD const operator++ -( - fmat4x4SIMD const & m, - int -) -{ - return detail::fmat4x4SIMD - ( - m[0] + 1.0f, - m[1] + 1.0f, - m[2] + 1.0f, - m[3] + 1.0f - ); -} - -}//namespace detail - -GLM_FUNC_QUALIFIER mat4 mat4_cast -( - detail::fmat4x4SIMD const & x -) -{ - GLM_ALIGN(16) mat4 Result; - _mm_store_ps(&Result[0][0], x.Data[0].Data); - _mm_store_ps(&Result[1][0], x.Data[1].Data); - _mm_store_ps(&Result[2][0], x.Data[2].Data); - _mm_store_ps(&Result[3][0], x.Data[3].Data); - return Result; -} - -GLM_FUNC_QUALIFIER detail::fmat4x4SIMD matrixCompMult -( - detail::fmat4x4SIMD const & x, - detail::fmat4x4SIMD const & y -) -{ - detail::fmat4x4SIMD result; - result[0] = x[0] * y[0]; - result[1] = x[1] * y[1]; - result[2] = x[2] * y[2]; - result[3] = x[3] * y[3]; - return result; -} - -GLM_FUNC_QUALIFIER detail::fmat4x4SIMD outerProduct -( - detail::fvec4SIMD const & c, - detail::fvec4SIMD const & r -) -{ - __m128 Shu0 = _mm_shuffle_ps(r.Data, r.Data, _MM_SHUFFLE(0, 0, 0, 0)); - __m128 Shu1 = _mm_shuffle_ps(r.Data, r.Data, _MM_SHUFFLE(1, 1, 1, 1)); - __m128 Shu2 = _mm_shuffle_ps(r.Data, r.Data, _MM_SHUFFLE(2, 2, 2, 2)); - __m128 Shu3 = _mm_shuffle_ps(r.Data, r.Data, _MM_SHUFFLE(3, 3, 3, 3)); - - detail::fmat4x4SIMD result(uninitialize); - result[0].Data = _mm_mul_ps(c.Data, Shu0); - result[1].Data = _mm_mul_ps(c.Data, Shu1); - result[2].Data = _mm_mul_ps(c.Data, Shu2); - result[3].Data = _mm_mul_ps(c.Data, Shu3); - return result; -} - -GLM_FUNC_QUALIFIER detail::fmat4x4SIMD transpose(detail::fmat4x4SIMD const & m) -{ - detail::fmat4x4SIMD result; - glm_mat4_transpose(&m[0].Data, &result[0].Data); - return result; -} - -GLM_FUNC_QUALIFIER float determinant(detail::fmat4x4SIMD const & m) -{ - float Result; - _mm_store_ss(&Result, glm_mat4_determinant(&m[0].Data)); - return Result; -} - -}//namespace glm diff --git a/depedencies/include/glm/gtx/simd_quat.hpp b/depedencies/include/glm/gtx/simd_quat.hpp deleted file mode 100644 index b134019..0000000 --- a/depedencies/include/glm/gtx/simd_quat.hpp +++ /dev/null @@ -1,307 +0,0 @@ -/// @ref gtx_simd_quat -/// @file glm/gtx/simd_quat.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_simd_quat GLM_GTX_simd_quat -/// @ingroup gtx -/// -/// @brief SIMD implementation of quat type. -/// -/// <glm/gtx/simd_quat.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" -#include "../gtc/quaternion.hpp" -#include "../gtx/fast_trigonometry.hpp" - -#if GLM_ARCH != GLM_ARCH_PURE - -#if GLM_ARCH & GLM_ARCH_SSE2_BIT -# include "../gtx/simd_mat4.hpp" -#else -# error "GLM: GLM_GTX_simd_quat requires compiler support of SSE2 through intrinsics" -#endif - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_simd_quat extension included") -# pragma message("GLM: GLM_GTX_simd_quat extension is deprecated and will be removed in GLM 0.9.9. Use GLM_GTC_quaternion instead and use compiler SIMD arguments.") -#endif - -// Warning silencer for nameless struct/union. -#if (GLM_COMPILER & GLM_COMPILER_VC) -# pragma warning(push) -# pragma warning(disable:4201) // warning C4201: nonstandard extension used : nameless struct/union -#endif - -namespace glm{ -namespace detail -{ - GLM_ALIGNED_STRUCT(16) fquatSIMD - { - typedef float value_type; - typedef std::size_t size_type; - - typedef fquatSIMD type; - typedef tquat<bool, defaultp> bool_type; - typedef tquat<float, defaultp> pure_type; - -#ifdef GLM_SIMD_ENABLE_XYZW_UNION - union - { - __m128 Data; - struct {float x, y, z, w;}; - }; -#else - __m128 Data; -#endif - - ////////////////////////////////////// - // Implicit basic constructors - - fquatSIMD() GLM_DEFAULT_CTOR; - fquatSIMD(fquatSIMD const & q) GLM_DEFAULT; - fquatSIMD(__m128 const & Data); - - ////////////////////////////////////// - // Explicit basic constructors - - explicit fquatSIMD( - ctor); - explicit fquatSIMD( - float const & w, - float const & x, - float const & y, - float const & z); - explicit fquatSIMD( - quat const & v); - explicit fquatSIMD( - vec3 const & eulerAngles); - - - ////////////////////////////////////// - // Unary arithmetic operators - - fquatSIMD& operator= (fquatSIMD const & q) GLM_DEFAULT; - fquatSIMD& operator*=(float const & s); - fquatSIMD& operator/=(float const & s); - }; - - - ////////////////////////////////////// - // Arithmetic operators - - detail::fquatSIMD operator- ( - detail::fquatSIMD const & q); - - detail::fquatSIMD operator+ ( - detail::fquatSIMD const & q, - detail::fquatSIMD const & p); - - detail::fquatSIMD operator* ( - detail::fquatSIMD const & q, - detail::fquatSIMD const & p); - - detail::fvec4SIMD operator* ( - detail::fquatSIMD const & q, - detail::fvec4SIMD const & v); - - detail::fvec4SIMD operator* ( - detail::fvec4SIMD const & v, - detail::fquatSIMD const & q); - - detail::fquatSIMD operator* ( - detail::fquatSIMD const & q, - float s); - - detail::fquatSIMD operator* ( - float s, - detail::fquatSIMD const & q); - - detail::fquatSIMD operator/ ( - detail::fquatSIMD const & q, - float s); - -}//namespace detail - - /// @addtogroup gtx_simd_quat - /// @{ - - typedef glm::detail::fquatSIMD simdQuat; - - //! Convert a simdQuat to a quat. - /// @see gtx_simd_quat - quat quat_cast( - detail::fquatSIMD const & x); - - //! Convert a simdMat4 to a simdQuat. - /// @see gtx_simd_quat - detail::fquatSIMD quatSIMD_cast( - detail::fmat4x4SIMD const & m); - - //! Converts a mat4 to a simdQuat. - /// @see gtx_simd_quat - template <typename T, precision P> - detail::fquatSIMD quatSIMD_cast( - tmat4x4<T, P> const & m); - - //! Converts a mat3 to a simdQuat. - /// @see gtx_simd_quat - template <typename T, precision P> - detail::fquatSIMD quatSIMD_cast( - tmat3x3<T, P> const & m); - - //! Convert a simdQuat to a simdMat4 - /// @see gtx_simd_quat - detail::fmat4x4SIMD mat4SIMD_cast( - detail::fquatSIMD const & q); - - //! Converts a simdQuat to a standard mat4. - /// @see gtx_simd_quat - mat4 mat4_cast( - detail::fquatSIMD const & q); - - - /// Returns the length of the quaternion. - /// - /// @see gtx_simd_quat - float length( - detail::fquatSIMD const & x); - - /// Returns the normalized quaternion. - /// - /// @see gtx_simd_quat - detail::fquatSIMD normalize( - detail::fquatSIMD const & x); - - /// Returns dot product of q1 and q2, i.e., q1[0] * q2[0] + q1[1] * q2[1] + ... - /// - /// @see gtx_simd_quat - float dot( - detail::fquatSIMD const & q1, - detail::fquatSIMD const & q2); - - /// Spherical linear interpolation of two quaternions. - /// The interpolation is oriented and the rotation is performed at constant speed. - /// For short path spherical linear interpolation, use the slerp function. - /// - /// @param x A quaternion - /// @param y A quaternion - /// @param a Interpolation factor. The interpolation is defined beyond the range [0, 1]. - /// @tparam T Value type used to build the quaternion. Supported: half, float or double. - /// @see gtx_simd_quat - /// @see - slerp(detail::fquatSIMD const & x, detail::fquatSIMD const & y, T const & a) - detail::fquatSIMD mix( - detail::fquatSIMD const & x, - detail::fquatSIMD const & y, - float const & a); - - /// Linear interpolation of two quaternions. - /// The interpolation is oriented. - /// - /// @param x A quaternion - /// @param y A quaternion - /// @param a Interpolation factor. The interpolation is defined in the range [0, 1]. - /// @tparam T Value type used to build the quaternion. Supported: half, float or double. - /// @see gtx_simd_quat - detail::fquatSIMD lerp( - detail::fquatSIMD const & x, - detail::fquatSIMD const & y, - float const & a); - - /// Spherical linear interpolation of two quaternions. - /// The interpolation always take the short path and the rotation is performed at constant speed. - /// - /// @param x A quaternion - /// @param y A quaternion - /// @param a Interpolation factor. The interpolation is defined beyond the range [0, 1]. - /// @tparam T Value type used to build the quaternion. Supported: half, float or double. - /// @see gtx_simd_quat - detail::fquatSIMD slerp( - detail::fquatSIMD const & x, - detail::fquatSIMD const & y, - float const & a); - - - /// Faster spherical linear interpolation of two unit length quaternions. - /// - /// This is the same as mix(), except for two rules: - /// 1) The two quaternions must be unit length. - /// 2) The interpolation factor (a) must be in the range [0, 1]. - /// - /// This will use the equivalent to fastAcos() and fastSin(). - /// - /// @see gtx_simd_quat - /// @see - mix(detail::fquatSIMD const & x, detail::fquatSIMD const & y, T const & a) - detail::fquatSIMD fastMix( - detail::fquatSIMD const & x, - detail::fquatSIMD const & y, - float const & a); - - /// Identical to fastMix() except takes the shortest path. - /// - /// The same rules apply here as those in fastMix(). Both quaternions must be unit length and 'a' must be - /// in the range [0, 1]. - /// - /// @see - fastMix(detail::fquatSIMD const & x, detail::fquatSIMD const & y, T const & a) - /// @see - slerp(detail::fquatSIMD const & x, detail::fquatSIMD const & y, T const & a) - detail::fquatSIMD fastSlerp( - detail::fquatSIMD const & x, - detail::fquatSIMD const & y, - float const & a); - - - /// Returns the q conjugate. - /// - /// @see gtx_simd_quat - detail::fquatSIMD conjugate( - detail::fquatSIMD const & q); - - /// Returns the q inverse. - /// - /// @see gtx_simd_quat - detail::fquatSIMD inverse( - detail::fquatSIMD const & q); - - /// Build a quaternion from an angle and a normalized axis. - /// - /// @param angle Angle expressed in radians. - /// @param axis Axis of the quaternion, must be normalized. - /// - /// @see gtx_simd_quat - detail::fquatSIMD angleAxisSIMD( - float const & angle, - vec3 const & axis); - - /// Build a quaternion from an angle and a normalized axis. - /// - /// @param angle Angle expressed in radians. - /// @param x x component of the x-axis, x, y, z must be a normalized axis - /// @param y y component of the y-axis, x, y, z must be a normalized axis - /// @param z z component of the z-axis, x, y, z must be a normalized axis - /// - /// @see gtx_simd_quat - detail::fquatSIMD angleAxisSIMD( - float const & angle, - float const & x, - float const & y, - float const & z); - - // TODO: Move this to somewhere more appropriate. Used with fastMix() and fastSlerp(). - /// Performs the equivalent of glm::fastSin() on each component of the given __m128. - __m128 fastSin(__m128 x); - - /// @} -}//namespace glm - -#include "simd_quat.inl" - - -#if (GLM_COMPILER & GLM_COMPILER_VC) -# pragma warning(pop) -#endif - - -#endif//(GLM_ARCH != GLM_ARCH_PURE) diff --git a/depedencies/include/glm/gtx/simd_quat.inl b/depedencies/include/glm/gtx/simd_quat.inl deleted file mode 100644 index b84865c..0000000 --- a/depedencies/include/glm/gtx/simd_quat.inl +++ /dev/null @@ -1,620 +0,0 @@ -/// @ref gtx_simd_quat -/// @file glm/gtx/simd_quat.inl - -namespace glm{ -namespace detail{ - - -////////////////////////////////////// -// Debugging -#if 0 -void print(__m128 v) -{ - GLM_ALIGN(16) float result[4]; - _mm_store_ps(result, v); - - printf("__m128: %f %f %f %f\n", result[0], result[1], result[2], result[3]); -} - -void print(const fvec4SIMD &v) -{ - printf("fvec4SIMD: %f %f %f %f\n", v.x, v.y, v.z, v.w); -} -#endif - -////////////////////////////////////// -// Implicit basic constructors - -# if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) - GLM_FUNC_QUALIFIER fquatSIMD::fquatSIMD() -# ifdef GLM_FORCE_NO_CTOR_INIT - : Data(_mm_set_ps(1.0f, 0.0f, 0.0f, 0.0f)) -# endif - {} -# endif - -# if !GLM_HAS_DEFAULTED_FUNCTIONS - GLM_FUNC_QUALIFIER fquatSIMD::fquatSIMD(fquatSIMD const & q) : - Data(q.Data) - {} -# endif//!GLM_HAS_DEFAULTED_FUNCTIONS - -GLM_FUNC_QUALIFIER fquatSIMD::fquatSIMD(__m128 const & Data) : - Data(Data) -{} - -////////////////////////////////////// -// Explicit basic constructors - -GLM_FUNC_QUALIFIER fquatSIMD::fquatSIMD(float const & w, float const & x, float const & y, float const & z) : - Data(_mm_set_ps(w, z, y, x)) -{} - -GLM_FUNC_QUALIFIER fquatSIMD::fquatSIMD(quat const & q) : - Data(_mm_set_ps(q.w, q.z, q.y, q.x)) -{} - -GLM_FUNC_QUALIFIER fquatSIMD::fquatSIMD(vec3 const & eulerAngles) -{ - vec3 c = glm::cos(eulerAngles * 0.5f); - vec3 s = glm::sin(eulerAngles * 0.5f); - - Data = _mm_set_ps( - (c.x * c.y * c.z) + (s.x * s.y * s.z), - (c.x * c.y * s.z) - (s.x * s.y * c.z), - (c.x * s.y * c.z) + (s.x * c.y * s.z), - (s.x * c.y * c.z) - (c.x * s.y * s.z)); -} - - -////////////////////////////////////// -// Unary arithmetic operators - -#if !GLM_HAS_DEFAULTED_FUNCTIONS - GLM_FUNC_QUALIFIER fquatSIMD& fquatSIMD::operator=(fquatSIMD const & q) - { - this->Data = q.Data; - return *this; - } -#endif//!GLM_HAS_DEFAULTED_FUNCTIONS - -GLM_FUNC_QUALIFIER fquatSIMD& fquatSIMD::operator*=(float const & s) -{ - this->Data = _mm_mul_ps(this->Data, _mm_set_ps1(s)); - return *this; -} - -GLM_FUNC_QUALIFIER fquatSIMD& fquatSIMD::operator/=(float const & s) -{ - this->Data = _mm_div_ps(Data, _mm_set1_ps(s)); - return *this; -} - - - -// negate operator -GLM_FUNC_QUALIFIER fquatSIMD operator- (fquatSIMD const & q) -{ - return fquatSIMD(_mm_mul_ps(q.Data, _mm_set_ps(-1.0f, -1.0f, -1.0f, -1.0f))); -} - -// operator+ -GLM_FUNC_QUALIFIER fquatSIMD operator+ (fquatSIMD const & q1, fquatSIMD const & q2) -{ - return fquatSIMD(_mm_add_ps(q1.Data, q2.Data)); -} - -//operator* -GLM_FUNC_QUALIFIER fquatSIMD operator* (fquatSIMD const & q1, fquatSIMD const & q2) -{ - // SSE2 STATS: - // 11 shuffle - // 8 mul - // 8 add - - // SSE4 STATS: - // 3 shuffle - // 4 mul - // 4 dpps - - __m128 mul0 = _mm_mul_ps(q1.Data, _mm_shuffle_ps(q2.Data, q2.Data, _MM_SHUFFLE(0, 1, 2, 3))); - __m128 mul1 = _mm_mul_ps(q1.Data, _mm_shuffle_ps(q2.Data, q2.Data, _MM_SHUFFLE(1, 0, 3, 2))); - __m128 mul2 = _mm_mul_ps(q1.Data, _mm_shuffle_ps(q2.Data, q2.Data, _MM_SHUFFLE(2, 3, 0, 1))); - __m128 mul3 = _mm_mul_ps(q1.Data, q2.Data); - -# if(GLM_ARCH & GLM_ARCH_SSE41_BIT) - __m128 add0 = _mm_dp_ps(mul0, _mm_set_ps(1.0f, -1.0f, 1.0f, 1.0f), 0xff); - __m128 add1 = _mm_dp_ps(mul1, _mm_set_ps(1.0f, 1.0f, 1.0f, -1.0f), 0xff); - __m128 add2 = _mm_dp_ps(mul2, _mm_set_ps(1.0f, 1.0f, -1.0f, 1.0f), 0xff); - __m128 add3 = _mm_dp_ps(mul3, _mm_set_ps(1.0f, -1.0f, -1.0f, -1.0f), 0xff); -# else - mul0 = _mm_mul_ps(mul0, _mm_set_ps(1.0f, -1.0f, 1.0f, 1.0f)); - __m128 add0 = _mm_add_ps(mul0, _mm_movehl_ps(mul0, mul0)); - add0 = _mm_add_ss(add0, _mm_shuffle_ps(add0, add0, 1)); - - mul1 = _mm_mul_ps(mul1, _mm_set_ps(1.0f, 1.0f, 1.0f, -1.0f)); - __m128 add1 = _mm_add_ps(mul1, _mm_movehl_ps(mul1, mul1)); - add1 = _mm_add_ss(add1, _mm_shuffle_ps(add1, add1, 1)); - - mul2 = _mm_mul_ps(mul2, _mm_set_ps(1.0f, 1.0f, -1.0f, 1.0f)); - __m128 add2 = _mm_add_ps(mul2, _mm_movehl_ps(mul2, mul2)); - add2 = _mm_add_ss(add2, _mm_shuffle_ps(add2, add2, 1)); - - mul3 = _mm_mul_ps(mul3, _mm_set_ps(1.0f, -1.0f, -1.0f, -1.0f)); - __m128 add3 = _mm_add_ps(mul3, _mm_movehl_ps(mul3, mul3)); - add3 = _mm_add_ss(add3, _mm_shuffle_ps(add3, add3, 1)); -#endif - - - // This SIMD code is a politically correct way of doing this, but in every test I've tried it has been slower than - // the final code below. I'll keep this here for reference - maybe somebody else can do something better... - // - //__m128 xxyy = _mm_shuffle_ps(add0, add1, _MM_SHUFFLE(0, 0, 0, 0)); - //__m128 zzww = _mm_shuffle_ps(add2, add3, _MM_SHUFFLE(0, 0, 0, 0)); - // - //return _mm_shuffle_ps(xxyy, zzww, _MM_SHUFFLE(2, 0, 2, 0)); - - float x; - float y; - float z; - float w; - - _mm_store_ss(&x, add0); - _mm_store_ss(&y, add1); - _mm_store_ss(&z, add2); - _mm_store_ss(&w, add3); - - return detail::fquatSIMD(w, x, y, z); -} - -GLM_FUNC_QUALIFIER fvec4SIMD operator* (fquatSIMD const & q, fvec4SIMD const & v) -{ - static const __m128 two = _mm_set1_ps(2.0f); - - __m128 q_wwww = _mm_shuffle_ps(q.Data, q.Data, _MM_SHUFFLE(3, 3, 3, 3)); - __m128 q_swp0 = _mm_shuffle_ps(q.Data, q.Data, _MM_SHUFFLE(3, 0, 2, 1)); - __m128 q_swp1 = _mm_shuffle_ps(q.Data, q.Data, _MM_SHUFFLE(3, 1, 0, 2)); - __m128 v_swp0 = _mm_shuffle_ps(v.Data, v.Data, _MM_SHUFFLE(3, 0, 2, 1)); - __m128 v_swp1 = _mm_shuffle_ps(v.Data, v.Data, _MM_SHUFFLE(3, 1, 0, 2)); - - __m128 uv = _mm_sub_ps(_mm_mul_ps(q_swp0, v_swp1), _mm_mul_ps(q_swp1, v_swp0)); - __m128 uv_swp0 = _mm_shuffle_ps(uv, uv, _MM_SHUFFLE(3, 0, 2, 1)); - __m128 uv_swp1 = _mm_shuffle_ps(uv, uv, _MM_SHUFFLE(3, 1, 0, 2)); - __m128 uuv = _mm_sub_ps(_mm_mul_ps(q_swp0, uv_swp1), _mm_mul_ps(q_swp1, uv_swp0)); - - - uv = _mm_mul_ps(uv, _mm_mul_ps(q_wwww, two)); - uuv = _mm_mul_ps(uuv, two); - - return _mm_add_ps(v.Data, _mm_add_ps(uv, uuv)); -} - -GLM_FUNC_QUALIFIER fvec4SIMD operator* (fvec4SIMD const & v, fquatSIMD const & q) -{ - return glm::inverse(q) * v; -} - -GLM_FUNC_QUALIFIER fquatSIMD operator* (fquatSIMD const & q, float s) -{ - return fquatSIMD(_mm_mul_ps(q.Data, _mm_set1_ps(s))); -} - -GLM_FUNC_QUALIFIER fquatSIMD operator* (float s, fquatSIMD const & q) -{ - return fquatSIMD(_mm_mul_ps(_mm_set1_ps(s), q.Data)); -} - - -//operator/ -GLM_FUNC_QUALIFIER fquatSIMD operator/ (fquatSIMD const & q, float s) -{ - return fquatSIMD(_mm_div_ps(q.Data, _mm_set1_ps(s))); -} - - -}//namespace detail - - -GLM_FUNC_QUALIFIER quat quat_cast -( - detail::fquatSIMD const & x -) -{ - GLM_ALIGN(16) quat Result; - _mm_store_ps(&Result[0], x.Data); - - return Result; -} - -template <typename T> -GLM_FUNC_QUALIFIER detail::fquatSIMD quatSIMD_cast_impl(const T m0[], const T m1[], const T m2[]) -{ - T trace = m0[0] + m1[1] + m2[2] + T(1.0); - if (trace > T(0)) - { - T s = static_cast<T>(0.5) / sqrt(trace); - - return _mm_set_ps( - static_cast<float>(T(0.25) / s), - static_cast<float>((m0[1] - m1[0]) * s), - static_cast<float>((m2[0] - m0[2]) * s), - static_cast<float>((m1[2] - m2[1]) * s)); - } - else - { - if (m0[0] > m1[1]) - { - if (m0[0] > m2[2]) - { - // X is biggest. - T s = sqrt(m0[0] - m1[1] - m2[2] + T(1.0)) * T(0.5); - - return _mm_set_ps( - static_cast<float>((m1[2] - m2[1]) * s), - static_cast<float>((m2[0] + m0[2]) * s), - static_cast<float>((m0[1] + m1[0]) * s), - static_cast<float>(T(0.5) * s)); - } - } - else - { - if (m1[1] > m2[2]) - { - // Y is biggest. - T s = sqrt(m1[1] - m0[0] - m2[2] + T(1.0)) * T(0.5); - - return _mm_set_ps( - static_cast<float>((m2[0] - m0[2]) * s), - static_cast<float>((m1[2] + m2[1]) * s), - static_cast<float>(T(0.5) * s), - static_cast<float>((m0[1] + m1[0]) * s)); - } - } - - // Z is biggest. - T s = sqrt(m2[2] - m0[0] - m1[1] + T(1.0)) * T(0.5); - - return _mm_set_ps( - static_cast<float>((m0[1] - m1[0]) * s), - static_cast<float>(T(0.5) * s), - static_cast<float>((m1[2] + m2[1]) * s), - static_cast<float>((m2[0] + m0[2]) * s)); - } -} - -GLM_FUNC_QUALIFIER detail::fquatSIMD quatSIMD_cast -( - detail::fmat4x4SIMD const & m -) -{ - // Scalar implementation for now. - GLM_ALIGN(16) float m0[4]; - GLM_ALIGN(16) float m1[4]; - GLM_ALIGN(16) float m2[4]; - - _mm_store_ps(m0, m[0].Data); - _mm_store_ps(m1, m[1].Data); - _mm_store_ps(m2, m[2].Data); - - return quatSIMD_cast_impl(m0, m1, m2); -} - -template <typename T, precision P> -GLM_FUNC_QUALIFIER detail::fquatSIMD quatSIMD_cast -( - tmat4x4<T, P> const & m -) -{ - return quatSIMD_cast_impl(&m[0][0], &m[1][0], &m[2][0]); -} - -template <typename T, precision P> -GLM_FUNC_QUALIFIER detail::fquatSIMD quatSIMD_cast -( - tmat3x3<T, P> const & m -) -{ - return quatSIMD_cast_impl(&m[0][0], &m[1][0], &m[2][0]); -} - - -GLM_FUNC_QUALIFIER detail::fmat4x4SIMD mat4SIMD_cast -( - detail::fquatSIMD const & q -) -{ - detail::fmat4x4SIMD result; - - __m128 _wwww = _mm_shuffle_ps(q.Data, q.Data, _MM_SHUFFLE(3, 3, 3, 3)); - __m128 _xyzw = q.Data; - __m128 _zxyw = _mm_shuffle_ps(q.Data, q.Data, _MM_SHUFFLE(3, 1, 0, 2)); - __m128 _yzxw = _mm_shuffle_ps(q.Data, q.Data, _MM_SHUFFLE(3, 0, 2, 1)); - - __m128 _xyzw2 = _mm_add_ps(_xyzw, _xyzw); - __m128 _zxyw2 = _mm_shuffle_ps(_xyzw2, _xyzw2, _MM_SHUFFLE(3, 1, 0, 2)); - __m128 _yzxw2 = _mm_shuffle_ps(_xyzw2, _xyzw2, _MM_SHUFFLE(3, 0, 2, 1)); - - __m128 _tmp0 = _mm_sub_ps(_mm_set1_ps(1.0f), _mm_mul_ps(_yzxw2, _yzxw)); - _tmp0 = _mm_sub_ps(_tmp0, _mm_mul_ps(_zxyw2, _zxyw)); - - __m128 _tmp1 = _mm_mul_ps(_yzxw2, _xyzw); - _tmp1 = _mm_add_ps(_tmp1, _mm_mul_ps(_zxyw2, _wwww)); - - __m128 _tmp2 = _mm_mul_ps(_zxyw2, _xyzw); - _tmp2 = _mm_sub_ps(_tmp2, _mm_mul_ps(_yzxw2, _wwww)); - - - // There's probably a better, more politically correct way of doing this... - result[0].Data = _mm_set_ps( - 0.0f, - reinterpret_cast<float*>(&_tmp2)[0], - reinterpret_cast<float*>(&_tmp1)[0], - reinterpret_cast<float*>(&_tmp0)[0]); - - result[1].Data = _mm_set_ps( - 0.0f, - reinterpret_cast<float*>(&_tmp1)[1], - reinterpret_cast<float*>(&_tmp0)[1], - reinterpret_cast<float*>(&_tmp2)[1]); - - result[2].Data = _mm_set_ps( - 0.0f, - reinterpret_cast<float*>(&_tmp0)[2], - reinterpret_cast<float*>(&_tmp2)[2], - reinterpret_cast<float*>(&_tmp1)[2]); - - result[3].Data = _mm_set_ps( - 1.0f, - 0.0f, - 0.0f, - 0.0f); - - - return result; -} - -GLM_FUNC_QUALIFIER mat4 mat4_cast -( - detail::fquatSIMD const & q -) -{ - return mat4_cast(mat4SIMD_cast(q)); -} - - - -GLM_FUNC_QUALIFIER float length -( - detail::fquatSIMD const & q -) -{ - return glm::sqrt(dot(q, q)); -} - -GLM_FUNC_QUALIFIER detail::fquatSIMD normalize -( - detail::fquatSIMD const & q -) -{ - return _mm_mul_ps(q.Data, _mm_set1_ps(1.0f / length(q))); -} - -GLM_FUNC_QUALIFIER float dot -( - detail::fquatSIMD const & q1, - detail::fquatSIMD const & q2 -) -{ - float result; - _mm_store_ss(&result, detail::sse_dot_ps(q1.Data, q2.Data)); - - return result; -} - -GLM_FUNC_QUALIFIER detail::fquatSIMD mix -( - detail::fquatSIMD const & x, - detail::fquatSIMD const & y, - float const & a -) -{ - float cosTheta = dot(x, y); - - if (cosTheta > 1.0f - glm::epsilon<float>()) - { - return _mm_add_ps(x.Data, _mm_mul_ps(_mm_set1_ps(a), _mm_sub_ps(y.Data, x.Data))); - } - else - { - float angle = glm::acos(cosTheta); - - - float s0 = glm::sin((1.0f - a) * angle); - float s1 = glm::sin(a * angle); - float d = 1.0f / glm::sin(angle); - - return (s0 * x + s1 * y) * d; - } -} - -GLM_FUNC_QUALIFIER detail::fquatSIMD lerp -( - detail::fquatSIMD const & x, - detail::fquatSIMD const & y, - float const & a -) -{ - // Lerp is only defined in [0, 1] - assert(a >= 0.0f); - assert(a <= 1.0f); - - return _mm_add_ps(x.Data, _mm_mul_ps(_mm_set1_ps(a), _mm_sub_ps(y.Data, x.Data))); -} - -GLM_FUNC_QUALIFIER detail::fquatSIMD slerp -( - detail::fquatSIMD const & x, - detail::fquatSIMD const & y, - float const & a -) -{ - detail::fquatSIMD z = y; - - float cosTheta = dot(x, y); - - // If cosTheta < 0, the interpolation will take the long way around the sphere. - // To fix this, one quat must be negated. - if (cosTheta < 0.0f) - { - z = -y; - cosTheta = -cosTheta; - } - - // Perform a linear interpolation when cosTheta is close to 1 to avoid side effect of sin(angle) becoming a zero denominator - if(cosTheta > 1.0f - epsilon<float>()) - { - return _mm_add_ps(x.Data, _mm_mul_ps(_mm_set1_ps(a), _mm_sub_ps(y.Data, x.Data))); - } - else - { - float angle = glm::acos(cosTheta); - - - float s0 = glm::sin((1.0f - a) * angle); - float s1 = glm::sin(a * angle); - float d = 1.0f / glm::sin(angle); - - return (s0 * x + s1 * y) * d; - } -} - - -GLM_FUNC_QUALIFIER detail::fquatSIMD fastMix -( - detail::fquatSIMD const & x, - detail::fquatSIMD const & y, - float const & a -) -{ - float cosTheta = dot(x, y); - - if (cosTheta > 1.0f - glm::epsilon<float>()) - { - return _mm_add_ps(x.Data, _mm_mul_ps(_mm_set1_ps(a), _mm_sub_ps(y.Data, x.Data))); - } - else - { - float angle = glm::fastAcos(cosTheta); - - - __m128 s = glm::fastSin(_mm_set_ps((1.0f - a) * angle, a * angle, angle, 0.0f)); - - __m128 s0 = _mm_shuffle_ps(s, s, _MM_SHUFFLE(3, 3, 3, 3)); - __m128 s1 = _mm_shuffle_ps(s, s, _MM_SHUFFLE(2, 2, 2, 2)); - __m128 d = _mm_div_ps(_mm_set1_ps(1.0f), _mm_shuffle_ps(s, s, _MM_SHUFFLE(1, 1, 1, 1))); - - return _mm_mul_ps(_mm_add_ps(_mm_mul_ps(s0, x.Data), _mm_mul_ps(s1, y.Data)), d); - } -} - -GLM_FUNC_QUALIFIER detail::fquatSIMD fastSlerp -( - detail::fquatSIMD const & x, - detail::fquatSIMD const & y, - float const & a -) -{ - detail::fquatSIMD z = y; - - float cosTheta = dot(x, y); - if (cosTheta < 0.0f) - { - z = -y; - cosTheta = -cosTheta; - } - - - if(cosTheta > 1.0f - epsilon<float>()) - { - return _mm_add_ps(x.Data, _mm_mul_ps(_mm_set1_ps(a), _mm_sub_ps(y.Data, x.Data))); - } - else - { - float angle = glm::fastAcos(cosTheta); - - - __m128 s = glm::fastSin(_mm_set_ps((1.0f - a) * angle, a * angle, angle, 0.0f)); - - __m128 s0 = _mm_shuffle_ps(s, s, _MM_SHUFFLE(3, 3, 3, 3)); - __m128 s1 = _mm_shuffle_ps(s, s, _MM_SHUFFLE(2, 2, 2, 2)); - __m128 d = _mm_div_ps(_mm_set1_ps(1.0f), _mm_shuffle_ps(s, s, _MM_SHUFFLE(1, 1, 1, 1))); - - return _mm_mul_ps(_mm_add_ps(_mm_mul_ps(s0, x.Data), _mm_mul_ps(s1, y.Data)), d); - } -} - - - -GLM_FUNC_QUALIFIER detail::fquatSIMD conjugate -( - detail::fquatSIMD const & q -) -{ - return detail::fquatSIMD(_mm_mul_ps(q.Data, _mm_set_ps(1.0f, -1.0f, -1.0f, -1.0f))); -} - -GLM_FUNC_QUALIFIER detail::fquatSIMD inverse -( - detail::fquatSIMD const & q -) -{ - return conjugate(q) / dot(q, q); -} - - -GLM_FUNC_QUALIFIER detail::fquatSIMD angleAxisSIMD -( - float const & angle, - vec3 const & v -) -{ - float s = glm::sin(angle * 0.5f); - - return _mm_set_ps( - glm::cos(angle * 0.5f), - v.z * s, - v.y * s, - v.x * s); -} - -GLM_FUNC_QUALIFIER detail::fquatSIMD angleAxisSIMD -( - float const & angle, - float const & x, - float const & y, - float const & z -) -{ - return angleAxisSIMD(angle, vec3(x, y, z)); -} - - -GLM_FUNC_QUALIFIER __m128 fastSin(__m128 x) -{ - static const __m128 c0 = _mm_set1_ps(0.16666666666666666666666666666667f); - static const __m128 c1 = _mm_set1_ps(0.00833333333333333333333333333333f); - static const __m128 c2 = _mm_set1_ps(0.00019841269841269841269841269841f); - - __m128 x3 = _mm_mul_ps(x, _mm_mul_ps(x, x)); - __m128 x5 = _mm_mul_ps(x3, _mm_mul_ps(x, x)); - __m128 x7 = _mm_mul_ps(x5, _mm_mul_ps(x, x)); - - __m128 y0 = _mm_mul_ps(x3, c0); - __m128 y1 = _mm_mul_ps(x5, c1); - __m128 y2 = _mm_mul_ps(x7, c2); - - return _mm_sub_ps(_mm_add_ps(_mm_sub_ps(x, y0), y1), y2); -} - - -}//namespace glm diff --git a/depedencies/include/glm/gtx/simd_vec4.hpp b/depedencies/include/glm/gtx/simd_vec4.hpp deleted file mode 100644 index cde540b..0000000 --- a/depedencies/include/glm/gtx/simd_vec4.hpp +++ /dev/null @@ -1,546 +0,0 @@ -/// @ref gtx_simd_vec4 -/// @file glm/gtx/simd_vec4.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_simd_vec4 GLM_GTX_simd_vec4 -/// @ingroup gtx -/// -/// @brief SIMD implementation of vec4 type. -/// -/// <glm/gtx/simd_vec4.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" - -#if(GLM_ARCH != GLM_ARCH_PURE) - -#if(GLM_ARCH & GLM_ARCH_SSE2_BIT) -# include "../detail/intrinsic_common.hpp" -# include "../detail/intrinsic_geometric.hpp" -# include "../detail/intrinsic_integer.hpp" -#else -# error "GLM: GLM_GTX_simd_vec4 requires compiler support of SSE2 through intrinsics" -#endif - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_simd_vec4 extension included") -# pragma message("GLM: GLM_GTX_simd_vec4 extension is deprecated and will be removed in GLM 0.9.9. Use *vec4 types instead and use compiler SIMD arguments.") -#endif - - -// Warning silencer for nameless struct/union. -#if (GLM_COMPILER & GLM_COMPILER_VC) -# pragma warning(push) -# pragma warning(disable:4201) // warning C4201: nonstandard extension used : nameless struct/union -#endif - -namespace glm -{ - enum comp - { - X = 0, - R = 0, - S = 0, - Y = 1, - G = 1, - T = 1, - Z = 2, - B = 2, - P = 2, - W = 3, - A = 3, - Q = 3 - }; - -}//namespace glm - -namespace glm{ -namespace detail -{ - /// 4-dimensional vector implemented using SIMD SEE intrinsics. - /// \ingroup gtx_simd_vec4 - GLM_ALIGNED_STRUCT(16) fvec4SIMD - { - typedef float value_type; - typedef std::size_t size_type; - - typedef fvec4SIMD type; - typedef tvec4<float, defaultp> pure_type; - typedef tvec4<bool, highp> bool_type; - -#ifdef GLM_SIMD_ENABLE_XYZW_UNION - union - { - __m128 Data; - struct {float x, y, z, w;}; - }; -#else - __m128 Data; -#endif - - ////////////////////////////////////// - // Implicit basic constructors - - fvec4SIMD() GLM_DEFAULT_CTOR; - fvec4SIMD(fvec4SIMD const & v) GLM_DEFAULT; - fvec4SIMD(__m128 const & Data); - - ////////////////////////////////////// - // Explicit basic constructors - - explicit fvec4SIMD( - ctor); - explicit fvec4SIMD( - float const & s); - explicit fvec4SIMD( - float const & x, - float const & y, - float const & z, - float const & w); - explicit fvec4SIMD( - vec4 const & v); - - //////////////////////////////////////// - //// Conversion vector constructors - - fvec4SIMD(vec2 const & v, float const & s1, float const & s2); - fvec4SIMD(float const & s1, vec2 const & v, float const & s2); - fvec4SIMD(float const & s1, float const & s2, vec2 const & v); - fvec4SIMD(vec3 const & v, float const & s); - fvec4SIMD(float const & s, vec3 const & v); - fvec4SIMD(vec2 const & v1, vec2 const & v2); - //fvec4SIMD(ivec4SIMD const & v); - - ////////////////////////////////////// - // Unary arithmetic operators - - fvec4SIMD& operator= (fvec4SIMD const & v) GLM_DEFAULT; - fvec4SIMD& operator+=(fvec4SIMD const & v); - fvec4SIMD& operator-=(fvec4SIMD const & v); - fvec4SIMD& operator*=(fvec4SIMD const & v); - fvec4SIMD& operator/=(fvec4SIMD const & v); - - fvec4SIMD& operator+=(float const & s); - fvec4SIMD& operator-=(float const & s); - fvec4SIMD& operator*=(float const & s); - fvec4SIMD& operator/=(float const & s); - - fvec4SIMD& operator++(); - fvec4SIMD& operator--(); - - ////////////////////////////////////// - // Swizzle operators - - template <comp X_, comp Y_, comp Z_, comp W_> - fvec4SIMD& swizzle(); - template <comp X_, comp Y_, comp Z_, comp W_> - fvec4SIMD swizzle() const; - template <comp X_, comp Y_, comp Z_> - fvec4SIMD swizzle() const; - template <comp X_, comp Y_> - fvec4SIMD swizzle() const; - template <comp X_> - fvec4SIMD swizzle() const; - }; -}//namespace detail - - typedef glm::detail::fvec4SIMD simdVec4; - - /// @addtogroup gtx_simd_vec4 - /// @{ - - //! Convert a simdVec4 to a vec4. - /// @see gtx_simd_vec4 - vec4 vec4_cast( - detail::fvec4SIMD const & x); - - //! Returns x if x >= 0; otherwise, it returns -x. - /// @see gtx_simd_vec4 - detail::fvec4SIMD abs(detail::fvec4SIMD const & x); - - //! Returns 1.0 if x > 0, 0.0 if x = 0, or -1.0 if x < 0. - /// @see gtx_simd_vec4 - detail::fvec4SIMD sign(detail::fvec4SIMD const & x); - - //! Returns a value equal to the nearest integer that is less then or equal to x. - /// @see gtx_simd_vec4 - detail::fvec4SIMD floor(detail::fvec4SIMD const & x); - - //! Returns a value equal to the nearest integer to x - //! whose absolute value is not larger than the absolute value of x. - /// @see gtx_simd_vec4 - detail::fvec4SIMD trunc(detail::fvec4SIMD const & x); - - //! Returns a value equal to the nearest integer to x. - //! The fraction 0.5 will round in a direction chosen by the - //! implementation, presumably the direction that is fastest. - //! This includes the possibility that round(x) returns the - //! same value as roundEven(x) for all values of x. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD round(detail::fvec4SIMD const & x); - - //! Returns a value equal to the nearest integer to x. - //! A fractional part of 0.5 will round toward the nearest even - //! integer. (Both 3.5 and 4.5 for x will return 4.0.) - /// - /// @see gtx_simd_vec4 - //detail::fvec4SIMD roundEven(detail::fvec4SIMD const & x); - - //! Returns a value equal to the nearest integer - //! that is greater than or equal to x. - /// @see gtx_simd_vec4 - detail::fvec4SIMD ceil(detail::fvec4SIMD const & x); - - //! Return x - floor(x). - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD fract(detail::fvec4SIMD const & x); - - //! Modulus. Returns x - y * floor(x / y) - //! for each component in x using the floating point value y. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD mod( - detail::fvec4SIMD const & x, - detail::fvec4SIMD const & y); - - //! Modulus. Returns x - y * floor(x / y) - //! for each component in x using the floating point value y. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD mod( - detail::fvec4SIMD const & x, - float const & y); - - //! Returns the fractional part of x and sets i to the integer - //! part (as a whole number floating point value). Both the - //! return value and the output parameter will have the same - //! sign as x. - //! (From GLM_GTX_simd_vec4 extension, common function) - //detail::fvec4SIMD modf( - // detail::fvec4SIMD const & x, - // detail::fvec4SIMD & i); - - //! Returns y if y < x; otherwise, it returns x. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD min( - detail::fvec4SIMD const & x, - detail::fvec4SIMD const & y); - - detail::fvec4SIMD min( - detail::fvec4SIMD const & x, - float const & y); - - //! Returns y if x < y; otherwise, it returns x. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD max( - detail::fvec4SIMD const & x, - detail::fvec4SIMD const & y); - - detail::fvec4SIMD max( - detail::fvec4SIMD const & x, - float const & y); - - //! Returns min(max(x, minVal), maxVal) for each component in x - //! using the floating-point values minVal and maxVal. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD clamp( - detail::fvec4SIMD const & x, - detail::fvec4SIMD const & minVal, - detail::fvec4SIMD const & maxVal); - - detail::fvec4SIMD clamp( - detail::fvec4SIMD const & x, - float const & minVal, - float const & maxVal); - - //! \return If genTypeU is a floating scalar or vector: - //! Returns x * (1.0 - a) + y * a, i.e., the linear blend of - //! x and y using the floating-point value a. - //! The value for a is not restricted to the range [0, 1]. - //! - //! \return If genTypeU is a boolean scalar or vector: - //! Selects which vector each returned component comes - //! from. For a component of a that is false, the - //! corresponding component of x is returned. For a - //! component of a that is true, the corresponding - //! component of y is returned. Components of x and y that - //! are not selected are allowed to be invalid floating point - //! values and will have no effect on the results. Thus, this - //! provides different functionality than - //! genType mix(genType x, genType y, genType(a)) - //! where a is a Boolean vector. - //! - //! From GLSL 1.30.08 specification, section 8.3 - //! - //! \param[in] x Floating point scalar or vector. - //! \param[in] y Floating point scalar or vector. - //! \param[in] a Floating point or boolean scalar or vector. - //! - /// \todo Test when 'a' is a boolean. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD mix( - detail::fvec4SIMD const & x, - detail::fvec4SIMD const & y, - detail::fvec4SIMD const & a); - - //! Returns 0.0 if x < edge, otherwise it returns 1.0. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD step( - detail::fvec4SIMD const & edge, - detail::fvec4SIMD const & x); - - detail::fvec4SIMD step( - float const & edge, - detail::fvec4SIMD const & x); - - //! Returns 0.0 if x <= edge0 and 1.0 if x >= edge1 and - //! performs smooth Hermite interpolation between 0 and 1 - //! when edge0 < x < edge1. This is useful in cases where - //! you would want a threshold function with a smooth - //! transition. This is equivalent to: - //! genType t; - //! t = clamp ((x - edge0) / (edge1 - edge0), 0, 1); - //! return t * t * (3 - 2 * t); - //! Results are undefined if edge0 >= edge1. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD smoothstep( - detail::fvec4SIMD const & edge0, - detail::fvec4SIMD const & edge1, - detail::fvec4SIMD const & x); - - detail::fvec4SIMD smoothstep( - float const & edge0, - float const & edge1, - detail::fvec4SIMD const & x); - - //! Returns true if x holds a NaN (not a number) - //! representation in the underlying implementation's set of - //! floating point representations. Returns false otherwise, - //! including for implementations with no NaN - //! representations. - /// - /// @see gtx_simd_vec4 - //bvec4 isnan(detail::fvec4SIMD const & x); - - //! Returns true if x holds a positive infinity or negative - //! infinity representation in the underlying implementation's - //! set of floating point representations. Returns false - //! otherwise, including for implementations with no infinity - //! representations. - /// - /// @see gtx_simd_vec4 - //bvec4 isinf(detail::fvec4SIMD const & x); - - //! Returns a signed or unsigned integer value representing - //! the encoding of a floating-point value. The floatingpoint - //! value's bit-level representation is preserved. - /// - /// @see gtx_simd_vec4 - //detail::ivec4SIMD floatBitsToInt(detail::fvec4SIMD const & value); - - //! Returns a floating-point value corresponding to a signed - //! or unsigned integer encoding of a floating-point value. - //! If an inf or NaN is passed in, it will not signal, and the - //! resulting floating point value is unspecified. Otherwise, - //! the bit-level representation is preserved. - /// - /// @see gtx_simd_vec4 - //detail::fvec4SIMD intBitsToFloat(detail::ivec4SIMD const & value); - - //! Computes and returns a * b + c. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD fma( - detail::fvec4SIMD const & a, - detail::fvec4SIMD const & b, - detail::fvec4SIMD const & c); - - //! Splits x into a floating-point significand in the range - //! [0.5, 1.0) and an integral exponent of two, such that: - //! x = significand * exp(2, exponent) - //! The significand is returned by the function and the - //! exponent is returned in the parameter exp. For a - //! floating-point value of zero, the significant and exponent - //! are both zero. For a floating-point value that is an - //! infinity or is not a number, the results are undefined. - /// - /// @see gtx_simd_vec4 - //detail::fvec4SIMD frexp(detail::fvec4SIMD const & x, detail::ivec4SIMD & exp); - - //! Builds a floating-point number from x and the - //! corresponding integral exponent of two in exp, returning: - //! significand * exp(2, exponent) - //! If this product is too large to be represented in the - //! floating-point type, the result is undefined. - /// - /// @see gtx_simd_vec4 - //detail::fvec4SIMD ldexp(detail::fvec4SIMD const & x, detail::ivec4SIMD const & exp); - - //! Returns the length of x, i.e., sqrt(x * x). - /// - /// @see gtx_simd_vec4 - float length( - detail::fvec4SIMD const & x); - - //! Returns the length of x, i.e., sqrt(x * x). - //! Less accurate but much faster than simdLength. - /// - /// @see gtx_simd_vec4 - float fastLength( - detail::fvec4SIMD const & x); - - //! Returns the length of x, i.e., sqrt(x * x). - //! Slightly more accurate but much slower than simdLength. - /// - /// @see gtx_simd_vec4 - float niceLength( - detail::fvec4SIMD const & x); - - //! Returns the length of x, i.e., sqrt(x * x). - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD length4( - detail::fvec4SIMD const & x); - - //! Returns the length of x, i.e., sqrt(x * x). - //! Less accurate but much faster than simdLength4. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD fastLength4( - detail::fvec4SIMD const & x); - - //! Returns the length of x, i.e., sqrt(x * x). - //! Slightly more accurate but much slower than simdLength4. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD niceLength4( - detail::fvec4SIMD const & x); - - //! Returns the distance betwwen p0 and p1, i.e., length(p0 - p1). - /// - /// @see gtx_simd_vec4 - float distance( - detail::fvec4SIMD const & p0, - detail::fvec4SIMD const & p1); - - //! Returns the distance betwwen p0 and p1, i.e., length(p0 - p1). - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD distance4( - detail::fvec4SIMD const & p0, - detail::fvec4SIMD const & p1); - - //! Returns the dot product of x and y, i.e., result = x * y. - /// - /// @see gtx_simd_vec4 - float simdDot( - detail::fvec4SIMD const & x, - detail::fvec4SIMD const & y); - - //! Returns the dot product of x and y, i.e., result = x * y. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD dot4( - detail::fvec4SIMD const & x, - detail::fvec4SIMD const & y); - - //! Returns the cross product of x and y. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD cross( - detail::fvec4SIMD const & x, - detail::fvec4SIMD const & y); - - //! Returns a vector in the same direction as x but with length of 1. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD normalize( - detail::fvec4SIMD const & x); - - //! Returns a vector in the same direction as x but with length of 1. - //! Less accurate but much faster than simdNormalize. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD fastNormalize( - detail::fvec4SIMD const & x); - - //! If dot(Nref, I) < 0.0, return N, otherwise, return -N. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD simdFaceforward( - detail::fvec4SIMD const & N, - detail::fvec4SIMD const & I, - detail::fvec4SIMD const & Nref); - - //! For the incident vector I and surface orientation N, - //! returns the reflection direction : result = I - 2.0 * dot(N, I) * N. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD reflect( - detail::fvec4SIMD const & I, - detail::fvec4SIMD const & N); - - //! For the incident vector I and surface normal N, - //! and the ratio of indices of refraction eta, - //! return the refraction vector. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD refract( - detail::fvec4SIMD const & I, - detail::fvec4SIMD const & N, - float const & eta); - - //! Returns the positive square root of x. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD sqrt( - detail::fvec4SIMD const & x); - - //! Returns the positive square root of x with the nicest quality but very slow. - //! Slightly more accurate but much slower than simdSqrt. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD niceSqrt( - detail::fvec4SIMD const & x); - - //! Returns the positive square root of x - //! Less accurate but much faster than sqrt. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD fastSqrt( - detail::fvec4SIMD const & x); - - //! Returns the reciprocal of the positive square root of x. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD inversesqrt( - detail::fvec4SIMD const & x); - - //! Returns the reciprocal of the positive square root of x. - //! Faster than inversesqrt but less accurate. - /// - /// @see gtx_simd_vec4 - detail::fvec4SIMD fastInversesqrt( - detail::fvec4SIMD const & x); - - /// @} -}//namespace glm - -#include "simd_vec4.inl" - -#if (GLM_COMPILER & GLM_COMPILER_VC) -# pragma warning(pop) -#endif - -#endif//(GLM_ARCH != GLM_ARCH_PURE) diff --git a/depedencies/include/glm/gtx/simd_vec4.inl b/depedencies/include/glm/gtx/simd_vec4.inl deleted file mode 100644 index efc87c6..0000000 --- a/depedencies/include/glm/gtx/simd_vec4.inl +++ /dev/null @@ -1,721 +0,0 @@ -/// @ref gtx_simd_vec4 -/// @file glm/gtx/simd_vec4.inl - -namespace glm{ -namespace detail{ - -////////////////////////////////////// -// Implicit basic constructors - -#if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) - GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD() -# ifdef GLM_FORCE_NO_CTOR_INIT - : Data(_mm_set_ps(0.0f, 0.0f, 0.0f, 0.0f)) -# endif - {} -#endif//!GLM_HAS_DEFAULTED_FUNCTIONS - -#if !GLM_HAS_DEFAULTED_FUNCTIONS - GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(fvec4SIMD const & v) : - Data(v.Data) - {} -#endif//!GLM_HAS_DEFAULTED_FUNCTIONS - -GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(__m128 const & Data) : - Data(Data) -{} - -GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(vec4 const & v) : - Data(_mm_set_ps(v.w, v.z, v.y, v.x)) -{} - -////////////////////////////////////// -// Explicit basic constructors - -GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(float const & s) : - Data(_mm_set1_ps(s)) -{} - -GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(float const & x, float const & y, float const & z, float const & w) : -// Data(_mm_setr_ps(x, y, z, w)) - Data(_mm_set_ps(w, z, y, x)) -{} -/* -GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(float const v[4]) : - Data(_mm_load_ps(v)) -{} -*/ -////////////////////////////////////// -// Swizzle constructors - -//fvec4SIMD(ref4<float> const & r); - -////////////////////////////////////// -// Conversion vector constructors - -GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(vec2 const & v, float const & s1, float const & s2) : - Data(_mm_set_ps(s2, s1, v.y, v.x)) -{} - -GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(float const & s1, vec2 const & v, float const & s2) : - Data(_mm_set_ps(s2, v.y, v.x, s1)) -{} - -GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(float const & s1, float const & s2, vec2 const & v) : - Data(_mm_set_ps(v.y, v.x, s2, s1)) -{} - -GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(vec3 const & v, float const & s) : - Data(_mm_set_ps(s, v.z, v.y, v.x)) -{} - -GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(float const & s, vec3 const & v) : - Data(_mm_set_ps(v.z, v.y, v.x, s)) -{} - -GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(vec2 const & v1, vec2 const & v2) : - Data(_mm_set_ps(v2.y, v2.x, v1.y, v1.x)) -{} - -//GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(ivec4SIMD const & v) : -// Data(_mm_cvtepi32_ps(v.Data)) -//{} - -////////////////////////////////////// -// Unary arithmetic operators - -#if !GLM_HAS_DEFAULTED_FUNCTIONS - GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator=(fvec4SIMD const & v) - { - this->Data = v.Data; - return *this; - } -#endif//!GLM_HAS_DEFAULTED_FUNCTIONS - -GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator+=(float const & s) -{ - this->Data = _mm_add_ps(Data, _mm_set_ps1(s)); - return *this; -} - -GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator+=(fvec4SIMD const & v) -{ - this->Data = _mm_add_ps(this->Data , v.Data); - return *this; -} - -GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator-=(float const & s) -{ - this->Data = _mm_sub_ps(Data, _mm_set_ps1(s)); - return *this; -} - -GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator-=(fvec4SIMD const & v) -{ - this->Data = _mm_sub_ps(this->Data , v.Data); - return *this; -} - -GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator*=(float const & s) -{ - this->Data = _mm_mul_ps(this->Data, _mm_set_ps1(s)); - return *this; -} - -GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator*=(fvec4SIMD const & v) -{ - this->Data = _mm_mul_ps(this->Data , v.Data); - return *this; -} - -GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator/=(float const & s) -{ - this->Data = _mm_div_ps(Data, _mm_set1_ps(s)); - return *this; -} - -GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator/=(fvec4SIMD const & v) -{ - this->Data = _mm_div_ps(this->Data , v.Data); - return *this; -} - -GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator++() -{ - this->Data = _mm_add_ps(this->Data , glm::detail::one); - return *this; -} - -GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator--() -{ - this->Data = _mm_sub_ps(this->Data, glm::detail::one); - return *this; -} - -////////////////////////////////////// -// Swizzle operators - -template <comp X_, comp Y_, comp Z_, comp W_> -GLM_FUNC_QUALIFIER fvec4SIMD fvec4SIMD::swizzle() const -{ - __m128 Data = _mm_shuffle_ps( - this->Data, this->Data, - shuffle_mask<(W_ << 6) | (Z_ << 4) | (Y_ << 2) | (X_ << 0)>::value); - return fvec4SIMD(Data); -} - -template <comp X_, comp Y_, comp Z_, comp W_> -GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::swizzle() -{ - this->Data = _mm_shuffle_ps( - this->Data, this->Data, - shuffle_mask<(W_ << 6) | (Z_ << 4) | (Y_ << 2) | (X_ << 0)>::value); - return *this; -} - -// operator+ -GLM_FUNC_QUALIFIER fvec4SIMD operator+ (fvec4SIMD const & v, float s) -{ - return fvec4SIMD(_mm_add_ps(v.Data, _mm_set1_ps(s))); -} - -GLM_FUNC_QUALIFIER fvec4SIMD operator+ (float s, fvec4SIMD const & v) -{ - return fvec4SIMD(_mm_add_ps(_mm_set1_ps(s), v.Data)); -} - -GLM_FUNC_QUALIFIER fvec4SIMD operator+ (fvec4SIMD const & v1, fvec4SIMD const & v2) -{ - return fvec4SIMD(_mm_add_ps(v1.Data, v2.Data)); -} - -//operator- -GLM_FUNC_QUALIFIER fvec4SIMD operator- (fvec4SIMD const & v, float s) -{ - return fvec4SIMD(_mm_sub_ps(v.Data, _mm_set1_ps(s))); -} - -GLM_FUNC_QUALIFIER fvec4SIMD operator- (float s, fvec4SIMD const & v) -{ - return fvec4SIMD(_mm_sub_ps(_mm_set1_ps(s), v.Data)); -} - -GLM_FUNC_QUALIFIER fvec4SIMD operator- (fvec4SIMD const & v1, fvec4SIMD const & v2) -{ - return fvec4SIMD(_mm_sub_ps(v1.Data, v2.Data)); -} - -//operator* -GLM_FUNC_QUALIFIER fvec4SIMD operator* (fvec4SIMD const & v, float s) -{ - __m128 par0 = v.Data; - __m128 par1 = _mm_set1_ps(s); - return fvec4SIMD(_mm_mul_ps(par0, par1)); -} - -GLM_FUNC_QUALIFIER fvec4SIMD operator* (float s, fvec4SIMD const & v) -{ - __m128 par0 = _mm_set1_ps(s); - __m128 par1 = v.Data; - return fvec4SIMD(_mm_mul_ps(par0, par1)); -} - -GLM_FUNC_QUALIFIER fvec4SIMD operator* (fvec4SIMD const & v1, fvec4SIMD const & v2) -{ - return fvec4SIMD(_mm_mul_ps(v1.Data, v2.Data)); -} - -//operator/ -GLM_FUNC_QUALIFIER fvec4SIMD operator/ (fvec4SIMD const & v, float s) -{ - __m128 par0 = v.Data; - __m128 par1 = _mm_set1_ps(s); - return fvec4SIMD(_mm_div_ps(par0, par1)); -} - -GLM_FUNC_QUALIFIER fvec4SIMD operator/ (float s, fvec4SIMD const & v) -{ - __m128 par0 = _mm_set1_ps(s); - __m128 par1 = v.Data; - return fvec4SIMD(_mm_div_ps(par0, par1)); -} - -GLM_FUNC_QUALIFIER fvec4SIMD operator/ (fvec4SIMD const & v1, fvec4SIMD const & v2) -{ - return fvec4SIMD(_mm_div_ps(v1.Data, v2.Data)); -} - -// Unary constant operators -GLM_FUNC_QUALIFIER fvec4SIMD operator- (fvec4SIMD const & v) -{ - return fvec4SIMD(_mm_sub_ps(_mm_setzero_ps(), v.Data)); -} - -GLM_FUNC_QUALIFIER fvec4SIMD operator++ (fvec4SIMD const & v, int) -{ - return fvec4SIMD(_mm_add_ps(v.Data, glm::detail::one)); -} - -GLM_FUNC_QUALIFIER fvec4SIMD operator-- (fvec4SIMD const & v, int) -{ - return fvec4SIMD(_mm_sub_ps(v.Data, glm::detail::one)); -} - -}//namespace detail - -GLM_FUNC_QUALIFIER vec4 vec4_cast -( - detail::fvec4SIMD const & x -) -{ - GLM_ALIGN(16) vec4 Result; - _mm_store_ps(&Result[0], x.Data); - return Result; -} - -// Other possible implementation -//float abs(float a) -//{ -// return max(-a, a); -//} -GLM_FUNC_QUALIFIER detail::fvec4SIMD abs -( - detail::fvec4SIMD const & x -) -{ - return detail::sse_abs_ps(x.Data); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD sign -( - detail::fvec4SIMD const & x -) -{ - return detail::sse_sgn_ps(x.Data); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD floor -( - detail::fvec4SIMD const & x -) -{ - return detail::sse_flr_ps(x.Data); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD trunc -( - detail::fvec4SIMD const & x -) -{ - //return x < 0 ? -floor(-x) : floor(x); - - __m128 Flr0 = detail::sse_flr_ps(_mm_sub_ps(_mm_setzero_ps(), x.Data)); - __m128 Sub0 = _mm_sub_ps(Flr0, x.Data); - __m128 Flr1 = detail::sse_flr_ps(x.Data); - - __m128 Cmp0 = _mm_cmplt_ps(x.Data, glm::detail::zero); - __m128 Cmp1 = _mm_cmpnlt_ps(x.Data, glm::detail::zero); - - __m128 And0 = _mm_and_ps(Sub0, Cmp0); - __m128 And1 = _mm_and_ps(Flr1, Cmp1); - - return _mm_or_ps(And0, And1); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD round -( - detail::fvec4SIMD const & x -) -{ - return detail::sse_rnd_ps(x.Data); -} - -//GLM_FUNC_QUALIFIER detail::fvec4SIMD roundEven -//( -// detail::fvec4SIMD const & x -//) -//{ - -//} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD ceil -( - detail::fvec4SIMD const & x -) -{ - return detail::sse_ceil_ps(x.Data); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD fract -( - detail::fvec4SIMD const & x -) -{ - return detail::sse_frc_ps(x.Data); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD mod -( - detail::fvec4SIMD const & x, - detail::fvec4SIMD const & y -) -{ - return detail::sse_mod_ps(x.Data, y.Data); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD mod -( - detail::fvec4SIMD const & x, - float const & y -) -{ - return detail::sse_mod_ps(x.Data, _mm_set1_ps(y)); -} - -//GLM_FUNC_QUALIFIER detail::fvec4SIMD modf -//( -// detail::fvec4SIMD const & x, -// detail::fvec4SIMD & i -//) -//{ - -//} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD min -( - detail::fvec4SIMD const & x, - detail::fvec4SIMD const & y -) -{ - return _mm_min_ps(x.Data, y.Data); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD min -( - detail::fvec4SIMD const & x, - float const & y -) -{ - return _mm_min_ps(x.Data, _mm_set1_ps(y)); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD max -( - detail::fvec4SIMD const & x, - detail::fvec4SIMD const & y -) -{ - return _mm_max_ps(x.Data, y.Data); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD max -( - detail::fvec4SIMD const & x, - float const & y -) -{ - return _mm_max_ps(x.Data, _mm_set1_ps(y)); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD clamp -( - detail::fvec4SIMD const & x, - detail::fvec4SIMD const & minVal, - detail::fvec4SIMD const & maxVal -) -{ - return detail::sse_clp_ps(x.Data, minVal.Data, maxVal.Data); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD clamp -( - detail::fvec4SIMD const & x, - float const & minVal, - float const & maxVal -) -{ - return detail::sse_clp_ps(x.Data, _mm_set1_ps(minVal), _mm_set1_ps(maxVal)); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD mix -( - detail::fvec4SIMD const & x, - detail::fvec4SIMD const & y, - detail::fvec4SIMD const & a -) -{ - __m128 Sub0 = _mm_sub_ps(y.Data, x.Data); - __m128 Mul0 = _mm_mul_ps(a.Data, Sub0); - return _mm_add_ps(x.Data, Mul0); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD step -( - detail::fvec4SIMD const & edge, - detail::fvec4SIMD const & x -) -{ - __m128 cmp0 = _mm_cmpngt_ps(x.Data, edge.Data); - return _mm_max_ps(_mm_min_ps(cmp0, _mm_setzero_ps()), detail::one); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD step -( - float const & edge, - detail::fvec4SIMD const & x -) -{ - __m128 cmp0 = _mm_cmpngt_ps(x.Data, _mm_set1_ps(edge)); - return _mm_max_ps(_mm_min_ps(cmp0, _mm_setzero_ps()), detail::one); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD smoothstep -( - detail::fvec4SIMD const & edge0, - detail::fvec4SIMD const & edge1, - detail::fvec4SIMD const & x -) -{ - return detail::sse_ssp_ps(edge0.Data, edge1.Data, x.Data); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD smoothstep -( - float const & edge0, - float const & edge1, - detail::fvec4SIMD const & x -) -{ - return detail::sse_ssp_ps(_mm_set1_ps(edge0), _mm_set1_ps(edge1), x.Data); -} - -//GLM_FUNC_QUALIFIER bvec4 isnan(detail::fvec4SIMD const & x) -//{ - -//} - -//GLM_FUNC_QUALIFIER bvec4 isinf(detail::fvec4SIMD const & x) -//{ - -//} - -//GLM_FUNC_QUALIFIER detail::ivec4SIMD floatBitsToInt -//( -// detail::fvec4SIMD const & value -//) -//{ - -//} - -//GLM_FUNC_QUALIFIER detail::fvec4SIMD intBitsToFloat -//( -// detail::ivec4SIMD const & value -//) -//{ - -//} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD fma -( - detail::fvec4SIMD const & a, - detail::fvec4SIMD const & b, - detail::fvec4SIMD const & c -) -{ - return _mm_add_ps(_mm_mul_ps(a.Data, b.Data), c.Data); -} - -GLM_FUNC_QUALIFIER float length -( - detail::fvec4SIMD const & x -) -{ - detail::fvec4SIMD dot0 = detail::sse_dot_ss(x.Data, x.Data); - detail::fvec4SIMD sqt0 = sqrt(dot0); - float Result = 0; - _mm_store_ss(&Result, sqt0.Data); - return Result; -} - -GLM_FUNC_QUALIFIER float fastLength -( - detail::fvec4SIMD const & x -) -{ - detail::fvec4SIMD dot0 = detail::sse_dot_ss(x.Data, x.Data); - detail::fvec4SIMD sqt0 = fastSqrt(dot0); - float Result = 0; - _mm_store_ss(&Result, sqt0.Data); - return Result; -} - -GLM_FUNC_QUALIFIER float niceLength -( - detail::fvec4SIMD const & x -) -{ - detail::fvec4SIMD dot0 = detail::sse_dot_ss(x.Data, x.Data); - detail::fvec4SIMD sqt0 = niceSqrt(dot0); - float Result = 0; - _mm_store_ss(&Result, sqt0.Data); - return Result; -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD length4 -( - detail::fvec4SIMD const & x -) -{ - return sqrt(dot4(x, x)); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD fastLength4 -( - detail::fvec4SIMD const & x -) -{ - return fastSqrt(dot4(x, x)); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD niceLength4 -( - detail::fvec4SIMD const & x -) -{ - return niceSqrt(dot4(x, x)); -} - -GLM_FUNC_QUALIFIER float distance -( - detail::fvec4SIMD const & p0, - detail::fvec4SIMD const & p1 -) -{ - float Result = 0; - _mm_store_ss(&Result, detail::sse_dst_ps(p0.Data, p1.Data)); - return Result; -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD distance4 -( - detail::fvec4SIMD const & p0, - detail::fvec4SIMD const & p1 -) -{ - return detail::sse_dst_ps(p0.Data, p1.Data); -} - -GLM_FUNC_QUALIFIER float dot -( - detail::fvec4SIMD const & x, - detail::fvec4SIMD const & y -) -{ - float Result = 0; - _mm_store_ss(&Result, detail::sse_dot_ss(x.Data, y.Data)); - return Result; -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD dot4 -( - detail::fvec4SIMD const & x, - detail::fvec4SIMD const & y -) -{ - return detail::sse_dot_ps(x.Data, y.Data); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD cross -( - detail::fvec4SIMD const & x, - detail::fvec4SIMD const & y -) -{ - return detail::sse_xpd_ps(x.Data, y.Data); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD normalize -( - detail::fvec4SIMD const & x -) -{ - __m128 dot0 = detail::sse_dot_ps(x.Data, x.Data); - __m128 isr0 = inversesqrt(detail::fvec4SIMD(dot0)).Data; - __m128 mul0 = _mm_mul_ps(x.Data, isr0); - return mul0; -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD fastNormalize -( - detail::fvec4SIMD const & x -) -{ - __m128 dot0 = detail::sse_dot_ps(x.Data, x.Data); - __m128 isr0 = fastInversesqrt(dot0).Data; - __m128 mul0 = _mm_mul_ps(x.Data, isr0); - return mul0; -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD faceforward -( - detail::fvec4SIMD const & N, - detail::fvec4SIMD const & I, - detail::fvec4SIMD const & Nref -) -{ - return detail::sse_ffd_ps(N.Data, I.Data, Nref.Data); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD reflect -( - detail::fvec4SIMD const & I, - detail::fvec4SIMD const & N -) -{ - return detail::sse_rfe_ps(I.Data, N.Data); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD refract -( - detail::fvec4SIMD const & I, - detail::fvec4SIMD const & N, - float const & eta -) -{ - return detail::sse_rfa_ps(I.Data, N.Data, _mm_set1_ps(eta)); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD sqrt(detail::fvec4SIMD const & x) -{ - return _mm_mul_ps(inversesqrt(x).Data, x.Data); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD niceSqrt(detail::fvec4SIMD const & x) -{ - return _mm_sqrt_ps(x.Data); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD fastSqrt(detail::fvec4SIMD const & x) -{ - return _mm_mul_ps(fastInversesqrt(x.Data).Data, x.Data); -} - -// SSE scalar reciprocal sqrt using rsqrt op, plus one Newton-Rhaphson iteration -// By Elan Ruskin, http://assemblyrequired.crashworks.org/ -GLM_FUNC_QUALIFIER detail::fvec4SIMD inversesqrt(detail::fvec4SIMD const & x) -{ - GLM_ALIGN(4) static const __m128 three = {3, 3, 3, 3}; // aligned consts for fast load - GLM_ALIGN(4) static const __m128 half = {0.5,0.5,0.5,0.5}; - - __m128 recip = _mm_rsqrt_ps(x.Data); // "estimate" opcode - __m128 halfrecip = _mm_mul_ps(half, recip); - __m128 threeminus_xrr = _mm_sub_ps(three, _mm_mul_ps(x.Data, _mm_mul_ps(recip, recip))); - return _mm_mul_ps(halfrecip, threeminus_xrr); -} - -GLM_FUNC_QUALIFIER detail::fvec4SIMD fastInversesqrt(detail::fvec4SIMD const & x) -{ - return _mm_rsqrt_ps(x.Data); -} - -}//namespace glm diff --git a/depedencies/include/glm/gtx/spline.hpp b/depedencies/include/glm/gtx/spline.hpp deleted file mode 100644 index 333a5bc..0000000 --- a/depedencies/include/glm/gtx/spline.hpp +++ /dev/null @@ -1,61 +0,0 @@ -/// @ref gtx_spline -/// @file glm/gtx/spline.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_spline GLM_GTX_spline -/// @ingroup gtx -/// -/// @brief Spline functions -/// -/// <glm/gtx/spline.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" -#include "../gtx/optimum_pow.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_spline extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_spline - /// @{ - - /// Return a point from a catmull rom curve. - /// @see gtx_spline extension. - template <typename genType> - GLM_FUNC_DECL genType catmullRom( - genType const & v1, - genType const & v2, - genType const & v3, - genType const & v4, - typename genType::value_type const & s); - - /// Return a point from a hermite curve. - /// @see gtx_spline extension. - template <typename genType> - GLM_FUNC_DECL genType hermite( - genType const & v1, - genType const & t1, - genType const & v2, - genType const & t2, - typename genType::value_type const & s); - - /// Return a point from a cubic curve. - /// @see gtx_spline extension. - template <typename genType> - GLM_FUNC_DECL genType cubic( - genType const & v1, - genType const & v2, - genType const & v3, - genType const & v4, - typename genType::value_type const & s); - - /// @} -}//namespace glm - -#include "spline.inl" diff --git a/depedencies/include/glm/gtx/spline.inl b/depedencies/include/glm/gtx/spline.inl deleted file mode 100644 index fcd3382..0000000 --- a/depedencies/include/glm/gtx/spline.inl +++ /dev/null @@ -1,63 +0,0 @@ -/// @ref gtx_spline -/// @file glm/gtx/spline.inl - -namespace glm -{ - template <typename genType> - GLM_FUNC_QUALIFIER genType catmullRom - ( - genType const & v1, - genType const & v2, - genType const & v3, - genType const & v4, - typename genType::value_type const & s - ) - { - typename genType::value_type s1 = s; - typename genType::value_type s2 = pow2(s); - typename genType::value_type s3 = pow3(s); - - typename genType::value_type f1 = -s3 + typename genType::value_type(2) * s2 - s; - typename genType::value_type f2 = typename genType::value_type(3) * s3 - typename genType::value_type(5) * s2 + typename genType::value_type(2); - typename genType::value_type f3 = typename genType::value_type(-3) * s3 + typename genType::value_type(4) * s2 + s; - typename genType::value_type f4 = s3 - s2; - - return (f1 * v1 + f2 * v2 + f3 * v3 + f4 * v4) / typename genType::value_type(2); - - } - - template <typename genType> - GLM_FUNC_QUALIFIER genType hermite - ( - genType const & v1, - genType const & t1, - genType const & v2, - genType const & t2, - typename genType::value_type const & s - ) - { - typename genType::value_type s1 = s; - typename genType::value_type s2 = pow2(s); - typename genType::value_type s3 = pow3(s); - - typename genType::value_type f1 = typename genType::value_type(2) * s3 - typename genType::value_type(3) * s2 + typename genType::value_type(1); - typename genType::value_type f2 = typename genType::value_type(-2) * s3 + typename genType::value_type(3) * s2; - typename genType::value_type f3 = s3 - typename genType::value_type(2) * s2 + s; - typename genType::value_type f4 = s3 - s2; - - return f1 * v1 + f2 * v2 + f3 * t1 + f4 * t2; - } - - template <typename genType> - GLM_FUNC_QUALIFIER genType cubic - ( - genType const & v1, - genType const & v2, - genType const & v3, - genType const & v4, - typename genType::value_type const & s - ) - { - return ((v1 * s + v2) * s + v3) * s + v4; - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/std_based_type.hpp b/depedencies/include/glm/gtx/std_based_type.hpp deleted file mode 100644 index ea1791b..0000000 --- a/depedencies/include/glm/gtx/std_based_type.hpp +++ /dev/null @@ -1,63 +0,0 @@ -/// @ref gtx_std_based_type -/// @file glm/gtx/std_based_type.hpp -/// -/// @see core (dependence) -/// @see gtx_extented_min_max (dependence) -/// -/// @defgroup gtx_std_based_type GLM_GTX_std_based_type -/// @ingroup gtx -/// -/// @brief Adds vector types based on STL value types. -/// <glm/gtx/std_based_type.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" -#include <cstdlib> - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_std_based_type extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_std_based_type - /// @{ - - /// Vector type based of one std::size_t component. - /// @see GLM_GTX_std_based_type - typedef tvec1<std::size_t, defaultp> size1; - - /// Vector type based of two std::size_t components. - /// @see GLM_GTX_std_based_type - typedef tvec2<std::size_t, defaultp> size2; - - /// Vector type based of three std::size_t components. - /// @see GLM_GTX_std_based_type - typedef tvec3<std::size_t, defaultp> size3; - - /// Vector type based of four std::size_t components. - /// @see GLM_GTX_std_based_type - typedef tvec4<std::size_t, defaultp> size4; - - /// Vector type based of one std::size_t component. - /// @see GLM_GTX_std_based_type - typedef tvec1<std::size_t, defaultp> size1_t; - - /// Vector type based of two std::size_t components. - /// @see GLM_GTX_std_based_type - typedef tvec2<std::size_t, defaultp> size2_t; - - /// Vector type based of three std::size_t components. - /// @see GLM_GTX_std_based_type - typedef tvec3<std::size_t, defaultp> size3_t; - - /// Vector type based of four std::size_t components. - /// @see GLM_GTX_std_based_type - typedef tvec4<std::size_t, defaultp> size4_t; - - /// @} -}//namespace glm - -#include "std_based_type.inl" diff --git a/depedencies/include/glm/gtx/std_based_type.inl b/depedencies/include/glm/gtx/std_based_type.inl deleted file mode 100644 index ca431a3..0000000 --- a/depedencies/include/glm/gtx/std_based_type.inl +++ /dev/null @@ -1,7 +0,0 @@ -/// @ref gtx_std_based_type -/// @file glm/gtx/std_based_type.inl - -namespace glm -{ - -} diff --git a/depedencies/include/glm/gtx/string_cast.hpp b/depedencies/include/glm/gtx/string_cast.hpp deleted file mode 100644 index d2b9fc6..0000000 --- a/depedencies/include/glm/gtx/string_cast.hpp +++ /dev/null @@ -1,47 +0,0 @@ -/// @ref gtx_string_cast -/// @file glm/gtx/string_cast.hpp -/// -/// @see core (dependence) -/// @see gtc_half_float (dependence) -/// @see gtx_integer (dependence) -/// @see gtx_quaternion (dependence) -/// -/// @defgroup gtx_string_cast GLM_GTX_string_cast -/// @ingroup gtx -/// -/// @brief Setup strings for GLM type values -/// -/// <glm/gtx/string_cast.hpp> need to be included to use these functionalities. -/// This extension is not supported with CUDA - -#pragma once - -// Dependency: -#include "../glm.hpp" -#include "../gtc/type_precision.hpp" -#include "../gtc/quaternion.hpp" -#include "../gtx/dual_quaternion.hpp" -#include <string> - -#if(GLM_COMPILER & GLM_COMPILER_CUDA) -# error "GLM_GTX_string_cast is not supported on CUDA compiler" -#endif - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_string_cast extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_string_cast - /// @{ - - /// Create a string from a GLM vector or matrix typed variable. - /// @see gtx_string_cast extension. - template <template <typename, precision> class matType, typename T, precision P> - GLM_FUNC_DECL std::string to_string(matType<T, P> const & x); - - /// @} -}//namespace glm - -#include "string_cast.inl" diff --git a/depedencies/include/glm/gtx/string_cast.inl b/depedencies/include/glm/gtx/string_cast.inl deleted file mode 100644 index 19f136b..0000000 --- a/depedencies/include/glm/gtx/string_cast.inl +++ /dev/null @@ -1,458 +0,0 @@ -/// @ref gtx_string_cast -/// @file glm/gtx/string_cast.inl - -#include <cstdarg> -#include <cstdio> - -namespace glm{ -namespace detail -{ - GLM_FUNC_QUALIFIER std::string format(const char* msg, ...) - { - std::size_t const STRING_BUFFER(4096); - char text[STRING_BUFFER]; - va_list list; - - if(msg == 0) - return std::string(); - - va_start(list, msg); -# if(GLM_COMPILER & GLM_COMPILER_VC) - vsprintf_s(text, STRING_BUFFER, msg, list); -# else// - vsprintf(text, msg, list); -# endif// - va_end(list); - - return std::string(text); - } - - static const char* LabelTrue = "true"; - static const char* LabelFalse = "false"; - - template <typename T, bool isFloat = false> - struct literal - { - GLM_FUNC_QUALIFIER static char const * value() {return "%d";}; - }; - - template <typename T> - struct literal<T, true> - { - GLM_FUNC_QUALIFIER static char const * value() {return "%f";}; - }; - -# if GLM_MODEL == GLM_MODEL_32 && GLM_COMPILER && GLM_COMPILER_VC - template <> - struct literal<uint64_t, false> - { - GLM_FUNC_QUALIFIER static char const * value() {return "%lld";}; - }; - - template <> - struct literal<int64_t, false> - { - GLM_FUNC_QUALIFIER static char const * value() {return "%lld";}; - }; -# endif//GLM_MODEL == GLM_MODEL_32 && GLM_COMPILER && GLM_COMPILER_VC - - template <typename T> - struct prefix{}; - - template <> - struct prefix<float> - { - GLM_FUNC_QUALIFIER static char const * value() {return "";}; - }; - - template <> - struct prefix<double> - { - GLM_FUNC_QUALIFIER static char const * value() {return "d";}; - }; - - template <> - struct prefix<bool> - { - GLM_FUNC_QUALIFIER static char const * value() {return "b";}; - }; - - template <> - struct prefix<uint8_t> - { - GLM_FUNC_QUALIFIER static char const * value() {return "u8";}; - }; - - template <> - struct prefix<int8_t> - { - GLM_FUNC_QUALIFIER static char const * value() {return "i8";}; - }; - - template <> - struct prefix<uint16_t> - { - GLM_FUNC_QUALIFIER static char const * value() {return "u16";}; - }; - - template <> - struct prefix<int16_t> - { - GLM_FUNC_QUALIFIER static char const * value() {return "i16";}; - }; - - template <> - struct prefix<uint32_t> - { - GLM_FUNC_QUALIFIER static char const * value() {return "u";}; - }; - - template <> - struct prefix<int32_t> - { - GLM_FUNC_QUALIFIER static char const * value() {return "i";}; - }; - - template <> - struct prefix<uint64_t> - { - GLM_FUNC_QUALIFIER static char const * value() {return "u64";}; - }; - - template <> - struct prefix<int64_t> - { - GLM_FUNC_QUALIFIER static char const * value() {return "i64";}; - }; - - template <template <typename, precision> class matType, typename T, precision P> - struct compute_to_string - {}; - - template <precision P> - struct compute_to_string<tvec1, bool, P> - { - GLM_FUNC_QUALIFIER static std::string call(tvec1<bool, P> const & x) - { - return detail::format("bvec1(%s)", - x[0] ? detail::LabelTrue : detail::LabelFalse); - } - }; - - template <precision P> - struct compute_to_string<tvec2, bool, P> - { - GLM_FUNC_QUALIFIER static std::string call(tvec2<bool, P> const & x) - { - return detail::format("bvec2(%s, %s)", - x[0] ? detail::LabelTrue : detail::LabelFalse, - x[1] ? detail::LabelTrue : detail::LabelFalse); - } - }; - - template <precision P> - struct compute_to_string<tvec3, bool, P> - { - GLM_FUNC_QUALIFIER static std::string call(tvec3<bool, P> const & x) - { - return detail::format("bvec3(%s, %s, %s)", - x[0] ? detail::LabelTrue : detail::LabelFalse, - x[1] ? detail::LabelTrue : detail::LabelFalse, - x[2] ? detail::LabelTrue : detail::LabelFalse); - } - }; - - template <precision P> - struct compute_to_string<tvec4, bool, P> - { - GLM_FUNC_QUALIFIER static std::string call(tvec4<bool, P> const & x) - { - return detail::format("bvec4(%s, %s, %s, %s)", - x[0] ? detail::LabelTrue : detail::LabelFalse, - x[1] ? detail::LabelTrue : detail::LabelFalse, - x[2] ? detail::LabelTrue : detail::LabelFalse, - x[3] ? detail::LabelTrue : detail::LabelFalse); - } - }; - - template <typename T, precision P> - struct compute_to_string<tvec1, T, P> - { - GLM_FUNC_QUALIFIER static std::string call(tvec1<T, P> const & x) - { - char const * PrefixStr = prefix<T>::value(); - char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value(); - std::string FormatStr(detail::format("%svec1(%s)", - PrefixStr, - LiteralStr)); - - return detail::format(FormatStr.c_str(), x[0]); - } - }; - - template <typename T, precision P> - struct compute_to_string<tvec2, T, P> - { - GLM_FUNC_QUALIFIER static std::string call(tvec2<T, P> const & x) - { - char const * PrefixStr = prefix<T>::value(); - char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value(); - std::string FormatStr(detail::format("%svec2(%s, %s)", - PrefixStr, - LiteralStr, LiteralStr)); - - return detail::format(FormatStr.c_str(), x[0], x[1]); - } - }; - - template <typename T, precision P> - struct compute_to_string<tvec3, T, P> - { - GLM_FUNC_QUALIFIER static std::string call(tvec3<T, P> const & x) - { - char const * PrefixStr = prefix<T>::value(); - char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value(); - std::string FormatStr(detail::format("%svec3(%s, %s, %s)", - PrefixStr, - LiteralStr, LiteralStr, LiteralStr)); - - return detail::format(FormatStr.c_str(), x[0], x[1], x[2]); - } - }; - - template <typename T, precision P> - struct compute_to_string<tvec4, T, P> - { - GLM_FUNC_QUALIFIER static std::string call(tvec4<T, P> const & x) - { - char const * PrefixStr = prefix<T>::value(); - char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value(); - std::string FormatStr(detail::format("%svec4(%s, %s, %s, %s)", - PrefixStr, - LiteralStr, LiteralStr, LiteralStr, LiteralStr)); - - return detail::format(FormatStr.c_str(), x[0], x[1], x[2], x[3]); - } - }; - - - template <typename T, precision P> - struct compute_to_string<tmat2x2, T, P> - { - GLM_FUNC_QUALIFIER static std::string call(tmat2x2<T, P> const & x) - { - char const * PrefixStr = prefix<T>::value(); - char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value(); - std::string FormatStr(detail::format("%smat2x2((%s, %s), (%s, %s))", - PrefixStr, - LiteralStr, LiteralStr, - LiteralStr, LiteralStr)); - - return detail::format(FormatStr.c_str(), - x[0][0], x[0][1], - x[1][0], x[1][1]); - } - }; - - template <typename T, precision P> - struct compute_to_string<tmat2x3, T, P> - { - GLM_FUNC_QUALIFIER static std::string call(tmat2x3<T, P> const & x) - { - char const * PrefixStr = prefix<T>::value(); - char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value(); - std::string FormatStr(detail::format("%smat2x3((%s, %s, %s), (%s, %s, %s))", - PrefixStr, - LiteralStr, LiteralStr, LiteralStr, - LiteralStr, LiteralStr, LiteralStr)); - - return detail::format(FormatStr.c_str(), - x[0][0], x[0][1], x[0][2], - x[1][0], x[1][1], x[1][2]); - } - }; - - template <typename T, precision P> - struct compute_to_string<tmat2x4, T, P> - { - GLM_FUNC_QUALIFIER static std::string call(tmat2x4<T, P> const & x) - { - char const * PrefixStr = prefix<T>::value(); - char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value(); - std::string FormatStr(detail::format("%smat2x4((%s, %s, %s, %s), (%s, %s, %s, %s))", - PrefixStr, - LiteralStr, LiteralStr, LiteralStr, LiteralStr, - LiteralStr, LiteralStr, LiteralStr, LiteralStr)); - - return detail::format(FormatStr.c_str(), - x[0][0], x[0][1], x[0][2], x[0][3], - x[1][0], x[1][1], x[1][2], x[1][3]); - } - }; - - template <typename T, precision P> - struct compute_to_string<tmat3x2, T, P> - { - GLM_FUNC_QUALIFIER static std::string call(tmat3x2<T, P> const & x) - { - char const * PrefixStr = prefix<T>::value(); - char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value(); - std::string FormatStr(detail::format("%smat3x2((%s, %s), (%s, %s), (%s, %s))", - PrefixStr, - LiteralStr, LiteralStr, - LiteralStr, LiteralStr, - LiteralStr, LiteralStr)); - - return detail::format(FormatStr.c_str(), - x[0][0], x[0][1], - x[1][0], x[1][1], - x[2][0], x[2][1]); - } - }; - - template <typename T, precision P> - struct compute_to_string<tmat3x3, T, P> - { - GLM_FUNC_QUALIFIER static std::string call(tmat3x3<T, P> const & x) - { - char const * PrefixStr = prefix<T>::value(); - char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value(); - std::string FormatStr(detail::format("%smat3x3((%s, %s, %s), (%s, %s, %s), (%s, %s, %s))", - PrefixStr, - LiteralStr, LiteralStr, LiteralStr, - LiteralStr, LiteralStr, LiteralStr, - LiteralStr, LiteralStr, LiteralStr)); - - return detail::format(FormatStr.c_str(), - x[0][0], x[0][1], x[0][2], - x[1][0], x[1][1], x[1][2], - x[2][0], x[2][1], x[2][2]); - } - }; - - template <typename T, precision P> - struct compute_to_string<tmat3x4, T, P> - { - GLM_FUNC_QUALIFIER static std::string call(tmat3x4<T, P> const & x) - { - char const * PrefixStr = prefix<T>::value(); - char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value(); - std::string FormatStr(detail::format("%smat3x4((%s, %s, %s, %s), (%s, %s, %s, %s), (%s, %s, %s, %s))", - PrefixStr, - LiteralStr, LiteralStr, LiteralStr, LiteralStr, - LiteralStr, LiteralStr, LiteralStr, LiteralStr, - LiteralStr, LiteralStr, LiteralStr, LiteralStr)); - - return detail::format(FormatStr.c_str(), - x[0][0], x[0][1], x[0][2], x[0][3], - x[1][0], x[1][1], x[1][2], x[1][3], - x[2][0], x[2][1], x[2][2], x[2][3]); - } - }; - - template <typename T, precision P> - struct compute_to_string<tmat4x2, T, P> - { - GLM_FUNC_QUALIFIER static std::string call(tmat4x2<T, P> const & x) - { - char const * PrefixStr = prefix<T>::value(); - char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value(); - std::string FormatStr(detail::format("%smat4x2((%s, %s), (%s, %s), (%s, %s), (%s, %s))", - PrefixStr, - LiteralStr, LiteralStr, - LiteralStr, LiteralStr, - LiteralStr, LiteralStr, - LiteralStr, LiteralStr)); - - return detail::format(FormatStr.c_str(), - x[0][0], x[0][1], - x[1][0], x[1][1], - x[2][0], x[2][1], - x[3][0], x[3][1]); - } - }; - - template <typename T, precision P> - struct compute_to_string<tmat4x3, T, P> - { - GLM_FUNC_QUALIFIER static std::string call(tmat4x3<T, P> const & x) - { - char const * PrefixStr = prefix<T>::value(); - char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value(); - std::string FormatStr(detail::format("%smat4x3((%s, %s, %s), (%s, %s, %s), (%s, %s, %s), (%s, %s, %s))", - PrefixStr, - LiteralStr, LiteralStr, LiteralStr, - LiteralStr, LiteralStr, LiteralStr, - LiteralStr, LiteralStr, LiteralStr, - LiteralStr, LiteralStr, LiteralStr)); - - return detail::format(FormatStr.c_str(), - x[0][0], x[0][1], x[0][2], - x[1][0], x[1][1], x[1][2], - x[2][0], x[2][1], x[2][2], - x[3][0], x[3][1], x[3][2]); - } - }; - - template <typename T, precision P> - struct compute_to_string<tmat4x4, T, P> - { - GLM_FUNC_QUALIFIER static std::string call(tmat4x4<T, P> const & x) - { - char const * PrefixStr = prefix<T>::value(); - char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value(); - std::string FormatStr(detail::format("%smat4x4((%s, %s, %s, %s), (%s, %s, %s, %s), (%s, %s, %s, %s), (%s, %s, %s, %s))", - PrefixStr, - LiteralStr, LiteralStr, LiteralStr, LiteralStr, - LiteralStr, LiteralStr, LiteralStr, LiteralStr, - LiteralStr, LiteralStr, LiteralStr, LiteralStr, - LiteralStr, LiteralStr, LiteralStr, LiteralStr)); - - return detail::format(FormatStr.c_str(), - x[0][0], x[0][1], x[0][2], x[0][3], - x[1][0], x[1][1], x[1][2], x[1][3], - x[2][0], x[2][1], x[2][2], x[2][3], - x[3][0], x[3][1], x[3][2], x[3][3]); - } - }; - - - template <typename T, precision P> - struct compute_to_string<tquat, T, P> - { - GLM_FUNC_QUALIFIER static std::string call(tquat<T, P> const & x) - { - char const * PrefixStr = prefix<T>::value(); - char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value(); - std::string FormatStr(detail::format("%squat(%s, %s, %s, %s)", - PrefixStr, - LiteralStr, LiteralStr, LiteralStr, LiteralStr)); - - return detail::format(FormatStr.c_str(), x[0], x[1], x[2], x[3]); - } - }; - - template <typename T, precision P> - struct compute_to_string<tdualquat, T, P> - { - GLM_FUNC_QUALIFIER static std::string call(tdualquat<T, P> const & x) - { - char const * PrefixStr = prefix<T>::value(); - char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value(); - std::string FormatStr(detail::format("%sdualquat((%s, %s, %s, %s), (%s, %s, %s, %s))", - PrefixStr, - LiteralStr, LiteralStr, LiteralStr, LiteralStr)); - - return detail::format(FormatStr.c_str(), x.real[0], x.real[1], x.real[2], x.real[3], x.dual[0], x.dual[1], x.dual[2], x.dual[3]); - } - }; - -}//namespace detail - -template <template <typename, precision> class matType, typename T, precision P> -GLM_FUNC_QUALIFIER std::string to_string(matType<T, P> const & x) -{ - return detail::compute_to_string<matType, T, P>::call(x); -} - -}//namespace glm diff --git a/depedencies/include/glm/gtx/transform.hpp b/depedencies/include/glm/gtx/transform.hpp deleted file mode 100644 index 365748b..0000000 --- a/depedencies/include/glm/gtx/transform.hpp +++ /dev/null @@ -1,56 +0,0 @@ -/// @ref gtx_transform -/// @file glm/gtx/transform.hpp -/// -/// @see core (dependence) -/// @see gtc_matrix_transform (dependence) -/// @see gtx_transform -/// @see gtx_transform2 -/// -/// @defgroup gtx_transform GLM_GTX_transform -/// @ingroup gtx -/// -/// @brief Add transformation matrices -/// -/// <glm/gtx/transform.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" -#include "../gtc/matrix_transform.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_transform extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_transform - /// @{ - - /// Transforms a matrix with a translation 4 * 4 matrix created from 3 scalars. - /// @see gtc_matrix_transform - /// @see gtx_transform - template <typename T, precision P> - GLM_FUNC_DECL tmat4x4<T, P> translate( - tvec3<T, P> const & v); - - /// Builds a rotation 4 * 4 matrix created from an axis of 3 scalars and an angle expressed in radians. - /// @see gtc_matrix_transform - /// @see gtx_transform - template <typename T, precision P> - GLM_FUNC_DECL tmat4x4<T, P> rotate( - T angle, - tvec3<T, P> const & v); - - /// Transforms a matrix with a scale 4 * 4 matrix created from a vector of 3 components. - /// @see gtc_matrix_transform - /// @see gtx_transform - template <typename T, precision P> - GLM_FUNC_DECL tmat4x4<T, P> scale( - tvec3<T, P> const & v); - - /// @} -}// namespace glm - -#include "transform.inl" diff --git a/depedencies/include/glm/gtx/transform.inl b/depedencies/include/glm/gtx/transform.inl deleted file mode 100644 index 516d866..0000000 --- a/depedencies/include/glm/gtx/transform.inl +++ /dev/null @@ -1,24 +0,0 @@ -/// @ref gtx_transform -/// @file glm/gtx/transform.inl - -namespace glm -{ - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> translate(tvec3<T, P> const & v) - { - return translate(tmat4x4<T, P>(static_cast<T>(1)), v); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> rotate(T angle, tvec3<T, P> const & v) - { - return rotate(tmat4x4<T, P>(static_cast<T>(1)), angle, v); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> scale(tvec3<T, P> const & v) - { - return scale(tmat4x4<T, P>(static_cast<T>(1)), v); - } - -}//namespace glm diff --git a/depedencies/include/glm/gtx/transform2.hpp b/depedencies/include/glm/gtx/transform2.hpp deleted file mode 100644 index bf5fbc9..0000000 --- a/depedencies/include/glm/gtx/transform2.hpp +++ /dev/null @@ -1,107 +0,0 @@ -/// @ref gtx_transform2 -/// @file glm/gtx/transform2.hpp -/// -/// @see core (dependence) -/// @see gtx_transform (dependence) -/// -/// @defgroup gtx_transform2 GLM_GTX_transform2 -/// @ingroup gtx -/// -/// @brief Add extra transformation matrices -/// -/// <glm/gtx/transform2.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" -#include "../gtx/transform.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_transform2 extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_transform2 - /// @{ - - //! Transforms a matrix with a shearing on X axis. - //! From GLM_GTX_transform2 extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat3x3<T, P> shearX2D( - tmat3x3<T, P> const & m, - T y); - - //! Transforms a matrix with a shearing on Y axis. - //! From GLM_GTX_transform2 extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat3x3<T, P> shearY2D( - tmat3x3<T, P> const & m, - T x); - - //! Transforms a matrix with a shearing on X axis - //! From GLM_GTX_transform2 extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat4x4<T, P> shearX3D( - const tmat4x4<T, P> & m, - T y, - T z); - - //! Transforms a matrix with a shearing on Y axis. - //! From GLM_GTX_transform2 extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat4x4<T, P> shearY3D( - const tmat4x4<T, P> & m, - T x, - T z); - - //! Transforms a matrix with a shearing on Z axis. - //! From GLM_GTX_transform2 extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat4x4<T, P> shearZ3D( - const tmat4x4<T, P> & m, - T x, - T y); - - //template <typename T> GLM_FUNC_QUALIFIER tmat4x4<T, P> shear(const tmat4x4<T, P> & m, shearPlane, planePoint, angle) - // Identity + tan(angle) * cross(Normal, OnPlaneVector) 0 - // - dot(PointOnPlane, normal) * OnPlaneVector 1 - - // Reflect functions seem to don't work - //template <typename T> tmat3x3<T, P> reflect2D(const tmat3x3<T, P> & m, const tvec3<T, P>& normal){return reflect2DGTX(m, normal);} //!< \brief Build a reflection matrix (from GLM_GTX_transform2 extension) - //template <typename T> tmat4x4<T, P> reflect3D(const tmat4x4<T, P> & m, const tvec3<T, P>& normal){return reflect3DGTX(m, normal);} //!< \brief Build a reflection matrix (from GLM_GTX_transform2 extension) - - //! Build planar projection matrix along normal axis. - //! From GLM_GTX_transform2 extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat3x3<T, P> proj2D( - const tmat3x3<T, P> & m, - const tvec3<T, P>& normal); - - //! Build planar projection matrix along normal axis. - //! From GLM_GTX_transform2 extension. - template <typename T, precision P> - GLM_FUNC_DECL tmat4x4<T, P> proj3D( - const tmat4x4<T, P> & m, - const tvec3<T, P>& normal); - - //! Build a scale bias matrix. - //! From GLM_GTX_transform2 extension. - template <typename valType, precision P> - GLM_FUNC_DECL tmat4x4<valType, P> scaleBias( - valType scale, - valType bias); - - //! Build a scale bias matrix. - //! From GLM_GTX_transform2 extension. - template <typename valType, precision P> - GLM_FUNC_DECL tmat4x4<valType, P> scaleBias( - tmat4x4<valType, P> const & m, - valType scale, - valType bias); - - /// @} -}// namespace glm - -#include "transform2.inl" diff --git a/depedencies/include/glm/gtx/transform2.inl b/depedencies/include/glm/gtx/transform2.inl deleted file mode 100644 index 6e0ab31..0000000 --- a/depedencies/include/glm/gtx/transform2.inl +++ /dev/null @@ -1,126 +0,0 @@ -/// @ref gtx_transform2 -/// @file glm/gtx/transform2.inl - -namespace glm -{ - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> shearX2D(tmat3x3<T, P> const& m, T s) - { - tmat3x3<T, P> r(1); - r[1][0] = s; - return m * r; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> shearY2D(tmat3x3<T, P> const& m, T s) - { - tmat3x3<T, P> r(1); - r[0][1] = s; - return m * r; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> shearX3D(tmat4x4<T, P> const& m, T s, T t) - { - tmat4x4<T, P> r(1); - r[0][1] = s; - r[0][2] = t; - return m * r; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> shearY3D(tmat4x4<T, P> const& m, T s, T t) - { - tmat4x4<T, P> r(1); - r[1][0] = s; - r[1][2] = t; - return m * r; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> shearZ3D(tmat4x4<T, P> const& m, T s, T t) - { - tmat4x4<T, P> r(1); - r[2][0] = s; - r[2][1] = t; - return m * r; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> reflect2D(tmat3x3<T, P> const& m, tvec3<T, P> const& normal) - { - tmat3x3<T, P> r(static_cast<T>(1)); - r[0][0] = static_cast<T>(1) - static_cast<T>(2) * normal.x * normal.x; - r[0][1] = -static_cast<T>(2) * normal.x * normal.y; - r[1][0] = -static_cast<T>(2) * normal.x * normal.y; - r[1][1] = static_cast<T>(1) - static_cast<T>(2) * normal.y * normal.y; - return m * r; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> reflect3D(tmat4x4<T, P> const& m, tvec3<T, P> const& normal) - { - tmat4x4<T, P> r(static_cast<T>(1)); - r[0][0] = static_cast<T>(1) - static_cast<T>(2) * normal.x * normal.x; - r[0][1] = -static_cast<T>(2) * normal.x * normal.y; - r[0][2] = -static_cast<T>(2) * normal.x * normal.z; - - r[1][0] = -static_cast<T>(2) * normal.x * normal.y; - r[1][1] = static_cast<T>(1) - static_cast<T>(2) * normal.y * normal.y; - r[1][2] = -static_cast<T>(2) * normal.y * normal.z; - - r[2][0] = -static_cast<T>(2) * normal.x * normal.z; - r[2][1] = -static_cast<T>(2) * normal.y * normal.z; - r[2][2] = static_cast<T>(1) - static_cast<T>(2) * normal.z * normal.z; - return m * r; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> proj2D( - const tmat3x3<T, P>& m, - const tvec3<T, P>& normal) - { - tmat3x3<T, P> r(static_cast<T>(1)); - r[0][0] = static_cast<T>(1) - normal.x * normal.x; - r[0][1] = - normal.x * normal.y; - r[1][0] = - normal.x * normal.y; - r[1][1] = static_cast<T>(1) - normal.y * normal.y; - return m * r; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> proj3D( - const tmat4x4<T, P>& m, - const tvec3<T, P>& normal) - { - tmat4x4<T, P> r(static_cast<T>(1)); - r[0][0] = static_cast<T>(1) - normal.x * normal.x; - r[0][1] = - normal.x * normal.y; - r[0][2] = - normal.x * normal.z; - r[1][0] = - normal.x * normal.y; - r[1][1] = static_cast<T>(1) - normal.y * normal.y; - r[1][2] = - normal.y * normal.z; - r[2][0] = - normal.x * normal.z; - r[2][1] = - normal.y * normal.z; - r[2][2] = static_cast<T>(1) - normal.z * normal.z; - return m * r; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> scaleBias(T scale, T bias) - { - tmat4x4<T, P> result; - result[3] = tvec4<T, P>(tvec3<T, P>(bias), static_cast<T>(1)); - result[0][0] = scale; - result[1][1] = scale; - result[2][2] = scale; - return result; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat4x4<T, P> scaleBias(tmat4x4<T, P> const& m, T scale, T bias) - { - return m * scaleBias(scale, bias); - } -}//namespace glm - diff --git a/depedencies/include/glm/gtx/type_aligned.hpp b/depedencies/include/glm/gtx/type_aligned.hpp deleted file mode 100644 index 8962a6f..0000000 --- a/depedencies/include/glm/gtx/type_aligned.hpp +++ /dev/null @@ -1,966 +0,0 @@ -/// @ref gtx_type_aligned -/// @file glm/gtx/type_aligned.hpp -/// -/// @see core (dependence) -/// @see gtc_quaternion (dependence) -/// -/// @defgroup gtx_type_aligned GLM_GTX_type_aligned -/// @ingroup gtx -/// -/// @brief Defines aligned types. -/// -/// @ref core_precision defines aligned types. -/// -/// <glm/gtx/type_aligned.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../gtc/type_precision.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_type_aligned extension included") -#endif - -namespace glm -{ - /////////////////////////// - // Signed int vector types - - /// @addtogroup gtx_type_aligned - /// @{ - - /// Low precision 8 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_int8, aligned_lowp_int8, 1); - - /// Low precision 16 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_int16, aligned_lowp_int16, 2); - - /// Low precision 32 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_int32, aligned_lowp_int32, 4); - - /// Low precision 64 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_int64, aligned_lowp_int64, 8); - - - /// Low precision 8 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_int8_t, aligned_lowp_int8_t, 1); - - /// Low precision 16 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_int16_t, aligned_lowp_int16_t, 2); - - /// Low precision 32 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_int32_t, aligned_lowp_int32_t, 4); - - /// Low precision 64 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_int64_t, aligned_lowp_int64_t, 8); - - - /// Low precision 8 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_i8, aligned_lowp_i8, 1); - - /// Low precision 16 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_i16, aligned_lowp_i16, 2); - - /// Low precision 32 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_i32, aligned_lowp_i32, 4); - - /// Low precision 64 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_i64, aligned_lowp_i64, 8); - - - /// Medium precision 8 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_int8, aligned_mediump_int8, 1); - - /// Medium precision 16 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_int16, aligned_mediump_int16, 2); - - /// Medium precision 32 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_int32, aligned_mediump_int32, 4); - - /// Medium precision 64 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_int64, aligned_mediump_int64, 8); - - - /// Medium precision 8 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_int8_t, aligned_mediump_int8_t, 1); - - /// Medium precision 16 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_int16_t, aligned_mediump_int16_t, 2); - - /// Medium precision 32 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_int32_t, aligned_mediump_int32_t, 4); - - /// Medium precision 64 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_int64_t, aligned_mediump_int64_t, 8); - - - /// Medium precision 8 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_i8, aligned_mediump_i8, 1); - - /// Medium precision 16 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_i16, aligned_mediump_i16, 2); - - /// Medium precision 32 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_i32, aligned_mediump_i32, 4); - - /// Medium precision 64 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_i64, aligned_mediump_i64, 8); - - - /// High precision 8 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_int8, aligned_highp_int8, 1); - - /// High precision 16 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_int16, aligned_highp_int16, 2); - - /// High precision 32 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_int32, aligned_highp_int32, 4); - - /// High precision 64 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_int64, aligned_highp_int64, 8); - - - /// High precision 8 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_int8_t, aligned_highp_int8_t, 1); - - /// High precision 16 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_int16_t, aligned_highp_int16_t, 2); - - /// High precision 32 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_int32_t, aligned_highp_int32_t, 4); - - /// High precision 64 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_int64_t, aligned_highp_int64_t, 8); - - - /// High precision 8 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_i8, aligned_highp_i8, 1); - - /// High precision 16 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_i16, aligned_highp_i16, 2); - - /// High precision 32 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_i32, aligned_highp_i32, 4); - - /// High precision 64 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_i64, aligned_highp_i64, 8); - - - /// Default precision 8 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(int8, aligned_int8, 1); - - /// Default precision 16 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(int16, aligned_int16, 2); - - /// Default precision 32 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(int32, aligned_int32, 4); - - /// Default precision 64 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(int64, aligned_int64, 8); - - - /// Default precision 8 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(int8_t, aligned_int8_t, 1); - - /// Default precision 16 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(int16_t, aligned_int16_t, 2); - - /// Default precision 32 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(int32_t, aligned_int32_t, 4); - - /// Default precision 64 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(int64_t, aligned_int64_t, 8); - - - /// Default precision 8 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(i8, aligned_i8, 1); - - /// Default precision 16 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(i16, aligned_i16, 2); - - /// Default precision 32 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(i32, aligned_i32, 4); - - /// Default precision 64 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(i64, aligned_i64, 8); - - - /// Default precision 32 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(ivec1, aligned_ivec1, 4); - - /// Default precision 32 bit signed integer aligned vector of 2 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(ivec2, aligned_ivec2, 8); - - /// Default precision 32 bit signed integer aligned vector of 3 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(ivec3, aligned_ivec3, 16); - - /// Default precision 32 bit signed integer aligned vector of 4 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(ivec4, aligned_ivec4, 16); - - - /// Default precision 8 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(i8vec1, aligned_i8vec1, 1); - - /// Default precision 8 bit signed integer aligned vector of 2 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(i8vec2, aligned_i8vec2, 2); - - /// Default precision 8 bit signed integer aligned vector of 3 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(i8vec3, aligned_i8vec3, 4); - - /// Default precision 8 bit signed integer aligned vector of 4 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(i8vec4, aligned_i8vec4, 4); - - - /// Default precision 16 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(i16vec1, aligned_i16vec1, 2); - - /// Default precision 16 bit signed integer aligned vector of 2 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(i16vec2, aligned_i16vec2, 4); - - /// Default precision 16 bit signed integer aligned vector of 3 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(i16vec3, aligned_i16vec3, 8); - - /// Default precision 16 bit signed integer aligned vector of 4 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(i16vec4, aligned_i16vec4, 8); - - - /// Default precision 32 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(i32vec1, aligned_i32vec1, 4); - - /// Default precision 32 bit signed integer aligned vector of 2 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(i32vec2, aligned_i32vec2, 8); - - /// Default precision 32 bit signed integer aligned vector of 3 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(i32vec3, aligned_i32vec3, 16); - - /// Default precision 32 bit signed integer aligned vector of 4 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(i32vec4, aligned_i32vec4, 16); - - - /// Default precision 64 bit signed integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(i64vec1, aligned_i64vec1, 8); - - /// Default precision 64 bit signed integer aligned vector of 2 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(i64vec2, aligned_i64vec2, 16); - - /// Default precision 64 bit signed integer aligned vector of 3 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(i64vec3, aligned_i64vec3, 32); - - /// Default precision 64 bit signed integer aligned vector of 4 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(i64vec4, aligned_i64vec4, 32); - - - ///////////////////////////// - // Unsigned int vector types - - /// Low precision 8 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_uint8, aligned_lowp_uint8, 1); - - /// Low precision 16 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_uint16, aligned_lowp_uint16, 2); - - /// Low precision 32 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_uint32, aligned_lowp_uint32, 4); - - /// Low precision 64 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_uint64, aligned_lowp_uint64, 8); - - - /// Low precision 8 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_uint8_t, aligned_lowp_uint8_t, 1); - - /// Low precision 16 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_uint16_t, aligned_lowp_uint16_t, 2); - - /// Low precision 32 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_uint32_t, aligned_lowp_uint32_t, 4); - - /// Low precision 64 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_uint64_t, aligned_lowp_uint64_t, 8); - - - /// Low precision 8 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_u8, aligned_lowp_u8, 1); - - /// Low precision 16 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_u16, aligned_lowp_u16, 2); - - /// Low precision 32 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_u32, aligned_lowp_u32, 4); - - /// Low precision 64 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(lowp_u64, aligned_lowp_u64, 8); - - - /// Medium precision 8 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_uint8, aligned_mediump_uint8, 1); - - /// Medium precision 16 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_uint16, aligned_mediump_uint16, 2); - - /// Medium precision 32 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_uint32, aligned_mediump_uint32, 4); - - /// Medium precision 64 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_uint64, aligned_mediump_uint64, 8); - - - /// Medium precision 8 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_uint8_t, aligned_mediump_uint8_t, 1); - - /// Medium precision 16 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_uint16_t, aligned_mediump_uint16_t, 2); - - /// Medium precision 32 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_uint32_t, aligned_mediump_uint32_t, 4); - - /// Medium precision 64 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_uint64_t, aligned_mediump_uint64_t, 8); - - - /// Medium precision 8 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_u8, aligned_mediump_u8, 1); - - /// Medium precision 16 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_u16, aligned_mediump_u16, 2); - - /// Medium precision 32 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_u32, aligned_mediump_u32, 4); - - /// Medium precision 64 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mediump_u64, aligned_mediump_u64, 8); - - - /// High precision 8 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_uint8, aligned_highp_uint8, 1); - - /// High precision 16 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_uint16, aligned_highp_uint16, 2); - - /// High precision 32 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_uint32, aligned_highp_uint32, 4); - - /// High precision 64 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_uint64, aligned_highp_uint64, 8); - - - /// High precision 8 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_uint8_t, aligned_highp_uint8_t, 1); - - /// High precision 16 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_uint16_t, aligned_highp_uint16_t, 2); - - /// High precision 32 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_uint32_t, aligned_highp_uint32_t, 4); - - /// High precision 64 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_uint64_t, aligned_highp_uint64_t, 8); - - - /// High precision 8 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_u8, aligned_highp_u8, 1); - - /// High precision 16 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_u16, aligned_highp_u16, 2); - - /// High precision 32 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_u32, aligned_highp_u32, 4); - - /// High precision 64 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(highp_u64, aligned_highp_u64, 8); - - - /// Default precision 8 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(uint8, aligned_uint8, 1); - - /// Default precision 16 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(uint16, aligned_uint16, 2); - - /// Default precision 32 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(uint32, aligned_uint32, 4); - - /// Default precision 64 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(uint64, aligned_uint64, 8); - - - /// Default precision 8 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(uint8_t, aligned_uint8_t, 1); - - /// Default precision 16 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(uint16_t, aligned_uint16_t, 2); - - /// Default precision 32 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(uint32_t, aligned_uint32_t, 4); - - /// Default precision 64 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(uint64_t, aligned_uint64_t, 8); - - - /// Default precision 8 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(u8, aligned_u8, 1); - - /// Default precision 16 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(u16, aligned_u16, 2); - - /// Default precision 32 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(u32, aligned_u32, 4); - - /// Default precision 64 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(u64, aligned_u64, 8); - - - /// Default precision 32 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(uvec1, aligned_uvec1, 4); - - /// Default precision 32 bit unsigned integer aligned vector of 2 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(uvec2, aligned_uvec2, 8); - - /// Default precision 32 bit unsigned integer aligned vector of 3 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(uvec3, aligned_uvec3, 16); - - /// Default precision 32 bit unsigned integer aligned vector of 4 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(uvec4, aligned_uvec4, 16); - - - /// Default precision 8 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(u8vec1, aligned_u8vec1, 1); - - /// Default precision 8 bit unsigned integer aligned vector of 2 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(u8vec2, aligned_u8vec2, 2); - - /// Default precision 8 bit unsigned integer aligned vector of 3 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(u8vec3, aligned_u8vec3, 4); - - /// Default precision 8 bit unsigned integer aligned vector of 4 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(u8vec4, aligned_u8vec4, 4); - - - /// Default precision 16 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(u16vec1, aligned_u16vec1, 2); - - /// Default precision 16 bit unsigned integer aligned vector of 2 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(u16vec2, aligned_u16vec2, 4); - - /// Default precision 16 bit unsigned integer aligned vector of 3 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(u16vec3, aligned_u16vec3, 8); - - /// Default precision 16 bit unsigned integer aligned vector of 4 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(u16vec4, aligned_u16vec4, 8); - - - /// Default precision 32 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(u32vec1, aligned_u32vec1, 4); - - /// Default precision 32 bit unsigned integer aligned vector of 2 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(u32vec2, aligned_u32vec2, 8); - - /// Default precision 32 bit unsigned integer aligned vector of 3 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(u32vec3, aligned_u32vec3, 16); - - /// Default precision 32 bit unsigned integer aligned vector of 4 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(u32vec4, aligned_u32vec4, 16); - - - /// Default precision 64 bit unsigned integer aligned scalar type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(u64vec1, aligned_u64vec1, 8); - - /// Default precision 64 bit unsigned integer aligned vector of 2 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(u64vec2, aligned_u64vec2, 16); - - /// Default precision 64 bit unsigned integer aligned vector of 3 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(u64vec3, aligned_u64vec3, 32); - - /// Default precision 64 bit unsigned integer aligned vector of 4 components type. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(u64vec4, aligned_u64vec4, 32); - - - ////////////////////// - // Float vector types - - /// 32 bit single-precision floating-point aligned scalar. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(float32, aligned_float32, 4); - - /// 64 bit double-precision floating-point aligned scalar. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(float64, aligned_float64, 8); - - - /// 32 bit single-precision floating-point aligned scalar. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(float32_t, aligned_float32_t, 4); - - /// 64 bit double-precision floating-point aligned scalar. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(float64_t, aligned_float64_t, 8); - - - /// 32 bit single-precision floating-point aligned scalar. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(float32, aligned_f32, 4); - - /// 64 bit double-precision floating-point aligned scalar. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(float64, aligned_f64, 8); - - - /// Single-precision floating-point aligned vector of 1 component. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(vec1, aligned_vec1, 4); - - /// Single-precision floating-point aligned vector of 2 components. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(vec2, aligned_vec2, 8); - - /// Single-precision floating-point aligned vector of 3 components. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(vec3, aligned_vec3, 16); - - /// Single-precision floating-point aligned vector of 4 components. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(vec4, aligned_vec4, 16); - - - /// Single-precision floating-point aligned vector of 1 component. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(fvec1, aligned_fvec1, 4); - - /// Single-precision floating-point aligned vector of 2 components. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(fvec2, aligned_fvec2, 8); - - /// Single-precision floating-point aligned vector of 3 components. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(fvec3, aligned_fvec3, 16); - - /// Single-precision floating-point aligned vector of 4 components. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(fvec4, aligned_fvec4, 16); - - - /// Single-precision floating-point aligned vector of 1 component. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f32vec1, aligned_f32vec1, 4); - - /// Single-precision floating-point aligned vector of 2 components. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f32vec2, aligned_f32vec2, 8); - - /// Single-precision floating-point aligned vector of 3 components. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f32vec3, aligned_f32vec3, 16); - - /// Single-precision floating-point aligned vector of 4 components. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f32vec4, aligned_f32vec4, 16); - - - /// Double-precision floating-point aligned vector of 1 component. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(dvec1, aligned_dvec1, 8); - - /// Double-precision floating-point aligned vector of 2 components. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(dvec2, aligned_dvec2, 16); - - /// Double-precision floating-point aligned vector of 3 components. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(dvec3, aligned_dvec3, 32); - - /// Double-precision floating-point aligned vector of 4 components. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(dvec4, aligned_dvec4, 32); - - - /// Double-precision floating-point aligned vector of 1 component. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f64vec1, aligned_f64vec1, 8); - - /// Double-precision floating-point aligned vector of 2 components. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f64vec2, aligned_f64vec2, 16); - - /// Double-precision floating-point aligned vector of 3 components. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f64vec3, aligned_f64vec3, 32); - - /// Double-precision floating-point aligned vector of 4 components. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f64vec4, aligned_f64vec4, 32); - - - ////////////////////// - // Float matrix types - - /// Single-precision floating-point aligned 1x1 matrix. - /// @see gtx_type_aligned - //typedef detail::tmat1<f32> mat1; - - /// Single-precision floating-point aligned 2x2 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mat2, aligned_mat2, 16); - - /// Single-precision floating-point aligned 3x3 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mat3, aligned_mat3, 16); - - /// Single-precision floating-point aligned 4x4 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mat4, aligned_mat4, 16); - - - /// Single-precision floating-point aligned 1x1 matrix. - /// @see gtx_type_aligned - //typedef detail::tmat1x1<f32> mat1; - - /// Single-precision floating-point aligned 2x2 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mat2x2, aligned_mat2x2, 16); - - /// Single-precision floating-point aligned 3x3 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mat3x3, aligned_mat3x3, 16); - - /// Single-precision floating-point aligned 4x4 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(mat4x4, aligned_mat4x4, 16); - - - /// Single-precision floating-point aligned 1x1 matrix. - /// @see gtx_type_aligned - //typedef detail::tmat1x1<f32> fmat1; - - /// Single-precision floating-point aligned 2x2 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(fmat2x2, aligned_fmat2, 16); - - /// Single-precision floating-point aligned 3x3 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(fmat3x3, aligned_fmat3, 16); - - /// Single-precision floating-point aligned 4x4 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(fmat4x4, aligned_fmat4, 16); - - - /// Single-precision floating-point aligned 1x1 matrix. - /// @see gtx_type_aligned - //typedef f32 fmat1x1; - - /// Single-precision floating-point aligned 2x2 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(fmat2x2, aligned_fmat2x2, 16); - - /// Single-precision floating-point aligned 2x3 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(fmat2x3, aligned_fmat2x3, 16); - - /// Single-precision floating-point aligned 2x4 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(fmat2x4, aligned_fmat2x4, 16); - - /// Single-precision floating-point aligned 3x2 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(fmat3x2, aligned_fmat3x2, 16); - - /// Single-precision floating-point aligned 3x3 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(fmat3x3, aligned_fmat3x3, 16); - - /// Single-precision floating-point aligned 3x4 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(fmat3x4, aligned_fmat3x4, 16); - - /// Single-precision floating-point aligned 4x2 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(fmat4x2, aligned_fmat4x2, 16); - - /// Single-precision floating-point aligned 4x3 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(fmat4x3, aligned_fmat4x3, 16); - - /// Single-precision floating-point aligned 4x4 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(fmat4x4, aligned_fmat4x4, 16); - - - /// Single-precision floating-point aligned 1x1 matrix. - /// @see gtx_type_aligned - //typedef detail::tmat1x1<f32, defaultp> f32mat1; - - /// Single-precision floating-point aligned 2x2 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f32mat2x2, aligned_f32mat2, 16); - - /// Single-precision floating-point aligned 3x3 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f32mat3x3, aligned_f32mat3, 16); - - /// Single-precision floating-point aligned 4x4 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f32mat4x4, aligned_f32mat4, 16); - - - /// Single-precision floating-point aligned 1x1 matrix. - /// @see gtx_type_aligned - //typedef f32 f32mat1x1; - - /// Single-precision floating-point aligned 2x2 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f32mat2x2, aligned_f32mat2x2, 16); - - /// Single-precision floating-point aligned 2x3 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f32mat2x3, aligned_f32mat2x3, 16); - - /// Single-precision floating-point aligned 2x4 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f32mat2x4, aligned_f32mat2x4, 16); - - /// Single-precision floating-point aligned 3x2 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f32mat3x2, aligned_f32mat3x2, 16); - - /// Single-precision floating-point aligned 3x3 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f32mat3x3, aligned_f32mat3x3, 16); - - /// Single-precision floating-point aligned 3x4 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f32mat3x4, aligned_f32mat3x4, 16); - - /// Single-precision floating-point aligned 4x2 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f32mat4x2, aligned_f32mat4x2, 16); - - /// Single-precision floating-point aligned 4x3 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f32mat4x3, aligned_f32mat4x3, 16); - - /// Single-precision floating-point aligned 4x4 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f32mat4x4, aligned_f32mat4x4, 16); - - - /// Double-precision floating-point aligned 1x1 matrix. - /// @see gtx_type_aligned - //typedef detail::tmat1x1<f64, defaultp> f64mat1; - - /// Double-precision floating-point aligned 2x2 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f64mat2x2, aligned_f64mat2, 32); - - /// Double-precision floating-point aligned 3x3 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f64mat3x3, aligned_f64mat3, 32); - - /// Double-precision floating-point aligned 4x4 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f64mat4x4, aligned_f64mat4, 32); - - - /// Double-precision floating-point aligned 1x1 matrix. - /// @see gtx_type_aligned - //typedef f64 f64mat1x1; - - /// Double-precision floating-point aligned 2x2 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f64mat2x2, aligned_f64mat2x2, 32); - - /// Double-precision floating-point aligned 2x3 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f64mat2x3, aligned_f64mat2x3, 32); - - /// Double-precision floating-point aligned 2x4 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f64mat2x4, aligned_f64mat2x4, 32); - - /// Double-precision floating-point aligned 3x2 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f64mat3x2, aligned_f64mat3x2, 32); - - /// Double-precision floating-point aligned 3x3 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f64mat3x3, aligned_f64mat3x3, 32); - - /// Double-precision floating-point aligned 3x4 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f64mat3x4, aligned_f64mat3x4, 32); - - /// Double-precision floating-point aligned 4x2 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f64mat4x2, aligned_f64mat4x2, 32); - - /// Double-precision floating-point aligned 4x3 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f64mat4x3, aligned_f64mat4x3, 32); - - /// Double-precision floating-point aligned 4x4 matrix. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f64mat4x4, aligned_f64mat4x4, 32); - - - ////////////////////////// - // Quaternion types - - /// Single-precision floating-point aligned quaternion. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(quat, aligned_quat, 16); - - /// Single-precision floating-point aligned quaternion. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(fquat, aligned_fquat, 16); - - /// Double-precision floating-point aligned quaternion. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(dquat, aligned_dquat, 32); - - /// Single-precision floating-point aligned quaternion. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f32quat, aligned_f32quat, 16); - - /// Double-precision floating-point aligned quaternion. - /// @see gtx_type_aligned - GLM_ALIGNED_TYPEDEF(f64quat, aligned_f64quat, 32); - - /// @} -}//namespace glm - -#include "type_aligned.inl" diff --git a/depedencies/include/glm/gtx/type_aligned.inl b/depedencies/include/glm/gtx/type_aligned.inl deleted file mode 100644 index 83202df..0000000 --- a/depedencies/include/glm/gtx/type_aligned.inl +++ /dev/null @@ -1,7 +0,0 @@ -/// @ref gtc_type_aligned -/// @file glm/gtc/type_aligned.inl - -namespace glm -{ - -} diff --git a/depedencies/include/glm/gtx/type_trait.hpp b/depedencies/include/glm/gtx/type_trait.hpp deleted file mode 100644 index 0207a06..0000000 --- a/depedencies/include/glm/gtx/type_trait.hpp +++ /dev/null @@ -1,252 +0,0 @@ -/// @ref gtx_type_trait -/// @file glm/gtx/type_trait.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_type_trait GLM_GTX_type_trait -/// @ingroup gtx -/// -/// @brief Defines traits for each type. -/// -/// <glm/gtx/type_trait.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../detail/type_vec2.hpp" -#include "../detail/type_vec3.hpp" -#include "../detail/type_vec4.hpp" -#include "../detail/type_mat2x2.hpp" -#include "../detail/type_mat2x3.hpp" -#include "../detail/type_mat2x4.hpp" -#include "../detail/type_mat3x2.hpp" -#include "../detail/type_mat3x3.hpp" -#include "../detail/type_mat3x4.hpp" -#include "../detail/type_mat4x2.hpp" -#include "../detail/type_mat4x3.hpp" -#include "../detail/type_mat4x4.hpp" -#include "../gtc/quaternion.hpp" -#include "../gtx/dual_quaternion.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_type_trait extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_type_trait - /// @{ - - template <template <typename, precision> class genType, typename T, precision P> - struct type - { - static bool const is_vec = false; - static bool const is_mat = false; - static bool const is_quat = false; - static length_t const components = 0; - static length_t const cols = 0; - static length_t const rows = 0; - }; - - template <typename T, precision P> - struct type<tvec1, T, P> - { - static bool const is_vec = true; - static bool const is_mat = false; - static bool const is_quat = false; - enum - { - components = 1 - }; - }; - - template <typename T, precision P> - struct type<tvec2, T, P> - { - static bool const is_vec = true; - static bool const is_mat = false; - static bool const is_quat = false; - enum - { - components = 2 - }; - }; - - template <typename T, precision P> - struct type<tvec3, T, P> - { - static bool const is_vec = true; - static bool const is_mat = false; - static bool const is_quat = false; - enum - { - components = 3 - }; - }; - - template <typename T, precision P> - struct type<tvec4, T, P> - { - static bool const is_vec = true; - static bool const is_mat = false; - static bool const is_quat = false; - enum - { - components = 4 - }; - }; - - template <typename T, precision P> - struct type<tmat2x2, T, P> - { - static bool const is_vec = false; - static bool const is_mat = true; - static bool const is_quat = false; - enum - { - components = 2, - cols = 2, - rows = 2 - }; - }; - - template <typename T, precision P> - struct type<tmat2x3, T, P> - { - static bool const is_vec = false; - static bool const is_mat = true; - static bool const is_quat = false; - enum - { - components = 2, - cols = 2, - rows = 3 - }; - }; - - template <typename T, precision P> - struct type<tmat2x4, T, P> - { - static bool const is_vec = false; - static bool const is_mat = true; - static bool const is_quat = false; - enum - { - components = 2, - cols = 2, - rows = 4 - }; - }; - - template <typename T, precision P> - struct type<tmat3x2, T, P> - { - static bool const is_vec = false; - static bool const is_mat = true; - static bool const is_quat = false; - enum - { - components = 3, - cols = 3, - rows = 2 - }; - }; - - template <typename T, precision P> - struct type<tmat3x3, T, P> - { - static bool const is_vec = false; - static bool const is_mat = true; - static bool const is_quat = false; - enum - { - components = 3, - cols = 3, - rows = 3 - }; - }; - - template <typename T, precision P> - struct type<tmat3x4, T, P> - { - static bool const is_vec = false; - static bool const is_mat = true; - static bool const is_quat = false; - enum - { - components = 3, - cols = 3, - rows = 4 - }; - }; - - template <typename T, precision P> - struct type<tmat4x2, T, P> - { - static bool const is_vec = false; - static bool const is_mat = true; - static bool const is_quat = false; - enum - { - components = 4, - cols = 4, - rows = 2 - }; - }; - - template <typename T, precision P> - struct type<tmat4x3, T, P> - { - static bool const is_vec = false; - static bool const is_mat = true; - static bool const is_quat = false; - enum - { - components = 4, - cols = 4, - rows = 3 - }; - }; - - template <typename T, precision P> - struct type<tmat4x4, T, P> - { - static bool const is_vec = false; - static bool const is_mat = true; - static bool const is_quat = false; - enum - { - components = 4, - cols = 4, - rows = 4 - }; - }; - - template <typename T, precision P> - struct type<tquat, T, P> - { - static bool const is_vec = false; - static bool const is_mat = false; - static bool const is_quat = true; - enum - { - components = 4 - }; - }; - - template <typename T, precision P> - struct type<tdualquat, T, P> - { - static bool const is_vec = false; - static bool const is_mat = false; - static bool const is_quat = true; - enum - { - components = 8 - }; - }; - - /// @} -}//namespace glm - -#include "type_trait.inl" diff --git a/depedencies/include/glm/gtx/type_trait.inl b/depedencies/include/glm/gtx/type_trait.inl deleted file mode 100644 index e69de29..0000000 --- a/depedencies/include/glm/gtx/type_trait.inl +++ /dev/null diff --git a/depedencies/include/glm/gtx/vector_angle.hpp b/depedencies/include/glm/gtx/vector_angle.hpp deleted file mode 100644 index d52d3f8..0000000 --- a/depedencies/include/glm/gtx/vector_angle.hpp +++ /dev/null @@ -1,60 +0,0 @@ -/// @ref gtx_vector_angle -/// @file glm/gtx/vector_angle.hpp -/// -/// @see core (dependence) -/// @see gtx_quaternion (dependence) -/// @see gtx_epsilon (dependence) -/// -/// @defgroup gtx_vector_angle GLM_GTX_vector_angle -/// @ingroup gtx -/// -/// @brief Compute angle between vectors -/// -/// <glm/gtx/vector_angle.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" -#include "../gtc/epsilon.hpp" -#include "../gtx/quaternion.hpp" -#include "../gtx/rotate_vector.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_vector_angle extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_vector_angle - /// @{ - - //! Returns the absolute angle between two vectors. - //! Parameters need to be normalized. - /// @see gtx_vector_angle extension. - template <typename vecType> - GLM_FUNC_DECL typename vecType::value_type angle( - vecType const & x, - vecType const & y); - - //! Returns the oriented angle between two 2d vectors. - //! Parameters need to be normalized. - /// @see gtx_vector_angle extension. - template <typename T, precision P> - GLM_FUNC_DECL T orientedAngle( - tvec2<T, P> const & x, - tvec2<T, P> const & y); - - //! Returns the oriented angle between two 3d vectors based from a reference axis. - //! Parameters need to be normalized. - /// @see gtx_vector_angle extension. - template <typename T, precision P> - GLM_FUNC_DECL T orientedAngle( - tvec3<T, P> const & x, - tvec3<T, P> const & y, - tvec3<T, P> const & ref); - - /// @} -}// namespace glm - -#include "vector_angle.inl" diff --git a/depedencies/include/glm/gtx/vector_angle.inl b/depedencies/include/glm/gtx/vector_angle.inl deleted file mode 100644 index 05c3028..0000000 --- a/depedencies/include/glm/gtx/vector_angle.inl +++ /dev/null @@ -1,58 +0,0 @@ -/// @ref gtx_vector_angle -/// @file glm/gtx/vector_angle.inl - -namespace glm -{ - template <typename genType> - GLM_FUNC_QUALIFIER genType angle - ( - genType const & x, - genType const & y - ) - { - GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'angle' only accept floating-point inputs"); - return acos(clamp(dot(x, y), genType(-1), genType(1))); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER T angle - ( - vecType<T, P> const & x, - vecType<T, P> const & y - ) - { - GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'angle' only accept floating-point inputs"); - return acos(clamp(dot(x, y), T(-1), T(1))); - } - - //! \todo epsilon is hard coded to 0.01 - template <typename T, precision P> - GLM_FUNC_QUALIFIER T orientedAngle - ( - tvec2<T, P> const & x, - tvec2<T, P> const & y - ) - { - GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'orientedAngle' only accept floating-point inputs"); - T const Angle(acos(clamp(dot(x, y), T(-1), T(1)))); - - if(all(epsilonEqual(y, glm::rotate(x, Angle), T(0.0001)))) - return Angle; - else - return -Angle; - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER T orientedAngle - ( - tvec3<T, P> const & x, - tvec3<T, P> const & y, - tvec3<T, P> const & ref - ) - { - GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'orientedAngle' only accept floating-point inputs"); - - T const Angle(acos(clamp(dot(x, y), T(-1), T(1)))); - return mix(Angle, -Angle, dot(ref, cross(x, y)) < T(0)); - } -}//namespace glm diff --git a/depedencies/include/glm/gtx/vector_query.hpp b/depedencies/include/glm/gtx/vector_query.hpp deleted file mode 100644 index 2c0d022..0000000 --- a/depedencies/include/glm/gtx/vector_query.hpp +++ /dev/null @@ -1,62 +0,0 @@ -/// @ref gtx_vector_query -/// @file glm/gtx/vector_query.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_vector_query GLM_GTX_vector_query -/// @ingroup gtx -/// -/// @brief Query informations of vector types -/// -/// <glm/gtx/vector_query.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" -#include <cfloat> -#include <limits> - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_vector_query extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_vector_query - /// @{ - - //! Check whether two vectors are collinears. - /// @see gtx_vector_query extensions. - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL bool areCollinear(vecType<T, P> const & v0, vecType<T, P> const & v1, T const & epsilon); - - //! Check whether two vectors are orthogonals. - /// @see gtx_vector_query extensions. - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL bool areOrthogonal(vecType<T, P> const & v0, vecType<T, P> const & v1, T const & epsilon); - - //! Check whether a vector is normalized. - /// @see gtx_vector_query extensions. - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL bool isNormalized(vecType<T, P> const & v, T const & epsilon); - - //! Check whether a vector is null. - /// @see gtx_vector_query extensions. - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL bool isNull(vecType<T, P> const & v, T const & epsilon); - - //! Check whether a each component of a vector is null. - /// @see gtx_vector_query extensions. - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL vecType<bool, P> isCompNull(vecType<T, P> const & v, T const & epsilon); - - //! Check whether two vectors are orthonormal. - /// @see gtx_vector_query extensions. - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_DECL bool areOrthonormal(vecType<T, P> const & v0, vecType<T, P> const & v1, T const & epsilon); - - /// @} -}// namespace glm - -#include "vector_query.inl" diff --git a/depedencies/include/glm/gtx/vector_query.inl b/depedencies/include/glm/gtx/vector_query.inl deleted file mode 100644 index 85ea5e5..0000000 --- a/depedencies/include/glm/gtx/vector_query.inl +++ /dev/null @@ -1,193 +0,0 @@ -/// @ref gtx_vector_query -/// @file glm/gtx/vector_query.inl - -#include <cassert> - -namespace glm{ -namespace detail -{ - template <typename T, precision P, template <typename, precision> class vecType> - struct compute_areCollinear{}; - - template <typename T, precision P> - struct compute_areCollinear<T, P, tvec2> - { - GLM_FUNC_QUALIFIER static bool call(tvec2<T, P> const & v0, tvec2<T, P> const & v1, T const & epsilon) - { - return length(cross(tvec3<T, P>(v0, static_cast<T>(0)), tvec3<T, P>(v1, static_cast<T>(0)))) < epsilon; - } - }; - - template <typename T, precision P> - struct compute_areCollinear<T, P, tvec3> - { - GLM_FUNC_QUALIFIER static bool call(tvec3<T, P> const & v0, tvec3<T, P> const & v1, T const & epsilon) - { - return length(cross(v0, v1)) < epsilon; - } - }; - - template <typename T, precision P> - struct compute_areCollinear<T, P, tvec4> - { - GLM_FUNC_QUALIFIER static bool call(tvec4<T, P> const & v0, tvec4<T, P> const & v1, T const & epsilon) - { - return length(cross(tvec3<T, P>(v0), tvec3<T, P>(v1))) < epsilon; - } - }; - - template <typename T, precision P, template <typename, precision> class vecType> - struct compute_isCompNull{}; - - template <typename T, precision P> - struct compute_isCompNull<T, P, tvec2> - { - GLM_FUNC_QUALIFIER static tvec2<bool, P> call(tvec2<T, P> const & v, T const & epsilon) - { - return tvec2<bool, P>( - (abs(v.x) < epsilon), - (abs(v.y) < epsilon)); - } - }; - - template <typename T, precision P> - struct compute_isCompNull<T, P, tvec3> - { - GLM_FUNC_QUALIFIER static tvec3<bool, P> call(tvec3<T, P> const & v, T const & epsilon) - { - return tvec3<bool, P>( - (abs(v.x) < epsilon), - (abs(v.y) < epsilon), - (abs(v.z) < epsilon)); - } - }; - - template <typename T, precision P> - struct compute_isCompNull<T, P, tvec4> - { - GLM_FUNC_QUALIFIER static tvec4<bool, P> call(tvec4<T, P> const & v, T const & epsilon) - { - return tvec4<bool, P>( - (abs(v.x) < epsilon), - (abs(v.y) < epsilon), - (abs(v.z) < epsilon), - (abs(v.w) < epsilon)); - } - }; - -}//namespace detail - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER bool areCollinear - ( - vecType<T, P> const & v0, - vecType<T, P> const & v1, - T const & epsilon - ) - { - GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'areCollinear' only accept floating-point inputs"); - - return detail::compute_areCollinear<T, P, vecType>::call(v0, v1, epsilon); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER bool areOrthogonal - ( - vecType<T, P> const & v0, - vecType<T, P> const & v1, - T const & epsilon - ) - { - GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'areOrthogonal' only accept floating-point inputs"); - - return abs(dot(v0, v1)) <= max( - static_cast<T>(1), - length(v0)) * max(static_cast<T>(1), length(v1)) * epsilon; - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER bool isNormalized - ( - vecType<T, P> const & v, - T const & epsilon - ) - { - GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isNormalized' only accept floating-point inputs"); - - return abs(length(v) - static_cast<T>(1)) <= static_cast<T>(2) * epsilon; - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER bool isNull - ( - vecType<T, P> const & v, - T const & epsilon - ) - { - GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isNull' only accept floating-point inputs"); - - return length(v) <= epsilon; - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<bool, P> isCompNull - ( - vecType<T, P> const & v, - T const & epsilon - ) - { - GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isCompNull' only accept floating-point inputs"); - - return detail::compute_isCompNull<T, P, vecType>::call(v, epsilon); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec2<bool, P> isCompNull - ( - tvec2<T, P> const & v, - T const & epsilon) - { - return tvec2<bool, P>( - abs(v.x) < epsilon, - abs(v.y) < epsilon); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec3<bool, P> isCompNull - ( - tvec3<T, P> const & v, - T const & epsilon - ) - { - return tvec3<bool, P>( - abs(v.x) < epsilon, - abs(v.y) < epsilon, - abs(v.z) < epsilon); - } - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tvec4<bool, P> isCompNull - ( - tvec4<T, P> const & v, - T const & epsilon - ) - { - return tvec4<bool, P>( - abs(v.x) < epsilon, - abs(v.y) < epsilon, - abs(v.z) < epsilon, - abs(v.w) < epsilon); - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER bool areOrthonormal - ( - vecType<T, P> const & v0, - vecType<T, P> const & v1, - T const & epsilon - ) - { - return isNormalized(v0, epsilon) && isNormalized(v1, epsilon) && (abs(dot(v0, v1)) <= epsilon); - } - -}//namespace glm diff --git a/depedencies/include/glm/gtx/wrap.hpp b/depedencies/include/glm/gtx/wrap.hpp deleted file mode 100644 index 0060073..0000000 --- a/depedencies/include/glm/gtx/wrap.hpp +++ /dev/null @@ -1,51 +0,0 @@ -/// @ref gtx_wrap -/// @file glm/gtx/wrap.hpp -/// -/// @see core (dependence) -/// -/// @defgroup gtx_wrap GLM_GTX_wrap -/// @ingroup gtx -/// -/// @brief Wrapping mode of texture coordinates. -/// -/// <glm/gtx/wrap.hpp> need to be included to use these functionalities. - -#pragma once - -// Dependency: -#include "../glm.hpp" -#include "../gtc/vec1.hpp" - -#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_wrap extension included") -#endif - -namespace glm -{ - /// @addtogroup gtx_wrap - /// @{ - - /// Simulate GL_CLAMP OpenGL wrap mode - /// @see gtx_wrap extension. - template <typename genType> - GLM_FUNC_DECL genType clamp(genType const& Texcoord); - - /// Simulate GL_REPEAT OpenGL wrap mode - /// @see gtx_wrap extension. - template <typename genType> - GLM_FUNC_DECL genType repeat(genType const& Texcoord); - - /// Simulate GL_MIRRORED_REPEAT OpenGL wrap mode - /// @see gtx_wrap extension. - template <typename genType> - GLM_FUNC_DECL genType mirrorClamp(genType const& Texcoord); - - /// Simulate GL_MIRROR_REPEAT OpenGL wrap mode - /// @see gtx_wrap extension. - template <typename genType> - GLM_FUNC_DECL genType mirrorRepeat(genType const& Texcoord); - - /// @} -}// namespace glm - -#include "wrap.inl" diff --git a/depedencies/include/glm/gtx/wrap.inl b/depedencies/include/glm/gtx/wrap.inl deleted file mode 100644 index 941a803..0000000 --- a/depedencies/include/glm/gtx/wrap.inl +++ /dev/null @@ -1,58 +0,0 @@ -/// @ref gtx_wrap -/// @file glm/gtx/wrap.inl - -namespace glm -{ - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> clamp(vecType<T, P> const& Texcoord) - { - return glm::clamp(Texcoord, vecType<T, P>(0), vecType<T, P>(1)); - } - - template <typename genType> - GLM_FUNC_QUALIFIER genType clamp(genType const & Texcoord) - { - return clamp(tvec1<genType, defaultp>(Texcoord)).x; - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> repeat(vecType<T, P> const& Texcoord) - { - return glm::fract(Texcoord); - } - - template <typename genType> - GLM_FUNC_QUALIFIER genType repeat(genType const & Texcoord) - { - return repeat(tvec1<genType, defaultp>(Texcoord)).x; - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> mirrorClamp(vecType<T, P> const& Texcoord) - { - return glm::fract(glm::abs(Texcoord)); - } - - template <typename genType> - GLM_FUNC_QUALIFIER genType mirrorClamp(genType const & Texcoord) - { - return mirrorClamp(tvec1<genType, defaultp>(Texcoord)).x; - } - - template <typename T, precision P, template <typename, precision> class vecType> - GLM_FUNC_QUALIFIER vecType<T, P> mirrorRepeat(vecType<T, P> const& Texcoord) - { - vecType<T, P> const Abs = glm::abs(Texcoord); - vecType<T, P> const Clamp = glm::mod(glm::floor(Abs), vecType<T, P>(2)); - vecType<T, P> const Floor = glm::floor(Abs); - vecType<T, P> const Rest = Abs - Floor; - vecType<T, P> const Mirror = Clamp + Rest; - return mix(Rest, vecType<T, P>(1) - Rest, glm::greaterThanEqual(Mirror, vecType<T, P>(1))); - } - - template <typename genType> - GLM_FUNC_QUALIFIER genType mirrorRepeat(genType const& Texcoord) - { - return mirrorRepeat(tvec1<genType, defaultp>(Texcoord)).x; - } -}//namespace glm |