From 5c46e0f0a924989201c6784b0f956bc442f14a7e Mon Sep 17 00:00:00 2001 From: majortom6 Date: Sun, 19 Feb 2017 09:17:35 -0600 Subject: -removed glm library, its in the debian repos -made opengl and sdl folders in includes, moved various *hpps to them --- inc/glm/gtc/bitfield.hpp | 236 ----------- inc/glm/gtc/bitfield.inl | 542 ------------------------ inc/glm/gtc/constants.hpp | 205 --------- inc/glm/gtc/constants.inl | 210 --------- inc/glm/gtc/epsilon.hpp | 102 ----- inc/glm/gtc/epsilon.inl | 154 ------- inc/glm/gtc/integer.hpp | 105 ----- inc/glm/gtc/integer.inl | 74 ---- inc/glm/gtc/matrix_access.hpp | 88 ---- inc/glm/gtc/matrix_access.inl | 92 ---- inc/glm/gtc/matrix_integer.hpp | 515 ---------------------- inc/glm/gtc/matrix_inverse.hpp | 78 ---- inc/glm/gtc/matrix_inverse.inl | 148 ------- inc/glm/gtc/matrix_transform.hpp | 304 ------------- inc/glm/gtc/matrix_transform.inl | 413 ------------------ inc/glm/gtc/noise.hpp | 89 ---- inc/glm/gtc/noise.inl | 837 ------------------------------------ inc/glm/gtc/packing.hpp | 478 --------------------- inc/glm/gtc/packing.inl | 490 --------------------- inc/glm/gtc/quaternion.hpp | 377 ----------------- inc/glm/gtc/quaternion.inl | 784 ---------------------------------- inc/glm/gtc/random.hpp | 120 ------ inc/glm/gtc/random.inl | 379 ----------------- inc/glm/gtc/reciprocal.hpp | 134 ------ inc/glm/gtc/reciprocal.inl | 221 ---------- inc/glm/gtc/round.hpp | 203 --------- inc/glm/gtc/round.inl | 378 ----------------- inc/glm/gtc/type_precision.hpp | 890 --------------------------------------- inc/glm/gtc/type_precision.inl | 36 -- inc/glm/gtc/type_ptr.hpp | 178 -------- inc/glm/gtc/type_ptr.inl | 479 --------------------- inc/glm/gtc/ulp.hpp | 92 ---- inc/glm/gtc/ulp.inl | 350 --------------- inc/glm/gtc/vec1.hpp | 193 --------- inc/glm/gtc/vec1.inl | 31 -- 35 files changed, 10005 deletions(-) delete mode 100644 inc/glm/gtc/bitfield.hpp delete mode 100644 inc/glm/gtc/bitfield.inl delete mode 100644 inc/glm/gtc/constants.hpp delete mode 100644 inc/glm/gtc/constants.inl delete mode 100644 inc/glm/gtc/epsilon.hpp delete mode 100644 inc/glm/gtc/epsilon.inl delete mode 100644 inc/glm/gtc/integer.hpp delete mode 100644 inc/glm/gtc/integer.inl delete mode 100644 inc/glm/gtc/matrix_access.hpp delete mode 100644 inc/glm/gtc/matrix_access.inl delete mode 100644 inc/glm/gtc/matrix_integer.hpp delete mode 100644 inc/glm/gtc/matrix_inverse.hpp delete mode 100644 inc/glm/gtc/matrix_inverse.inl delete mode 100644 inc/glm/gtc/matrix_transform.hpp delete mode 100644 inc/glm/gtc/matrix_transform.inl delete mode 100644 inc/glm/gtc/noise.hpp delete mode 100644 inc/glm/gtc/noise.inl delete mode 100644 inc/glm/gtc/packing.hpp delete mode 100644 inc/glm/gtc/packing.inl delete mode 100644 inc/glm/gtc/quaternion.hpp delete mode 100644 inc/glm/gtc/quaternion.inl delete mode 100644 inc/glm/gtc/random.hpp delete mode 100644 inc/glm/gtc/random.inl delete mode 100644 inc/glm/gtc/reciprocal.hpp delete mode 100644 inc/glm/gtc/reciprocal.inl delete mode 100644 inc/glm/gtc/round.hpp delete mode 100644 inc/glm/gtc/round.inl delete mode 100644 inc/glm/gtc/type_precision.hpp delete mode 100644 inc/glm/gtc/type_precision.inl delete mode 100644 inc/glm/gtc/type_ptr.hpp delete mode 100644 inc/glm/gtc/type_ptr.inl delete mode 100644 inc/glm/gtc/ulp.hpp delete mode 100644 inc/glm/gtc/ulp.inl delete mode 100644 inc/glm/gtc/vec1.hpp delete mode 100644 inc/glm/gtc/vec1.inl (limited to 'inc/glm/gtc') diff --git a/inc/glm/gtc/bitfield.hpp b/inc/glm/gtc/bitfield.hpp deleted file mode 100644 index 24695df..0000000 --- a/inc/glm/gtc/bitfield.hpp +++ /dev/null @@ -1,236 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_bitfield -/// @file glm/gtc/bitfield.hpp -/// @date 2014-10-25 / 2014-10-25 -/// @author Christophe Riccio -/// -/// @see core (dependence) -/// @see gtc_bitfield (dependence) -/// -/// @defgroup gtc_bitfield GLM_GTC_bitfield -/// @ingroup gtc -/// -/// @brief Allow to perform bit operations on integer values -/// -/// need to be included to use these functionalities. -/////////////////////////////////////////////////////////////////////////////////// - -#pragma once - -// Dependencies -#include "../detail/setup.hpp" -#include "../detail/precision.hpp" -#include "../detail/type_int.hpp" -#include "../detail/_vectorize.hpp" -#include - -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) -# pragma message("GLM: GLM_GTC_bitfield extension included") -#endif - -namespace glm -{ - /// @addtogroup gtc_bitfield - /// @{ - - /// Build a mask of 'count' bits - /// - /// @see gtc_bitfield - template - GLM_FUNC_DECL genIUType mask(genIUType Bits); - - /// Build a mask of 'count' bits - /// - /// @see gtc_bitfield - template class vecIUType> - GLM_FUNC_DECL vecIUType mask(vecIUType const & v); - - /// Rotate all bits to the right. All the bits dropped in the right side are inserted back on the left side. - /// - /// @see gtc_bitfield - template - GLM_FUNC_DECL genIUType bitfieldRotateRight(genIUType In, int Shift); - - /// Rotate all bits to the right. All the bits dropped in the right side are inserted back on the left side. - /// - /// @see gtc_bitfield - template class vecType> - GLM_FUNC_DECL vecType bitfieldRotateRight(vecType const & In, int Shift); - - /// Rotate all bits to the left. All the bits dropped in the left side are inserted back on the right side. - /// - /// @see gtc_bitfield - template - GLM_FUNC_DECL genIUType bitfieldRotateLeft(genIUType In, int Shift); - - /// Rotate all bits to the left. All the bits dropped in the left side are inserted back on the right side. - /// - /// @see gtc_bitfield - template class vecType> - GLM_FUNC_DECL vecType bitfieldRotateLeft(vecType const & In, int Shift); - - /// Set to 1 a range of bits. - /// - /// @see gtc_bitfield - template - GLM_FUNC_DECL genIUType bitfieldFillOne(genIUType Value, int FirstBit, int BitCount); - - /// Set to 1 a range of bits. - /// - /// @see gtc_bitfield - template class vecType> - GLM_FUNC_DECL vecType bitfieldFillOne(vecType const & Value, int FirstBit, int BitCount); - - /// Set to 0 a range of bits. - /// - /// @see gtc_bitfield - template - GLM_FUNC_DECL genIUType bitfieldFillZero(genIUType Value, int FirstBit, int BitCount); - - /// Set to 0 a range of bits. - /// - /// @see gtc_bitfield - template class vecType> - GLM_FUNC_DECL vecType bitfieldFillZero(vecType const & Value, int FirstBit, int BitCount); - - /// Interleaves the bits of x and y. - /// The first bit is the first bit of x followed by the first bit of y. - /// The other bits are interleaved following the previous sequence. - /// - /// @see gtc_bitfield - GLM_FUNC_DECL int16 bitfieldInterleave(int8 x, int8 y); - - /// Interleaves the bits of x and y. - /// The first bit is the first bit of x followed by the first bit of y. - /// The other bits are interleaved following the previous sequence. - /// - /// @see gtc_bitfield - GLM_FUNC_DECL uint16 bitfieldInterleave(uint8 x, uint8 y); - - /// Interleaves the bits of x and y. - /// The first bit is the first bit of x followed by the first bit of y. - /// The other bits are interleaved following the previous sequence. - /// - /// @see gtc_bitfield - GLM_FUNC_DECL int32 bitfieldInterleave(int16 x, int16 y); - - /// Interleaves the bits of x and y. - /// The first bit is the first bit of x followed by the first bit of y. - /// The other bits are interleaved following the previous sequence. - /// - /// @see gtc_bitfield - GLM_FUNC_DECL uint32 bitfieldInterleave(uint16 x, uint16 y); - - /// Interleaves the bits of x and y. - /// The first bit is the first bit of x followed by the first bit of y. - /// The other bits are interleaved following the previous sequence. - /// - /// @see gtc_bitfield - GLM_FUNC_DECL int64 bitfieldInterleave(int32 x, int32 y); - - /// Interleaves the bits of x and y. - /// The first bit is the first bit of x followed by the first bit of y. - /// The other bits are interleaved following the previous sequence. - /// - /// @see gtc_bitfield - GLM_FUNC_DECL uint64 bitfieldInterleave(uint32 x, uint32 y); - - /// Interleaves the bits of x, y and z. - /// The first bit is the first bit of x followed by the first bit of y and the first bit of z. - /// The other bits are interleaved following the previous sequence. - /// - /// @see gtc_bitfield - GLM_FUNC_DECL int32 bitfieldInterleave(int8 x, int8 y, int8 z); - - /// Interleaves the bits of x, y and z. - /// The first bit is the first bit of x followed by the first bit of y and the first bit of z. - /// The other bits are interleaved following the previous sequence. - /// - /// @see gtc_bitfield - GLM_FUNC_DECL uint32 bitfieldInterleave(uint8 x, uint8 y, uint8 z); - - /// Interleaves the bits of x, y and z. - /// The first bit is the first bit of x followed by the first bit of y and the first bit of z. - /// The other bits are interleaved following the previous sequence. - /// - /// @see gtc_bitfield - GLM_FUNC_DECL int64 bitfieldInterleave(int16 x, int16 y, int16 z); - - /// Interleaves the bits of x, y and z. - /// The first bit is the first bit of x followed by the first bit of y and the first bit of z. - /// The other bits are interleaved following the previous sequence. - /// - /// @see gtc_bitfield - GLM_FUNC_DECL uint64 bitfieldInterleave(uint16 x, uint16 y, uint16 z); - - /// Interleaves the bits of x, y and z. - /// The first bit is the first bit of x followed by the first bit of y and the first bit of z. - /// The other bits are interleaved following the previous sequence. - /// - /// @see gtc_bitfield - GLM_FUNC_DECL int64 bitfieldInterleave(int32 x, int32 y, int32 z); - - /// Interleaves the bits of x, y and z. - /// The first bit is the first bit of x followed by the first bit of y and the first bit of z. - /// The other bits are interleaved following the previous sequence. - /// - /// @see gtc_bitfield - GLM_FUNC_DECL uint64 bitfieldInterleave(uint32 x, uint32 y, uint32 z); - - /// Interleaves the bits of x, y, z and w. - /// The first bit is the first bit of x followed by the first bit of y, the first bit of z and finally the first bit of w. - /// The other bits are interleaved following the previous sequence. - /// - /// @see gtc_bitfield - GLM_FUNC_DECL int32 bitfieldInterleave(int8 x, int8 y, int8 z, int8 w); - - /// Interleaves the bits of x, y, z and w. - /// The first bit is the first bit of x followed by the first bit of y, the first bit of z and finally the first bit of w. - /// The other bits are interleaved following the previous sequence. - /// - /// @see gtc_bitfield - GLM_FUNC_DECL uint32 bitfieldInterleave(uint8 x, uint8 y, uint8 z, uint8 w); - - /// Interleaves the bits of x, y, z and w. - /// The first bit is the first bit of x followed by the first bit of y, the first bit of z and finally the first bit of w. - /// The other bits are interleaved following the previous sequence. - /// - /// @see gtc_bitfield - GLM_FUNC_DECL int64 bitfieldInterleave(int16 x, int16 y, int16 z, int16 w); - - /// Interleaves the bits of x, y, z and w. - /// The first bit is the first bit of x followed by the first bit of y, the first bit of z and finally the first bit of w. - /// The other bits are interleaved following the previous sequence. - /// - /// @see gtc_bitfield - GLM_FUNC_DECL uint64 bitfieldInterleave(uint16 x, uint16 y, uint16 z, uint16 w); - - /// @} -} //namespace glm - -#include "bitfield.inl" diff --git a/inc/glm/gtc/bitfield.inl b/inc/glm/gtc/bitfield.inl deleted file mode 100644 index ddd8fc0..0000000 --- a/inc/glm/gtc/bitfield.inl +++ /dev/null @@ -1,542 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_bitfield -/// @file glm/gtc/bitfield.inl -/// @date 2011-10-14 / 2012-01-25 -/// @author Christophe Riccio -/////////////////////////////////////////////////////////////////////////////////// - -namespace glm{ -namespace detail -{ - template - GLM_FUNC_DECL RET bitfieldInterleave(PARAM x, PARAM y); - - template - GLM_FUNC_DECL RET bitfieldInterleave(PARAM x, PARAM y, PARAM z); - - template - GLM_FUNC_DECL RET bitfieldInterleave(PARAM x, PARAM y, PARAM z, PARAM w); - - template <> - GLM_FUNC_QUALIFIER glm::uint16 bitfieldInterleave(glm::uint8 x, glm::uint8 y) - { - glm::uint16 REG1(x); - glm::uint16 REG2(y); - - REG1 = ((REG1 << 4) | REG1) & glm::uint16(0x0F0F); - REG2 = ((REG2 << 4) | REG2) & glm::uint16(0x0F0F); - - REG1 = ((REG1 << 2) | REG1) & glm::uint16(0x3333); - REG2 = ((REG2 << 2) | REG2) & glm::uint16(0x3333); - - REG1 = ((REG1 << 1) | REG1) & glm::uint16(0x5555); - REG2 = ((REG2 << 1) | REG2) & glm::uint16(0x5555); - - return REG1 | (REG2 << 1); - } - - template <> - GLM_FUNC_QUALIFIER glm::uint32 bitfieldInterleave(glm::uint16 x, glm::uint16 y) - { - glm::uint32 REG1(x); - glm::uint32 REG2(y); - - REG1 = ((REG1 << 8) | REG1) & glm::uint32(0x00FF00FF); - REG2 = ((REG2 << 8) | REG2) & glm::uint32(0x00FF00FF); - - REG1 = ((REG1 << 4) | REG1) & glm::uint32(0x0F0F0F0F); - REG2 = ((REG2 << 4) | REG2) & glm::uint32(0x0F0F0F0F); - - REG1 = ((REG1 << 2) | REG1) & glm::uint32(0x33333333); - REG2 = ((REG2 << 2) | REG2) & glm::uint32(0x33333333); - - REG1 = ((REG1 << 1) | REG1) & glm::uint32(0x55555555); - REG2 = ((REG2 << 1) | REG2) & glm::uint32(0x55555555); - - return REG1 | (REG2 << 1); - } - - template <> - GLM_FUNC_QUALIFIER glm::uint64 bitfieldInterleave(glm::uint32 x, glm::uint32 y) - { - glm::uint64 REG1(x); - glm::uint64 REG2(y); - - REG1 = ((REG1 << 16) | REG1) & glm::uint64(0x0000FFFF0000FFFF); - REG2 = ((REG2 << 16) | REG2) & glm::uint64(0x0000FFFF0000FFFF); - - REG1 = ((REG1 << 8) | REG1) & glm::uint64(0x00FF00FF00FF00FF); - REG2 = ((REG2 << 8) | REG2) & glm::uint64(0x00FF00FF00FF00FF); - - REG1 = ((REG1 << 4) | REG1) & glm::uint64(0x0F0F0F0F0F0F0F0F); - REG2 = ((REG2 << 4) | REG2) & glm::uint64(0x0F0F0F0F0F0F0F0F); - - REG1 = ((REG1 << 2) | REG1) & glm::uint64(0x3333333333333333); - REG2 = ((REG2 << 2) | REG2) & glm::uint64(0x3333333333333333); - - REG1 = ((REG1 << 1) | REG1) & glm::uint64(0x5555555555555555); - REG2 = ((REG2 << 1) | REG2) & glm::uint64(0x5555555555555555); - - return REG1 | (REG2 << 1); - } - - template <> - GLM_FUNC_QUALIFIER glm::uint32 bitfieldInterleave(glm::uint8 x, glm::uint8 y, glm::uint8 z) - { - glm::uint32 REG1(x); - glm::uint32 REG2(y); - glm::uint32 REG3(z); - - REG1 = ((REG1 << 16) | REG1) & glm::uint32(0x00FF0000FF0000FF); - REG2 = ((REG2 << 16) | REG2) & glm::uint32(0x00FF0000FF0000FF); - REG3 = ((REG3 << 16) | REG3) & glm::uint32(0x00FF0000FF0000FF); - - REG1 = ((REG1 << 8) | REG1) & glm::uint32(0xF00F00F00F00F00F); - REG2 = ((REG2 << 8) | REG2) & glm::uint32(0xF00F00F00F00F00F); - REG3 = ((REG3 << 8) | REG3) & glm::uint32(0xF00F00F00F00F00F); - - REG1 = ((REG1 << 4) | REG1) & glm::uint32(0x30C30C30C30C30C3); - REG2 = ((REG2 << 4) | REG2) & glm::uint32(0x30C30C30C30C30C3); - REG3 = ((REG3 << 4) | REG3) & glm::uint32(0x30C30C30C30C30C3); - - REG1 = ((REG1 << 2) | REG1) & glm::uint32(0x9249249249249249); - REG2 = ((REG2 << 2) | REG2) & glm::uint32(0x9249249249249249); - REG3 = ((REG3 << 2) | REG3) & glm::uint32(0x9249249249249249); - - return REG1 | (REG2 << 1) | (REG3 << 2); - } - - template <> - GLM_FUNC_QUALIFIER glm::uint64 bitfieldInterleave(glm::uint16 x, glm::uint16 y, glm::uint16 z) - { - glm::uint64 REG1(x); - glm::uint64 REG2(y); - glm::uint64 REG3(z); - - REG1 = ((REG1 << 32) | REG1) & glm::uint64(0xFFFF00000000FFFF); - REG2 = ((REG2 << 32) | REG2) & glm::uint64(0xFFFF00000000FFFF); - REG3 = ((REG3 << 32) | REG3) & glm::uint64(0xFFFF00000000FFFF); - - REG1 = ((REG1 << 16) | REG1) & glm::uint64(0x00FF0000FF0000FF); - REG2 = ((REG2 << 16) | REG2) & glm::uint64(0x00FF0000FF0000FF); - REG3 = ((REG3 << 16) | REG3) & glm::uint64(0x00FF0000FF0000FF); - - REG1 = ((REG1 << 8) | REG1) & glm::uint64(0xF00F00F00F00F00F); - REG2 = ((REG2 << 8) | REG2) & glm::uint64(0xF00F00F00F00F00F); - REG3 = ((REG3 << 8) | REG3) & glm::uint64(0xF00F00F00F00F00F); - - REG1 = ((REG1 << 4) | REG1) & glm::uint64(0x30C30C30C30C30C3); - REG2 = ((REG2 << 4) | REG2) & glm::uint64(0x30C30C30C30C30C3); - REG3 = ((REG3 << 4) | REG3) & glm::uint64(0x30C30C30C30C30C3); - - REG1 = ((REG1 << 2) | REG1) & glm::uint64(0x9249249249249249); - REG2 = ((REG2 << 2) | REG2) & glm::uint64(0x9249249249249249); - REG3 = ((REG3 << 2) | REG3) & glm::uint64(0x9249249249249249); - - return REG1 | (REG2 << 1) | (REG3 << 2); - } - - template <> - GLM_FUNC_QUALIFIER glm::uint64 bitfieldInterleave(glm::uint32 x, glm::uint32 y, glm::uint32 z) - { - glm::uint64 REG1(x); - glm::uint64 REG2(y); - glm::uint64 REG3(z); - - REG1 = ((REG1 << 32) | REG1) & glm::uint64(0xFFFF00000000FFFF); - REG2 = ((REG2 << 32) | REG2) & glm::uint64(0xFFFF00000000FFFF); - REG3 = ((REG3 << 32) | REG3) & glm::uint64(0xFFFF00000000FFFF); - - REG1 = ((REG1 << 16) | REG1) & glm::uint64(0x00FF0000FF0000FF); - REG2 = ((REG2 << 16) | REG2) & glm::uint64(0x00FF0000FF0000FF); - REG3 = ((REG3 << 16) | REG3) & glm::uint64(0x00FF0000FF0000FF); - - REG1 = ((REG1 << 8) | REG1) & glm::uint64(0xF00F00F00F00F00F); - REG2 = ((REG2 << 8) | REG2) & glm::uint64(0xF00F00F00F00F00F); - REG3 = ((REG3 << 8) | REG3) & glm::uint64(0xF00F00F00F00F00F); - - REG1 = ((REG1 << 4) | REG1) & glm::uint64(0x30C30C30C30C30C3); - REG2 = ((REG2 << 4) | REG2) & glm::uint64(0x30C30C30C30C30C3); - REG3 = ((REG3 << 4) | REG3) & glm::uint64(0x30C30C30C30C30C3); - - REG1 = ((REG1 << 2) | REG1) & glm::uint64(0x9249249249249249); - REG2 = ((REG2 << 2) | REG2) & glm::uint64(0x9249249249249249); - REG3 = ((REG3 << 2) | REG3) & glm::uint64(0x9249249249249249); - - return REG1 | (REG2 << 1) | (REG3 << 2); - } - - template <> - GLM_FUNC_QUALIFIER glm::uint32 bitfieldInterleave(glm::uint8 x, glm::uint8 y, glm::uint8 z, glm::uint8 w) - { - glm::uint32 REG1(x); - glm::uint32 REG2(y); - glm::uint32 REG3(z); - glm::uint32 REG4(w); - - REG1 = ((REG1 << 12) | REG1) & glm::uint32(0x000F000F000F000F); - REG2 = ((REG2 << 12) | REG2) & glm::uint32(0x000F000F000F000F); - REG3 = ((REG3 << 12) | REG3) & glm::uint32(0x000F000F000F000F); - REG4 = ((REG4 << 12) | REG4) & glm::uint32(0x000F000F000F000F); - - REG1 = ((REG1 << 6) | REG1) & glm::uint32(0x0303030303030303); - REG2 = ((REG2 << 6) | REG2) & glm::uint32(0x0303030303030303); - REG3 = ((REG3 << 6) | REG3) & glm::uint32(0x0303030303030303); - REG4 = ((REG4 << 6) | REG4) & glm::uint32(0x0303030303030303); - - REG1 = ((REG1 << 3) | REG1) & glm::uint32(0x1111111111111111); - REG2 = ((REG2 << 3) | REG2) & glm::uint32(0x1111111111111111); - REG3 = ((REG3 << 3) | REG3) & glm::uint32(0x1111111111111111); - REG4 = ((REG4 << 3) | REG4) & glm::uint32(0x1111111111111111); - - return REG1 | (REG2 << 1) | (REG3 << 2) | (REG4 << 3); - } - - template <> - GLM_FUNC_QUALIFIER glm::uint64 bitfieldInterleave(glm::uint16 x, glm::uint16 y, glm::uint16 z, glm::uint16 w) - { - glm::uint64 REG1(x); - glm::uint64 REG2(y); - glm::uint64 REG3(z); - glm::uint64 REG4(w); - - REG1 = ((REG1 << 24) | REG1) & glm::uint64(0x000000FF000000FF); - REG2 = ((REG2 << 24) | REG2) & glm::uint64(0x000000FF000000FF); - REG3 = ((REG3 << 24) | REG3) & glm::uint64(0x000000FF000000FF); - REG4 = ((REG4 << 24) | REG4) & glm::uint64(0x000000FF000000FF); - - REG1 = ((REG1 << 12) | REG1) & glm::uint64(0x000F000F000F000F); - REG2 = ((REG2 << 12) | REG2) & glm::uint64(0x000F000F000F000F); - REG3 = ((REG3 << 12) | REG3) & glm::uint64(0x000F000F000F000F); - REG4 = ((REG4 << 12) | REG4) & glm::uint64(0x000F000F000F000F); - - REG1 = ((REG1 << 6) | REG1) & glm::uint64(0x0303030303030303); - REG2 = ((REG2 << 6) | REG2) & glm::uint64(0x0303030303030303); - REG3 = ((REG3 << 6) | REG3) & glm::uint64(0x0303030303030303); - REG4 = ((REG4 << 6) | REG4) & glm::uint64(0x0303030303030303); - - REG1 = ((REG1 << 3) | REG1) & glm::uint64(0x1111111111111111); - REG2 = ((REG2 << 3) | REG2) & glm::uint64(0x1111111111111111); - REG3 = ((REG3 << 3) | REG3) & glm::uint64(0x1111111111111111); - REG4 = ((REG4 << 3) | REG4) & glm::uint64(0x1111111111111111); - - return REG1 | (REG2 << 1) | (REG3 << 2) | (REG4 << 3); - } -}//namespace detail - - template - GLM_FUNC_QUALIFIER genIUType mask(genIUType Bits) - { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'mask' accepts only integer values"); - - return Bits >= sizeof(genIUType) * 8 ? ~static_cast(0) : (static_cast(1) << Bits) - static_cast(1); - } - - template class vecIUType> - GLM_FUNC_QUALIFIER vecIUType mask(vecIUType const & v) - { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'mask' accepts only integer values"); - - return detail::functor1::call(mask, v); - } - - template - GLM_FUNC_QUALIFIER genIType bitfieldRotateRight(genIType In, int Shift) - { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'bitfieldRotateRight' accepts only integer values"); - - int const BitSize = static_cast(sizeof(genIType) * 8); - return (In << static_cast(Shift)) | (In >> static_cast(BitSize - Shift)); - } - - template class vecType> - GLM_FUNC_QUALIFIER vecType bitfieldRotateRight(vecType const & In, int Shift) - { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'bitfieldRotateRight' accepts only integer values"); - - int const BitSize = static_cast(sizeof(T) * 8); - return (In << static_cast(Shift)) | (In >> static_cast(BitSize - Shift)); - } - - template - GLM_FUNC_QUALIFIER genIType bitfieldRotateLeft(genIType In, int Shift) - { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'bitfieldRotateLeft' accepts only integer values"); - - int const BitSize = static_cast(sizeof(genIType) * 8); - return (In >> static_cast(Shift)) | (In << static_cast(BitSize - Shift)); - } - - template class vecType> - GLM_FUNC_QUALIFIER vecType bitfieldRotateLeft(vecType const & In, int Shift) - { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'bitfieldRotateLeft' accepts only integer values"); - - int const BitSize = static_cast(sizeof(T) * 8); - return (In >> static_cast(Shift)) | (In << static_cast(BitSize - Shift)); - } - - template - GLM_FUNC_QUALIFIER genIUType bitfieldFillOne(genIUType Value, int FirstBit, int BitCount) - { - return Value | static_cast(mask(BitCount) << FirstBit); - } - - template class vecType> - GLM_FUNC_QUALIFIER vecType bitfieldFillOne(vecType const & Value, int FirstBit, int BitCount) - { - return Value | static_cast(mask(BitCount) << FirstBit); - } - - template - GLM_FUNC_QUALIFIER genIUType bitfieldFillZero(genIUType Value, int FirstBit, int BitCount) - { - return Value & static_cast(~(mask(BitCount) << FirstBit)); - } - - template class vecType> - GLM_FUNC_QUALIFIER vecType bitfieldFillZero(vecType const & Value, int FirstBit, int BitCount) - { - return Value & static_cast(~(mask(BitCount) << FirstBit)); - } - - GLM_FUNC_QUALIFIER int16 bitfieldInterleave(int8 x, int8 y) - { - union sign8 - { - int8 i; - uint8 u; - } sign_x, sign_y; - - union sign16 - { - int16 i; - uint16 u; - } result; - - sign_x.i = x; - sign_y.i = y; - result.u = bitfieldInterleave(sign_x.u, sign_y.u); - - return result.i; - } - - GLM_FUNC_QUALIFIER uint16 bitfieldInterleave(uint8 x, uint8 y) - { - return detail::bitfieldInterleave(x, y); - } - - GLM_FUNC_QUALIFIER int32 bitfieldInterleave(int16 x, int16 y) - { - union sign16 - { - int16 i; - uint16 u; - } sign_x, sign_y; - - union sign32 - { - int32 i; - uint32 u; - } result; - - sign_x.i = x; - sign_y.i = y; - result.u = bitfieldInterleave(sign_x.u, sign_y.u); - - return result.i; - } - - GLM_FUNC_QUALIFIER uint32 bitfieldInterleave(uint16 x, uint16 y) - { - return detail::bitfieldInterleave(x, y); - } - - GLM_FUNC_QUALIFIER int64 bitfieldInterleave(int32 x, int32 y) - { - union sign32 - { - int32 i; - uint32 u; - } sign_x, sign_y; - - union sign64 - { - int64 i; - uint64 u; - } result; - - sign_x.i = x; - sign_y.i = y; - result.u = bitfieldInterleave(sign_x.u, sign_y.u); - - return result.i; - } - - GLM_FUNC_QUALIFIER uint64 bitfieldInterleave(uint32 x, uint32 y) - { - return detail::bitfieldInterleave(x, y); - } - - GLM_FUNC_QUALIFIER int32 bitfieldInterleave(int8 x, int8 y, int8 z) - { - union sign8 - { - int8 i; - uint8 u; - } sign_x, sign_y, sign_z; - - union sign32 - { - int32 i; - uint32 u; - } result; - - sign_x.i = x; - sign_y.i = y; - sign_z.i = z; - result.u = bitfieldInterleave(sign_x.u, sign_y.u, sign_z.u); - - return result.i; - } - - GLM_FUNC_QUALIFIER uint32 bitfieldInterleave(uint8 x, uint8 y, uint8 z) - { - return detail::bitfieldInterleave(x, y, z); - } - - GLM_FUNC_QUALIFIER int64 bitfieldInterleave(int16 x, int16 y, int16 z) - { - union sign16 - { - int16 i; - uint16 u; - } sign_x, sign_y, sign_z; - - union sign64 - { - int64 i; - uint64 u; - } result; - - sign_x.i = x; - sign_y.i = y; - sign_z.i = z; - result.u = bitfieldInterleave(sign_x.u, sign_y.u, sign_z.u); - - return result.i; - } - - GLM_FUNC_QUALIFIER uint64 bitfieldInterleave(uint16 x, uint16 y, uint16 z) - { - return detail::bitfieldInterleave(x, y, z); - } - - GLM_FUNC_QUALIFIER int64 bitfieldInterleave(int32 x, int32 y, int32 z) - { - union sign16 - { - int32 i; - uint32 u; - } sign_x, sign_y, sign_z; - - union sign64 - { - int64 i; - uint64 u; - } result; - - sign_x.i = x; - sign_y.i = y; - sign_z.i = z; - result.u = bitfieldInterleave(sign_x.u, sign_y.u, sign_z.u); - - return result.i; - } - - GLM_FUNC_QUALIFIER uint64 bitfieldInterleave(uint32 x, uint32 y, uint32 z) - { - return detail::bitfieldInterleave(x, y, z); - } - - GLM_FUNC_QUALIFIER int32 bitfieldInterleave(int8 x, int8 y, int8 z, int8 w) - { - union sign8 - { - int8 i; - uint8 u; - } sign_x, sign_y, sign_z, sign_w; - - union sign32 - { - int32 i; - uint32 u; - } result; - - sign_x.i = x; - sign_y.i = y; - sign_z.i = z; - sign_w.i = w; - result.u = bitfieldInterleave(sign_x.u, sign_y.u, sign_z.u, sign_w.u); - - return result.i; - } - - GLM_FUNC_QUALIFIER uint32 bitfieldInterleave(uint8 x, uint8 y, uint8 z, uint8 w) - { - return detail::bitfieldInterleave(x, y, z, w); - } - - GLM_FUNC_QUALIFIER int64 bitfieldInterleave(int16 x, int16 y, int16 z, int16 w) - { - union sign16 - { - int16 i; - uint16 u; - } sign_x, sign_y, sign_z, sign_w; - - union sign64 - { - int64 i; - uint64 u; - } result; - - sign_x.i = x; - sign_y.i = y; - sign_z.i = z; - sign_w.i = w; - result.u = bitfieldInterleave(sign_x.u, sign_y.u, sign_z.u, sign_w.u); - - return result.i; - } - - GLM_FUNC_QUALIFIER uint64 bitfieldInterleave(uint16 x, uint16 y, uint16 z, uint16 w) - { - return detail::bitfieldInterleave(x, y, z, w); - } -}//namespace glm diff --git a/inc/glm/gtc/constants.hpp b/inc/glm/gtc/constants.hpp deleted file mode 100644 index db3e32a..0000000 --- a/inc/glm/gtc/constants.hpp +++ /dev/null @@ -1,205 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_constants -/// @file glm/gtc/constants.hpp -/// @date 2011-09-30 / 2012-01-25 -/// @author Christophe Riccio -/// -/// @see core (dependence) -/// @see gtc_half_float (dependence) -/// -/// @defgroup gtc_constants GLM_GTC_constants -/// @ingroup gtc -/// -/// @brief Provide a list of constants and precomputed useful values. -/// -/// need to be included to use these features. -/////////////////////////////////////////////////////////////////////////////////// - -#pragma once - -// Dependencies -#include "../detail/setup.hpp" - -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) -# pragma message("GLM: GLM_GTC_constants extension included") -#endif - -namespace glm -{ - /// @addtogroup gtc_constants - /// @{ - - /// Return the epsilon constant for floating point types. - /// @see gtc_constants - template - GLM_FUNC_DECL genType epsilon(); - - /// Return 0. - /// @see gtc_constants - template - GLM_FUNC_DECL genType zero(); - - /// Return 1. - /// @see gtc_constants - template - GLM_FUNC_DECL genType one(); - - /// Return the pi constant. - /// @see gtc_constants - template - GLM_FUNC_DECL genType pi(); - - /// Return pi * 2. - /// @see gtc_constants - template - GLM_FUNC_DECL genType two_pi(); - - /// Return square root of pi. - /// @see gtc_constants - template - GLM_FUNC_DECL genType root_pi(); - - /// Return pi / 2. - /// @see gtc_constants - template - GLM_FUNC_DECL genType half_pi(); - - /// Return pi / 2 * 3. - /// @see gtc_constants - template - GLM_FUNC_DECL genType three_over_two_pi(); - - /// Return pi / 4. - /// @see gtc_constants - template - GLM_FUNC_DECL genType quarter_pi(); - - /// Return 1 / pi. - /// @see gtc_constants - template - GLM_FUNC_DECL genType one_over_pi(); - - /// Return 1 / (pi * 2). - /// @see gtc_constants - template - GLM_FUNC_DECL genType one_over_two_pi(); - - /// Return 2 / pi. - /// @see gtc_constants - template - GLM_FUNC_DECL genType two_over_pi(); - - /// Return 4 / pi. - /// @see gtc_constants - template - GLM_FUNC_DECL genType four_over_pi(); - - /// Return 2 / sqrt(pi). - /// @see gtc_constants - template - GLM_FUNC_DECL genType two_over_root_pi(); - - /// Return 1 / sqrt(2). - /// @see gtc_constants - template - GLM_FUNC_DECL genType one_over_root_two(); - - /// Return sqrt(pi / 2). - /// @see gtc_constants - template - GLM_FUNC_DECL genType root_half_pi(); - - /// Return sqrt(2 * pi). - /// @see gtc_constants - template - GLM_FUNC_DECL genType root_two_pi(); - - /// Return sqrt(ln(4)). - /// @see gtc_constants - template - GLM_FUNC_DECL genType root_ln_four(); - - /// Return e constant. - /// @see gtc_constants - template - GLM_FUNC_DECL genType e(); - - /// Return Euler's constant. - /// @see gtc_constants - template - GLM_FUNC_DECL genType euler(); - - /// Return sqrt(2). - /// @see gtc_constants - template - GLM_FUNC_DECL genType root_two(); - - /// Return sqrt(3). - /// @see gtc_constants - template - GLM_FUNC_DECL genType root_three(); - - /// Return sqrt(5). - /// @see gtc_constants - template - GLM_FUNC_DECL genType root_five(); - - /// Return ln(2). - /// @see gtc_constants - template - GLM_FUNC_DECL genType ln_two(); - - /// Return ln(10). - /// @see gtc_constants - template - GLM_FUNC_DECL genType ln_ten(); - - /// Return ln(ln(2)). - /// @see gtc_constants - template - GLM_FUNC_DECL genType ln_ln_two(); - - /// Return 1 / 3. - /// @see gtc_constants - template - GLM_FUNC_DECL genType third(); - - /// Return 2 / 3. - /// @see gtc_constants - template - GLM_FUNC_DECL genType two_thirds(); - - /// Return the golden ratio constant. - /// @see gtc_constants - template - GLM_FUNC_DECL genType golden_ratio(); - - /// @} -} //namespace glm - -#include "constants.inl" diff --git a/inc/glm/gtc/constants.inl b/inc/glm/gtc/constants.inl deleted file mode 100644 index ef5ec9f..0000000 --- a/inc/glm/gtc/constants.inl +++ /dev/null @@ -1,210 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_constants -/// @file glm/gtc/constants.inl -/// @date 2011-10-14 / 2014-10-25 -/// @author Christophe Riccio -/////////////////////////////////////////////////////////////////////////////////// - -#include - -namespace glm -{ - template - GLM_FUNC_QUALIFIER genType epsilon() - { - return std::numeric_limits::epsilon(); - } - - template - GLM_FUNC_QUALIFIER genType zero() - { - return genType(0); - } - - template - GLM_FUNC_QUALIFIER genType one() - { - return genType(1); - } - - template - GLM_FUNC_QUALIFIER genType pi() - { - return genType(3.14159265358979323846264338327950288); - } - - template - GLM_FUNC_QUALIFIER genType two_pi() - { - return genType(6.28318530717958647692528676655900576); - } - - template - GLM_FUNC_QUALIFIER genType root_pi() - { - return genType(1.772453850905516027); - } - - template - GLM_FUNC_QUALIFIER genType half_pi() - { - return genType(1.57079632679489661923132169163975144); - } - - template - GLM_FUNC_QUALIFIER genType three_over_two_pi() - { - return genType(4.71238898038468985769396507491925432); - } - - template - GLM_FUNC_QUALIFIER genType quarter_pi() - { - return genType(0.785398163397448309615660845819875721); - } - - template - GLM_FUNC_QUALIFIER genType one_over_pi() - { - return genType(0.318309886183790671537767526745028724); - } - - template - GLM_FUNC_QUALIFIER genType one_over_two_pi() - { - return genType(0.159154943091895335768883763372514362); - } - - template - GLM_FUNC_QUALIFIER genType two_over_pi() - { - return genType(0.636619772367581343075535053490057448); - } - - template - GLM_FUNC_QUALIFIER genType four_over_pi() - { - return genType(1.273239544735162686151070106980114898); - } - - template - GLM_FUNC_QUALIFIER genType two_over_root_pi() - { - return genType(1.12837916709551257389615890312154517); - } - - template - GLM_FUNC_QUALIFIER genType one_over_root_two() - { - return genType(0.707106781186547524400844362104849039); - } - - template - GLM_FUNC_QUALIFIER genType root_half_pi() - { - return genType(1.253314137315500251); - } - - template - GLM_FUNC_QUALIFIER genType root_two_pi() - { - return genType(2.506628274631000502); - } - - template - GLM_FUNC_QUALIFIER genType root_ln_four() - { - return genType(1.17741002251547469); - } - - template - GLM_FUNC_QUALIFIER genType e() - { - return genType(2.71828182845904523536); - } - - template - GLM_FUNC_QUALIFIER genType euler() - { - return genType(0.577215664901532860606); - } - - template - GLM_FUNC_QUALIFIER genType root_two() - { - return genType(1.41421356237309504880168872420969808); - } - - template - GLM_FUNC_QUALIFIER genType root_three() - { - return genType(1.73205080756887729352744634150587236); - } - - template - GLM_FUNC_QUALIFIER genType root_five() - { - return genType(2.23606797749978969640917366873127623); - } - - template - GLM_FUNC_QUALIFIER genType ln_two() - { - return genType(0.693147180559945309417232121458176568); - } - - template - GLM_FUNC_QUALIFIER genType ln_ten() - { - return genType(2.30258509299404568401799145468436421); - } - - template - GLM_FUNC_QUALIFIER genType ln_ln_two() - { - return genType(-0.3665129205816643); - } - - template - GLM_FUNC_QUALIFIER genType third() - { - return genType(0.3333333333333333333333333333333333333333); - } - - template - GLM_FUNC_QUALIFIER genType two_thirds() - { - return genType(0.666666666666666666666666666666666666667); - } - - template - GLM_FUNC_QUALIFIER genType golden_ratio() - { - return genType(1.61803398874989484820458683436563811); - } -} //namespace glm diff --git a/inc/glm/gtc/epsilon.hpp b/inc/glm/gtc/epsilon.hpp deleted file mode 100644 index 4baa64d..0000000 --- a/inc/glm/gtc/epsilon.hpp +++ /dev/null @@ -1,102 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_epsilon -/// @file glm/gtc/epsilon.hpp -/// @date 2012-04-07 / 2012-04-07 -/// @author Christophe Riccio -/// -/// @see core (dependence) -/// @see gtc_half_float (dependence) -/// @see gtc_quaternion (dependence) -/// -/// @defgroup gtc_epsilon GLM_GTC_epsilon -/// @ingroup gtc -/// -/// @brief Comparison functions for a user defined epsilon values. -/// -/// need to be included to use these functionalities. -/////////////////////////////////////////////////////////////////////////////////// - -#pragma once - -// Dependencies -#include "../detail/setup.hpp" -#include "../detail/precision.hpp" - -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) -# pragma message("GLM: GLM_GTC_epsilon extension included") -#endif - -namespace glm -{ - /// @addtogroup gtc_epsilon - /// @{ - - /// Returns the component-wise comparison of |x - y| < epsilon. - /// True if this expression is satisfied. - /// - /// @see gtc_epsilon - template class vecType> - GLM_FUNC_DECL vecType epsilonEqual( - vecType const & x, - vecType const & y, - T const & epsilon); - - /// Returns the component-wise comparison of |x - y| < epsilon. - /// True if this expression is satisfied. - /// - /// @see gtc_epsilon - template - GLM_FUNC_DECL bool epsilonEqual( - genType const & x, - genType const & y, - genType const & epsilon); - - /// Returns the component-wise comparison of |x - y| < epsilon. - /// True if this expression is not satisfied. - /// - /// @see gtc_epsilon - template - GLM_FUNC_DECL typename genType::boolType epsilonNotEqual( - genType const & x, - genType const & y, - typename genType::value_type const & epsilon); - - /// Returns the component-wise comparison of |x - y| >= epsilon. - /// True if this expression is not satisfied. - /// - /// @see gtc_epsilon - template - GLM_FUNC_DECL bool epsilonNotEqual( - genType const & x, - genType const & y, - genType const & epsilon); - - /// @} -}//namespace glm - -#include "epsilon.inl" diff --git a/inc/glm/gtc/epsilon.inl b/inc/glm/gtc/epsilon.inl deleted file mode 100644 index e02c287..0000000 --- a/inc/glm/gtc/epsilon.inl +++ /dev/null @@ -1,154 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_epsilon -/// @file glm/gtc/epsilon.inl -/// @date 2012-04-07 / 2012-04-07 -/// @author Christophe Riccio -/////////////////////////////////////////////////////////////////////////////////// - -// Dependency: -#include "quaternion.hpp" -#include "../vector_relational.hpp" -#include "../common.hpp" -#include "../vec2.hpp" -#include "../vec3.hpp" -#include "../vec4.hpp" - -namespace glm -{ - template <> - GLM_FUNC_QUALIFIER bool epsilonEqual - ( - float const & x, - float const & y, - float const & epsilon - ) - { - return abs(x - y) < epsilon; - } - - template <> - GLM_FUNC_QUALIFIER bool epsilonEqual - ( - double const & x, - double const & y, - double const & epsilon - ) - { - return abs(x - y) < epsilon; - } - - template <> - GLM_FUNC_QUALIFIER bool epsilonNotEqual - ( - float const & x, - float const & y, - float const & epsilon - ) - { - return abs(x - y) >= epsilon; - } - - template <> - GLM_FUNC_QUALIFIER bool epsilonNotEqual - ( - double const & x, - double const & y, - double const & epsilon - ) - { - return abs(x - y) >= epsilon; - } - - template class vecType> - GLM_FUNC_QUALIFIER vecType epsilonEqual - ( - vecType const & x, - vecType const & y, - T const & epsilon - ) - { - return lessThan(abs(x - y), vecType(epsilon)); - } - - template class vecType> - GLM_FUNC_QUALIFIER vecType epsilonEqual - ( - vecType const & x, - vecType const & y, - vecType const & epsilon - ) - { - return lessThan(abs(x - y), vecType(epsilon)); - } - - template class vecType> - GLM_FUNC_QUALIFIER vecType epsilonNotEqual - ( - vecType const & x, - vecType const & y, - T const & epsilon - ) - { - return greaterThanEqual(abs(x - y), vecType(epsilon)); - } - - template class vecType> - GLM_FUNC_QUALIFIER vecType epsilonNotEqual - ( - vecType const & x, - vecType const & y, - vecType const & epsilon - ) - { - return greaterThanEqual(abs(x - y), vecType(epsilon)); - } - - template - GLM_FUNC_QUALIFIER tvec4 epsilonEqual - ( - tquat const & x, - tquat const & y, - T const & epsilon - ) - { - tvec4 v(x.x - y.x, x.y - y.y, x.z - y.z, x.w - y.w); - return lessThan(abs(v), tvec4(epsilon)); - } - - template - GLM_FUNC_QUALIFIER tvec4 epsilonNotEqual - ( - tquat const & x, - tquat const & y, - T const & epsilon - ) - { - tvec4 v(x.x - y.x, x.y - y.y, x.z - y.z, x.w - y.w); - return greaterThanEqual(abs(v), tvec4(epsilon)); - } -}//namespace glm diff --git a/inc/glm/gtc/integer.hpp b/inc/glm/gtc/integer.hpp deleted file mode 100644 index 0dddb90..0000000 --- a/inc/glm/gtc/integer.hpp +++ /dev/null @@ -1,105 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_integer -/// @file glm/gtc/integer.hpp -/// @date 2014-11-17 / 2014-11-17 -/// @author Christophe Riccio -/// -/// @see core (dependence) -/// @see gtc_integer (dependence) -/// -/// @defgroup gtc_integer GLM_GTC_integer -/// @ingroup gtc -/// -/// @brief Allow to perform bit operations on integer values -/// -/// need to be included to use these functionalities. -/////////////////////////////////////////////////////////////////////////////////// - -#pragma once - -// Dependencies -#include "../detail/setup.hpp" -#include "../detail/precision.hpp" -#include "../detail/func_common.hpp" -#include "../detail/func_integer.hpp" -#include "../detail/func_exponential.hpp" -#include - -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) -# pragma message("GLM: GLM_GTC_integer extension included") -#endif - -namespace glm -{ - /// @addtogroup gtc_integer - /// @{ - - /// Returns the log2 of x for integer values. Can be reliably using to compute mipmap count from the texture size. - /// @see gtc_integer - template - GLM_FUNC_DECL genIUType log2(genIUType x); - - /// Modulus. Returns x % y - /// for each component in x using the floating point value y. - /// - /// @tparam genIUType Integer-point scalar or vector types. - /// - /// @see gtc_integer - /// @see GLSL mod man page - /// @see GLSL 4.20.8 specification, section 8.3 Common Functions - template - GLM_FUNC_DECL genIUType mod(genIUType x, genIUType y); - - /// Modulus. Returns x % y - /// for each component in x using the floating point value y. - /// - /// @tparam T Integer scalar types. - /// @tparam vecType vector types. - /// - /// @see gtc_integer - /// @see GLSL mod man page - /// @see GLSL 4.20.8 specification, section 8.3 Common Functions - template class vecType> - GLM_FUNC_DECL vecType mod(vecType const & x, T y); - - /// Modulus. Returns x % y - /// for each component in x using the floating point value y. - /// - /// @tparam T Integer scalar types. - /// @tparam vecType vector types. - /// - /// @see gtc_integer - /// @see GLSL mod man page - /// @see GLSL 4.20.8 specification, section 8.3 Common Functions - template class vecType> - GLM_FUNC_DECL vecType mod(vecType const & x, vecType const & y); - - /// @} -} //namespace glm - -#include "integer.inl" diff --git a/inc/glm/gtc/integer.inl b/inc/glm/gtc/integer.inl deleted file mode 100644 index c2961b8..0000000 --- a/inc/glm/gtc/integer.inl +++ /dev/null @@ -1,74 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_integer -/// @file glm/gtc/integer.inl -/// @date 2014-11-17 / 2014-11-17 -/// @author Christophe Riccio -/////////////////////////////////////////////////////////////////////////////////// - -namespace glm{ -namespace detail -{ - template class vecType> - struct compute_log2 - { - GLM_FUNC_QUALIFIER static vecType call(vecType const & vec) - { - //Equivalent to return findMSB(vec); but save one function call in ASM with VC - //return findMSB(vec); - return vecType(detail::compute_findMSB_vec::call(vec)); - } - }; - -# if GLM_HAS_BITSCAN_WINDOWS - template - struct compute_log2 - { - GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & vec) - { - tvec4 Result(glm::uninitialize); - - _BitScanReverse(reinterpret_cast(&Result.x), vec.x); - _BitScanReverse(reinterpret_cast(&Result.y), vec.y); - _BitScanReverse(reinterpret_cast(&Result.z), vec.z); - _BitScanReverse(reinterpret_cast(&Result.w), vec.w); - - return Result; - } - }; -# endif//GLM_HAS_BITSCAN_WINDOWS - - template class vecType, typename genType> - struct compute_mod - { - GLM_FUNC_QUALIFIER static vecType call(vecType const & a, genType const & b) - { - return a % b; - } - }; -}//namespace detail -}//namespace glm diff --git a/inc/glm/gtc/matrix_access.hpp b/inc/glm/gtc/matrix_access.hpp deleted file mode 100644 index df645ef..0000000 --- a/inc/glm/gtc/matrix_access.hpp +++ /dev/null @@ -1,88 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_matrix_access -/// @file glm/gtc/matrix_access.hpp -/// @date 2005-12-27 / 2011-05-16 -/// @author Christophe Riccio -/// -/// @see core (dependence) -/// -/// @defgroup gtc_matrix_access GLM_GTC_matrix_access -/// @ingroup gtc -/// -/// Defines functions to access rows or columns of a matrix easily. -/// need to be included to use these functionalities. -/////////////////////////////////////////////////////////////////////////////////// - -#pragma once - -// Dependency: -#include "../detail/setup.hpp" - -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) -# pragma message("GLM: GLM_GTC_matrix_access extension included") -#endif - -namespace glm -{ - /// @addtogroup gtc_matrix_access - /// @{ - - /// Get a specific row of a matrix. - /// @see gtc_matrix_access - template - GLM_FUNC_DECL typename genType::row_type row( - genType const & m, - length_t index); - - /// Set a specific row to a matrix. - /// @see gtc_matrix_access - template - GLM_FUNC_DECL genType row( - genType const & m, - length_t index, - typename genType::row_type const & x); - - /// Get a specific column of a matrix. - /// @see gtc_matrix_access - template - GLM_FUNC_DECL typename genType::col_type column( - genType const & m, - length_t index); - - /// Set a specific column to a matrix. - /// @see gtc_matrix_access - template - GLM_FUNC_DECL genType column( - genType const & m, - length_t index, - typename genType::col_type const & x); - - /// @} -}//namespace glm - -#include "matrix_access.inl" diff --git a/inc/glm/gtc/matrix_access.inl b/inc/glm/gtc/matrix_access.inl deleted file mode 100644 index aba94ba..0000000 --- a/inc/glm/gtc/matrix_access.inl +++ /dev/null @@ -1,92 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_matrix_access -/// @file glm/gtc/matrix_access.inl -/// @date 2005-12-27 / 2011-06-05 -/// @author Christophe Riccio -/////////////////////////////////////////////////////////////////////////////////// - -namespace glm -{ - template - GLM_FUNC_QUALIFIER genType row - ( - genType const & m, - length_t index, - typename genType::row_type const & x - ) - { - assert(index >= 0 && static_cast(index) < detail::component_count(m[0])); - - genType Result = m; - for(detail::component_count_t i = 0; i < detail::component_count(m); ++i) - Result[i][index] = x[i]; - return Result; - } - - template - GLM_FUNC_QUALIFIER typename genType::row_type row - ( - genType const & m, - length_t index - ) - { - assert(index >= 0 && static_cast(index) < detail::component_count(m[0])); - - typename genType::row_type Result; - for(detail::component_count_t i = 0; i < detail::component_count(m); ++i) - Result[i] = m[i][index]; - return Result; - } - - template - GLM_FUNC_QUALIFIER genType column - ( - genType const & m, - length_t index, - typename genType::col_type const & x - ) - { - assert(index >= 0 && static_cast(index) < detail::component_count(m)); - - genType Result = m; - Result[index] = x; - return Result; - } - - template - GLM_FUNC_QUALIFIER typename genType::col_type column - ( - genType const & m, - length_t index - ) - { - assert(index >= 0 && static_cast(index) < detail::component_count(m)); - - return m[index]; - } -}//namespace glm diff --git a/inc/glm/gtc/matrix_integer.hpp b/inc/glm/gtc/matrix_integer.hpp deleted file mode 100644 index 89f4412..0000000 --- a/inc/glm/gtc/matrix_integer.hpp +++ /dev/null @@ -1,515 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_matrix_integer -/// @file glm/gtc/matrix_integer.hpp -/// @date 2011-01-20 / 2011-06-05 -/// @author Christophe Riccio -/// -/// @see core (dependence) -/// -/// @defgroup gtc_matrix_integer GLM_GTC_matrix_integer -/// @ingroup gtc -/// -/// Defines a number of matrices with integer types. -/// need to be included to use these functionalities. -/////////////////////////////////////////////////////////////////////////////////// - -#pragma once - -// Dependency: -#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(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) -# pragma message("GLM: GLM_GTC_matrix_integer extension included") -#endif - -namespace glm -{ - /// @addtogroup gtc_matrix_integer - /// @{ - - /// High-precision signed integer 2x2 matrix. - /// @see gtc_matrix_integer - typedef tmat2x2 highp_imat2; - - /// High-precision signed integer 3x3 matrix. - /// @see gtc_matrix_integer - typedef tmat3x3 highp_imat3; - - /// High-precision signed integer 4x4 matrix. - /// @see gtc_matrix_integer - typedef tmat4x4 highp_imat4; - - /// High-precision signed integer 2x2 matrix. - /// @see gtc_matrix_integer - typedef tmat2x2 highp_imat2x2; - - /// High-precision signed integer 2x3 matrix. - /// @see gtc_matrix_integer - typedef tmat2x3 highp_imat2x3; - - /// High-precision signed integer 2x4 matrix. - /// @see gtc_matrix_integer - typedef tmat2x4 highp_imat2x4; - - /// High-precision signed integer 3x2 matrix. - /// @see gtc_matrix_integer - typedef tmat3x2 highp_imat3x2; - - /// High-precision signed integer 3x3 matrix. - /// @see gtc_matrix_integer - typedef tmat3x3 highp_imat3x3; - - /// High-precision signed integer 3x4 matrix. - /// @see gtc_matrix_integer - typedef tmat3x4 highp_imat3x4; - - /// High-precision signed integer 4x2 matrix. - /// @see gtc_matrix_integer - typedef tmat4x2 highp_imat4x2; - - /// High-precision signed integer 4x3 matrix. - /// @see gtc_matrix_integer - typedef tmat4x3 highp_imat4x3; - - /// High-precision signed integer 4x4 matrix. - /// @see gtc_matrix_integer - typedef tmat4x4 highp_imat4x4; - - - /// Medium-precision signed integer 2x2 matrix. - /// @see gtc_matrix_integer - typedef tmat2x2 mediump_imat2; - - /// Medium-precision signed integer 3x3 matrix. - /// @see gtc_matrix_integer - typedef tmat3x3 mediump_imat3; - - /// Medium-precision signed integer 4x4 matrix. - /// @see gtc_matrix_integer - typedef tmat4x4 mediump_imat4; - - - /// Medium-precision signed integer 2x2 matrix. - /// @see gtc_matrix_integer - typedef tmat2x2 mediump_imat2x2; - - /// Medium-precision signed integer 2x3 matrix. - /// @see gtc_matrix_integer - typedef tmat2x3 mediump_imat2x3; - - /// Medium-precision signed integer 2x4 matrix. - /// @see gtc_matrix_integer - typedef tmat2x4 mediump_imat2x4; - - /// Medium-precision signed integer 3x2 matrix. - /// @see gtc_matrix_integer - typedef tmat3x2 mediump_imat3x2; - - /// Medium-precision signed integer 3x3 matrix. - /// @see gtc_matrix_integer - typedef tmat3x3 mediump_imat3x3; - - /// Medium-precision signed integer 3x4 matrix. - /// @see gtc_matrix_integer - typedef tmat3x4 mediump_imat3x4; - - /// Medium-precision signed integer 4x2 matrix. - /// @see gtc_matrix_integer - typedef tmat4x2 mediump_imat4x2; - - /// Medium-precision signed integer 4x3 matrix. - /// @see gtc_matrix_integer - typedef tmat4x3 mediump_imat4x3; - - /// Medium-precision signed integer 4x4 matrix. - /// @see gtc_matrix_integer - typedef tmat4x4 mediump_imat4x4; - - - /// Low-precision signed integer 2x2 matrix. - /// @see gtc_matrix_integer - typedef tmat2x2 lowp_imat2; - - /// Low-precision signed integer 3x3 matrix. - /// @see gtc_matrix_integer - typedef tmat3x3 lowp_imat3; - - /// Low-precision signed integer 4x4 matrix. - /// @see gtc_matrix_integer - typedef tmat4x4 lowp_imat4; - - - /// Low-precision signed integer 2x2 matrix. - /// @see gtc_matrix_integer - typedef tmat2x2 lowp_imat2x2; - - /// Low-precision signed integer 2x3 matrix. - /// @see gtc_matrix_integer - typedef tmat2x3 lowp_imat2x3; - - /// Low-precision signed integer 2x4 matrix. - /// @see gtc_matrix_integer - typedef tmat2x4 lowp_imat2x4; - - /// Low-precision signed integer 3x2 matrix. - /// @see gtc_matrix_integer - typedef tmat3x2 lowp_imat3x2; - - /// Low-precision signed integer 3x3 matrix. - /// @see gtc_matrix_integer - typedef tmat3x3 lowp_imat3x3; - - /// Low-precision signed integer 3x4 matrix. - /// @see gtc_matrix_integer - typedef tmat3x4 lowp_imat3x4; - - /// Low-precision signed integer 4x2 matrix. - /// @see gtc_matrix_integer - typedef tmat4x2 lowp_imat4x2; - - /// Low-precision signed integer 4x3 matrix. - /// @see gtc_matrix_integer - typedef tmat4x3 lowp_imat4x3; - - /// Low-precision signed integer 4x4 matrix. - /// @see gtc_matrix_integer - typedef tmat4x4 lowp_imat4x4; - - - /// High-precision unsigned integer 2x2 matrix. - /// @see gtc_matrix_integer - typedef tmat2x2 highp_umat2; - - /// High-precision unsigned integer 3x3 matrix. - /// @see gtc_matrix_integer - typedef tmat3x3 highp_umat3; - - /// High-precision unsigned integer 4x4 matrix. - /// @see gtc_matrix_integer - typedef tmat4x4 highp_umat4; - - /// High-precision unsigned integer 2x2 matrix. - /// @see gtc_matrix_integer - typedef tmat2x2 highp_umat2x2; - - /// High-precision unsigned integer 2x3 matrix. - /// @see gtc_matrix_integer - typedef tmat2x3 highp_umat2x3; - - /// High-precision unsigned integer 2x4 matrix. - /// @see gtc_matrix_integer - typedef tmat2x4 highp_umat2x4; - - /// High-precision unsigned integer 3x2 matrix. - /// @see gtc_matrix_integer - typedef tmat3x2 highp_umat3x2; - - /// High-precision unsigned integer 3x3 matrix. - /// @see gtc_matrix_integer - typedef tmat3x3 highp_umat3x3; - - /// High-precision unsigned integer 3x4 matrix. - /// @see gtc_matrix_integer - typedef tmat3x4 highp_umat3x4; - - /// High-precision unsigned integer 4x2 matrix. - /// @see gtc_matrix_integer - typedef tmat4x2 highp_umat4x2; - - /// High-precision unsigned integer 4x3 matrix. - /// @see gtc_matrix_integer - typedef tmat4x3 highp_umat4x3; - - /// High-precision unsigned integer 4x4 matrix. - /// @see gtc_matrix_integer - typedef tmat4x4 highp_umat4x4; - - - /// Medium-precision unsigned integer 2x2 matrix. - /// @see gtc_matrix_integer - typedef tmat2x2 mediump_umat2; - - /// Medium-precision unsigned integer 3x3 matrix. - /// @see gtc_matrix_integer - typedef tmat3x3 mediump_umat3; - - /// Medium-precision unsigned integer 4x4 matrix. - /// @see gtc_matrix_integer - typedef tmat4x4 mediump_umat4; - - - /// Medium-precision unsigned integer 2x2 matrix. - /// @see gtc_matrix_integer - typedef tmat2x2 mediump_umat2x2; - - /// Medium-precision unsigned integer 2x3 matrix. - /// @see gtc_matrix_integer - typedef tmat2x3 mediump_umat2x3; - - /// Medium-precision unsigned integer 2x4 matrix. - /// @see gtc_matrix_integer - typedef tmat2x4 mediump_umat2x4; - - /// Medium-precision unsigned integer 3x2 matrix. - /// @see gtc_matrix_integer - typedef tmat3x2 mediump_umat3x2; - - /// Medium-precision unsigned integer 3x3 matrix. - /// @see gtc_matrix_integer - typedef tmat3x3 mediump_umat3x3; - - /// Medium-precision unsigned integer 3x4 matrix. - /// @see gtc_matrix_integer - typedef tmat3x4 mediump_umat3x4; - - /// Medium-precision unsigned integer 4x2 matrix. - /// @see gtc_matrix_integer - typedef tmat4x2 mediump_umat4x2; - - /// Medium-precision unsigned integer 4x3 matrix. - /// @see gtc_matrix_integer - typedef tmat4x3 mediump_umat4x3; - - /// Medium-precision unsigned integer 4x4 matrix. - /// @see gtc_matrix_integer - typedef tmat4x4 mediump_umat4x4; - - - /// Low-precision unsigned integer 2x2 matrix. - /// @see gtc_matrix_integer - typedef tmat2x2 lowp_umat2; - - /// Low-precision unsigned integer 3x3 matrix. - /// @see gtc_matrix_integer - typedef tmat3x3 lowp_umat3; - - /// Low-precision unsigned integer 4x4 matrix. - /// @see gtc_matrix_integer - typedef tmat4x4 lowp_umat4; - - - /// Low-precision unsigned integer 2x2 matrix. - /// @see gtc_matrix_integer - typedef tmat2x2 lowp_umat2x2; - - /// Low-precision unsigned integer 2x3 matrix. - /// @see gtc_matrix_integer - typedef tmat2x3 lowp_umat2x3; - - /// Low-precision unsigned integer 2x4 matrix. - /// @see gtc_matrix_integer - typedef tmat2x4 lowp_umat2x4; - - /// Low-precision unsigned integer 3x2 matrix. - /// @see gtc_matrix_integer - typedef tmat3x2 lowp_umat3x2; - - /// Low-precision unsigned integer 3x3 matrix. - /// @see gtc_matrix_integer - typedef tmat3x3 lowp_umat3x3; - - /// Low-precision unsigned integer 3x4 matrix. - /// @see gtc_matrix_integer - typedef tmat3x4 lowp_umat3x4; - - /// Low-precision unsigned integer 4x2 matrix. - /// @see gtc_matrix_integer - typedef tmat4x2 lowp_umat4x2; - - /// Low-precision unsigned integer 4x3 matrix. - /// @see gtc_matrix_integer - typedef tmat4x3 lowp_umat4x3; - - /// Low-precision unsigned integer 4x4 matrix. - /// @see gtc_matrix_integer - typedef tmat4x4 lowp_umat4x4; - -#if(defined(GLM_PRECISION_HIGHP_INT)) - typedef highp_imat2 imat2; - typedef highp_imat3 imat3; - typedef highp_imat4 imat4; - typedef highp_imat2x2 imat2x2; - typedef highp_imat2x3 imat2x3; - typedef highp_imat2x4 imat2x4; - typedef highp_imat3x2 imat3x2; - typedef highp_imat3x3 imat3x3; - typedef highp_imat3x4 imat3x4; - typedef highp_imat4x2 imat4x2; - typedef highp_imat4x3 imat4x3; - typedef highp_imat4x4 imat4x4; -#elif(defined(GLM_PRECISION_LOWP_INT)) - typedef lowp_imat2 imat2; - typedef lowp_imat3 imat3; - typedef lowp_imat4 imat4; - typedef lowp_imat2x2 imat2x2; - typedef lowp_imat2x3 imat2x3; - typedef lowp_imat2x4 imat2x4; - typedef lowp_imat3x2 imat3x2; - typedef lowp_imat3x3 imat3x3; - typedef lowp_imat3x4 imat3x4; - typedef lowp_imat4x2 imat4x2; - typedef lowp_imat4x3 imat4x3; - typedef lowp_imat4x4 imat4x4; -#else //if(defined(GLM_PRECISION_MEDIUMP_INT)) - - /// Signed integer 2x2 matrix. - /// @see gtc_matrix_integer - typedef mediump_imat2 imat2; - - /// Signed integer 3x3 matrix. - /// @see gtc_matrix_integer - typedef mediump_imat3 imat3; - - /// Signed integer 4x4 matrix. - /// @see gtc_matrix_integer - typedef mediump_imat4 imat4; - - /// Signed integer 2x2 matrix. - /// @see gtc_matrix_integer - typedef mediump_imat2x2 imat2x2; - - /// Signed integer 2x3 matrix. - /// @see gtc_matrix_integer - typedef mediump_imat2x3 imat2x3; - - /// Signed integer 2x4 matrix. - /// @see gtc_matrix_integer - typedef mediump_imat2x4 imat2x4; - - /// Signed integer 3x2 matrix. - /// @see gtc_matrix_integer - typedef mediump_imat3x2 imat3x2; - - /// Signed integer 3x3 matrix. - /// @see gtc_matrix_integer - typedef mediump_imat3x3 imat3x3; - - /// Signed integer 3x4 matrix. - /// @see gtc_matrix_integer - typedef mediump_imat3x4 imat3x4; - - /// Signed integer 4x2 matrix. - /// @see gtc_matrix_integer - typedef mediump_imat4x2 imat4x2; - - /// Signed integer 4x3 matrix. - /// @see gtc_matrix_integer - typedef mediump_imat4x3 imat4x3; - - /// Signed integer 4x4 matrix. - /// @see gtc_matrix_integer - typedef mediump_imat4x4 imat4x4; -#endif//GLM_PRECISION - -#if(defined(GLM_PRECISION_HIGHP_UINT)) - typedef highp_umat2 umat2; - typedef highp_umat3 umat3; - typedef highp_umat4 umat4; - typedef highp_umat2x2 umat2x2; - typedef highp_umat2x3 umat2x3; - typedef highp_umat2x4 umat2x4; - typedef highp_umat3x2 umat3x2; - typedef highp_umat3x3 umat3x3; - typedef highp_umat3x4 umat3x4; - typedef highp_umat4x2 umat4x2; - typedef highp_umat4x3 umat4x3; - typedef highp_umat4x4 umat4x4; -#elif(defined(GLM_PRECISION_LOWP_UINT)) - typedef lowp_umat2 umat2; - typedef lowp_umat3 umat3; - typedef lowp_umat4 umat4; - typedef lowp_umat2x2 umat2x2; - typedef lowp_umat2x3 umat2x3; - typedef lowp_umat2x4 umat2x4; - typedef lowp_umat3x2 umat3x2; - typedef lowp_umat3x3 umat3x3; - typedef lowp_umat3x4 umat3x4; - typedef lowp_umat4x2 umat4x2; - typedef lowp_umat4x3 umat4x3; - typedef lowp_umat4x4 umat4x4; -#else //if(defined(GLM_PRECISION_MEDIUMP_UINT)) - - /// Unsigned integer 2x2 matrix. - /// @see gtc_matrix_integer - typedef mediump_umat2 umat2; - - /// Unsigned integer 3x3 matrix. - /// @see gtc_matrix_integer - typedef mediump_umat3 umat3; - - /// Unsigned integer 4x4 matrix. - /// @see gtc_matrix_integer - typedef mediump_umat4 umat4; - - /// Unsigned integer 2x2 matrix. - /// @see gtc_matrix_integer - typedef mediump_umat2x2 umat2x2; - - /// Unsigned integer 2x3 matrix. - /// @see gtc_matrix_integer - typedef mediump_umat2x3 umat2x3; - - /// Unsigned integer 2x4 matrix. - /// @see gtc_matrix_integer - typedef mediump_umat2x4 umat2x4; - - /// Unsigned integer 3x2 matrix. - /// @see gtc_matrix_integer - typedef mediump_umat3x2 umat3x2; - - /// Unsigned integer 3x3 matrix. - /// @see gtc_matrix_integer - typedef mediump_umat3x3 umat3x3; - - /// Unsigned integer 3x4 matrix. - /// @see gtc_matrix_integer - typedef mediump_umat3x4 umat3x4; - - /// Unsigned integer 4x2 matrix. - /// @see gtc_matrix_integer - typedef mediump_umat4x2 umat4x2; - - /// Unsigned integer 4x3 matrix. - /// @see gtc_matrix_integer - typedef mediump_umat4x3 umat4x3; - - /// Unsigned integer 4x4 matrix. - /// @see gtc_matrix_integer - typedef mediump_umat4x4 umat4x4; -#endif//GLM_PRECISION - - /// @} -}//namespace glm diff --git a/inc/glm/gtc/matrix_inverse.hpp b/inc/glm/gtc/matrix_inverse.hpp deleted file mode 100644 index 3a2b8d0..0000000 --- a/inc/glm/gtc/matrix_inverse.hpp +++ /dev/null @@ -1,78 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_matrix_inverse -/// @file glm/gtc/matrix_inverse.hpp -/// @date 2005-12-21 / 2011-06-05 -/// @author Christophe Riccio -/// -/// @see core (dependence) -/// -/// @defgroup gtc_matrix_inverse GLM_GTC_matrix_inverse -/// @ingroup gtc -/// -/// Defines additional matrix inverting functions. -/// need to be included to use these functionalities. -/////////////////////////////////////////////////////////////////////////////////// - -#pragma once - -// Dependencies -#include "../detail/setup.hpp" -#include "../matrix.hpp" -#include "../mat2x2.hpp" -#include "../mat3x3.hpp" -#include "../mat4x4.hpp" - -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) -# pragma message("GLM: GLM_GTC_matrix_inverse extension included") -#endif - -namespace glm -{ - /// @addtogroup gtc_matrix_inverse - /// @{ - - /// Fast matrix inverse for affine matrix. - /// - /// @param m Input matrix to invert. - /// @tparam genType Squared floating-point matrix: half, float or double. Inverse of matrix based of half-precision floating point value is highly innacurate. - /// @see gtc_matrix_inverse - template - GLM_FUNC_DECL genType affineInverse(genType const & m); - - /// Compute the inverse transpose of a matrix. - /// - /// @param m Input matrix to invert transpose. - /// @tparam genType Squared floating-point matrix: half, float or double. Inverse of matrix based of half-precision floating point value is highly innacurate. - /// @see gtc_matrix_inverse - template - GLM_FUNC_DECL genType inverseTranspose(genType const & m); - - /// @} -}//namespace glm - -#include "matrix_inverse.inl" diff --git a/inc/glm/gtc/matrix_inverse.inl b/inc/glm/gtc/matrix_inverse.inl deleted file mode 100644 index 526c1c6..0000000 --- a/inc/glm/gtc/matrix_inverse.inl +++ /dev/null @@ -1,148 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_matrix_inverse -/// @file glm/gtc/matrix_inverse.inl -/// @date 2005-12-21 / 2011-06-15 -/// @author Christophe Riccio -/////////////////////////////////////////////////////////////////////////////////// - -namespace glm -{ - template - GLM_FUNC_QUALIFIER tmat3x3 affineInverse(tmat3x3 const & m) - { - tmat3x3 Result(m); - Result[2] = tvec3(0, 0, 1); - Result = transpose(Result); - tvec3 Translation = Result * tvec3(-tvec2(m[2]), m[2][2]); - Result[2] = Translation; - return Result; - } - - template - GLM_FUNC_QUALIFIER tmat4x4 affineInverse(tmat4x4 const & m) - { - tmat4x4 Result(m); - Result[3] = tvec4(0, 0, 0, 1); - Result = transpose(Result); - tvec4 Translation = Result * tvec4(-tvec3(m[3]), m[3][3]); - Result[3] = Translation; - return Result; - } - - template - GLM_FUNC_QUALIFIER tmat2x2 inverseTranspose(tmat2x2 const & m) - { - T Determinant = m[0][0] * m[1][1] - m[1][0] * m[0][1]; - - tmat2x2 Inverse( - + m[1][1] / Determinant, - - m[0][1] / Determinant, - - m[1][0] / Determinant, - + m[0][0] / Determinant); - - return Inverse; - } - - template - GLM_FUNC_QUALIFIER tmat3x3 inverseTranspose(tmat3x3 const & m) - { - T Determinant = - + m[0][0] * (m[1][1] * m[2][2] - m[1][2] * m[2][1]) - - m[0][1] * (m[1][0] * m[2][2] - m[1][2] * m[2][0]) - + m[0][2] * (m[1][0] * m[2][1] - m[1][1] * m[2][0]); - - tmat3x3 Inverse(uninitialize); - Inverse[0][0] = + (m[1][1] * m[2][2] - m[2][1] * m[1][2]); - Inverse[0][1] = - (m[1][0] * m[2][2] - m[2][0] * m[1][2]); - Inverse[0][2] = + (m[1][0] * m[2][1] - m[2][0] * m[1][1]); - Inverse[1][0] = - (m[0][1] * m[2][2] - m[2][1] * m[0][2]); - Inverse[1][1] = + (m[0][0] * m[2][2] - m[2][0] * m[0][2]); - Inverse[1][2] = - (m[0][0] * m[2][1] - m[2][0] * m[0][1]); - Inverse[2][0] = + (m[0][1] * m[1][2] - m[1][1] * m[0][2]); - Inverse[2][1] = - (m[0][0] * m[1][2] - m[1][0] * m[0][2]); - Inverse[2][2] = + (m[0][0] * m[1][1] - m[1][0] * m[0][1]); - Inverse /= Determinant; - - return Inverse; - } - - template - GLM_FUNC_QUALIFIER tmat4x4 inverseTranspose(tmat4x4 const & m) - { - T SubFactor00 = m[2][2] * m[3][3] - m[3][2] * m[2][3]; - T SubFactor01 = m[2][1] * m[3][3] - m[3][1] * m[2][3]; - T SubFactor02 = m[2][1] * m[3][2] - m[3][1] * m[2][2]; - T SubFactor03 = m[2][0] * m[3][3] - m[3][0] * m[2][3]; - T SubFactor04 = m[2][0] * m[3][2] - m[3][0] * m[2][2]; - T SubFactor05 = m[2][0] * m[3][1] - m[3][0] * m[2][1]; - T SubFactor06 = m[1][2] * m[3][3] - m[3][2] * m[1][3]; - T SubFactor07 = m[1][1] * m[3][3] - m[3][1] * m[1][3]; - T SubFactor08 = m[1][1] * m[3][2] - m[3][1] * m[1][2]; - T SubFactor09 = m[1][0] * m[3][3] - m[3][0] * m[1][3]; - T SubFactor10 = m[1][0] * m[3][2] - m[3][0] * m[1][2]; - T SubFactor11 = m[1][1] * m[3][3] - m[3][1] * m[1][3]; - T SubFactor12 = m[1][0] * m[3][1] - m[3][0] * m[1][1]; - T SubFactor13 = m[1][2] * m[2][3] - m[2][2] * m[1][3]; - T SubFactor14 = m[1][1] * m[2][3] - m[2][1] * m[1][3]; - T SubFactor15 = m[1][1] * m[2][2] - m[2][1] * m[1][2]; - T SubFactor16 = m[1][0] * m[2][3] - m[2][0] * m[1][3]; - T SubFactor17 = m[1][0] * m[2][2] - m[2][0] * m[1][2]; - T SubFactor18 = m[1][0] * m[2][1] - m[2][0] * m[1][1]; - - tmat4x4 Inverse(uninitialize); - Inverse[0][0] = + (m[1][1] * SubFactor00 - m[1][2] * SubFactor01 + m[1][3] * SubFactor02); - Inverse[0][1] = - (m[1][0] * SubFactor00 - m[1][2] * SubFactor03 + m[1][3] * SubFactor04); - Inverse[0][2] = + (m[1][0] * SubFactor01 - m[1][1] * SubFactor03 + m[1][3] * SubFactor05); - Inverse[0][3] = - (m[1][0] * SubFactor02 - m[1][1] * SubFactor04 + m[1][2] * SubFactor05); - - Inverse[1][0] = - (m[0][1] * SubFactor00 - m[0][2] * SubFactor01 + m[0][3] * SubFactor02); - Inverse[1][1] = + (m[0][0] * SubFactor00 - m[0][2] * SubFactor03 + m[0][3] * SubFactor04); - Inverse[1][2] = - (m[0][0] * SubFactor01 - m[0][1] * SubFactor03 + m[0][3] * SubFactor05); - Inverse[1][3] = + (m[0][0] * SubFactor02 - m[0][1] * SubFactor04 + m[0][2] * SubFactor05); - - Inverse[2][0] = + (m[0][1] * SubFactor06 - m[0][2] * SubFactor07 + m[0][3] * SubFactor08); - Inverse[2][1] = - (m[0][0] * SubFactor06 - m[0][2] * SubFactor09 + m[0][3] * SubFactor10); - Inverse[2][2] = + (m[0][0] * SubFactor11 - m[0][1] * SubFactor09 + m[0][3] * SubFactor12); - Inverse[2][3] = - (m[0][0] * SubFactor08 - m[0][1] * SubFactor10 + m[0][2] * SubFactor12); - - Inverse[3][0] = - (m[0][1] * SubFactor13 - m[0][2] * SubFactor14 + m[0][3] * SubFactor15); - Inverse[3][1] = + (m[0][0] * SubFactor13 - m[0][2] * SubFactor16 + m[0][3] * SubFactor17); - Inverse[3][2] = - (m[0][0] * SubFactor14 - m[0][1] * SubFactor16 + m[0][3] * SubFactor18); - Inverse[3][3] = + (m[0][0] * SubFactor15 - m[0][1] * SubFactor17 + m[0][2] * SubFactor18); - - T Determinant = - + m[0][0] * Inverse[0][0] - + m[0][1] * Inverse[0][1] - + m[0][2] * Inverse[0][2] - + m[0][3] * Inverse[0][3]; - - Inverse /= Determinant; - - return Inverse; - } -}//namespace glm diff --git a/inc/glm/gtc/matrix_transform.hpp b/inc/glm/gtc/matrix_transform.hpp deleted file mode 100644 index 41c4878..0000000 --- a/inc/glm/gtc/matrix_transform.hpp +++ /dev/null @@ -1,304 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_matrix_transform -/// @file glm/gtc/matrix_transform.hpp -/// @date 2009-04-29 / 2011-05-16 -/// @author Christophe Riccio -/// -/// @see core (dependence) -/// @see gtx_transform -/// @see gtx_transform2 -/// -/// @defgroup gtc_matrix_transform GLM_GTC_matrix_transform -/// @ingroup gtc -/// -/// @brief Defines functions that generate common transformation matrices. -/// -/// The matrices generated by this extension use standard OpenGL fixed-function -/// conventions. For example, the lookAt function generates a transform from world -/// space into the specific eye space that the projective matrix functions -/// (perspective, ortho, etc) are designed to expect. The OpenGL compatibility -/// specifications defines the particular layout of this eye space. -/// -/// need to be included to use these functionalities. -/////////////////////////////////////////////////////////////////////////////////// - -#pragma once - -// Dependencies -#include "../mat4x4.hpp" -#include "../vec2.hpp" -#include "../vec3.hpp" -#include "../vec4.hpp" -#include "../gtc/constants.hpp" - -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) -# pragma message("GLM: GLM_GTC_matrix_transform extension included") -#endif - -namespace glm -{ - /// @addtogroup gtc_matrix_transform - /// @{ - - /// Builds a translation 4 * 4 matrix created from a vector of 3 components. - /// - /// @param m Input matrix multiplied by this translation matrix. - /// @param v Coordinates of a translation vector. - /// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double. - /// @code - /// #include - /// #include - /// ... - /// glm::mat4 m = glm::translate(glm::mat4(1.0f), glm::vec3(1.0f)); - /// // m[0][0] == 1.0f, m[0][1] == 0.0f, m[0][2] == 0.0f, m[0][3] == 0.0f - /// // m[1][0] == 0.0f, m[1][1] == 1.0f, m[1][2] == 0.0f, m[1][3] == 0.0f - /// // m[2][0] == 0.0f, m[2][1] == 0.0f, m[2][2] == 1.0f, m[2][3] == 0.0f - /// // m[3][0] == 1.0f, m[3][1] == 1.0f, m[3][2] == 1.0f, m[3][3] == 1.0f - /// @endcode - /// @see gtc_matrix_transform - /// @see - translate(tmat4x4 const & m, T x, T y, T z) - /// @see - translate(tvec3 const & v) - template - GLM_FUNC_DECL tmat4x4 translate( - tmat4x4 const & m, - tvec3 const & v); - - /// Builds a rotation 4 * 4 matrix created from an axis vector and an angle. - /// - /// @param m Input matrix multiplied by this rotation matrix. - /// @param angle Rotation angle expressed in radians. - /// @param axis Rotation axis, recommanded to be normalized. - /// @tparam T Value type used to build the matrix. Supported: half, float or double. - /// @see gtc_matrix_transform - /// @see - rotate(tmat4x4 const & m, T angle, T x, T y, T z) - /// @see - rotate(T angle, tvec3 const & v) - template - GLM_FUNC_DECL tmat4x4 rotate( - tmat4x4 const & m, - T angle, - tvec3 const & axis); - - /// Builds a scale 4 * 4 matrix created from 3 scalars. - /// - /// @param m Input matrix multiplied by this scale matrix. - /// @param v Ratio of scaling for each axis. - /// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double. - /// @see gtc_matrix_transform - /// @see - scale(tmat4x4 const & m, T x, T y, T z) - /// @see - scale(tvec3 const & v) - template - GLM_FUNC_DECL tmat4x4 scale( - tmat4x4 const & m, - tvec3 const & v); - - /// Creates a matrix for an orthographic parallel viewing volume. - /// - /// @param left - /// @param right - /// @param bottom - /// @param top - /// @param zNear - /// @param zFar - /// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double. - /// @see gtc_matrix_transform - /// @see - glm::ortho(T const & left, T const & right, T const & bottom, T const & top) - template - GLM_FUNC_DECL tmat4x4 ortho( - T left, - T right, - T bottom, - T top, - T zNear, - T zFar); - - /// Creates a matrix for projecting two-dimensional coordinates onto the screen. - /// - /// @param left - /// @param right - /// @param bottom - /// @param top - /// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double. - /// @see gtc_matrix_transform - /// @see - glm::ortho(T const & left, T const & right, T const & bottom, T const & top, T const & zNear, T const & zFar) - template - GLM_FUNC_DECL tmat4x4 ortho( - T left, - T right, - T bottom, - T top); - - /// Creates a frustum matrix. - /// - /// @param left - /// @param right - /// @param bottom - /// @param top - /// @param near - /// @param far - /// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double. - /// @see gtc_matrix_transform - template - GLM_FUNC_DECL tmat4x4 frustum( - T left, - T right, - T bottom, - T top, - T near, - T far); - - /// Creates a matrix for a symetric perspective-view frustum. - /// - /// @param fovy Specifies the field of view angle, in degrees, in the y direction. Expressed in radians. - /// @param aspect Specifies the aspect ratio that determines the field of view in the x direction. The aspect ratio is the ratio of x (width) to y (height). - /// @param near Specifies the distance from the viewer to the near clipping plane (always positive). - /// @param far Specifies the distance from the viewer to the far clipping plane (always positive). - /// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double. - /// @see gtc_matrix_transform - template - GLM_FUNC_DECL tmat4x4 perspective( - T fovy, - T aspect, - T near, - T far); - - /// Builds a perspective projection matrix based on a field of view. - /// - /// @param fov Expressed in radians. - /// @param width - /// @param height - /// @param near Specifies the distance from the viewer to the near clipping plane (always positive). - /// @param far Specifies the distance from the viewer to the far clipping plane (always positive). - /// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double. - /// @see gtc_matrix_transform - template - GLM_FUNC_DECL tmat4x4 perspectiveFov( - T fov, - T width, - T height, - T near, - T far); - - /// Creates a matrix for a symmetric perspective-view frustum with far plane at infinite. - /// - /// @param fovy Specifies the field of view angle, in degrees, in the y direction. Expressed in radians. - /// @param aspect Specifies the aspect ratio that determines the field of view in the x direction. The aspect ratio is the ratio of x (width) to y (height). - /// @param near Specifies the distance from the viewer to the near clipping plane (always positive). - /// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double. - /// @see gtc_matrix_transform - template - GLM_FUNC_DECL tmat4x4 infinitePerspective( - T fovy, T aspect, T near); - - /// Creates a matrix for a symmetric perspective-view frustum with far plane at infinite for graphics hardware that doesn't support depth clamping. - /// - /// @param fovy Specifies the field of view angle, in degrees, in the y direction. Expressed in radians. - /// @param aspect Specifies the aspect ratio that determines the field of view in the x direction. The aspect ratio is the ratio of x (width) to y (height). - /// @param near Specifies the distance from the viewer to the near clipping plane (always positive). - /// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double. - /// @see gtc_matrix_transform - template - GLM_FUNC_DECL tmat4x4 tweakedInfinitePerspective( - T fovy, T aspect, T near); - - /// Creates a matrix for a symmetric perspective-view frustum with far plane at infinite for graphics hardware that doesn't support depth clamping. - /// - /// @param fovy Specifies the field of view angle, in degrees, in the y direction. Expressed in radians. - /// @param aspect Specifies the aspect ratio that determines the field of view in the x direction. The aspect ratio is the ratio of x (width) to y (height). - /// @param near Specifies the distance from the viewer to the near clipping plane (always positive). - /// @param ep - /// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double. - /// @see gtc_matrix_transform - template - GLM_FUNC_DECL tmat4x4 tweakedInfinitePerspective( - T fovy, T aspect, T near, T ep); - - /// Map the specified object coordinates (obj.x, obj.y, obj.z) into window coordinates. - /// - /// @param obj Specify the object coordinates. - /// @param model Specifies the current modelview matrix - /// @param proj Specifies the current projection matrix - /// @param viewport Specifies the current viewport - /// @return Return the computed window coordinates. - /// @tparam T Native type used for the computation. Currently supported: half (not recommanded), float or double. - /// @tparam U Currently supported: Floating-point types and integer types. - /// @see gtc_matrix_transform - template - GLM_FUNC_DECL tvec3 project( - tvec3 const & obj, - tmat4x4 const & model, - tmat4x4 const & proj, - tvec4 const & viewport); - - /// Map the specified window coordinates (win.x, win.y, win.z) into object coordinates. - /// - /// @param win Specify the window coordinates to be mapped. - /// @param model Specifies the modelview matrix - /// @param proj Specifies the projection matrix - /// @param viewport Specifies the viewport - /// @return Returns the computed object coordinates. - /// @tparam T Native type used for the computation. Currently supported: half (not recommanded), float or double. - /// @tparam U Currently supported: Floating-point types and integer types. - /// @see gtc_matrix_transform - template - GLM_FUNC_DECL tvec3 unProject( - tvec3 const & win, - tmat4x4 const & model, - tmat4x4 const & proj, - tvec4 const & viewport); - - /// Define a picking region - /// - /// @param center - /// @param delta - /// @param viewport - /// @tparam T Native type used for the computation. Currently supported: half (not recommanded), float or double. - /// @tparam U Currently supported: Floating-point types and integer types. - /// @see gtc_matrix_transform - template - GLM_FUNC_DECL tmat4x4 pickMatrix( - tvec2 const & center, - tvec2 const & delta, - tvec4 const & viewport); - - /// Build a look at view matrix. - /// - /// @param eye Position of the camera - /// @param center Position where the camera is looking at - /// @param up Normalized up vector, how the camera is oriented. Typically (0, 0, 1) - /// @see gtc_matrix_transform - /// @see - frustum(T const & left, T const & right, T const & bottom, T const & top, T const & nearVal, T const & farVal) frustum(T const & left, T const & right, T const & bottom, T const & top, T const & nearVal, T const & farVal) - template - GLM_FUNC_DECL tmat4x4 lookAt( - tvec3 const & eye, - tvec3 const & center, - tvec3 const & up); - - /// @} -}//namespace glm - -#include "matrix_transform.inl" diff --git a/inc/glm/gtc/matrix_transform.inl b/inc/glm/gtc/matrix_transform.inl deleted file mode 100644 index ac7ad09..0000000 --- a/inc/glm/gtc/matrix_transform.inl +++ /dev/null @@ -1,413 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_matrix_transform -/// @file glm/gtc/matrix_transform.inl -/// @date 2009-04-29 / 2011-06-15 -/// @author Christophe Riccio -/////////////////////////////////////////////////////////////////////////////////// - -#include "../geometric.hpp" -#include "../trigonometric.hpp" -#include "../matrix.hpp" - -namespace glm -{ - template - GLM_FUNC_QUALIFIER tmat4x4 translate - ( - tmat4x4 const & m, - tvec3 const & v - ) - { - tmat4x4 Result(m); - Result[3] = m[0] * v[0] + m[1] * v[1] + m[2] * v[2] + m[3]; - return Result; - } - - template - GLM_FUNC_QUALIFIER tmat4x4 rotate - ( - tmat4x4 const & m, - T angle, - tvec3 const & v - ) - { - T const a = angle; - T const c = cos(a); - T const s = sin(a); - - tvec3 axis(normalize(v)); - tvec3 temp((T(1) - c) * axis); - - tmat4x4 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 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 - GLM_FUNC_QUALIFIER tmat4x4 rotate_slow - ( - tmat4x4 const & m, - T angle, - tvec3 const & v - ) - { - T const a = angle; - T const c = cos(a); - T const s = sin(a); - tmat4x4 Result; - - tvec3 axis = normalize(v); - - Result[0][0] = c + (1 - c) * axis.x * axis.x; - Result[0][1] = (1 - c) * axis.x * axis.y + s * axis.z; - Result[0][2] = (1 - c) * axis.x * axis.z - s * axis.y; - Result[0][3] = 0; - - Result[1][0] = (1 - c) * axis.y * axis.x - s * axis.z; - Result[1][1] = c + (1 - c) * axis.y * axis.y; - Result[1][2] = (1 - c) * axis.y * axis.z + s * axis.x; - Result[1][3] = 0; - - Result[2][0] = (1 - c) * axis.z * axis.x + s * axis.y; - Result[2][1] = (1 - c) * axis.z * axis.y - s * axis.x; - Result[2][2] = c + (1 - c) * axis.z * axis.z; - Result[2][3] = 0; - - Result[3] = tvec4(0, 0, 0, 1); - return m * Result; - } - - template - GLM_FUNC_QUALIFIER tmat4x4 scale - ( - tmat4x4 const & m, - tvec3 const & v - ) - { - tmat4x4 Result(uninitialize); - Result[0] = m[0] * v[0]; - Result[1] = m[1] * v[1]; - Result[2] = m[2] * v[2]; - Result[3] = m[3]; - return Result; - } - - template - GLM_FUNC_QUALIFIER tmat4x4 scale_slow - ( - tmat4x4 const & m, - tvec3 const & v - ) - { - tmat4x4 Result(T(1)); - Result[0][0] = v.x; - Result[1][1] = v.y; - Result[2][2] = v.z; - return m * Result; - } - - template - GLM_FUNC_QUALIFIER tmat4x4 ortho - ( - T left, - T right, - T bottom, - T top, - T zNear, - T zFar - ) - { - tmat4x4 Result(1); - Result[0][0] = static_cast(2) / (right - left); - Result[1][1] = static_cast(2) / (top - bottom); - Result[2][2] = - static_cast(2) / (zFar - zNear); - Result[3][0] = - (right + left) / (right - left); - Result[3][1] = - (top + bottom) / (top - bottom); - Result[3][2] = - (zFar + zNear) / (zFar - zNear); - return Result; - } - - template - GLM_FUNC_QUALIFIER tmat4x4 ortho - ( - T left, - T right, - T bottom, - T top - ) - { - tmat4x4 Result(1); - Result[0][0] = static_cast(2) / (right - left); - Result[1][1] = static_cast(2) / (top - bottom); - Result[2][2] = - static_cast(1); - Result[3][0] = - (right + left) / (right - left); - Result[3][1] = - (top + bottom) / (top - bottom); - return Result; - } - - template - GLM_FUNC_QUALIFIER tmat4x4 frustum - ( - T left, - T right, - T bottom, - T top, - T nearVal, - T farVal - ) - { - tmat4x4 Result(0); - Result[0][0] = (static_cast(2) * nearVal) / (right - left); - Result[1][1] = (static_cast(2) * nearVal) / (top - bottom); - Result[2][0] = (right + left) / (right - left); - Result[2][1] = (top + bottom) / (top - bottom); - Result[2][2] = -(farVal + nearVal) / (farVal - nearVal); - Result[2][3] = static_cast(-1); - Result[3][2] = -(static_cast(2) * farVal * nearVal) / (farVal - nearVal); - return Result; - } - - template - GLM_FUNC_QUALIFIER tmat4x4 perspective - ( - T fovy, - T aspect, - T zNear, - T zFar - ) - { - assert(abs(aspect - std::numeric_limits::epsilon()) > static_cast(0)); - - T const tanHalfFovy = tan(fovy / static_cast(2)); - - tmat4x4 Result(static_cast(0)); - Result[0][0] = static_cast(1) / (aspect * tanHalfFovy); - Result[1][1] = static_cast(1) / (tanHalfFovy); - Result[2][2] = - (zFar + zNear) / (zFar - zNear); - Result[2][3] = - static_cast(1); - Result[3][2] = - (static_cast(2) * zFar * zNear) / (zFar - zNear); - return Result; - } - - template - GLM_FUNC_QUALIFIER tmat4x4 perspectiveFov - ( - T fov, - T width, - T height, - T zNear, - T zFar - ) - { - assert(width > static_cast(0)); - assert(height > static_cast(0)); - assert(fov > static_cast(0)); - - T const rad = fov; - T const h = glm::cos(static_cast(0.5) * rad) / glm::sin(static_cast(0.5) * rad); - T const w = h * height / width; ///todo max(width , Height) / min(width , Height)? - - tmat4x4 Result(static_cast(0)); - Result[0][0] = w; - Result[1][1] = h; - Result[2][2] = - (zFar + zNear) / (zFar - zNear); - Result[2][3] = - static_cast(1); - Result[3][2] = - (static_cast(2) * zFar * zNear) / (zFar - zNear); - return Result; - } - - template - GLM_FUNC_QUALIFIER tmat4x4 infinitePerspective - ( - T fovy, - T aspect, - T zNear - ) - { - T const range = tan(fovy / T(2)) * zNear; - T const left = -range * aspect; - T const right = range * aspect; - T const bottom = -range; - T const top = range; - - tmat4x4 Result(T(0)); - Result[0][0] = (T(2) * zNear) / (right - left); - Result[1][1] = (T(2) * zNear) / (top - bottom); - Result[2][2] = - T(1); - Result[2][3] = - T(1); - Result[3][2] = - T(2) * zNear; - return Result; - } - - // Infinite projection matrix: http://www.terathon.com/gdc07_lengyel.pdf - template - GLM_FUNC_QUALIFIER tmat4x4 tweakedInfinitePerspective - ( - T fovy, - T aspect, - T zNear, - T ep - ) - { - T const range = tan(fovy / T(2)) * zNear; - T const left = -range * aspect; - T const right = range * aspect; - T const bottom = -range; - T const top = range; - - tmat4x4 Result(T(0)); - Result[0][0] = (static_cast(2) * zNear) / (right - left); - Result[1][1] = (static_cast(2) * zNear) / (top - bottom); - Result[2][2] = ep - static_cast(1); - Result[2][3] = static_cast(-1); - Result[3][2] = (ep - static_cast(2)) * zNear; - return Result; - } - - template - GLM_FUNC_QUALIFIER tmat4x4 tweakedInfinitePerspective - ( - T fovy, - T aspect, - T zNear - ) - { - return tweakedInfinitePerspective(fovy, aspect, zNear, epsilon()); - } - - template - GLM_FUNC_QUALIFIER tvec3 project - ( - tvec3 const & obj, - tmat4x4 const & model, - tmat4x4 const & proj, - tvec4 const & viewport - ) - { - tvec4 tmp = tvec4(obj, T(1)); - tmp = model * tmp; - tmp = proj * tmp; - - tmp /= tmp.w; - tmp = tmp * T(0.5) + T(0.5); - tmp[0] = tmp[0] * T(viewport[2]) + T(viewport[0]); - tmp[1] = tmp[1] * T(viewport[3]) + T(viewport[1]); - - return tvec3(tmp); - } - - template - GLM_FUNC_QUALIFIER tvec3 unProject - ( - tvec3 const & win, - tmat4x4 const & model, - tmat4x4 const & proj, - tvec4 const & viewport - ) - { - tmat4x4 Inverse = inverse(proj * model); - - tvec4 tmp = tvec4(win, T(1)); - tmp.x = (tmp.x - T(viewport[0])) / T(viewport[2]); - tmp.y = (tmp.y - T(viewport[1])) / T(viewport[3]); - tmp = tmp * T(2) - T(1); - - tvec4 obj = Inverse * tmp; - obj /= obj.w; - - return tvec3(obj); - } - - template - GLM_FUNC_QUALIFIER tmat4x4 pickMatrix - ( - tvec2 const & center, - tvec2 const & delta, - tvec4 const & viewport - ) - { - assert(delta.x > T(0) && delta.y > T(0)); - tmat4x4 Result(1.0f); - - if(!(delta.x > T(0) && delta.y > T(0))) - return Result; // Error - - tvec3 Temp( - (T(viewport[2]) - T(2) * (center.x - T(viewport[0]))) / delta.x, - (T(viewport[3]) - T(2) * (center.y - T(viewport[1]))) / delta.y, - T(0)); - - // Translate and scale the picked region to the entire window - Result = translate(Result, Temp); - return scale(Result, tvec3(T(viewport[2]) / delta.x, T(viewport[3]) / delta.y, T(1))); - } - - template - GLM_FUNC_QUALIFIER tmat4x4 lookAt - ( - tvec3 const & eye, - tvec3 const & center, - tvec3 const & up - ) - { - tvec3 const f(normalize(center - eye)); - tvec3 const s(normalize(cross(f, up))); - tvec3 const u(cross(s, f)); - - tmat4x4 Result(1); - Result[0][0] = s.x; - Result[1][0] = s.y; - Result[2][0] = s.z; - Result[0][1] = u.x; - Result[1][1] = u.y; - Result[2][1] = u.z; - Result[0][2] =-f.x; - Result[1][2] =-f.y; - Result[2][2] =-f.z; - Result[3][0] =-dot(s, eye); - Result[3][1] =-dot(u, eye); - Result[3][2] = dot(f, eye); - return Result; - } -}//namespace glm diff --git a/inc/glm/gtc/noise.hpp b/inc/glm/gtc/noise.hpp deleted file mode 100644 index 79f2dda..0000000 --- a/inc/glm/gtc/noise.hpp +++ /dev/null @@ -1,89 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_noise -/// @file glm/gtc/noise.hpp -/// @date 2011-04-21 / 2011-09-27 -/// @author Christophe Riccio -/// -/// @see core (dependence) -/// -/// @defgroup gtc_noise GLM_GTC_noise -/// @ingroup gtc -/// -/// Defines 2D, 3D and 4D procedural noise functions -/// Based on the work of Stefan Gustavson and Ashima Arts on "webgl-noise": -/// https://github.com/ashima/webgl-noise -/// Following Stefan Gustavson's paper "Simplex noise demystified": -/// http://www.itn.liu.se/~stegu/simplexnoise/simplexnoise.pdf -/// need to be included to use these functionalities. -/////////////////////////////////////////////////////////////////////////////////// - -#pragma once - -// Dependencies -#include "../detail/setup.hpp" -#include "../detail/precision.hpp" -#include "../detail/_noise.hpp" -#include "../geometric.hpp" -#include "../common.hpp" -#include "../vector_relational.hpp" -#include "../vec2.hpp" -#include "../vec3.hpp" -#include "../vec4.hpp" - -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) -# pragma message("GLM: GLM_GTC_noise extension included") -#endif - -namespace glm -{ - /// @addtogroup gtc_noise - /// @{ - - /// Classic perlin noise. - /// @see gtc_noise - template class vecType> - GLM_FUNC_DECL T perlin( - vecType const & p); - - /// Periodic perlin noise. - /// @see gtc_noise - template class vecType> - GLM_FUNC_DECL T perlin( - vecType const & p, - vecType const & rep); - - /// Simplex noise. - /// @see gtc_noise - template class vecType> - GLM_FUNC_DECL T simplex( - vecType const & p); - - /// @} -}//namespace glm - -#include "noise.inl" diff --git a/inc/glm/gtc/noise.inl b/inc/glm/gtc/noise.inl deleted file mode 100644 index 00ff073..0000000 --- a/inc/glm/gtc/noise.inl +++ /dev/null @@ -1,837 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_noise -/// @file glm/gtc/noise.inl -/// @date 2011-04-21 / 2012-04-07 -/// @author Christophe Riccio -/////////////////////////////////////////////////////////////////////////////////// -// Based on the work of Stefan Gustavson and Ashima Arts on "webgl-noise": -// https://github.com/ashima/webgl-noise -// Following Stefan Gustavson's paper "Simplex noise demystified": -// http://www.itn.liu.se/~stegu/simplexnoise/simplexnoise.pdf -/////////////////////////////////////////////////////////////////////////////////// - -namespace glm{ -namespace gtc -{ - template - GLM_FUNC_QUALIFIER tvec4 grad4(T const & j, tvec4 const & ip) - { - tvec3 pXYZ = floor(fract(tvec3(j) * tvec3(ip)) * T(7)) * ip[2] - T(1); - T pW = static_cast(1.5) - dot(abs(pXYZ), tvec3(1)); - tvec4 s = tvec4(lessThan(tvec4(pXYZ, pW), tvec4(0.0))); - pXYZ = pXYZ + (tvec3(s) * T(2) - T(1)) * s.w; - return tvec4(pXYZ, pW); - } -}//namespace gtc - - // Classic Perlin noise - template - GLM_FUNC_QUALIFIER T perlin(tvec2 const & Position) - { - tvec4 Pi = glm::floor(tvec4(Position.x, Position.y, Position.x, Position.y)) + tvec4(0.0, 0.0, 1.0, 1.0); - tvec4 Pf = glm::fract(tvec4(Position.x, Position.y, Position.x, Position.y)) - tvec4(0.0, 0.0, 1.0, 1.0); - Pi = mod(Pi, tvec4(289)); // To avoid truncation effects in permutation - tvec4 ix(Pi.x, Pi.z, Pi.x, Pi.z); - tvec4 iy(Pi.y, Pi.y, Pi.w, Pi.w); - tvec4 fx(Pf.x, Pf.z, Pf.x, Pf.z); - tvec4 fy(Pf.y, Pf.y, Pf.w, Pf.w); - - tvec4 i = detail::permute(detail::permute(ix) + iy); - - tvec4 gx = static_cast(2) * glm::fract(i / T(41)) - T(1); - tvec4 gy = glm::abs(gx) - T(0.5); - tvec4 tx = glm::floor(gx + T(0.5)); - gx = gx - tx; - - tvec2 g00(gx.x, gy.x); - tvec2 g10(gx.y, gy.y); - tvec2 g01(gx.z, gy.z); - tvec2 g11(gx.w, gy.w); - - tvec4 norm = detail::taylorInvSqrt(tvec4(dot(g00, g00), dot(g01, g01), dot(g10, g10), dot(g11, g11))); - g00 *= norm.x; - g01 *= norm.y; - g10 *= norm.z; - g11 *= norm.w; - - T n00 = dot(g00, tvec2(fx.x, fy.x)); - T n10 = dot(g10, tvec2(fx.y, fy.y)); - T n01 = dot(g01, tvec2(fx.z, fy.z)); - T n11 = dot(g11, tvec2(fx.w, fy.w)); - - tvec2 fade_xy = detail::fade(tvec2(Pf.x, Pf.y)); - tvec2 n_x = mix(tvec2(n00, n01), tvec2(n10, n11), fade_xy.x); - T n_xy = mix(n_x.x, n_x.y, fade_xy.y); - return T(2.3) * n_xy; - } - - // Classic Perlin noise - template - GLM_FUNC_QUALIFIER T perlin(tvec3 const & Position) - { - tvec3 Pi0 = floor(Position); // Integer part for indexing - tvec3 Pi1 = Pi0 + T(1); // Integer part + 1 - Pi0 = detail::mod289(Pi0); - Pi1 = detail::mod289(Pi1); - tvec3 Pf0 = fract(Position); // Fractional part for interpolation - tvec3 Pf1 = Pf0 - T(1); // Fractional part - 1.0 - tvec4 ix(Pi0.x, Pi1.x, Pi0.x, Pi1.x); - tvec4 iy = tvec4(tvec2(Pi0.y), tvec2(Pi1.y)); - tvec4 iz0(Pi0.z); - tvec4 iz1(Pi1.z); - - tvec4 ixy = detail::permute(detail::permute(ix) + iy); - tvec4 ixy0 = detail::permute(ixy + iz0); - tvec4 ixy1 = detail::permute(ixy + iz1); - - tvec4 gx0 = ixy0 * T(1.0 / 7.0); - tvec4 gy0 = fract(floor(gx0) * T(1.0 / 7.0)) - T(0.5); - gx0 = fract(gx0); - tvec4 gz0 = tvec4(0.5) - abs(gx0) - abs(gy0); - tvec4 sz0 = step(gz0, tvec4(0.0)); - gx0 -= sz0 * (step(T(0), gx0) - T(0.5)); - gy0 -= sz0 * (step(T(0), gy0) - T(0.5)); - - tvec4 gx1 = ixy1 * T(1.0 / 7.0); - tvec4 gy1 = fract(floor(gx1) * T(1.0 / 7.0)) - T(0.5); - gx1 = fract(gx1); - tvec4 gz1 = tvec4(0.5) - abs(gx1) - abs(gy1); - tvec4 sz1 = step(gz1, tvec4(0.0)); - gx1 -= sz1 * (step(T(0), gx1) - T(0.5)); - gy1 -= sz1 * (step(T(0), gy1) - T(0.5)); - - tvec3 g000(gx0.x, gy0.x, gz0.x); - tvec3 g100(gx0.y, gy0.y, gz0.y); - tvec3 g010(gx0.z, gy0.z, gz0.z); - tvec3 g110(gx0.w, gy0.w, gz0.w); - tvec3 g001(gx1.x, gy1.x, gz1.x); - tvec3 g101(gx1.y, gy1.y, gz1.y); - tvec3 g011(gx1.z, gy1.z, gz1.z); - tvec3 g111(gx1.w, gy1.w, gz1.w); - - tvec4 norm0 = detail::taylorInvSqrt(tvec4(dot(g000, g000), dot(g010, g010), dot(g100, g100), dot(g110, g110))); - g000 *= norm0.x; - g010 *= norm0.y; - g100 *= norm0.z; - g110 *= norm0.w; - tvec4 norm1 = detail::taylorInvSqrt(tvec4(dot(g001, g001), dot(g011, g011), dot(g101, g101), dot(g111, g111))); - g001 *= norm1.x; - g011 *= norm1.y; - g101 *= norm1.z; - g111 *= norm1.w; - - T n000 = dot(g000, Pf0); - T n100 = dot(g100, tvec3(Pf1.x, Pf0.y, Pf0.z)); - T n010 = dot(g010, tvec3(Pf0.x, Pf1.y, Pf0.z)); - T n110 = dot(g110, tvec3(Pf1.x, Pf1.y, Pf0.z)); - T n001 = dot(g001, tvec3(Pf0.x, Pf0.y, Pf1.z)); - T n101 = dot(g101, tvec3(Pf1.x, Pf0.y, Pf1.z)); - T n011 = dot(g011, tvec3(Pf0.x, Pf1.y, Pf1.z)); - T n111 = dot(g111, Pf1); - - tvec3 fade_xyz = detail::fade(Pf0); - tvec4 n_z = mix(tvec4(n000, n100, n010, n110), tvec4(n001, n101, n011, n111), fade_xyz.z); - tvec2 n_yz = mix(tvec2(n_z.x, n_z.y), tvec2(n_z.z, n_z.w), fade_xyz.y); - T n_xyz = mix(n_yz.x, n_yz.y, fade_xyz.x); - return T(2.2) * n_xyz; - } - /* - // Classic Perlin noise - template - GLM_FUNC_QUALIFIER T perlin(tvec3 const & P) - { - tvec3 Pi0 = floor(P); // Integer part for indexing - tvec3 Pi1 = Pi0 + T(1); // Integer part + 1 - Pi0 = mod(Pi0, T(289)); - Pi1 = mod(Pi1, T(289)); - tvec3 Pf0 = fract(P); // Fractional part for interpolation - tvec3 Pf1 = Pf0 - T(1); // Fractional part - 1.0 - tvec4 ix(Pi0.x, Pi1.x, Pi0.x, Pi1.x); - tvec4 iy(Pi0.y, Pi0.y, Pi1.y, Pi1.y); - tvec4 iz0(Pi0.z); - tvec4 iz1(Pi1.z); - - tvec4 ixy = permute(permute(ix) + iy); - tvec4 ixy0 = permute(ixy + iz0); - tvec4 ixy1 = permute(ixy + iz1); - - tvec4 gx0 = ixy0 / T(7); - tvec4 gy0 = fract(floor(gx0) / T(7)) - T(0.5); - gx0 = fract(gx0); - tvec4 gz0 = tvec4(0.5) - abs(gx0) - abs(gy0); - tvec4 sz0 = step(gz0, tvec4(0.0)); - gx0 -= sz0 * (step(0.0, gx0) - T(0.5)); - gy0 -= sz0 * (step(0.0, gy0) - T(0.5)); - - tvec4 gx1 = ixy1 / T(7); - tvec4 gy1 = fract(floor(gx1) / T(7)) - T(0.5); - gx1 = fract(gx1); - tvec4 gz1 = tvec4(0.5) - abs(gx1) - abs(gy1); - tvec4 sz1 = step(gz1, tvec4(0.0)); - gx1 -= sz1 * (step(T(0), gx1) - T(0.5)); - gy1 -= sz1 * (step(T(0), gy1) - T(0.5)); - - tvec3 g000(gx0.x, gy0.x, gz0.x); - tvec3 g100(gx0.y, gy0.y, gz0.y); - tvec3 g010(gx0.z, gy0.z, gz0.z); - tvec3 g110(gx0.w, gy0.w, gz0.w); - tvec3 g001(gx1.x, gy1.x, gz1.x); - tvec3 g101(gx1.y, gy1.y, gz1.y); - tvec3 g011(gx1.z, gy1.z, gz1.z); - tvec3 g111(gx1.w, gy1.w, gz1.w); - - tvec4 norm0 = taylorInvSqrt(tvec4(dot(g000, g000), dot(g010, g010), dot(g100, g100), dot(g110, g110))); - g000 *= norm0.x; - g010 *= norm0.y; - g100 *= norm0.z; - g110 *= norm0.w; - tvec4 norm1 = taylorInvSqrt(tvec4(dot(g001, g001), dot(g011, g011), dot(g101, g101), dot(g111, g111))); - g001 *= norm1.x; - g011 *= norm1.y; - g101 *= norm1.z; - g111 *= norm1.w; - - T n000 = dot(g000, Pf0); - T n100 = dot(g100, tvec3(Pf1.x, Pf0.y, Pf0.z)); - T n010 = dot(g010, tvec3(Pf0.x, Pf1.y, Pf0.z)); - T n110 = dot(g110, tvec3(Pf1.x, Pf1.y, Pf0.z)); - T n001 = dot(g001, tvec3(Pf0.x, Pf0.y, Pf1.z)); - T n101 = dot(g101, tvec3(Pf1.x, Pf0.y, Pf1.z)); - T n011 = dot(g011, tvec3(Pf0.x, Pf1.y, Pf1.z)); - T n111 = dot(g111, Pf1); - - tvec3 fade_xyz = fade(Pf0); - tvec4 n_z = mix(tvec4(n000, n100, n010, n110), tvec4(n001, n101, n011, n111), fade_xyz.z); - tvec2 n_yz = mix( - tvec2(n_z.x, n_z.y), - tvec2(n_z.z, n_z.w), fade_xyz.y); - T n_xyz = mix(n_yz.x, n_yz.y, fade_xyz.x); - return T(2.2) * n_xyz; - } - */ - // Classic Perlin noise - template - GLM_FUNC_QUALIFIER T perlin(tvec4 const & Position) - { - tvec4 Pi0 = floor(Position); // Integer part for indexing - tvec4 Pi1 = Pi0 + T(1); // Integer part + 1 - Pi0 = mod(Pi0, tvec4(289)); - Pi1 = mod(Pi1, tvec4(289)); - tvec4 Pf0 = fract(Position); // Fractional part for interpolation - tvec4 Pf1 = Pf0 - T(1); // Fractional part - 1.0 - tvec4 ix(Pi0.x, Pi1.x, Pi0.x, Pi1.x); - tvec4 iy(Pi0.y, Pi0.y, Pi1.y, Pi1.y); - tvec4 iz0(Pi0.z); - tvec4 iz1(Pi1.z); - tvec4 iw0(Pi0.w); - tvec4 iw1(Pi1.w); - - tvec4 ixy = detail::permute(detail::permute(ix) + iy); - tvec4 ixy0 = detail::permute(ixy + iz0); - tvec4 ixy1 = detail::permute(ixy + iz1); - tvec4 ixy00 = detail::permute(ixy0 + iw0); - tvec4 ixy01 = detail::permute(ixy0 + iw1); - tvec4 ixy10 = detail::permute(ixy1 + iw0); - tvec4 ixy11 = detail::permute(ixy1 + iw1); - - tvec4 gx00 = ixy00 / T(7); - tvec4 gy00 = floor(gx00) / T(7); - tvec4 gz00 = floor(gy00) / T(6); - gx00 = fract(gx00) - T(0.5); - gy00 = fract(gy00) - T(0.5); - gz00 = fract(gz00) - T(0.5); - tvec4 gw00 = tvec4(0.75) - abs(gx00) - abs(gy00) - abs(gz00); - tvec4 sw00 = step(gw00, tvec4(0.0)); - gx00 -= sw00 * (step(T(0), gx00) - T(0.5)); - gy00 -= sw00 * (step(T(0), gy00) - T(0.5)); - - tvec4 gx01 = ixy01 / T(7); - tvec4 gy01 = floor(gx01) / T(7); - tvec4 gz01 = floor(gy01) / T(6); - gx01 = fract(gx01) - T(0.5); - gy01 = fract(gy01) - T(0.5); - gz01 = fract(gz01) - T(0.5); - tvec4 gw01 = tvec4(0.75) - abs(gx01) - abs(gy01) - abs(gz01); - tvec4 sw01 = step(gw01, tvec4(0.0)); - gx01 -= sw01 * (step(T(0), gx01) - T(0.5)); - gy01 -= sw01 * (step(T(0), gy01) - T(0.5)); - - tvec4 gx10 = ixy10 / T(7); - tvec4 gy10 = floor(gx10) / T(7); - tvec4 gz10 = floor(gy10) / T(6); - gx10 = fract(gx10) - T(0.5); - gy10 = fract(gy10) - T(0.5); - gz10 = fract(gz10) - T(0.5); - tvec4 gw10 = tvec4(0.75) - abs(gx10) - abs(gy10) - abs(gz10); - tvec4 sw10 = step(gw10, tvec4(0)); - gx10 -= sw10 * (step(T(0), gx10) - T(0.5)); - gy10 -= sw10 * (step(T(0), gy10) - T(0.5)); - - tvec4 gx11 = ixy11 / T(7); - tvec4 gy11 = floor(gx11) / T(7); - tvec4 gz11 = floor(gy11) / T(6); - gx11 = fract(gx11) - T(0.5); - gy11 = fract(gy11) - T(0.5); - gz11 = fract(gz11) - T(0.5); - tvec4 gw11 = tvec4(0.75) - abs(gx11) - abs(gy11) - abs(gz11); - tvec4 sw11 = step(gw11, tvec4(0.0)); - gx11 -= sw11 * (step(T(0), gx11) - T(0.5)); - gy11 -= sw11 * (step(T(0), gy11) - T(0.5)); - - tvec4 g0000(gx00.x, gy00.x, gz00.x, gw00.x); - tvec4 g1000(gx00.y, gy00.y, gz00.y, gw00.y); - tvec4 g0100(gx00.z, gy00.z, gz00.z, gw00.z); - tvec4 g1100(gx00.w, gy00.w, gz00.w, gw00.w); - tvec4 g0010(gx10.x, gy10.x, gz10.x, gw10.x); - tvec4 g1010(gx10.y, gy10.y, gz10.y, gw10.y); - tvec4 g0110(gx10.z, gy10.z, gz10.z, gw10.z); - tvec4 g1110(gx10.w, gy10.w, gz10.w, gw10.w); - tvec4 g0001(gx01.x, gy01.x, gz01.x, gw01.x); - tvec4 g1001(gx01.y, gy01.y, gz01.y, gw01.y); - tvec4 g0101(gx01.z, gy01.z, gz01.z, gw01.z); - tvec4 g1101(gx01.w, gy01.w, gz01.w, gw01.w); - tvec4 g0011(gx11.x, gy11.x, gz11.x, gw11.x); - tvec4 g1011(gx11.y, gy11.y, gz11.y, gw11.y); - tvec4 g0111(gx11.z, gy11.z, gz11.z, gw11.z); - tvec4 g1111(gx11.w, gy11.w, gz11.w, gw11.w); - - tvec4 norm00 = detail::taylorInvSqrt(tvec4(dot(g0000, g0000), dot(g0100, g0100), dot(g1000, g1000), dot(g1100, g1100))); - g0000 *= norm00.x; - g0100 *= norm00.y; - g1000 *= norm00.z; - g1100 *= norm00.w; - - tvec4 norm01 = detail::taylorInvSqrt(tvec4(dot(g0001, g0001), dot(g0101, g0101), dot(g1001, g1001), dot(g1101, g1101))); - g0001 *= norm01.x; - g0101 *= norm01.y; - g1001 *= norm01.z; - g1101 *= norm01.w; - - tvec4 norm10 = detail::taylorInvSqrt(tvec4(dot(g0010, g0010), dot(g0110, g0110), dot(g1010, g1010), dot(g1110, g1110))); - g0010 *= norm10.x; - g0110 *= norm10.y; - g1010 *= norm10.z; - g1110 *= norm10.w; - - tvec4 norm11 = detail::taylorInvSqrt(tvec4(dot(g0011, g0011), dot(g0111, g0111), dot(g1011, g1011), dot(g1111, g1111))); - g0011 *= norm11.x; - g0111 *= norm11.y; - g1011 *= norm11.z; - g1111 *= norm11.w; - - T n0000 = dot(g0000, Pf0); - T n1000 = dot(g1000, tvec4(Pf1.x, Pf0.y, Pf0.z, Pf0.w)); - T n0100 = dot(g0100, tvec4(Pf0.x, Pf1.y, Pf0.z, Pf0.w)); - T n1100 = dot(g1100, tvec4(Pf1.x, Pf1.y, Pf0.z, Pf0.w)); - T n0010 = dot(g0010, tvec4(Pf0.x, Pf0.y, Pf1.z, Pf0.w)); - T n1010 = dot(g1010, tvec4(Pf1.x, Pf0.y, Pf1.z, Pf0.w)); - T n0110 = dot(g0110, tvec4(Pf0.x, Pf1.y, Pf1.z, Pf0.w)); - T n1110 = dot(g1110, tvec4(Pf1.x, Pf1.y, Pf1.z, Pf0.w)); - T n0001 = dot(g0001, tvec4(Pf0.x, Pf0.y, Pf0.z, Pf1.w)); - T n1001 = dot(g1001, tvec4(Pf1.x, Pf0.y, Pf0.z, Pf1.w)); - T n0101 = dot(g0101, tvec4(Pf0.x, Pf1.y, Pf0.z, Pf1.w)); - T n1101 = dot(g1101, tvec4(Pf1.x, Pf1.y, Pf0.z, Pf1.w)); - T n0011 = dot(g0011, tvec4(Pf0.x, Pf0.y, Pf1.z, Pf1.w)); - T n1011 = dot(g1011, tvec4(Pf1.x, Pf0.y, Pf1.z, Pf1.w)); - T n0111 = dot(g0111, tvec4(Pf0.x, Pf1.y, Pf1.z, Pf1.w)); - T n1111 = dot(g1111, Pf1); - - tvec4 fade_xyzw = detail::fade(Pf0); - tvec4 n_0w = mix(tvec4(n0000, n1000, n0100, n1100), tvec4(n0001, n1001, n0101, n1101), fade_xyzw.w); - tvec4 n_1w = mix(tvec4(n0010, n1010, n0110, n1110), tvec4(n0011, n1011, n0111, n1111), fade_xyzw.w); - tvec4 n_zw = mix(n_0w, n_1w, fade_xyzw.z); - tvec2 n_yzw = mix(tvec2(n_zw.x, n_zw.y), tvec2(n_zw.z, n_zw.w), fade_xyzw.y); - T n_xyzw = mix(n_yzw.x, n_yzw.y, fade_xyzw.x); - return T(2.2) * n_xyzw; - } - - // Classic Perlin noise, periodic variant - template - GLM_FUNC_QUALIFIER T perlin(tvec2 const & Position, tvec2 const & rep) - { - tvec4 Pi = floor(tvec4(Position.x, Position.y, Position.x, Position.y)) + tvec4(0.0, 0.0, 1.0, 1.0); - tvec4 Pf = fract(tvec4(Position.x, Position.y, Position.x, Position.y)) - tvec4(0.0, 0.0, 1.0, 1.0); - Pi = mod(Pi, tvec4(rep.x, rep.y, rep.x, rep.y)); // To create noise with explicit period - Pi = mod(Pi, tvec4(289)); // To avoid truncation effects in permutation - tvec4 ix(Pi.x, Pi.z, Pi.x, Pi.z); - tvec4 iy(Pi.y, Pi.y, Pi.w, Pi.w); - tvec4 fx(Pf.x, Pf.z, Pf.x, Pf.z); - tvec4 fy(Pf.y, Pf.y, Pf.w, Pf.w); - - tvec4 i = detail::permute(detail::permute(ix) + iy); - - tvec4 gx = static_cast(2) * fract(i / T(41)) - T(1); - tvec4 gy = abs(gx) - T(0.5); - tvec4 tx = floor(gx + T(0.5)); - gx = gx - tx; - - tvec2 g00(gx.x, gy.x); - tvec2 g10(gx.y, gy.y); - tvec2 g01(gx.z, gy.z); - tvec2 g11(gx.w, gy.w); - - tvec4 norm = detail::taylorInvSqrt(tvec4(dot(g00, g00), dot(g01, g01), dot(g10, g10), dot(g11, g11))); - g00 *= norm.x; - g01 *= norm.y; - g10 *= norm.z; - g11 *= norm.w; - - T n00 = dot(g00, tvec2(fx.x, fy.x)); - T n10 = dot(g10, tvec2(fx.y, fy.y)); - T n01 = dot(g01, tvec2(fx.z, fy.z)); - T n11 = dot(g11, tvec2(fx.w, fy.w)); - - tvec2 fade_xy = detail::fade(tvec2(Pf.x, Pf.y)); - tvec2 n_x = mix(tvec2(n00, n01), tvec2(n10, n11), fade_xy.x); - T n_xy = mix(n_x.x, n_x.y, fade_xy.y); - return T(2.3) * n_xy; - } - - // Classic Perlin noise, periodic variant - template - GLM_FUNC_QUALIFIER T perlin(tvec3 const & Position, tvec3 const & rep) - { - tvec3 Pi0 = mod(floor(Position), rep); // Integer part, modulo period - tvec3 Pi1 = mod(Pi0 + tvec3(T(1)), rep); // Integer part + 1, mod period - Pi0 = mod(Pi0, tvec3(289)); - Pi1 = mod(Pi1, tvec3(289)); - tvec3 Pf0 = fract(Position); // Fractional part for interpolation - tvec3 Pf1 = Pf0 - tvec3(T(1)); // Fractional part - 1.0 - tvec4 ix = tvec4(Pi0.x, Pi1.x, Pi0.x, Pi1.x); - tvec4 iy = tvec4(Pi0.y, Pi0.y, Pi1.y, Pi1.y); - tvec4 iz0(Pi0.z); - tvec4 iz1(Pi1.z); - - tvec4 ixy = detail::permute(detail::permute(ix) + iy); - tvec4 ixy0 = detail::permute(ixy + iz0); - tvec4 ixy1 = detail::permute(ixy + iz1); - - tvec4 gx0 = ixy0 / T(7); - tvec4 gy0 = fract(floor(gx0) / T(7)) - T(0.5); - gx0 = fract(gx0); - tvec4 gz0 = tvec4(0.5) - abs(gx0) - abs(gy0); - tvec4 sz0 = step(gz0, tvec4(0)); - gx0 -= sz0 * (step(T(0), gx0) - T(0.5)); - gy0 -= sz0 * (step(T(0), gy0) - T(0.5)); - - tvec4 gx1 = ixy1 / T(7); - tvec4 gy1 = fract(floor(gx1) / T(7)) - T(0.5); - gx1 = fract(gx1); - tvec4 gz1 = tvec4(0.5) - abs(gx1) - abs(gy1); - tvec4 sz1 = step(gz1, tvec4(T(0))); - gx1 -= sz1 * (step(T(0), gx1) - T(0.5)); - gy1 -= sz1 * (step(T(0), gy1) - T(0.5)); - - tvec3 g000 = tvec3(gx0.x, gy0.x, gz0.x); - tvec3 g100 = tvec3(gx0.y, gy0.y, gz0.y); - tvec3 g010 = tvec3(gx0.z, gy0.z, gz0.z); - tvec3 g110 = tvec3(gx0.w, gy0.w, gz0.w); - tvec3 g001 = tvec3(gx1.x, gy1.x, gz1.x); - tvec3 g101 = tvec3(gx1.y, gy1.y, gz1.y); - tvec3 g011 = tvec3(gx1.z, gy1.z, gz1.z); - tvec3 g111 = tvec3(gx1.w, gy1.w, gz1.w); - - tvec4 norm0 = detail::taylorInvSqrt(tvec4(dot(g000, g000), dot(g010, g010), dot(g100, g100), dot(g110, g110))); - g000 *= norm0.x; - g010 *= norm0.y; - g100 *= norm0.z; - g110 *= norm0.w; - tvec4 norm1 = detail::taylorInvSqrt(tvec4(dot(g001, g001), dot(g011, g011), dot(g101, g101), dot(g111, g111))); - g001 *= norm1.x; - g011 *= norm1.y; - g101 *= norm1.z; - g111 *= norm1.w; - - T n000 = dot(g000, Pf0); - T n100 = dot(g100, tvec3(Pf1.x, Pf0.y, Pf0.z)); - T n010 = dot(g010, tvec3(Pf0.x, Pf1.y, Pf0.z)); - T n110 = dot(g110, tvec3(Pf1.x, Pf1.y, Pf0.z)); - T n001 = dot(g001, tvec3(Pf0.x, Pf0.y, Pf1.z)); - T n101 = dot(g101, tvec3(Pf1.x, Pf0.y, Pf1.z)); - T n011 = dot(g011, tvec3(Pf0.x, Pf1.y, Pf1.z)); - T n111 = dot(g111, Pf1); - - tvec3 fade_xyz = detail::fade(Pf0); - tvec4 n_z = mix(tvec4(n000, n100, n010, n110), tvec4(n001, n101, n011, n111), fade_xyz.z); - tvec2 n_yz = mix(tvec2(n_z.x, n_z.y), tvec2(n_z.z, n_z.w), fade_xyz.y); - T n_xyz = mix(n_yz.x, n_yz.y, fade_xyz.x); - return T(2.2) * n_xyz; - } - - // Classic Perlin noise, periodic version - template - GLM_FUNC_QUALIFIER T perlin(tvec4 const & Position, tvec4 const & rep) - { - tvec4 Pi0 = mod(floor(Position), rep); // Integer part modulo rep - tvec4 Pi1 = mod(Pi0 + T(1), rep); // Integer part + 1 mod rep - tvec4 Pf0 = fract(Position); // Fractional part for interpolation - tvec4 Pf1 = Pf0 - T(1); // Fractional part - 1.0 - tvec4 ix = tvec4(Pi0.x, Pi1.x, Pi0.x, Pi1.x); - tvec4 iy = tvec4(Pi0.y, Pi0.y, Pi1.y, Pi1.y); - tvec4 iz0(Pi0.z); - tvec4 iz1(Pi1.z); - tvec4 iw0(Pi0.w); - tvec4 iw1(Pi1.w); - - tvec4 ixy = detail::permute(detail::permute(ix) + iy); - tvec4 ixy0 = detail::permute(ixy + iz0); - tvec4 ixy1 = detail::permute(ixy + iz1); - tvec4 ixy00 = detail::permute(ixy0 + iw0); - tvec4 ixy01 = detail::permute(ixy0 + iw1); - tvec4 ixy10 = detail::permute(ixy1 + iw0); - tvec4 ixy11 = detail::permute(ixy1 + iw1); - - tvec4 gx00 = ixy00 / T(7); - tvec4 gy00 = floor(gx00) / T(7); - tvec4 gz00 = floor(gy00) / T(6); - gx00 = fract(gx00) - T(0.5); - gy00 = fract(gy00) - T(0.5); - gz00 = fract(gz00) - T(0.5); - tvec4 gw00 = tvec4(0.75) - abs(gx00) - abs(gy00) - abs(gz00); - tvec4 sw00 = step(gw00, tvec4(0)); - gx00 -= sw00 * (step(T(0), gx00) - T(0.5)); - gy00 -= sw00 * (step(T(0), gy00) - T(0.5)); - - tvec4 gx01 = ixy01 / T(7); - tvec4 gy01 = floor(gx01) / T(7); - tvec4 gz01 = floor(gy01) / T(6); - gx01 = fract(gx01) - T(0.5); - gy01 = fract(gy01) - T(0.5); - gz01 = fract(gz01) - T(0.5); - tvec4 gw01 = tvec4(0.75) - abs(gx01) - abs(gy01) - abs(gz01); - tvec4 sw01 = step(gw01, tvec4(0.0)); - gx01 -= sw01 * (step(T(0), gx01) - T(0.5)); - gy01 -= sw01 * (step(T(0), gy01) - T(0.5)); - - tvec4 gx10 = ixy10 / T(7); - tvec4 gy10 = floor(gx10) / T(7); - tvec4 gz10 = floor(gy10) / T(6); - gx10 = fract(gx10) - T(0.5); - gy10 = fract(gy10) - T(0.5); - gz10 = fract(gz10) - T(0.5); - tvec4 gw10 = tvec4(0.75) - abs(gx10) - abs(gy10) - abs(gz10); - tvec4 sw10 = step(gw10, tvec4(0.0)); - gx10 -= sw10 * (step(T(0), gx10) - T(0.5)); - gy10 -= sw10 * (step(T(0), gy10) - T(0.5)); - - tvec4 gx11 = ixy11 / T(7); - tvec4 gy11 = floor(gx11) / T(7); - tvec4 gz11 = floor(gy11) / T(6); - gx11 = fract(gx11) - T(0.5); - gy11 = fract(gy11) - T(0.5); - gz11 = fract(gz11) - T(0.5); - tvec4 gw11 = tvec4(0.75) - abs(gx11) - abs(gy11) - abs(gz11); - tvec4 sw11 = step(gw11, tvec4(T(0))); - gx11 -= sw11 * (step(T(0), gx11) - T(0.5)); - gy11 -= sw11 * (step(T(0), gy11) - T(0.5)); - - tvec4 g0000(gx00.x, gy00.x, gz00.x, gw00.x); - tvec4 g1000(gx00.y, gy00.y, gz00.y, gw00.y); - tvec4 g0100(gx00.z, gy00.z, gz00.z, gw00.z); - tvec4 g1100(gx00.w, gy00.w, gz00.w, gw00.w); - tvec4 g0010(gx10.x, gy10.x, gz10.x, gw10.x); - tvec4 g1010(gx10.y, gy10.y, gz10.y, gw10.y); - tvec4 g0110(gx10.z, gy10.z, gz10.z, gw10.z); - tvec4 g1110(gx10.w, gy10.w, gz10.w, gw10.w); - tvec4 g0001(gx01.x, gy01.x, gz01.x, gw01.x); - tvec4 g1001(gx01.y, gy01.y, gz01.y, gw01.y); - tvec4 g0101(gx01.z, gy01.z, gz01.z, gw01.z); - tvec4 g1101(gx01.w, gy01.w, gz01.w, gw01.w); - tvec4 g0011(gx11.x, gy11.x, gz11.x, gw11.x); - tvec4 g1011(gx11.y, gy11.y, gz11.y, gw11.y); - tvec4 g0111(gx11.z, gy11.z, gz11.z, gw11.z); - tvec4 g1111(gx11.w, gy11.w, gz11.w, gw11.w); - - tvec4 norm00 = detail::taylorInvSqrt(tvec4(dot(g0000, g0000), dot(g0100, g0100), dot(g1000, g1000), dot(g1100, g1100))); - g0000 *= norm00.x; - g0100 *= norm00.y; - g1000 *= norm00.z; - g1100 *= norm00.w; - - tvec4 norm01 = detail::taylorInvSqrt(tvec4(dot(g0001, g0001), dot(g0101, g0101), dot(g1001, g1001), dot(g1101, g1101))); - g0001 *= norm01.x; - g0101 *= norm01.y; - g1001 *= norm01.z; - g1101 *= norm01.w; - - tvec4 norm10 = detail::taylorInvSqrt(tvec4(dot(g0010, g0010), dot(g0110, g0110), dot(g1010, g1010), dot(g1110, g1110))); - g0010 *= norm10.x; - g0110 *= norm10.y; - g1010 *= norm10.z; - g1110 *= norm10.w; - - tvec4 norm11 = detail::taylorInvSqrt(tvec4(dot(g0011, g0011), dot(g0111, g0111), dot(g1011, g1011), dot(g1111, g1111))); - g0011 *= norm11.x; - g0111 *= norm11.y; - g1011 *= norm11.z; - g1111 *= norm11.w; - - T n0000 = dot(g0000, Pf0); - T n1000 = dot(g1000, tvec4(Pf1.x, Pf0.y, Pf0.z, Pf0.w)); - T n0100 = dot(g0100, tvec4(Pf0.x, Pf1.y, Pf0.z, Pf0.w)); - T n1100 = dot(g1100, tvec4(Pf1.x, Pf1.y, Pf0.z, Pf0.w)); - T n0010 = dot(g0010, tvec4(Pf0.x, Pf0.y, Pf1.z, Pf0.w)); - T n1010 = dot(g1010, tvec4(Pf1.x, Pf0.y, Pf1.z, Pf0.w)); - T n0110 = dot(g0110, tvec4(Pf0.x, Pf1.y, Pf1.z, Pf0.w)); - T n1110 = dot(g1110, tvec4(Pf1.x, Pf1.y, Pf1.z, Pf0.w)); - T n0001 = dot(g0001, tvec4(Pf0.x, Pf0.y, Pf0.z, Pf1.w)); - T n1001 = dot(g1001, tvec4(Pf1.x, Pf0.y, Pf0.z, Pf1.w)); - T n0101 = dot(g0101, tvec4(Pf0.x, Pf1.y, Pf0.z, Pf1.w)); - T n1101 = dot(g1101, tvec4(Pf1.x, Pf1.y, Pf0.z, Pf1.w)); - T n0011 = dot(g0011, tvec4(Pf0.x, Pf0.y, Pf1.z, Pf1.w)); - T n1011 = dot(g1011, tvec4(Pf1.x, Pf0.y, Pf1.z, Pf1.w)); - T n0111 = dot(g0111, tvec4(Pf0.x, Pf1.y, Pf1.z, Pf1.w)); - T n1111 = dot(g1111, Pf1); - - tvec4 fade_xyzw = detail::fade(Pf0); - tvec4 n_0w = mix(tvec4(n0000, n1000, n0100, n1100), tvec4(n0001, n1001, n0101, n1101), fade_xyzw.w); - tvec4 n_1w = mix(tvec4(n0010, n1010, n0110, n1110), tvec4(n0011, n1011, n0111, n1111), fade_xyzw.w); - tvec4 n_zw = mix(n_0w, n_1w, fade_xyzw.z); - tvec2 n_yzw = mix(tvec2(n_zw.x, n_zw.y), tvec2(n_zw.z, n_zw.w), fade_xyzw.y); - T n_xyzw = mix(n_yzw.x, n_yzw.y, fade_xyzw.x); - return T(2.2) * n_xyzw; - } - - template - GLM_FUNC_QUALIFIER T simplex(glm::tvec2 const & v) - { - tvec4 const C = tvec4( - T( 0.211324865405187), // (3.0 - sqrt(3.0)) / 6.0 - T( 0.366025403784439), // 0.5 * (sqrt(3.0) - 1.0) - T(-0.577350269189626), // -1.0 + 2.0 * C.x - T( 0.024390243902439)); // 1.0 / 41.0 - - // First corner - tvec2 i = floor(v + dot(v, tvec2(C[1]))); - tvec2 x0 = v - i + dot(i, tvec2(C[0])); - - // Other corners - //i1.x = step( x0.y, x0.x ); // x0.x > x0.y ? 1.0 : 0.0 - //i1.y = 1.0 - i1.x; - tvec2 i1 = (x0.x > x0.y) ? tvec2(1, 0) : tvec2(0, 1); - // x0 = x0 - 0.0 + 0.0 * C.xx ; - // x1 = x0 - i1 + 1.0 * C.xx ; - // x2 = x0 - 1.0 + 2.0 * C.xx ; - tvec4 x12 = tvec4(x0.x, x0.y, x0.x, x0.y) + tvec4(C.x, C.x, C.z, C.z); - x12 = tvec4(tvec2(x12) - i1, x12.z, x12.w); - - // Permutations - i = mod(i, tvec2(289)); // Avoid truncation effects in permutation - tvec3 p = detail::permute( - detail::permute(i.y + tvec3(T(0), i1.y, T(1))) - + i.x + tvec3(T(0), i1.x, T(1))); - - tvec3 m = max(tvec3(0.5) - tvec3( - dot(x0, x0), - dot(tvec2(x12.x, x12.y), tvec2(x12.x, x12.y)), - dot(tvec2(x12.z, x12.w), tvec2(x12.z, x12.w))), tvec3(0)); - m = m * m ; - m = m * m ; - - // Gradients: 41 points uniformly over a line, mapped onto a diamond. - // The ring size 17*17 = 289 is close to a multiple of 41 (41*7 = 287) - - tvec3 x = static_cast(2) * fract(p * C.w) - T(1); - tvec3 h = abs(x) - T(0.5); - tvec3 ox = floor(x + T(0.5)); - tvec3 a0 = x - ox; - - // Normalise gradients implicitly by scaling m - // Inlined for speed: m *= taylorInvSqrt( a0*a0 + h*h ); - m *= static_cast(1.79284291400159) - T(0.85373472095314) * (a0 * a0 + h * h); - - // Compute final noise value at P - tvec3 g; - g.x = a0.x * x0.x + h.x * x0.y; - //g.yz = a0.yz * x12.xz + h.yz * x12.yw; - g.y = a0.y * x12.x + h.y * x12.y; - g.z = a0.z * x12.z + h.z * x12.w; - return T(130) * dot(m, g); - } - - template - GLM_FUNC_QUALIFIER T simplex(tvec3 const & v) - { - tvec2 const C(1.0 / 6.0, 1.0 / 3.0); - tvec4 const D(0.0, 0.5, 1.0, 2.0); - - // First corner - tvec3 i(floor(v + dot(v, tvec3(C.y)))); - tvec3 x0(v - i + dot(i, tvec3(C.x))); - - // Other corners - tvec3 g(step(tvec3(x0.y, x0.z, x0.x), x0)); - tvec3 l(T(1) - g); - tvec3 i1(min(g, tvec3(l.z, l.x, l.y))); - tvec3 i2(max(g, tvec3(l.z, l.x, l.y))); - - // x0 = x0 - 0.0 + 0.0 * C.xxx; - // x1 = x0 - i1 + 1.0 * C.xxx; - // x2 = x0 - i2 + 2.0 * C.xxx; - // x3 = x0 - 1.0 + 3.0 * C.xxx; - tvec3 x1(x0 - i1 + C.x); - tvec3 x2(x0 - i2 + C.y); // 2.0*C.x = 1/3 = C.y - tvec3 x3(x0 - D.y); // -1.0+3.0*C.x = -0.5 = -D.y - - // Permutations - i = detail::mod289(i); - tvec4 p(detail::permute(detail::permute(detail::permute( - i.z + tvec4(T(0), i1.z, i2.z, T(1))) + - i.y + tvec4(T(0), i1.y, i2.y, T(1))) + - i.x + tvec4(T(0), i1.x, i2.x, T(1)))); - - // Gradients: 7x7 points over a square, mapped onto an octahedron. - // The ring size 17*17 = 289 is close to a multiple of 49 (49*6 = 294) - T n_ = static_cast(0.142857142857); // 1.0/7.0 - tvec3 ns(n_ * tvec3(D.w, D.y, D.z) - tvec3(D.x, D.z, D.x)); - - tvec4 j(p - T(49) * floor(p * ns.z * ns.z)); // mod(p,7*7) - - tvec4 x_(floor(j * ns.z)); - tvec4 y_(floor(j - T(7) * x_)); // mod(j,N) - - tvec4 x(x_ * ns.x + ns.y); - tvec4 y(y_ * ns.x + ns.y); - tvec4 h(T(1) - abs(x) - abs(y)); - - tvec4 b0(x.x, x.y, y.x, y.y); - tvec4 b1(x.z, x.w, y.z, y.w); - - // vec4 s0 = vec4(lessThan(b0,0.0))*2.0 - 1.0; - // vec4 s1 = vec4(lessThan(b1,0.0))*2.0 - 1.0; - tvec4 s0(floor(b0) * T(2) + T(1)); - tvec4 s1(floor(b1) * T(2) + T(1)); - tvec4 sh(-step(h, tvec4(0.0))); - - tvec4 a0 = tvec4(b0.x, b0.z, b0.y, b0.w) + tvec4(s0.x, s0.z, s0.y, s0.w) * tvec4(sh.x, sh.x, sh.y, sh.y); - tvec4 a1 = tvec4(b1.x, b1.z, b1.y, b1.w) + tvec4(s1.x, s1.z, s1.y, s1.w) * tvec4(sh.z, sh.z, sh.w, sh.w); - - tvec3 p0(a0.x, a0.y, h.x); - tvec3 p1(a0.z, a0.w, h.y); - tvec3 p2(a1.x, a1.y, h.z); - tvec3 p3(a1.z, a1.w, h.w); - - // Normalise gradients - tvec4 norm = detail::taylorInvSqrt(tvec4(dot(p0, p0), dot(p1, p1), dot(p2, p2), dot(p3, p3))); - p0 *= norm.x; - p1 *= norm.y; - p2 *= norm.z; - p3 *= norm.w; - - // Mix final noise value - tvec4 m = max(T(0.6) - tvec4(dot(x0, x0), dot(x1, x1), dot(x2, x2), dot(x3, x3)), tvec4(0)); - m = m * m; - return T(42) * dot(m * m, tvec4(dot(p0, x0), dot(p1, x1), dot(p2, x2), dot(p3, x3))); - } - - template - GLM_FUNC_QUALIFIER T simplex(tvec4 const & v) - { - tvec4 const C( - 0.138196601125011, // (5 - sqrt(5))/20 G4 - 0.276393202250021, // 2 * G4 - 0.414589803375032, // 3 * G4 - -0.447213595499958); // -1 + 4 * G4 - - // (sqrt(5) - 1)/4 = F4, used once below - T const F4 = static_cast(0.309016994374947451); - - // First corner - tvec4 i = floor(v + dot(v, vec4(F4))); - tvec4 x0 = v - i + dot(i, vec4(C.x)); - - // Other corners - - // Rank sorting originally contributed by Bill Licea-Kane, AMD (formerly ATI) - tvec4 i0; - tvec3 isX = step(tvec3(x0.y, x0.z, x0.w), tvec3(x0.x)); - tvec3 isYZ = step(tvec3(x0.z, x0.w, x0.w), tvec3(x0.y, x0.y, x0.z)); - // i0.x = dot(isX, vec3(1.0)); - //i0.x = isX.x + isX.y + isX.z; - //i0.yzw = static_cast(1) - isX; - i0 = tvec4(isX.x + isX.y + isX.z, T(1) - isX); - // i0.y += dot(isYZ.xy, vec2(1.0)); - i0.y += isYZ.x + isYZ.y; - //i0.zw += 1.0 - tvec2(isYZ.x, isYZ.y); - i0.z += static_cast(1) - isYZ.x; - i0.w += static_cast(1) - isYZ.y; - i0.z += isYZ.z; - i0.w += static_cast(1) - isYZ.z; - - // i0 now contains the unique values 0,1,2,3 in each channel - tvec4 i3 = clamp(i0, T(0), T(1)); - tvec4 i2 = clamp(i0 - T(1), T(0), T(1)); - tvec4 i1 = clamp(i0 - T(2), T(0), T(1)); - - // x0 = x0 - 0.0 + 0.0 * C.xxxx - // x1 = x0 - i1 + 0.0 * C.xxxx - // x2 = x0 - i2 + 0.0 * C.xxxx - // x3 = x0 - i3 + 0.0 * C.xxxx - // x4 = x0 - 1.0 + 4.0 * C.xxxx - tvec4 x1 = x0 - i1 + C.x; - tvec4 x2 = x0 - i2 + C.y; - tvec4 x3 = x0 - i3 + C.z; - tvec4 x4 = x0 + C.w; - - // Permutations - i = mod(i, tvec4(289)); - T j0 = detail::permute(detail::permute(detail::permute(detail::permute(i.w) + i.z) + i.y) + i.x); - tvec4 j1 = detail::permute(detail::permute(detail::permute(detail::permute( - i.w + tvec4(i1.w, i2.w, i3.w, T(1))) + - i.z + tvec4(i1.z, i2.z, i3.z, T(1))) + - i.y + tvec4(i1.y, i2.y, i3.y, T(1))) + - i.x + tvec4(i1.x, i2.x, i3.x, T(1))); - - // Gradients: 7x7x6 points over a cube, mapped onto a 4-cross polytope - // 7*7*6 = 294, which is close to the ring size 17*17 = 289. - tvec4 ip = tvec4(T(1) / T(294), T(1) / T(49), T(1) / T(7), T(0)); - - tvec4 p0 = gtc::grad4(j0, ip); - tvec4 p1 = gtc::grad4(j1.x, ip); - tvec4 p2 = gtc::grad4(j1.y, ip); - tvec4 p3 = gtc::grad4(j1.z, ip); - tvec4 p4 = gtc::grad4(j1.w, ip); - - // Normalise gradients - tvec4 norm = detail::taylorInvSqrt(tvec4(dot(p0, p0), dot(p1, p1), dot(p2, p2), dot(p3, p3))); - p0 *= norm.x; - p1 *= norm.y; - p2 *= norm.z; - p3 *= norm.w; - p4 *= detail::taylorInvSqrt(dot(p4, p4)); - - // Mix contributions from the five corners - tvec3 m0 = max(T(0.6) - tvec3(dot(x0, x0), dot(x1, x1), dot(x2, x2)), tvec3(0)); - tvec2 m1 = max(T(0.6) - tvec2(dot(x3, x3), dot(x4, x4) ), tvec2(0)); - m0 = m0 * m0; - m1 = m1 * m1; - return T(49) * - (dot(m0 * m0, tvec3(dot(p0, x0), dot(p1, x1), dot(p2, x2))) + - dot(m1 * m1, tvec2(dot(p3, x3), dot(p4, x4)))); - } -}//namespace glm diff --git a/inc/glm/gtc/packing.hpp b/inc/glm/gtc/packing.hpp deleted file mode 100644 index 49b529a..0000000 --- a/inc/glm/gtc/packing.hpp +++ /dev/null @@ -1,478 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_packing -/// @file glm/gtc/packing.hpp -/// @date 2013-08-08 / 2013-08-08 -/// @author Christophe Riccio -/// -/// @see core (dependence) -/// -/// @defgroup gtc_packing GLM_GTC_packing -/// @ingroup gtc -/// -/// @brief This extension provides a set of function to convert vertors to packed -/// formats. -/// -/// need to be included to use these features. -/////////////////////////////////////////////////////////////////////////////////// - -#pragma once - -// Dependency: -#include "type_precision.hpp" - -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) -# pragma message("GLM: GLM_GTC_packing extension included") -#endif - -namespace glm -{ - /// @addtogroup gtc_packing - /// @{ - - /// First, converts the normalized floating-point value v into a 8-bit integer value. - /// Then, the results are packed into the returned 8-bit unsigned integer. - /// - /// The conversion for component c of v to fixed point is done as follows: - /// packUnorm1x8: round(clamp(c, 0, +1) * 255.0) - /// - /// @see gtc_packing - /// @see uint16 packUnorm2x8(vec2 const & v) - /// @see uint32 packUnorm4x8(vec4 const & v) - /// @see GLSL packUnorm4x8 man page - /// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions - GLM_FUNC_DECL uint8 packUnorm1x8(float v); - - /// Convert a single 8-bit integer to a normalized floating-point value. - /// - /// The conversion for unpacked fixed-point value f to floating point is done as follows: - /// unpackUnorm4x8: f / 255.0 - /// - /// @see gtc_packing - /// @see vec2 unpackUnorm2x8(uint16 p) - /// @see vec4 unpackUnorm4x8(uint32 p) - /// @see GLSL unpackUnorm4x8 man page - /// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions - GLM_FUNC_DECL float unpackUnorm1x8(uint8 p); - - /// First, converts each component of the normalized floating-point value v into 8-bit integer values. - /// Then, the results are packed into the returned 16-bit unsigned integer. - /// - /// The conversion for component c of v to fixed point is done as follows: - /// packUnorm2x8: round(clamp(c, 0, +1) * 255.0) - /// - /// The first component of the vector will be written to the least significant bits of the output; - /// the last component will be written to the most significant bits. - /// - /// @see gtc_packing - /// @see uint8 packUnorm1x8(float const & v) - /// @see uint32 packUnorm4x8(vec4 const & v) - /// @see GLSL packUnorm4x8 man page - /// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions - GLM_FUNC_DECL uint16 packUnorm2x8(vec2 const & v); - - /// First, unpacks a single 16-bit unsigned integer p into a pair of 8-bit unsigned integers. - /// Then, each component is converted to a normalized floating-point value to generate the returned two-component vector. - /// - /// The conversion for unpacked fixed-point value f to floating point is done as follows: - /// unpackUnorm4x8: f / 255.0 - /// - /// The first component of the returned vector will be extracted from the least significant bits of the input; - /// the last component will be extracted from the most significant bits. - /// - /// @see gtc_packing - /// @see float unpackUnorm1x8(uint8 v) - /// @see vec4 unpackUnorm4x8(uint32 p) - /// @see GLSL unpackUnorm4x8 man page - /// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions - GLM_FUNC_DECL vec2 unpackUnorm2x8(uint16 p); - - /// First, converts the normalized floating-point value v into 8-bit integer value. - /// Then, the results are packed into the returned 8-bit unsigned integer. - /// - /// The conversion to fixed point is done as follows: - /// packSnorm1x8: round(clamp(s, -1, +1) * 127.0) - /// - /// @see gtc_packing - /// @see uint16 packSnorm2x8(vec2 const & v) - /// @see uint32 packSnorm4x8(vec4 const & v) - /// @see GLSL packSnorm4x8 man page - /// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions - GLM_FUNC_DECL uint8 packSnorm1x8(float s); - - /// First, unpacks a single 8-bit unsigned integer p into a single 8-bit signed integers. - /// Then, the value is converted to a normalized floating-point value to generate the returned scalar. - /// - /// The conversion for unpacked fixed-point value f to floating point is done as follows: - /// unpackSnorm1x8: clamp(f / 127.0, -1, +1) - /// - /// @see gtc_packing - /// @see vec2 unpackSnorm2x8(uint16 p) - /// @see vec4 unpackSnorm4x8(uint32 p) - /// @see GLSL unpackSnorm4x8 man page - /// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions - GLM_FUNC_DECL float unpackSnorm1x8(uint8 p); - - /// First, converts each component of the normalized floating-point value v into 8-bit integer values. - /// Then, the results are packed into the returned 16-bit unsigned integer. - /// - /// The conversion for component c of v to fixed point is done as follows: - /// packSnorm2x8: round(clamp(c, -1, +1) * 127.0) - /// - /// The first component of the vector will be written to the least significant bits of the output; - /// the last component will be written to the most significant bits. - /// - /// @see gtc_packing - /// @see uint8 packSnorm1x8(float const & v) - /// @see uint32 packSnorm4x8(vec4 const & v) - /// @see GLSL packSnorm4x8 man page - /// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions - GLM_FUNC_DECL uint16 packSnorm2x8(vec2 const & v); - - /// First, unpacks a single 16-bit unsigned integer p into a pair of 8-bit signed integers. - /// Then, each component is converted to a normalized floating-point value to generate the returned two-component vector. - /// - /// The conversion for unpacked fixed-point value f to floating point is done as follows: - /// unpackSnorm2x8: clamp(f / 127.0, -1, +1) - /// - /// The first component of the returned vector will be extracted from the least significant bits of the input; - /// the last component will be extracted from the most significant bits. - /// - /// @see gtc_packing - /// @see float unpackSnorm1x8(uint8 p) - /// @see vec4 unpackSnorm4x8(uint32 p) - /// @see GLSL unpackSnorm4x8 man page - /// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions - GLM_FUNC_DECL vec2 unpackSnorm2x8(uint16 p); - - /// First, converts the normalized floating-point value v into a 16-bit integer value. - /// Then, the results are packed into the returned 16-bit unsigned integer. - /// - /// The conversion for component c of v to fixed point is done as follows: - /// packUnorm1x16: round(clamp(c, 0, +1) * 65535.0) - /// - /// @see gtc_packing - /// @see uint16 packSnorm1x16(float const & v) - /// @see uint64 packSnorm4x16(vec4 const & v) - /// @see GLSL packUnorm4x8 man page - /// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions - GLM_FUNC_DECL uint16 packUnorm1x16(float v); - - /// First, unpacks a single 16-bit unsigned integer p into a of 16-bit unsigned integers. - /// Then, the value is converted to a normalized floating-point value to generate the returned scalar. - /// - /// The conversion for unpacked fixed-point value f to floating point is done as follows: - /// unpackUnorm1x16: f / 65535.0 - /// - /// @see gtc_packing - /// @see vec2 unpackUnorm2x16(uint32 p) - /// @see vec4 unpackUnorm4x16(uint64 p) - /// @see GLSL unpackUnorm2x16 man page - /// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions - GLM_FUNC_DECL float unpackUnorm1x16(uint16 p); - - /// First, converts each component of the normalized floating-point value v into 16-bit integer values. - /// Then, the results are packed into the returned 64-bit unsigned integer. - /// - /// The conversion for component c of v to fixed point is done as follows: - /// packUnorm4x16: round(clamp(c, 0, +1) * 65535.0) - /// - /// The first component of the vector will be written to the least significant bits of the output; - /// the last component will be written to the most significant bits. - /// - /// @see gtc_packing - /// @see uint16 packUnorm1x16(float const & v) - /// @see uint32 packUnorm2x16(vec2 const & v) - /// @see GLSL packUnorm4x8 man page - /// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions - GLM_FUNC_DECL uint64 packUnorm4x16(vec4 const & v); - - /// First, unpacks a single 64-bit unsigned integer p into four 16-bit unsigned integers. - /// Then, each component is converted to a normalized floating-point value to generate the returned four-component vector. - /// - /// The conversion for unpacked fixed-point value f to floating point is done as follows: - /// unpackUnormx4x16: f / 65535.0 - /// - /// The first component of the returned vector will be extracted from the least significant bits of the input; - /// the last component will be extracted from the most significant bits. - /// - /// @see gtc_packing - /// @see float unpackUnorm1x16(uint16 p) - /// @see vec2 unpackUnorm2x16(uint32 p) - /// @see GLSL unpackUnorm2x16 man page - /// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions - GLM_FUNC_DECL vec4 unpackUnorm4x16(uint64 p); - - /// First, converts the normalized floating-point value v into 16-bit integer value. - /// Then, the results are packed into the returned 16-bit unsigned integer. - /// - /// The conversion to fixed point is done as follows: - /// packSnorm1x8: round(clamp(s, -1, +1) * 32767.0) - /// - /// @see gtc_packing - /// @see uint32 packSnorm2x16(vec2 const & v) - /// @see uint64 packSnorm4x16(vec4 const & v) - /// @see GLSL packSnorm4x8 man page - /// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions - GLM_FUNC_DECL uint16 packSnorm1x16(float v); - - /// First, unpacks a single 16-bit unsigned integer p into a single 16-bit signed integers. - /// Then, each component is converted to a normalized floating-point value to generate the returned scalar. - /// - /// The conversion for unpacked fixed-point value f to floating point is done as follows: - /// unpackSnorm1x16: clamp(f / 32767.0, -1, +1) - /// - /// @see gtc_packing - /// @see vec2 unpackSnorm2x16(uint32 p) - /// @see vec4 unpackSnorm4x16(uint64 p) - /// @see GLSL unpackSnorm4x8 man page - /// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions - GLM_FUNC_DECL float unpackSnorm1x16(uint16 p); - - /// First, converts each component of the normalized floating-point value v into 16-bit integer values. - /// Then, the results are packed into the returned 64-bit unsigned integer. - /// - /// The conversion for component c of v to fixed point is done as follows: - /// packSnorm2x8: round(clamp(c, -1, +1) * 32767.0) - /// - /// The first component of the vector will be written to the least significant bits of the output; - /// the last component will be written to the most significant bits. - /// - /// @see gtc_packing - /// @see uint16 packSnorm1x16(float const & v) - /// @see uint32 packSnorm2x16(vec2 const & v) - /// @see GLSL packSnorm4x8 man page - /// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions - GLM_FUNC_DECL uint64 packSnorm4x16(vec4 const & v); - - /// First, unpacks a single 64-bit unsigned integer p into four 16-bit signed integers. - /// Then, each component is converted to a normalized floating-point value to generate the returned four-component vector. - /// - /// The conversion for unpacked fixed-point value f to floating point is done as follows: - /// unpackSnorm4x16: clamp(f / 32767.0, -1, +1) - /// - /// The first component of the returned vector will be extracted from the least significant bits of the input; - /// the last component will be extracted from the most significant bits. - /// - /// @see gtc_packing - /// @see float unpackSnorm1x16(uint16 p) - /// @see vec2 unpackSnorm2x16(uint32 p) - /// @see GLSL unpackSnorm4x8 man page - /// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions - GLM_FUNC_DECL vec4 unpackSnorm4x16(uint64 p); - - /// Returns an unsigned integer obtained by converting the components of a floating-point scalar - /// to the 16-bit floating-point representation found in the OpenGL Specification, - /// and then packing this 16-bit value into a 16-bit unsigned integer. - /// - /// @see gtc_packing - /// @see uint32 packHalf2x16(vec2 const & v) - /// @see uint64 packHalf4x16(vec4 const & v) - /// @see GLSL packHalf2x16 man page - /// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions - GLM_FUNC_DECL uint16 packHalf1x16(float v); - - /// Returns a floating-point scalar with components obtained by unpacking a 16-bit unsigned integer into a 16-bit value, - /// interpreted as a 16-bit floating-point number according to the OpenGL Specification, - /// and converting it to 32-bit floating-point values. - /// - /// @see gtc_packing - /// @see vec2 unpackHalf2x16(uint32 const & v) - /// @see vec4 unpackHalf4x16(uint64 const & v) - /// @see GLSL unpackHalf2x16 man page - /// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions - GLM_FUNC_DECL float unpackHalf1x16(uint16 v); - - /// Returns an unsigned integer obtained by converting the components of a four-component floating-point vector - /// to the 16-bit floating-point representation found in the OpenGL Specification, - /// and then packing these four 16-bit values into a 64-bit unsigned integer. - /// The first vector component specifies the 16 least-significant bits of the result; - /// the forth component specifies the 16 most-significant bits. - /// - /// @see gtc_packing - /// @see uint16 packHalf1x16(float const & v) - /// @see uint32 packHalf2x16(vec2 const & v) - /// @see GLSL packHalf2x16 man page - /// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions - GLM_FUNC_DECL uint64 packHalf4x16(vec4 const & v); - - /// Returns a four-component floating-point vector with components obtained by unpacking a 64-bit unsigned integer into four 16-bit values, - /// interpreting those values as 16-bit floating-point numbers according to the OpenGL Specification, - /// and converting them to 32-bit floating-point values. - /// The first component of the vector is obtained from the 16 least-significant bits of v; - /// the forth component is obtained from the 16 most-significant bits of v. - /// - /// @see gtc_packing - /// @see float unpackHalf1x16(uint16 const & v) - /// @see vec2 unpackHalf2x16(uint32 const & v) - /// @see GLSL unpackHalf2x16 man page - /// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions - GLM_FUNC_DECL vec4 unpackHalf4x16(uint64 p); - - /// Returns an unsigned integer obtained by converting the components of a four-component signed integer vector - /// to the 10-10-10-2-bit signed integer representation found in the OpenGL Specification, - /// and then packing these four values into a 32-bit unsigned integer. - /// The first vector component specifies the 10 least-significant bits of the result; - /// the forth component specifies the 2 most-significant bits. - /// - /// @see gtc_packing - /// @see uint32 packI3x10_1x2(uvec4 const & v) - /// @see uint32 packSnorm3x10_1x2(vec4 const & v) - /// @see uint32 packUnorm3x10_1x2(vec4 const & v) - /// @see ivec4 unpackI3x10_1x2(uint32 const & p) - GLM_FUNC_DECL uint32 packI3x10_1x2(ivec4 const & v); - - /// Unpacks a single 32-bit unsigned integer p into three 10-bit and one 2-bit signed integers. - /// - /// The first component of the returned vector will be extracted from the least significant bits of the input; - /// the last component will be extracted from the most significant bits. - /// - /// @see gtc_packing - /// @see uint32 packU3x10_1x2(uvec4 const & v) - /// @see vec4 unpackSnorm3x10_1x2(uint32 const & p); - /// @see uvec4 unpackI3x10_1x2(uint32 const & p); - GLM_FUNC_DECL ivec4 unpackI3x10_1x2(uint32 p); - - /// Returns an unsigned integer obtained by converting the components of a four-component unsigned integer vector - /// to the 10-10-10-2-bit unsigned integer representation found in the OpenGL Specification, - /// and then packing these four values into a 32-bit unsigned integer. - /// The first vector component specifies the 10 least-significant bits of the result; - /// the forth component specifies the 2 most-significant bits. - /// - /// @see gtc_packing - /// @see uint32 packI3x10_1x2(ivec4 const & v) - /// @see uint32 packSnorm3x10_1x2(vec4 const & v) - /// @see uint32 packUnorm3x10_1x2(vec4 const & v) - /// @see ivec4 unpackU3x10_1x2(uint32 const & p) - GLM_FUNC_DECL uint32 packU3x10_1x2(uvec4 const & v); - - /// Unpacks a single 32-bit unsigned integer p into three 10-bit and one 2-bit unsigned integers. - /// - /// The first component of the returned vector will be extracted from the least significant bits of the input; - /// the last component will be extracted from the most significant bits. - /// - /// @see gtc_packing - /// @see uint32 packU3x10_1x2(uvec4 const & v) - /// @see vec4 unpackSnorm3x10_1x2(uint32 const & p); - /// @see uvec4 unpackI3x10_1x2(uint32 const & p); - GLM_FUNC_DECL uvec4 unpackU3x10_1x2(uint32 p); - - /// First, converts the first three components of the normalized floating-point value v into 10-bit signed integer values. - /// Then, converts the forth component of the normalized floating-point value v into 2-bit signed integer values. - /// Then, the results are packed into the returned 32-bit unsigned integer. - /// - /// The conversion for component c of v to fixed point is done as follows: - /// packSnorm3x10_1x2(xyz): round(clamp(c, -1, +1) * 511.0) - /// packSnorm3x10_1x2(w): round(clamp(c, -1, +1) * 1.0) - /// - /// The first vector component specifies the 10 least-significant bits of the result; - /// the forth component specifies the 2 most-significant bits. - /// - /// @see gtc_packing - /// @see vec4 unpackSnorm3x10_1x2(uint32 const & p) - /// @see uint32 packUnorm3x10_1x2(vec4 const & v) - /// @see uint32 packU3x10_1x2(uvec4 const & v) - /// @see uint32 packI3x10_1x2(ivec4 const & v) - GLM_FUNC_DECL uint32 packSnorm3x10_1x2(vec4 const & v); - - /// First, unpacks a single 32-bit unsigned integer p into four 16-bit signed integers. - /// Then, each component is converted to a normalized floating-point value to generate the returned four-component vector. - /// - /// The conversion for unpacked fixed-point value f to floating point is done as follows: - /// unpackSnorm3x10_1x2(xyz): clamp(f / 511.0, -1, +1) - /// unpackSnorm3x10_1x2(w): clamp(f / 511.0, -1, +1) - /// - /// The first component of the returned vector will be extracted from the least significant bits of the input; - /// the last component will be extracted from the most significant bits. - /// - /// @see gtc_packing - /// @see uint32 packSnorm3x10_1x2(vec4 const & v) - /// @see vec4 unpackUnorm3x10_1x2(uint32 const & p)) - /// @see uvec4 unpackI3x10_1x2(uint32 const & p) - /// @see uvec4 unpackU3x10_1x2(uint32 const & p) - GLM_FUNC_DECL vec4 unpackSnorm3x10_1x2(uint32 p); - - /// First, converts the first three components of the normalized floating-point value v into 10-bit unsigned integer values. - /// Then, converts the forth component of the normalized floating-point value v into 2-bit signed uninteger values. - /// Then, the results are packed into the returned 32-bit unsigned integer. - /// - /// The conversion for component c of v to fixed point is done as follows: - /// packUnorm3x10_1x2(xyz): round(clamp(c, 0, +1) * 1023.0) - /// packUnorm3x10_1x2(w): round(clamp(c, 0, +1) * 3.0) - /// - /// The first vector component specifies the 10 least-significant bits of the result; - /// the forth component specifies the 2 most-significant bits. - /// - /// @see gtc_packing - /// @see vec4 unpackUnorm3x10_1x2(uint32 const & p) - /// @see uint32 packUnorm3x10_1x2(vec4 const & v) - /// @see uint32 packU3x10_1x2(uvec4 const & v) - /// @see uint32 packI3x10_1x2(ivec4 const & v) - GLM_FUNC_DECL uint32 packUnorm3x10_1x2(vec4 const & v); - - /// First, unpacks a single 32-bit unsigned integer p into four 16-bit signed integers. - /// Then, each component is converted to a normalized floating-point value to generate the returned four-component vector. - /// - /// The conversion for unpacked fixed-point value f to floating point is done as follows: - /// unpackSnorm3x10_1x2(xyz): clamp(f / 1023.0, 0, +1) - /// unpackSnorm3x10_1x2(w): clamp(f / 3.0, 0, +1) - /// - /// The first component of the returned vector will be extracted from the least significant bits of the input; - /// the last component will be extracted from the most significant bits. - /// - /// @see gtc_packing - /// @see uint32 packSnorm3x10_1x2(vec4 const & v) - /// @see vec4 unpackInorm3x10_1x2(uint32 const & p)) - /// @see uvec4 unpackI3x10_1x2(uint32 const & p) - /// @see uvec4 unpackU3x10_1x2(uint32 const & p) - GLM_FUNC_DECL vec4 unpackUnorm3x10_1x2(uint32 p); - - /// First, converts the first two components of the normalized floating-point value v into 11-bit signless floating-point values. - /// Then, converts the third component of the normalized floating-point value v into a 10-bit signless floating-point value. - /// Then, the results are packed into the returned 32-bit unsigned integer. - /// - /// The first vector component specifies the 11 least-significant bits of the result; - /// the last component specifies the 10 most-significant bits. - /// - /// @see gtc_packing - /// @see vec3 unpackF2x11_1x10(uint32 const & p) - GLM_FUNC_DECL uint32 packF2x11_1x10(vec3 const & v); - - /// First, unpacks a single 32-bit unsigned integer p into two 11-bit signless floating-point values and one 10-bit signless floating-point value . - /// Then, each component is converted to a normalized floating-point value to generate the returned three-component vector. - /// - /// The first component of the returned vector will be extracted from the least significant bits of the input; - /// the last component will be extracted from the most significant bits. - /// - /// @see gtc_packing - /// @see uint32 packF2x11_1x10(vec3 const & v) - GLM_FUNC_DECL vec3 unpackF2x11_1x10(uint32 p); - - /// @} -}// namespace glm - -#include "packing.inl" diff --git a/inc/glm/gtc/packing.inl b/inc/glm/gtc/packing.inl deleted file mode 100644 index fa417dd..0000000 --- a/inc/glm/gtc/packing.inl +++ /dev/null @@ -1,490 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_packing -/// @file glm/gtc/packing.inl -/// @date 2013-08-08 / 2013-08-08 -/// @author Christophe Riccio -/////////////////////////////////////////////////////////////////////////////////// - -#include "../common.hpp" -#include "../vec2.hpp" -#include "../vec3.hpp" -#include "../vec4.hpp" -#include "../detail/type_half.hpp" -#include - -namespace glm{ -namespace detail -{ - GLM_FUNC_QUALIFIER glm::uint16 float2half(glm::uint32 f) - { - // 10 bits => EE EEEFFFFF - // 11 bits => EEE EEFFFFFF - // Half bits => SEEEEEFF FFFFFFFF - // Float bits => SEEEEEEE EFFFFFFF FFFFFFFF FFFFFFFF - - // 0x00007c00 => 00000000 00000000 01111100 00000000 - // 0x000003ff => 00000000 00000000 00000011 11111111 - // 0x38000000 => 00111000 00000000 00000000 00000000 - // 0x7f800000 => 01111111 10000000 00000000 00000000 - // 0x00008000 => 00000000 00000000 10000000 00000000 - return - ((f >> 16) & 0x8000) | // sign - ((((f & 0x7f800000) - 0x38000000) >> 13) & 0x7c00) | // exponential - ((f >> 13) & 0x03ff); // Mantissa - } - - GLM_FUNC_QUALIFIER glm::uint32 float2packed11(glm::uint32 f) - { - // 10 bits => EE EEEFFFFF - // 11 bits => EEE EEFFFFFF - // Half bits => SEEEEEFF FFFFFFFF - // Float bits => SEEEEEEE EFFFFFFF FFFFFFFF FFFFFFFF - - // 0x000007c0 => 00000000 00000000 00000111 11000000 - // 0x00007c00 => 00000000 00000000 01111100 00000000 - // 0x000003ff => 00000000 00000000 00000011 11111111 - // 0x38000000 => 00111000 00000000 00000000 00000000 - // 0x7f800000 => 01111111 10000000 00000000 00000000 - // 0x00008000 => 00000000 00000000 10000000 00000000 - return - ((((f & 0x7f800000) - 0x38000000) >> 17) & 0x07c0) | // exponential - ((f >> 17) & 0x003f); // Mantissa - } - - GLM_FUNC_QUALIFIER glm::uint32 packed11ToFloat(glm::uint32 p) - { - // 10 bits => EE EEEFFFFF - // 11 bits => EEE EEFFFFFF - // Half bits => SEEEEEFF FFFFFFFF - // Float bits => SEEEEEEE EFFFFFFF FFFFFFFF FFFFFFFF - - // 0x000007c0 => 00000000 00000000 00000111 11000000 - // 0x00007c00 => 00000000 00000000 01111100 00000000 - // 0x000003ff => 00000000 00000000 00000011 11111111 - // 0x38000000 => 00111000 00000000 00000000 00000000 - // 0x7f800000 => 01111111 10000000 00000000 00000000 - // 0x00008000 => 00000000 00000000 10000000 00000000 - return - ((((p & 0x07c0) << 17) + 0x38000000) & 0x7f800000) | // exponential - ((p & 0x003f) << 17); // Mantissa - } - - GLM_FUNC_QUALIFIER glm::uint32 float2packed10(glm::uint32 f) - { - // 10 bits => EE EEEFFFFF - // 11 bits => EEE EEFFFFFF - // Half bits => SEEEEEFF FFFFFFFF - // Float bits => SEEEEEEE EFFFFFFF FFFFFFFF FFFFFFFF - - // 0x0000001F => 00000000 00000000 00000000 00011111 - // 0x0000003F => 00000000 00000000 00000000 00111111 - // 0x000003E0 => 00000000 00000000 00000011 11100000 - // 0x000007C0 => 00000000 00000000 00000111 11000000 - // 0x00007C00 => 00000000 00000000 01111100 00000000 - // 0x000003FF => 00000000 00000000 00000011 11111111 - // 0x38000000 => 00111000 00000000 00000000 00000000 - // 0x7f800000 => 01111111 10000000 00000000 00000000 - // 0x00008000 => 00000000 00000000 10000000 00000000 - return - ((((f & 0x7f800000) - 0x38000000) >> 18) & 0x03E0) | // exponential - ((f >> 18) & 0x001f); // Mantissa - } - - GLM_FUNC_QUALIFIER glm::uint32 packed10ToFloat(glm::uint32 p) - { - // 10 bits => EE EEEFFFFF - // 11 bits => EEE EEFFFFFF - // Half bits => SEEEEEFF FFFFFFFF - // Float bits => SEEEEEEE EFFFFFFF FFFFFFFF FFFFFFFF - - // 0x0000001F => 00000000 00000000 00000000 00011111 - // 0x0000003F => 00000000 00000000 00000000 00111111 - // 0x000003E0 => 00000000 00000000 00000011 11100000 - // 0x000007C0 => 00000000 00000000 00000111 11000000 - // 0x00007C00 => 00000000 00000000 01111100 00000000 - // 0x000003FF => 00000000 00000000 00000011 11111111 - // 0x38000000 => 00111000 00000000 00000000 00000000 - // 0x7f800000 => 01111111 10000000 00000000 00000000 - // 0x00008000 => 00000000 00000000 10000000 00000000 - return - ((((p & 0x03E0) << 18) + 0x38000000) & 0x7f800000) | // exponential - ((p & 0x001f) << 18); // Mantissa - } - - GLM_FUNC_QUALIFIER glm::uint half2float(glm::uint h) - { - return ((h & 0x8000) << 16) | ((( h & 0x7c00) + 0x1C000) << 13) | ((h & 0x03FF) << 13); - } - - GLM_FUNC_QUALIFIER glm::uint floatTo11bit(float x) - { - if(x == 0.0f) - return 0u; - else if(glm::isnan(x)) - return ~0u; - else if(glm::isinf(x)) - return 0x1Fu << 6u; - -# if(GLM_COMPILER & GLM_COMPILER_GCC || GLM_COMPILER & (GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM)) - uint Pack = 0u; - memcpy(&Pack, &x, sizeof(Pack)); -# else - uint Pack = reinterpret_cast(x); -# endif - - return float2packed11(Pack); - } - - GLM_FUNC_QUALIFIER float packed11bitToFloat(glm::uint x) - { - if(x == 0) - return 0.0f; - else if(x == ((1 << 11) - 1)) - return ~0;//NaN - else if(x == (0x1f << 6)) - return ~0;//Inf - - uint Result = packed11ToFloat(x); - -# if(GLM_COMPILER & GLM_COMPILER_GCC || GLM_COMPILER & (GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM)) - float Temp = 0; - memcpy(&Temp, &Result, sizeof(Temp)); - return Temp; -# else - return reinterpret_cast(Result); -# endif - } - - GLM_FUNC_QUALIFIER glm::uint floatTo10bit(float x) - { - if(x == 0.0f) - return 0u; - else if(glm::isnan(x)) - return ~0u; - else if(glm::isinf(x)) - return 0x1Fu << 5u; - -# if(GLM_COMPILER & GLM_COMPILER_GCC || GLM_COMPILER & (GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM)) - uint Pack = 0; - memcpy(&Pack, &x, sizeof(Pack)); -# else - uint Pack = reinterpret_cast(x); -# endif - - return float2packed10(Pack); - } - - GLM_FUNC_QUALIFIER float packed10bitToFloat(glm::uint x) - { - if(x == 0) - return 0.0f; - else if(x == ((1 << 10) - 1)) - return ~0;//NaN - else if(x == (0x1f << 5)) - return ~0;//Inf - - uint Result = packed10ToFloat(x); - -# if(GLM_COMPILER & GLM_COMPILER_GCC || GLM_COMPILER & (GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM)) - float Temp = 0; - memcpy(&Temp, &Result, sizeof(Temp)); - return Temp; -# else - return reinterpret_cast(Result); -# endif - } - -// GLM_FUNC_QUALIFIER glm::uint f11_f11_f10(float x, float y, float z) -// { -// return ((floatTo11bit(x) & ((1 << 11) - 1)) << 0) | ((floatTo11bit(y) & ((1 << 11) - 1)) << 11) | ((floatTo10bit(z) & ((1 << 10) - 1)) << 22); -// } - - union u10u10u10u2 - { - struct - { - uint x : 10; - uint y : 10; - uint z : 10; - uint w : 2; - } data; - uint32 pack; - }; - - union i10i10i10i2 - { - struct - { - int x : 10; - int y : 10; - int z : 10; - int w : 2; - } data; - uint32 pack; - }; - -}//namespace detail - - GLM_FUNC_QUALIFIER uint8 packUnorm1x8(float v) - { - return static_cast(round(clamp(v, 0.0f, 1.0f) * 255.0f)); - } - - GLM_FUNC_QUALIFIER float unpackUnorm1x8(uint8 p) - { - float const Unpack(p); - return Unpack * static_cast(0.0039215686274509803921568627451); // 1 / 255 - } - - GLM_FUNC_QUALIFIER uint16 packUnorm2x8(vec2 const & v) - { - u8vec2 const Topack(round(clamp(v, 0.0f, 1.0f) * 255.0f)); - return reinterpret_cast(Topack); - } - - GLM_FUNC_QUALIFIER vec2 unpackUnorm2x8(uint16 p) - { - vec2 const Unpack(reinterpret_cast(p)); - return Unpack * float(0.0039215686274509803921568627451); // 1 / 255 - } - - GLM_FUNC_QUALIFIER uint8 packSnorm1x8(float v) - { - int8 const Topack(static_cast(round(clamp(v ,-1.0f, 1.0f) * 127.0f))); - return reinterpret_cast(Topack); - } - - GLM_FUNC_QUALIFIER float unpackSnorm1x8(uint8 p) - { - float const Unpack(reinterpret_cast(p)); - return clamp( - Unpack * 0.00787401574803149606299212598425f, // 1.0f / 127.0f - -1.0f, 1.0f); - } - - GLM_FUNC_QUALIFIER uint16 packSnorm2x8(vec2 const & v) - { - i8vec2 const Topack(round(clamp(v, -1.0f, 1.0f) * 127.0f)); - return reinterpret_cast(Topack); - } - - GLM_FUNC_QUALIFIER vec2 unpackSnorm2x8(uint16 p) - { - vec2 const Unpack(reinterpret_cast(p)); - return clamp( - Unpack * 0.00787401574803149606299212598425f, // 1.0f / 127.0f - -1.0f, 1.0f); - } - - GLM_FUNC_QUALIFIER uint16 packUnorm1x16(float s) - { - return static_cast(round(clamp(s, 0.0f, 1.0f) * 65535.0f)); - } - - GLM_FUNC_QUALIFIER float unpackUnorm1x16(uint16 p) - { - float const Unpack(p); - return Unpack * 1.5259021896696421759365224689097e-5f; // 1.0 / 65535.0 - } - - GLM_FUNC_QUALIFIER uint64 packUnorm4x16(vec4 const & v) - { - u16vec4 const Topack(round(clamp(v , 0.0f, 1.0f) * 65535.0f)); - return reinterpret_cast(Topack); - } - - GLM_FUNC_QUALIFIER vec4 unpackUnorm4x16(uint64 p) - { - vec4 const Unpack(reinterpret_cast(p)); - return Unpack * 1.5259021896696421759365224689097e-5f; // 1.0 / 65535.0 - } - - GLM_FUNC_QUALIFIER uint16 packSnorm1x16(float v) - { - int16 const Topack = static_cast(round(clamp(v ,-1.0f, 1.0f) * 32767.0f)); - return reinterpret_cast(Topack); - } - - GLM_FUNC_QUALIFIER float unpackSnorm1x16(uint16 p) - { - float const Unpack(reinterpret_cast(p)); - return clamp( - Unpack * 3.0518509475997192297128208258309e-5f, //1.0f / 32767.0f, - -1.0f, 1.0f); - } - - GLM_FUNC_QUALIFIER uint64 packSnorm4x16(vec4 const & v) - { - i16vec4 const Topack(round(clamp(v ,-1.0f, 1.0f) * 32767.0f)); - return reinterpret_cast(Topack); - } - - GLM_FUNC_QUALIFIER vec4 unpackSnorm4x16(uint64 p) - { - vec4 const Unpack(reinterpret_cast(p)); - return clamp( - Unpack * 3.0518509475997192297128208258309e-5f, //1.0f / 32767.0f, - -1.0f, 1.0f); - } - - GLM_FUNC_QUALIFIER uint16 packHalf1x16(float v) - { - int16 const Topack(detail::toFloat16(v)); - return reinterpret_cast(Topack); - } - - GLM_FUNC_QUALIFIER float unpackHalf1x16(uint16 v) - { - return detail::toFloat32(reinterpret_cast(v)); - } - - GLM_FUNC_QUALIFIER uint64 packHalf4x16(glm::vec4 const & v) - { - i16vec4 Unpack( - detail::toFloat16(v.x), - detail::toFloat16(v.y), - detail::toFloat16(v.z), - detail::toFloat16(v.w)); - - return reinterpret_cast(Unpack); - } - - GLM_FUNC_QUALIFIER glm::vec4 unpackHalf4x16(uint64 v) - { - i16vec4 Unpack(reinterpret_cast(v)); - - return vec4( - detail::toFloat32(Unpack.x), - detail::toFloat32(Unpack.y), - detail::toFloat32(Unpack.z), - detail::toFloat32(Unpack.w)); - } - - GLM_FUNC_QUALIFIER uint32 packI3x10_1x2(ivec4 const & v) - { - detail::i10i10i10i2 Result; - Result.data.x = v.x; - Result.data.y = v.y; - Result.data.z = v.z; - Result.data.w = v.w; - return Result.pack; - } - - GLM_FUNC_QUALIFIER ivec4 unpackI3x10_1x2(uint32 v) - { - detail::i10i10i10i2 Unpack; - Unpack.pack = v; - return ivec4( - Unpack.data.x, - Unpack.data.y, - Unpack.data.z, - Unpack.data.w); - } - - GLM_FUNC_QUALIFIER uint32 packU3x10_1x2(uvec4 const & v) - { - detail::u10u10u10u2 Result; - Result.data.x = v.x; - Result.data.y = v.y; - Result.data.z = v.z; - Result.data.w = v.w; - return Result.pack; - } - - GLM_FUNC_QUALIFIER uvec4 unpackU3x10_1x2(uint32 v) - { - detail::u10u10u10u2 Unpack; - Unpack.pack = v; - return uvec4( - Unpack.data.x, - Unpack.data.y, - Unpack.data.z, - Unpack.data.w); - } - - GLM_FUNC_QUALIFIER uint32 packSnorm3x10_1x2(vec4 const & v) - { - detail::i10i10i10i2 Result; - Result.data.x = int(round(clamp(v.x,-1.0f, 1.0f) * 511.f)); - Result.data.y = int(round(clamp(v.y,-1.0f, 1.0f) * 511.f)); - Result.data.z = int(round(clamp(v.z,-1.0f, 1.0f) * 511.f)); - Result.data.w = int(round(clamp(v.w,-1.0f, 1.0f) * 1.f)); - return Result.pack; - } - - GLM_FUNC_QUALIFIER vec4 unpackSnorm3x10_1x2(uint32 v) - { - detail::i10i10i10i2 Unpack; - Unpack.pack = v; - vec4 Result; - Result.x = clamp(float(Unpack.data.x) / 511.f, -1.0f, 1.0f); - Result.y = clamp(float(Unpack.data.y) / 511.f, -1.0f, 1.0f); - Result.z = clamp(float(Unpack.data.z) / 511.f, -1.0f, 1.0f); - Result.w = clamp(float(Unpack.data.w) / 1.f, -1.0f, 1.0f); - return Result; - } - - GLM_FUNC_QUALIFIER uint32 packUnorm3x10_1x2(vec4 const & v) - { - detail::i10i10i10i2 Result; - Result.data.x = int(round(clamp(v.x, 0.0f, 1.0f) * 1023.f)); - Result.data.y = int(round(clamp(v.y, 0.0f, 1.0f) * 1023.f)); - Result.data.z = int(round(clamp(v.z, 0.0f, 1.0f) * 1023.f)); - Result.data.w = int(round(clamp(v.w, 0.0f, 1.0f) * 3.f)); - return Result.pack; - } - - GLM_FUNC_QUALIFIER vec4 unpackUnorm3x10_1x2(uint32 v) - { - detail::i10i10i10i2 Unpack; - Unpack.pack = v; - vec4 Result; - Result.x = float(Unpack.data.x) / 1023.f; - Result.y = float(Unpack.data.y) / 1023.f; - Result.z = float(Unpack.data.z) / 1023.f; - Result.w = float(Unpack.data.w) / 3.f; - return Result; - } - - GLM_FUNC_QUALIFIER uint32 packF2x11_1x10(vec3 const & v) - { - return - ((detail::floatTo11bit(v.x) & ((1 << 11) - 1)) << 0) | - ((detail::floatTo11bit(v.y) & ((1 << 11) - 1)) << 11) | - ((detail::floatTo10bit(v.z) & ((1 << 10) - 1)) << 22); - } - - GLM_FUNC_QUALIFIER vec3 unpackF2x11_1x10(uint32 v) - { - return vec3( - detail::packed11bitToFloat(v >> 0), - detail::packed11bitToFloat(v >> 11), - detail::packed10bitToFloat(v >> 22)); - } - -}//namespace glm diff --git a/inc/glm/gtc/quaternion.hpp b/inc/glm/gtc/quaternion.hpp deleted file mode 100644 index 8a81f5d..0000000 --- a/inc/glm/gtc/quaternion.hpp +++ /dev/null @@ -1,377 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_quaternion -/// @file glm/gtc/quaternion.hpp -/// @date 2009-05-21 / 2012-12-20 -/// @author Christophe Riccio -/// -/// @see core (dependence) -/// @see gtc_half_float (dependence) -/// @see gtc_constants (dependence) -/// -/// @defgroup gtc_quaternion GLM_GTC_quaternion -/// @ingroup gtc -/// -/// @brief Defines a templated quaternion type and several quaternion operations. -/// -/// need to be included to use these functionalities. -/////////////////////////////////////////////////////////////////////////////////// - -#pragma once - -// Dependency: -#include "../mat3x3.hpp" -#include "../mat4x4.hpp" -#include "../vec3.hpp" -#include "../vec4.hpp" -#include "../gtc/constants.hpp" - -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) -# pragma message("GLM: GLM_GTC_quaternion extension included") -#endif - -namespace glm -{ - /// @addtogroup gtc_quaternion - /// @{ - - template - struct tquat - { - typedef tquat type; - typedef T value_type; - - public: - T x, y, z, w; - - ////////////////////////////////////// - // Component accesses - -# ifdef GLM_FORCE_SIZE_FUNC - typedef size_t size_type; - /// Return the count of components of a quaternion - GLM_FUNC_DECL GLM_CONSTEXPR size_type size() const; - - GLM_FUNC_DECL T & operator[](size_type i); - GLM_FUNC_DECL T const & operator[](size_type i) const; -# else - typedef length_t length_type; - /// Return the count of components of a quaternion - GLM_FUNC_DECL GLM_CONSTEXPR length_type length() const; - - GLM_FUNC_DECL T & operator[](length_type i); - GLM_FUNC_DECL T const & operator[](length_type i) const; -# endif//GLM_FORCE_SIZE_FUNC - - ////////////////////////////////////// - // Implicit basic constructors - - GLM_FUNC_DECL tquat(); - GLM_FUNC_DECL tquat(tquat const & q); - template - GLM_FUNC_DECL tquat(tquat const & q); - - ////////////////////////////////////// - // Explicit basic constructors - - GLM_FUNC_DECL explicit tquat(ctor); - GLM_FUNC_DECL explicit tquat(T const & s, tvec3 const & v); - GLM_FUNC_DECL tquat(T const & w, T const & x, T const & y, T const & z); - - ////////////////////////////////////// - // Convertions - -# ifdef GLM_FORCE_EXPLICIT_CTOR - template - GLM_FUNC_DECL explicit tquat(tquat const & q); -# else - template - GLM_FUNC_DECL tquat(tquat const & q); -# endif - - // explicit conversion operators -# if GLM_HAS_EXPLICIT_CONVERSION_OPERATORS - GLM_FUNC_DECL explicit operator tmat3x3(); - GLM_FUNC_DECL explicit operator tmat4x4(); -# endif - - /// Create a quaternion from two normalized axis - /// - /// @param u A first normalized axis - /// @param v A second normalized axis - /// @see gtc_quaternion - /// @see http://lolengine.net/blog/2013/09/18/beautiful-maths-quaternion-from-vectors - GLM_FUNC_DECL explicit tquat(tvec3 const & u, tvec3 const & v); - - /// Build a quaternion from euler angles (pitch, yaw, roll), in radians. - GLM_FUNC_DECL explicit tquat(tvec3 const & eulerAngles); - GLM_FUNC_DECL explicit tquat(tmat3x3 const & m); - GLM_FUNC_DECL explicit tquat(tmat4x4 const & m); - - ////////////////////////////////////// - // Operators - - GLM_FUNC_DECL tquat & operator=(tquat const & m); - - template - GLM_FUNC_DECL tquat & operator=(tquat const & m); - template - GLM_FUNC_DECL tquat & operator+=(tquat const & q); - template - GLM_FUNC_DECL tquat & operator*=(tquat const & q); - template - GLM_FUNC_DECL tquat & operator*=(U s); - template - GLM_FUNC_DECL tquat & operator/=(U s); - }; - - template - GLM_FUNC_DECL tquat operator-(tquat const & q); - - template - GLM_FUNC_DECL tquat operator+(tquat const & q, tquat const & p); - - template - GLM_FUNC_DECL tquat operator*(tquat const & q, tquat const & p); - - template - GLM_FUNC_DECL tvec3 operator*(tquat const & q, tvec3 const & v); - - template - GLM_FUNC_DECL tvec3 operator*(tvec3 const & v, tquat const & q); - - template - GLM_FUNC_DECL tvec4 operator*(tquat const & q, tvec4 const & v); - - template - GLM_FUNC_DECL tvec4 operator*(tvec4 const & v, tquat const & q); - - template - GLM_FUNC_DECL tquat operator*(tquat const & q, T const & s); - - template - GLM_FUNC_DECL tquat operator*(T const & s, tquat const & q); - - template - GLM_FUNC_DECL tquat operator/(tquat const & q, T const & s); - - /// Returns the length of the quaternion. - /// - /// @see gtc_quaternion - template - GLM_FUNC_DECL T length(tquat const & q); - - /// Returns the normalized quaternion. - /// - /// @see gtc_quaternion - template - GLM_FUNC_DECL tquat normalize(tquat const & q); - - /// Returns dot product of q1 and q2, i.e., q1[0] * q2[0] + q1[1] * q2[1] + ... - /// - /// @see gtc_quaternion - template class quatType> - GLM_FUNC_DECL T dot(quatType const & x, quatType const & y); - - /// 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 gtc_quaternion - /// @see - slerp(tquat const & x, tquat const & y, T const & a) - template - GLM_FUNC_DECL tquat mix(tquat const & x, tquat const & y, T 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 gtc_quaternion - template - GLM_FUNC_DECL tquat lerp(tquat const & x, tquat const & y, T 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 gtc_quaternion - template - GLM_FUNC_DECL tquat slerp(tquat const & x, tquat const & y, T a); - - /// Returns the q conjugate. - /// - /// @see gtc_quaternion - template - GLM_FUNC_DECL tquat conjugate(tquat const & q); - - /// Returns the q inverse. - /// - /// @see gtc_quaternion - template - GLM_FUNC_DECL tquat inverse(tquat const & q); - - /// Rotates a quaternion from a vector of 3 components axis and an angle. - /// - /// @param q Source orientation - /// @param angle Angle expressed in radians. - /// @param axis Axis of the rotation - /// - /// @see gtc_quaternion - template - GLM_FUNC_DECL tquat rotate(tquat const & q, T const & angle, tvec3 const & axis); - - /// Returns euler angles, yitch as x, yaw as y, roll as z. - /// The result is expressed in radians if GLM_FORCE_RADIANS is defined or degrees otherwise. - /// - /// @see gtc_quaternion - template - GLM_FUNC_DECL tvec3 eulerAngles(tquat const & x); - - /// Returns roll value of euler angles expressed in radians. - /// - /// @see gtx_quaternion - template - GLM_FUNC_DECL T roll(tquat const & x); - - /// Returns pitch value of euler angles expressed in radians. - /// - /// @see gtx_quaternion - template - GLM_FUNC_DECL T pitch(tquat const & x); - - /// Returns yaw value of euler angles expressed in radians. - /// - /// @see gtx_quaternion - template - GLM_FUNC_DECL T yaw(tquat const & x); - - /// Converts a quaternion to a 3 * 3 matrix. - /// - /// @see gtc_quaternion - template - GLM_FUNC_DECL tmat3x3 mat3_cast(tquat const & x); - - /// Converts a quaternion to a 4 * 4 matrix. - /// - /// @see gtc_quaternion - template - GLM_FUNC_DECL tmat4x4 mat4_cast(tquat const & x); - - /// Converts a 3 * 3 matrix to a quaternion. - /// - /// @see gtc_quaternion - template - GLM_FUNC_DECL tquat quat_cast(tmat3x3 const & x); - - /// Converts a 4 * 4 matrix to a quaternion. - /// - /// @see gtc_quaternion - template - GLM_FUNC_DECL tquat quat_cast(tmat4x4 const & x); - - /// Returns the quaternion rotation angle. - /// - /// @see gtc_quaternion - template - GLM_FUNC_DECL T angle(tquat const & x); - - /// Returns the q rotation axis. - /// - /// @see gtc_quaternion - template - GLM_FUNC_DECL tvec3 axis(tquat const & x); - - /// 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 gtc_quaternion - template - GLM_FUNC_DECL tquat angleAxis(T const & angle, tvec3 const & axis); - - /// Returns the component-wise comparison result of x < y. - /// - /// @tparam quatType Floating-point quaternion types. - /// - /// @see gtc_quaternion - template - GLM_FUNC_DECL tvec4 lessThan(tquat const & x, tquat const & y); - - /// Returns the component-wise comparison of result x <= y. - /// - /// @tparam quatType Floating-point quaternion types. - /// - /// @see gtc_quaternion - template - GLM_FUNC_DECL tvec4 lessThanEqual(tquat const & x, tquat const & y); - - /// Returns the component-wise comparison of result x > y. - /// - /// @tparam quatType Floating-point quaternion types. - /// - /// @see gtc_quaternion - template - GLM_FUNC_DECL tvec4 greaterThan(tquat const & x, tquat const & y); - - /// Returns the component-wise comparison of result x >= y. - /// - /// @tparam quatType Floating-point quaternion types. - /// - /// @see gtc_quaternion - template - GLM_FUNC_DECL tvec4 greaterThanEqual(tquat const & x, tquat const & y); - - /// Returns the component-wise comparison of result x == y. - /// - /// @tparam quatType Floating-point quaternion types. - /// - /// @see gtc_quaternion - template - GLM_FUNC_DECL tvec4 equal(tquat const & x, tquat const & y); - - /// Returns the component-wise comparison of result x != y. - /// - /// @tparam quatType Floating-point quaternion types. - /// - /// @see gtc_quaternion - template - GLM_FUNC_DECL tvec4 notEqual(tquat const & x, tquat const & y); - /// @} -} //namespace glm - -#include "quaternion.inl" diff --git a/inc/glm/gtc/quaternion.inl b/inc/glm/gtc/quaternion.inl deleted file mode 100644 index 25f41f1..0000000 --- a/inc/glm/gtc/quaternion.inl +++ /dev/null @@ -1,784 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_quaternion -/// @file glm/gtc/quaternion.inl -/// @date 2009-05-21 / 2011-06-15 -/// @author Christophe Riccio -/////////////////////////////////////////////////////////////////////////////////// - -#include "../trigonometric.hpp" -#include "../geometric.hpp" -#include "../exponential.hpp" -#include - -namespace glm{ -namespace detail -{ - template - struct compute_dot - { - static GLM_FUNC_QUALIFIER T call(tquat const & x, tquat const & y) - { - tvec4 tmp(x.x * y.x, x.y * y.y, x.z * y.z, x.w * y.w); - return (tmp.x + tmp.y) + (tmp.z + tmp.w); - } - }; -}//namespace detail - - ////////////////////////////////////// - // Component accesses - -# ifdef GLM_FORCE_SIZE_FUNC - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tquat::size_type tquat::size() const - { - return 4; - } - - template - GLM_FUNC_QUALIFIER T & tquat::operator[](typename tquat::size_type i) - { - assert(i >= 0 && static_cast(i) < detail::component_count(*this)); - return (&x)[i]; - } - - template - GLM_FUNC_QUALIFIER T const & tquat::operator[](typename tquat::size_type i) const - { - assert(i >= 0 && static_cast(i) < detail::component_count(*this)); - return (&x)[i]; - } -# else - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tquat::length_type tquat::length() const - { - return 4; - } - - template - GLM_FUNC_QUALIFIER T & tquat::operator[](typename tquat::length_type i) - { - assert(i >= 0 && static_cast(i) < detail::component_count(*this)); - return (&x)[i]; - } - - template - GLM_FUNC_QUALIFIER T const & tquat::operator[](typename tquat::length_type i) const - { - assert(i >= 0 && static_cast(i) < detail::component_count(*this)); - return (&x)[i]; - } -# endif//GLM_FORCE_SIZE_FUNC - - ////////////////////////////////////// - // Implicit basic constructors - - template - GLM_FUNC_QUALIFIER tquat::tquat() -# ifndef GLM_FORCE_NO_CTOR_INIT - : x(0), y(0), z(0), w(1) -# endif - {} - - template - GLM_FUNC_QUALIFIER tquat::tquat(tquat const & q) - : x(q.x), y(q.y), z(q.z), w(q.w) - {} - - template - template - GLM_FUNC_QUALIFIER tquat::tquat(tquat const & q) - : x(q.x), y(q.y), z(q.z), w(q.w) - {} - - ////////////////////////////////////// - // Explicit basic constructors - - template - GLM_FUNC_QUALIFIER tquat::tquat(ctor) - {} - - template - GLM_FUNC_QUALIFIER tquat::tquat(T const & s, tvec3 const & v) - : x(v.x), y(v.y), z(v.z), w(s) - {} - - template - GLM_FUNC_QUALIFIER tquat::tquat(T const & w, T const & x, T const & y, T const & z) - : x(x), y(y), z(z), w(w) - {} - - ////////////////////////////////////////////////////////////// - // Conversions - - template - template - GLM_FUNC_QUALIFIER tquat::tquat(tquat const & q) - : x(static_cast(q.x)) - , y(static_cast(q.y)) - , z(static_cast(q.z)) - , w(static_cast(q.w)) - {} - - //template - //GLM_FUNC_QUALIFIER tquat::tquat - //( - // valType const & pitch, - // valType const & yaw, - // valType const & roll - //) - //{ - // tvec3 eulerAngle(pitch * valType(0.5), yaw * valType(0.5), roll * valType(0.5)); - // tvec3 c = glm::cos(eulerAngle * valType(0.5)); - // tvec3 s = glm::sin(eulerAngle * valType(0.5)); - // - // this->w = c.x * c.y * c.z + s.x * s.y * s.z; - // this->x = s.x * c.y * c.z - c.x * s.y * s.z; - // this->y = c.x * s.y * c.z + s.x * c.y * s.z; - // this->z = c.x * c.y * s.z - s.x * s.y * c.z; - //} - - template - GLM_FUNC_QUALIFIER tquat::tquat(tvec3 const & u, tvec3 const & v) - { - tvec3 const LocalW(cross(u, v)); - T Dot = detail::compute_dot::call(u, v); - tquat q(T(1) + Dot, LocalW.x, LocalW.y, LocalW.z); - - *this = normalize(q); - } - - template - GLM_FUNC_QUALIFIER tquat::tquat(tvec3 const & eulerAngle) - { - tvec3 c = glm::cos(eulerAngle * T(0.5)); - tvec3 s = glm::sin(eulerAngle * T(0.5)); - - this->w = c.x * c.y * c.z + s.x * s.y * s.z; - this->x = s.x * c.y * c.z - c.x * s.y * s.z; - this->y = c.x * s.y * c.z + s.x * c.y * s.z; - this->z = c.x * c.y * s.z - s.x * s.y * c.z; - } - - template - GLM_FUNC_QUALIFIER tquat::tquat(tmat3x3 const & m) - { - *this = quat_cast(m); - } - - template - GLM_FUNC_QUALIFIER tquat::tquat(tmat4x4 const & m) - { - *this = quat_cast(m); - } - -# if GLM_HAS_EXPLICIT_CONVERSION_OPERATORS - template - GLM_FUNC_QUALIFIER tquat::operator tmat3x3() - { - return mat3_cast(*this); - } - - template - GLM_FUNC_QUALIFIER tquat::operator tmat4x4() - { - return mat4_cast(*this); - } -# endif//GLM_HAS_EXPLICIT_CONVERSION_OPERATORS - - template - GLM_FUNC_QUALIFIER tquat conjugate(tquat const & q) - { - return tquat(q.w, -q.x, -q.y, -q.z); - } - - template - GLM_FUNC_QUALIFIER tquat inverse(tquat const & q) - { - return conjugate(q) / dot(q, q); - } - - ////////////////////////////////////////////////////////////// - // tquat operators - - template - GLM_FUNC_QUALIFIER tquat & tquat::operator=(tquat const & q) - { - this->w = q.w; - this->x = q.x; - this->y = q.y; - this->z = q.z; - return *this; - } - - template - template - GLM_FUNC_QUALIFIER tquat & tquat::operator=(tquat const & q) - { - this->w = static_cast(q.w); - this->x = static_cast(q.x); - this->y = static_cast(q.y); - this->z = static_cast(q.z); - return *this; - } - - template - template - GLM_FUNC_QUALIFIER tquat & tquat::operator+=(tquat const & q) - { - this->w += static_cast(q.w); - this->x += static_cast(q.x); - this->y += static_cast(q.y); - this->z += static_cast(q.z); - return *this; - } - - template - template - GLM_FUNC_QUALIFIER tquat & tquat::operator*=(tquat const & r) - { - tquat const p(*this); - tquat const q(r); - - this->w = p.w * q.w - p.x * q.x - p.y * q.y - p.z * q.z; - this->x = p.w * q.x + p.x * q.w + p.y * q.z - p.z * q.y; - this->y = p.w * q.y + p.y * q.w + p.z * q.x - p.x * q.z; - this->z = p.w * q.z + p.z * q.w + p.x * q.y - p.y * q.x; - return *this; - } - - template - template - GLM_FUNC_QUALIFIER tquat & tquat::operator*=(U s) - { - this->w *= static_cast(s); - this->x *= static_cast(s); - this->y *= static_cast(s); - this->z *= static_cast(s); - return *this; - } - - template - template - GLM_FUNC_QUALIFIER tquat & tquat::operator/=(U s) - { - this->w /= static_cast(s); - this->x /= static_cast(s); - this->y /= static_cast(s); - this->z /= static_cast(s); - return *this; - } - - ////////////////////////////////////////////////////////////// - // tquat external operators - - template - GLM_FUNC_QUALIFIER tquat operator-(tquat const & q) - { - return tquat(-q.w, -q.x, -q.y, -q.z); - } - - template - GLM_FUNC_QUALIFIER tquat operator+(tquat const & q, tquat const & p) - { - return tquat(q) += p; - } - - template - GLM_FUNC_QUALIFIER tquat operator*(tquat const & q, tquat const & p) - { - return tquat(q) *= p; - } - - // Transformation - template - GLM_FUNC_QUALIFIER tvec3 operator*(tquat const & q, tvec3 const & v) - { - tvec3 const QuatVector(q.x, q.y, q.z); - tvec3 const uv(glm::cross(QuatVector, v)); - tvec3 const uuv(glm::cross(QuatVector, uv)); - - return v + ((uv * q.w) + uuv) * static_cast(2); - } - - template - GLM_FUNC_QUALIFIER tvec3 operator*(tvec3 const & v, tquat const & q) - { - return glm::inverse(q) * v; - } - - template - GLM_FUNC_QUALIFIER tvec4 operator*(tquat const & q, tvec4 const & v) - { - return tvec4(q * tvec3(v), v.w); - } - - template - GLM_FUNC_QUALIFIER tvec4 operator*(tvec4 const & v, tquat const & q) - { - return glm::inverse(q) * v; - } - - template - GLM_FUNC_QUALIFIER tquat operator*(tquat const & q, T const & s) - { - return tquat( - q.w * s, q.x * s, q.y * s, q.z * s); - } - - template - GLM_FUNC_QUALIFIER tquat operator*(T const & s, tquat const & q) - { - return q * s; - } - - template - GLM_FUNC_QUALIFIER tquat operator/(tquat const & q, T const & s) - { - return tquat( - q.w / s, q.x / s, q.y / s, q.z / s); - } - - ////////////////////////////////////// - // Boolean operators - - template - GLM_FUNC_QUALIFIER bool operator==(tquat const & q1, tquat const & q2) - { - return (q1.x == q2.x) && (q1.y == q2.y) && (q1.z == q2.z) && (q1.w == q2.w); - } - - template - GLM_FUNC_QUALIFIER bool operator!=(tquat const & q1, tquat const & q2) - { - return (q1.x != q2.x) || (q1.y != q2.y) || (q1.z != q2.z) || (q1.w != q2.w); - } - - //////////////////////////////////////////////////////// - template - GLM_FUNC_QUALIFIER T length(tquat const & q) - { - return glm::sqrt(dot(q, q)); - } - - template - GLM_FUNC_QUALIFIER tquat normalize(tquat const & q) - { - T len = length(q); - if(len <= T(0)) // Problem - return tquat(1, 0, 0, 0); - T oneOverLen = T(1) / len; - return tquat(q.w * oneOverLen, q.x * oneOverLen, q.y * oneOverLen, q.z * oneOverLen); - } - - template - GLM_FUNC_QUALIFIER tquat cross(tquat const & q1, tquat const & q2) - { - return tquat( - q1.w * q2.w - q1.x * q2.x - q1.y * q2.y - q1.z * q2.z, - q1.w * q2.x + q1.x * q2.w + q1.y * q2.z - q1.z * q2.y, - q1.w * q2.y + q1.y * q2.w + q1.z * q2.x - q1.x * q2.z, - q1.w * q2.z + q1.z * q2.w + q1.x * q2.y - q1.y * q2.x); - } -/* - // (x * sin(1 - a) * angle / sin(angle)) + (y * sin(a) * angle / sin(angle)) - template - GLM_FUNC_QUALIFIER tquat mix(tquat const & x, tquat const & y, T const & a) - { - if(a <= T(0)) return x; - if(a >= T(1)) return y; - - float fCos = dot(x, y); - tquat y2(y); //BUG!!! tquat y2; - if(fCos < T(0)) - { - y2 = -y; - fCos = -fCos; - } - - //if(fCos > 1.0f) // problem - float k0, k1; - if(fCos > T(0.9999)) - { - k0 = T(1) - a; - k1 = T(0) + a; //BUG!!! 1.0f + a; - } - else - { - T fSin = sqrt(T(1) - fCos * fCos); - T fAngle = atan(fSin, fCos); - T fOneOverSin = static_cast(1) / fSin; - k0 = sin((T(1) - a) * fAngle) * fOneOverSin; - k1 = sin((T(0) + a) * fAngle) * fOneOverSin; - } - - return tquat( - 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 - GLM_FUNC_QUALIFIER tquat mix2 - ( - tquat const & x, - tquat const & y, - T const & a - ) - { - bool flip = false; - if(a <= static_cast(0)) return x; - if(a >= static_cast(1)) return y; - - T cos_t = dot(x, y); - if(cos_t < T(0)) - { - cos_t = -cos_t; - flip = true; - } - - T alpha(0), beta(0); - - if(T(1) - cos_t < 1e-7) - beta = static_cast(1) - alpha; - else - { - T theta = acos(cos_t); - T sin_t = sin(theta); - beta = sin(theta * (T(1) - alpha)) / sin_t; - alpha = sin(alpha * theta) / sin_t; - } - - if(flip) - alpha = -alpha; - - return normalize(beta * x + alpha * y); - } -*/ - - template - GLM_FUNC_QUALIFIER tquat mix(tquat const & x, tquat const & y, T a) - { - T cosTheta = dot(x, y); - - // Perform a linear interpolation when cosTheta is close to 1 to avoid side effect of sin(angle) becoming a zero denominator - if(cosTheta > T(1) - epsilon()) - { - // Linear interpolation - return tquat( - mix(x.w, y.w, a), - mix(x.x, y.x, a), - mix(x.y, y.y, a), - mix(x.z, y.z, a)); - } - else - { - // Essential Mathematics, page 467 - T angle = acos(cosTheta); - return (sin((T(1) - a) * angle) * x + sin(a * angle) * y) / sin(angle); - } - } - - template - GLM_FUNC_QUALIFIER tquat lerp(tquat const & x, tquat const & y, T a) - { - // Lerp is only defined in [0, 1] - assert(a >= static_cast(0)); - assert(a <= static_cast(1)); - - return x * (T(1) - a) + (y * a); - } - - template - GLM_FUNC_QUALIFIER tquat slerp(tquat const & x, tquat const & y, T a) - { - tquat z = y; - - T 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 < T(0)) - { - 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 > T(1) - epsilon()) - { - // Linear interpolation - return tquat( - mix(x.w, z.w, a), - mix(x.x, z.x, a), - mix(x.y, z.y, a), - mix(x.z, z.z, a)); - } - else - { - // Essential Mathematics, page 467 - T angle = acos(cosTheta); - return (sin((T(1) - a) * angle) * x + sin(a * angle) * z) / sin(angle); - } - } - - template - GLM_FUNC_QUALIFIER tquat rotate(tquat const & q, T const & angle, tvec3 const & v) - { - tvec3 Tmp = v; - - // Axis of rotation must be normalised - T len = glm::length(Tmp); - if(abs(len - T(1)) > T(0.001)) - { - T oneOverLen = static_cast(1) / len; - Tmp.x *= oneOverLen; - Tmp.y *= oneOverLen; - Tmp.z *= oneOverLen; - } - - T const AngleRad(angle); - T const Sin = sin(AngleRad * T(0.5)); - - return q * tquat(cos(AngleRad * T(0.5)), Tmp.x * Sin, Tmp.y * Sin, Tmp.z * Sin); - //return gtc::quaternion::cross(q, tquat(cos(AngleRad * T(0.5)), Tmp.x * fSin, Tmp.y * fSin, Tmp.z * fSin)); - } - - template - GLM_FUNC_QUALIFIER tvec3 eulerAngles(tquat const & x) - { - return tvec3(pitch(x), yaw(x), roll(x)); - } - - template - GLM_FUNC_QUALIFIER T roll(tquat const & q) - { - return T(atan(T(2) * (q.x * q.y + q.w * q.z), q.w * q.w + q.x * q.x - q.y * q.y - q.z * q.z)); - } - - template - GLM_FUNC_QUALIFIER T pitch(tquat const & q) - { - return T(atan(T(2) * (q.y * q.z + q.w * q.x), q.w * q.w - q.x * q.x - q.y * q.y + q.z * q.z)); - } - - template - GLM_FUNC_QUALIFIER T yaw(tquat const & q) - { - return asin(T(-2) * (q.x * q.z - q.w * q.y)); - } - - template - GLM_FUNC_QUALIFIER tmat3x3 mat3_cast(tquat const & q) - { - tmat3x3 Result(T(1)); - T qxx(q.x * q.x); - T qyy(q.y * q.y); - T qzz(q.z * q.z); - T qxz(q.x * q.z); - T qxy(q.x * q.y); - T qyz(q.y * q.z); - T qwx(q.w * q.x); - T qwy(q.w * q.y); - T qwz(q.w * q.z); - - Result[0][0] = 1 - 2 * (qyy + qzz); - Result[0][1] = 2 * (qxy + qwz); - Result[0][2] = 2 * (qxz - qwy); - - Result[1][0] = 2 * (qxy - qwz); - Result[1][1] = 1 - 2 * (qxx + qzz); - Result[1][2] = 2 * (qyz + qwx); - - Result[2][0] = 2 * (qxz + qwy); - Result[2][1] = 2 * (qyz - qwx); - Result[2][2] = 1 - 2 * (qxx + qyy); - return Result; - } - - template - GLM_FUNC_QUALIFIER tmat4x4 mat4_cast(tquat const & q) - { - return tmat4x4(mat3_cast(q)); - } - - template - GLM_FUNC_QUALIFIER tquat quat_cast(tmat3x3 const & m) - { - T fourXSquaredMinus1 = m[0][0] - m[1][1] - m[2][2]; - T fourYSquaredMinus1 = m[1][1] - m[0][0] - m[2][2]; - T fourZSquaredMinus1 = m[2][2] - m[0][0] - m[1][1]; - T fourWSquaredMinus1 = m[0][0] + m[1][1] + m[2][2]; - - int biggestIndex = 0; - T fourBiggestSquaredMinus1 = fourWSquaredMinus1; - if(fourXSquaredMinus1 > fourBiggestSquaredMinus1) - { - fourBiggestSquaredMinus1 = fourXSquaredMinus1; - biggestIndex = 1; - } - if(fourYSquaredMinus1 > fourBiggestSquaredMinus1) - { - fourBiggestSquaredMinus1 = fourYSquaredMinus1; - biggestIndex = 2; - } - if(fourZSquaredMinus1 > fourBiggestSquaredMinus1) - { - fourBiggestSquaredMinus1 = fourZSquaredMinus1; - biggestIndex = 3; - } - - T biggestVal = sqrt(fourBiggestSquaredMinus1 + T(1)) * T(0.5); - T mult = static_cast(0.25) / biggestVal; - - tquat Result(uninitialize); - switch(biggestIndex) - { - case 0: - Result.w = biggestVal; - Result.x = (m[1][2] - m[2][1]) * mult; - Result.y = (m[2][0] - m[0][2]) * mult; - Result.z = (m[0][1] - m[1][0]) * mult; - break; - case 1: - Result.w = (m[1][2] - m[2][1]) * mult; - Result.x = biggestVal; - Result.y = (m[0][1] + m[1][0]) * mult; - Result.z = (m[2][0] + m[0][2]) * mult; - break; - case 2: - Result.w = (m[2][0] - m[0][2]) * mult; - Result.x = (m[0][1] + m[1][0]) * mult; - Result.y = biggestVal; - Result.z = (m[1][2] + m[2][1]) * mult; - break; - case 3: - Result.w = (m[0][1] - m[1][0]) * mult; - Result.x = (m[2][0] + m[0][2]) * mult; - Result.y = (m[1][2] + m[2][1]) * mult; - Result.z = biggestVal; - break; - - default: // Silence a -Wswitch-default warning in GCC. Should never actually get here. Assert is just for sanity. - assert(false); - break; - } - return Result; - } - - template - GLM_FUNC_QUALIFIER tquat quat_cast(tmat4x4 const & m4) - { - return quat_cast(tmat3x3(m4)); - } - - template - GLM_FUNC_QUALIFIER T angle(tquat const & x) - { - return acos(x.w) * T(2); - } - - template - GLM_FUNC_QUALIFIER tvec3 axis(tquat const & x) - { - T tmp1 = static_cast(1) - x.w * x.w; - if(tmp1 <= static_cast(0)) - return tvec3(0, 0, 1); - T tmp2 = static_cast(1) / sqrt(tmp1); - return tvec3(x.x * tmp2, x.y * tmp2, x.z * tmp2); - } - - template - GLM_FUNC_QUALIFIER tquat angleAxis(T const & angle, tvec3 const & v) - { - tquat Result(uninitialize); - - T const a(angle); - T const s = glm::sin(a * static_cast(0.5)); - - Result.w = glm::cos(a * static_cast(0.5)); - Result.x = v.x * s; - Result.y = v.y * s; - Result.z = v.z * s; - return Result; - } - - template - GLM_FUNC_QUALIFIER tvec4 lessThan(tquat const & x, tquat const & y) - { - tvec4 Result(uninitialize); - for(detail::component_count_t i = 0; i < detail::component_count(x); ++i) - Result[i] = x[i] < y[i]; - return Result; - } - - template - GLM_FUNC_QUALIFIER tvec4 lessThanEqual(tquat const & x, tquat const & y) - { - tvec4 Result(uninitialize); - for(detail::component_count_t i = 0; i < detail::component_count(x); ++i) - Result[i] = x[i] <= y[i]; - return Result; - } - - template - GLM_FUNC_QUALIFIER tvec4 greaterThan(tquat const & x, tquat const & y) - { - tvec4 Result(uninitialize); - for(detail::component_count_t i = 0; i < detail::component_count(x); ++i) - Result[i] = x[i] > y[i]; - return Result; - } - - template - GLM_FUNC_QUALIFIER tvec4 greaterThanEqual(tquat const & x, tquat const & y) - { - tvec4 Result(uninitialize); - for(detail::component_count_t i = 0; i < detail::component_count(x); ++i) - Result[i] = x[i] >= y[i]; - return Result; - } - - template - GLM_FUNC_QUALIFIER tvec4 equal(tquat const & x, tquat const & y) - { - tvec4 Result(uninitialize); - for(detail::component_count_t i = 0; i < detail::component_count(x); ++i) - Result[i] = x[i] == y[i]; - return Result; - } - - template - GLM_FUNC_QUALIFIER tvec4 notEqual(tquat const & x, tquat const & y) - { - tvec4 Result(uninitialize); - for(detail::component_count_t i = 0; i < detail::component_count(x); ++i) - Result[i] = x[i] != y[i]; - return Result; - } -}//namespace glm diff --git a/inc/glm/gtc/random.hpp b/inc/glm/gtc/random.hpp deleted file mode 100644 index bcff193..0000000 --- a/inc/glm/gtc/random.hpp +++ /dev/null @@ -1,120 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_random -/// @file glm/gtc/random.hpp -/// @date 2011-09-18 / 2011-09-18 -/// @author Christophe Riccio -/// -/// @see core (dependence) -/// @see gtc_half_float (dependence) -/// @see gtx_random (extended) -/// -/// @defgroup gtc_random GLM_GTC_random -/// @ingroup gtc -/// -/// @brief Generate random number from various distribution methods. -/// -/// need to be included to use these functionalities. -/////////////////////////////////////////////////////////////////////////////////// - -#pragma once - -// Dependency: -#include "../vec2.hpp" -#include "../vec3.hpp" - -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) -# pragma message("GLM: GLM_GTC_random extension included") -#endif - -namespace glm -{ - /// @addtogroup gtc_random - /// @{ - - /// Generate random numbers in the interval [Min, Max], according a linear distribution - /// - /// @param Min - /// @param Max - /// @tparam genType Value type. Currently supported: half (not recommanded), float or double scalars and vectors. - /// @see gtc_random - template - GLM_FUNC_DECL genTYpe linearRand( - genTYpe Min, - genTYpe Max); - - template class vecType> - GLM_FUNC_DECL vecType linearRand( - vecType const & Min, - vecType const & Max); - - /// Generate random numbers in the interval [Min, Max], according a gaussian distribution - /// - /// @param Mean - /// @param Deviation - /// @see gtc_random - template - GLM_FUNC_DECL genType gaussRand( - genType Mean, - genType Deviation); - - /// Generate a random 2D vector which coordinates are regulary distributed on a circle of a given radius - /// - /// @param Radius - /// @see gtc_random - template - GLM_FUNC_DECL tvec2 circularRand( - T Radius); - - /// Generate a random 3D vector which coordinates are regulary distributed on a sphere of a given radius - /// - /// @param Radius - /// @see gtc_random - template - GLM_FUNC_DECL tvec3 sphericalRand( - T Radius); - - /// Generate a random 2D vector which coordinates are regulary distributed within the area of a disk of a given radius - /// - /// @param Radius - /// @see gtc_random - template - GLM_FUNC_DECL tvec2 diskRand( - T Radius); - - /// Generate a random 3D vector which coordinates are regulary distributed within the volume of a ball of a given radius - /// - /// @param Radius - /// @see gtc_random - template - GLM_FUNC_DECL tvec3 ballRand( - T Radius); - - /// @} -}//namespace glm - -#include "random.inl" diff --git a/inc/glm/gtc/random.inl b/inc/glm/gtc/random.inl deleted file mode 100644 index c6b4ee1..0000000 --- a/inc/glm/gtc/random.inl +++ /dev/null @@ -1,379 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// Restrictions: -/// By making use of the Software for military purposes, you choose to make -/// a Bunny unhappy. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtc_random -/// @file glm/gtc/random.inl -/// @date 2011-09-19 / 2012-04-07 -/// @author Christophe Riccio -/////////////////////////////////////////////////////////////////////////////////// - -#include "../geometric.hpp" -#include "../exponential.hpp" -#include -#include -#include - -namespace glm{ -namespace detail -{ - template class vecType> - struct compute_rand - { - GLM_FUNC_QUALIFIER static vecType call(); - }; - - template - struct compute_rand - { - GLM_FUNC_QUALIFIER static tvec1 call() - { - return tvec1( - std::rand()) % std::numeric_limits::max(); - } - }; - - template - struct compute_rand - { - GLM_FUNC_QUALIFIER static tvec2 call() - { - return tvec2( - std::rand(), - std::rand()) % std::numeric_limits::max(); - } - }; - - template - struct compute_rand - { - GLM_FUNC_QUALIFIER static tvec3 call() - { - return tvec3( - std::rand(), - std::rand(), - std::rand()) % std::numeric_limits::max(); - } - }; - - template - struct compute_rand - { - GLM_FUNC_QUALIFIER static tvec4 call() - { - return tvec4( - std::rand(), - std::rand(), - std::rand(), - std::rand()) % std::numeric_limits::max(); - } - }; - - template class vecType> - struct compute_rand - { - GLM_FUNC_QUALIFIER static vecType call() - { - return - (vecType(compute_rand::call()) << static_cast(8)) | - (vecType(compute_rand::call()) << static_cast(0)); - } - }; - - template class vecType> - struct compute_rand - { - GLM_FUNC_QUALIFIER static vecType call() - { - return - (vecType(compute_rand::call()) << static_cast(16)) | - (vecType(compute_rand::call()) << static_cast(0)); - } - }; - - template class vecType> - struct compute_rand - { - GLM_FUNC_QUALIFIER static vecType call() - { - return - (vecType(compute_rand::call()) << static_cast(32)) | - (vecType(compute_rand::call()) << static_cast(0)); - } - }; - - template class vecType> - struct compute_linearRand - { - GLM_FUNC_QUALIFIER static vecType call(vecType const & Min, vecType const & Max); - }; - - template class vecType> - struct compute_linearRand - { - GLM_FUNC_QUALIFIER static vecType call(vecType const & Min, vecType const & Max) - { - return (vecType(compute_rand::call() % vecType(Max + static_cast(1) - Min))) + Min; - } - }; - - template class vecType> - struct compute_linearRand - { - GLM_FUNC_QUALIFIER static vecType call(vecType const & Min, vecType const & Max) - { - return (compute_rand::call() % (Max + static_cast(1) - Min)) + Min; - } - }; - - template class vecType> - struct compute_linearRand - { - GLM_FUNC_QUALIFIER static vecType call(vecType const & Min, vecType const & Max) - { - return (vecType(compute_rand::call() % vecType(Max + static_cast(1) - Min))) + Min; - } - }; - - template class vecType> - struct compute_linearRand - { - GLM_FUNC_QUALIFIER static vecType call(vecType const & Min, vecType const & Max) - { - return (compute_rand::call() % (Max + static_cast(1) - Min)) + Min; - } - }; - - template class vecType> - struct compute_linearRand - { - GLM_FUNC_QUALIFIER static vecType call(vecType const & Min, vecType const & Max) - { - return (vecType(compute_rand::call() % vecType(Max + static_cast(1) - Min))) + Min; - } - }; - - template class vecType> - struct compute_linearRand - { - GLM_FUNC_QUALIFIER static vecType call(vecType const & Min, vecType const & Max) - { - return (compute_rand::call() % (Max + static_cast(1) - Min)) + Min; - } - }; - - template class vecType> - struct compute_linearRand - { - GLM_FUNC_QUALIFIER static vecType call(vecType const & Min, vecType const & Max) - { - return (vecType(compute_rand::call() % vecType(Max + static_cast(1) - Min))) + Min; - } - }; - - template class vecType> - struct compute_linearRand - { - GLM_FUNC_QUALIFIER static vecType call(vecType const & Min, vecType const & Max) - { - return (compute_rand::call() % (Max + static_cast(1) - Min)) + Min; - } - }; - - template