diff options
| author | majortom6 <tombarrett@siu.edu> | 2017-02-19 09:17:35 -0600 |
|---|---|---|
| committer | Tom Barrett <tombarrett@siu.edu> | 2017-03-07 13:23:41 -0600 |
| commit | 5c46e0f0a924989201c6784b0f956bc442f14a7e (patch) | |
| tree | 33b5889b872023bd7d414f7baec45706330813b3 | |
| parent | 2cc21176467d4501adb7bfb9ee03eb9a2a7d14f2 (diff) | |
-removed glm library, its in the debian repos
-made opengl and sdl folders in includes, moved various *hpps to them
281 files changed, 124 insertions, 57703 deletions
@@ -1,7 +1,7 @@ nature's course for librarys ~ -apt install libsdl2-dev +apt install libsdl2-dev libglm-dev ideas - make code compilable on various distrobutions (maybe wangblows if not too big of changes) diff --git a/inc/entity.hpp b/inc/entity.hpp index 259849f..c47ef00 100644 --- a/inc/entity.hpp +++ b/inc/entity.hpp @@ -4,7 +4,7 @@ #include <SDL2/SDL.h> #include "dna.hpp" -#include "graphicsobjects.hpp" +#include "opengl/graphicsdata.hpp" #include "rectangle.hpp" class Entity diff --git a/inc/glm/CMakeLists.txt b/inc/glm/CMakeLists.txt deleted file mode 100644 index fe28b5d..0000000 --- a/inc/glm/CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ -set(NAME glm_dummy)
-
-file(GLOB ROOT_SOURCE *.cpp)
-file(GLOB ROOT_INLINE *.inl)
-file(GLOB ROOT_HEADER *.hpp)
-file(GLOB ROOT_TEXT ../*.txt)
-file(GLOB ROOT_NAT ../util/glm.natvis)
-
-file(GLOB_RECURSE CORE_SOURCE ./detail/*.cpp)
-file(GLOB_RECURSE CORE_INLINE ./detail/*.inl)
-file(GLOB_RECURSE CORE_HEADER ./detail/*.hpp)
-
-file(GLOB_RECURSE GTC_SOURCE ./gtc/*.cpp)
-file(GLOB_RECURSE GTC_INLINE ./gtc/*.inl)
-file(GLOB_RECURSE GTC_HEADER ./gtc/*.hpp)
-
-file(GLOB_RECURSE GTX_SOURCE ./gtx/*.cpp)
-file(GLOB_RECURSE GTX_INLINE ./gtx/*.inl)
-file(GLOB_RECURSE GTX_HEADER ./gtx/*.hpp)
-
-source_group("Text Files" FILES ${ROOT_TEXT})
-source_group("Core Files" FILES ${CORE_SOURCE})
-source_group("Core Files" FILES ${CORE_INLINE})
-source_group("Core Files" FILES ${CORE_HEADER})
-source_group("GTC Files" FILES ${GTC_SOURCE})
-source_group("GTC Files" FILES ${GTC_INLINE})
-source_group("GTC Files" FILES ${GTC_HEADER})
-source_group("GTX Files" FILES ${GTX_SOURCE})
-source_group("GTX Files" FILES ${GTX_INLINE})
-source_group("GTX Files" FILES ${GTX_HEADER})
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
-
-if(GLM_TEST_ENABLE)
- add_executable(${NAME} ${ROOT_TEXT} ${ROOT_NAT}
- ${ROOT_SOURCE} ${ROOT_INLINE} ${ROOT_HEADER}
- ${CORE_SOURCE} ${CORE_INLINE} ${CORE_HEADER}
- ${GTC_SOURCE} ${GTC_INLINE} ${GTC_HEADER}
- ${GTX_SOURCE} ${GTX_INLINE} ${GTX_HEADER})
-endif(GLM_TEST_ENABLE)
-
-#add_library(glm STATIC glm.cpp)
-#add_library(glm_shared SHARED glm.cpp)
diff --git a/inc/glm/common.hpp b/inc/glm/common.hpp deleted file mode 100644 index 45dd343..0000000 --- a/inc/glm/common.hpp +++ /dev/null @@ -1,35 +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 core
-/// @file glm/common.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/func_common.hpp"
diff --git a/inc/glm/detail/_features.hpp b/inc/glm/detail/_features.hpp deleted file mode 100644 index f132015..0000000 --- a/inc/glm/detail/_features.hpp +++ /dev/null @@ -1,428 +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 core
-/// @file glm/detail/_features.hpp
-/// @date 2013-02-20 / 2013-02-20
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// #define GLM_CXX98_EXCEPTIONS
-// #define GLM_CXX98_RTTI
-
-// #define GLM_CXX11_RVALUE_REFERENCES
-// Rvalue references - GCC 4.3
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2006/n2118.html
-
-// GLM_CXX11_TRAILING_RETURN
-// Rvalue references for *this - GCC not supported
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2439.htm
-
-// GLM_CXX11_NONSTATIC_MEMBER_INIT
-// Initialization of class objects by rvalues - GCC any
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2004/n1610.html
-
-// GLM_CXX11_NONSTATIC_MEMBER_INIT
-// Non-static data member initializers - GCC 4.7
-// http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2008/n2756.htm
-
-// #define GLM_CXX11_VARIADIC_TEMPLATE
-// Variadic templates - GCC 4.3
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2242.pdf
-
-//
-// Extending variadic template template parameters - GCC 4.4
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2555.pdf
-
-// #define GLM_CXX11_GENERALIZED_INITIALIZERS
-// Initializer lists - GCC 4.4
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2672.htm
-
-// #define GLM_CXX11_STATIC_ASSERT
-// Static assertions - GCC 4.3
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2004/n1720.html
-
-// #define GLM_CXX11_AUTO_TYPE
-// auto-typed variables - GCC 4.4
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2006/n1984.pdf
-
-// #define GLM_CXX11_AUTO_TYPE
-// Multi-declarator auto - GCC 4.4
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2004/n1737.pdf
-
-// #define GLM_CXX11_AUTO_TYPE
-// Removal of auto as a storage-class specifier - GCC 4.4
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2546.htm
-
-// #define GLM_CXX11_AUTO_TYPE
-// New function declarator syntax - GCC 4.4
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2541.htm
-
-// #define GLM_CXX11_LAMBDAS
-// New wording for C++0x lambdas - GCC 4.5
-// http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2927.pdf
-
-// #define GLM_CXX11_DECLTYPE
-// Declared type of an expression - GCC 4.3
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2343.pdf
-
-//
-// Right angle brackets - GCC 4.3
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1757.html
-
-//
-// Default template arguments for function templates DR226 GCC 4.3
-// http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#226
-
-//
-// Solving the SFINAE problem for expressions DR339 GCC 4.4
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2634.html
-
-// #define GLM_CXX11_ALIAS_TEMPLATE
-// Template aliases N2258 GCC 4.7
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2258.pdf
-
-//
-// Extern templates N1987 Yes
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2006/n1987.htm
-
-// #define GLM_CXX11_NULLPTR
-// Null pointer constant N2431 GCC 4.6
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2431.pdf
-
-// #define GLM_CXX11_STRONG_ENUMS
-// Strongly-typed enums N2347 GCC 4.4
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2347.pdf
-
-//
-// Forward declarations for enums N2764 GCC 4.6
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2764.pdf
-
-//
-// Generalized attributes N2761 GCC 4.8
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2761.pdf
-
-//
-// Generalized constant expressions N2235 GCC 4.6
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2235.pdf
-
-//
-// Alignment support N2341 GCC 4.8
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2341.pdf
-
-// #define GLM_CXX11_DELEGATING_CONSTRUCTORS
-// Delegating constructors N1986 GCC 4.7
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2006/n1986.pdf
-
-//
-// Inheriting constructors N2540 GCC 4.8
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2540.htm
-
-// #define GLM_CXX11_EXPLICIT_CONVERSIONS
-// Explicit conversion operators N2437 GCC 4.5
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2437.pdf
-
-//
-// New character types N2249 GCC 4.4
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2249.html
-
-//
-// Unicode string literals N2442 GCC 4.5
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2442.htm
-
-//
-// Raw string literals N2442 GCC 4.5
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2442.htm
-
-//
-// Universal character name literals N2170 GCC 4.5
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2170.html
-
-// #define GLM_CXX11_USER_LITERALS
-// User-defined literals N2765 GCC 4.7
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2765.pdf
-
-//
-// Standard Layout Types N2342 GCC 4.5
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2342.htm
-
-// #define GLM_CXX11_DEFAULTED_FUNCTIONS
-// #define GLM_CXX11_DELETED_FUNCTIONS
-// Defaulted and deleted functions N2346 GCC 4.4
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2346.htm
-
-//
-// Extended friend declarations N1791 GCC 4.7
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1791.pdf
-
-//
-// Extending sizeof N2253 GCC 4.4
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2253.html
-
-// #define GLM_CXX11_INLINE_NAMESPACES
-// Inline namespaces N2535 GCC 4.4
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2535.htm
-
-// #define GLM_CXX11_UNRESTRICTED_UNIONS
-// Unrestricted unions N2544 GCC 4.6
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2544.pdf
-
-// #define GLM_CXX11_LOCAL_TYPE_TEMPLATE_ARGS
-// Local and unnamed types as template arguments N2657 GCC 4.5
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm
-
-// #define GLM_CXX11_RANGE_FOR
-// Range-based for N2930 GCC 4.6
-// http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2930.html
-
-// #define GLM_CXX11_OVERRIDE_CONTROL
-// Explicit virtual overrides N2928 N3206 N3272 GCC 4.7
-// http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2928.htm
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3206.htm
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3272.htm
-
-//
-// Minimal support for garbage collection and reachability-based leak detection N2670 No
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2670.htm
-
-// #define GLM_CXX11_NOEXCEPT
-// Allowing move constructors to throw [noexcept] N3050 GCC 4.6 (core language only)
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3050.html
-
-//
-// Defining move special member functions N3053 GCC 4.6
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3053.html
-
-//
-// Sequence points N2239 Yes
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2239.html
-
-//
-// Atomic operations N2427 GCC 4.4
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2239.html
-
-//
-// Strong Compare and Exchange N2748 GCC 4.5
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2427.html
-
-//
-// Bidirectional Fences N2752 GCC 4.8
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2752.htm
-
-//
-// Memory model N2429 GCC 4.8
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2429.htm
-
-//
-// Data-dependency ordering: atomics and memory model N2664 GCC 4.4
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2664.htm
-
-//
-// Propagating exceptions N2179 GCC 4.4
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2179.html
-
-//
-// Abandoning a process and at_quick_exit N2440 GCC 4.8
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2440.htm
-
-//
-// Allow atomics use in signal handlers N2547 Yes
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2547.htm
-
-//
-// Thread-local storage N2659 GCC 4.8
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2659.htm
-
-//
-// Dynamic initialization and destruction with concurrency N2660 GCC 4.3
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2660.htm
-
-//
-// __func__ predefined identifier N2340 GCC 4.3
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2340.htm
-
-//
-// C99 preprocessor N1653 GCC 4.3
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2004/n1653.htm
-
-//
-// long long N1811 GCC 4.3
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1811.pdf
-
-//
-// Extended integral types N1988 Yes
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2006/n1988.pdf
-
-#if(GLM_COMPILER & GLM_COMPILER_GCC)
-
-# if(GLM_COMPILER >= GLM_COMPILER_GCC43)
-# define GLM_CXX11_STATIC_ASSERT
-# endif
-
-#elif(GLM_COMPILER & (GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM))
-# if(__has_feature(cxx_exceptions))
-# define GLM_CXX98_EXCEPTIONS
-# endif
-
-# if(__has_feature(cxx_rtti))
-# define GLM_CXX98_RTTI
-# endif
-
-# if(__has_feature(cxx_access_control_sfinae))
-# define GLM_CXX11_ACCESS_CONTROL_SFINAE
-# endif
-
-# if(__has_feature(cxx_alias_templates))
-# define GLM_CXX11_ALIAS_TEMPLATE
-# endif
-
-# if(__has_feature(cxx_alignas))
-# define GLM_CXX11_ALIGNAS
-# endif
-
-# if(__has_feature(cxx_attributes))
-# define GLM_CXX11_ATTRIBUTES
-# endif
-
-# if(__has_feature(cxx_constexpr))
-# define GLM_CXX11_CONSTEXPR
-# endif
-
-# if(__has_feature(cxx_decltype))
-# define GLM_CXX11_DECLTYPE
-# endif
-
-# if(__has_feature(cxx_default_function_template_args))
-# define GLM_CXX11_DEFAULT_FUNCTION_TEMPLATE_ARGS
-# endif
-
-# if(__has_feature(cxx_defaulted_functions))
-# define GLM_CXX11_DEFAULTED_FUNCTIONS
-# endif
-
-# if(__has_feature(cxx_delegating_constructors))
-# define GLM_CXX11_DELEGATING_CONSTRUCTORS
-# endif
-
-# if(__has_feature(cxx_deleted_functions))
-# define GLM_CXX11_DELETED_FUNCTIONS
-# endif
-
-# if(__has_feature(cxx_explicit_conversions))
-# define GLM_CXX11_EXPLICIT_CONVERSIONS
-# endif
-
-# if(__has_feature(cxx_generalized_initializers))
-# define GLM_CXX11_GENERALIZED_INITIALIZERS
-# endif
-
-# if(__has_feature(cxx_implicit_moves))
-# define GLM_CXX11_IMPLICIT_MOVES
-# endif
-
-# if(__has_feature(cxx_inheriting_constructors))
-# define GLM_CXX11_INHERITING_CONSTRUCTORS
-# endif
-
-# if(__has_feature(cxx_inline_namespaces))
-# define GLM_CXX11_INLINE_NAMESPACES
-# endif
-
-# if(__has_feature(cxx_lambdas))
-# define GLM_CXX11_LAMBDAS
-# endif
-
-# if(__has_feature(cxx_local_type_template_args))
-# define GLM_CXX11_LOCAL_TYPE_TEMPLATE_ARGS
-# endif
-
-# if(__has_feature(cxx_noexcept))
-# define GLM_CXX11_NOEXCEPT
-# endif
-
-# if(__has_feature(cxx_nonstatic_member_init))
-# define GLM_CXX11_NONSTATIC_MEMBER_INIT
-# endif
-
-# if(__has_feature(cxx_nullptr))
-# define GLM_CXX11_NULLPTR
-# endif
-
-# if(__has_feature(cxx_override_control))
-# define GLM_CXX11_OVERRIDE_CONTROL
-# endif
-
-# if(__has_feature(cxx_reference_qualified_functions))
-# define GLM_CXX11_REFERENCE_QUALIFIED_FUNCTIONS
-# endif
-
-# if(__has_feature(cxx_range_for))
-# define GLM_CXX11_RANGE_FOR
-# endif
-
-# if(__has_feature(cxx_raw_string_literals))
-# define GLM_CXX11_RAW_STRING_LITERALS
-# endif
-
-# if(__has_feature(cxx_rvalue_references))
-# define GLM_CXX11_RVALUE_REFERENCES
-# endif
-
-# if(__has_feature(cxx_static_assert))
-# define GLM_CXX11_STATIC_ASSERT
-# endif
-
-# if(__has_feature(cxx_auto_type))
-# define GLM_CXX11_AUTO_TYPE
-# endif
-
-# if(__has_feature(cxx_strong_enums))
-# define GLM_CXX11_STRONG_ENUMS
-# endif
-
-# if(__has_feature(cxx_trailing_return))
-# define GLM_CXX11_TRAILING_RETURN
-# endif
-
-# if(__has_feature(cxx_unicode_literals))
-# define GLM_CXX11_UNICODE_LITERALS
-# endif
-
-# if(__has_feature(cxx_unrestricted_unions))
-# define GLM_CXX11_UNRESTRICTED_UNIONS
-# endif
-
-# if(__has_feature(cxx_user_literals))
-# define GLM_CXX11_USER_LITERALS
-# endif
-
-# if(__has_feature(cxx_variadic_templates))
-# define GLM_CXX11_VARIADIC_TEMPLATES
-# endif
-
-#endif//(GLM_COMPILER & (GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM))
diff --git a/inc/glm/detail/_fixes.hpp b/inc/glm/detail/_fixes.hpp deleted file mode 100644 index 827ec95..0000000 --- a/inc/glm/detail/_fixes.hpp +++ /dev/null @@ -1,59 +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 core
-/// @file glm/detail/_fixes.hpp
-/// @date 2011-02-21 / 2011-11-22
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#include <cmath>
-
-//! Workaround for compatibility with other libraries
-#ifdef max
-#undef max
-#endif
-
-//! Workaround for compatibility with other libraries
-#ifdef min
-#undef min
-#endif
-
-//! Workaround for Android
-#ifdef isnan
-#undef isnan
-#endif
-
-//! Workaround for Android
-#ifdef isinf
-#undef isinf
-#endif
-
-//! Workaround for Chrone Native Client
-#ifdef log2
-#undef log2
-#endif
-
diff --git a/inc/glm/detail/_noise.hpp b/inc/glm/detail/_noise.hpp deleted file mode 100644 index 164e691..0000000 --- a/inc/glm/detail/_noise.hpp +++ /dev/null @@ -1,136 +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 core
-/// @file glm/detail/_noise.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "../vec2.hpp"
-#include "../vec3.hpp"
-#include "../vec4.hpp"
-#include "../common.hpp"
-
-namespace glm{
-namespace detail
-{
- template <typename T>
- GLM_FUNC_QUALIFIER T mod289(T const & x)
- {
- return x - floor(x * static_cast<T>(1.0) / static_cast<T>(289.0)) * static_cast<T>(289.0);
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER T permute(T const & x)
- {
- return mod289(((x * static_cast<T>(34)) + static_cast<T>(1)) * x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> permute(tvec2<T, P> const & x)
- {
- return mod289(((x * static_cast<T>(34)) + static_cast<T>(1)) * x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> permute(tvec3<T, P> const & x)
- {
- return mod289(((x * static_cast<T>(34)) + static_cast<T>(1)) * x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> permute(tvec4<T, P> const & x)
- {
- return mod289(((x * static_cast<T>(34)) + static_cast<T>(1)) * x);
- }
-/*
- template <typename T, precision P, template<typename> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> permute(vecType<T, P> const & x)
- {
- return mod289(((x * T(34)) + T(1)) * x);
- }
-*/
- template <typename T>
- GLM_FUNC_QUALIFIER T taylorInvSqrt(T const & r)
- {
- return T(1.79284291400159) - T(0.85373472095314) * r;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> taylorInvSqrt(tvec2<T, P> const & r)
- {
- return T(1.79284291400159) - T(0.85373472095314) * r;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> taylorInvSqrt(tvec3<T, P> const & r)
- {
- return T(1.79284291400159) - T(0.85373472095314) * r;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> taylorInvSqrt(tvec4<T, P> const & r)
- {
- return T(1.79284291400159) - T(0.85373472095314) * r;
- }
-/*
- template <typename T, precision P, template<typename> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> taylorInvSqrt(vecType<T, P> const & r)
- {
- return T(1.79284291400159) - T(0.85373472095314) * r;
- }
-*/
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> fade(tvec2<T, P> const & t)
- {
- return (t * t * t) * (t * (t * T(6) - T(15)) + T(10));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> fade(tvec3<T, P> const & t)
- {
- return (t * t * t) * (t * (t * T(6) - T(15)) + T(10));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> fade(tvec4<T, P> const & t)
- {
- return (t * t * t) * (t * (t * T(6) - T(15)) + T(10));
- }
-/*
- template <typename T, precision P, template <typename> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> fade(vecType<T, P> const & t)
- {
- return (t * t * t) * (t * (t * T(6) - T(15)) + T(10));
- }
-*/
-}//namespace detail
-}//namespace glm
-
diff --git a/inc/glm/detail/_swizzle.hpp b/inc/glm/detail/_swizzle.hpp deleted file mode 100644 index 82be311..0000000 --- a/inc/glm/detail/_swizzle.hpp +++ /dev/null @@ -1,833 +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 core
-/// @file glm/detail/_swizzle.hpp
-/// @date 2006-04-20 / 2011-02-16
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-namespace glm{
-namespace detail
-{
- // Internal class for implementing swizzle operators
- template <typename T, int N>
- struct _swizzle_base0
- {
- typedef T value_type;
-
- protected:
- GLM_FUNC_QUALIFIER value_type& elem (size_t i) { return (reinterpret_cast<value_type*>(_buffer))[i]; }
- GLM_FUNC_QUALIFIER const value_type& elem (size_t i) const { return (reinterpret_cast<const value_type*>(_buffer))[i]; }
-
- // Use an opaque buffer to *ensure* the compiler doesn't call a constructor.
- // The size 1 buffer is assumed to aligned to the actual members so that the
- // elem()
- char _buffer[1];
- };
-
- template <typename T, precision P, typename V, int E0, int E1, int E2, int E3, int N>
- struct _swizzle_base1 : public _swizzle_base0<T, N>
- {
- };
-
- template <typename T, precision P, typename V, int E0, int E1>
- struct _swizzle_base1<T, P, V,E0,E1,-1,-2,2> : public _swizzle_base0<T, 2>
- {
- GLM_FUNC_QUALIFIER V operator ()() const { return V(this->elem(E0), this->elem(E1)); }
- };
-
- template <typename T, precision P, typename V, int E0, int E1, int E2>
- struct _swizzle_base1<T, P, V,E0,E1,E2,-1,3> : public _swizzle_base0<T, 3>
- {
- GLM_FUNC_QUALIFIER V operator ()() const { return V(this->elem(E0), this->elem(E1), this->elem(E2)); }
- };
-
- template <typename T, precision P, typename V, int E0, int E1, int E2, int E3>
- struct _swizzle_base1<T, P, V,E0,E1,E2,E3,4> : public _swizzle_base0<T, 4>
- {
- GLM_FUNC_QUALIFIER V operator ()() const { return V(this->elem(E0), this->elem(E1), this->elem(E2), this->elem(E3)); }
- };
-
- // Internal class for implementing swizzle operators
- /*
- Template parameters:
-
- ValueType = type of scalar values (e.g. float, double)
- VecType = class the swizzle is applies to (e.g. tvec3<float>)
- N = number of components in the vector (e.g. 3)
- E0...3 = what index the n-th element of this swizzle refers to in the unswizzled vec
-
- DUPLICATE_ELEMENTS = 1 if there is a repeated element, 0 otherwise (used to specialize swizzles
- containing duplicate elements so that they cannot be used as r-values).
- */
- template <typename ValueType, precision P, typename VecType, int N, int E0, int E1, int E2, int E3, int DUPLICATE_ELEMENTS>
- struct _swizzle_base2 : public _swizzle_base1<ValueType, P, VecType,E0,E1,E2,E3,N>
- {
- typedef VecType vec_type;
- typedef ValueType value_type;
-
- GLM_FUNC_QUALIFIER _swizzle_base2& operator= (const ValueType& t)
- {
- for (int i = 0; i < N; ++i)
- (*this)[i] = t;
- return *this;
- }
-
- GLM_FUNC_QUALIFIER _swizzle_base2& operator= (const VecType& that)
- {
- struct op {
- GLM_FUNC_QUALIFIER void operator() (value_type& e, value_type& t) { e = t; }
- };
- _apply_op(that, op());
- return *this;
- }
-
- GLM_FUNC_QUALIFIER void operator -= (const VecType& that)
- {
- struct op {
- GLM_FUNC_QUALIFIER void operator() (value_type& e, value_type& t) { e -= t; }
- };
- _apply_op(that, op());
- }
-
- GLM_FUNC_QUALIFIER void operator += (const VecType& that)
- {
- struct op {
- GLM_FUNC_QUALIFIER void operator() (value_type& e, value_type& t) { e += t; }
- };
- _apply_op(that, op());
- }
-
- GLM_FUNC_QUALIFIER void operator *= (const VecType& that)
- {
- struct op {
- GLM_FUNC_QUALIFIER void operator() (value_type& e, value_type& t) { e *= t; }
- };
- _apply_op(that, op());
- }
-
- GLM_FUNC_QUALIFIER void operator /= (const VecType& that)
- {
- struct op {
- GLM_FUNC_QUALIFIER void operator() (value_type& e, value_type& t) { e /= t; }
- };
- _apply_op(that, op());
- }
-
- GLM_FUNC_QUALIFIER value_type& operator[] (size_t i)
- {
- const int offset_dst[4] = { E0, E1, E2, E3 };
- return this->elem(offset_dst[i]);
- }
- GLM_FUNC_QUALIFIER value_type operator[] (size_t i) const
- {
- const int offset_dst[4] = { E0, E1, E2, E3 };
- return this->elem(offset_dst[i]);
- }
-
- protected:
- template <typename T>
- GLM_FUNC_QUALIFIER void _apply_op(const VecType& that, T op)
- {
- // Make a copy of the data in this == &that.
- // The copier should optimize out the copy in cases where the function is
- // properly inlined and the copy is not necessary.
- ValueType t[N];
- for (int i = 0; i < N; ++i)
- t[i] = that[i];
- for (int i = 0; i < N; ++i)
- op( (*this)[i], t[i] );
- }
- };
-
- // Specialization for swizzles containing duplicate elements. These cannot be modified.
- template <typename ValueType, precision P, typename VecType, int N, int E0, int E1, int E2, int E3>
- struct _swizzle_base2<ValueType, P, VecType,N,E0,E1,E2,E3,1> : public _swizzle_base1<ValueType, P, VecType,E0,E1,E2,E3,N>
- {
- typedef VecType vec_type;
- typedef ValueType value_type;
-
- struct Stub {};
- GLM_FUNC_QUALIFIER _swizzle_base2& operator= (Stub const &) { return *this; }
-
- GLM_FUNC_QUALIFIER value_type operator[] (size_t i) const
- {
- const int offset_dst[4] = { E0, E1, E2, E3 };
- return this->elem(offset_dst[i]);
- }
- };
-
- template <int N,typename ValueType, precision P, typename VecType, int E0,int E1,int E2,int E3>
- struct _swizzle : public _swizzle_base2<ValueType, P, VecType, N, E0, E1, E2, E3, (E0==E1||E0==E2||E0==E3||E1==E2||E1==E3||E2==E3)>
- {
- typedef _swizzle_base2<ValueType, P, VecType,N,E0,E1,E2,E3,(E0==E1||E0==E2||E0==E3||E1==E2||E1==E3||E2==E3)> base_type;
-
- using base_type::operator=;
-
- GLM_FUNC_QUALIFIER operator VecType () const { return (*this)(); }
- };
-
-//
-// To prevent the C++ syntax from getting entirely overwhelming, define some alias macros
-//
-#define _GLM_SWIZZLE_TEMPLATE1 template <int N, typename T, precision P, typename V, int E0, int E1, int E2, int E3>
-#define _GLM_SWIZZLE_TEMPLATE2 template <int N, typename T, precision P, typename V, int E0, int E1, int E2, int E3, int F0, int F1, int F2, int F3>
-#define _GLM_SWIZZLE_TYPE1 _swizzle<N, T, P, V, E0, E1, E2, E3>
-#define _GLM_SWIZZLE_TYPE2 _swizzle<N, T, P, V, F0, F1, F2, F3>
-
-//
-// Wrapper for a binary operator (e.g. u.yy + v.zy)
-//
-#define _GLM_SWIZZLE_VECTOR_BINARY_OPERATOR_IMPLEMENTATION(OPERAND) \
- _GLM_SWIZZLE_TEMPLATE2 \
- GLM_FUNC_QUALIFIER V operator OPERAND ( const _GLM_SWIZZLE_TYPE1& a, const _GLM_SWIZZLE_TYPE2& b) \
- { \
- return a() OPERAND b(); \
- } \
- _GLM_SWIZZLE_TEMPLATE1 \
- GLM_FUNC_QUALIFIER V operator OPERAND ( const _GLM_SWIZZLE_TYPE1& a, const V& b) \
- { \
- return a() OPERAND b; \
- } \
- _GLM_SWIZZLE_TEMPLATE1 \
- GLM_FUNC_QUALIFIER V operator OPERAND ( const V& a, const _GLM_SWIZZLE_TYPE1& b) \
- { \
- return a OPERAND b(); \
- }
-
-//
-// Wrapper for a operand between a swizzle and a binary (e.g. 1.0f - u.xyz)
-//
-#define _GLM_SWIZZLE_SCALAR_BINARY_OPERATOR_IMPLEMENTATION(OPERAND) \
- _GLM_SWIZZLE_TEMPLATE1 \
- GLM_FUNC_QUALIFIER V operator OPERAND ( const _GLM_SWIZZLE_TYPE1& a, const T& b) \
- { \
- return a() OPERAND b; \
- } \
- _GLM_SWIZZLE_TEMPLATE1 \
- GLM_FUNC_QUALIFIER V operator OPERAND ( const T& a, const _GLM_SWIZZLE_TYPE1& b) \
- { \
- return a OPERAND b(); \
- }
-
-//
-// Macro for wrapping a function taking one argument (e.g. abs())
-//
-#define _GLM_SWIZZLE_FUNCTION_1_ARGS(RETURN_TYPE,FUNCTION) \
- _GLM_SWIZZLE_TEMPLATE1 \
- GLM_FUNC_QUALIFIER typename _GLM_SWIZZLE_TYPE1::RETURN_TYPE FUNCTION(const _GLM_SWIZZLE_TYPE1& a) \
- { \
- return FUNCTION(a()); \
- }
-
-//
-// Macro for wrapping a function taking two vector arguments (e.g. dot()).
-//
-#define _GLM_SWIZZLE_FUNCTION_2_ARGS(RETURN_TYPE,FUNCTION) \
- _GLM_SWIZZLE_TEMPLATE2 \
- GLM_FUNC_QUALIFIER typename _GLM_SWIZZLE_TYPE1::RETURN_TYPE FUNCTION(const _GLM_SWIZZLE_TYPE1& a, const _GLM_SWIZZLE_TYPE2& b) \
- { \
- return FUNCTION(a(), b()); \
- } \
- _GLM_SWIZZLE_TEMPLATE1 \
- GLM_FUNC_QUALIFIER typename _GLM_SWIZZLE_TYPE1::RETURN_TYPE FUNCTION(const _GLM_SWIZZLE_TYPE1& a, const _GLM_SWIZZLE_TYPE1& b) \
- { \
- return FUNCTION(a(), b()); \
- } \
- _GLM_SWIZZLE_TEMPLATE1 \
- GLM_FUNC_QUALIFIER typename _GLM_SWIZZLE_TYPE1::RETURN_TYPE FUNCTION(const _GLM_SWIZZLE_TYPE1& a, const typename V& b) \
- { \
- return FUNCTION(a(), b); \
- } \
- _GLM_SWIZZLE_TEMPLATE1 \
- GLM_FUNC_QUALIFIER typename _GLM_SWIZZLE_TYPE1::RETURN_TYPE FUNCTION(const V& a, const _GLM_SWIZZLE_TYPE1& b) \
- { \
- return FUNCTION(a, b()); \
- }
-
-//
-// Macro for wrapping a function take 2 vec arguments followed by a scalar (e.g. mix()).
-//
-#define _GLM_SWIZZLE_FUNCTION_2_ARGS_SCALAR(RETURN_TYPE,FUNCTION) \
- _GLM_SWIZZLE_TEMPLATE2 \
- GLM_FUNC_QUALIFIER typename _GLM_SWIZZLE_TYPE1::RETURN_TYPE FUNCTION(const _GLM_SWIZZLE_TYPE1& a, const _GLM_SWIZZLE_TYPE2& b, const T& c) \
- { \
- return FUNCTION(a(), b(), c); \
- } \
- _GLM_SWIZZLE_TEMPLATE1 \
- GLM_FUNC_QUALIFIER typename _GLM_SWIZZLE_TYPE1::RETURN_TYPE FUNCTION(const _GLM_SWIZZLE_TYPE1& a, const _GLM_SWIZZLE_TYPE1& b, const T& c) \
- { \
- return FUNCTION(a(), b(), c); \
- } \
- _GLM_SWIZZLE_TEMPLATE1 \
- GLM_FUNC_QUALIFIER typename _GLM_SWIZZLE_TYPE1::RETURN_TYPE FUNCTION(const _GLM_SWIZZLE_TYPE1& a, const typename S0::vec_type& b, const T& c)\
- { \
- return FUNCTION(a(), b, c); \
- } \
- _GLM_SWIZZLE_TEMPLATE1 \
- GLM_FUNC_QUALIFIER typename _GLM_SWIZZLE_TYPE1::RETURN_TYPE FUNCTION(const typename V& a, const _GLM_SWIZZLE_TYPE1& b, const T& c) \
- { \
- return FUNCTION(a, b(), c); \
- }
-
-}//namespace detail
-}//namespace glm
-
-namespace glm
-{
- namespace detail
- {
- _GLM_SWIZZLE_SCALAR_BINARY_OPERATOR_IMPLEMENTATION(-)
- _GLM_SWIZZLE_SCALAR_BINARY_OPERATOR_IMPLEMENTATION(*)
- _GLM_SWIZZLE_VECTOR_BINARY_OPERATOR_IMPLEMENTATION(+)
- _GLM_SWIZZLE_VECTOR_BINARY_OPERATOR_IMPLEMENTATION(-)
- _GLM_SWIZZLE_VECTOR_BINARY_OPERATOR_IMPLEMENTATION(*)
- _GLM_SWIZZLE_VECTOR_BINARY_OPERATOR_IMPLEMENTATION(/)
- }
-
- //
- // Swizzles are distinct types from the unswizzled type. The below macros will
- // provide template specializations for the swizzle types for the given functions
- // so that the compiler does not have any ambiguity to choosing how to handle
- // the function.
- //
- // The alternative is to use the operator()() when calling the function in order
- // to explicitly convert the swizzled type to the unswizzled type.
- //
-
- //_GLM_SWIZZLE_FUNCTION_1_ARGS(vec_type, abs);
- //_GLM_SWIZZLE_FUNCTION_1_ARGS(vec_type, acos);
- //_GLM_SWIZZLE_FUNCTION_1_ARGS(vec_type, acosh);
- //_GLM_SWIZZLE_FUNCTION_1_ARGS(vec_type, all);
- //_GLM_SWIZZLE_FUNCTION_1_ARGS(vec_type, any);
-
- //_GLM_SWIZZLE_FUNCTION_2_ARGS(value_type, dot);
- //_GLM_SWIZZLE_FUNCTION_2_ARGS(vec_type, cross);
- //_GLM_SWIZZLE_FUNCTION_2_ARGS(vec_type, step);
- //_GLM_SWIZZLE_FUNCTION_2_ARGS_SCALAR(vec_type, mix);
-}
-
-#define _GLM_SWIZZLE2_2_MEMBERS(T, P, V, E0,E1) \
- struct { detail::_swizzle<2, T, P, V<T, P>, 0,0,-1,-2> E0 ## E0; }; \
- struct { detail::_swizzle<2, T, P, V<T, P>, 0,1,-1,-2> E0 ## E1; }; \
- struct { detail::_swizzle<2, T, P, V<T, P>, 1,0,-1,-2> E1 ## E0; }; \
- struct { detail::_swizzle<2, T, P, V<T, P>, 1,1,-1,-2> E1 ## E1; };
-
-#define _GLM_SWIZZLE2_3_MEMBERS(T, P, V, E0,E1) \
- struct { detail::_swizzle<3,T, P, V<T, P>, 0,0,0,-1> E0 ## E0 ## E0; }; \
- struct { detail::_swizzle<3,T, P, V<T, P>, 0,0,1,-1> E0 ## E0 ## E1; }; \
- struct { detail::_swizzle<3,T, P, V<T, P>, 0,1,0,-1> E0 ## E1 ## E0; }; \
- struct { detail::_swizzle<3,T, P, V<T, P>, 0,1,1,-1> E0 ## E1 ## E1; }; \
- struct { detail::_swizzle<3,T, P, V<T, P>, 1,0,0,-1> E1 ## E0 ## E0; }; \
- struct { detail::_swizzle<3,T, P, V<T, P>, 1,0,1,-1> E1 ## E0 ## E1; }; \
- struct { detail::_swizzle<3,T, P, V<T, P>, 1,1,0,-1> E1 ## E1 ## E0; }; \
- struct { detail::_swizzle<3,T, P, V<T, P>, 1,1,1,-1> E1 ## E1 ## E1; };
-
-#define _GLM_SWIZZLE2_4_MEMBERS(T, P, V, E0,E1) \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,0,0,0> E0 ## E0 ## E0 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,0,0,1> E0 ## E0 ## E0 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,0,1,0> E0 ## E0 ## E1 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,0,1,1> E0 ## E0 ## E1 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,1,0,0> E0 ## E1 ## E0 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,1,0,1> E0 ## E1 ## E0 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,1,1,0> E0 ## E1 ## E1 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,1,1,1> E0 ## E1 ## E1 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,0,0,0> E1 ## E0 ## E0 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,0,0,1> E1 ## E0 ## E0 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,0,1,0> E1 ## E0 ## E1 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,0,1,1> E1 ## E0 ## E1 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,1,0,0> E1 ## E1 ## E0 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,1,0,1> E1 ## E1 ## E0 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,1,1,0> E1 ## E1 ## E1 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,1,1,1> E1 ## E1 ## E1 ## E1; };
-
-#define _GLM_SWIZZLE3_2_MEMBERS(T, P, V, E0,E1,E2) \
- struct { detail::_swizzle<2,T, P, V<T, P>, 0,0,-1,-2> E0 ## E0; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 0,1,-1,-2> E0 ## E1; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 0,2,-1,-2> E0 ## E2; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 1,0,-1,-2> E1 ## E0; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 1,1,-1,-2> E1 ## E1; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 1,2,-1,-2> E1 ## E2; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 2,0,-1,-2> E2 ## E0; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 2,1,-1,-2> E2 ## E1; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 2,2,-1,-2> E2 ## E2; };
-
-#define _GLM_SWIZZLE3_3_MEMBERS(T, P, V ,E0,E1,E2) \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,0,0,-1> E0 ## E0 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,0,1,-1> E0 ## E0 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,0,2,-1> E0 ## E0 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,1,0,-1> E0 ## E1 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,1,1,-1> E0 ## E1 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,1,2,-1> E0 ## E1 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,2,0,-1> E0 ## E2 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,2,1,-1> E0 ## E2 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,2,2,-1> E0 ## E2 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,0,0,-1> E1 ## E0 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,0,1,-1> E1 ## E0 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,0,2,-1> E1 ## E0 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,1,0,-1> E1 ## E1 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,1,1,-1> E1 ## E1 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,1,2,-1> E1 ## E1 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,2,0,-1> E1 ## E2 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,2,1,-1> E1 ## E2 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,2,2,-1> E1 ## E2 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,0,0,-1> E2 ## E0 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,0,1,-1> E2 ## E0 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,0,2,-1> E2 ## E0 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,1,0,-1> E2 ## E1 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,1,1,-1> E2 ## E1 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,1,2,-1> E2 ## E1 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,2,0,-1> E2 ## E2 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,2,1,-1> E2 ## E2 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,2,2,-1> E2 ## E2 ## E2; };
-
-#define _GLM_SWIZZLE3_4_MEMBERS(T, P, V, E0,E1,E2) \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,0,0,0> E0 ## E0 ## E0 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,0,0,1> E0 ## E0 ## E0 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,0,0,2> E0 ## E0 ## E0 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,0,1,0> E0 ## E0 ## E1 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,0,1,1> E0 ## E0 ## E1 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,0,1,2> E0 ## E0 ## E1 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,0,2,0> E0 ## E0 ## E2 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,0,2,1> E0 ## E0 ## E2 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,0,2,2> E0 ## E0 ## E2 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,1,0,0> E0 ## E1 ## E0 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,1,0,1> E0 ## E1 ## E0 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,1,0,2> E0 ## E1 ## E0 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,1,1,0> E0 ## E1 ## E1 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,1,1,1> E0 ## E1 ## E1 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,1,1,2> E0 ## E1 ## E1 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,1,2,0> E0 ## E1 ## E2 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,1,2,1> E0 ## E1 ## E2 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,1,2,2> E0 ## E1 ## E2 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,2,0,0> E0 ## E2 ## E0 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,2,0,1> E0 ## E2 ## E0 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,2,0,2> E0 ## E2 ## E0 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,2,1,0> E0 ## E2 ## E1 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,2,1,1> E0 ## E2 ## E1 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,2,1,2> E0 ## E2 ## E1 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,2,2,0> E0 ## E2 ## E2 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,2,2,1> E0 ## E2 ## E2 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 0,2,2,2> E0 ## E2 ## E2 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,0,0,0> E1 ## E0 ## E0 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,0,0,1> E1 ## E0 ## E0 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,0,0,2> E1 ## E0 ## E0 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,0,1,0> E1 ## E0 ## E1 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,0,1,1> E1 ## E0 ## E1 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,0,1,2> E1 ## E0 ## E1 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,0,2,0> E1 ## E0 ## E2 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,0,2,1> E1 ## E0 ## E2 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,0,2,2> E1 ## E0 ## E2 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,1,0,0> E1 ## E1 ## E0 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,1,0,1> E1 ## E1 ## E0 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,1,0,2> E1 ## E1 ## E0 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,1,1,0> E1 ## E1 ## E1 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,1,1,1> E1 ## E1 ## E1 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,1,1,2> E1 ## E1 ## E1 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,1,2,0> E1 ## E1 ## E2 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,1,2,1> E1 ## E1 ## E2 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,1,2,2> E1 ## E1 ## E2 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,2,0,0> E1 ## E2 ## E0 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,2,0,1> E1 ## E2 ## E0 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,2,0,2> E1 ## E2 ## E0 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,2,1,0> E1 ## E2 ## E1 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,2,1,1> E1 ## E2 ## E1 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,2,1,2> E1 ## E2 ## E1 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,2,2,0> E1 ## E2 ## E2 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,2,2,1> E1 ## E2 ## E2 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 1,2,2,2> E1 ## E2 ## E2 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,0,0,0> E2 ## E0 ## E0 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,0,0,1> E2 ## E0 ## E0 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,0,0,2> E2 ## E0 ## E0 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,0,1,0> E2 ## E0 ## E1 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,0,1,1> E2 ## E0 ## E1 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,0,1,2> E2 ## E0 ## E1 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,0,2,0> E2 ## E0 ## E2 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,0,2,1> E2 ## E0 ## E2 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,0,2,2> E2 ## E0 ## E2 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,1,0,0> E2 ## E1 ## E0 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,1,0,1> E2 ## E1 ## E0 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,1,0,2> E2 ## E1 ## E0 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,1,1,0> E2 ## E1 ## E1 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,1,1,1> E2 ## E1 ## E1 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,1,1,2> E2 ## E1 ## E1 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,1,2,0> E2 ## E1 ## E2 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,1,2,1> E2 ## E1 ## E2 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,1,2,2> E2 ## E1 ## E2 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,2,0,0> E2 ## E2 ## E0 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,2,0,1> E2 ## E2 ## E0 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,2,0,2> E2 ## E2 ## E0 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,2,1,0> E2 ## E2 ## E1 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,2,1,1> E2 ## E2 ## E1 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,2,1,2> E2 ## E2 ## E1 ## E2; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,2,2,0> E2 ## E2 ## E2 ## E0; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,2,2,1> E2 ## E2 ## E2 ## E1; }; \
- struct { detail::_swizzle<4,T, P, V<T, P>, 2,2,2,2> E2 ## E2 ## E2 ## E2; };
-
-#define _GLM_SWIZZLE4_2_MEMBERS(T, P, V, E0,E1,E2,E3) \
- struct { detail::_swizzle<2,T, P, V<T, P>, 0,0,-1,-2> E0 ## E0; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 0,1,-1,-2> E0 ## E1; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 0,2,-1,-2> E0 ## E2; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 0,3,-1,-2> E0 ## E3; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 1,0,-1,-2> E1 ## E0; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 1,1,-1,-2> E1 ## E1; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 1,2,-1,-2> E1 ## E2; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 1,3,-1,-2> E1 ## E3; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 2,0,-1,-2> E2 ## E0; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 2,1,-1,-2> E2 ## E1; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 2,2,-1,-2> E2 ## E2; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 2,3,-1,-2> E2 ## E3; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 3,0,-1,-2> E3 ## E0; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 3,1,-1,-2> E3 ## E1; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 3,2,-1,-2> E3 ## E2; }; \
- struct { detail::_swizzle<2,T, P, V<T, P>, 3,3,-1,-2> E3 ## E3; };
-
-#define _GLM_SWIZZLE4_3_MEMBERS(T,P, V, E0,E1,E2,E3) \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,0,0,-1> E0 ## E0 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,0,1,-1> E0 ## E0 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,0,2,-1> E0 ## E0 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,0,3,-1> E0 ## E0 ## E3; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,1,0,-1> E0 ## E1 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,1,1,-1> E0 ## E1 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,1,2,-1> E0 ## E1 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,1,3,-1> E0 ## E1 ## E3; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,2,0,-1> E0 ## E2 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,2,1,-1> E0 ## E2 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,2,2,-1> E0 ## E2 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,2,3,-1> E0 ## E2 ## E3; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,3,0,-1> E0 ## E3 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,3,1,-1> E0 ## E3 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,3,2,-1> E0 ## E3 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 0,3,3,-1> E0 ## E3 ## E3; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,0,0,-1> E1 ## E0 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,0,1,-1> E1 ## E0 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,0,2,-1> E1 ## E0 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,0,3,-1> E1 ## E0 ## E3; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,1,0,-1> E1 ## E1 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,1,1,-1> E1 ## E1 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,1,2,-1> E1 ## E1 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,1,3,-1> E1 ## E1 ## E3; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,2,0,-1> E1 ## E2 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,2,1,-1> E1 ## E2 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,2,2,-1> E1 ## E2 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,2,3,-1> E1 ## E2 ## E3; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,3,0,-1> E1 ## E3 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,3,1,-1> E1 ## E3 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,3,2,-1> E1 ## E3 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 1,3,3,-1> E1 ## E3 ## E3; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,0,0,-1> E2 ## E0 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,0,1,-1> E2 ## E0 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,0,2,-1> E2 ## E0 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,0,3,-1> E2 ## E0 ## E3; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,1,0,-1> E2 ## E1 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,1,1,-1> E2 ## E1 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,1,2,-1> E2 ## E1 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,1,3,-1> E2 ## E1 ## E3; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,2,0,-1> E2 ## E2 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,2,1,-1> E2 ## E2 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,2,2,-1> E2 ## E2 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,2,3,-1> E2 ## E2 ## E3; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,3,0,-1> E2 ## E3 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,3,1,-1> E2 ## E3 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,3,2,-1> E2 ## E3 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 2,3,3,-1> E2 ## E3 ## E3; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 3,0,0,-1> E3 ## E0 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 3,0,1,-1> E3 ## E0 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 3,0,2,-1> E3 ## E0 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 3,0,3,-1> E3 ## E0 ## E3; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 3,1,0,-1> E3 ## E1 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 3,1,1,-1> E3 ## E1 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 3,1,2,-1> E3 ## E1 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 3,1,3,-1> E3 ## E1 ## E3; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 3,2,0,-1> E3 ## E2 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 3,2,1,-1> E3 ## E2 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 3,2,2,-1> E3 ## E2 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 3,2,3,-1> E3 ## E2 ## E3; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 3,3,0,-1> E3 ## E3 ## E0; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 3,3,1,-1> E3 ## E3 ## E1; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 3,3,2,-1> E3 ## E3 ## E2; }; \
- struct { detail::_swizzle<3,T,P, V<T, P>, 3,3,3,-1> E3 ## E3 ## E3; };
-
-#define _GLM_SWIZZLE4_4_MEMBERS(T, P, V, E0,E1,E2,E3) \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,0,0,0> E0 ## E0 ## E0 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,0,0,1> E0 ## E0 ## E0 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,0,0,2> E0 ## E0 ## E0 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,0,0,3> E0 ## E0 ## E0 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,0,1,0> E0 ## E0 ## E1 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,0,1,1> E0 ## E0 ## E1 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,0,1,2> E0 ## E0 ## E1 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,0,1,3> E0 ## E0 ## E1 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,0,2,0> E0 ## E0 ## E2 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,0,2,1> E0 ## E0 ## E2 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,0,2,2> E0 ## E0 ## E2 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,0,2,3> E0 ## E0 ## E2 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,0,3,0> E0 ## E0 ## E3 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,0,3,1> E0 ## E0 ## E3 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,0,3,2> E0 ## E0 ## E3 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,0,3,3> E0 ## E0 ## E3 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,1,0,0> E0 ## E1 ## E0 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,1,0,1> E0 ## E1 ## E0 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,1,0,2> E0 ## E1 ## E0 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,1,0,3> E0 ## E1 ## E0 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,1,1,0> E0 ## E1 ## E1 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,1,1,1> E0 ## E1 ## E1 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,1,1,2> E0 ## E1 ## E1 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,1,1,3> E0 ## E1 ## E1 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,1,2,0> E0 ## E1 ## E2 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,1,2,1> E0 ## E1 ## E2 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,1,2,2> E0 ## E1 ## E2 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,1,2,3> E0 ## E1 ## E2 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,1,3,0> E0 ## E1 ## E3 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,1,3,1> E0 ## E1 ## E3 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,1,3,2> E0 ## E1 ## E3 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,1,3,3> E0 ## E1 ## E3 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,2,0,0> E0 ## E2 ## E0 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,2,0,1> E0 ## E2 ## E0 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,2,0,2> E0 ## E2 ## E0 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,2,0,3> E0 ## E2 ## E0 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,2,1,0> E0 ## E2 ## E1 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,2,1,1> E0 ## E2 ## E1 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,2,1,2> E0 ## E2 ## E1 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,2,1,3> E0 ## E2 ## E1 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,2,2,0> E0 ## E2 ## E2 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,2,2,1> E0 ## E2 ## E2 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,2,2,2> E0 ## E2 ## E2 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,2,2,3> E0 ## E2 ## E2 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,2,3,0> E0 ## E2 ## E3 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,2,3,1> E0 ## E2 ## E3 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,2,3,2> E0 ## E2 ## E3 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,2,3,3> E0 ## E2 ## E3 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,3,0,0> E0 ## E3 ## E0 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,3,0,1> E0 ## E3 ## E0 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,3,0,2> E0 ## E3 ## E0 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,3,0,3> E0 ## E3 ## E0 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,3,1,0> E0 ## E3 ## E1 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,3,1,1> E0 ## E3 ## E1 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,3,1,2> E0 ## E3 ## E1 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,3,1,3> E0 ## E3 ## E1 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,3,2,0> E0 ## E3 ## E2 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,3,2,1> E0 ## E3 ## E2 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,3,2,2> E0 ## E3 ## E2 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,3,2,3> E0 ## E3 ## E2 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,3,3,0> E0 ## E3 ## E3 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,3,3,1> E0 ## E3 ## E3 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,3,3,2> E0 ## E3 ## E3 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 0,3,3,3> E0 ## E3 ## E3 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,0,0,0> E1 ## E0 ## E0 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,0,0,1> E1 ## E0 ## E0 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,0,0,2> E1 ## E0 ## E0 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,0,0,3> E1 ## E0 ## E0 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,0,1,0> E1 ## E0 ## E1 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,0,1,1> E1 ## E0 ## E1 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,0,1,2> E1 ## E0 ## E1 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,0,1,3> E1 ## E0 ## E1 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,0,2,0> E1 ## E0 ## E2 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,0,2,1> E1 ## E0 ## E2 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,0,2,2> E1 ## E0 ## E2 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,0,2,3> E1 ## E0 ## E2 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,0,3,0> E1 ## E0 ## E3 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,0,3,1> E1 ## E0 ## E3 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,0,3,2> E1 ## E0 ## E3 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,0,3,3> E1 ## E0 ## E3 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,1,0,0> E1 ## E1 ## E0 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,1,0,1> E1 ## E1 ## E0 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,1,0,2> E1 ## E1 ## E0 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,1,0,3> E1 ## E1 ## E0 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,1,1,0> E1 ## E1 ## E1 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,1,1,1> E1 ## E1 ## E1 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,1,1,2> E1 ## E1 ## E1 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,1,1,3> E1 ## E1 ## E1 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,1,2,0> E1 ## E1 ## E2 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,1,2,1> E1 ## E1 ## E2 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,1,2,2> E1 ## E1 ## E2 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,1,2,3> E1 ## E1 ## E2 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,1,3,0> E1 ## E1 ## E3 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,1,3,1> E1 ## E1 ## E3 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,1,3,2> E1 ## E1 ## E3 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,1,3,3> E1 ## E1 ## E3 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,2,0,0> E1 ## E2 ## E0 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,2,0,1> E1 ## E2 ## E0 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,2,0,2> E1 ## E2 ## E0 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,2,0,3> E1 ## E2 ## E0 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,2,1,0> E1 ## E2 ## E1 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,2,1,1> E1 ## E2 ## E1 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,2,1,2> E1 ## E2 ## E1 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,2,1,3> E1 ## E2 ## E1 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,2,2,0> E1 ## E2 ## E2 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,2,2,1> E1 ## E2 ## E2 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,2,2,2> E1 ## E2 ## E2 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,2,2,3> E1 ## E2 ## E2 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,2,3,0> E1 ## E2 ## E3 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,2,3,1> E1 ## E2 ## E3 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,2,3,2> E1 ## E2 ## E3 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,2,3,3> E1 ## E2 ## E3 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,3,0,0> E1 ## E3 ## E0 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,3,0,1> E1 ## E3 ## E0 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,3,0,2> E1 ## E3 ## E0 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,3,0,3> E1 ## E3 ## E0 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,3,1,0> E1 ## E3 ## E1 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,3,1,1> E1 ## E3 ## E1 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,3,1,2> E1 ## E3 ## E1 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,3,1,3> E1 ## E3 ## E1 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,3,2,0> E1 ## E3 ## E2 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,3,2,1> E1 ## E3 ## E2 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,3,2,2> E1 ## E3 ## E2 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,3,2,3> E1 ## E3 ## E2 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,3,3,0> E1 ## E3 ## E3 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,3,3,1> E1 ## E3 ## E3 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,3,3,2> E1 ## E3 ## E3 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 1,3,3,3> E1 ## E3 ## E3 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,0,0,0> E2 ## E0 ## E0 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,0,0,1> E2 ## E0 ## E0 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,0,0,2> E2 ## E0 ## E0 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,0,0,3> E2 ## E0 ## E0 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,0,1,0> E2 ## E0 ## E1 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,0,1,1> E2 ## E0 ## E1 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,0,1,2> E2 ## E0 ## E1 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,0,1,3> E2 ## E0 ## E1 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,0,2,0> E2 ## E0 ## E2 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,0,2,1> E2 ## E0 ## E2 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,0,2,2> E2 ## E0 ## E2 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,0,2,3> E2 ## E0 ## E2 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,0,3,0> E2 ## E0 ## E3 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,0,3,1> E2 ## E0 ## E3 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,0,3,2> E2 ## E0 ## E3 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,0,3,3> E2 ## E0 ## E3 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,1,0,0> E2 ## E1 ## E0 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,1,0,1> E2 ## E1 ## E0 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,1,0,2> E2 ## E1 ## E0 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,1,0,3> E2 ## E1 ## E0 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,1,1,0> E2 ## E1 ## E1 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,1,1,1> E2 ## E1 ## E1 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,1,1,2> E2 ## E1 ## E1 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,1,1,3> E2 ## E1 ## E1 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,1,2,0> E2 ## E1 ## E2 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,1,2,1> E2 ## E1 ## E2 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,1,2,2> E2 ## E1 ## E2 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,1,2,3> E2 ## E1 ## E2 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,1,3,0> E2 ## E1 ## E3 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,1,3,1> E2 ## E1 ## E3 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,1,3,2> E2 ## E1 ## E3 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,1,3,3> E2 ## E1 ## E3 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,2,0,0> E2 ## E2 ## E0 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,2,0,1> E2 ## E2 ## E0 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,2,0,2> E2 ## E2 ## E0 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,2,0,3> E2 ## E2 ## E0 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,2,1,0> E2 ## E2 ## E1 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,2,1,1> E2 ## E2 ## E1 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,2,1,2> E2 ## E2 ## E1 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,2,1,3> E2 ## E2 ## E1 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,2,2,0> E2 ## E2 ## E2 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,2,2,1> E2 ## E2 ## E2 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,2,2,2> E2 ## E2 ## E2 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,2,2,3> E2 ## E2 ## E2 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,2,3,0> E2 ## E2 ## E3 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,2,3,1> E2 ## E2 ## E3 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,2,3,2> E2 ## E2 ## E3 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,2,3,3> E2 ## E2 ## E3 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,3,0,0> E2 ## E3 ## E0 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,3,0,1> E2 ## E3 ## E0 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,3,0,2> E2 ## E3 ## E0 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,3,0,3> E2 ## E3 ## E0 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,3,1,0> E2 ## E3 ## E1 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,3,1,1> E2 ## E3 ## E1 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,3,1,2> E2 ## E3 ## E1 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,3,1,3> E2 ## E3 ## E1 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,3,2,0> E2 ## E3 ## E2 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,3,2,1> E2 ## E3 ## E2 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,3,2,2> E2 ## E3 ## E2 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,3,2,3> E2 ## E3 ## E2 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,3,3,0> E2 ## E3 ## E3 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,3,3,1> E2 ## E3 ## E3 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,3,3,2> E2 ## E3 ## E3 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 2,3,3,3> E2 ## E3 ## E3 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,0,0,0> E3 ## E0 ## E0 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,0,0,1> E3 ## E0 ## E0 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,0,0,2> E3 ## E0 ## E0 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,0,0,3> E3 ## E0 ## E0 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,0,1,0> E3 ## E0 ## E1 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,0,1,1> E3 ## E0 ## E1 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,0,1,2> E3 ## E0 ## E1 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,0,1,3> E3 ## E0 ## E1 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,0,2,0> E3 ## E0 ## E2 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,0,2,1> E3 ## E0 ## E2 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,0,2,2> E3 ## E0 ## E2 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,0,2,3> E3 ## E0 ## E2 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,0,3,0> E3 ## E0 ## E3 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,0,3,1> E3 ## E0 ## E3 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,0,3,2> E3 ## E0 ## E3 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,0,3,3> E3 ## E0 ## E3 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,1,0,0> E3 ## E1 ## E0 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,1,0,1> E3 ## E1 ## E0 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,1,0,2> E3 ## E1 ## E0 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,1,0,3> E3 ## E1 ## E0 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,1,1,0> E3 ## E1 ## E1 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,1,1,1> E3 ## E1 ## E1 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,1,1,2> E3 ## E1 ## E1 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,1,1,3> E3 ## E1 ## E1 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,1,2,0> E3 ## E1 ## E2 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,1,2,1> E3 ## E1 ## E2 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,1,2,2> E3 ## E1 ## E2 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,1,2,3> E3 ## E1 ## E2 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,1,3,0> E3 ## E1 ## E3 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,1,3,1> E3 ## E1 ## E3 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,1,3,2> E3 ## E1 ## E3 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,1,3,3> E3 ## E1 ## E3 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,2,0,0> E3 ## E2 ## E0 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,2,0,1> E3 ## E2 ## E0 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,2,0,2> E3 ## E2 ## E0 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,2,0,3> E3 ## E2 ## E0 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,2,1,0> E3 ## E2 ## E1 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,2,1,1> E3 ## E2 ## E1 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,2,1,2> E3 ## E2 ## E1 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,2,1,3> E3 ## E2 ## E1 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,2,2,0> E3 ## E2 ## E2 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,2,2,1> E3 ## E2 ## E2 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,2,2,2> E3 ## E2 ## E2 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,2,2,3> E3 ## E2 ## E2 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,2,3,0> E3 ## E2 ## E3 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,2,3,1> E3 ## E2 ## E3 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,2,3,2> E3 ## E2 ## E3 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,2,3,3> E3 ## E2 ## E3 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,3,0,0> E3 ## E3 ## E0 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,3,0,1> E3 ## E3 ## E0 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,3,0,2> E3 ## E3 ## E0 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,3,0,3> E3 ## E3 ## E0 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,3,1,0> E3 ## E3 ## E1 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,3,1,1> E3 ## E3 ## E1 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,3,1,2> E3 ## E3 ## E1 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,3,1,3> E3 ## E3 ## E1 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,3,2,0> E3 ## E3 ## E2 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,3,2,1> E3 ## E3 ## E2 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,3,2,2> E3 ## E3 ## E2 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,3,2,3> E3 ## E3 ## E2 ## E3; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,3,3,0> E3 ## E3 ## E3 ## E0; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,3,3,1> E3 ## E3 ## E3 ## E1; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,3,3,2> E3 ## E3 ## E3 ## E2; }; \
- struct { detail::_swizzle<4, T, P, V<T, P>, 3,3,3,3> E3 ## E3 ## E3 ## E3; };
diff --git a/inc/glm/detail/_swizzle_func.hpp b/inc/glm/detail/_swizzle_func.hpp deleted file mode 100644 index c7f1aec..0000000 --- a/inc/glm/detail/_swizzle_func.hpp +++ /dev/null @@ -1,725 +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 core
-/// @file glm/detail/_swizzle_func.hpp
-/// @date 2011-10-16 / 2011-10-16
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#define GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, CONST, A, B) \
- SWIZZLED_TYPE<TMPL_TYPE, PRECISION> A ## B() CONST \
- { \
- return SWIZZLED_TYPE<TMPL_TYPE, PRECISION>(this->A, this->B); \
- }
-
-#define GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, CONST, A, B, C) \
- SWIZZLED_TYPE<TMPL_TYPE, PRECISION> A ## B ## C() CONST \
- { \
- return SWIZZLED_TYPE<TMPL_TYPE, PRECISION>(this->A, this->B, this->C); \
- }
-
-#define GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, CONST, A, B, C, D) \
- SWIZZLED_TYPE<TMPL_TYPE, PRECISION> A ## B ## C ## D() CONST \
- { \
- return SWIZZLED_TYPE<TMPL_TYPE, PRECISION>(this->A, this->B, this->C, this->D); \
- }
-
-#define GLM_SWIZZLE_GEN_VEC2_ENTRY_DEF(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, CONST, A, B) \
- template <typename TMPL_TYPE> \
- SWIZZLED_TYPE<TMPL_TYPE> CLASS_TYPE<TMPL_TYPE, PRECISION>::A ## B() CONST \
- { \
- return SWIZZLED_TYPE<TMPL_TYPE, PRECISION>(this->A, this->B); \
- }
-
-#define GLM_SWIZZLE_GEN_VEC3_ENTRY_DEF(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, CONST, A, B, C) \
- template <typename TMPL_TYPE> \
- SWIZZLED_TYPE<TMPL_TYPE> CLASS_TYPE<TMPL_TYPE, PRECISION>::A ## B ## C() CONST \
- { \
- return SWIZZLED_TYPE<TMPL_TYPE, PRECISION>(this->A, this->B, this->C); \
- }
-
-#define GLM_SWIZZLE_GEN_VEC4_ENTRY_DEF(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, CONST, A, B, C, D) \
- template <typename TMPL_TYPE> \
- SWIZZLED_TYPE<TMPL_TYPE> CLASS_TYPE<TMPL_TYPE, PRECISION>::A ## B ## C ## D() CONST \
- { \
- return SWIZZLED_TYPE<TMPL_TYPE, PRECISION>(this->A, this->B, this->C, this->D); \
- }
-
-#define GLM_MUTABLE
-
-#define GLM_SWIZZLE_GEN_REF2_FROM_VEC2_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, A, B) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, A, B) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, B, A)
-
-#define GLM_SWIZZLE_GEN_REF_FROM_VEC2(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE) \
- GLM_SWIZZLE_GEN_REF2_FROM_VEC2_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, x, y) \
- GLM_SWIZZLE_GEN_REF2_FROM_VEC2_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, r, g) \
- GLM_SWIZZLE_GEN_REF2_FROM_VEC2_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, s, t)
-
-//GLM_SWIZZLE_GEN_REF_FROM_VEC2(valType, detail::vec2, detail::ref2)
-
-#define GLM_SWIZZLE_GEN_REF2_FROM_VEC3_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, A, B, C) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, A, B) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, A, C) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, B, A) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, B, C) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, C, A) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, C, B)
-
-#define GLM_SWIZZLE_GEN_REF3_FROM_VEC3_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, A, B, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, A, B, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, A, C, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, B, A, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, B, C, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, C, A, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, C, B, A)
-
-#define GLM_SWIZZLE_GEN_REF_FROM_VEC3_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, A, B, C) \
- GLM_SWIZZLE_GEN_REF3_FROM_VEC3_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC3_TYPE, A, B, C) \
- GLM_SWIZZLE_GEN_REF2_FROM_VEC3_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, A, B, C)
-
-#define GLM_SWIZZLE_GEN_REF_FROM_VEC3(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE) \
- GLM_SWIZZLE_GEN_REF_FROM_VEC3_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, x, y, z) \
- GLM_SWIZZLE_GEN_REF_FROM_VEC3_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, r, g, b) \
- GLM_SWIZZLE_GEN_REF_FROM_VEC3_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, s, t, p)
-
-//GLM_SWIZZLE_GEN_REF_FROM_VEC3(valType, detail::vec3, detail::ref2, detail::ref3)
-
-#define GLM_SWIZZLE_GEN_REF2_FROM_VEC4_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, A, B, C, D) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, A, B) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, A, C) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, A, D) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, B, A) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, B, C) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, B, D) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, C, A) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, C, B) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, C, D) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, D, A) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, D, B) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, GLM_MUTABLE, D, C)
-
-#define GLM_SWIZZLE_GEN_REF3_FROM_VEC4_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, A, B, C, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , A, B, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , A, B, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , A, C, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , A, C, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , A, D, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , A, D, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , B, A, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , B, A, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , B, C, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , B, C, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , B, D, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , B, D, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , C, A, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , C, A, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , C, B, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , C, B, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , C, D, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , C, D, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , D, A, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , D, A, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , D, B, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , D, B, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , D, C, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , D, C, B)
-
-#define GLM_SWIZZLE_GEN_REF4_FROM_VEC4_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, A, B, C, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , A, C, B, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , A, C, D, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , A, D, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , A, D, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , A, B, D, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , A, B, C, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , B, C, A, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , B, C, D, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , B, D, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , B, D, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , B, A, D, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , B, A, C, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , C, B, A, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , C, B, D, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , C, D, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , C, D, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , C, A, D, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , C, A, B, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , D, C, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , D, C, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , D, A, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , D, A, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , D, B, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, , D, B, C, A)
-
-#define GLM_SWIZZLE_GEN_REF_FROM_VEC4_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE, A, B, C, D) \
- GLM_SWIZZLE_GEN_REF2_FROM_VEC4_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, A, B, C, D) \
- GLM_SWIZZLE_GEN_REF3_FROM_VEC4_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC3_TYPE, A, B, C, D) \
- GLM_SWIZZLE_GEN_REF4_FROM_VEC4_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC4_TYPE, A, B, C, D)
-
-#define GLM_SWIZZLE_GEN_REF_FROM_VEC4(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE) \
- GLM_SWIZZLE_GEN_REF_FROM_VEC4_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE, x, y, z, w) \
- GLM_SWIZZLE_GEN_REF_FROM_VEC4_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE, r, g, b, a) \
- GLM_SWIZZLE_GEN_REF_FROM_VEC4_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE, s, t, p, q)
-
-//GLM_SWIZZLE_GEN_REF_FROM_VEC4(valType, detail::vec4, detail::ref2, detail::ref3, detail::ref4)
-
-#define GLM_SWIZZLE_GEN_VEC2_FROM_VEC2_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, A, B) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B)
-
-#define GLM_SWIZZLE_GEN_VEC3_FROM_VEC2_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, A, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, B)
-
-#define GLM_SWIZZLE_GEN_VEC4_FROM_VEC2_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, B, B)
-
-#define GLM_SWIZZLE_GEN_VEC_FROM_VEC2_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE, A, B) \
- GLM_SWIZZLE_GEN_VEC2_FROM_VEC2_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, A, B) \
- GLM_SWIZZLE_GEN_VEC3_FROM_VEC2_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC3_TYPE, A, B) \
- GLM_SWIZZLE_GEN_VEC4_FROM_VEC2_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC4_TYPE, A, B)
-
-#define GLM_SWIZZLE_GEN_VEC_FROM_VEC2(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE) \
- GLM_SWIZZLE_GEN_VEC_FROM_VEC2_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE, x, y) \
- GLM_SWIZZLE_GEN_VEC_FROM_VEC2_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE, r, g) \
- GLM_SWIZZLE_GEN_VEC_FROM_VEC2_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE, s, t)
-
-//GLM_SWIZZLE_GEN_VEC_FROM_VEC2(valType, detail::vec2, detail::vec2, detail::vec3, detail::vec4)
-
-#define GLM_SWIZZLE_GEN_VEC2_FROM_VEC3_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, A, B, C) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C)
-
-#define GLM_SWIZZLE_GEN_VEC3_FROM_VEC3_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, A, B, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, C)
-
-#define GLM_SWIZZLE_GEN_VEC4_FROM_VEC3_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, A, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, C, C)
-
-#define GLM_SWIZZLE_GEN_VEC_FROM_VEC3_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE, A, B, C) \
- GLM_SWIZZLE_GEN_VEC2_FROM_VEC3_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, A, B, C) \
- GLM_SWIZZLE_GEN_VEC3_FROM_VEC3_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC3_TYPE, A, B, C) \
- GLM_SWIZZLE_GEN_VEC4_FROM_VEC3_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC4_TYPE, A, B, C)
-
-#define GLM_SWIZZLE_GEN_VEC_FROM_VEC3(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE) \
- GLM_SWIZZLE_GEN_VEC_FROM_VEC3_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE, x, y, z) \
- GLM_SWIZZLE_GEN_VEC_FROM_VEC3_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE, r, g, b) \
- GLM_SWIZZLE_GEN_VEC_FROM_VEC3_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE, s, t, p)
-
-//GLM_SWIZZLE_GEN_VEC_FROM_VEC3(valType, detail::vec3, detail::vec2, detail::vec3, detail::vec4)
-
-#define GLM_SWIZZLE_GEN_VEC2_FROM_VEC4_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, A, B, C, D) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C) \
- GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D)
-
-#define GLM_SWIZZLE_GEN_VEC3_FROM_VEC4_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, A, B, C, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C, D) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D, A) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D, B) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D, C) \
- GLM_SWIZZLE_GEN_VEC3_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D, D)
-
-#define GLM_SWIZZLE_GEN_VEC4_FROM_VEC4_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, A, B, C, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, A, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, B, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, C, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, D, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, D, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, D, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, A, D, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, A, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, B, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, C, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, D, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, D, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, D, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, B, D, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, A, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, B, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, C, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, D, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, D, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, D, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, C, D, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D, A, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D, B, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D, C, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D, D, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D, D, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D, D, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, A, D, D, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, A, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, B, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, C, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, D, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, D, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, D, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, A, D, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, A, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, B, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, C, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, D, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, D, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, D, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, B, D, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, A, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, B, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, C, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, D, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, D, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, D, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, C, D, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D, A, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D, B, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D, C, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D, D, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D, D, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D, D, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, B, D, D, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, A, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, B, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, C, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, D, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, D, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, D, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, A, D, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, A, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, B, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, C, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, D, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, D, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, D, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, B, D, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, A, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, B, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, C, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, D, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, D, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, D, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, C, D, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D, A, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D, B, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D, C, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D, D, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D, D, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D, D, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, C, D, D, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A, A, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A, B, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A, C, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A, D, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A, D, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A, D, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, A, D, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B, A, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B, B, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B, C, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B, D, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B, D, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B, D, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, B, D, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C, A, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C, B, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C, C, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C, D, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C, D, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C, D, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, C, D, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D, A, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D, A, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D, A, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D, A, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D, B, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D, B, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D, B, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D, B, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D, C, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D, C, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D, C, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D, C, D) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D, D, A) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D, D, B) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D, D, C) \
- GLM_SWIZZLE_GEN_VEC4_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, const, D, D, D, D)
-
-#define GLM_SWIZZLE_GEN_VEC_FROM_VEC4_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE, A, B, C, D) \
- GLM_SWIZZLE_GEN_VEC2_FROM_VEC4_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, A, B, C, D) \
- GLM_SWIZZLE_GEN_VEC3_FROM_VEC4_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC3_TYPE, A, B, C, D) \
- GLM_SWIZZLE_GEN_VEC4_FROM_VEC4_SWIZZLE(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC4_TYPE, A, B, C, D)
-
-#define GLM_SWIZZLE_GEN_VEC_FROM_VEC4(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE) \
- GLM_SWIZZLE_GEN_VEC_FROM_VEC4_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE, x, y, z, w) \
- GLM_SWIZZLE_GEN_VEC_FROM_VEC4_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE, r, g, b, a) \
- GLM_SWIZZLE_GEN_VEC_FROM_VEC4_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE, s, t, p, q)
-
-//GLM_SWIZZLE_GEN_VEC_FROM_VEC4(valType, detail::vec4, detail::vec2, detail::vec3, detail::vec4)
diff --git a/inc/glm/detail/_vectorize.hpp b/inc/glm/detail/_vectorize.hpp deleted file mode 100644 index ce83cb8..0000000 --- a/inc/glm/detail/_vectorize.hpp +++ /dev/null @@ -1,160 +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 core
-/// @file glm/detail/_vectorize.hpp
-/// @date 2011-10-14 / 2011-10-14
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "type_vec1.hpp"
-#include "type_vec2.hpp"
-#include "type_vec3.hpp"
-#include "type_vec4.hpp"
-
-namespace glm{
-namespace detail
-{
- template <typename R, typename T, precision P, template <typename, precision> class vecType>
- struct functor1{};
-
- template <typename R, typename T, precision P>
- struct functor1<R, T, P, tvec1>
- {
- GLM_FUNC_QUALIFIER static tvec1<R, P> call(R (*Func) (T x), tvec1<T, P> const & v)
- {
- return tvec1<R, P>(Func(v.x));
- }
- };
-
- template <typename R, typename T, precision P>
- struct functor1<R, T, P, tvec2>
- {
- GLM_FUNC_QUALIFIER static tvec2<R, P> call(R (*Func) (T x), tvec2<T, P> const & v)
- {
- return tvec2<R, P>(Func(v.x), Func(v.y));
- }
- };
-
- template <typename R, typename T, precision P>
- struct functor1<R, T, P, tvec3>
- {
- GLM_FUNC_QUALIFIER static tvec3<R, P> call(R (*Func) (T x), tvec3<T, P> const & v)
- {
- return tvec3<R, P>(Func(v.x), Func(v.y), Func(v.z));
- }
- };
-
- template <typename R, typename T, precision P>
- struct functor1<R, T, P, tvec4>
- {
- GLM_FUNC_QUALIFIER static tvec4<R, P> call(R (*Func) (T x), tvec4<T, P> const & v)
- {
- return tvec4<R, P>(Func(v.x), Func(v.y), Func(v.z), Func(v.w));
- }
- };
-
- template <typename T, precision P, template <typename, precision> class vecType>
- struct functor2{};
-
- template <typename T, precision P>
- struct functor2<T, P, tvec1>
- {
- GLM_FUNC_QUALIFIER static tvec1<T, P> call(T (*Func) (T x, T y), tvec1<T, P> const & a, tvec1<T, P> const & b)
- {
- return tvec1<T, P>(Func(a.x, b.x));
- }
- };
-
- template <typename T, precision P>
- struct functor2<T, P, tvec2>
- {
- GLM_FUNC_QUALIFIER static tvec2<T, P> call(T (*Func) (T x, T y), tvec2<T, P> const & a, tvec2<T, P> const & b)
- {
- return tvec2<T, P>(Func(a.x, b.x), Func(a.y, b.y));
- }
- };
-
- template <typename T, precision P>
- struct functor2<T, P, tvec3>
- {
- GLM_FUNC_QUALIFIER static tvec3<T, P> call(T (*Func) (T x, T y), tvec3<T, P> const & a, tvec3<T, P> const & b)
- {
- return tvec3<T, P>(Func(a.x, b.x), Func(a.y, b.y), Func(a.z, b.z));
- }
- };
-
- template <typename T, precision P>
- struct functor2<T, P, tvec4>
- {
- GLM_FUNC_QUALIFIER static tvec4<T, P> call(T (*Func) (T x, T y), tvec4<T, P> const & a, tvec4<T, P> const & b)
- {
- return tvec4<T, P>(Func(a.x, b.x), Func(a.y, b.y), Func(a.z, b.z), Func(a.w, b.w));
- }
- };
-
- template <typename T, precision P, template <typename, precision> class vecType>
- struct functor2_vec_sca{};
-
- template <typename T, precision P>
- struct functor2_vec_sca<T, P, tvec1>
- {
- GLM_FUNC_QUALIFIER static tvec1<T, P> call(T (*Func) (T x, T y), tvec1<T, P> const & a, T b)
- {
- return tvec1<T, P>(Func(a.x, b));
- }
- };
-
- template <typename T, precision P>
- struct functor2_vec_sca<T, P, tvec2>
- {
- GLM_FUNC_QUALIFIER static tvec2<T, P> call(T (*Func) (T x, T y), tvec2<T, P> const & a, T b)
- {
- return tvec2<T, P>(Func(a.x, b), Func(a.y, b));
- }
- };
-
- template <typename T, precision P>
- struct functor2_vec_sca<T, P, tvec3>
- {
- GLM_FUNC_QUALIFIER static tvec3<T, P> call(T (*Func) (T x, T y), tvec3<T, P> const & a, T b)
- {
- return tvec3<T, P>(Func(a.x, b), Func(a.y, b), Func(a.z, b));
- }
- };
-
- template <typename T, precision P>
- struct functor2_vec_sca<T, P, tvec4>
- {
- GLM_FUNC_QUALIFIER static tvec4<T, P> call(T (*Func) (T x, T y), tvec4<T, P> const & a, T b)
- {
- return tvec4<T, P>(Func(a.x, b), Func(a.y, b), Func(a.z, b), Func(a.w, b));
- }
- };
-}//namespace detail
-}//namespace glm
diff --git a/inc/glm/detail/dummy.cpp b/inc/glm/detail/dummy.cpp deleted file mode 100644 index 5034280..0000000 --- a/inc/glm/detail/dummy.cpp +++ /dev/null @@ -1,232 +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 core
-/// @file glm/core/dummy.cpp
-/// @date 2011-01-19 / 2011-06-15
-/// @author Christophe Riccio
-///
-/// GLM is a header only library. There is nothing to compile.
-/// dummy.cpp exist only a wordaround for CMake file.
-///////////////////////////////////////////////////////////////////////////////////
-
-#define GLM_MESSAGES
-#include <glm/glm.hpp>
-#include <glm/ext.hpp>
-#include <limits>
-
-struct material
-{
- glm::vec4 emission; // Ecm
- glm::vec4 ambient; // Acm
- glm::vec4 diffuse; // Dcm
- glm::vec4 specular; // Scm
- float shininess; // Srm
-};
-
-struct light
-{
- glm::vec4 ambient; // Acli
- glm::vec4 diffuse; // Dcli
- glm::vec4 specular; // Scli
- glm::vec4 position; // Ppli
- glm::vec4 halfVector; // Derived: Hi
- glm::vec3 spotDirection; // Sdli
- float spotExponent; // Srli
- float spotCutoff; // Crli
- // (range: [0.0,90.0], 180.0)
- float spotCosCutoff; // Derived: cos(Crli)
- // (range: [1.0,0.0],-1.0)
- float constantAttenuation; // K0
- float linearAttenuation; // K1
- float quadraticAttenuation;// K2
-};
-
-
-// Sample 1
-#include <glm/vec3.hpp>// glm::vec3
-#include <glm/geometric.hpp>// glm::cross, glm::normalize
-
-glm::vec3 computeNormal
-(
- glm::vec3 const & a,
- glm::vec3 const & b,
- glm::vec3 const & c
-)
-{
- return glm::normalize(glm::cross(c - a, b - a));
-}
-
-typedef unsigned int GLuint;
-#define GL_FALSE 0
-void glUniformMatrix4fv(GLuint, int, int, float*){}
-
-// Sample 2
-#include <glm/vec3.hpp> // glm::vec3
-#include <glm/vec4.hpp> // glm::vec4, glm::ivec4
-#include <glm/mat4x4.hpp> // glm::mat4
-#include <glm/gtc/matrix_transform.hpp> // glm::translate, glm::rotate, glm::scale, glm::perspective
-#include <glm/gtc/type_ptr.hpp> // glm::value_ptr
-void func(GLuint LocationMVP, float Translate, glm::vec2 const & Rotate)
-{
- glm::mat4 Projection = glm::perspective(45.0f, 4.0f / 3.0f, 0.1f, 100.f);
- glm::mat4 ViewTranslate = glm::translate(glm::mat4(1.0f), glm::vec3(0.0f, 0.0f, -Translate));
- glm::mat4 ViewRotateX = glm::rotate(ViewTranslate, Rotate.y, glm::vec3(-1.0f, 0.0f, 0.0f));
- glm::mat4 View = glm::rotate(ViewRotateX, Rotate.x, glm::vec3(0.0f, 1.0f, 0.0f));
- glm::mat4 Model = glm::scale(glm::mat4(1.0f), glm::vec3(0.5f));
- glm::mat4 MVP = Projection * View * Model;
- glUniformMatrix4fv(LocationMVP, 1, GL_FALSE, glm::value_ptr(MVP));
-}
-
-// Sample 3
-#include <glm/vec2.hpp>// glm::vec2
-#include <glm/packing.hpp>// glm::packUnorm2x16
-#include <glm/integer.hpp>// glm::uint
-#include <glm/gtc/type_precision.hpp>// glm::i8vec2, glm::i32vec2
-std::size_t const VertexCount = 4;
-// Float quad geometry
-std::size_t const PositionSizeF32 = VertexCount * sizeof(glm::vec2);
-glm::vec2 const PositionDataF32[VertexCount] =
-{
- glm::vec2(-1.0f,-1.0f),
- glm::vec2( 1.0f,-1.0f),
- glm::vec2( 1.0f, 1.0f),
- glm::vec2(-1.0f, 1.0f)
- };
-// Half-float quad geometry
-std::size_t const PositionSizeF16 = VertexCount * sizeof(glm::uint);
-glm::uint const PositionDataF16[VertexCount] =
-{
- glm::uint(glm::packUnorm2x16(glm::vec2(-1.0f, -1.0f))),
- glm::uint(glm::packUnorm2x16(glm::vec2( 1.0f, -1.0f))),
- glm::uint(glm::packUnorm2x16(glm::vec2( 1.0f, 1.0f))),
- glm::uint(glm::packUnorm2x16(glm::vec2(-1.0f, 1.0f)))
-};
-// 8 bits signed integer quad geometry
-std::size_t const PositionSizeI8 = VertexCount * sizeof(glm::i8vec2);
-glm::i8vec2 const PositionDataI8[VertexCount] =
-{
- glm::i8vec2(-1,-1),
- glm::i8vec2( 1,-1),
- glm::i8vec2( 1, 1),
- glm::i8vec2(-1, 1)
-};
-// 32 bits signed integer quad geometry
-std::size_t const PositionSizeI32 = VertexCount * sizeof(glm::i32vec2);
-glm::i32vec2 const PositionDataI32[VertexCount] =
-{
- glm::i32vec2 (-1,-1),
- glm::i32vec2 ( 1,-1),
- glm::i32vec2 ( 1, 1),
- glm::i32vec2 (-1, 1)
-};
-
-struct intersection
-{
- glm::vec4 position;
- glm::vec3 normal;
-};
-
-/*
-// Sample 4
-#include <glm/vec3.hpp>// glm::vec3
-#include <glm/geometric.hpp>// glm::normalize, glm::dot, glm::reflect
-#include <glm/exponential.hpp>// glm::pow
-#include <glm/gtc/random.hpp>// glm::vecRand3
-glm::vec3 lighting
-(
- intersection const & Intersection,
- material const & Material,
- light const & Light,
- glm::vec3 const & View
-)
-{
- glm::vec3 Color(0.0f);
- glm::vec3 LightVertor(glm::normalize(
- Light.position - Intersection.position +
- glm::vecRand3(0.0f, Light.inaccuracy));
-
- if(!shadow(Intersection.position, Light.position, LightVertor))
- {
- float Diffuse = glm::dot(Intersection.normal, LightVector);
- if(Diffuse <= 0.0f)
- return Color;
- if(Material.isDiffuse())
- Color += Light.color() * Material.diffuse * Diffuse;
- if(Material.isSpecular())
- {
- glm::vec3 Reflect(glm::reflect(
- glm::normalize(-LightVector),
- glm::normalize(Intersection.normal)));
- float Dot = glm::dot(Reflect, View);
- float Base = Dot > 0.0f ? Dot : 0.0f;
- float Specular = glm::pow(Base, Material.exponent);
- Color += Material.specular * Specular;
- }
- }
- return Color;
-}
-*/
-
-
-template <typename T, glm::precision P, template<typename, glm::precision> class vecType>
-T normalizeDotA(vecType<T, P> const & x, vecType<T, P> const & y)
-{
- return glm::dot(x, y) * glm::inversesqrt(glm::dot(x, x) * glm::dot(y, y));
-}
-
-#define GLM_TEMPLATE_GENTYPE typename T, glm::precision P, template<typename, glm::precision> class
-
-template <GLM_TEMPLATE_GENTYPE vecType>
-T normalizeDotB(vecType<T, P> const & x, vecType<T, P> const & y)
-{
- return glm::dot(x, y) * glm::inversesqrt(glm::dot(x, x) * glm::dot(y, y));
-}
-
-template <typename vecType>
-typename vecType::value_type normalizeDotC(vecType const & a, vecType const & b)
-{
- return glm::dot(a, b) * glm::inversesqrt(glm::dot(a, a) * glm::dot(b, b));
-}
-
-int main()
-{
- glm::vec1 o(1);
- glm::vec2 a(1);
- glm::vec3 b(1);
- glm::vec4 c(1);
-
- glm::quat q;
- glm::dualquat p;
-
- glm::mat4 m(1);
-
- float a0 = normalizeDotA(a, a);
- float b0 = normalizeDotB(b, b);
- float c0 = normalizeDotC(c, c);
-
- return 0;
-}
diff --git a/inc/glm/detail/func_common.hpp b/inc/glm/detail/func_common.hpp deleted file mode 100644 index 26c4c73..0000000 --- a/inc/glm/detail/func_common.hpp +++ /dev/null @@ -1,456 +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 core
-/// @file glm/detail/func_common.hpp
-/// @date 2008-03-08 / 2010-01-26
-/// @author Christophe Riccio
-///
-/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-///
-/// @defgroup core_func_common Common functions
-/// @ingroup core
-///
-/// These all operate component-wise. The description is per component.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "setup.hpp"
-#include "precision.hpp"
-#include "type_int.hpp"
-#include "_fixes.hpp"
-
-namespace glm
-{
- /// @addtogroup core_func_common
- /// @{
-
- /// Returns x if x >= 0; otherwise, it returns -x.
- ///
- /// @tparam genType floating-point or signed integer; scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/abs.xml">GLSL abs man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename genType>
- GLM_FUNC_DECL genType abs(genType x);
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> abs(vecType<T, P> const & x);
-
- /// Returns 1.0 if x > 0, 0.0 if x == 0, or -1.0 if x < 0.
- ///
- /// @tparam genType Floating-point or signed integer; scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/sign.xml">GLSL sign man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> sign(vecType<T, P> const & x);
-
- /// Returns a value equal to the nearest integer that is less then or equal to x.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/floor.xml">GLSL floor man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> floor(vecType<T, P> const & x);
-
- /// Returns a value equal to the nearest integer to x
- /// whose absolute value is not larger than the absolute value of x.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/trunc.xml">GLSL trunc man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> trunc(vecType<T, P> const & x);
-
- /// Returns a value equal to the nearest integer to x.
- /// The fraction 0.5 will round in a direction chosen by the
- /// implementation, presumably the direction that is fastest.
- /// This includes the possibility that round(x) returns the
- /// same value as roundEven(x) for all values of x.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/round.xml">GLSL round man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> round(vecType<T, P> const & x);
-
- /// Returns a value equal to the nearest integer to x.
- /// A fractional part of 0.5 will round toward the nearest even
- /// integer. (Both 3.5 and 4.5 for x will return 4.0.)
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/roundEven.xml">GLSL roundEven man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- /// @see <a href="http://developer.amd.com/documentation/articles/pages/New-Round-to-Even-Technique.aspx">New round to even technique</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> roundEven(vecType<T, P> const & x);
-
- /// Returns a value equal to the nearest integer
- /// that is greater than or equal to x.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/ceil.xml">GLSL ceil man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> ceil(vecType<T, P> const & x);
-
- /// Return x - floor(x).
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/fract.xml">GLSL fract man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename genType>
- GLM_FUNC_DECL genType fract(genType x);
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> fract(vecType<T, P> const & x);
-
- /// Modulus. Returns x - y * floor(x / y)
- /// for each component in x using the floating point value y.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mod.xml">GLSL mod man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename genType>
- GLM_FUNC_DECL genType mod(genType x, genType y);
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> mod(vecType<T, P> const & x, T y);
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> mod(vecType<T, P> const & x, vecType<T, P> const & y);
-
- /// Returns the fractional part of x and sets i to the integer
- /// part (as a whole number floating point value). Both the
- /// return value and the output parameter will have the same
- /// sign as x.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/modf.xml">GLSL modf man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename genType>
- GLM_FUNC_DECL genType modf(genType x, genType & i);
-
- /// Returns y if y < x; otherwise, it returns x.
- ///
- /// @tparam genType Floating-point or integer; scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/min.xml">GLSL min man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename genType>
- GLM_FUNC_DECL genType min(genType x, genType y);
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> min(vecType<T, P> const & x, T y);
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> min(vecType<T, P> const & x, vecType<T, P> const & y);
-
- /// Returns y if x < y; otherwise, it returns x.
- ///
- /// @tparam genType Floating-point or integer; scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/max.xml">GLSL max man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename genType>
- GLM_FUNC_DECL genType max(genType x, genType y);
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> max(vecType<T, P> const & x, T y);
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> max(vecType<T, P> const & x, vecType<T, P> const & y);
-
- /// Returns min(max(x, minVal), maxVal) for each component in x
- /// using the floating-point values minVal and maxVal.
- ///
- /// @tparam genType Floating-point or integer; scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/clamp.xml">GLSL clamp man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename genType>
- GLM_FUNC_DECL genType clamp(genType x, genType minVal, genType maxVal);
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> clamp(vecType<T, P> const & x, T minVal, T maxVal);
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> clamp(vecType<T, P> const & x, vecType<T, P> const & minVal, vecType<T, P> const & maxVal);
-
- /// If genTypeU is a floating scalar or vector:
- /// Returns x * (1.0 - a) + y * a, i.e., the linear blend of
- /// x and y using the floating-point value a.
- /// The value for a is not restricted to the range [0, 1].
- ///
- /// If genTypeU is a boolean scalar or vector:
- /// Selects which vector each returned component comes
- /// from. For a component of <a> that is false, the
- /// corresponding component of x is returned. For a
- /// component of a that is true, the corresponding
- /// component of y is returned. Components of x and y that
- /// are not selected are allowed to be invalid floating point
- /// values and will have no effect on the results. Thus, this
- /// provides different functionality than
- /// genType mix(genType x, genType y, genType(a))
- /// where a is a Boolean vector.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mix.xml">GLSL mix man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- ///
- /// @param[in] x Value to interpolate.
- /// @param[in] y Value to interpolate.
- /// @param[in] a Interpolant.
- ///
- /// @tparam genTypeT Floating point scalar or vector.
- /// @tparam genTypeU Floating point or boolean scalar or vector. It can't be a vector if it is the length of genTypeT.
- ///
- /// @code
- /// #include <glm/glm.hpp>
- /// ...
- /// float a;
- /// bool b;
- /// glm::dvec3 e;
- /// glm::dvec3 f;
- /// glm::vec4 g;
- /// glm::vec4 h;
- /// ...
- /// glm::vec4 r = glm::mix(g, h, a); // Interpolate with a floating-point scalar two vectors.
- /// glm::vec4 s = glm::mix(g, h, b); // Teturns g or h;
- /// glm::dvec3 t = glm::mix(e, f, a); // Types of the third parameter is not required to match with the first and the second.
- /// glm::vec4 u = glm::mix(g, h, r); // Interpolations can be perform per component with a vector for the last parameter.
- /// @endcode
- template <typename T, typename U, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> mix(vecType<T, P> const & x, vecType<T, P> const & y, vecType<U, P> const & a);
-
- template <typename T, typename U, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> mix(vecType<T, P> const & x, vecType<T, P> const & y, U a);
-
- template <typename genTypeT, typename genTypeU>
- GLM_FUNC_DECL genTypeT mix(genTypeT x, genTypeT y, genTypeU a);
-
- /// Returns 0.0 if x < edge, otherwise it returns 1.0 for each component of a genType.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/step.xml">GLSL step man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename genType>
- GLM_FUNC_DECL genType step(genType edge, genType x);
-
- /// Returns 0.0 if x < edge, otherwise it returns 1.0.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/step.xml">GLSL step man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <template <typename, precision> class vecType, typename T, precision P>
- GLM_FUNC_DECL vecType<T, P> step(T edge, vecType<T, P> const & x);
-
- /// Returns 0.0 if x < edge, otherwise it returns 1.0.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/step.xml">GLSL step man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <template <typename, precision> class vecType, typename T, precision P>
- GLM_FUNC_DECL vecType<T, P> step(vecType<T, P> const & edge, vecType<T, P> const & x);
-
- /// Returns 0.0 if x <= edge0 and 1.0 if x >= edge1 and
- /// performs smooth Hermite interpolation between 0 and 1
- /// when edge0 < x < edge1. This is useful in cases where
- /// you would want a threshold function with a smooth
- /// transition. This is equivalent to:
- /// genType t;
- /// t = clamp ((x - edge0) / (edge1 - edge0), 0, 1);
- /// return t * t * (3 - 2 * t);
- /// Results are undefined if edge0 >= edge1.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/smoothstep.xml">GLSL smoothstep man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename genType>
- GLM_FUNC_DECL genType smoothstep(genType edge0, genType edge1, genType x);
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> smoothstep(T edge0, T edge1, vecType<T, P> const & x);
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> smoothstep(vecType<T, P> const & edge0, vecType<T, P> const & edge1, vecType<T, P> const & x);
-
- /// Returns true if x holds a NaN (not a number)
- /// representation in the underlying implementation's set of
- /// floating point representations. Returns false otherwise,
- /// including for implementations with no NaN
- /// representations.
- ///
- /// /!\ When using compiler fast math, this function may fail.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/isnan.xml">GLSL isnan man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<bool, P> isnan(vecType<T, P> const & x);
-
- /// Returns true if x holds a positive infinity or negative
- /// infinity representation in the underlying implementation's
- /// set of floating point representations. Returns false
- /// otherwise, including for implementations with no infinity
- /// representations.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/isinf.xml">GLSL isinf man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<bool, P> isinf(vecType<T, P> const & x);
-
- /// Returns a signed integer value representing
- /// the encoding of a floating-point value. The floating-point
- /// value's bit-level representation is preserved.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/floatBitsToInt.xml">GLSL floatBitsToInt man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- GLM_FUNC_DECL int floatBitsToInt(float const & v);
-
- /// Returns a signed integer value representing
- /// the encoding of a floating-point value. The floatingpoint
- /// value's bit-level representation is preserved.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/floatBitsToInt.xml">GLSL floatBitsToInt man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <template <typename, precision> class vecType, precision P>
- GLM_FUNC_DECL vecType<int, P> floatBitsToInt(vecType<float, P> const & v);
-
- /// Returns a unsigned integer value representing
- /// the encoding of a floating-point value. The floatingpoint
- /// value's bit-level representation is preserved.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/floatBitsToUint.xml">GLSL floatBitsToUint man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- GLM_FUNC_DECL uint floatBitsToUint(float const & v);
-
- /// Returns a unsigned integer value representing
- /// the encoding of a floating-point value. The floatingpoint
- /// value's bit-level representation is preserved.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/floatBitsToUint.xml">GLSL floatBitsToUint man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <template <typename, precision> class vecType, precision P>
- GLM_FUNC_DECL vecType<uint, P> floatBitsToUint(vecType<float, P> const & v);
-
- /// Returns a floating-point value corresponding to a signed
- /// integer encoding of a floating-point value.
- /// If an inf or NaN is passed in, it will not signal, and the
- /// resulting floating point value is unspecified. Otherwise,
- /// the bit-level representation is preserved.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/intBitsToFloat.xml">GLSL intBitsToFloat man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- GLM_FUNC_DECL float intBitsToFloat(int const & v);
-
- /// Returns a floating-point value corresponding to a signed
- /// integer encoding of a floating-point value.
- /// If an inf or NaN is passed in, it will not signal, and the
- /// resulting floating point value is unspecified. Otherwise,
- /// the bit-level representation is preserved.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/intBitsToFloat.xml">GLSL intBitsToFloat man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <template <typename, precision> class vecType, precision P>
- GLM_FUNC_DECL vecType<float, P> intBitsToFloat(vecType<int, P> const & v);
-
- /// Returns a floating-point value corresponding to a
- /// unsigned integer encoding of a floating-point value.
- /// If an inf or NaN is passed in, it will not signal, and the
- /// resulting floating point value is unspecified. Otherwise,
- /// the bit-level representation is preserved.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/uintBitsToFloat.xml">GLSL uintBitsToFloat man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- GLM_FUNC_DECL float uintBitsToFloat(uint const & v);
-
- /// Returns a floating-point value corresponding to a
- /// unsigned integer encoding of a floating-point value.
- /// If an inf or NaN is passed in, it will not signal, and the
- /// resulting floating point value is unspecified. Otherwise,
- /// the bit-level representation is preserved.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/uintBitsToFloat.xml">GLSL uintBitsToFloat man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <template <typename, precision> class vecType, precision P>
- GLM_FUNC_DECL vecType<float, P> uintBitsToFloat(vecType<uint, P> const & v);
-
- /// Computes and returns a * b + c.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/fma.xml">GLSL fma man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename genType>
- GLM_FUNC_DECL genType fma(genType const & a, genType const & b, genType const & c);
-
- /// Splits x into a floating-point significand in the range
- /// [0.5, 1.0) and an integral exponent of two, such that:
- /// x = significand * exp(2, exponent)
- ///
- /// The significand is returned by the function and the
- /// exponent is returned in the parameter exp. For a
- /// floating-point value of zero, the significant and exponent
- /// are both zero. For a floating-point value that is an
- /// infinity or is not a number, the results are undefined.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/frexp.xml">GLSL frexp man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename genType, typename genIType>
- GLM_FUNC_DECL genType frexp(genType const & x, genIType & exp);
-
- /// Builds a floating-point number from x and the
- /// corresponding integral exponent of two in exp, returning:
- /// significand * exp(2, exponent)
- ///
- /// If this product is too large to be represented in the
- /// floating-point type, the result is undefined.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/ldexp.xml">GLSL ldexp man page</a>;
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename genType, typename genIType>
- GLM_FUNC_DECL genType ldexp(genType const & x, genIType const & exp);
-
- /// @}
-}//namespace glm
-
-#include "func_common.inl"
-
diff --git a/inc/glm/detail/func_common.inl b/inc/glm/detail/func_common.inl deleted file mode 100644 index 015ac0d..0000000 --- a/inc/glm/detail/func_common.inl +++ /dev/null @@ -1,758 +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 core
-/// @file glm/detail/func_common.inl
-/// @date 2008-08-03 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#include "func_vector_relational.hpp"
-#include "type_vec2.hpp"
-#include "type_vec3.hpp"
-#include "type_vec4.hpp"
-#include "_vectorize.hpp"
-#include <limits>
-
-namespace glm{
-namespace detail
-{
- template <typename genFIType, bool /*signed*/>
- struct compute_abs
- {};
-
- template <typename genFIType>
- struct compute_abs<genFIType, true>
- {
- GLM_FUNC_QUALIFIER static genFIType call(genFIType x)
- {
- GLM_STATIC_ASSERT(
- std::numeric_limits<genFIType>::is_iec559 || std::numeric_limits<genFIType>::is_signed,
- "'abs' only accept floating-point and integer scalar or vector inputs");
-
- return x >= genFIType(0) ? x : -x;
- // TODO, perf comp with: *(((int *) &x) + 1) &= 0x7fffffff;
- }
- };
-
- template <typename genFIType>
- struct compute_abs<genFIType, false>
- {
- GLM_FUNC_QUALIFIER static genFIType call(genFIType x)
- {
- GLM_STATIC_ASSERT(
- !std::numeric_limits<genFIType>::is_signed && std::numeric_limits<genFIType>::is_integer,
- "'abs' only accept floating-point and integer scalar or vector inputs");
- return x;
- }
- };
-
- template <typename T, typename U, precision P, template <class, precision> class vecType>
- struct compute_mix_vector
- {
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x, vecType<T, P> const & y, vecType<U, P> const & a)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<U>::is_iec559, "'mix' only accept floating-point inputs for the interpolator a");
-
- return vecType<T, P>(vecType<U, P>(x) + a * vecType<U, P>(y - x));
- }
- };
-
- template <typename T, precision P, template <class, precision> class vecType>
- struct compute_mix_vector<T, bool, P, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x, vecType<T, P> const & y, vecType<bool, P> const & a)
- {
- vecType<T, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(x); ++i)
- Result[i] = a[i] ? y[i] : x[i];
- return Result;
- }
- };
-
- template <typename T, typename U, precision P, template <class, precision> class vecType>
- struct compute_mix_scalar
- {
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x, vecType<T, P> const & y, U const & a)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<U>::is_iec559, "'mix' only accept floating-point inputs for the interpolator a");
-
- return vecType<T, P>(vecType<U, P>(x) + a * vecType<U, P>(y - x));
- }
- };
-
- template <typename T, precision P, template <class, precision> class vecType>
- struct compute_mix_scalar<T, bool, P, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x, vecType<T, P> const & y, bool const & a)
- {
- return a ? y : x;
- }
- };
-
- template <typename T, typename U>
- struct compute_mix
- {
- GLM_FUNC_QUALIFIER static T call(T const & x, T const & y, U const & a)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<U>::is_iec559, "'mix' only accept floating-point inputs for the interpolator a");
-
- return static_cast<T>(static_cast<U>(x) + a * static_cast<U>(y - x));
- }
- };
-
- template <typename T>
- struct compute_mix<T, bool>
- {
- GLM_FUNC_QUALIFIER static T call(T const & x, T const & y, bool const & a)
- {
- return a ? y : x;
- }
- };
-
- template <typename T, precision P, template <class, precision> class vecType, bool isFloat = true, bool isSigned = true>
- struct compute_sign
- {
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x)
- {
- return vecType<T, P>(glm::lessThan(vecType<T, P>(0), x)) - vecType<T, P>(glm::lessThan(x, vecType<T, P>(0)));
- }
- };
-
- template <typename T, precision P, template <class, precision> class vecType>
- struct compute_sign<T, P, vecType, false, false>
- {
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x)
- {
- return vecType<T, P>(glm::greaterThan(x , vecType<T, P>(0)));
- }
- };
-
- template <typename T, precision P, template <class, precision> class vecType>
- struct compute_sign<T, P, vecType, false, true>
- {
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x)
- {
- T const Shift(static_cast<T>(sizeof(T) * 8 - 1));
- vecType<T, P> const y(vecType<typename make_unsigned<T>::type, P>(-x) >> typename make_unsigned<T>::type(Shift));
-
- return (x >> Shift) | y;
- }
- };
-
- template <typename T, precision P, template <class, precision> class vecType, typename genType, bool isFloat = true>
- struct compute_mod
- {
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & a, genType const & b)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'mod' only accept floating-point inputs. Include <glm/gtc/integer.hpp> for integer inputs.");
- return a - b * floor(a / b);
- }
- };
-}//namespace detail
-
- // abs
- template <>
- GLM_FUNC_QUALIFIER int32 abs(int32 x)
- {
- int32 const y = x >> 31;
- return (x ^ y) - y;
- }
-
- template <typename genFIType>
- GLM_FUNC_QUALIFIER genFIType abs(genFIType x)
- {
- return detail::compute_abs<genFIType, std::numeric_limits<genFIType>::is_signed>::call(x);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> abs(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(abs, x);
- }
-
- // sign
- // fast and works for any type
- template <typename genFIType>
- GLM_FUNC_QUALIFIER genFIType sign(genFIType x)
- {
- GLM_STATIC_ASSERT(
- std::numeric_limits<genFIType>::is_iec559 || (std::numeric_limits<genFIType>::is_signed && std::numeric_limits<genFIType>::is_integer),
- "'sign' only accept signed inputs");
-
- return detail::compute_sign<genFIType, defaultp, tvec1, std::numeric_limits<genFIType>::is_iec559>::call(tvec1<genFIType>(x)).x;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> sign(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(
- std::numeric_limits<T>::is_iec559 || (std::numeric_limits<T>::is_signed && std::numeric_limits<T>::is_integer),
- "'sign' only accept signed inputs");
-
- return detail::compute_sign<T, P, vecType, std::numeric_limits<T>::is_iec559>::call(x);
- }
-
- // floor
- using ::std::floor;
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> floor(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(floor, x);
- }
-
- // trunc
-# if GLM_HAS_CXX11_STL
- using ::std::trunc;
-# else
- template <typename genType>
- GLM_FUNC_QUALIFIER genType trunc(genType x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'trunc' only accept floating-point inputs");
-
- return x < static_cast<genType>(0) ? -floor(-x) : floor(x);
- }
-# endif
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> trunc(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(trunc, x);
- }
-
- // round
-# if GLM_HAS_CXX11_STL
- using ::std::round;
-# else
- template <typename genType>
- GLM_FUNC_QUALIFIER genType round(genType x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'round' only accept floating-point inputs");
-
- return x < static_cast<genType>(0) ? static_cast<genType>(int(x - static_cast<genType>(0.5))) : static_cast<genType>(int(x + static_cast<genType>(0.5)));
- }
-# endif
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> round(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(round, x);
- }
-
-/*
- // roundEven
- template <typename genType>
- GLM_FUNC_QUALIFIER genType roundEven(genType const& x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'roundEven' only accept floating-point inputs");
-
- return genType(int(x + genType(int(x) % 2)));
- }
-*/
-
- // roundEven
- template <typename genType>
- GLM_FUNC_QUALIFIER genType roundEven(genType x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'roundEven' only accept floating-point inputs");
-
- int Integer = static_cast<int>(x);
- genType IntegerPart = static_cast<genType>(Integer);
- genType FractionalPart = fract(x);
-
- if(FractionalPart > static_cast<genType>(0.5) || FractionalPart < static_cast<genType>(0.5))
- {
- return round(x);
- }
- else if((Integer % 2) == 0)
- {
- return IntegerPart;
- }
- else if(x <= static_cast<genType>(0)) // Work around...
- {
- return IntegerPart - static_cast<genType>(1);
- }
- else
- {
- return IntegerPart + static_cast<genType>(1);
- }
- //else // Bug on MinGW 4.5.2
- //{
- // return mix(IntegerPart + genType(-1), IntegerPart + genType(1), x <= genType(0));
- //}
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> roundEven(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(roundEven, x);
- }
-
- // ceil
- using ::std::ceil;
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> ceil(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(ceil, x);
- }
-
- // fract
- template <typename genType>
- GLM_FUNC_QUALIFIER genType fract(genType x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'fract' only accept floating-point inputs");
-
- return fract(tvec1<genType>(x)).x;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> fract(vecType<T, P> const & x)
- {
- return x - floor(x);
- }
-
- // mod
- template <typename genType>
- GLM_FUNC_QUALIFIER genType mod(genType x, genType y)
- {
- return mod(tvec1<genType>(x), y).x;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> mod(vecType<T, P> const & x, T y)
- {
- return detail::compute_mod<T, P, vecType, T, std::numeric_limits<T>::is_iec559>::call(x, y);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> mod(vecType<T, P> const & x, vecType<T, P> const & y)
- {
- return detail::compute_mod<T, P, vecType, vecType<T, P>, std::numeric_limits<T>::is_iec559>::call(x, y);
- }
-
- // modf
- template <typename genType>
- GLM_FUNC_QUALIFIER genType modf(genType x, genType & i)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'modf' only accept floating-point inputs");
-
- return std::modf(x, &i);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> modf(tvec1<T, P> const & x, tvec1<T, P> & i)
- {
- return tvec1<T, P>(
- modf(x.x, i.x));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> modf(tvec2<T, P> const & x, tvec2<T, P> & i)
- {
- return tvec2<T, P>(
- modf(x.x, i.x),
- modf(x.y, i.y));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> modf(tvec3<T, P> const & x, tvec3<T, P> & i)
- {
- return tvec3<T, P>(
- modf(x.x, i.x),
- modf(x.y, i.y),
- modf(x.z, i.z));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> modf(tvec4<T, P> const & x, tvec4<T, P> & i)
- {
- return tvec4<T, P>(
- modf(x.x, i.x),
- modf(x.y, i.y),
- modf(x.z, i.z),
- modf(x.w, i.w));
- }
-
- //// Only valid if (INT_MIN <= x-y <= INT_MAX)
- //// min(x,y)
- //r = y + ((x - y) & ((x - y) >> (sizeof(int) *
- //CHAR_BIT - 1)));
- //// max(x,y)
- //r = x - ((x - y) & ((x - y) >> (sizeof(int) *
- //CHAR_BIT - 1)));
-
- // min
- template <typename genType>
- GLM_FUNC_QUALIFIER genType min(genType x, genType y)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559 || std::numeric_limits<genType>::is_integer, "'min' only accept floating-point or integer inputs");
-
- return x < y ? x : y;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> min(vecType<T, P> const & a, T b)
- {
- return detail::functor2_vec_sca<T, P, vecType>::call(min, a, b);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> min(vecType<T, P> const & a, vecType<T, P> const & b)
- {
- return detail::functor2<T, P, vecType>::call(min, a, b);
- }
-
- // max
- template <typename genType>
- GLM_FUNC_QUALIFIER genType max(genType x, genType y)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559 || std::numeric_limits<genType>::is_integer, "'max' only accept floating-point or integer inputs");
-
- return x > y ? x : y;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> max(vecType<T, P> const & a, T b)
- {
- return detail::functor2_vec_sca<T, P, vecType>::call(max, a, b);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> max(vecType<T, P> const & a, vecType<T, P> const & b)
- {
- return detail::functor2<T, P, vecType>::call(max, a, b);
- }
-
- // clamp
- template <typename genType>
- GLM_FUNC_QUALIFIER genType clamp(genType x, genType minVal, genType maxVal)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559 || std::numeric_limits<genType>::is_integer, "'clamp' only accept floating-point or integer inputs");
-
- return min(max(x, minVal), maxVal);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> clamp(vecType<T, P> const & x, T minVal, T maxVal)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || std::numeric_limits<T>::is_integer, "'clamp' only accept floating-point or integer inputs");
-
- return min(max(x, minVal), maxVal);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> clamp(vecType<T, P> const & x, vecType<T, P> const & minVal, vecType<T, P> const & maxVal)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || std::numeric_limits<T>::is_integer, "'clamp' only accept floating-point or integer inputs");
-
- return min(max(x, minVal), maxVal);
- }
-
- template <typename genTypeT, typename genTypeU>
- GLM_FUNC_QUALIFIER genTypeT mix(genTypeT x, genTypeT y, genTypeU a)
- {
- return detail::compute_mix<genTypeT, genTypeU>::call(x, y, a);
- }
-
- template <typename T, typename U, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> mix(vecType<T, P> const & x, vecType<T, P> const & y, U a)
- {
- return detail::compute_mix_scalar<T, U, P, vecType>::call(x, y, a);
- }
-
- template <typename T, typename U, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> mix(vecType<T, P> const & x, vecType<T, P> const & y, vecType<U, P> const & a)
- {
- return detail::compute_mix_vector<T, U, P, vecType>::call(x, y, a);
- }
-
- // step
- template <typename genType>
- GLM_FUNC_QUALIFIER genType step(genType edge, genType x)
- {
- return mix(static_cast<genType>(1), static_cast<genType>(0), glm::lessThan(x, edge));
- }
-
- template <template <typename, precision> class vecType, typename T, precision P>
- GLM_FUNC_QUALIFIER vecType<T, P> step(T edge, vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'step' only accept floating-point inputs");
-
- return mix(vecType<T, P>(1), vecType<T, P>(0), glm::lessThan(x, vecType<T, P>(edge)));
- }
-
- template <template <typename, precision> class vecType, typename T, precision P>
- GLM_FUNC_QUALIFIER vecType<T, P> step(vecType<T, P> const & edge, vecType<T, P> const & x)
- {
- return mix(vecType<T, P>(1), vecType<T, P>(0), glm::lessThan(x, edge));
- }
-
- // smoothstep
- template <typename genType>
- GLM_FUNC_QUALIFIER genType smoothstep(genType edge0, genType edge1, genType x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'smoothstep' only accept floating-point inputs");
-
- genType const tmp(clamp((x - edge0) / (edge1 - edge0), genType(0), genType(1)));
- return tmp * tmp * (genType(3) - genType(2) * tmp);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> smoothstep(T edge0, T edge1, vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'smoothstep' only accept floating-point inputs");
-
- vecType<T, P> const tmp(clamp((x - edge0) / (edge1 - edge0), static_cast<T>(0), static_cast<T>(1)));
- return tmp * tmp * (static_cast<T>(3) - static_cast<T>(2) * tmp);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> smoothstep(vecType<T, P> const & edge0, vecType<T, P> const & edge1, vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'smoothstep' only accept floating-point inputs");
-
- vecType<T, P> const tmp(clamp((x - edge0) / (edge1 - edge0), static_cast<T>(0), static_cast<T>(1)));
- return tmp * tmp * (static_cast<T>(3) - static_cast<T>(2) * tmp);
- }
-
-# if GLM_HAS_CXX11_STL
- using std::isnan;
-# else
- template <typename genType>
- GLM_FUNC_QUALIFIER bool isnan(genType x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'isnan' only accept floating-point inputs");
-
-# if GLM_HAS_CXX11_STL
- return std::isnan(x);
-# elif GLM_COMPILER & (GLM_COMPILER_VC | GLM_COMPILER_INTEL)
- return _isnan(x) != 0;
-# elif GLM_COMPILER & (GLM_COMPILER_GCC | (GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM))
-# if GLM_PLATFORM & GLM_PLATFORM_ANDROID && __cplusplus < 201103L
- return _isnan(x) != 0;
-# else
- return std::isnan(x);
-# endif
-# elif GLM_COMPILER & GLM_COMPILER_CUDA
- return isnan(x) != 0;
-# else
- return std::isnan(x);
-# endif
- }
-# endif
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<bool, P> isnan(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isnan' only accept floating-point inputs");
-
- return detail::functor1<bool, T, P, vecType>::call(isnan, x);
- }
-
-# if GLM_HAS_CXX11_STL
- using std::isinf;
-# else
- template <typename genType>
- GLM_FUNC_QUALIFIER bool isinf(genType x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'isinf' only accept floating-point inputs");
-
-# if GLM_HAS_CXX11_STL
- return std::isinf(x);
-# elif GLM_COMPILER & (GLM_COMPILER_INTEL | GLM_COMPILER_VC)
- return _fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF;
-# elif GLM_COMPILER & (GLM_COMPILER_GCC | (GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM))
-# if(GLM_PLATFORM & GLM_PLATFORM_ANDROID && __cplusplus < 201103L)
- return _isinf(x) != 0;
-# else
- return std::isinf(x);
-# endif
-# elif GLM_COMPILER & GLM_COMPILER_CUDA
- // http://developer.download.nvidia.com/compute/cuda/4_2/rel/toolkit/docs/online/group__CUDA__MATH__DOUBLE_g13431dd2b40b51f9139cbb7f50c18fab.html#g13431dd2b40b51f9139cbb7f50c18fab
- return isinf(double(x)) != 0;
-# else
- return std::isinf(x);
-# endif
- }
-# endif
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<bool, P> isinf(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isnan' only accept floating-point inputs");
-
- return detail::functor1<bool, T, P, vecType>::call(isinf, x);
- }
-
- GLM_FUNC_QUALIFIER int floatBitsToInt(float const & v)
- {
- return reinterpret_cast<int&>(const_cast<float&>(v));
- }
-
- template <template <typename, precision> class vecType, precision P>
- GLM_FUNC_QUALIFIER vecType<int, P> floatBitsToInt(vecType<float, P> const & v)
- {
- return reinterpret_cast<vecType<int, P>&>(const_cast<vecType<float, P>&>(v));
- }
-
- GLM_FUNC_QUALIFIER uint floatBitsToUint(float const & v)
- {
- return reinterpret_cast<uint&>(const_cast<float&>(v));
- }
-
- template <template <typename, precision> class vecType, precision P>
- GLM_FUNC_QUALIFIER vecType<uint, P> floatBitsToUint(vecType<float, P> const & v)
- {
- return reinterpret_cast<vecType<uint, P>&>(const_cast<vecType<float, P>&>(v));
- }
-
- GLM_FUNC_QUALIFIER float intBitsToFloat(int const & v)
- {
- return reinterpret_cast<float&>(const_cast<int&>(v));
- }
-
- template <template <typename, precision> class vecType, precision P>
- GLM_FUNC_QUALIFIER vecType<float, P> intBitsToFloat(vecType<int, P> const & v)
- {
- return reinterpret_cast<vecType<float, P>&>(const_cast<vecType<int, P>&>(v));
- }
-
- GLM_FUNC_QUALIFIER float uintBitsToFloat(uint const & v)
- {
- return reinterpret_cast<float&>(const_cast<uint&>(v));
- }
-
- template <template <typename, precision> class vecType, precision P>
- GLM_FUNC_QUALIFIER vecType<float, P> uintBitsToFloat(vecType<uint, P> const & v)
- {
- return reinterpret_cast<vecType<float, P>&>(const_cast<vecType<uint, P>&>(v));
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType fma(genType const & a, genType const & b, genType const & c)
- {
- return a * b + c;
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType frexp(genType x, int & exp)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'frexp' only accept floating-point inputs");
-
- return std::frexp(x, exp);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> frexp(tvec1<T, P> const & x, tvec1<int, P> & exp)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'frexp' only accept floating-point inputs");
-
- return tvec1<T, P>(std::frexp(x.x, exp.x));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> frexp(tvec2<T, P> const & x, tvec2<int, P> & exp)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'frexp' only accept floating-point inputs");
-
- return tvec2<T, P>(
- frexp(x.x, exp.x),
- frexp(x.y, exp.y));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> frexp(tvec3<T, P> const & x, tvec3<int, P> & exp)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'frexp' only accept floating-point inputs");
-
- return tvec3<T, P>(
- frexp(x.x, exp.x),
- frexp(x.y, exp.y),
- frexp(x.z, exp.z));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> frexp(tvec4<T, P> const & x, tvec4<int, P> & exp)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'frexp' only accept floating-point inputs");
-
- return tvec4<T, P>(
- frexp(x.x, exp.x),
- frexp(x.y, exp.y),
- frexp(x.z, exp.z),
- frexp(x.w, exp.w));
- }
-
- template <typename genType, precision P>
- GLM_FUNC_QUALIFIER genType ldexp(genType const & x, int const & exp)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'ldexp' only accept floating-point inputs");
-
- return std::ldexp(x, exp);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> ldexp(tvec1<T, P> const & x, tvec1<int, P> const & exp)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'ldexp' only accept floating-point inputs");
-
- return tvec1<T, P>(
- ldexp(x.x, exp.x));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> ldexp(tvec2<T, P> const & x, tvec2<int, P> const & exp)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'ldexp' only accept floating-point inputs");
-
- return tvec2<T, P>(
- ldexp(x.x, exp.x),
- ldexp(x.y, exp.y));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> ldexp(tvec3<T, P> const & x, tvec3<int, P> const & exp)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'ldexp' only accept floating-point inputs");
-
- return tvec3<T, P>(
- ldexp(x.x, exp.x),
- ldexp(x.y, exp.y),
- ldexp(x.z, exp.z));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> ldexp(tvec4<T, P> const & x, tvec4<int, P> const & exp)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'ldexp' only accept floating-point inputs");
-
- return tvec4<T, P>(
- ldexp(x.x, exp.x),
- ldexp(x.y, exp.y),
- ldexp(x.z, exp.z),
- ldexp(x.w, exp.w));
- }
-}//namespace glm
diff --git a/inc/glm/detail/func_exponential.hpp b/inc/glm/detail/func_exponential.hpp deleted file mode 100644 index c8c88e5..0000000 --- a/inc/glm/detail/func_exponential.hpp +++ /dev/null @@ -1,132 +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 core
-/// @file glm/detail/func_exponential.hpp
-/// @date 2008-08-08 / 2011-06-14
-/// @author Christophe Riccio
-///
-/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2 Exponential Functions</a>
-///
-/// @defgroup core_func_exponential Exponential functions
-/// @ingroup core
-///
-/// These all operate component-wise. The description is per component.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "type_vec1.hpp"
-#include "type_vec2.hpp"
-#include "type_vec3.hpp"
-#include "type_vec4.hpp"
-#include <cmath>
-
-namespace glm
-{
- /// @addtogroup core_func_exponential
- /// @{
-
- /// Returns 'base' raised to the power 'exponent'.
- ///
- /// @param base Floating point value. pow function is defined for input values of 'base' defined in the range (inf-, inf+) in the limit of the type precision.
- /// @param exponent Floating point value representing the 'exponent'.
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/pow.xml">GLSL pow man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2 Exponential Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> pow(vecType<T, P> const & base, vecType<T, P> const & exponent);
-
- /// Returns the natural exponentiation of x, i.e., e^x.
- ///
- /// @param v exp function is defined for input values of v defined in the range (inf-, inf+) in the limit of the type precision.
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/exp.xml">GLSL exp man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2 Exponential Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> exp(vecType<T, P> const & v);
-
- /// Returns the natural logarithm of v, i.e.,
- /// returns the value y which satisfies the equation x = e^y.
- /// Results are undefined if v <= 0.
- ///
- /// @param v log function is defined for input values of v defined in the range (0, inf+) in the limit of the type precision.
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/log.xml">GLSL log man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2 Exponential Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> log(vecType<T, P> const & v);
-
- /// Returns 2 raised to the v power.
- ///
- /// @param v exp2 function is defined for input values of v defined in the range (inf-, inf+) in the limit of the type precision.
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/exp2.xml">GLSL exp2 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2 Exponential Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> exp2(vecType<T, P> const & v);
-
- /// Returns the base 2 log of x, i.e., returns the value y,
- /// which satisfies the equation x = 2 ^ y.
- ///
- /// @param v log2 function is defined for input values of v defined in the range (0, inf+) in the limit of the type precision.
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/log2.xml">GLSL log2 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2 Exponential Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> log2(vecType<T, P> const & v);
-
- /// Returns the positive square root of v.
- ///
- /// @param v sqrt function is defined for input values of v defined in the range [0, inf+) in the limit of the type precision.
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/sqrt.xml">GLSL sqrt man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2 Exponential Functions</a>
- //template <typename genType>
- //GLM_FUNC_DECL genType sqrt(genType const & x);
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> sqrt(vecType<T, P> const & v);
-
- /// Returns the reciprocal of the positive square root of v.
- ///
- /// @param v inversesqrt function is defined for input values of v defined in the range [0, inf+) in the limit of the type precision.
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/inversesqrt.xml">GLSL inversesqrt man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2 Exponential Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> inversesqrt(vecType<T, P> const & v);
-
- /// @}
-}//namespace glm
-
-#include "func_exponential.inl"
diff --git a/inc/glm/detail/func_exponential.inl b/inc/glm/detail/func_exponential.inl deleted file mode 100644 index bbd76a8..0000000 --- a/inc/glm/detail/func_exponential.inl +++ /dev/null @@ -1,161 +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 core
-/// @file glm/detail/func_exponential.inl
-/// @date 2008-08-03 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#include "func_vector_relational.hpp"
-#include "_vectorize.hpp"
-#include <limits>
-#include <cmath>
-#include <cassert>
-
-namespace glm{
-namespace detail
-{
-# if GLM_HAS_CXX11_STL
- using std::log2;
-# else
- template <typename genType>
- genType log2(genType Value)
- {
- return std::log(Value) * static_cast<genType>(1.4426950408889634073599246810019);
- }
-# endif
-
- template <typename T, precision P, template <class, precision> class vecType, bool isFloat = true>
- struct compute_log2
- {
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & vec)
- {
- return detail::functor1<T, T, P, vecType>::call(log2, vec);
- }
- };
-
- template <template <class, precision> class vecType, typename T, precision P>
- struct compute_inversesqrt
- {
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x)
- {
- return static_cast<T>(1) / sqrt(x);
- }
- };
-
- template <template <class, precision> class vecType>
- struct compute_inversesqrt<vecType, float, lowp>
- {
- GLM_FUNC_QUALIFIER static vecType<float, lowp> call(vecType<float, lowp> const & x)
- {
- vecType<float, lowp> tmp(x);
- vecType<float, lowp> xhalf(tmp * 0.5f);
- vecType<uint, lowp>* p = reinterpret_cast<vecType<uint, lowp>*>(const_cast<vecType<float, lowp>*>(&x));
- vecType<uint, lowp> i = vecType<uint, lowp>(0x5f375a86) - (*p >> vecType<uint, lowp>(1));
- vecType<float, lowp>* ptmp = reinterpret_cast<vecType<float, lowp>*>(&i);
- tmp = *ptmp;
- tmp = tmp * (1.5f - xhalf * tmp * tmp);
- return tmp;
- }
- };
-}//namespace detail
-
- // pow
- using std::pow;
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> pow(vecType<T, P> const & base, vecType<T, P> const & exponent)
- {
- return detail::functor2<T, P, vecType>::call(pow, base, exponent);
- }
-
- // exp
- using std::exp;
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> exp(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(exp, x);
- }
-
- // log
- using std::log;
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> log(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(log, x);
- }
-
- //exp2, ln2 = 0.69314718055994530941723212145818f
- template <typename genType>
- GLM_FUNC_QUALIFIER genType exp2(genType x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'exp2' only accept floating-point inputs");
-
- return std::exp(static_cast<genType>(0.69314718055994530941723212145818) * x);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> exp2(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(exp2, x);
- }
-
- // log2, ln2 = 0.69314718055994530941723212145818f
- template <typename genType>
- GLM_FUNC_QUALIFIER genType log2(genType x)
- {
- return log2(tvec1<genType>(x)).x;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> log2(vecType<T, P> const & x)
- {
- return detail::compute_log2<T, P, vecType, std::numeric_limits<T>::is_iec559>::call(x);
- }
-
- // sqrt
- using std::sqrt;
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> sqrt(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'sqrt' only accept floating-point inputs");
- return detail::functor1<T, T, P, vecType>::call(sqrt, x);
- }
-
- // inversesqrt
- template <typename genType>
- GLM_FUNC_QUALIFIER genType inversesqrt(genType x)
- {
- return static_cast<genType>(1) / sqrt(x);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> inversesqrt(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'inversesqrt' only accept floating-point inputs");
- return detail::compute_inversesqrt<vecType, T, P>::call(x);
- }
-}//namespace glm
diff --git a/inc/glm/detail/func_geometric.hpp b/inc/glm/detail/func_geometric.hpp deleted file mode 100644 index 6d97b09..0000000 --- a/inc/glm/detail/func_geometric.hpp +++ /dev/null @@ -1,142 +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 core
-/// @file glm/detail/func_geometric.hpp
-/// @date 2008-08-03 / 2011-06-14
-/// @author Christophe Riccio
-///
-/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5 Geometric Functions</a>
-///
-/// @defgroup core_func_geometric Geometric functions
-/// @ingroup core
-///
-/// These operate on vectors as vectors, not component-wise.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "type_vec3.hpp"
-
-namespace glm
-{
- /// @addtogroup core_func_geometric
- /// @{
-
- /// Returns the length of x, i.e., sqrt(x * x).
- ///
- /// @tparam genType Floating-point vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/length.xml">GLSL length man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5 Geometric Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL T length(
- vecType<T, P> const & x);
-
- /// Returns the distance betwwen p0 and p1, i.e., length(p0 - p1).
- ///
- /// @tparam genType Floating-point vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/distance.xml">GLSL distance man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5 Geometric Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL T distance(
- vecType<T, P> const & p0,
- vecType<T, P> const & p1);
-
- /// Returns the dot product of x and y, i.e., result = x * y.
- ///
- /// @tparam genType Floating-point vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/dot.xml">GLSL dot man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5 Geometric Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL T dot(
- vecType<T, P> const & x,
- vecType<T, P> const & y);
-
- /// Returns the cross product of x and y.
- ///
- /// @tparam valType Floating-point scalar types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/cross.xml">GLSL cross man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5 Geometric Functions</a>
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> cross(
- tvec3<T, P> const & x,
- tvec3<T, P> const & y);
-
- /// Returns a vector in the same direction as x but with length of 1.
- /// According to issue 10 GLSL 1.10 specification, if length(x) == 0 then result is undefined and generate an error.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/normalize.xml">GLSL normalize man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5 Geometric Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> normalize(
- vecType<T, P> const & x);
-
- /// If dot(Nref, I) < 0.0, return N, otherwise, return -N.
- ///
- /// @tparam genType Floating-point vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/faceforward.xml">GLSL faceforward man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5 Geometric Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> faceforward(
- vecType<T, P> const & N,
- vecType<T, P> const & I,
- vecType<T, P> const & Nref);
-
- /// For the incident vector I and surface orientation N,
- /// returns the reflection direction : result = I - 2.0 * dot(N, I) * N.
- ///
- /// @tparam genType Floating-point vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/reflect.xml">GLSL reflect man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5 Geometric Functions</a>
- template <typename genType>
- GLM_FUNC_DECL genType reflect(
- genType const & I,
- genType const & N);
-
- /// For the incident vector I and surface normal N,
- /// and the ratio of indices of refraction eta,
- /// return the refraction vector.
- ///
- /// @tparam genType Floating-point vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/refract.xml">GLSL refract man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5 Geometric Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> refract(
- vecType<T, P> const & I,
- vecType<T, P> const & N,
- T eta);
-
- /// @}
-}//namespace glm
-
-#include "func_geometric.inl"
diff --git a/inc/glm/detail/func_geometric.inl b/inc/glm/detail/func_geometric.inl deleted file mode 100644 index 2d4d50e..0000000 --- a/inc/glm/detail/func_geometric.inl +++ /dev/null @@ -1,201 +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 core
-/// @file glm/detail/func_geometric.inl
-/// @date 2008-08-03 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#include "func_exponential.hpp"
-#include "func_common.hpp"
-#include "type_vec2.hpp"
-#include "type_vec4.hpp"
-#include "type_float.hpp"
-
-namespace glm{
-namespace detail
-{
- template <template <class, precision> class vecType, typename T, precision P>
- struct compute_dot{};
-
- template <typename T, precision P>
- struct compute_dot<tvec1, T, P>
- {
- GLM_FUNC_QUALIFIER static T call(tvec1<T, P> const & a, tvec1<T, P> const & b)
- {
- return a.x * b.x;
- }
- };
-
- template <typename T, precision P>
- struct compute_dot<tvec2, T, P>
- {
- GLM_FUNC_QUALIFIER static T call(tvec2<T, P> const & x, tvec2<T, P> const & y)
- {
- tvec2<T, P> tmp(x * y);
- return tmp.x + tmp.y;
- }
- };
-
- template <typename T, precision P>
- struct compute_dot<tvec3, T, P>
- {
- GLM_FUNC_QUALIFIER static T call(tvec3<T, P> const & x, tvec3<T, P> const & y)
- {
- tvec3<T, P> tmp(x * y);
- return tmp.x + tmp.y + tmp.z;
- }
- };
-
- template <typename T, precision P>
- struct compute_dot<tvec4, T, P>
- {
- GLM_FUNC_QUALIFIER static T call(tvec4<T, P> const & x, tvec4<T, P> const & y)
- {
- tvec4<T, P> tmp(x * y);
- return (tmp.x + tmp.y) + (tmp.z + tmp.w);
- }
- };
-}//namespace detail
-
- // length
- template <typename genType>
- GLM_FUNC_QUALIFIER genType length(genType x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'length' only accept floating-point inputs");
-
- return abs(x);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER T length(vecType<T, P> const & v)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'length' only accept floating-point inputs");
-
- return sqrt(dot(v, v));
- }
-
- // distance
- template <typename genType>
- GLM_FUNC_QUALIFIER genType distance(genType const & p0, genType const & p1)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'distance' only accept floating-point inputs");
-
- return length(p1 - p0);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER T distance(vecType<T, P> const & p0, vecType<T, P> const & p1)
- {
- return length(p1 - p0);
- }
-
- // dot
- template <typename T>
- GLM_FUNC_QUALIFIER T dot(T x, T y)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'dot' only accept floating-point inputs");
- return x * y;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER T dot(vecType<T, P> const & x, vecType<T, P> const & y)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'dot' only accept floating-point inputs");
- return detail::compute_dot<vecType, T, P>::call(x, y);
- }
-
- // cross
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> cross(tvec3<T, P> const & x, tvec3<T, P> const & y)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'cross' only accept floating-point inputs");
-
- return tvec3<T, P>(
- x.y * y.z - y.y * x.z,
- x.z * y.x - y.z * x.x,
- x.x * y.y - y.x * x.y);
- }
-
- // normalize
- template <typename genType>
- GLM_FUNC_QUALIFIER genType normalize(genType const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'normalize' only accept floating-point inputs");
-
- return x < genType(0) ? genType(-1) : genType(1);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> normalize(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'normalize' only accept floating-point inputs");
-
- return x * inversesqrt(dot(x, x));
- }
-
- // faceforward
- template <typename genType>
- GLM_FUNC_QUALIFIER genType faceforward(genType const & N, genType const & I, genType const & Nref)
- {
- return dot(Nref, I) < static_cast<genType>(0) ? N : -N;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> faceforward(vecType<T, P> const & N, vecType<T, P> const & I, vecType<T, P> const & Nref)
- {
- return dot(Nref, I) < static_cast<T>(0) ? N : -N;
- }
-
- // reflect
- template <typename genType>
- GLM_FUNC_QUALIFIER genType reflect(genType const & I, genType const & N)
- {
- return I - N * dot(N, I) * static_cast<genType>(2);
- }
-
- // refract
- template <typename genType>
- GLM_FUNC_QUALIFIER genType refract(genType const & I, genType const & N, genType const & eta)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'refract' only accept floating-point inputs");
-
- genType const dotValue(dot(N, I));
- genType const k(static_cast<genType>(1) - eta * eta * (static_cast<genType>(1) - dotValue * dotValue));
- return (eta * I - (eta * dotValue + sqrt(k)) * N) * static_cast<genType>(k >= static_cast<genType>(0));
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> refract(vecType<T, P> const & I, vecType<T, P> const & N, T eta)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'refract' only accept floating-point inputs");
-
- T const dotValue(dot(N, I));
- T const k(static_cast<T>(1) - eta * eta * (static_cast<T>(1) - dotValue * dotValue));
- return (eta * I - (eta * dotValue + std::sqrt(k)) * N) * static_cast<T>(k >= static_cast<T>(0));
- }
-}//namespace glm
diff --git a/inc/glm/detail/func_integer.hpp b/inc/glm/detail/func_integer.hpp deleted file mode 100644 index 4e2567a..0000000 --- a/inc/glm/detail/func_integer.hpp +++ /dev/null @@ -1,232 +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 core
-/// @file glm/detail/func_integer.hpp
-/// @date 2010-03-17 / 2011-06-18
-/// @author Christophe Riccio
-///
-/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
-///
-/// @defgroup core_func_integer Integer functions
-/// @ingroup core
-///
-/// These all operate component-wise. The description is per component.
-/// The notation [a, b] means the set of bits from bit-number a through bit-number
-/// b, inclusive. The lowest-order bit is bit 0.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "setup.hpp"
-#include "precision.hpp"
-#include "func_common.hpp"
-#include "func_vector_relational.hpp"
-
-namespace glm
-{
- /// @addtogroup core_func_integer
- /// @{
-
- /// Adds 32-bit unsigned integer x and y, returning the sum
- /// modulo pow(2, 32). The value carry is set to 0 if the sum was
- /// less than pow(2, 32), or to 1 otherwise.
- ///
- /// @tparam genUType Unsigned integer scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/uaddCarry.xml">GLSL uaddCarry man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
- template <precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<uint, P> uaddCarry(
- vecType<uint, P> const & x,
- vecType<uint, P> const & y,
- vecType<uint, P> & carry);
-
- /// Subtracts the 32-bit unsigned integer y from x, returning
- /// the difference if non-negative, or pow(2, 32) plus the difference
- /// otherwise. The value borrow is set to 0 if x >= y, or to 1 otherwise.
- ///
- /// @tparam genUType Unsigned integer scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/usubBorrow.xml">GLSL usubBorrow man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
- template <precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<uint, P> usubBorrow(
- vecType<uint, P> const & x,
- vecType<uint, P> const & y,
- vecType<uint, P> & borrow);
-
- /// Multiplies 32-bit integers x and y, producing a 64-bit
- /// result. The 32 least-significant bits are returned in lsb.
- /// The 32 most-significant bits are returned in msb.
- ///
- /// @tparam genUType Unsigned integer scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/umulExtended.xml">GLSL umulExtended man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
- template <precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL void umulExtended(
- vecType<uint, P> const & x,
- vecType<uint, P> const & y,
- vecType<uint, P> & msb,
- vecType<uint, P> & lsb);
-
- /// Multiplies 32-bit integers x and y, producing a 64-bit
- /// result. The 32 least-significant bits are returned in lsb.
- /// The 32 most-significant bits are returned in msb.
- ///
- /// @tparam genIType Signed integer scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/imulExtended.xml">GLSL imulExtended man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
- template <precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL void imulExtended(
- vecType<int, P> const & x,
- vecType<int, P> const & y,
- vecType<int, P> & msb,
- vecType<int, P> & lsb);
-
- /// Extracts bits [offset, offset + bits - 1] from value,
- /// returning them in the least significant bits of the result.
- /// For unsigned data types, the most significant bits of the
- /// result will be set to zero. For signed data types, the
- /// most significant bits will be set to the value of bit offset + base - 1.
- ///
- /// If bits is zero, the result will be zero. The result will be
- /// undefined if offset or bits is negative, or if the sum of
- /// offset and bits is greater than the number of bits used
- /// to store the operand.
- ///
- /// @tparam T Signed or unsigned integer scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/bitfieldExtract.xml">GLSL bitfieldExtract man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> bitfieldExtract(
- vecType<T, P> const & Value,
- int Offset,
- int Bits);
-
- /// Returns the insertion the bits least-significant bits of insert into base.
- ///
- /// The result will have bits [offset, offset + bits - 1] taken
- /// from bits [0, bits - 1] of insert, and all other bits taken
- /// directly from the corresponding bits of base. If bits is
- /// zero, the result will simply be base. The result will be
- /// undefined if offset or bits is negative, or if the sum of
- /// offset and bits is greater than the number of bits used to
- /// store the operand.
- ///
- /// @tparam T Signed or unsigned integer scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/bitfieldInsert.xml">GLSL bitfieldInsert man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> bitfieldInsert(
- vecType<T, P> const & Base,
- vecType<T, P> const & Insert,
- int Offset,
- int Bits);
-
- /// Returns the reversal of the bits of value.
- /// The bit numbered n of the result will be taken from bit (bits - 1) - n of value,
- /// where bits is the total number of bits used to represent value.
- ///
- /// @tparam T Signed or unsigned integer scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/bitfieldReverse.xml">GLSL bitfieldReverse man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> bitfieldReverse(vecType<T, P> const & v);
-
- /// Returns the number of bits set to 1 in the binary representation of value.
- ///
- /// @tparam T Signed or unsigned integer scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/bitCount.xml">GLSL bitCount man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
- template <typename genType>
- GLM_FUNC_DECL int bitCount(genType v);
-
- /// Returns the number of bits set to 1 in the binary representation of value.
- ///
- /// @tparam T Signed or unsigned integer scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/bitCount.xml">GLSL bitCount man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<int, P> bitCount(vecType<T, P> const & v);
-
- /// Returns the bit number of the least significant bit set to
- /// 1 in the binary representation of value.
- /// If value is zero, -1 will be returned.
- ///
- /// @tparam T Signed or unsigned integer scalar types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/findLSB.xml">GLSL findLSB man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
- template <typename genIUType>
- GLM_FUNC_DECL int findLSB(genIUType x);
-
- /// Returns the bit number of the least significant bit set to
- /// 1 in the binary representation of value.
- /// If value is zero, -1 will be returned.
- ///
- /// @tparam T Signed or unsigned integer scalar types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/findLSB.xml">GLSL findLSB man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<int, P> findLSB(vecType<T, P> const & v);
-
- /// Returns the bit number of the most significant bit in the binary representation of value.
- /// For positive integers, the result will be the bit number of the most significant bit set to 1.
- /// For negative integers, the result will be the bit number of the most significant
- /// bit set to 0. For a value of zero or negative one, -1 will be returned.
- ///
- /// @tparam T Signed or unsigned integer scalar types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/findMSB.xml">GLSL findMSB man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
- template <typename genIUType>
- GLM_FUNC_DECL int findMSB(genIUType x);
-
- /// Returns the bit number of the most significant bit in the binary representation of value.
- /// For positive integers, the result will be the bit number of the most significant bit set to 1.
- /// For negative integers, the result will be the bit number of the most significant
- /// bit set to 0. For a value of zero or negative one, -1 will be returned.
- ///
- /// @tparam T Signed or unsigned integer scalar types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/findMSB.xml">GLSL findMSB man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<int, P> findMSB(vecType<T, P> const & v);
-
- /// @}
-}//namespace glm
-
-#include "func_integer.inl"
diff --git a/inc/glm/detail/func_integer.inl b/inc/glm/detail/func_integer.inl deleted file mode 100644 index 5702a15..0000000 --- a/inc/glm/detail/func_integer.inl +++ /dev/null @@ -1,393 +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 core
-/// @file glm/detail/func_integer.inl
-/// @date 2010-03-17 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#include "type_vec2.hpp"
-#include "type_vec3.hpp"
-#include "type_vec4.hpp"
-#include "type_int.hpp"
-#include "_vectorize.hpp"
-#if(GLM_ARCH != GLM_ARCH_PURE)
-#if(GLM_COMPILER & GLM_COMPILER_VC)
-# include <intrin.h>
-# pragma intrinsic(_BitScanReverse)
-#endif//(GLM_COMPILER & GLM_COMPILER_VC)
-#endif//(GLM_ARCH != GLM_ARCH_PURE)
-#include <limits>
-
-namespace glm{
-namespace detail
-{
- template <typename T>
- GLM_FUNC_QUALIFIER T mask(T Bits)
- {
- return Bits >= sizeof(T) * 8 ? ~static_cast<T>(0) : (static_cast<T>(1) << Bits) - static_cast<T>(1);
- }
-
- template <bool EXEC = false>
- struct compute_bitfieldReverseStep
- {
- template <typename T, glm::precision P, template <class, glm::precision> class vecType>
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & v, T, T)
- {
- return v;
- }
- };
-
- template <>
- struct compute_bitfieldReverseStep<true>
- {
- template <typename T, glm::precision P, template <class, glm::precision> class vecType>
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & v, T Mask, T Shift)
- {
- return (v & Mask) << Shift | (v & (~Mask)) >> Shift;
- }
- };
-
- template <bool EXEC = false>
- struct compute_bitfieldBitCountStep
- {
- template <typename T, glm::precision P, template <class, glm::precision> class vecType>
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & v, T, T)
- {
- return v;
- }
- };
-
- template <>
- struct compute_bitfieldBitCountStep<true>
- {
- template <typename T, glm::precision P, template <class, glm::precision> class vecType>
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & v, T Mask, T Shift)
- {
- return (v & Mask) + ((v >> Shift) & Mask);
- }
- };
-
- template <typename genIUType, size_t Bits>
- struct compute_findLSB
- {
- GLM_FUNC_QUALIFIER static int call(genIUType Value)
- {
- if(Value == 0)
- return -1;
-
- return glm::bitCount(~Value & (Value - static_cast<genIUType>(1)));
- }
- };
-
-# if GLM_HAS_BITSCAN_WINDOWS
- template <typename genIUType>
- struct compute_findLSB<genIUType, 32>
- {
- GLM_FUNC_QUALIFIER static int call(genIUType Value)
- {
- unsigned long Result(0);
- unsigned char IsNotNull = _BitScanForward(&Result, *reinterpret_cast<unsigned long*>(&Value));
- return IsNotNull ? int(Result) : -1;
- }
- };
-
-# if !((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_MODEL == GLM_MODEL_32))
- template <typename genIUType>
- struct compute_findLSB<genIUType, 64>
- {
- GLM_FUNC_QUALIFIER static int call(genIUType Value)
- {
- unsigned long Result(0);
- unsigned char IsNotNull = _BitScanForward64(&Result, *reinterpret_cast<unsigned __int64*>(&Value));
- return IsNotNull ? int(Result) : -1;
- }
- };
-# endif
-# endif//GLM_HAS_BITSCAN_WINDOWS
-
- template <typename T, glm::precision P, template <class, glm::precision> class vecType, bool EXEC = true>
- struct compute_findMSB_step_vec
- {
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x, T Shift)
- {
- return x | (x >> Shift);
- }
- };
-
- template <typename T, glm::precision P, template <typename, glm::precision> class vecType>
- struct compute_findMSB_step_vec<T, P, vecType, false>
- {
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x, T)
- {
- return x;
- }
- };
-
- template <typename T, glm::precision P, template <typename, glm::precision> class vecType, int>
- struct compute_findMSB_vec
- {
- GLM_FUNC_QUALIFIER static vecType<int, P> call(vecType<T, P> const & vec)
- {
- vecType<T, P> x(vec);
- x = compute_findMSB_step_vec<T, P, vecType, sizeof(T) * 8 >= 8>::call(x, static_cast<T>( 1));
- x = compute_findMSB_step_vec<T, P, vecType, sizeof(T) * 8 >= 8>::call(x, static_cast<T>( 2));
- x = compute_findMSB_step_vec<T, P, vecType, sizeof(T) * 8 >= 8>::call(x, static_cast<T>( 4));
- x = compute_findMSB_step_vec<T, P, vecType, sizeof(T) * 8 >= 16>::call(x, static_cast<T>( 8));
- x = compute_findMSB_step_vec<T, P, vecType, sizeof(T) * 8 >= 32>::call(x, static_cast<T>(16));
- x = compute_findMSB_step_vec<T, P, vecType, sizeof(T) * 8 >= 64>::call(x, static_cast<T>(32));
- return vecType<int, P>(sizeof(T) * 8 - 1) - glm::bitCount(~x);
- }
- };
-
-# if GLM_HAS_BITSCAN_WINDOWS
- template <typename genIUType>
- GLM_FUNC_QUALIFIER int compute_findMSB_32(genIUType Value)
- {
- unsigned long Result(0);
- unsigned char IsNotNull = _BitScanReverse(&Result, *reinterpret_cast<unsigned long*>(&Value));
- return IsNotNull ? int(Result) : -1;
- }
-
- template <typename T, glm::precision P, template <class, glm::precision> class vecType>
- struct compute_findMSB_vec<T, P, vecType, 32>
- {
- GLM_FUNC_QUALIFIER static vecType<int, P> call(vecType<T, P> const & x)
- {
- return detail::functor1<int, T, P, vecType>::call(compute_findMSB_32, x);
- }
- };
-
-# if !((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_MODEL == GLM_MODEL_32))
- template <typename genIUType>
- GLM_FUNC_QUALIFIER int compute_findMSB_64(genIUType Value)
- {
- unsigned long Result(0);
- unsigned char IsNotNull = _BitScanReverse64(&Result, *reinterpret_cast<unsigned __int64*>(&Value));
- return IsNotNull ? int(Result) : -1;
- }
-
- template <typename T, glm::precision P, template <class, glm::precision> class vecType>
- struct compute_findMSB_vec<T, P, vecType, 64>
- {
- GLM_FUNC_QUALIFIER static vecType<int, P> call(vecType<T, P> const & x)
- {
- return detail::functor1<int, T, P, vecType>::call(compute_findMSB_64, x);
- }
- };
-# endif
-# endif//GLM_HAS_BITSCAN_WINDOWS
-}//namespace detail
-
- // uaddCarry
- GLM_FUNC_QUALIFIER uint uaddCarry(uint const & x, uint const & y, uint & Carry)
- {
- uint64 const Value64(static_cast<uint64>(x) + static_cast<uint64>(y));
- uint64 const Max32((static_cast<uint64>(1) << static_cast<uint64>(32)) - static_cast<uint64>(1));
- Carry = Value64 > Max32 ? 1 : 0;
- return static_cast<uint32>(Value64 % (Max32 + static_cast<uint64>(1)));
- }
-
- template <precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<uint, P> uaddCarry(vecType<uint, P> const & x, vecType<uint, P> const & y, vecType<uint, P> & Carry)
- {
- vecType<uint64, P> Value64(vecType<uint64, P>(x) + vecType<uint64, P>(y));
- vecType<uint64, P> Max32((static_cast<uint64>(1) << static_cast<uint64>(32)) - static_cast<uint64>(1));
- Carry = mix(vecType<uint32, P>(0), vecType<uint32, P>(1), greaterThan(Value64, Max32));
- return vecType<uint32,P>(Value64 % (Max32 + static_cast<uint64>(1)));
- }
-
- // usubBorrow
- GLM_FUNC_QUALIFIER uint usubBorrow(uint const & x, uint const & y, uint & Borrow)
- {
- GLM_STATIC_ASSERT(sizeof(uint) == sizeof(uint32), "uint and uint32 size mismatch");
-
- Borrow = x >= y ? static_cast<uint32>(0) : static_cast<uint32>(1);
- if(y >= x)
- return y - x;
- else
- return static_cast<uint32>((static_cast<int64>(1) << static_cast<int64>(32)) + (static_cast<int64>(y) - static_cast<int64>(x)));
- }
-
- template <precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<uint, P> usubBorrow(vecType<uint, P> const & x, vecType<uint, P> const & y, vecType<uint, P> & Borrow)
- {
- Borrow = mix(vecType<uint, P>(1), vecType<uint, P>(0), greaterThanEqual(x, y));
- vecType<uint, P> const YgeX(y - x);
- vecType<uint, P> const XgeY(vecType<uint32, P>((static_cast<int64>(1) << static_cast<int64>(32)) + (vecType<int64, P>(y) - vecType<int64, P>(x))));
- return mix(XgeY, YgeX, greaterThanEqual(y, x));
- }
-
- // umulExtended
- GLM_FUNC_QUALIFIER void umulExtended(uint const & x, uint const & y, uint & msb, uint & lsb)
- {
- GLM_STATIC_ASSERT(sizeof(uint) == sizeof(uint32), "uint and uint32 size mismatch");
-
- uint64 Value64 = static_cast<uint64>(x) * static_cast<uint64>(y);
- uint32* PointerMSB = (reinterpret_cast<uint32*>(&Value64) + 1);
- msb = *PointerMSB;
- uint32* PointerLSB = (reinterpret_cast<uint32*>(&Value64) + 0);
- lsb = *PointerLSB;
- }
-
- template <precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER void umulExtended(vecType<uint, P> const & x, vecType<uint, P> const & y, vecType<uint, P> & msb, vecType<uint, P> & lsb)
- {
- GLM_STATIC_ASSERT(sizeof(uint) == sizeof(uint32), "uint and uint32 size mismatch");
-
- vecType<uint64, P> Value64(vecType<uint64, P>(x) * vecType<uint64, P>(y));
- msb = vecType<uint32, P>(Value64 >> static_cast<uint64>(32));
- lsb = vecType<uint32, P>(Value64);
- }
-
- // imulExtended
- GLM_FUNC_QUALIFIER void imulExtended(int x, int y, int & msb, int & lsb)
- {
- GLM_STATIC_ASSERT(sizeof(int) == sizeof(int32), "int and int32 size mismatch");
-
- int64 Value64 = static_cast<int64>(x) * static_cast<int64>(y);
- int32* PointerMSB = (reinterpret_cast<int32*>(&Value64) + 1);
- msb = *PointerMSB;
- int32* PointerLSB = (reinterpret_cast<int32*>(&Value64));
- lsb = *PointerLSB;
- }
-
- template <precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER void imulExtended(vecType<int, P> const & x, vecType<int, P> const & y, vecType<int, P> & msb, vecType<int, P> & lsb)
- {
- GLM_STATIC_ASSERT(sizeof(int) == sizeof(int32), "int and int32 size mismatch");
-
- vecType<int64, P> Value64(vecType<int64, P>(x) * vecType<int64, P>(y));
- lsb = vecType<int32, P>(Value64 & static_cast<int64>(0xFFFFFFFF));
- msb = vecType<int32, P>((Value64 >> static_cast<int64>(32)) & static_cast<int64>(0xFFFFFFFF));
- }
-
- // bitfieldExtract
- template <typename genIUType>
- GLM_FUNC_QUALIFIER genIUType bitfieldExtract(genIUType Value, int Offset, int Bits)
- {
- return bitfieldExtract(tvec1<genIUType>(Value), Offset, Bits).x;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> bitfieldExtract(vecType<T, P> const & Value, int Offset, int Bits)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'bitfieldExtract' only accept integer inputs");
-
- return (Value >> static_cast<T>(Offset)) & static_cast<T>(detail::mask(Bits));
- }
-
- // bitfieldInsert
- template <typename genIUType>
- GLM_FUNC_QUALIFIER genIUType bitfieldInsert(genIUType const & Base, genIUType const & Insert, int Offset, int Bits)
- {
- return bitfieldInsert(tvec1<genIUType>(Base), tvec1<genIUType>(Insert), Offset, Bits).x;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> bitfieldInsert(vecType<T, P> const & Base, vecType<T, P> const & Insert, int Offset, int Bits)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'bitfieldInsert' only accept integer values");
-
- T const Mask = static_cast<T>(detail::mask(Bits) << Offset);
- return (Base & ~Mask) | (Insert & Mask);
- }
-
- // bitfieldReverse
- template <typename genType>
- GLM_FUNC_QUALIFIER genType bitfieldReverse(genType x)
- {
- return bitfieldReverse(glm::tvec1<genType, glm::defaultp>(x)).x;
- }
-
- template <typename T, glm::precision P, template <typename, glm::precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> bitfieldReverse(vecType<T, P> const & v)
- {
- vecType<T, P> x(v);
- x = detail::compute_bitfieldReverseStep<sizeof(T) * 8 >= 2>::call(x, T(0x5555555555555555ull), static_cast<T>( 1));
- x = detail::compute_bitfieldReverseStep<sizeof(T) * 8 >= 4>::call(x, T(0x3333333333333333ull), static_cast<T>( 2));
- x = detail::compute_bitfieldReverseStep<sizeof(T) * 8 >= 8>::call(x, T(0x0F0F0F0F0F0F0F0Full), static_cast<T>( 4));
- x = detail::compute_bitfieldReverseStep<sizeof(T) * 8 >= 16>::call(x, T(0x00FF00FF00FF00FFull), static_cast<T>( 8));
- x = detail::compute_bitfieldReverseStep<sizeof(T) * 8 >= 32>::call(x, T(0x0000FFFF0000FFFFull), static_cast<T>(16));
- x = detail::compute_bitfieldReverseStep<sizeof(T) * 8 >= 64>::call(x, T(0x00000000FFFFFFFFull), static_cast<T>(32));
- return x;
- }
-
- // bitCount
- template <typename genType>
- GLM_FUNC_QUALIFIER int bitCount(genType x)
- {
- return bitCount(glm::tvec1<genType, glm::defaultp>(x)).x;
- }
-
- template <typename T, glm::precision P, template <typename, glm::precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<int, P> bitCount(vecType<T, P> const & v)
- {
- vecType<typename detail::make_unsigned<T>::type, P> x(*reinterpret_cast<vecType<typename detail::make_unsigned<T>::type, P> const *>(&v));
- x = detail::compute_bitfieldBitCountStep<sizeof(T) * 8 >= 2>::call(x, typename detail::make_unsigned<T>::type(0x5555555555555555ull), typename detail::make_unsigned<T>::type( 1));
- x = detail::compute_bitfieldBitCountStep<sizeof(T) * 8 >= 4>::call(x, typename detail::make_unsigned<T>::type(0x3333333333333333ull), typename detail::make_unsigned<T>::type( 2));
- x = detail::compute_bitfieldBitCountStep<sizeof(T) * 8 >= 8>::call(x, typename detail::make_unsigned<T>::type(0x0F0F0F0F0F0F0F0Full), typename detail::make_unsigned<T>::type( 4));
- x = detail::compute_bitfieldBitCountStep<sizeof(T) * 8 >= 16>::call(x, typename detail::make_unsigned<T>::type(0x00FF00FF00FF00FFull), typename detail::make_unsigned<T>::type( 8));
- x = detail::compute_bitfieldBitCountStep<sizeof(T) * 8 >= 32>::call(x, typename detail::make_unsigned<T>::type(0x0000FFFF0000FFFFull), typename detail::make_unsigned<T>::type(16));
- x = detail::compute_bitfieldBitCountStep<sizeof(T) * 8 >= 64>::call(x, typename detail::make_unsigned<T>::type(0x00000000FFFFFFFFull), typename detail::make_unsigned<T>::type(32));
- return vecType<int, P>(x);
- }
-
- // findLSB
- template <typename genIUType>
- GLM_FUNC_QUALIFIER int findLSB(genIUType Value)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genIUType>::is_integer, "'findLSB' only accept integer values");
-
- return detail::compute_findLSB<genIUType, sizeof(genIUType) * 8>::call(Value);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<int, P> findLSB(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'findLSB' only accept integer values");
-
- return detail::functor1<int, T, P, vecType>::call(findLSB, x);
- }
-
- // findMSB
- template <typename genIUType>
- GLM_FUNC_QUALIFIER int findMSB(genIUType x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genIUType>::is_integer, "'findMSB' only accept integer values");
-
- return findMSB(tvec1<genIUType>(x)).x;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<int, P> findMSB(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'findMSB' only accept integer values");
-
- return detail::compute_findMSB_vec<T, P, vecType, sizeof(T) * 8>::call(x);
- }
-}//namespace glm
diff --git a/inc/glm/detail/func_matrix.hpp b/inc/glm/detail/func_matrix.hpp deleted file mode 100644 index 0cf164c..0000000 --- a/inc/glm/detail/func_matrix.hpp +++ /dev/null @@ -1,178 +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 core
-/// @file glm/detail/func_matrix.hpp
-/// @date 2008-08-03 / 2011-06-15
-/// @author Christophe Riccio
-///
-/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6 Matrix Functions</a>
-///
-/// @defgroup core_func_matrix Matrix functions
-/// @ingroup core
-///
-/// For each of the following built-in matrix functions, there is both a
-/// single-precision floating point version, where all arguments and return values
-/// are single precision, and a double-precision floating version, where all
-/// arguments and return values are double precision. Only the single-precision
-/// floating point version is shown.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependencies
-#include "../detail/precision.hpp"
-#include "../detail/setup.hpp"
-#include "../detail/type_mat.hpp"
-#include "../vec2.hpp"
-#include "../vec3.hpp"
-#include "../vec4.hpp"
-#include "../mat2x2.hpp"
-#include "../mat2x3.hpp"
-#include "../mat2x4.hpp"
-#include "../mat3x2.hpp"
-#include "../mat3x3.hpp"
-#include "../mat3x4.hpp"
-#include "../mat4x2.hpp"
-#include "../mat4x3.hpp"
-#include "../mat4x4.hpp"
-
-namespace glm{
-namespace detail
-{
- template <typename T, precision P>
- struct outerProduct_trait<T, P, tvec2, tvec2>
- {
- typedef tmat2x2<T, P> type;
- };
-
- template <typename T, precision P>
- struct outerProduct_trait<T, P, tvec2, tvec3>
- {
- typedef tmat2x3<T, P> type;
- };
-
- template <typename T, precision P>
- struct outerProduct_trait<T, P, tvec2, tvec4>
- {
- typedef tmat2x4<T, P> type;
- };
-
- template <typename T, precision P>
- struct outerProduct_trait<T, P, tvec3, tvec2>
- {
- typedef tmat3x2<T, P> type;
- };
-
- template <typename T, precision P>
- struct outerProduct_trait<T, P, tvec3, tvec3>
- {
- typedef tmat3x3<T, P> type;
- };
-
- template <typename T, precision P>
- struct outerProduct_trait<T, P, tvec3, tvec4>
- {
- typedef tmat3x4<T, P> type;
- };
-
- template <typename T, precision P>
- struct outerProduct_trait<T, P, tvec4, tvec2>
- {
- typedef tmat4x2<T, P> type;
- };
-
- template <typename T, precision P>
- struct outerProduct_trait<T, P, tvec4, tvec3>
- {
- typedef tmat4x3<T, P> type;
- };
-
- template <typename T, precision P>
- struct outerProduct_trait<T, P, tvec4, tvec4>
- {
- typedef tmat4x4<T, P> type;
- };
-
-}//namespace detail
-
- /// @addtogroup core_func_matrix
- /// @{
-
- /// Multiply matrix x by matrix y component-wise, i.e.,
- /// result[i][j] is the scalar product of x[i][j] and y[i][j].
- ///
- /// @tparam matType Floating-point matrix types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/matrixCompMult.xml">GLSL matrixCompMult man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6 Matrix Functions</a>
- template <typename T, precision P, template <typename, precision> class matType>
- GLM_FUNC_DECL matType<T, P> matrixCompMult(matType<T, P> const & x, matType<T, P> const & y);
-
- /// Treats the first parameter c as a column vector
- /// and the second parameter r as a row vector
- /// and does a linear algebraic matrix multiply c * r.
- ///
- /// @tparam matType Floating-point matrix types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/outerProduct.xml">GLSL outerProduct man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6 Matrix Functions</a>
- template <typename T, precision P, template <typename, precision> class vecTypeA, template <typename, precision> class vecTypeB>
- GLM_FUNC_DECL typename detail::outerProduct_trait<T, P, vecTypeA, vecTypeB>::type outerProduct(vecTypeA<T, P> const & c, vecTypeB<T, P> const & r);
-
- /// Returns the transposed matrix of x
- ///
- /// @tparam matType Floating-point matrix types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/transpose.xml">GLSL transpose man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6 Matrix Functions</a>
-# if((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2012))
- template <typename T, precision P, template <typename, precision> class matType>
- GLM_FUNC_DECL typename matType<T, P>::transpose_type transpose(matType<T, P> const & x);
-# endif
-
- /// Return the determinant of a squared matrix.
- ///
- /// @tparam valType Floating-point scalar types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/determinant.xml">GLSL determinant man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6 Matrix Functions</a>
- template <typename T, precision P, template <typename, precision> class matType>
- GLM_FUNC_DECL T determinant(matType<T, P> const & m);
-
- /// Return the inverse of a squared matrix.
- ///
- /// @tparam valType Floating-point scalar types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/inverse.xml">GLSL inverse man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6 Matrix Functions</a>
- template <typename T, precision P, template <typename, precision> class matType>
- GLM_FUNC_DECL matType<T, P> inverse(matType<T, P> const & m);
-
- /// @}
-}//namespace glm
-
-#include "func_matrix.inl"
diff --git a/inc/glm/detail/func_matrix.inl b/inc/glm/detail/func_matrix.inl deleted file mode 100644 index b27efbc..0000000 --- a/inc/glm/detail/func_matrix.inl +++ /dev/null @@ -1,310 +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 core
-/// @file glm/detail/func_matrix.inl
-/// @date 2008-03-08 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#include "../geometric.hpp"
-#include <limits>
-
-namespace glm{
-namespace detail
-{
- template <template <class, precision> class matType, typename T, precision P>
- struct compute_transpose{};
-
- template <typename T, precision P>
- struct compute_transpose<tmat2x2, T, P>
- {
- GLM_FUNC_QUALIFIER static tmat2x2<T, P> call(tmat2x2<T, P> const & m)
- {
- tmat2x2<T, P> result(uninitialize);
- result[0][0] = m[0][0];
- result[0][1] = m[1][0];
- result[1][0] = m[0][1];
- result[1][1] = m[1][1];
- return result;
- }
- };
-
- template <typename T, precision P>
- struct compute_transpose<tmat2x3, T, P>
- {
- GLM_FUNC_QUALIFIER static tmat3x2<T, P> call(tmat2x3<T, P> const & m)
- {
- tmat3x2<T, P> result(uninitialize);
- result[0][0] = m[0][0];
- result[0][1] = m[1][0];
- result[1][0] = m[0][1];
- result[1][1] = m[1][1];
- result[2][0] = m[0][2];
- result[2][1] = m[1][2];
- return result;
- }
- };
-
- template <typename T, precision P>
- struct compute_transpose<tmat2x4, T, P>
- {
- GLM_FUNC_QUALIFIER static tmat4x2<T, P> call(tmat2x4<T, P> const & m)
- {
- tmat4x2<T, P> result(uninitialize);
- result[0][0] = m[0][0];
- result[0][1] = m[1][0];
- result[1][0] = m[0][1];
- result[1][1] = m[1][1];
- result[2][0] = m[0][2];
- result[2][1] = m[1][2];
- result[3][0] = m[0][3];
- result[3][1] = m[1][3];
- return result;
- }
- };
-
- template <typename T, precision P>
- struct compute_transpose<tmat3x2, T, P>
- {
- GLM_FUNC_QUALIFIER static tmat2x3<T, P> call(tmat3x2<T, P> const & m)
- {
- tmat2x3<T, P> result(uninitialize);
- result[0][0] = m[0][0];
- result[0][1] = m[1][0];
- result[0][2] = m[2][0];
- result[1][0] = m[0][1];
- result[1][1] = m[1][1];
- result[1][2] = m[2][1];
- return result;
- }
- };
-
- template <typename T, precision P>
- struct compute_transpose<tmat3x3, T, P>
- {
- GLM_FUNC_QUALIFIER static tmat3x3<T, P> call(tmat3x3<T, P> const & m)
- {
- tmat3x3<T, P> result(uninitialize);
- result[0][0] = m[0][0];
- result[0][1] = m[1][0];
- result[0][2] = m[2][0];
-
- result[1][0] = m[0][1];
- result[1][1] = m[1][1];
- result[1][2] = m[2][1];
-
- result[2][0] = m[0][2];
- result[2][1] = m[1][2];
- result[2][2] = m[2][2];
- return result;
- }
- };
-
- template <typename T, precision P>
- struct compute_transpose<tmat3x4, T, P>
- {
- GLM_FUNC_QUALIFIER static tmat4x3<T, P> call(tmat3x4<T, P> const & m)
- {
- tmat4x3<T, P> result(uninitialize);
- result[0][0] = m[0][0];
- result[0][1] = m[1][0];
- result[0][2] = m[2][0];
- result[1][0] = m[0][1];
- result[1][1] = m[1][1];
- result[1][2] = m[2][1];
- result[2][0] = m[0][2];
- result[2][1] = m[1][2];
- result[2][2] = m[2][2];
- result[3][0] = m[0][3];
- result[3][1] = m[1][3];
- result[3][2] = m[2][3];
- return result;
- }
- };
-
- template <typename T, precision P>
- struct compute_transpose<tmat4x2, T, P>
- {
- GLM_FUNC_QUALIFIER static tmat2x4<T, P> call(tmat4x2<T, P> const & m)
- {
- tmat2x4<T, P> result(uninitialize);
- result[0][0] = m[0][0];
- result[0][1] = m[1][0];
- result[0][2] = m[2][0];
- result[0][3] = m[3][0];
- result[1][0] = m[0][1];
- result[1][1] = m[1][1];
- result[1][2] = m[2][1];
- result[1][3] = m[3][1];
- return result;
- }
- };
-
- template <typename T, precision P>
- struct compute_transpose<tmat4x3, T, P>
- {
- GLM_FUNC_QUALIFIER static tmat3x4<T, P> call(tmat4x3<T, P> const & m)
- {
- tmat3x4<T, P> result(uninitialize);
- result[0][0] = m[0][0];
- result[0][1] = m[1][0];
- result[0][2] = m[2][0];
- result[0][3] = m[3][0];
- result[1][0] = m[0][1];
- result[1][1] = m[1][1];
- result[1][2] = m[2][1];
- result[1][3] = m[3][1];
- result[2][0] = m[0][2];
- result[2][1] = m[1][2];
- result[2][2] = m[2][2];
- result[2][3] = m[3][2];
- return result;
- }
- };
-
- template <typename T, precision P>
- struct compute_transpose<tmat4x4, T, P>
- {
- GLM_FUNC_QUALIFIER static tmat4x4<T, P> call(tmat4x4<T, P> const & m)
- {
- tmat4x4<T, P> result(uninitialize);
- result[0][0] = m[0][0];
- result[0][1] = m[1][0];
- result[0][2] = m[2][0];
- result[0][3] = m[3][0];
-
- result[1][0] = m[0][1];
- result[1][1] = m[1][1];
- result[1][2] = m[2][1];
- result[1][3] = m[3][1];
-
- result[2][0] = m[0][2];
- result[2][1] = m[1][2];
- result[2][2] = m[2][2];
- result[2][3] = m[3][2];
-
- result[3][0] = m[0][3];
- result[3][1] = m[1][3];
- result[3][2] = m[2][3];
- result[3][3] = m[3][3];
- return result;
- }
- };
-
- template <template <class, precision> class matType, typename T, precision P>
- struct compute_determinant{};
-
- template <typename T, precision P>
- struct compute_determinant<tmat2x2, T, P>
- {
- GLM_FUNC_QUALIFIER static T call(tmat2x2<T, P> const & m)
- {
- return m[0][0] * m[1][1] - m[1][0] * m[0][1];
- }
- };
-
- template <typename T, precision P>
- struct compute_determinant<tmat3x3, T, P>
- {
- GLM_FUNC_QUALIFIER static T call(tmat3x3<T, P> const & m)
- {
- return
- + m[0][0] * (m[1][1] * m[2][2] - m[2][1] * m[1][2])
- - m[1][0] * (m[0][1] * m[2][2] - m[2][1] * m[0][2])
- + m[2][0] * (m[0][1] * m[1][2] - m[1][1] * m[0][2]);
- }
- };
-
- template <typename T, precision P>
- struct compute_determinant<tmat4x4, T, P>
- {
- GLM_FUNC_QUALIFIER static T call(tmat4x4<T, P> 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];
-
- tvec4<T, P> DetCof(
- + (m[1][1] * SubFactor00 - m[1][2] * SubFactor01 + m[1][3] * SubFactor02),
- - (m[1][0] * SubFactor00 - m[1][2] * SubFactor03 + m[1][3] * SubFactor04),
- + (m[1][0] * SubFactor01 - m[1][1] * SubFactor03 + m[1][3] * SubFactor05),
- - (m[1][0] * SubFactor02 - m[1][1] * SubFactor04 + m[1][2] * SubFactor05));
-
- return
- m[0][0] * DetCof[0] + m[0][1] * DetCof[1] +
- m[0][2] * DetCof[2] + m[0][3] * DetCof[3];
- }
- };
-}//namespace detail
-
- template <typename T, precision P, template <typename, precision> class matType>
- GLM_FUNC_QUALIFIER matType<T, P> matrixCompMult(matType<T, P> const & x, matType<T, P> const & y)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'matrixCompMult' only accept floating-point inputs");
-
- matType<T, P> result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(result); ++i)
- result[i] = x[i] * y[i];
- return result;
- }
-
- template<typename T, precision P, template <typename, precision> class vecTypeA, template <typename, precision> class vecTypeB>
- GLM_FUNC_QUALIFIER typename detail::outerProduct_trait<T, P, vecTypeA, vecTypeB>::type outerProduct(vecTypeA<T, P> const & c, vecTypeB<T, P> const & r)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'outerProduct' only accept floating-point inputs");
-
- typename detail::outerProduct_trait<T, P, vecTypeA, vecTypeB>::type m(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(m); ++i)
- m[i] = c * r[i];
- return m;
- }
-
- template <typename T, precision P, template <typename, precision> class matType>
- GLM_FUNC_QUALIFIER typename matType<T, P>::transpose_type transpose(matType<T, P> const & m)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'transpose' only accept floating-point inputs");
- return detail::compute_transpose<matType, T, P>::call(m);
- }
-
- template <typename T, precision P, template <typename, precision> class matType>
- GLM_FUNC_QUALIFIER T determinant(matType<T, P> const & m)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'determinant' only accept floating-point inputs");
- return detail::compute_determinant<matType, T, P>::call(m);
- }
-
- template <typename T, precision P, template <typename, precision> class matType>
- GLM_FUNC_QUALIFIER matType<T, P> inverse(matType<T, P> const & m)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'inverse' only accept floating-point inputs");
- return detail::compute_inverse(m);
- }
-
-}//namespace glm
diff --git a/inc/glm/detail/func_noise.hpp b/inc/glm/detail/func_noise.hpp deleted file mode 100644 index 9d5680e..0000000 --- a/inc/glm/detail/func_noise.hpp +++ /dev/null @@ -1,93 +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 core
-/// @file glm/detail/func_noise.hpp
-/// @date 2008-08-01 / 2011-06-18
-/// @author Christophe Riccio
-///
-/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.13 Noise Functions</a>
-///
-/// @defgroup core_func_noise Noise functions
-/// @ingroup core
-///
-/// Noise functions are stochastic functions that can be used to increase visual
-/// complexity. Values returned by the following noise functions give the
-/// appearance of randomness, but are not truly random.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "type_vec1.hpp"
-#include "type_vec2.hpp"
-#include "type_vec3.hpp"
-#include "setup.hpp"
-
-namespace glm
-{
- /// @addtogroup core_func_noise
- /// @{
-
- /// Returns a 1D noise value based on the input value x.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/noise1.xml">GLSL noise1 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.13 Noise Functions</a>
- template <typename genType>
- GLM_FUNC_DECL typename genType::value_type noise1(genType const & x);
-
- /// Returns a 2D noise value based on the input value x.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/noise2.xml">GLSL noise2 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.13 Noise Functions</a>
- template <typename genType>
- GLM_FUNC_DECL tvec2<typename genType::value_type, defaultp> noise2(genType const & x);
-
- /// Returns a 3D noise value based on the input value x.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/noise3.xml">GLSL noise3 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.13 Noise Functions</a>
- template <typename genType>
- GLM_FUNC_DECL tvec3<typename genType::value_type, defaultp> noise3(genType const & x);
-
- /// Returns a 4D noise value based on the input value x.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/noise4.xml">GLSL noise4 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.13 Noise Functions</a>
- template <typename genType>
- GLM_FUNC_DECL tvec4<typename genType::value_type, defaultp> noise4(genType const & x);
-
- /// @}
-}//namespace glm
-
-#include "func_noise.inl"
diff --git a/inc/glm/detail/func_noise.inl b/inc/glm/detail/func_noise.inl deleted file mode 100644 index 241e13e..0000000 --- a/inc/glm/detail/func_noise.inl +++ /dev/null @@ -1,388 +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 core
-/// @file glm/detail/func_noise.inl
-/// @date 2008-08-01 / 2011-09-27
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#include "../detail/_noise.hpp"
-#include "./func_common.hpp"
-
-namespace glm{
-namespace detail
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> grad4(T const & j, tvec4<T, P> const & ip)
- {
- tvec3<T, P> pXYZ = floor(fract(tvec3<T, P>(j) * tvec3<T, P>(ip)) * T(7)) * ip[2] - T(1);
- T pW = static_cast<T>(1.5) - dot(abs(pXYZ), tvec3<T, P>(1));
- tvec4<T, P> s = tvec4<T, P>(lessThan(tvec4<T, P>(pXYZ, pW), tvec4<T, P>(0.0)));
- pXYZ = pXYZ + (tvec3<T, P>(s) * T(2) - T(1)) * s.w;
- return tvec4<T, P>(pXYZ, pW);
- }
-}//namespace detail
-
- template <typename T>
- GLM_FUNC_QUALIFIER T noise1(T const & x)
- {
- return noise1(tvec2<T, defaultp>(x, T(0)));
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tvec2<T, defaultp> noise2(T const & x)
- {
- return tvec2<T, defaultp>(
- noise1(x + T(0.0)),
- noise1(x + T(1.0)));
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tvec3<T, defaultp> noise3(T const & x)
- {
- return tvec3<T, defaultp>(
- noise1(x - T(1.0)),
- noise1(x + T(0.0)),
- noise1(x + T(1.0)));
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tvec4<T, defaultp> noise4(T const & x)
- {
- return tvec4<T, defaultp>(
- noise1(x - T(1.0)),
- noise1(x + T(0.0)),
- noise1(x + T(1.0)),
- noise1(x + T(2.0)));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T noise1(tvec2<T, P> const & v)
- {
- tvec4<T, P> const C = tvec4<T, P>(
- 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<T, P> i = floor(v + dot(v, tvec2<T, P>(C[1])));
- tvec2<T, P> x0 = v - i + dot(i, tvec2<T, P>(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<T, P> i1 = (x0.x > x0.y) ? tvec2<T, P>(1, 0) : tvec2<T, P>(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<T, P> x12 = tvec4<T, P>(x0.x, x0.y, x0.x, x0.y) + tvec4<T, P>(C.x, C.x, C.z, C.z);
- x12 = tvec4<T, P>(tvec2<T, P>(x12) - i1, x12.z, x12.w);
-
- // Permutations
- i = mod(i, T(289)); // Avoid truncation effects in permutation
- tvec3<T, P> p = detail::permute(
- detail::permute(i.y + tvec3<T, P>(T(0), i1.y, T(1))) + i.x + tvec3<T, P>(T(0), i1.x, T(1)));
-
- tvec3<T, P> m = max(T(0.5) - tvec3<T, P>(
- dot(x0, x0),
- dot(tvec2<T, P>(x12.x, x12.y), tvec2<T, P>(x12.x, x12.y)),
- dot(tvec2<T, P>(x12.z, x12.w), tvec2<T, P>(x12.z, x12.w))), T(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<T, P> x = static_cast<T>(2) * fract(p * C.w) - T(1);
- tvec3<T, P> h = abs(x) - T(0.5);
- tvec3<T, P> ox = floor(x + T(0.5));
- tvec3<T, P> a0 = x - ox;
-
- // Normalise gradients implicitly by scaling m
- // Inlined for speed: m *= taylorInvSqrt( a0*a0 + h*h );
- m *= static_cast<T>(1.79284291400159) - T(0.85373472095314) * (a0 * a0 + h * h);
-
- // Compute final noise value at P
- tvec3<T, P> 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 <typename T, precision P>
- GLM_FUNC_QUALIFIER T noise1(tvec3<T, P> const & v)
- {
- tvec2<T, P> const C(1.0 / 6.0, 1.0 / 3.0);
- tvec4<T, P> const D(0.0, 0.5, 1.0, 2.0);
-
- // First corner
- tvec3<T, P> i(floor(v + dot(v, tvec3<T, P>(C.y))));
- tvec3<T, P> x0(v - i + dot(i, tvec3<T, P>(C.x)));
-
- // Other corners
- tvec3<T, P> g(step(tvec3<T, P>(x0.y, x0.z, x0.x), x0));
- tvec3<T, P> l(T(1) - g);
- tvec3<T, P> i1(min(g, tvec3<T, P>(l.z, l.x, l.y)));
- tvec3<T, P> i2(max(g, tvec3<T, P>(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<T, P> x1(x0 - i1 + C.x);
- tvec3<T, P> x2(x0 - i2 + C.y); // 2.0*C.x = 1/3 = C.y
- tvec3<T, P> x3(x0 - D.y); // -1.0+3.0*C.x = -0.5 = -D.y
-
- // Permutations
- i = mod289(i);
- tvec4<T, P> p(detail::permute(detail::permute(detail::permute(
- i.z + tvec4<T, P>(T(0), i1.z, i2.z, T(1))) +
- i.y + tvec4<T, P>(T(0), i1.y, i2.y, T(1))) +
- i.x + tvec4<T, P>(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<T>(0.142857142857); // 1.0/7.0
- tvec3<T, P> ns(n_ * tvec3<T, P>(D.w, D.y, D.z) - tvec3<T, P>(D.x, D.z, D.x));
-
- tvec4<T, P> j(p - T(49) * floor(p * ns.z * ns.z)); // mod(p,7*7)
-
- tvec4<T, P> x_(floor(j * ns.z));
- tvec4<T, P> y_(floor(j - T(7) * x_)); // mod(j,N)
-
- tvec4<T, P> x(x_ * ns.x + ns.y);
- tvec4<T, P> y(y_ * ns.x + ns.y);
- tvec4<T, P> h(T(1) - abs(x) - abs(y));
-
- tvec4<T, P> b0(x.x, x.y, y.x, y.y);
- tvec4<T, P> 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<T, P> s0(floor(b0) * T(2) + T(1));
- tvec4<T, P> s1(floor(b1) * T(2) + T(1));
- tvec4<T, P> sh(-step(h, tvec4<T, P>(0.0)));
-
- tvec4<T, P> a0 = tvec4<T, P>(b0.x, b0.z, b0.y, b0.w) + tvec4<T, P>(s0.x, s0.z, s0.y, s0.w) * tvec4<T, P>(sh.x, sh.x, sh.y, sh.y);
- tvec4<T, P> a1 = tvec4<T, P>(b1.x, b1.z, b1.y, b1.w) + tvec4<T, P>(s1.x, s1.z, s1.y, s1.w) * tvec4<T, P>(sh.z, sh.z, sh.w, sh.w);
-
- tvec3<T, P> p0(a0.x, a0.y, h.x);
- tvec3<T, P> p1(a0.z, a0.w, h.y);
- tvec3<T, P> p2(a1.x, a1.y, h.z);
- tvec3<T, P> p3(a1.z, a1.w, h.w);
-
- // Normalise gradients
- tvec4<T, P> norm = taylorInvSqrt(tvec4<T, P>(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<T, P> m = max(T(0.6) - tvec4<T, P>(dot(x0, x0), dot(x1, x1), dot(x2, x2), dot(x3, x3)), T(0));
- m = m * m;
- return T(42) * dot(m * m, tvec4<T, P>(dot(p0, x0), dot(p1, x1), dot(p2, x2), dot(p3, x3)));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T noise1(tvec4<T, P> const & v)
- {
- tvec4<T, P> 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<T>(0.309016994374947451);
-
- // First corner
- tvec4<T, P> i = floor(v + dot(v, tvec4<T, P>(F4)));
- tvec4<T, P> x0 = v - i + dot(i, tvec4<T, P>(C.x));
-
- // Other corners
-
- // Rank sorting originally contributed by Bill Licea-Kane, AMD (formerly ATI)
- tvec4<T, P> i0;
- tvec3<T, P> isX = step(tvec3<T, P>(x0.y, x0.z, x0.w), tvec3<T, P>(x0.x));
- tvec3<T, P> isYZ = step(tvec3<T, P>(x0.z, x0.w, x0.w), tvec3<T, P>(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<T>(1) - isX;
- i0 = tvec4<T, P>(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<T, P>(isYZ.x, isYZ.y);
- i0.z += static_cast<T>(1) - isYZ.x;
- i0.w += static_cast<T>(1) - isYZ.y;
- i0.z += isYZ.z;
- i0.w += static_cast<T>(1) - isYZ.z;
-
- // i0 now contains the unique values 0,1,2,3 in each channel
- tvec4<T, P> i3 = clamp(i0, T(0), T(1));
- tvec4<T, P> i2 = clamp(i0 - T(1), T(0), T(1));
- tvec4<T, P> 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<T, P> x1 = x0 - i1 + C.x;
- tvec4<T, P> x2 = x0 - i2 + C.y;
- tvec4<T, P> x3 = x0 - i3 + C.z;
- tvec4<T, P> x4 = x0 + C.w;
-
- // Permutations
- i = mod(i, T(289));
- T j0 = detail::permute(detail::permute(detail::permute(detail::permute(i.w) + i.z) + i.y) + i.x);
- tvec4<T, P> j1 = detail::permute(detail::permute(detail::permute(detail::permute(
- i.w + tvec4<T, P>(i1.w, i2.w, i3.w, T(1))) +
- i.z + tvec4<T, P>(i1.z, i2.z, i3.z, T(1))) +
- i.y + tvec4<T, P>(i1.y, i2.y, i3.y, T(1))) +
- i.x + tvec4<T, P>(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<T, P> ip = tvec4<T, P>(T(1) / T(294), T(1) / T(49), T(1) / T(7), T(0));
-
- tvec4<T, P> p0 = detail::grad4(j0, ip);
- tvec4<T, P> p1 = detail::grad4(j1.x, ip);
- tvec4<T, P> p2 = detail::grad4(j1.y, ip);
- tvec4<T, P> p3 = detail::grad4(j1.z, ip);
- tvec4<T, P> p4 = detail::grad4(j1.w, ip);
-
- // Normalise gradients
- tvec4<T, P> norm = detail::taylorInvSqrt(tvec4<T, P>(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 *= taylorInvSqrt(dot(p4, p4));
-
- // Mix contributions from the five corners
- tvec3<T, P> m0 = max(T(0.6) - tvec3<T, P>(dot(x0, x0), dot(x1, x1), dot(x2, x2)), T(0));
- tvec2<T, P> m1 = max(T(0.6) - tvec2<T, P>(dot(x3, x3), dot(x4, x4) ), T(0));
- m0 = m0 * m0;
- m1 = m1 * m1;
-
- return T(49) * (
- dot(m0 * m0, tvec3<T, P>(dot(p0, x0), dot(p1, x1), dot(p2, x2))) +
- dot(m1 * m1, tvec2<T, P>(dot(p3, x3), dot(p4, x4))));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> noise2(tvec2<T, P> const & x)
- {
- return tvec2<T, P>(
- noise1(x + tvec2<T, P>(0.0)),
- noise1(tvec2<T, P>(0.0) - x));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> noise2(tvec3<T, P> const & x)
- {
- return tvec2<T, P>(
- noise1(x + tvec3<T, P>(0.0)),
- noise1(tvec3<T, P>(0.0) - x));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> noise2(tvec4<T, P> const & x)
- {
- return tvec2<T, P>(
- noise1(x + tvec4<T, P>(0)),
- noise1(tvec4<T, P>(0) - x));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> noise3(tvec2<T, P> const & x)
- {
- return tvec3<T, P>(
- noise1(x - tvec2<T, P>(1.0)),
- noise1(x + tvec2<T, P>(0.0)),
- noise1(x + tvec2<T, P>(1.0)));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> noise3(tvec3<T, P> const & x)
- {
- return tvec3<T, P>(
- noise1(x - tvec3<T, P>(1.0)),
- noise1(x + tvec3<T, P>(0.0)),
- noise1(x + tvec3<T, P>(1.0)));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> noise3(tvec4<T, P> const & x)
- {
- return tvec3<T, P>(
- noise1(x - tvec4<T, P>(1)),
- noise1(x + tvec4<T, P>(0)),
- noise1(x + tvec4<T, P>(1)));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> noise4(tvec2<T, P> const & x)
- {
- return tvec4<T, P>(
- noise1(x - tvec2<T, P>(1)),
- noise1(x + tvec2<T, P>(0)),
- noise1(x + tvec2<T, P>(1)),
- noise1(x + tvec2<T, P>(2)));
- }
-
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> noise4(tvec3<T, P> const & x)
- {
- return tvec4<T, P>(
- noise1(x - tvec3<T, P>(1)),
- noise1(x + tvec3<T, P>(0)),
- noise1(x + tvec3<T, P>(1)),
- noise1(x + tvec3<T, P>(2)));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> noise4(tvec4<T, P> const & x)
- {
- return tvec4<T, P>(
- noise1(x - tvec4<T, P>(1)),
- noise1(x + tvec4<T, P>(0)),
- noise1(x + tvec4<T, P>(1)),
- noise1(x + tvec4<T, P>(2)));
- }
-
-}//namespace glm
diff --git a/inc/glm/detail/func_packing.hpp b/inc/glm/detail/func_packing.hpp deleted file mode 100644 index 38347d3..0000000 --- a/inc/glm/detail/func_packing.hpp +++ /dev/null @@ -1,197 +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 core
-/// @file glm/detail/func_packing.hpp
-/// @date 2010-03-17 / 2011-06-15
-/// @author Christophe Riccio
-///
-/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
-/// @see gtc_packing
-///
-/// @defgroup core_func_packing Floating-Point Pack and Unpack Functions
-/// @ingroup core
-///
-/// These functions do not operate component-wise, rather as described in each case.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "type_vec2.hpp"
-#include "type_vec4.hpp"
-
-namespace glm
-{
- /// @addtogroup core_func_packing
- /// @{
-
- /// First, converts each component of the normalized floating-point value v into 8- or 16-bit 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:
- /// packUnorm2x16: 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/packUnorm2x16.xml">GLSL packUnorm2x16 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- GLM_FUNC_DECL uint packUnorm2x16(vec2 const & v);
-
- /// First, converts each component of the normalized floating-point value v into 8- or 16-bit 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:
- /// packSnorm2x16: round(clamp(v, -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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/packSnorm2x16.xml">GLSL packSnorm2x16 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- GLM_FUNC_DECL uint packSnorm2x16(vec2 const & v);
-
- /// First, converts each component of the normalized floating-point value v into 8- or 16-bit 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:
- /// packUnorm4x8: 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/packUnorm4x8.xml">GLSL packUnorm4x8 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- GLM_FUNC_DECL uint packUnorm4x8(vec4 const & v);
-
- /// First, converts each component of the normalized floating-point value v into 8- or 16-bit 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:
- /// packSnorm4x8: 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/packSnorm4x8.xml">GLSL packSnorm4x8 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- GLM_FUNC_DECL uint packSnorm4x8(vec4 const & v);
-
- /// First, unpacks a single 32-bit unsigned integer p into a pair of 16-bit unsigned integers, four 8-bit unsigned integers, or four 8-bit signed integers.
- /// Then, each component is converted to a normalized floating-point value to generate the returned two- or four-component vector.
- ///
- /// The conversion for unpacked fixed-point value f to floating point is done as follows:
- /// unpackUnorm2x16: 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/unpackUnorm2x16.xml">GLSL unpackUnorm2x16 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- GLM_FUNC_DECL vec2 unpackUnorm2x16(uint p);
-
- /// First, unpacks a single 32-bit unsigned integer p into a pair of 16-bit unsigned integers, four 8-bit unsigned integers, or four 8-bit signed integers.
- /// Then, each component is converted to a normalized floating-point value to generate the returned two- or four-component vector.
- ///
- /// The conversion for unpacked fixed-point value f to floating point is done as follows:
- /// unpackSnorm2x16: 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/unpackSnorm2x16.xml">GLSL unpackSnorm2x16 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- GLM_FUNC_DECL vec2 unpackSnorm2x16(uint p);
-
- /// First, unpacks a single 32-bit unsigned integer p into a pair of 16-bit unsigned integers, four 8-bit unsigned integers, or four 8-bit signed integers.
- /// Then, each component is converted to a normalized floating-point value to generate the returned two- or four-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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/unpackUnorm4x8.xml">GLSL unpackUnorm4x8 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- GLM_FUNC_DECL vec4 unpackUnorm4x8(uint p);
-
- /// First, unpacks a single 32-bit unsigned integer p into a pair of 16-bit unsigned integers, four 8-bit unsigned integers, or four 8-bit signed integers.
- /// Then, each component is converted to a normalized floating-point value to generate the returned two- or four-component vector.
- ///
- /// The conversion for unpacked fixed-point value f to floating point is done as follows:
- /// unpackSnorm4x8: 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/unpackSnorm4x8.xml">GLSL unpackSnorm4x8 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- GLM_FUNC_DECL vec4 unpackSnorm4x8(uint p);
-
- /// Returns a double-precision value obtained by packing the components of v into a 64-bit value.
- /// If an IEEE 754 Inf or NaN is created, it will not signal, and the resulting floating point value is unspecified.
- /// Otherwise, the bit- level representation of v is preserved.
- /// The first vector component specifies the 32 least significant bits;
- /// the second component specifies the 32 most significant bits.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/packDouble2x32.xml">GLSL packDouble2x32 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- GLM_FUNC_DECL double packDouble2x32(uvec2 const & v);
-
- /// Returns a two-component unsigned integer vector representation of v.
- /// The bit-level representation of v is preserved.
- /// The first component of the vector contains the 32 least significant bits of the double;
- /// the second component consists the 32 most significant bits.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/unpackDouble2x32.xml">GLSL unpackDouble2x32 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- GLM_FUNC_DECL uvec2 unpackDouble2x32(double v);
-
- /// Returns an unsigned integer obtained by converting the components of a two-component floating-point vector
- /// to the 16-bit floating-point representation found in the OpenGL Specification,
- /// and then packing these two 16- bit integers into a 32-bit unsigned integer.
- /// The first vector component specifies the 16 least-significant bits of the result;
- /// the second component specifies the 16 most-significant bits.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/packHalf2x16.xml">GLSL packHalf2x16 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- GLM_FUNC_DECL uint packHalf2x16(vec2 const & v);
-
- /// Returns a two-component floating-point vector with components obtained by unpacking a 32-bit unsigned integer into a pair of 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 second component is obtained from the 16 most-significant bits of v.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/unpackHalf2x16.xml">GLSL unpackHalf2x16 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- GLM_FUNC_DECL vec2 unpackHalf2x16(uint v);
-
- /// @}
-}//namespace glm
-
-#include "func_packing.inl"
diff --git a/inc/glm/detail/func_packing.inl b/inc/glm/detail/func_packing.inl deleted file mode 100644 index f853e4d..0000000 --- a/inc/glm/detail/func_packing.inl +++ /dev/null @@ -1,119 +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 core
-/// @file glm/detail/func_packing.inl
-/// @date 2010-03-17 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#include "func_common.hpp"
-#include "type_half.hpp"
-#include "../fwd.hpp"
-
-namespace glm
-{
- GLM_FUNC_QUALIFIER uint packUnorm2x16(vec2 const & v)
- {
- u16vec2 const Topack(round(clamp(v, 0.0f, 1.0f) * 65535.0f));
- return reinterpret_cast<uint const &>(Topack);
- }
-
- GLM_FUNC_QUALIFIER vec2 unpackUnorm2x16(uint p)
- {
- vec2 Unpack(reinterpret_cast<u16vec2 const &>(p));
- return Unpack * float(1.5259021896696421759365224689097e-5); // 1.0 / 65535.0
- }
-
- GLM_FUNC_QUALIFIER uint packSnorm2x16(vec2 const & v)
- {
- i16vec2 const Topack(round(clamp(v ,-1.0f, 1.0f) * 32767.0f));
- return reinterpret_cast<uint const &>(Topack);
- }
-
- GLM_FUNC_QUALIFIER vec2 unpackSnorm2x16(uint p)
- {
- vec2 const Unpack(reinterpret_cast<i16vec2 const &>(p));
- return clamp(
- Unpack * 3.0518509475997192297128208258309e-5f, //1.0f / 32767.0f,
- -1.0f, 1.0f);
- }
-
- GLM_FUNC_QUALIFIER uint packUnorm4x8(vec4 const & v)
- {
- u8vec4 const Topack(round(clamp(v, 0.0f, 1.0f) * 255.0f));
- return reinterpret_cast<uint const &>(Topack);
- }
-
- GLM_FUNC_QUALIFIER vec4 unpackUnorm4x8(uint p)
- {
- vec4 const Unpack(reinterpret_cast<u8vec4 const&>(p));
- return Unpack * float(0.0039215686274509803921568627451); // 1 / 255
- }
-
- GLM_FUNC_QUALIFIER uint packSnorm4x8(vec4 const & v)
- {
- i8vec4 const Topack(round(clamp(v ,-1.0f, 1.0f) * 127.0f));
- return reinterpret_cast<uint const &>(Topack);
- }
-
- GLM_FUNC_QUALIFIER glm::vec4 unpackSnorm4x8(uint p)
- {
- vec4 const Unpack(reinterpret_cast<i8vec4 const &>(p));
- return clamp(
- Unpack * 0.0078740157480315f, // 1.0f / 127.0f
- -1.0f, 1.0f);
- }
-
- GLM_FUNC_QUALIFIER double packDouble2x32(uvec2 const & v)
- {
- return reinterpret_cast<double const &>(v);
- }
-
- GLM_FUNC_QUALIFIER uvec2 unpackDouble2x32(double v)
- {
- return reinterpret_cast<uvec2 const &>(v);
- }
-
- GLM_FUNC_QUALIFIER uint packHalf2x16(vec2 const & v)
- {
- i16vec2 const Unpack(
- detail::toFloat16(v.x),
- detail::toFloat16(v.y));
-
- return reinterpret_cast<uint const &>(Unpack);
- }
-
- GLM_FUNC_QUALIFIER vec2 unpackHalf2x16(uint v)
- {
- i16vec2 const Unpack(reinterpret_cast<i16vec2 const &>(v));
-
- return vec2(
- detail::toFloat32(Unpack.x),
- detail::toFloat32(Unpack.y));
- }
-}//namespace glm
-
diff --git a/inc/glm/detail/func_trigonometric.hpp b/inc/glm/detail/func_trigonometric.hpp deleted file mode 100644 index d4d6090..0000000 --- a/inc/glm/detail/func_trigonometric.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 core
-/// @file glm/detail/func_trigonometric.hpp
-/// @date 2008-08-01 / 2011-06-15
-/// @author Christophe Riccio
-///
-/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
-///
-/// @defgroup core_func_trigonometric Angle and Trigonometry Functions
-/// @ingroup core
-///
-/// Function parameters specified as angle are assumed to be in units of radians.
-/// In no case will any of these functions result in a divide by zero error. If
-/// the divisor of a ratio is 0, then results will be undefined.
-///
-/// These all operate component-wise. The description is per component.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "setup.hpp"
-#include "precision.hpp"
-
-namespace glm
-{
- /// @addtogroup core_func_trigonometric
- /// @{
-
- /// Converts degrees to radians and returns the result.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/radians.xml">GLSL radians man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> radians(vecType<T, P> const & degrees);
-
- /// Converts radians to degrees and returns the result.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/degrees.xml">GLSL degrees man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> degrees(vecType<T, P> const & radians);
-
- /// The standard trigonometric sine function.
- /// The values returned by this function will range from [-1, 1].
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/sin.xml">GLSL sin man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> sin(vecType<T, P> const & angle);
-
- /// The standard trigonometric cosine function.
- /// The values returned by this function will range from [-1, 1].
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/cos.xml">GLSL cos man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> cos(vecType<T, P> const & angle);
-
- /// The standard trigonometric tangent function.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/tan.xml">GLSL tan man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> tan(vecType<T, P> const & angle);
-
- /// Arc sine. Returns an angle whose sine is x.
- /// The range of values returned by this function is [-PI/2, PI/2].
- /// Results are undefined if |x| > 1.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/asin.xml">GLSL asin man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> asin(vecType<T, P> const & x);
-
- /// Arc cosine. Returns an angle whose sine is x.
- /// The range of values returned by this function is [0, PI].
- /// Results are undefined if |x| > 1.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/acos.xml">GLSL acos man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> acos(vecType<T, P> const & x);
-
- /// Arc tangent. Returns an angle whose tangent is y/x.
- /// The signs of x and y are used to determine what
- /// quadrant the angle is in. The range of values returned
- /// by this function is [-PI, PI]. Results are undefined
- /// if x and y are both 0.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/atan.xml">GLSL atan man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> atan(vecType<T, P> const & y, vecType<T, P> const & x);
-
- /// Arc tangent. Returns an angle whose tangent is y_over_x.
- /// The range of values returned by this function is [-PI/2, PI/2].
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/atan.xml">GLSL atan man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> atan(vecType<T, P> const & y_over_x);
-
- /// Returns the hyperbolic sine function, (exp(x) - exp(-x)) / 2
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/sinh.xml">GLSL sinh man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> sinh(vecType<T, P> const & angle);
-
- /// Returns the hyperbolic cosine function, (exp(x) + exp(-x)) / 2
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/cosh.xml">GLSL cosh man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> cosh(vecType<T, P> const & angle);
-
- /// Returns the hyperbolic tangent function, sinh(angle) / cosh(angle)
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/tanh.xml">GLSL tanh man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> tanh(vecType<T, P> const & angle);
-
- /// Arc hyperbolic sine; returns the inverse of sinh.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/asinh.xml">GLSL asinh man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> asinh(vecType<T, P> const & x);
-
- /// Arc hyperbolic cosine; returns the non-negative inverse
- /// of cosh. Results are undefined if x < 1.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/acosh.xml">GLSL acosh man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> acosh(vecType<T, P> const & x);
-
- /// Arc hyperbolic tangent; returns the inverse of tanh.
- /// Results are undefined if abs(x) >= 1.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/atanh.xml">GLSL atanh man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> atanh(vecType<T, P> const & x);
-
- /// @}
-}//namespace glm
-
-#include "func_trigonometric.inl"
diff --git a/inc/glm/detail/func_trigonometric.inl b/inc/glm/detail/func_trigonometric.inl deleted file mode 100644 index 8f9c20d..0000000 --- a/inc/glm/detail/func_trigonometric.inl +++ /dev/null @@ -1,224 +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 core
-/// @file glm/detail/func_trigonometric.inl
-/// @date 2008-08-03 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#include "_vectorize.hpp"
-#include <cmath>
-#include <limits>
-
-namespace glm
-{
- // radians
- template <typename genType>
- GLM_FUNC_QUALIFIER genType radians(genType degrees)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'radians' only accept floating-point input");
-
- return degrees * static_cast<genType>(0.01745329251994329576923690768489);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> radians(vecType<T, P> const & v)
- {
- return detail::functor1<T, T, P, vecType>::call(radians, v);
- }
-
- // degrees
- template <typename genType>
- GLM_FUNC_QUALIFIER genType degrees(genType radians)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'degrees' only accept floating-point input");
-
- return radians * static_cast<genType>(57.295779513082320876798154814105);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> degrees(vecType<T, P> const & v)
- {
- return detail::functor1<T, T, P, vecType>::call(degrees, v);
- }
-
- // sin
- using ::std::sin;
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> sin(vecType<T, P> const & v)
- {
- return detail::functor1<T, T, P, vecType>::call(sin, v);
- }
-
- // cos
- using std::cos;
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> cos(vecType<T, P> const & v)
- {
- return detail::functor1<T, T, P, vecType>::call(cos, v);
- }
-
- // tan
- using std::tan;
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> tan(vecType<T, P> const & v)
- {
- return detail::functor1<T, T, P, vecType>::call(tan, v);
- }
-
- // asin
- using std::asin;
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> asin(vecType<T, P> const & v)
- {
- return detail::functor1<T, T, P, vecType>::call(asin, v);
- }
-
- // acos
- using std::acos;
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> acos(vecType<T, P> const & v)
- {
- return detail::functor1<T, T, P, vecType>::call(acos, v);
- }
-
- // atan
- template <typename genType>
- GLM_FUNC_QUALIFIER genType atan(genType const & y, genType const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'atan' only accept floating-point input");
-
- return ::std::atan2(y, x);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> atan(vecType<T, P> const & a, vecType<T, P> const & b)
- {
- return detail::functor2<T, P, vecType>::call(atan2, a, b);
- }
-
- using std::atan;
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> atan(vecType<T, P> const & v)
- {
- return detail::functor1<T, T, P, vecType>::call(atan, v);
- }
-
- // sinh
- using std::sinh;
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> sinh(vecType<T, P> const & v)
- {
- return detail::functor1<T, T, P, vecType>::call(sinh, v);
- }
-
- // cosh
- using std::cosh;
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> cosh(vecType<T, P> const & v)
- {
- return detail::functor1<T, T, P, vecType>::call(cosh, v);
- }
-
- // tanh
- using std::tanh;
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> tanh(vecType<T, P> const & v)
- {
- return detail::functor1<T, T, P, vecType>::call(tanh, v);
- }
-
- // asinh
-# if GLM_HAS_CXX11_STL
- using std::asinh;
-# else
- template <typename genType>
- GLM_FUNC_QUALIFIER genType asinh(genType const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'asinh' only accept floating-point input");
-
- return (x < static_cast<genType>(0) ? static_cast<genType>(-1) : (x > static_cast<genType>(0) ? static_cast<genType>(1) : static_cast<genType>(0))) * log(abs(x) + sqrt(static_cast<genType>(1) + x * x));
- }
-# endif
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> asinh(vecType<T, P> const & v)
- {
- return detail::functor1<T, T, P, vecType>::call(asinh, v);
- }
-
- // acosh
-# if GLM_HAS_CXX11_STL
- using std::acosh;
-# else
- template <typename genType>
- GLM_FUNC_QUALIFIER genType acosh(genType const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'acosh' only accept floating-point input");
-
- if(x < static_cast<genType>(1))
- return static_cast<genType>(0);
- return log(x + sqrt(x * x - static_cast<genType>(1)));
- }
-# endif
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> acosh(vecType<T, P> const & v)
- {
- return detail::functor1<T, T, P, vecType>::call(acosh, v);
- }
-
- // atanh
-# if GLM_HAS_CXX11_STL
- using std::atanh;
-# else
- template <typename genType>
- GLM_FUNC_QUALIFIER genType atanh(genType const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'atanh' only accept floating-point input");
-
- if(abs(x) >= static_cast<genType>(1))
- return 0;
- return static_cast<genType>(0.5) * log((static_cast<genType>(1) + x) / (static_cast<genType>(1) - x));
- }
-# endif
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> atanh(vecType<T, P> const & v)
- {
- return detail::functor1<T, T, P, vecType>::call(atanh, v);
- }
-}//namespace glm
diff --git a/inc/glm/detail/func_vector_relational.hpp b/inc/glm/detail/func_vector_relational.hpp deleted file mode 100644 index 73a0ef5..0000000 --- a/inc/glm/detail/func_vector_relational.hpp +++ /dev/null @@ -1,140 +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 core
-/// @file glm/detail/func_vector_relational.hpp
-/// @date 2008-08-03 / 2011-06-15
-/// @author Christophe Riccio
-///
-/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7 Vector Relational Functions</a>
-///
-/// @defgroup core_func_vector_relational Vector Relational Functions
-/// @ingroup core
-///
-/// Relational and equality operators (<, <=, >, >=, ==, !=) are defined to
-/// operate on scalars and produce scalar Boolean results. For vector results,
-/// use the following built-in functions.
-///
-/// In all cases, the sizes of all the input and return vectors for any particular
-/// call must match.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "precision.hpp"
-#include "setup.hpp"
-
-namespace glm
-{
- /// @addtogroup core_func_vector_relational
- /// @{
-
- /// Returns the component-wise comparison result of x < y.
- ///
- /// @tparam vecType Floating-point or integer vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/lessThan.xml">GLSL lessThan man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7 Vector Relational Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<bool, P> lessThan(vecType<T, P> const & x, vecType<T, P> const & y);
-
- /// Returns the component-wise comparison of result x <= y.
- ///
- /// @tparam vecType Floating-point or integer vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/lessThanEqual.xml">GLSL lessThanEqual man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7 Vector Relational Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<bool, P> lessThanEqual(vecType<T, P> const & x, vecType<T, P> const & y);
-
- /// Returns the component-wise comparison of result x > y.
- ///
- /// @tparam vecType Floating-point or integer vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/greaterThan.xml">GLSL greaterThan man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7 Vector Relational Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<bool, P> greaterThan(vecType<T, P> const & x, vecType<T, P> const & y);
-
- /// Returns the component-wise comparison of result x >= y.
- ///
- /// @tparam vecType Floating-point or integer vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/greaterThanEqual.xml">GLSL greaterThanEqual man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7 Vector Relational Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<bool, P> greaterThanEqual(vecType<T, P> const & x, vecType<T, P> const & y);
-
- /// Returns the component-wise comparison of result x == y.
- ///
- /// @tparam vecType Floating-point, integer or boolean vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/equal.xml">GLSL equal man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7 Vector Relational Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<bool, P> equal(vecType<T, P> const & x, vecType<T, P> const & y);
-
- /// Returns the component-wise comparison of result x != y.
- ///
- /// @tparam vecType Floating-point, integer or boolean vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/notEqual.xml">GLSL notEqual man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7 Vector Relational Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<bool, P> notEqual(vecType<T, P> const & x, vecType<T, P> const & y);
-
- /// Returns true if any component of x is true.
- ///
- /// @tparam vecType Boolean vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/any.xml">GLSL any man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7 Vector Relational Functions</a>
- template <precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL bool any(vecType<bool, P> const & v);
-
- /// Returns true if all components of x are true.
- ///
- /// @tparam vecType Boolean vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/all.xml">GLSL all man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7 Vector Relational Functions</a>
- template <precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL bool all(vecType<bool, P> const & v);
-
- /// Returns the component-wise logical complement of x.
- /// /!\ Because of language incompatibilities between C++ and GLSL, GLM defines the function not but not_ instead.
- ///
- /// @tparam vecType Boolean vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/not.xml">GLSL not man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7 Vector Relational Functions</a>
- template <precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<bool, P> not_(vecType<bool, P> const & v);
-
- /// @}
-}//namespace glm
-
-#include "func_vector_relational.inl"
diff --git a/inc/glm/detail/func_vector_relational.inl b/inc/glm/detail/func_vector_relational.inl deleted file mode 100644 index ac88c49..0000000 --- a/inc/glm/detail/func_vector_relational.inl +++ /dev/null @@ -1,131 +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 core
-/// @file glm/detail/func_vector_relational.inl
-/// @date 2008-08-03 / 2011-09-09
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#include <limits>
-
-namespace glm
-{
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<bool, P> lessThan(vecType<T, P> const & x, vecType<T, P> const & y)
- {
- assert(detail::component_count(x) == detail::component_count(y));
-
- vecType<bool, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(x); ++i)
- Result[i] = x[i] < y[i];
-
- return Result;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<bool, P> lessThanEqual(vecType<T, P> const & x, vecType<T, P> const & y)
- {
- assert(detail::component_count(x) == detail::component_count(y));
-
- vecType<bool, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(x); ++i)
- Result[i] = x[i] <= y[i];
- return Result;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<bool, P> greaterThan(vecType<T, P> const & x, vecType<T, P> const & y)
- {
- assert(detail::component_count(x) == detail::component_count(y));
-
- vecType<bool, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(x); ++i)
- Result[i] = x[i] > y[i];
- return Result;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<bool, P> greaterThanEqual(vecType<T, P> const & x, vecType<T, P> const & y)
- {
- assert(detail::component_count(x) == detail::component_count(y));
-
- vecType<bool, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(x); ++i)
- Result[i] = x[i] >= y[i];
- return Result;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<bool, P> equal(vecType<T, P> const & x, vecType<T, P> const & y)
- {
- assert(detail::component_count(x) == detail::component_count(y));
-
- vecType<bool, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(x); ++i)
- Result[i] = x[i] == y[i];
- return Result;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<bool, P> notEqual(vecType<T, P> const & x, vecType<T, P> const & y)
- {
- assert(detail::component_count(x) == detail::component_count(y));
-
- vecType<bool, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(x); ++i)
- Result[i] = x[i] != y[i];
- return Result;
- }
-
- template <precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER bool any(vecType<bool, P> const & v)
- {
- bool Result = false;
- for(detail::component_count_t i = 0; i < detail::component_count(v); ++i)
- Result = Result || v[i];
- return Result;
- }
-
- template <precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER bool all(vecType<bool, P> const & v)
- {
- bool Result = true;
- for(detail::component_count_t i = 0; i < detail::component_count(v); ++i)
- Result = Result && v[i];
- return Result;
- }
-
- template <precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<bool, P> not_(vecType<bool, P> const & v)
- {
- vecType<bool, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(v); ++i)
- Result[i] = !v[i];
- return Result;
- }
-}//namespace glm
-
diff --git a/inc/glm/detail/glm.cpp b/inc/glm/detail/glm.cpp deleted file mode 100644 index 47c7479..0000000 --- a/inc/glm/detail/glm.cpp +++ /dev/null @@ -1,286 +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 core
-/// @file glm/glm.cpp
-/// @date 2013-04-22 / 2013-04-22
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#include <glm/glm.hpp>
-#include <glm/gtc/quaternion.hpp>
-#include <glm/gtx/dual_quaternion.hpp>
-
-namespace glm
-{
-// tvec1 type explicit instantiation
-template struct tvec1<uint8, lowp>;
-template struct tvec1<uint16, lowp>;
-template struct tvec1<uint32, lowp>;
-template struct tvec1<uint64, lowp>;
-template struct tvec1<int8, lowp>;
-template struct tvec1<int16, lowp>;
-template struct tvec1<int32, lowp>;
-template struct tvec1<int64, lowp>;
-template struct tvec1<float32, lowp>;
-template struct tvec1<float64, lowp>;
-
-template struct tvec1<uint8, mediump>;
-template struct tvec1<uint16, mediump>;
-template struct tvec1<uint32, mediump>;
-template struct tvec1<uint64, mediump>;
-template struct tvec1<int8, mediump>;
-template struct tvec1<int16, mediump>;
-template struct tvec1<int32, mediump>;
-template struct tvec1<int64, mediump>;
-template struct tvec1<float32, mediump>;
-template struct tvec1<float64, mediump>;
-
-template struct tvec1<uint8, highp>;
-template struct tvec1<uint16, highp>;
-template struct tvec1<uint32, highp>;
-template struct tvec1<uint64, highp>;
-template struct tvec1<int8, highp>;
-template struct tvec1<int16, highp>;
-template struct tvec1<int32, highp>;
-template struct tvec1<int64, highp>;
-template struct tvec1<float32, highp>;
-template struct tvec1<float64, highp>;
-
-// tvec2 type explicit instantiation
-template struct tvec2<uint8, lowp>;
-template struct tvec2<uint16, lowp>;
-template struct tvec2<uint32, lowp>;
-template struct tvec2<uint64, lowp>;
-template struct tvec2<int8, lowp>;
-template struct tvec2<int16, lowp>;
-template struct tvec2<int32, lowp>;
-template struct tvec2<int64, lowp>;
-template struct tvec2<float32, lowp>;
-template struct tvec2<float64, lowp>;
-
-template struct tvec2<uint8, mediump>;
-template struct tvec2<uint16, mediump>;
-template struct tvec2<uint32, mediump>;
-template struct tvec2<uint64, mediump>;
-template struct tvec2<int8, mediump>;
-template struct tvec2<int16, mediump>;
-template struct tvec2<int32, mediump>;
-template struct tvec2<int64, mediump>;
-template struct tvec2<float32, mediump>;
-template struct tvec2<float64, mediump>;
-
-template struct tvec2<uint8, highp>;
-template struct tvec2<uint16, highp>;
-template struct tvec2<uint32, highp>;
-template struct tvec2<uint64, highp>;
-template struct tvec2<int8, highp>;
-template struct tvec2<int16, highp>;
-template struct tvec2<int32, highp>;
-template struct tvec2<int64, highp>;
-template struct tvec2<float32, highp>;
-template struct tvec2<float64, highp>;
-
-// tvec3 type explicit instantiation
-template struct tvec3<uint8, lowp>;
-template struct tvec3<uint16, lowp>;
-template struct tvec3<uint32, lowp>;
-template struct tvec3<uint64, lowp>;
-template struct tvec3<int8, lowp>;
-template struct tvec3<int16, lowp>;
-template struct tvec3<int32, lowp>;
-template struct tvec3<int64, lowp>;
-template struct tvec3<float32, lowp>;
-template struct tvec3<float64, lowp>;
-
-template struct tvec3<uint8, mediump>;
-template struct tvec3<uint16, mediump>;
-template struct tvec3<uint32, mediump>;
-template struct tvec3<uint64, mediump>;
-template struct tvec3<int8, mediump>;
-template struct tvec3<int16, mediump>;
-template struct tvec3<int32, mediump>;
-template struct tvec3<int64, mediump>;
-template struct tvec3<float32, mediump>;
-template struct tvec3<float64, mediump>;
-
-template struct tvec3<uint8, highp>;
-template struct tvec3<uint16, highp>;
-template struct tvec3<uint32, highp>;
-template struct tvec3<uint64, highp>;
-template struct tvec3<int8, highp>;
-template struct tvec3<int16, highp>;
-template struct tvec3<int32, highp>;
-template struct tvec3<int64, highp>;
-template struct tvec3<float32, highp>;
-template struct tvec3<float64, highp>;
-
-// tvec4 type explicit instantiation
-template struct tvec4<uint8, lowp>;
-template struct tvec4<uint16, lowp>;
-template struct tvec4<uint32, lowp>;
-template struct tvec4<uint64, lowp>;
-template struct tvec4<int8, lowp>;
-template struct tvec4<int16, lowp>;
-template struct tvec4<int32, lowp>;
-template struct tvec4<int64, lowp>;
-template struct tvec4<float32, lowp>;
-template struct tvec4<float64, lowp>;
-
-template struct tvec4<uint8, mediump>;
-template struct tvec4<uint16, mediump>;
-template struct tvec4<uint32, mediump>;
-template struct tvec4<uint64, mediump>;
-template struct tvec4<int8, mediump>;
-template struct tvec4<int16, mediump>;
-template struct tvec4<int32, mediump>;
-template struct tvec4<int64, mediump>;
-template struct tvec4<float32, mediump>;
-template struct tvec4<float64, mediump>;
-
-template struct tvec4<uint8, highp>;
-template struct tvec4<uint16, highp>;
-template struct tvec4<uint32, highp>;
-template struct tvec4<uint64, highp>;
-template struct tvec4<int8, highp>;
-template struct tvec4<int16, highp>;
-template struct tvec4<int32, highp>;
-template struct tvec4<int64, highp>;
-template struct tvec4<float32, highp>;
-template struct tvec4<float64, highp>;
-
-// tmat2x2 type explicit instantiation
-template struct tmat2x2<float32, lowp>;
-template struct tmat2x2<float64, lowp>;
-
-template struct tmat2x2<float32, mediump>;
-template struct tmat2x2<float64, mediump>;
-
-template struct tmat2x2<float32, highp>;
-template struct tmat2x2<float64, highp>;
-
-// tmat2x3 type explicit instantiation
-template struct tmat2x3<float32, lowp>;
-template struct tmat2x3<float64, lowp>;
-
-template struct tmat2x3<float32, mediump>;
-template struct tmat2x3<float64, mediump>;
-
-template struct tmat2x3<float32, highp>;
-template struct tmat2x3<float64, highp>;
-
-// tmat2x4 type explicit instantiation
-template struct tmat2x4<float32, lowp>;
-template struct tmat2x4<float64, lowp>;
-
-template struct tmat2x4<float32, mediump>;
-template struct tmat2x4<float64, mediump>;
-
-template struct tmat2x4<float32, highp>;
-template struct tmat2x4<float64, highp>;
-
-// tmat3x2 type explicit instantiation
-template struct tmat3x2<float32, lowp>;
-template struct tmat3x2<float64, lowp>;
-
-template struct tmat3x2<float32, mediump>;
-template struct tmat3x2<float64, mediump>;
-
-template struct tmat3x2<float32, highp>;
-template struct tmat3x2<float64, highp>;
-
-// tmat3x3 type explicit instantiation
-template struct tmat3x3<float32, lowp>;
-template struct tmat3x3<float64, lowp>;
-
-template struct tmat3x3<float32, mediump>;
-template struct tmat3x3<float64, mediump>;
-
-template struct tmat3x3<float32, highp>;
-template struct tmat3x3<float64, highp>;
-
-// tmat3x4 type explicit instantiation
-template struct tmat3x4<float32, lowp>;
-template struct tmat3x4<float64, lowp>;
-
-template struct tmat3x4<float32, mediump>;
-template struct tmat3x4<float64, mediump>;
-
-template struct tmat3x4<float32, highp>;
-template struct tmat3x4<float64, highp>;
-
-// tmat4x2 type explicit instantiation
-template struct tmat4x2<float32, lowp>;
-template struct tmat4x2<float64, lowp>;
-
-template struct tmat4x2<float32, mediump>;
-template struct tmat4x2<float64, mediump>;
-
-template struct tmat4x2<float32, highp>;
-template struct tmat4x2<float64, highp>;
-
-// tmat4x3 type explicit instantiation
-template struct tmat4x3<float32, lowp>;
-template struct tmat4x3<float64, lowp>;
-
-template struct tmat4x3<float32, mediump>;
-template struct tmat4x3<float64, mediump>;
-
-template struct tmat4x3<float32, highp>;
-template struct tmat4x3<float64, highp>;
-
-// tmat4x4 type explicit instantiation
-template struct tmat4x4<float32, lowp>;
-template struct tmat4x4<float64, lowp>;
-
-template struct tmat4x4<float32, mediump>;
-template struct tmat4x4<float64, mediump>;
-
-template struct tmat4x4<float32, highp>;
-template struct tmat4x4<float64, highp>;
-
-// tquat type explicit instantiation
-template struct tquat<float32, lowp>;
-template struct tquat<float64, lowp>;
-
-template struct tquat<float32, mediump>;
-template struct tquat<float64, mediump>;
-
-template struct tquat<float32, highp>;
-template struct tquat<float64, highp>;
-
-//tdualquat type explicit instantiation
-template struct tdualquat<float32, lowp>;
-template struct tdualquat<float64, lowp>;
-
-template struct tdualquat<float32, mediump>;
-template struct tdualquat<float64, mediump>;
-
-template struct tdualquat<float32, highp>;
-template struct tdualquat<float64, highp>;
-
-}//namespace glm
-
diff --git a/inc/glm/detail/intrinsic_common.hpp b/inc/glm/detail/intrinsic_common.hpp deleted file mode 100644 index 54911e3..0000000 --- a/inc/glm/detail/intrinsic_common.hpp +++ /dev/null @@ -1,87 +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.
-///
-/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-/// THE SOFTWARE.
-///
-/// @ref core
-/// @file glm/detail/intrinsic_common.hpp
-/// @date 2009-05-11 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "setup.hpp"
-
-#if(!(GLM_ARCH & GLM_ARCH_SSE2))
-# error "SSE2 instructions not supported or enabled"
-#else
-
-namespace glm{
-namespace detail
-{
- __m128 sse_abs_ps(__m128 x);
-
- __m128 sse_sgn_ps(__m128 x);
-
- //floor
- __m128 sse_flr_ps(__m128 v);
-
- //trunc
- __m128 sse_trc_ps(__m128 v);
-
- //round
- __m128 sse_nd_ps(__m128 v);
-
- //roundEven
- __m128 sse_rde_ps(__m128 v);
-
- __m128 sse_rnd_ps(__m128 x);
-
- __m128 sse_ceil_ps(__m128 v);
-
- __m128 sse_frc_ps(__m128 x);
-
- __m128 sse_mod_ps(__m128 x, __m128 y);
-
- __m128 sse_modf_ps(__m128 x, __m128i & i);
-
- //GLM_FUNC_QUALIFIER __m128 sse_min_ps(__m128 x, __m128 y)
-
- //GLM_FUNC_QUALIFIER __m128 sse_max_ps(__m128 x, __m128 y)
-
- __m128 sse_clp_ps(__m128 v, __m128 minVal, __m128 maxVal);
-
- __m128 sse_mix_ps(__m128 v1, __m128 v2, __m128 a);
-
- __m128 sse_stp_ps(__m128 edge, __m128 x);
-
- __m128 sse_ssp_ps(__m128 edge0, __m128 edge1, __m128 x);
-
- __m128 sse_nan_ps(__m128 x);
-
- __m128 sse_inf_ps(__m128 x);
-
-}//namespace detail
-}//namespace glm
-
-#include "intrinsic_common.inl"
-
-#endif//GLM_ARCH
diff --git a/inc/glm/detail/intrinsic_common.inl b/inc/glm/detail/intrinsic_common.inl deleted file mode 100644 index 2c2f5d0..0000000 --- a/inc/glm/detail/intrinsic_common.inl +++ /dev/null @@ -1,313 +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.
-///
-/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-/// THE SOFTWARE.
-///
-/// @ref core
-/// @file glm/detail/intrinsic_common.inl
-/// @date 2009-05-08 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm{
-namespace detail{
-
-#if(GLM_COMPILER & GLM_COMPILER_VC)
-#pragma warning(push)
-#pragma warning(disable : 4510 4512 4610)
-#endif
-
- union ieee754_QNAN
- {
- const float f;
- struct i
- {
- const unsigned int mantissa:23, exp:8, sign:1;
- };
-
- ieee754_QNAN() : f(0.0)/*, mantissa(0x7FFFFF), exp(0xFF), sign(0x0)*/ {}
- };
-
-#if(GLM_COMPILER & GLM_COMPILER_VC)
-#pragma warning(pop)
-#endif
-
- static const __m128 GLM_VAR_USED zero = _mm_setzero_ps();
- static const __m128 GLM_VAR_USED one = _mm_set_ps1(1.0f);
- static const __m128 GLM_VAR_USED minus_one = _mm_set_ps1(-1.0f);
- static const __m128 GLM_VAR_USED two = _mm_set_ps1(2.0f);
- static const __m128 GLM_VAR_USED three = _mm_set_ps1(3.0f);
- static const __m128 GLM_VAR_USED pi = _mm_set_ps1(3.1415926535897932384626433832795f);
- static const __m128 GLM_VAR_USED hundred_eighty = _mm_set_ps1(180.f);
- static const __m128 GLM_VAR_USED pi_over_hundred_eighty = _mm_set_ps1(0.017453292519943295769236907684886f);
- static const __m128 GLM_VAR_USED hundred_eighty_over_pi = _mm_set_ps1(57.295779513082320876798154814105f);
-
- static const ieee754_QNAN absMask;
- static const __m128 GLM_VAR_USED abs4Mask = _mm_set_ps1(absMask.f);
-
- static const __m128 GLM_VAR_USED _epi32_sign_mask = _mm_castsi128_ps(_mm_set1_epi32(static_cast<int>(0x80000000)));
- //static const __m128 GLM_VAR_USED _epi32_inv_sign_mask = _mm_castsi128_ps(_mm_set1_epi32(0x7FFFFFFF));
- //static const __m128 GLM_VAR_USED _epi32_mant_mask = _mm_castsi128_ps(_mm_set1_epi32(0x7F800000));
- //static const __m128 GLM_VAR_USED _epi32_inv_mant_mask = _mm_castsi128_ps(_mm_set1_epi32(0x807FFFFF));
- //static const __m128 GLM_VAR_USED _epi32_min_norm_pos = _mm_castsi128_ps(_mm_set1_epi32(0x00800000));
- static const __m128 GLM_VAR_USED _epi32_0 = _mm_set_ps1(0);
- static const __m128 GLM_VAR_USED _epi32_1 = _mm_set_ps1(1);
- static const __m128 GLM_VAR_USED _epi32_2 = _mm_set_ps1(2);
- static const __m128 GLM_VAR_USED _epi32_3 = _mm_set_ps1(3);
- static const __m128 GLM_VAR_USED _epi32_4 = _mm_set_ps1(4);
- static const __m128 GLM_VAR_USED _epi32_5 = _mm_set_ps1(5);
- static const __m128 GLM_VAR_USED _epi32_6 = _mm_set_ps1(6);
- static const __m128 GLM_VAR_USED _epi32_7 = _mm_set_ps1(7);
- static const __m128 GLM_VAR_USED _epi32_8 = _mm_set_ps1(8);
- static const __m128 GLM_VAR_USED _epi32_9 = _mm_set_ps1(9);
- static const __m128 GLM_VAR_USED _epi32_127 = _mm_set_ps1(127);
- //static const __m128 GLM_VAR_USED _epi32_ninf = _mm_castsi128_ps(_mm_set1_epi32(0xFF800000));
- //static const __m128 GLM_VAR_USED _epi32_pinf = _mm_castsi128_ps(_mm_set1_epi32(0x7F800000));
-
- static const __m128 GLM_VAR_USED _ps_1_3 = _mm_set_ps1(0.33333333333333333333333333333333f);
- static const __m128 GLM_VAR_USED _ps_0p5 = _mm_set_ps1(0.5f);
- static const __m128 GLM_VAR_USED _ps_1 = _mm_set_ps1(1.0f);
- static const __m128 GLM_VAR_USED _ps_m1 = _mm_set_ps1(-1.0f);
- static const __m128 GLM_VAR_USED _ps_2 = _mm_set_ps1(2.0f);
- static const __m128 GLM_VAR_USED _ps_3 = _mm_set_ps1(3.0f);
- static const __m128 GLM_VAR_USED _ps_127 = _mm_set_ps1(127.0f);
- static const __m128 GLM_VAR_USED _ps_255 = _mm_set_ps1(255.0f);
- static const __m128 GLM_VAR_USED _ps_2pow23 = _mm_set_ps1(8388608.0f);
-
- static const __m128 GLM_VAR_USED _ps_1_0_0_0 = _mm_set_ps(1.0f, 0.0f, 0.0f, 0.0f);
- static const __m128 GLM_VAR_USED _ps_0_1_0_0 = _mm_set_ps(0.0f, 1.0f, 0.0f, 0.0f);
- static const __m128 GLM_VAR_USED _ps_0_0_1_0 = _mm_set_ps(0.0f, 0.0f, 1.0f, 0.0f);
- static const __m128 GLM_VAR_USED _ps_0_0_0_1 = _mm_set_ps(0.0f, 0.0f, 0.0f, 1.0f);
-
- static const __m128 GLM_VAR_USED _ps_pi = _mm_set_ps1(3.1415926535897932384626433832795f);
- static const __m128 GLM_VAR_USED _ps_pi2 = _mm_set_ps1(6.283185307179586476925286766560f);
- static const __m128 GLM_VAR_USED _ps_2_pi = _mm_set_ps1(0.63661977236758134307553505349006f);
- static const __m128 GLM_VAR_USED _ps_pi_2 = _mm_set_ps1(1.5707963267948966192313216916398f);
- static const __m128 GLM_VAR_USED _ps_4_pi = _mm_set_ps1(1.2732395447351626861510701069801f);
- static const __m128 GLM_VAR_USED _ps_pi_4 = _mm_set_ps1(0.78539816339744830961566084581988f);
-
- static const __m128 GLM_VAR_USED _ps_sincos_p0 = _mm_set_ps1(0.15707963267948963959e1f);
- static const __m128 GLM_VAR_USED _ps_sincos_p1 = _mm_set_ps1(-0.64596409750621907082e0f);
- static const __m128 GLM_VAR_USED _ps_sincos_p2 = _mm_set_ps1(0.7969262624561800806e-1f);
- static const __m128 GLM_VAR_USED _ps_sincos_p3 = _mm_set_ps1(-0.468175413106023168e-2f);
- static const __m128 GLM_VAR_USED _ps_tan_p0 = _mm_set_ps1(-1.79565251976484877988e7f);
- static const __m128 GLM_VAR_USED _ps_tan_p1 = _mm_set_ps1(1.15351664838587416140e6f);
- static const __m128 GLM_VAR_USED _ps_tan_p2 = _mm_set_ps1(-1.30936939181383777646e4f);
- static const __m128 GLM_VAR_USED _ps_tan_q0 = _mm_set_ps1(-5.38695755929454629881e7f);
- static const __m128 GLM_VAR_USED _ps_tan_q1 = _mm_set_ps1(2.50083801823357915839e7f);
- static const __m128 GLM_VAR_USED _ps_tan_q2 = _mm_set_ps1(-1.32089234440210967447e6f);
- static const __m128 GLM_VAR_USED _ps_tan_q3 = _mm_set_ps1(1.36812963470692954678e4f);
- static const __m128 GLM_VAR_USED _ps_tan_poleval = _mm_set_ps1(3.68935e19f);
- static const __m128 GLM_VAR_USED _ps_atan_t0 = _mm_set_ps1(-0.91646118527267623468e-1f);
- static const __m128 GLM_VAR_USED _ps_atan_t1 = _mm_set_ps1(-0.13956945682312098640e1f);
- static const __m128 GLM_VAR_USED _ps_atan_t2 = _mm_set_ps1(-0.94393926122725531747e2f);
- static const __m128 GLM_VAR_USED _ps_atan_t3 = _mm_set_ps1(0.12888383034157279340e2f);
- static const __m128 GLM_VAR_USED _ps_atan_s0 = _mm_set_ps1(0.12797564625607904396e1f);
- static const __m128 GLM_VAR_USED _ps_atan_s1 = _mm_set_ps1(0.21972168858277355914e1f);
- static const __m128 GLM_VAR_USED _ps_atan_s2 = _mm_set_ps1(0.68193064729268275701e1f);
- static const __m128 GLM_VAR_USED _ps_atan_s3 = _mm_set_ps1(0.28205206687035841409e2f);
-
- static const __m128 GLM_VAR_USED _ps_exp_hi = _mm_set_ps1(88.3762626647949f);
- static const __m128 GLM_VAR_USED _ps_exp_lo = _mm_set_ps1(-88.3762626647949f);
- static const __m128 GLM_VAR_USED _ps_exp_rln2 = _mm_set_ps1(1.4426950408889634073599f);
- static const __m128 GLM_VAR_USED _ps_exp_p0 = _mm_set_ps1(1.26177193074810590878e-4f);
- static const __m128 GLM_VAR_USED _ps_exp_p1 = _mm_set_ps1(3.02994407707441961300e-2f);
- static const __m128 GLM_VAR_USED _ps_exp_q0 = _mm_set_ps1(3.00198505138664455042e-6f);
- static const __m128 GLM_VAR_USED _ps_exp_q1 = _mm_set_ps1(2.52448340349684104192e-3f);
- static const __m128 GLM_VAR_USED _ps_exp_q2 = _mm_set_ps1(2.27265548208155028766e-1f);
- static const __m128 GLM_VAR_USED _ps_exp_q3 = _mm_set_ps1(2.00000000000000000009e0f);
- static const __m128 GLM_VAR_USED _ps_exp_c1 = _mm_set_ps1(6.93145751953125e-1f);
- static const __m128 GLM_VAR_USED _ps_exp_c2 = _mm_set_ps1(1.42860682030941723212e-6f);
- static const __m128 GLM_VAR_USED _ps_exp2_hi = _mm_set_ps1(127.4999961853f);
- static const __m128 GLM_VAR_USED _ps_exp2_lo = _mm_set_ps1(-127.4999961853f);
- static const __m128 GLM_VAR_USED _ps_exp2_p0 = _mm_set_ps1(2.30933477057345225087e-2f);
- static const __m128 GLM_VAR_USED _ps_exp2_p1 = _mm_set_ps1(2.02020656693165307700e1f);
- static const __m128 GLM_VAR_USED _ps_exp2_p2 = _mm_set_ps1(1.51390680115615096133e3f);
- static const __m128 GLM_VAR_USED _ps_exp2_q0 = _mm_set_ps1(2.33184211722314911771e2f);
- static const __m128 GLM_VAR_USED _ps_exp2_q1 = _mm_set_ps1(4.36821166879210612817e3f);
- static const __m128 GLM_VAR_USED _ps_log_p0 = _mm_set_ps1(-7.89580278884799154124e-1f);
- static const __m128 GLM_VAR_USED _ps_log_p1 = _mm_set_ps1(1.63866645699558079767e1f);
- static const __m128 GLM_VAR_USED _ps_log_p2 = _mm_set_ps1(-6.41409952958715622951e1f);
- static const __m128 GLM_VAR_USED _ps_log_q0 = _mm_set_ps1(-3.56722798256324312549e1f);
- static const __m128 GLM_VAR_USED _ps_log_q1 = _mm_set_ps1(3.12093766372244180303e2f);
- static const __m128 GLM_VAR_USED _ps_log_q2 = _mm_set_ps1(-7.69691943550460008604e2f);
- static const __m128 GLM_VAR_USED _ps_log_c0 = _mm_set_ps1(0.693147180559945f);
- static const __m128 GLM_VAR_USED _ps_log2_c0 = _mm_set_ps1(1.44269504088896340735992f);
-
-GLM_FUNC_QUALIFIER __m128 sse_abs_ps(__m128 x)
-{
- return _mm_and_ps(glm::detail::abs4Mask, x);
-}
-
-GLM_FUNC_QUALIFIER __m128 sse_sgn_ps(__m128 x)
-{
- __m128 Neg = _mm_set1_ps(-1.0f);
- __m128 Pos = _mm_set1_ps(1.0f);
-
- __m128 Cmp0 = _mm_cmplt_ps(x, zero);
- __m128 Cmp1 = _mm_cmpgt_ps(x, zero);
-
- __m128 And0 = _mm_and_ps(Cmp0, Neg);
- __m128 And1 = _mm_and_ps(Cmp1, Pos);
-
- return _mm_or_ps(And0, And1);
-}
-
-//floor
-GLM_FUNC_QUALIFIER __m128 sse_flr_ps(__m128 x)
-{
- __m128 rnd0 = sse_rnd_ps(x);
- __m128 cmp0 = _mm_cmplt_ps(x, rnd0);
- __m128 and0 = _mm_and_ps(cmp0, glm::detail::_ps_1);
- __m128 sub0 = _mm_sub_ps(rnd0, and0);
- return sub0;
-}
-
-//trunc
-/*
-GLM_FUNC_QUALIFIER __m128 _mm_trc_ps(__m128 v)
-{
- return __m128();
-}
-*/
-//round
-GLM_FUNC_QUALIFIER __m128 sse_rnd_ps(__m128 x)
-{
- __m128 and0 = _mm_and_ps(glm::detail::_epi32_sign_mask, x);
- __m128 or0 = _mm_or_ps(and0, glm::detail::_ps_2pow23);
- __m128 add0 = _mm_add_ps(x, or0);
- __m128 sub0 = _mm_sub_ps(add0, or0);
- return sub0;
-}
-
-//roundEven
-GLM_FUNC_QUALIFIER __m128 sse_rde_ps(__m128 x)
-{
- __m128 and0 = _mm_and_ps(glm::detail::_epi32_sign_mask, x);
- __m128 or0 = _mm_or_ps(and0, glm::detail::_ps_2pow23);
- __m128 add0 = _mm_add_ps(x, or0);
- __m128 sub0 = _mm_sub_ps(add0, or0);
- return sub0;
-}
-
-GLM_FUNC_QUALIFIER __m128 sse_ceil_ps(__m128 x)
-{
- __m128 rnd0 = sse_rnd_ps(x);
- __m128 cmp0 = _mm_cmpgt_ps(x, rnd0);
- __m128 and0 = _mm_and_ps(cmp0, glm::detail::_ps_1);
- __m128 add0 = _mm_add_ps(rnd0, and0);
- return add0;
-}
-
-GLM_FUNC_QUALIFIER __m128 sse_frc_ps(__m128 x)
-{
- __m128 flr0 = sse_flr_ps(x);
- __m128 sub0 = _mm_sub_ps(x, flr0);
- return sub0;
-}
-
-GLM_FUNC_QUALIFIER __m128 sse_mod_ps(__m128 x, __m128 y)
-{
- __m128 div0 = _mm_div_ps(x, y);
- __m128 flr0 = sse_flr_ps(div0);
- __m128 mul0 = _mm_mul_ps(y, flr0);
- __m128 sub0 = _mm_sub_ps(x, mul0);
- return sub0;
-}
-
-/// TODO
-/*
-GLM_FUNC_QUALIFIER __m128 sse_modf_ps(__m128 x, __m128i & i)
-{
- __m128 empty;
- return empty;
-}
-*/
-
-//GLM_FUNC_QUALIFIER __m128 _mm_min_ps(__m128 x, __m128 y)
-
-//GLM_FUNC_QUALIFIER __m128 _mm_max_ps(__m128 x, __m128 y)
-
-GLM_FUNC_QUALIFIER __m128 sse_clp_ps(__m128 v, __m128 minVal, __m128 maxVal)
-{
- __m128 min0 = _mm_min_ps(v, maxVal);
- __m128 max0 = _mm_max_ps(min0, minVal);
- return max0;
-}
-
-GLM_FUNC_QUALIFIER __m128 sse_mix_ps(__m128 v1, __m128 v2, __m128 a)
-{
- __m128 sub0 = _mm_sub_ps(glm::detail::one, a);
- __m128 mul0 = _mm_mul_ps(v1, sub0);
- __m128 mul1 = _mm_mul_ps(v2, a);
- __m128 add0 = _mm_add_ps(mul0, mul1);
- return add0;
-}
-
-GLM_FUNC_QUALIFIER __m128 sse_stp_ps(__m128 edge, __m128 x)
-{
- __m128 cmp = _mm_cmple_ps(x, edge);
- if(_mm_movemask_ps(cmp) == 0)
- return glm::detail::one;
- else
- return glm::detail::zero;
-}
-
-GLM_FUNC_QUALIFIER __m128 sse_ssp_ps(__m128 edge0, __m128 edge1, __m128 x)
-{
- __m128 sub0 = _mm_sub_ps(x, edge0);
- __m128 sub1 = _mm_sub_ps(edge1, edge0);
- __m128 div0 = _mm_sub_ps(sub0, sub1);
- __m128 clp0 = sse_clp_ps(div0, glm::detail::zero, glm::detail::one);
- __m128 mul0 = _mm_mul_ps(glm::detail::two, clp0);
- __m128 sub2 = _mm_sub_ps(glm::detail::three, mul0);
- __m128 mul1 = _mm_mul_ps(clp0, clp0);
- __m128 mul2 = _mm_mul_ps(mul1, sub2);
- return mul2;
-}
-
-/// \todo
-//GLM_FUNC_QUALIFIER __m128 sse_nan_ps(__m128 x)
-//{
-// __m128 empty;
-// return empty;
-//}
-
-/// \todo
-//GLM_FUNC_QUALIFIER __m128 sse_inf_ps(__m128 x)
-//{
-// __m128 empty;
-// return empty;
-//}
-
-// SSE scalar reciprocal sqrt using rsqrt op, plus one Newton-Rhaphson iteration
-// By Elan Ruskin, http://assemblyrequired.crashworks.org/
-GLM_FUNC_QUALIFIER __m128 sse_sqrt_wip_ss(__m128 const & x)
-{
- __m128 const recip = _mm_rsqrt_ss(x); // "estimate" opcode
- __m128 const half = _mm_set_ps1(0.5f);
- __m128 const halfrecip = _mm_mul_ss(half, recip);
- __m128 const threeminus_xrr = _mm_sub_ss(three, _mm_mul_ss(x, _mm_mul_ss (recip, recip)));
- return _mm_mul_ss(halfrecip, threeminus_xrr);
-}
-
-}//namespace detail
-}//namespace glms
-
diff --git a/inc/glm/detail/intrinsic_exponential.hpp b/inc/glm/detail/intrinsic_exponential.hpp deleted file mode 100644 index 8fca5f9..0000000 --- a/inc/glm/detail/intrinsic_exponential.hpp +++ /dev/null @@ -1,77 +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.
-///
-/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-/// THE SOFTWARE.
-///
-/// @ref core
-/// @file glm/detail/intrinsic_exponential.hpp
-/// @date 2009-05-11 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "setup.hpp"
-
-#if(!(GLM_ARCH & GLM_ARCH_SSE2))
-# error "SSE2 instructions not supported or enabled"
-#else
-
-namespace glm{
-namespace detail
-{
-/*
-GLM_FUNC_QUALIFIER __m128 sse_rsqrt_nr_ss(__m128 const x)
-{
- __m128 recip = _mm_rsqrt_ss( x ); // "estimate" opcode
- const static __m128 three = { 3, 3, 3, 3 }; // aligned consts for fast load
- const static __m128 half = { 0.5,0.5,0.5,0.5 };
- __m128 halfrecip = _mm_mul_ss( half, recip );
- __m128 threeminus_xrr = _mm_sub_ss( three, _mm_mul_ss( x, _mm_mul_ss ( recip, recip ) ) );
- return _mm_mul_ss( halfrecip, threeminus_xrr );
-}
-
-GLM_FUNC_QUALIFIER __m128 sse_normalize_fast_ps( float * RESTRICT vOut, float * RESTRICT vIn )
-{
- __m128 x = _mm_load_ss(&vIn[0]);
- __m128 y = _mm_load_ss(&vIn[1]);
- __m128 z = _mm_load_ss(&vIn[2]);
-
- const __m128 l = // compute x*x + y*y + z*z
- _mm_add_ss(
- _mm_add_ss( _mm_mul_ss(x,x),
- _mm_mul_ss(y,y)
- ),
- _mm_mul_ss( z, z )
- );
-
-
- const __m128 rsqt = _mm_rsqrt_nr_ss( l );
- _mm_store_ss( &vOut[0] , _mm_mul_ss( rsqt, x ) );
- _mm_store_ss( &vOut[1] , _mm_mul_ss( rsqt, y ) );
- _mm_store_ss( &vOut[2] , _mm_mul_ss( rsqt, z ) );
-
- return _mm_mul_ss( l , rsqt );
-}
-*/
-}//namespace detail
-}//namespace glm
-
-#endif//GLM_ARCH
diff --git a/inc/glm/detail/intrinsic_exponential.inl b/inc/glm/detail/intrinsic_exponential.inl deleted file mode 100644 index 76d4a19..0000000 --- a/inc/glm/detail/intrinsic_exponential.inl +++ /dev/null @@ -1,27 +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.
-///
-/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-/// THE SOFTWARE.
-///
-/// @ref core
-/// @file glm/detail/intrinsic_exponential.inl
-/// @date 2011-06-15 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
diff --git a/inc/glm/detail/intrinsic_geometric.hpp b/inc/glm/detail/intrinsic_geometric.hpp deleted file mode 100644 index 963baad..0000000 --- a/inc/glm/detail/intrinsic_geometric.hpp +++ /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.
-///
-/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-/// THE SOFTWARE.
-///
-/// @ref core
-/// @file glm/detail/intrinsic_geometric.hpp
-/// @date 2009-05-08 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "setup.hpp"
-
-#if(!(GLM_ARCH & GLM_ARCH_SSE2))
-# error "SSE2 instructions not supported or enabled"
-#else
-
-#include "intrinsic_common.hpp"
-
-namespace glm{
-namespace detail
-{
- //length
- __m128 sse_len_ps(__m128 x);
-
- //distance
- __m128 sse_dst_ps(__m128 p0, __m128 p1);
-
- //dot
- __m128 sse_dot_ps(__m128 v1, __m128 v2);
-
- // SSE1
- __m128 sse_dot_ss(__m128 v1, __m128 v2);
-
- //cross
- __m128 sse_xpd_ps(__m128 v1, __m128 v2);
-
- //normalize
- __m128 sse_nrm_ps(__m128 v);
-
- //faceforward
- __m128 sse_ffd_ps(__m128 N, __m128 I, __m128 Nref);
-
- //reflect
- __m128 sse_rfe_ps(__m128 I, __m128 N);
-
- //refract
- __m128 sse_rfa_ps(__m128 I, __m128 N, __m128 eta);
-
-}//namespace detail
-}//namespace glm
-
-#include "intrinsic_geometric.inl"
-
-#endif//GLM_ARCH
diff --git a/inc/glm/detail/intrinsic_geometric.inl b/inc/glm/detail/intrinsic_geometric.inl deleted file mode 100644 index e58d5c4..0000000 --- a/inc/glm/detail/intrinsic_geometric.inl +++ /dev/null @@ -1,147 +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.
-///
-/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-/// THE SOFTWARE.
-///
-/// @ref core
-/// @file glm/detail/intrinsic_geometric.inl
-/// @date 2009-05-08 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm{
-namespace detail{
-
-//length
-GLM_FUNC_QUALIFIER __m128 sse_len_ps(__m128 x)
-{
- __m128 dot0 = sse_dot_ps(x, x);
- __m128 sqt0 = _mm_sqrt_ps(dot0);
- return sqt0;
-}
-
-//distance
-GLM_FUNC_QUALIFIER __m128 sse_dst_ps(__m128 p0, __m128 p1)
-{
- __m128 sub0 = _mm_sub_ps(p0, p1);
- __m128 len0 = sse_len_ps(sub0);
- return len0;
-}
-
-//dot
-GLM_FUNC_QUALIFIER __m128 sse_dot_ps(__m128 v1, __m128 v2)
-{
-
-# if(GLM_ARCH & GLM_ARCH_AVX)
- return _mm_dp_ps(v1, v2, 0xff);
-# else
- __m128 mul0 = _mm_mul_ps(v1, v2);
- __m128 swp0 = _mm_shuffle_ps(mul0, mul0, _MM_SHUFFLE(2, 3, 0, 1));
- __m128 add0 = _mm_add_ps(mul0, swp0);
- __m128 swp1 = _mm_shuffle_ps(add0, add0, _MM_SHUFFLE(0, 1, 2, 3));
- __m128 add1 = _mm_add_ps(add0, swp1);
- return add1;
-# endif
-}
-
-// SSE1
-GLM_FUNC_QUALIFIER __m128 sse_dot_ss(__m128 v1, __m128 v2)
-{
- __m128 mul0 = _mm_mul_ps(v1, v2);
- __m128 mov0 = _mm_movehl_ps(mul0, mul0);
- __m128 add0 = _mm_add_ps(mov0, mul0);
- __m128 swp1 = _mm_shuffle_ps(add0, add0, 1);
- __m128 add1 = _mm_add_ss(add0, swp1);
- return add1;
-}
-
-//cross
-GLM_FUNC_QUALIFIER __m128 sse_xpd_ps(__m128 v1, __m128 v2)
-{
- __m128 swp0 = _mm_shuffle_ps(v1, v1, _MM_SHUFFLE(3, 0, 2, 1));
- __m128 swp1 = _mm_shuffle_ps(v1, v1, _MM_SHUFFLE(3, 1, 0, 2));
- __m128 swp2 = _mm_shuffle_ps(v2, v2, _MM_SHUFFLE(3, 0, 2, 1));
- __m128 swp3 = _mm_shuffle_ps(v2, v2, _MM_SHUFFLE(3, 1, 0, 2));
- __m128 mul0 = _mm_mul_ps(swp0, swp3);
- __m128 mul1 = _mm_mul_ps(swp1, swp2);
- __m128 sub0 = _mm_sub_ps(mul0, mul1);
- return sub0;
-}
-
-//normalize
-GLM_FUNC_QUALIFIER __m128 sse_nrm_ps(__m128 v)
-{
- __m128 dot0 = sse_dot_ps(v, v);
- __m128 isr0 = _mm_rsqrt_ps(dot0);
- __m128 mul0 = _mm_mul_ps(v, isr0);
- return mul0;
-}
-
-//faceforward
-GLM_FUNC_QUALIFIER __m128 sse_ffd_ps(__m128 N, __m128 I, __m128 Nref)
-{
- //__m128 dot0 = _mm_dot_ps(v, v);
- //__m128 neg0 = _mm_neg_ps(N);
- //__m128 sgn0 = _mm_sgn_ps(dot0);
- //__m128 mix0 = _mm_mix_ps(N, neg0, sgn0);
- //return mix0;
-
- __m128 dot0 = sse_dot_ps(Nref, I);
- __m128 sgn0 = sse_sgn_ps(dot0);
- __m128 mul0 = _mm_mul_ps(sgn0, glm::detail::minus_one);
- __m128 mul1 = _mm_mul_ps(N, mul0);
- return mul1;
-}
-
-//reflect
-GLM_FUNC_QUALIFIER __m128 sse_rfe_ps(__m128 I, __m128 N)
-{
- __m128 dot0 = sse_dot_ps(N, I);
- __m128 mul0 = _mm_mul_ps(N, dot0);
- __m128 mul1 = _mm_mul_ps(mul0, glm::detail::two);
- __m128 sub0 = _mm_sub_ps(I, mul1);
- return sub0;
-}
-
-//refract
-GLM_FUNC_QUALIFIER __m128 sse_rfa_ps(__m128 I, __m128 N, __m128 eta)
-{
- __m128 dot0 = sse_dot_ps(N, I);
- __m128 mul0 = _mm_mul_ps(eta, eta);
- __m128 mul1 = _mm_mul_ps(dot0, dot0);
- __m128 sub0 = _mm_sub_ps(glm::detail::one, mul0);
- __m128 sub1 = _mm_sub_ps(glm::detail::one, mul1);
- __m128 mul2 = _mm_mul_ps(sub0, sub1);
-
- if(_mm_movemask_ps(_mm_cmplt_ss(mul2, glm::detail::zero)) == 0)
- return glm::detail::zero;
-
- __m128 sqt0 = _mm_sqrt_ps(mul2);
- __m128 mul3 = _mm_mul_ps(eta, dot0);
- __m128 add0 = _mm_add_ps(mul3, sqt0);
- __m128 mul4 = _mm_mul_ps(add0, N);
- __m128 mul5 = _mm_mul_ps(eta, I);
- __m128 sub2 = _mm_sub_ps(mul5, mul4);
-
- return sub2;
-}
-
-}//namespace detail
-}//namespace glm
diff --git a/inc/glm/detail/intrinsic_integer.hpp b/inc/glm/detail/intrinsic_integer.hpp deleted file mode 100644 index 049388e..0000000 --- a/inc/glm/detail/intrinsic_integer.hpp +++ /dev/null @@ -1,48 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////////
-/// OpenGL Mathematics (glm.g-truc.net)
-///
-/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net)
-/// Permission is hereby granted, free of charge, to any person obtaining a copy
-/// of this software and associated documentation files (the "Software"), to deal
-/// in the Software without restriction, including without limitation the rights
-/// 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.
-///
-/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-/// THE SOFTWARE.
-///
-/// @ref core
-/// @file glm/detail/intrinsic_integer.hpp
-/// @date 2009-05-11 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "glm/glm.hpp"
-
-#if(!(GLM_ARCH & GLM_ARCH_SSE2))
-# error "SSE2 instructions not supported or enabled"
-#else
-
-namespace glm{
-namespace detail
-{
- __m128i _mm_bit_interleave_si128(__m128i x);
- __m128i _mm_bit_interleave_si128(__m128i x, __m128i y);
-
-}//namespace detail
-}//namespace glm
-
-#include "intrinsic_integer.inl"
-
-#endif//GLM_ARCH
diff --git a/inc/glm/detail/intrinsic_integer.inl b/inc/glm/detail/intrinsic_integer.inl deleted file mode 100644 index 1ea96b5..0000000 --- a/inc/glm/detail/intrinsic_integer.inl +++ /dev/null @@ -1,139 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////////
-/// OpenGL Mathematics (glm.g-truc.net)
-///
-/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net)
-/// Permission is hereby granted, free of charge, to any person obtaining a copy
-/// of this software and associated documentation files (the "Software"), to deal
-/// in the Software without restriction, including without limitation the rights
-/// 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.
-///
-/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-/// THE SOFTWARE.
-///
-/// @ref core
-/// @file glm/detail/intrinsic_integer.inl
-/// @date 2009-05-08 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm{
-namespace detail
-{
- inline __m128i _mm_bit_interleave_si128(__m128i x)
- {
- __m128i const Mask4 = _mm_set1_epi32(0x0000FFFF);
- __m128i const Mask3 = _mm_set1_epi32(0x00FF00FF);
- __m128i const Mask2 = _mm_set1_epi32(0x0F0F0F0F);
- __m128i const Mask1 = _mm_set1_epi32(0x33333333);
- __m128i const Mask0 = _mm_set1_epi32(0x55555555);
-
- __m128i Reg1;
- __m128i Reg2;
-
- // REG1 = x;
- // REG2 = y;
- //Reg1 = _mm_unpacklo_epi64(x, y);
- Reg1 = x;
-
- //REG1 = ((REG1 << 16) | REG1) & glm::uint64(0x0000FFFF0000FFFF);
- //REG2 = ((REG2 << 16) | REG2) & glm::uint64(0x0000FFFF0000FFFF);
- Reg2 = _mm_slli_si128(Reg1, 2);
- Reg1 = _mm_or_si128(Reg2, Reg1);
- Reg1 = _mm_and_si128(Reg1, Mask4);
-
- //REG1 = ((REG1 << 8) | REG1) & glm::uint64(0x00FF00FF00FF00FF);
- //REG2 = ((REG2 << 8) | REG2) & glm::uint64(0x00FF00FF00FF00FF);
- Reg2 = _mm_slli_si128(Reg1, 1);
- Reg1 = _mm_or_si128(Reg2, Reg1);
- Reg1 = _mm_and_si128(Reg1, Mask3);
-
- //REG1 = ((REG1 << 4) | REG1) & glm::uint64(0x0F0F0F0F0F0F0F0F);
- //REG2 = ((REG2 << 4) | REG2) & glm::uint64(0x0F0F0F0F0F0F0F0F);
- Reg2 = _mm_slli_epi32(Reg1, 4);
- Reg1 = _mm_or_si128(Reg2, Reg1);
- Reg1 = _mm_and_si128(Reg1, Mask2);
-
- //REG1 = ((REG1 << 2) | REG1) & glm::uint64(0x3333333333333333);
- //REG2 = ((REG2 << 2) | REG2) & glm::uint64(0x3333333333333333);
- Reg2 = _mm_slli_epi32(Reg1, 2);
- Reg1 = _mm_or_si128(Reg2, Reg1);
- Reg1 = _mm_and_si128(Reg1, Mask1);
-
- //REG1 = ((REG1 << 1) | REG1) & glm::uint64(0x5555555555555555);
- //REG2 = ((REG2 << 1) | REG2) & glm::uint64(0x5555555555555555);
- Reg2 = _mm_slli_epi32(Reg1, 1);
- Reg1 = _mm_or_si128(Reg2, Reg1);
- Reg1 = _mm_and_si128(Reg1, Mask0);
-
- //return REG1 | (REG2 << 1);
- Reg2 = _mm_slli_epi32(Reg1, 1);
- Reg2 = _mm_srli_si128(Reg2, 8);
- Reg1 = _mm_or_si128(Reg1, Reg2);
-
- return Reg1;
- }
-
- inline __m128i _mm_bit_interleave_si128(__m128i x, __m128i y)
- {
- __m128i const Mask4 = _mm_set1_epi32(0x0000FFFF);
- __m128i const Mask3 = _mm_set1_epi32(0x00FF00FF);
- __m128i const Mask2 = _mm_set1_epi32(0x0F0F0F0F);
- __m128i const Mask1 = _mm_set1_epi32(0x33333333);
- __m128i const Mask0 = _mm_set1_epi32(0x55555555);
-
- __m128i Reg1;
- __m128i Reg2;
-
- // REG1 = x;
- // REG2 = y;
- Reg1 = _mm_unpacklo_epi64(x, y);
-
- //REG1 = ((REG1 << 16) | REG1) & glm::uint64(0x0000FFFF0000FFFF);
- //REG2 = ((REG2 << 16) | REG2) & glm::uint64(0x0000FFFF0000FFFF);
- Reg2 = _mm_slli_si128(Reg1, 2);
- Reg1 = _mm_or_si128(Reg2, Reg1);
- Reg1 = _mm_and_si128(Reg1, Mask4);
-
- //REG1 = ((REG1 << 8) | REG1) & glm::uint64(0x00FF00FF00FF00FF);
- //REG2 = ((REG2 << 8) | REG2) & glm::uint64(0x00FF00FF00FF00FF);
- Reg2 = _mm_slli_si128(Reg1, 1);
- Reg1 = _mm_or_si128(Reg2, Reg1);
- Reg1 = _mm_and_si128(Reg1, Mask3);
-
- //REG1 = ((REG1 << 4) | REG1) & glm::uint64(0x0F0F0F0F0F0F0F0F);
- //REG2 = ((REG2 << 4) | REG2) & glm::uint64(0x0F0F0F0F0F0F0F0F);
- Reg2 = _mm_slli_epi32(Reg1, 4);
- Reg1 = _mm_or_si128(Reg2, Reg1);
- Reg1 = _mm_and_si128(Reg1, Mask2);
-
- //REG1 = ((REG1 << 2) | REG1) & glm::uint64(0x3333333333333333);
- //REG2 = ((REG2 << 2) | REG2) & glm::uint64(0x3333333333333333);
- Reg2 = _mm_slli_epi32(Reg1, 2);
- Reg1 = _mm_or_si128(Reg2, Reg1);
- Reg1 = _mm_and_si128(Reg1, Mask1);
-
- //REG1 = ((REG1 << 1) | REG1) & glm::uint64(0x5555555555555555);
- //REG2 = ((REG2 << 1) | REG2) & glm::uint64(0x5555555555555555);
- Reg2 = _mm_slli_epi32(Reg1, 1);
- Reg1 = _mm_or_si128(Reg2, Reg1);
- Reg1 = _mm_and_si128(Reg1, Mask0);
-
- //return REG1 | (REG2 << 1);
- Reg2 = _mm_slli_epi32(Reg1, 1);
- Reg2 = _mm_srli_si128(Reg2, 8);
- Reg1 = _mm_or_si128(Reg1, Reg2);
-
- return Reg1;
- }
-}//namespace detail
-}//namespace glms
diff --git a/inc/glm/detail/intrinsic_matrix.hpp b/inc/glm/detail/intrinsic_matrix.hpp deleted file mode 100644 index 909d137..0000000 --- a/inc/glm/detail/intrinsic_matrix.hpp +++ /dev/null @@ -1,67 +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.
-///
-/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-/// THE SOFTWARE.
-///
-/// @ref core
-/// @file glm/detail/intrinsic_common.hpp
-/// @date 2009-06-05 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "setup.hpp"
-
-#if(!(GLM_ARCH & GLM_ARCH_SSE2))
-# error "SSE2 instructions not supported or enabled"
-#else
-
-#include "intrinsic_geometric.hpp"
-
-namespace glm{
-namespace detail
-{
- void sse_add_ps(__m128 in1[4], __m128 in2[4], __m128 out[4]);
-
- void sse_sub_ps(__m128 in1[4], __m128 in2[4], __m128 out[4]);
-
- __m128 sse_mul_ps(__m128 m[4], __m128 v);
-
- __m128 sse_mul_ps(__m128 v, __m128 m[4]);
-
- void sse_mul_ps(__m128 const in1[4], __m128 const in2[4], __m128 out[4]);
-
- void sse_transpose_ps(__m128 const in[4], __m128 out[4]);
-
- void sse_inverse_ps(__m128 const in[4], __m128 out[4]);
-
- void sse_rotate_ps(__m128 const in[4], float Angle, float const v[3], __m128 out[4]);
-
- __m128 sse_det_ps(__m128 const m[4]);
-
- __m128 sse_slow_det_ps(__m128 const m[4]);
-
-}//namespace detail
-}//namespace glm
-
-#include "intrinsic_matrix.inl"
-
-#endif//GLM_ARCH
diff --git a/inc/glm/detail/intrinsic_matrix.inl b/inc/glm/detail/intrinsic_matrix.inl deleted file mode 100644 index 7ab6bce..0000000 --- a/inc/glm/detail/intrinsic_matrix.inl +++ /dev/null @@ -1,1070 +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.
-///
-/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-/// THE SOFTWARE.
-///
-/// @ref core
-/// @file glm/detail/intrinsic_common.inl
-/// @date 2009-06-05 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm{
-namespace detail{
-
-static const __m128 GLM_VAR_USED _m128_rad_ps = _mm_set_ps1(3.141592653589793238462643383279f / 180.f);
-static const __m128 GLM_VAR_USED _m128_deg_ps = _mm_set_ps1(180.f / 3.141592653589793238462643383279f);
-
-template <typename matType>
-GLM_FUNC_QUALIFIER matType sse_comp_mul_ps
-(
- __m128 const in1[4],
- __m128 const in2[4],
- __m128 out[4]
-)
-{
- out[0] = _mm_mul_ps(in1[0], in2[0]);
- out[1] = _mm_mul_ps(in1[1], in2[1]);
- out[2] = _mm_mul_ps(in1[2], in2[2]);
- out[3] = _mm_mul_ps(in1[3], in2[3]);
-}
-
-GLM_FUNC_QUALIFIER void sse_add_ps(__m128 const in1[4], __m128 const in2[4], __m128 out[4])
-{
- {
- out[0] = _mm_add_ps(in1[0], in2[0]);
- out[1] = _mm_add_ps(in1[1], in2[1]);
- out[2] = _mm_add_ps(in1[2], in2[2]);
- out[3] = _mm_add_ps(in1[3], in2[3]);
- }
-}
-
-GLM_FUNC_QUALIFIER void sse_sub_ps(__m128 const in1[4], __m128 const in2[4], __m128 out[4])
-{
- {
- out[0] = _mm_sub_ps(in1[0], in2[0]);
- out[1] = _mm_sub_ps(in1[1], in2[1]);
- out[2] = _mm_sub_ps(in1[2], in2[2]);
- out[3] = _mm_sub_ps(in1[3], in2[3]);
- }
-}
-
-GLM_FUNC_QUALIFIER __m128 sse_mul_ps(__m128 const m[4], __m128 v)
-{
- __m128 v0 = _mm_shuffle_ps(v, v, _MM_SHUFFLE(0, 0, 0, 0));
- __m128 v1 = _mm_shuffle_ps(v, v, _MM_SHUFFLE(1, 1, 1, 1));
- __m128 v2 = _mm_shuffle_ps(v, v, _MM_SHUFFLE(2, 2, 2, 2));
- __m128 v3 = _mm_shuffle_ps(v, v, _MM_SHUFFLE(3, 3, 3, 3));
-
- __m128 m0 = _mm_mul_ps(m[0], v0);
- __m128 m1 = _mm_mul_ps(m[1], v1);
- __m128 m2 = _mm_mul_ps(m[2], v2);
- __m128 m3 = _mm_mul_ps(m[3], v3);
-
- __m128 a0 = _mm_add_ps(m0, m1);
- __m128 a1 = _mm_add_ps(m2, m3);
- __m128 a2 = _mm_add_ps(a0, a1);
-
- return a2;
-}
-
-GLM_FUNC_QUALIFIER __m128 sse_mul_ps(__m128 v, __m128 const m[4])
-{
- __m128 i0 = m[0];
- __m128 i1 = m[1];
- __m128 i2 = m[2];
- __m128 i3 = m[3];
-
- __m128 m0 = _mm_mul_ps(v, i0);
- __m128 m1 = _mm_mul_ps(v, i1);
- __m128 m2 = _mm_mul_ps(v, i2);
- __m128 m3 = _mm_mul_ps(v, i3);
-
- __m128 u0 = _mm_unpacklo_ps(m0, m1);
- __m128 u1 = _mm_unpackhi_ps(m0, m1);
- __m128 a0 = _mm_add_ps(u0, u1);
-
- __m128 u2 = _mm_unpacklo_ps(m2, m3);
- __m128 u3 = _mm_unpackhi_ps(m2, m3);
- __m128 a1 = _mm_add_ps(u2, u3);
-
- __m128 f0 = _mm_movelh_ps(a0, a1);
- __m128 f1 = _mm_movehl_ps(a1, a0);
- __m128 f2 = _mm_add_ps(f0, f1);
-
- return f2;
-}
-
-GLM_FUNC_QUALIFIER void sse_mul_ps(__m128 const in1[4], __m128 const in2[4], __m128 out[4])
-{
- {
- __m128 e0 = _mm_shuffle_ps(in2[0], in2[0], _MM_SHUFFLE(0, 0, 0, 0));
- __m128 e1 = _mm_shuffle_ps(in2[0], in2[0], _MM_SHUFFLE(1, 1, 1, 1));
- __m128 e2 = _mm_shuffle_ps(in2[0], in2[0], _MM_SHUFFLE(2, 2, 2, 2));
- __m128 e3 = _mm_shuffle_ps(in2[0], in2[0], _MM_SHUFFLE(3, 3, 3, 3));
-
- __m128 m0 = _mm_mul_ps(in1[0], e0);
- __m128 m1 = _mm_mul_ps(in1[1], e1);
- __m128 m2 = _mm_mul_ps(in1[2], e2);
- __m128 m3 = _mm_mul_ps(in1[3], e3);
-
- __m128 a0 = _mm_add_ps(m0, m1);
- __m128 a1 = _mm_add_ps(m2, m3);
- __m128 a2 = _mm_add_ps(a0, a1);
-
- out[0] = a2;
- }
-
- {
- __m128 e0 = _mm_shuffle_ps(in2[1], in2[1], _MM_SHUFFLE(0, 0, 0, 0));
- __m128 e1 = _mm_shuffle_ps(in2[1], in2[1], _MM_SHUFFLE(1, 1, 1, 1));
- __m128 e2 = _mm_shuffle_ps(in2[1], in2[1], _MM_SHUFFLE(2, 2, 2, 2));
- __m128 e3 = _mm_shuffle_ps(in2[1], in2[1], _MM_SHUFFLE(3, 3, 3, 3));
-
- __m128 m0 = _mm_mul_ps(in1[0], e0);
- __m128 m1 = _mm_mul_ps(in1[1], e1);
- __m128 m2 = _mm_mul_ps(in1[2], e2);
- __m128 m3 = _mm_mul_ps(in1[3], e3);
-
- __m128 a0 = _mm_add_ps(m0, m1);
- __m128 a1 = _mm_add_ps(m2, m3);
- __m128 a2 = _mm_add_ps(a0, a1);
-
- out[1] = a2;
- }
-
- {
- __m128 e0 = _mm_shuffle_ps(in2[2], in2[2], _MM_SHUFFLE(0, 0, 0, 0));
- __m128 e1 = _mm_shuffle_ps(in2[2], in2[2], _MM_SHUFFLE(1, 1, 1, 1));
- __m128 e2 = _mm_shuffle_ps(in2[2], in2[2], _MM_SHUFFLE(2, 2, 2, 2));
- __m128 e3 = _mm_shuffle_ps(in2[2], in2[2], _MM_SHUFFLE(3, 3, 3, 3));
-
- __m128 m0 = _mm_mul_ps(in1[0], e0);
- __m128 m1 = _mm_mul_ps(in1[1], e1);
- __m128 m2 = _mm_mul_ps(in1[2], e2);
- __m128 m3 = _mm_mul_ps(in1[3], e3);
-
- __m128 a0 = _mm_add_ps(m0, m1);
- __m128 a1 = _mm_add_ps(m2, m3);
- __m128 a2 = _mm_add_ps(a0, a1);
-
- out[2] = a2;
- }
-
- {
- //(__m128&)_mm_shuffle_epi32(__m128i&)in2[0], _MM_SHUFFLE(3, 3, 3, 3))
- __m128 e0 = _mm_shuffle_ps(in2[3], in2[3], _MM_SHUFFLE(0, 0, 0, 0));
- __m128 e1 = _mm_shuffle_ps(in2[3], in2[3], _MM_SHUFFLE(1, 1, 1, 1));
- __m128 e2 = _mm_shuffle_ps(in2[3], in2[3], _MM_SHUFFLE(2, 2, 2, 2));
- __m128 e3 = _mm_shuffle_ps(in2[3], in2[3], _MM_SHUFFLE(3, 3, 3, 3));
-
- __m128 m0 = _mm_mul_ps(in1[0], e0);
- __m128 m1 = _mm_mul_ps(in1[1], e1);
- __m128 m2 = _mm_mul_ps(in1[2], e2);
- __m128 m3 = _mm_mul_ps(in1[3], e3);
-
- __m128 a0 = _mm_add_ps(m0, m1);
- __m128 a1 = _mm_add_ps(m2, m3);
- __m128 a2 = _mm_add_ps(a0, a1);
-
- out[3] = a2;
- }
-}
-
-GLM_FUNC_QUALIFIER void sse_transpose_ps(__m128 const in[4], __m128 out[4])
-{
- __m128 tmp0 = _mm_shuffle_ps(in[0], in[1], 0x44);
- __m128 tmp2 = _mm_shuffle_ps(in[0], in[1], 0xEE);
- __m128 tmp1 = _mm_shuffle_ps(in[2], in[3], 0x44);
- __m128 tmp3 = _mm_shuffle_ps(in[2], in[3], 0xEE);
-
- out[0] = _mm_shuffle_ps(tmp0, tmp1, 0x88);
- out[1] = _mm_shuffle_ps(tmp0, tmp1, 0xDD);
- out[2] = _mm_shuffle_ps(tmp2, tmp3, 0x88);
- out[3] = _mm_shuffle_ps(tmp2, tmp3, 0xDD);
-}
-
-GLM_FUNC_QUALIFIER __m128 sse_slow_det_ps(__m128 const in[4])
-{
- __m128 Fac0;
- {
- // valType SubFactor00 = m[2][2] * m[3][3] - m[3][2] * m[2][3];
- // valType SubFactor00 = m[2][2] * m[3][3] - m[3][2] * m[2][3];
- // valType SubFactor06 = m[1][2] * m[3][3] - m[3][2] * m[1][3];
- // valType SubFactor13 = m[1][2] * m[2][3] - m[2][2] * m[1][3];
-
- __m128 Swp0a = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(3, 3, 3, 3));
- __m128 Swp0b = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(2, 2, 2, 2));
-
- __m128 Swp00 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(2, 2, 2, 2));
- __m128 Swp01 = _mm_shuffle_ps(Swp0a, Swp0a, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp02 = _mm_shuffle_ps(Swp0b, Swp0b, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp03 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(3, 3, 3, 3));
-
- __m128 Mul00 = _mm_mul_ps(Swp00, Swp01);
- __m128 Mul01 = _mm_mul_ps(Swp02, Swp03);
- Fac0 = _mm_sub_ps(Mul00, Mul01);
- }
-
- __m128 Fac1;
- {
- // valType SubFactor01 = m[2][1] * m[3][3] - m[3][1] * m[2][3];
- // valType SubFactor01 = m[2][1] * m[3][3] - m[3][1] * m[2][3];
- // valType SubFactor07 = m[1][1] * m[3][3] - m[3][1] * m[1][3];
- // valType SubFactor14 = m[1][1] * m[2][3] - m[2][1] * m[1][3];
-
- __m128 Swp0a = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(3, 3, 3, 3));
- __m128 Swp0b = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(1, 1, 1, 1));
-
- __m128 Swp00 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(1, 1, 1, 1));
- __m128 Swp01 = _mm_shuffle_ps(Swp0a, Swp0a, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp02 = _mm_shuffle_ps(Swp0b, Swp0b, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp03 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(3, 3, 3, 3));
-
- __m128 Mul00 = _mm_mul_ps(Swp00, Swp01);
- __m128 Mul01 = _mm_mul_ps(Swp02, Swp03);
- Fac1 = _mm_sub_ps(Mul00, Mul01);
- }
-
-
- __m128 Fac2;
- {
- // valType SubFactor02 = m[2][1] * m[3][2] - m[3][1] * m[2][2];
- // valType SubFactor02 = m[2][1] * m[3][2] - m[3][1] * m[2][2];
- // valType SubFactor08 = m[1][1] * m[3][2] - m[3][1] * m[1][2];
- // valType SubFactor15 = m[1][1] * m[2][2] - m[2][1] * m[1][2];
-
- __m128 Swp0a = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(2, 2, 2, 2));
- __m128 Swp0b = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(1, 1, 1, 1));
-
- __m128 Swp00 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(1, 1, 1, 1));
- __m128 Swp01 = _mm_shuffle_ps(Swp0a, Swp0a, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp02 = _mm_shuffle_ps(Swp0b, Swp0b, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp03 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(2, 2, 2, 2));
-
- __m128 Mul00 = _mm_mul_ps(Swp00, Swp01);
- __m128 Mul01 = _mm_mul_ps(Swp02, Swp03);
- Fac2 = _mm_sub_ps(Mul00, Mul01);
- }
-
- __m128 Fac3;
- {
- // valType SubFactor03 = m[2][0] * m[3][3] - m[3][0] * m[2][3];
- // valType SubFactor03 = m[2][0] * m[3][3] - m[3][0] * m[2][3];
- // valType SubFactor09 = m[1][0] * m[3][3] - m[3][0] * m[1][3];
- // valType SubFactor16 = m[1][0] * m[2][3] - m[2][0] * m[1][3];
-
- __m128 Swp0a = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(3, 3, 3, 3));
- __m128 Swp0b = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(0, 0, 0, 0));
-
- __m128 Swp00 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(0, 0, 0, 0));
- __m128 Swp01 = _mm_shuffle_ps(Swp0a, Swp0a, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp02 = _mm_shuffle_ps(Swp0b, Swp0b, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp03 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(3, 3, 3, 3));
-
- __m128 Mul00 = _mm_mul_ps(Swp00, Swp01);
- __m128 Mul01 = _mm_mul_ps(Swp02, Swp03);
- Fac3 = _mm_sub_ps(Mul00, Mul01);
- }
-
- __m128 Fac4;
- {
- // valType SubFactor04 = m[2][0] * m[3][2] - m[3][0] * m[2][2];
- // valType SubFactor04 = m[2][0] * m[3][2] - m[3][0] * m[2][2];
- // valType SubFactor10 = m[1][0] * m[3][2] - m[3][0] * m[1][2];
- // valType SubFactor17 = m[1][0] * m[2][2] - m[2][0] * m[1][2];
-
- __m128 Swp0a = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(2, 2, 2, 2));
- __m128 Swp0b = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(0, 0, 0, 0));
-
- __m128 Swp00 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(0, 0, 0, 0));
- __m128 Swp01 = _mm_shuffle_ps(Swp0a, Swp0a, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp02 = _mm_shuffle_ps(Swp0b, Swp0b, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp03 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(2, 2, 2, 2));
-
- __m128 Mul00 = _mm_mul_ps(Swp00, Swp01);
- __m128 Mul01 = _mm_mul_ps(Swp02, Swp03);
- Fac4 = _mm_sub_ps(Mul00, Mul01);
- }
-
- __m128 Fac5;
- {
- // valType SubFactor05 = m[2][0] * m[3][1] - m[3][0] * m[2][1];
- // valType SubFactor05 = m[2][0] * m[3][1] - m[3][0] * m[2][1];
- // valType SubFactor12 = m[1][0] * m[3][1] - m[3][0] * m[1][1];
- // valType SubFactor18 = m[1][0] * m[2][1] - m[2][0] * m[1][1];
-
- __m128 Swp0a = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(1, 1, 1, 1));
- __m128 Swp0b = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(0, 0, 0, 0));
-
- __m128 Swp00 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(0, 0, 0, 0));
- __m128 Swp01 = _mm_shuffle_ps(Swp0a, Swp0a, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp02 = _mm_shuffle_ps(Swp0b, Swp0b, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp03 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(1, 1, 1, 1));
-
- __m128 Mul00 = _mm_mul_ps(Swp00, Swp01);
- __m128 Mul01 = _mm_mul_ps(Swp02, Swp03);
- Fac5 = _mm_sub_ps(Mul00, Mul01);
- }
-
- __m128 SignA = _mm_set_ps( 1.0f,-1.0f, 1.0f,-1.0f);
- __m128 SignB = _mm_set_ps(-1.0f, 1.0f,-1.0f, 1.0f);
-
- // m[1][0]
- // m[0][0]
- // m[0][0]
- // m[0][0]
- __m128 Temp0 = _mm_shuffle_ps(in[1], in[0], _MM_SHUFFLE(0, 0, 0, 0));
- __m128 Vec0 = _mm_shuffle_ps(Temp0, Temp0, _MM_SHUFFLE(2, 2, 2, 0));
-
- // m[1][1]
- // m[0][1]
- // m[0][1]
- // m[0][1]
- __m128 Temp1 = _mm_shuffle_ps(in[1], in[0], _MM_SHUFFLE(1, 1, 1, 1));
- __m128 Vec1 = _mm_shuffle_ps(Temp1, Temp1, _MM_SHUFFLE(2, 2, 2, 0));
-
- // m[1][2]
- // m[0][2]
- // m[0][2]
- // m[0][2]
- __m128 Temp2 = _mm_shuffle_ps(in[1], in[0], _MM_SHUFFLE(2, 2, 2, 2));
- __m128 Vec2 = _mm_shuffle_ps(Temp2, Temp2, _MM_SHUFFLE(2, 2, 2, 0));
-
- // m[1][3]
- // m[0][3]
- // m[0][3]
- // m[0][3]
- __m128 Temp3 = _mm_shuffle_ps(in[1], in[0], _MM_SHUFFLE(3, 3, 3, 3));
- __m128 Vec3 = _mm_shuffle_ps(Temp3, Temp3, _MM_SHUFFLE(2, 2, 2, 0));
-
- // col0
- // + (Vec1[0] * Fac0[0] - Vec2[0] * Fac1[0] + Vec3[0] * Fac2[0]),
- // - (Vec1[1] * Fac0[1] - Vec2[1] * Fac1[1] + Vec3[1] * Fac2[1]),
- // + (Vec1[2] * Fac0[2] - Vec2[2] * Fac1[2] + Vec3[2] * Fac2[2]),
- // - (Vec1[3] * Fac0[3] - Vec2[3] * Fac1[3] + Vec3[3] * Fac2[3]),
- __m128 Mul00 = _mm_mul_ps(Vec1, Fac0);
- __m128 Mul01 = _mm_mul_ps(Vec2, Fac1);
- __m128 Mul02 = _mm_mul_ps(Vec3, Fac2);
- __m128 Sub00 = _mm_sub_ps(Mul00, Mul01);
- __m128 Add00 = _mm_add_ps(Sub00, Mul02);
- __m128 Inv0 = _mm_mul_ps(SignB, Add00);
-
- // col1
- // - (Vec0[0] * Fac0[0] - Vec2[0] * Fac3[0] + Vec3[0] * Fac4[0]),
- // + (Vec0[0] * Fac0[1] - Vec2[1] * Fac3[1] + Vec3[1] * Fac4[1]),
- // - (Vec0[0] * Fac0[2] - Vec2[2] * Fac3[2] + Vec3[2] * Fac4[2]),
- // + (Vec0[0] * Fac0[3] - Vec2[3] * Fac3[3] + Vec3[3] * Fac4[3]),
- __m128 Mul03 = _mm_mul_ps(Vec0, Fac0);
- __m128 Mul04 = _mm_mul_ps(Vec2, Fac3);
- __m128 Mul05 = _mm_mul_ps(Vec3, Fac4);
- __m128 Sub01 = _mm_sub_ps(Mul03, Mul04);
- __m128 Add01 = _mm_add_ps(Sub01, Mul05);
- __m128 Inv1 = _mm_mul_ps(SignA, Add01);
-
- // col2
- // + (Vec0[0] * Fac1[0] - Vec1[0] * Fac3[0] + Vec3[0] * Fac5[0]),
- // - (Vec0[0] * Fac1[1] - Vec1[1] * Fac3[1] + Vec3[1] * Fac5[1]),
- // + (Vec0[0] * Fac1[2] - Vec1[2] * Fac3[2] + Vec3[2] * Fac5[2]),
- // - (Vec0[0] * Fac1[3] - Vec1[3] * Fac3[3] + Vec3[3] * Fac5[3]),
- __m128 Mul06 = _mm_mul_ps(Vec0, Fac1);
- __m128 Mul07 = _mm_mul_ps(Vec1, Fac3);
- __m128 Mul08 = _mm_mul_ps(Vec3, Fac5);
- __m128 Sub02 = _mm_sub_ps(Mul06, Mul07);
- __m128 Add02 = _mm_add_ps(Sub02, Mul08);
- __m128 Inv2 = _mm_mul_ps(SignB, Add02);
-
- // col3
- // - (Vec1[0] * Fac2[0] - Vec1[0] * Fac4[0] + Vec2[0] * Fac5[0]),
- // + (Vec1[0] * Fac2[1] - Vec1[1] * Fac4[1] + Vec2[1] * Fac5[1]),
- // - (Vec1[0] * Fac2[2] - Vec1[2] * Fac4[2] + Vec2[2] * Fac5[2]),
- // + (Vec1[0] * Fac2[3] - Vec1[3] * Fac4[3] + Vec2[3] * Fac5[3]));
- __m128 Mul09 = _mm_mul_ps(Vec0, Fac2);
- __m128 Mul10 = _mm_mul_ps(Vec1, Fac4);
- __m128 Mul11 = _mm_mul_ps(Vec2, Fac5);
- __m128 Sub03 = _mm_sub_ps(Mul09, Mul10);
- __m128 Add03 = _mm_add_ps(Sub03, Mul11);
- __m128 Inv3 = _mm_mul_ps(SignA, Add03);
-
- __m128 Row0 = _mm_shuffle_ps(Inv0, Inv1, _MM_SHUFFLE(0, 0, 0, 0));
- __m128 Row1 = _mm_shuffle_ps(Inv2, Inv3, _MM_SHUFFLE(0, 0, 0, 0));
- __m128 Row2 = _mm_shuffle_ps(Row0, Row1, _MM_SHUFFLE(2, 0, 2, 0));
-
- // valType Determinant = m[0][0] * Inverse[0][0]
- // + m[0][1] * Inverse[1][0]
- // + m[0][2] * Inverse[2][0]
- // + m[0][3] * Inverse[3][0];
- __m128 Det0 = sse_dot_ps(in[0], Row2);
- return Det0;
-}
-
-GLM_FUNC_QUALIFIER __m128 sse_detd_ps
-(
- __m128 const m[4]
-)
-{
- // _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(
-
- //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];
-
- // First 2 columns
- __m128 Swp2A = _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(m[2]), _MM_SHUFFLE(0, 1, 1, 2)));
- __m128 Swp3A = _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(m[3]), _MM_SHUFFLE(3, 2, 3, 3)));
- __m128 MulA = _mm_mul_ps(Swp2A, Swp3A);
-
- // Second 2 columns
- __m128 Swp2B = _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(m[2]), _MM_SHUFFLE(3, 2, 3, 3)));
- __m128 Swp3B = _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(m[3]), _MM_SHUFFLE(0, 1, 1, 2)));
- __m128 MulB = _mm_mul_ps(Swp2B, Swp3B);
-
- // Columns subtraction
- __m128 SubE = _mm_sub_ps(MulA, MulB);
-
- // Last 2 rows
- __m128 Swp2C = _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(m[2]), _MM_SHUFFLE(0, 0, 1, 2)));
- __m128 Swp3C = _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(m[3]), _MM_SHUFFLE(1, 2, 0, 0)));
- __m128 MulC = _mm_mul_ps(Swp2C, Swp3C);
- __m128 SubF = _mm_sub_ps(_mm_movehl_ps(MulC, MulC), MulC);
-
- //tvec4<T, P> DetCof(
- // + (m[1][1] * SubFactor00 - m[1][2] * SubFactor01 + m[1][3] * SubFactor02),
- // - (m[1][0] * SubFactor00 - m[1][2] * SubFactor03 + m[1][3] * SubFactor04),
- // + (m[1][0] * SubFactor01 - m[1][1] * SubFactor03 + m[1][3] * SubFactor05),
- // - (m[1][0] * SubFactor02 - m[1][1] * SubFactor04 + m[1][2] * SubFactor05));
-
- __m128 SubFacA = _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(SubE), _MM_SHUFFLE(2, 1, 0, 0)));
- __m128 SwpFacA = _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(m[1]), _MM_SHUFFLE(0, 0, 0, 1)));
- __m128 MulFacA = _mm_mul_ps(SwpFacA, SubFacA);
-
- __m128 SubTmpB = _mm_shuffle_ps(SubE, SubF, _MM_SHUFFLE(0, 0, 3, 1));
- __m128 SubFacB = _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(SubTmpB), _MM_SHUFFLE(3, 1, 1, 0)));//SubF[0], SubE[3], SubE[3], SubE[1];
- __m128 SwpFacB = _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(m[1]), _MM_SHUFFLE(1, 1, 2, 2)));
- __m128 MulFacB = _mm_mul_ps(SwpFacB, SubFacB);
-
- __m128 SubRes = _mm_sub_ps(MulFacA, MulFacB);
-
- __m128 SubTmpC = _mm_shuffle_ps(SubE, SubF, _MM_SHUFFLE(1, 0, 2, 2));
- __m128 SubFacC = _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(SubTmpC), _MM_SHUFFLE(3, 3, 2, 0)));
- __m128 SwpFacC = _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(m[1]), _MM_SHUFFLE(2, 3, 3, 3)));
- __m128 MulFacC = _mm_mul_ps(SwpFacC, SubFacC);
-
- __m128 AddRes = _mm_add_ps(SubRes, MulFacC);
- __m128 DetCof = _mm_mul_ps(AddRes, _mm_setr_ps( 1.0f,-1.0f, 1.0f,-1.0f));
-
- //return m[0][0] * DetCof[0]
- // + m[0][1] * DetCof[1]
- // + m[0][2] * DetCof[2]
- // + m[0][3] * DetCof[3];
-
- return sse_dot_ps(m[0], DetCof);
-}
-
-GLM_FUNC_QUALIFIER __m128 sse_det_ps
-(
- __m128 const m[4]
-)
-{
- // _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(add)
-
- //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];
-
- // First 2 columns
- __m128 Swp2A = _mm_shuffle_ps(m[2], m[2], _MM_SHUFFLE(0, 1, 1, 2));
- __m128 Swp3A = _mm_shuffle_ps(m[3], m[3], _MM_SHUFFLE(3, 2, 3, 3));
- __m128 MulA = _mm_mul_ps(Swp2A, Swp3A);
-
- // Second 2 columns
- __m128 Swp2B = _mm_shuffle_ps(m[2], m[2], _MM_SHUFFLE(3, 2, 3, 3));
- __m128 Swp3B = _mm_shuffle_ps(m[3], m[3], _MM_SHUFFLE(0, 1, 1, 2));
- __m128 MulB = _mm_mul_ps(Swp2B, Swp3B);
-
- // Columns subtraction
- __m128 SubE = _mm_sub_ps(MulA, MulB);
-
- // Last 2 rows
- __m128 Swp2C = _mm_shuffle_ps(m[2], m[2], _MM_SHUFFLE(0, 0, 1, 2));
- __m128 Swp3C = _mm_shuffle_ps(m[3], m[3], _MM_SHUFFLE(1, 2, 0, 0));
- __m128 MulC = _mm_mul_ps(Swp2C, Swp3C);
- __m128 SubF = _mm_sub_ps(_mm_movehl_ps(MulC, MulC), MulC);
-
- //tvec4<T, P> DetCof(
- // + (m[1][1] * SubFactor00 - m[1][2] * SubFactor01 + m[1][3] * SubFactor02),
- // - (m[1][0] * SubFactor00 - m[1][2] * SubFactor03 + m[1][3] * SubFactor04),
- // + (m[1][0] * SubFactor01 - m[1][1] * SubFactor03 + m[1][3] * SubFactor05),
- // - (m[1][0] * SubFactor02 - m[1][1] * SubFactor04 + m[1][2] * SubFactor05));
-
- __m128 SubFacA = _mm_shuffle_ps(SubE, SubE, _MM_SHUFFLE(2, 1, 0, 0));
- __m128 SwpFacA = _mm_shuffle_ps(m[1], m[1], _MM_SHUFFLE(0, 0, 0, 1));
- __m128 MulFacA = _mm_mul_ps(SwpFacA, SubFacA);
-
- __m128 SubTmpB = _mm_shuffle_ps(SubE, SubF, _MM_SHUFFLE(0, 0, 3, 1));
- __m128 SubFacB = _mm_shuffle_ps(SubTmpB, SubTmpB, _MM_SHUFFLE(3, 1, 1, 0));//SubF[0], SubE[3], SubE[3], SubE[1];
- __m128 SwpFacB = _mm_shuffle_ps(m[1], m[1], _MM_SHUFFLE(1, 1, 2, 2));
- __m128 MulFacB = _mm_mul_ps(SwpFacB, SubFacB);
-
- __m128 SubRes = _mm_sub_ps(MulFacA, MulFacB);
-
- __m128 SubTmpC = _mm_shuffle_ps(SubE, SubF, _MM_SHUFFLE(1, 0, 2, 2));
- __m128 SubFacC = _mm_shuffle_ps(SubTmpC, SubTmpC, _MM_SHUFFLE(3, 3, 2, 0));
- __m128 SwpFacC = _mm_shuffle_ps(m[1], m[1], _MM_SHUFFLE(2, 3, 3, 3));
- __m128 MulFacC = _mm_mul_ps(SwpFacC, SubFacC);
-
- __m128 AddRes = _mm_add_ps(SubRes, MulFacC);
- __m128 DetCof = _mm_mul_ps(AddRes, _mm_setr_ps( 1.0f,-1.0f, 1.0f,-1.0f));
-
- //return m[0][0] * DetCof[0]
- // + m[0][1] * DetCof[1]
- // + m[0][2] * DetCof[2]
- // + m[0][3] * DetCof[3];
-
- return sse_dot_ps(m[0], DetCof);
-}
-
-GLM_FUNC_QUALIFIER void sse_inverse_ps(__m128 const in[4], __m128 out[4])
-{
- __m128 Fac0;
- {
- // valType SubFactor00 = m[2][2] * m[3][3] - m[3][2] * m[2][3];
- // valType SubFactor00 = m[2][2] * m[3][3] - m[3][2] * m[2][3];
- // valType SubFactor06 = m[1][2] * m[3][3] - m[3][2] * m[1][3];
- // valType SubFactor13 = m[1][2] * m[2][3] - m[2][2] * m[1][3];
-
- __m128 Swp0a = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(3, 3, 3, 3));
- __m128 Swp0b = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(2, 2, 2, 2));
-
- __m128 Swp00 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(2, 2, 2, 2));
- __m128 Swp01 = _mm_shuffle_ps(Swp0a, Swp0a, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp02 = _mm_shuffle_ps(Swp0b, Swp0b, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp03 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(3, 3, 3, 3));
-
- __m128 Mul00 = _mm_mul_ps(Swp00, Swp01);
- __m128 Mul01 = _mm_mul_ps(Swp02, Swp03);
- Fac0 = _mm_sub_ps(Mul00, Mul01);
- }
-
- __m128 Fac1;
- {
- // valType SubFactor01 = m[2][1] * m[3][3] - m[3][1] * m[2][3];
- // valType SubFactor01 = m[2][1] * m[3][3] - m[3][1] * m[2][3];
- // valType SubFactor07 = m[1][1] * m[3][3] - m[3][1] * m[1][3];
- // valType SubFactor14 = m[1][1] * m[2][3] - m[2][1] * m[1][3];
-
- __m128 Swp0a = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(3, 3, 3, 3));
- __m128 Swp0b = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(1, 1, 1, 1));
-
- __m128 Swp00 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(1, 1, 1, 1));
- __m128 Swp01 = _mm_shuffle_ps(Swp0a, Swp0a, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp02 = _mm_shuffle_ps(Swp0b, Swp0b, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp03 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(3, 3, 3, 3));
-
- __m128 Mul00 = _mm_mul_ps(Swp00, Swp01);
- __m128 Mul01 = _mm_mul_ps(Swp02, Swp03);
- Fac1 = _mm_sub_ps(Mul00, Mul01);
- }
-
-
- __m128 Fac2;
- {
- // valType SubFactor02 = m[2][1] * m[3][2] - m[3][1] * m[2][2];
- // valType SubFactor02 = m[2][1] * m[3][2] - m[3][1] * m[2][2];
- // valType SubFactor08 = m[1][1] * m[3][2] - m[3][1] * m[1][2];
- // valType SubFactor15 = m[1][1] * m[2][2] - m[2][1] * m[1][2];
-
- __m128 Swp0a = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(2, 2, 2, 2));
- __m128 Swp0b = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(1, 1, 1, 1));
-
- __m128 Swp00 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(1, 1, 1, 1));
- __m128 Swp01 = _mm_shuffle_ps(Swp0a, Swp0a, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp02 = _mm_shuffle_ps(Swp0b, Swp0b, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp03 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(2, 2, 2, 2));
-
- __m128 Mul00 = _mm_mul_ps(Swp00, Swp01);
- __m128 Mul01 = _mm_mul_ps(Swp02, Swp03);
- Fac2 = _mm_sub_ps(Mul00, Mul01);
- }
-
- __m128 Fac3;
- {
- // valType SubFactor03 = m[2][0] * m[3][3] - m[3][0] * m[2][3];
- // valType SubFactor03 = m[2][0] * m[3][3] - m[3][0] * m[2][3];
- // valType SubFactor09 = m[1][0] * m[3][3] - m[3][0] * m[1][3];
- // valType SubFactor16 = m[1][0] * m[2][3] - m[2][0] * m[1][3];
-
- __m128 Swp0a = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(3, 3, 3, 3));
- __m128 Swp0b = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(0, 0, 0, 0));
-
- __m128 Swp00 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(0, 0, 0, 0));
- __m128 Swp01 = _mm_shuffle_ps(Swp0a, Swp0a, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp02 = _mm_shuffle_ps(Swp0b, Swp0b, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp03 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(3, 3, 3, 3));
-
- __m128 Mul00 = _mm_mul_ps(Swp00, Swp01);
- __m128 Mul01 = _mm_mul_ps(Swp02, Swp03);
- Fac3 = _mm_sub_ps(Mul00, Mul01);
- }
-
- __m128 Fac4;
- {
- // valType SubFactor04 = m[2][0] * m[3][2] - m[3][0] * m[2][2];
- // valType SubFactor04 = m[2][0] * m[3][2] - m[3][0] * m[2][2];
- // valType SubFactor10 = m[1][0] * m[3][2] - m[3][0] * m[1][2];
- // valType SubFactor17 = m[1][0] * m[2][2] - m[2][0] * m[1][2];
-
- __m128 Swp0a = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(2, 2, 2, 2));
- __m128 Swp0b = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(0, 0, 0, 0));
-
- __m128 Swp00 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(0, 0, 0, 0));
- __m128 Swp01 = _mm_shuffle_ps(Swp0a, Swp0a, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp02 = _mm_shuffle_ps(Swp0b, Swp0b, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp03 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(2, 2, 2, 2));
-
- __m128 Mul00 = _mm_mul_ps(Swp00, Swp01);
- __m128 Mul01 = _mm_mul_ps(Swp02, Swp03);
- Fac4 = _mm_sub_ps(Mul00, Mul01);
- }
-
- __m128 Fac5;
- {
- // valType SubFactor05 = m[2][0] * m[3][1] - m[3][0] * m[2][1];
- // valType SubFactor05 = m[2][0] * m[3][1] - m[3][0] * m[2][1];
- // valType SubFactor12 = m[1][0] * m[3][1] - m[3][0] * m[1][1];
- // valType SubFactor18 = m[1][0] * m[2][1] - m[2][0] * m[1][1];
-
- __m128 Swp0a = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(1, 1, 1, 1));
- __m128 Swp0b = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(0, 0, 0, 0));
-
- __m128 Swp00 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(0, 0, 0, 0));
- __m128 Swp01 = _mm_shuffle_ps(Swp0a, Swp0a, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp02 = _mm_shuffle_ps(Swp0b, Swp0b, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp03 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(1, 1, 1, 1));
-
- __m128 Mul00 = _mm_mul_ps(Swp00, Swp01);
- __m128 Mul01 = _mm_mul_ps(Swp02, Swp03);
- Fac5 = _mm_sub_ps(Mul00, Mul01);
- }
-
- __m128 SignA = _mm_set_ps( 1.0f,-1.0f, 1.0f,-1.0f);
- __m128 SignB = _mm_set_ps(-1.0f, 1.0f,-1.0f, 1.0f);
-
- // m[1][0]
- // m[0][0]
- // m[0][0]
- // m[0][0]
- __m128 Temp0 = _mm_shuffle_ps(in[1], in[0], _MM_SHUFFLE(0, 0, 0, 0));
- __m128 Vec0 = _mm_shuffle_ps(Temp0, Temp0, _MM_SHUFFLE(2, 2, 2, 0));
-
- // m[1][1]
- // m[0][1]
- // m[0][1]
- // m[0][1]
- __m128 Temp1 = _mm_shuffle_ps(in[1], in[0], _MM_SHUFFLE(1, 1, 1, 1));
- __m128 Vec1 = _mm_shuffle_ps(Temp1, Temp1, _MM_SHUFFLE(2, 2, 2, 0));
-
- // m[1][2]
- // m[0][2]
- // m[0][2]
- // m[0][2]
- __m128 Temp2 = _mm_shuffle_ps(in[1], in[0], _MM_SHUFFLE(2, 2, 2, 2));
- __m128 Vec2 = _mm_shuffle_ps(Temp2, Temp2, _MM_SHUFFLE(2, 2, 2, 0));
-
- // m[1][3]
- // m[0][3]
- // m[0][3]
- // m[0][3]
- __m128 Temp3 = _mm_shuffle_ps(in[1], in[0], _MM_SHUFFLE(3, 3, 3, 3));
- __m128 Vec3 = _mm_shuffle_ps(Temp3, Temp3, _MM_SHUFFLE(2, 2, 2, 0));
-
- // col0
- // + (Vec1[0] * Fac0[0] - Vec2[0] * Fac1[0] + Vec3[0] * Fac2[0]),
- // - (Vec1[1] * Fac0[1] - Vec2[1] * Fac1[1] + Vec3[1] * Fac2[1]),
- // + (Vec1[2] * Fac0[2] - Vec2[2] * Fac1[2] + Vec3[2] * Fac2[2]),
- // - (Vec1[3] * Fac0[3] - Vec2[3] * Fac1[3] + Vec3[3] * Fac2[3]),
- __m128 Mul00 = _mm_mul_ps(Vec1, Fac0);
- __m128 Mul01 = _mm_mul_ps(Vec2, Fac1);
- __m128 Mul02 = _mm_mul_ps(Vec3, Fac2);
- __m128 Sub00 = _mm_sub_ps(Mul00, Mul01);
- __m128 Add00 = _mm_add_ps(Sub00, Mul02);
- __m128 Inv0 = _mm_mul_ps(SignB, Add00);
-
- // col1
- // - (Vec0[0] * Fac0[0] - Vec2[0] * Fac3[0] + Vec3[0] * Fac4[0]),
- // + (Vec0[0] * Fac0[1] - Vec2[1] * Fac3[1] + Vec3[1] * Fac4[1]),
- // - (Vec0[0] * Fac0[2] - Vec2[2] * Fac3[2] + Vec3[2] * Fac4[2]),
- // + (Vec0[0] * Fac0[3] - Vec2[3] * Fac3[3] + Vec3[3] * Fac4[3]),
- __m128 Mul03 = _mm_mul_ps(Vec0, Fac0);
- __m128 Mul04 = _mm_mul_ps(Vec2, Fac3);
- __m128 Mul05 = _mm_mul_ps(Vec3, Fac4);
- __m128 Sub01 = _mm_sub_ps(Mul03, Mul04);
- __m128 Add01 = _mm_add_ps(Sub01, Mul05);
- __m128 Inv1 = _mm_mul_ps(SignA, Add01);
-
- // col2
- // + (Vec0[0] * Fac1[0] - Vec1[0] * Fac3[0] + Vec3[0] * Fac5[0]),
- // - (Vec0[0] * Fac1[1] - Vec1[1] * Fac3[1] + Vec3[1] * Fac5[1]),
- // + (Vec0[0] * Fac1[2] - Vec1[2] * Fac3[2] + Vec3[2] * Fac5[2]),
- // - (Vec0[0] * Fac1[3] - Vec1[3] * Fac3[3] + Vec3[3] * Fac5[3]),
- __m128 Mul06 = _mm_mul_ps(Vec0, Fac1);
- __m128 Mul07 = _mm_mul_ps(Vec1, Fac3);
- __m128 Mul08 = _mm_mul_ps(Vec3, Fac5);
- __m128 Sub02 = _mm_sub_ps(Mul06, Mul07);
- __m128 Add02 = _mm_add_ps(Sub02, Mul08);
- __m128 Inv2 = _mm_mul_ps(SignB, Add02);
-
- // col3
- // - (Vec1[0] * Fac2[0] - Vec1[0] * Fac4[0] + Vec2[0] * Fac5[0]),
- // + (Vec1[0] * Fac2[1] - Vec1[1] * Fac4[1] + Vec2[1] * Fac5[1]),
- // - (Vec1[0] * Fac2[2] - Vec1[2] * Fac4[2] + Vec2[2] * Fac5[2]),
- // + (Vec1[0] * Fac2[3] - Vec1[3] * Fac4[3] + Vec2[3] * Fac5[3]));
- __m128 Mul09 = _mm_mul_ps(Vec0, Fac2);
- __m128 Mul10 = _mm_mul_ps(Vec1, Fac4);
- __m128 Mul11 = _mm_mul_ps(Vec2, Fac5);
- __m128 Sub03 = _mm_sub_ps(Mul09, Mul10);
- __m128 Add03 = _mm_add_ps(Sub03, Mul11);
- __m128 Inv3 = _mm_mul_ps(SignA, Add03);
-
- __m128 Row0 = _mm_shuffle_ps(Inv0, Inv1, _MM_SHUFFLE(0, 0, 0, 0));
- __m128 Row1 = _mm_shuffle_ps(Inv2, Inv3, _MM_SHUFFLE(0, 0, 0, 0));
- __m128 Row2 = _mm_shuffle_ps(Row0, Row1, _MM_SHUFFLE(2, 0, 2, 0));
-
- // valType Determinant = m[0][0] * Inverse[0][0]
- // + m[0][1] * Inverse[1][0]
- // + m[0][2] * Inverse[2][0]
- // + m[0][3] * Inverse[3][0];
- __m128 Det0 = sse_dot_ps(in[0], Row2);
- __m128 Rcp0 = _mm_div_ps(one, Det0);
- //__m128 Rcp0 = _mm_rcp_ps(Det0);
-
- // Inverse /= Determinant;
- out[0] = _mm_mul_ps(Inv0, Rcp0);
- out[1] = _mm_mul_ps(Inv1, Rcp0);
- out[2] = _mm_mul_ps(Inv2, Rcp0);
- out[3] = _mm_mul_ps(Inv3, Rcp0);
-}
-
-GLM_FUNC_QUALIFIER void sse_inverse_fast_ps(__m128 const in[4], __m128 out[4])
-{
- __m128 Fac0;
- {
- // valType SubFactor00 = m[2][2] * m[3][3] - m[3][2] * m[2][3];
- // valType SubFactor00 = m[2][2] * m[3][3] - m[3][2] * m[2][3];
- // valType SubFactor06 = m[1][2] * m[3][3] - m[3][2] * m[1][3];
- // valType SubFactor13 = m[1][2] * m[2][3] - m[2][2] * m[1][3];
-
- __m128 Swp0a = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(3, 3, 3, 3));
- __m128 Swp0b = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(2, 2, 2, 2));
-
- __m128 Swp00 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(2, 2, 2, 2));
- __m128 Swp01 = _mm_shuffle_ps(Swp0a, Swp0a, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp02 = _mm_shuffle_ps(Swp0b, Swp0b, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp03 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(3, 3, 3, 3));
-
- __m128 Mul00 = _mm_mul_ps(Swp00, Swp01);
- __m128 Mul01 = _mm_mul_ps(Swp02, Swp03);
- Fac0 = _mm_sub_ps(Mul00, Mul01);
- }
-
- __m128 Fac1;
- {
- // valType SubFactor01 = m[2][1] * m[3][3] - m[3][1] * m[2][3];
- // valType SubFactor01 = m[2][1] * m[3][3] - m[3][1] * m[2][3];
- // valType SubFactor07 = m[1][1] * m[3][3] - m[3][1] * m[1][3];
- // valType SubFactor14 = m[1][1] * m[2][3] - m[2][1] * m[1][3];
-
- __m128 Swp0a = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(3, 3, 3, 3));
- __m128 Swp0b = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(1, 1, 1, 1));
-
- __m128 Swp00 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(1, 1, 1, 1));
- __m128 Swp01 = _mm_shuffle_ps(Swp0a, Swp0a, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp02 = _mm_shuffle_ps(Swp0b, Swp0b, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp03 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(3, 3, 3, 3));
-
- __m128 Mul00 = _mm_mul_ps(Swp00, Swp01);
- __m128 Mul01 = _mm_mul_ps(Swp02, Swp03);
- Fac1 = _mm_sub_ps(Mul00, Mul01);
- }
-
-
- __m128 Fac2;
- {
- // valType SubFactor02 = m[2][1] * m[3][2] - m[3][1] * m[2][2];
- // valType SubFactor02 = m[2][1] * m[3][2] - m[3][1] * m[2][2];
- // valType SubFactor08 = m[1][1] * m[3][2] - m[3][1] * m[1][2];
- // valType SubFactor15 = m[1][1] * m[2][2] - m[2][1] * m[1][2];
-
- __m128 Swp0a = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(2, 2, 2, 2));
- __m128 Swp0b = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(1, 1, 1, 1));
-
- __m128 Swp00 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(1, 1, 1, 1));
- __m128 Swp01 = _mm_shuffle_ps(Swp0a, Swp0a, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp02 = _mm_shuffle_ps(Swp0b, Swp0b, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp03 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(2, 2, 2, 2));
-
- __m128 Mul00 = _mm_mul_ps(Swp00, Swp01);
- __m128 Mul01 = _mm_mul_ps(Swp02, Swp03);
- Fac2 = _mm_sub_ps(Mul00, Mul01);
- }
-
- __m128 Fac3;
- {
- // valType SubFactor03 = m[2][0] * m[3][3] - m[3][0] * m[2][3];
- // valType SubFactor03 = m[2][0] * m[3][3] - m[3][0] * m[2][3];
- // valType SubFactor09 = m[1][0] * m[3][3] - m[3][0] * m[1][3];
- // valType SubFactor16 = m[1][0] * m[2][3] - m[2][0] * m[1][3];
-
- __m128 Swp0a = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(3, 3, 3, 3));
- __m128 Swp0b = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(0, 0, 0, 0));
-
- __m128 Swp00 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(0, 0, 0, 0));
- __m128 Swp01 = _mm_shuffle_ps(Swp0a, Swp0a, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp02 = _mm_shuffle_ps(Swp0b, Swp0b, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp03 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(3, 3, 3, 3));
-
- __m128 Mul00 = _mm_mul_ps(Swp00, Swp01);
- __m128 Mul01 = _mm_mul_ps(Swp02, Swp03);
- Fac3 = _mm_sub_ps(Mul00, Mul01);
- }
-
- __m128 Fac4;
- {
- // valType SubFactor04 = m[2][0] * m[3][2] - m[3][0] * m[2][2];
- // valType SubFactor04 = m[2][0] * m[3][2] - m[3][0] * m[2][2];
- // valType SubFactor10 = m[1][0] * m[3][2] - m[3][0] * m[1][2];
- // valType SubFactor17 = m[1][0] * m[2][2] - m[2][0] * m[1][2];
-
- __m128 Swp0a = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(2, 2, 2, 2));
- __m128 Swp0b = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(0, 0, 0, 0));
-
- __m128 Swp00 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(0, 0, 0, 0));
- __m128 Swp01 = _mm_shuffle_ps(Swp0a, Swp0a, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp02 = _mm_shuffle_ps(Swp0b, Swp0b, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp03 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(2, 2, 2, 2));
-
- __m128 Mul00 = _mm_mul_ps(Swp00, Swp01);
- __m128 Mul01 = _mm_mul_ps(Swp02, Swp03);
- Fac4 = _mm_sub_ps(Mul00, Mul01);
- }
-
- __m128 Fac5;
- {
- // valType SubFactor05 = m[2][0] * m[3][1] - m[3][0] * m[2][1];
- // valType SubFactor05 = m[2][0] * m[3][1] - m[3][0] * m[2][1];
- // valType SubFactor12 = m[1][0] * m[3][1] - m[3][0] * m[1][1];
- // valType SubFactor18 = m[1][0] * m[2][1] - m[2][0] * m[1][1];
-
- __m128 Swp0a = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(1, 1, 1, 1));
- __m128 Swp0b = _mm_shuffle_ps(in[3], in[2], _MM_SHUFFLE(0, 0, 0, 0));
-
- __m128 Swp00 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(0, 0, 0, 0));
- __m128 Swp01 = _mm_shuffle_ps(Swp0a, Swp0a, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp02 = _mm_shuffle_ps(Swp0b, Swp0b, _MM_SHUFFLE(2, 0, 0, 0));
- __m128 Swp03 = _mm_shuffle_ps(in[2], in[1], _MM_SHUFFLE(1, 1, 1, 1));
-
- __m128 Mul00 = _mm_mul_ps(Swp00, Swp01);
- __m128 Mul01 = _mm_mul_ps(Swp02, Swp03);
- Fac5 = _mm_sub_ps(Mul00, Mul01);
- }
-
- __m128 SignA = _mm_set_ps( 1.0f,-1.0f, 1.0f,-1.0f);
- __m128 SignB = _mm_set_ps(-1.0f, 1.0f,-1.0f, 1.0f);
-
- // m[1][0]
- // m[0][0]
- // m[0][0]
- // m[0][0]
- __m128 Temp0 = _mm_shuffle_ps(in[1], in[0], _MM_SHUFFLE(0, 0, 0, 0));
- __m128 Vec0 = _mm_shuffle_ps(Temp0, Temp0, _MM_SHUFFLE(2, 2, 2, 0));
-
- // m[1][1]
- // m[0][1]
- // m[0][1]
- // m[0][1]
- __m128 Temp1 = _mm_shuffle_ps(in[1], in[0], _MM_SHUFFLE(1, 1, 1, 1));
- __m128 Vec1 = _mm_shuffle_ps(Temp1, Temp1, _MM_SHUFFLE(2, 2, 2, 0));
-
- // m[1][2]
- // m[0][2]
- // m[0][2]
- // m[0][2]
- __m128 Temp2 = _mm_shuffle_ps(in[1], in[0], _MM_SHUFFLE(2, 2, 2, 2));
- __m128 Vec2 = _mm_shuffle_ps(Temp2, Temp2, _MM_SHUFFLE(2, 2, 2, 0));
-
- // m[1][3]
- // m[0][3]
- // m[0][3]
- // m[0][3]
- __m128 Temp3 = _mm_shuffle_ps(in[1], in[0], _MM_SHUFFLE(3, 3, 3, 3));
- __m128 Vec3 = _mm_shuffle_ps(Temp3, Temp3, _MM_SHUFFLE(2, 2, 2, 0));
-
- // col0
- // + (Vec1[0] * Fac0[0] - Vec2[0] * Fac1[0] + Vec3[0] * Fac2[0]),
- // - (Vec1[1] * Fac0[1] - Vec2[1] * Fac1[1] + Vec3[1] * Fac2[1]),
- // + (Vec1[2] * Fac0[2] - Vec2[2] * Fac1[2] + Vec3[2] * Fac2[2]),
- // - (Vec1[3] * Fac0[3] - Vec2[3] * Fac1[3] + Vec3[3] * Fac2[3]),
- __m128 Mul00 = _mm_mul_ps(Vec1, Fac0);
- __m128 Mul01 = _mm_mul_ps(Vec2, Fac1);
- __m128 Mul02 = _mm_mul_ps(Vec3, Fac2);
- __m128 Sub00 = _mm_sub_ps(Mul00, Mul01);
- __m128 Add00 = _mm_add_ps(Sub00, Mul02);
- __m128 Inv0 = _mm_mul_ps(SignB, Add00);
-
- // col1
- // - (Vec0[0] * Fac0[0] - Vec2[0] * Fac3[0] + Vec3[0] * Fac4[0]),
- // + (Vec0[0] * Fac0[1] - Vec2[1] * Fac3[1] + Vec3[1] * Fac4[1]),
- // - (Vec0[0] * Fac0[2] - Vec2[2] * Fac3[2] + Vec3[2] * Fac4[2]),
- // + (Vec0[0] * Fac0[3] - Vec2[3] * Fac3[3] + Vec3[3] * Fac4[3]),
- __m128 Mul03 = _mm_mul_ps(Vec0, Fac0);
- __m128 Mul04 = _mm_mul_ps(Vec2, Fac3);
- __m128 Mul05 = _mm_mul_ps(Vec3, Fac4);
- __m128 Sub01 = _mm_sub_ps(Mul03, Mul04);
- __m128 Add01 = _mm_add_ps(Sub01, Mul05);
- __m128 Inv1 = _mm_mul_ps(SignA, Add01);
-
- // col2
- // + (Vec0[0] * Fac1[0] - Vec1[0] * Fac3[0] + Vec3[0] * Fac5[0]),
- // - (Vec0[0] * Fac1[1] - Vec1[1] * Fac3[1] + Vec3[1] * Fac5[1]),
- // + (Vec0[0] * Fac1[2] - Vec1[2] * Fac3[2] + Vec3[2] * Fac5[2]),
- // - (Vec0[0] * Fac1[3] - Vec1[3] * Fac3[3] + Vec3[3] * Fac5[3]),
- __m128 Mul06 = _mm_mul_ps(Vec0, Fac1);
- __m128 Mul07 = _mm_mul_ps(Vec1, Fac3);
- __m128 Mul08 = _mm_mul_ps(Vec3, Fac5);
- __m128 Sub02 = _mm_sub_ps(Mul06, Mul07);
- __m128 Add02 = _mm_add_ps(Sub02, Mul08);
- __m128 Inv2 = _mm_mul_ps(SignB, Add02);
-
- // col3
- // - (Vec1[0] * Fac2[0] - Vec1[0] * Fac4[0] + Vec2[0] * Fac5[0]),
- // + (Vec1[0] * Fac2[1] - Vec1[1] * Fac4[1] + Vec2[1] * Fac5[1]),
- // - (Vec1[0] * Fac2[2] - Vec1[2] * Fac4[2] + Vec2[2] * Fac5[2]),
- // + (Vec1[0] * Fac2[3] - Vec1[3] * Fac4[3] + Vec2[3] * Fac5[3]));
- __m128 Mul09 = _mm_mul_ps(Vec0, Fac2);
- __m128 Mul10 = _mm_mul_ps(Vec1, Fac4);
- __m128 Mul11 = _mm_mul_ps(Vec2, Fac5);
- __m128 Sub03 = _mm_sub_ps(Mul09, Mul10);
- __m128 Add03 = _mm_add_ps(Sub03, Mul11);
- __m128 Inv3 = _mm_mul_ps(SignA, Add03);
-
- __m128 Row0 = _mm_shuffle_ps(Inv0, Inv1, _MM_SHUFFLE(0, 0, 0, 0));
- __m128 Row1 = _mm_shuffle_ps(Inv2, Inv3, _MM_SHUFFLE(0, 0, 0, 0));
- __m128 Row2 = _mm_shuffle_ps(Row0, Row1, _MM_SHUFFLE(2, 0, 2, 0));
-
- // valType Determinant = m[0][0] * Inverse[0][0]
- // + m[0][1] * Inverse[1][0]
- // + m[0][2] * Inverse[2][0]
- // + m[0][3] * Inverse[3][0];
- __m128 Det0 = sse_dot_ps(in[0], Row2);
- __m128 Rcp0 = _mm_rcp_ps(Det0);
- //__m128 Rcp0 = _mm_div_ps(one, Det0);
- // Inverse /= Determinant;
- out[0] = _mm_mul_ps(Inv0, Rcp0);
- out[1] = _mm_mul_ps(Inv1, Rcp0);
- out[2] = _mm_mul_ps(Inv2, Rcp0);
- out[3] = _mm_mul_ps(Inv3, Rcp0);
-}
-/*
-GLM_FUNC_QUALIFIER void sse_rotate_ps(__m128 const in[4], float Angle, float const v[3], __m128 out[4])
-{
- float a = glm::radians(Angle);
- float c = cos(a);
- float s = sin(a);
-
- glm::vec4 AxisA(v[0], v[1], v[2], float(0));
- __m128 AxisB = _mm_set_ps(AxisA.w, AxisA.z, AxisA.y, AxisA.x);
- __m128 AxisC = detail::sse_nrm_ps(AxisB);
-
- __m128 Cos0 = _mm_set_ss(c);
- __m128 CosA = _mm_shuffle_ps(Cos0, Cos0, _MM_SHUFFLE(0, 0, 0, 0));
- __m128 Sin0 = _mm_set_ss(s);
- __m128 SinA = _mm_shuffle_ps(Sin0, Sin0, _MM_SHUFFLE(0, 0, 0, 0));
-
- // tvec3<T, P> temp = (valType(1) - c) * axis;
- __m128 Temp0 = _mm_sub_ps(one, CosA);
- __m128 Temp1 = _mm_mul_ps(Temp0, AxisC);
-
- //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];
- __m128 Axis0 = _mm_shuffle_ps(AxisC, AxisC, _MM_SHUFFLE(0, 0, 0, 0));
- __m128 TmpA0 = _mm_mul_ps(Axis0, AxisC);
- __m128 CosA0 = _mm_shuffle_ps(Cos0, Cos0, _MM_SHUFFLE(1, 1, 1, 0));
- __m128 TmpA1 = _mm_add_ps(CosA0, TmpA0);
- __m128 SinA0 = SinA;//_mm_set_ps(0.0f, s, -s, 0.0f);
- __m128 TmpA2 = _mm_shuffle_ps(AxisC, AxisC, _MM_SHUFFLE(3, 1, 2, 3));
- __m128 TmpA3 = _mm_mul_ps(SinA0, TmpA2);
- __m128 TmpA4 = _mm_add_ps(TmpA1, TmpA3);
-
- //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];
- __m128 Axis1 = _mm_shuffle_ps(AxisC, AxisC, _MM_SHUFFLE(1, 1, 1, 1));
- __m128 TmpB0 = _mm_mul_ps(Axis1, AxisC);
- __m128 CosA1 = _mm_shuffle_ps(Cos0, Cos0, _MM_SHUFFLE(1, 1, 0, 1));
- __m128 TmpB1 = _mm_add_ps(CosA1, TmpB0);
- __m128 SinB0 = SinA;//_mm_set_ps(-s, 0.0f, s, 0.0f);
- __m128 TmpB2 = _mm_shuffle_ps(AxisC, AxisC, _MM_SHUFFLE(3, 0, 3, 2));
- __m128 TmpB3 = _mm_mul_ps(SinA0, TmpB2);
- __m128 TmpB4 = _mm_add_ps(TmpB1, TmpB3);
-
- //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];
- __m128 Axis2 = _mm_shuffle_ps(AxisC, AxisC, _MM_SHUFFLE(2, 2, 2, 2));
- __m128 TmpC0 = _mm_mul_ps(Axis2, AxisC);
- __m128 CosA2 = _mm_shuffle_ps(Cos0, Cos0, _MM_SHUFFLE(1, 0, 1, 1));
- __m128 TmpC1 = _mm_add_ps(CosA2, TmpC0);
- __m128 SinC0 = SinA;//_mm_set_ps(s, -s, 0.0f, 0.0f);
- __m128 TmpC2 = _mm_shuffle_ps(AxisC, AxisC, _MM_SHUFFLE(3, 3, 0, 1));
- __m128 TmpC3 = _mm_mul_ps(SinA0, TmpC2);
- __m128 TmpC4 = _mm_add_ps(TmpC1, TmpC3);
-
- __m128 Result[4];
- Result[0] = TmpA4;
- Result[1] = TmpB4;
- Result[2] = TmpC4;
- Result[3] = _mm_set_ps(1, 0, 0, 0);
-
- //tmat4x4<valType> 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;
- sse_mul_ps(in, Result, out);
-}
-*/
-GLM_FUNC_QUALIFIER void sse_outer_ps(__m128 const & c, __m128 const & r, __m128 out[4])
-{
- out[0] = _mm_mul_ps(c, _mm_shuffle_ps(r, r, _MM_SHUFFLE(0, 0, 0, 0)));
- out[1] = _mm_mul_ps(c, _mm_shuffle_ps(r, r, _MM_SHUFFLE(1, 1, 1, 1)));
- out[2] = _mm_mul_ps(c, _mm_shuffle_ps(r, r, _MM_SHUFFLE(2, 2, 2, 2)));
- out[3] = _mm_mul_ps(c, _mm_shuffle_ps(r, r, _MM_SHUFFLE(3, 3, 3, 3)));
-}
-
-}//namespace detail
-}//namespace glm
diff --git a/inc/glm/detail/intrinsic_trigonometric.hpp b/inc/glm/detail/intrinsic_trigonometric.hpp deleted file mode 100644 index 78888b1..0000000 --- a/inc/glm/detail/intrinsic_trigonometric.hpp +++ /dev/null @@ -1,46 +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.
-///
-/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-/// THE SOFTWARE.
-///
-/// @ref core
-/// @file glm/detail/intrinsic_trigonometric.hpp
-/// @date 2009-06-09 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "setup.hpp"
-
-#if(!(GLM_ARCH & GLM_ARCH_SSE2))
-# error "SSE2 instructions not supported or enabled"
-#else
-
-namespace glm{
-namespace detail
-{
-
-}//namespace detail
-}//namespace glm
-
-#include "intrinsic_trigonometric.inl"
-
-#endif//GLM_ARCH
diff --git a/inc/glm/detail/intrinsic_trigonometric.inl b/inc/glm/detail/intrinsic_trigonometric.inl deleted file mode 100644 index badf934..0000000 --- a/inc/glm/detail/intrinsic_trigonometric.inl +++ /dev/null @@ -1,27 +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.
-///
-/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-/// THE SOFTWARE.
-///
-/// @ref core
-/// @file glm/detail/intrinsic_trigonometric.inl
-/// @date 2011-06-15 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
diff --git a/inc/glm/detail/intrinsic_vector_relational.hpp b/inc/glm/detail/intrinsic_vector_relational.hpp deleted file mode 100644 index d34541f..0000000 --- a/inc/glm/detail/intrinsic_vector_relational.hpp +++ /dev/null @@ -1,46 +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.
-///
-/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-/// THE SOFTWARE.
-///
-/// @ref core
-/// @file glm/detail/intrinsic_vector_relational.hpp
-/// @date 2009-06-09 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "setup.hpp"
-
-#if(!(GLM_ARCH & GLM_ARCH_SSE2))
-# error "SSE2 instructions not supported or enabled"
-#else
-
-namespace glm{
-namespace detail
-{
-
-}//namespace detail
-}//namespace glm
-
-#include "intrinsic_vector_relational.inl"
-
-#endif//GLM_ARCH
diff --git a/inc/glm/detail/intrinsic_vector_relational.inl b/inc/glm/detail/intrinsic_vector_relational.inl deleted file mode 100644 index 4b23082..0000000 --- a/inc/glm/detail/intrinsic_vector_relational.inl +++ /dev/null @@ -1,366 +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.
-///
-/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-/// THE SOFTWARE.
-///
-/// @ref core
-/// @file glm/detail/intrinsic_vector_relational.inl
-/// @date 2009-06-09 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-//
-//// lessThan
-//template <typename valType>
-//GLM_FUNC_QUALIFIER typename tvec2<T, P>::bool_type lessThan
-//(
-// tvec2<T, P> const & x,
-// tvec2<T, P> const & y
-//)
-//{
-// GLM_STATIC_ASSERT(
-// detail::type<valType>::is_float ||
-// detail::type<valType>::is_int ||
-// detail::type<valType>::is_uint);
-//
-// return typename tvec2<bool>::bool_type(x.x < y.x, x.y < y.y);
-//}
-//
-//template <typename valType>
-//GLM_FUNC_QUALIFIER typename tvec3<T, P>::bool_type lessThan
-//(
-// tvec3<T, P> const & x,
-// tvec3<T, P> const & y
-//)
-//{
-// GLM_STATIC_ASSERT(
-// detail::type<valType>::is_float ||
-// detail::type<valType>::is_int ||
-// detail::type<valType>::is_uint);
-//
-// return typename tvec3<bool>::bool_type(x.x < y.x, x.y < y.y, x.z < y.z);
-//}
-//
-//template <typename valType>
-//GLM_FUNC_QUALIFIER typename tvec4<T, P>::bool_type lessThan
-//(
-// tvec4<T, P> const & x,
-// tvec4<T, P> const & y
-//)
-//{
-// GLM_STATIC_ASSERT(
-// detail::type<valType>::is_float ||
-// detail::type<valType>::is_int ||
-// detail::type<valType>::is_uint);
-//
-// return typename tvec4<bool>::bool_type(x.x < y.x, x.y < y.y, x.z < y.z, x.w < y.w);
-//}
-//
-//// lessThanEqual
-//template <typename valType>
-//GLM_FUNC_QUALIFIER typename tvec2<T, P>::bool_type lessThanEqual
-//(
-// tvec2<T, P> const & x,
-// tvec2<T, P> const & y
-//)
-//{
-// GLM_STATIC_ASSERT(
-// detail::type<valType>::is_float ||
-// detail::type<valType>::is_int ||
-// detail::type<valType>::is_uint);
-//
-// return typename tvec2<bool>::bool_type(x.x <= y.x, x.y <= y.y);
-//}
-//
-//template <typename valType>
-//GLM_FUNC_QUALIFIER typename tvec3<T, P>::bool_type lessThanEqual
-//(
-// tvec3<T, P> const & x,
-// tvec3<T, P> const & y
-//)
-//{
-// GLM_STATIC_ASSERT(
-// detail::type<valType>::is_float ||
-// detail::type<valType>::is_int ||
-// detail::type<valType>::is_uint);
-//
-// return typename tvec3<bool>::bool_type(x.x <= y.x, x.y <= y.y, x.z <= y.z);
-//}
-//
-//template <typename valType>
-//GLM_FUNC_QUALIFIER typename tvec4<T, P>::bool_type lessThanEqual
-//(
-// tvec4<T, P> const & x,
-// tvec4<T, P> const & y
-//)
-//{
-// GLM_STATIC_ASSERT(
-// detail::type<valType>::is_float ||
-// detail::type<valType>::is_int ||
-// detail::type<valType>::is_uint);
-//
-// return typename tvec4<bool>::bool_type(x.x <= y.x, x.y <= y.y, x.z <= y.z, x.w <= y.w);
-//}
-//
-//// greaterThan
-//template <typename valType>
-//GLM_FUNC_QUALIFIER typename tvec2<T, P>::bool_type greaterThan
-//(
-// tvec2<T, P> const & x,
-// tvec2<T, P> const & y
-//)
-//{
-// GLM_STATIC_ASSERT(
-// detail::type<valType>::is_float ||
-// detail::type<valType>::is_int ||
-// detail::type<valType>::is_uint);
-//
-// return typename tvec2<bool>::bool_type(x.x > y.x, x.y > y.y);
-//}
-//
-//template <typename valType>
-//GLM_FUNC_QUALIFIER typename tvec3<T, P>::bool_type greaterThan
-//(
-// tvec3<T, P> const & x,
-// tvec3<T, P> const & y
-//)
-//{
-// GLM_STATIC_ASSERT(
-// detail::type<valType>::is_float ||
-// detail::type<valType>::is_int ||
-// detail::type<valType>::is_uint);
-//
-// return typename tvec3<bool>::bool_type(x.x > y.x, x.y > y.y, x.z > y.z);
-//}
-//
-//template <typename valType>
-//GLM_FUNC_QUALIFIER typename tvec4<T, P>::bool_type greaterThan
-//(
-// tvec4<T, P> const & x,
-// tvec4<T, P> const & y
-//)
-//{
-// GLM_STATIC_ASSERT(
-// detail::type<valType>::is_float ||
-// detail::type<valType>::is_int ||
-// detail::type<valType>::is_uint);
-//
-// return typename tvec4<bool>::bool_type(x.x > y.x, x.y > y.y, x.z > y.z, x.w > y.w);
-//}
-//
-//// greaterThanEqual
-//template <typename valType>
-//GLM_FUNC_QUALIFIER typename tvec2<T, P>::bool_type greaterThanEqual
-//(
-// tvec2<T, P> const & x,
-// tvec2<T, P> const & y
-//)
-//{
-// GLM_STATIC_ASSERT(
-// detail::type<valType>::is_float ||
-// detail::type<valType>::is_int ||
-// detail::type<valType>::is_uint);
-//
-// return typename tvec2<bool>::bool_type(x.x >= y.x, x.y >= y.y);
-//}
-//
-//template <typename valType>
-//GLM_FUNC_QUALIFIER typename tvec3<T, P>::bool_type greaterThanEqual
-//(
-// tvec3<T, P> const & x,
-// tvec3<T, P> const & y
-//)
-//{
-// GLM_STATIC_ASSERT(
-// detail::type<valType>::is_float ||
-// detail::type<valType>::is_int ||
-// detail::type<valType>::is_uint);
-//
-// return typename tvec3<bool>::bool_type(x.x >= y.x, x.y >= y.y, x.z >= y.z);
-//}
-//
-//template <typename valType>
-//GLM_FUNC_QUALIFIER typename tvec4<T, P>::bool_type greaterThanEqual
-//(
-// tvec4<T, P> const & x,
-// tvec4<T, P> const & y
-//)
-//{
-// GLM_STATIC_ASSERT(
-// detail::type<valType>::is_float ||
-// detail::type<valType>::is_int ||
-// detail::type<valType>::is_uint);
-//
-// return typename tvec4<bool>::bool_type(x.x >= y.x, x.y >= y.y, x.z >= y.z, x.w >= y.w);
-//}
-//
-//// equal
-//template <typename valType>
-//GLM_FUNC_QUALIFIER typename tvec2<T, P>::bool_type equal
-//(
-// tvec2<T, P> const & x,
-// tvec2<T, P> const & y
-//)
-//{
-// GLM_STATIC_ASSERT(
-// detail::type<valType>::is_float ||
-// detail::type<valType>::is_int ||
-// detail::type<valType>::is_uint ||
-// detail::type<valType>::is_bool);
-//
-// return typename tvec2<T, P>::bool_type(x.x == y.x, x.y == y.y);
-//}
-//
-//template <typename valType>
-//GLM_FUNC_QUALIFIER typename tvec3<T, P>::bool_type equal
-//(
-// tvec3<T, P> const & x,
-// tvec3<T, P> const & y
-//)
-//{
-// GLM_STATIC_ASSERT(
-// detail::type<valType>::is_float ||
-// detail::type<valType>::is_int ||
-// detail::type<valType>::is_uint ||
-// detail::type<valType>::is_bool);
-//
-// return typename tvec3<T, P>::bool_type(x.x == y.x, x.y == y.y, x.z == y.z);
-//}
-//
-//template <typename valType>
-//GLM_FUNC_QUALIFIER typename tvec4<T, P>::bool_type equal
-//(
-// tvec4<T, P> const & x,
-// tvec4<T, P> const & y
-//)
-//{
-// GLM_STATIC_ASSERT(
-// detail::type<valType>::is_float ||
-// detail::type<valType>::is_int ||
-// detail::type<valType>::is_uint ||
-// detail::type<valType>::is_bool);
-//
-// return typename tvec4<T, P>::bool_type(x.x == y.x, x.y == y.y, x.z == y.z, x.w == y.w);
-//}
-//
-//// notEqual
-//template <typename valType>
-//GLM_FUNC_QUALIFIER typename tvec2<T, P>::bool_type notEqual
-//(
-// tvec2<T, P> const & x,
-// tvec2<T, P> const & y
-//)
-//{
-// GLM_STATIC_ASSERT(
-// detail::type<valType>::is_float ||
-// detail::type<valType>::is_int ||
-// detail::type<valType>::is_uint ||
-// detail::type<valType>::is_bool);
-//
-// return typename tvec2<T, P>::bool_type(x.x != y.x, x.y != y.y);
-//}
-//
-//template <typename valType>
-//GLM_FUNC_QUALIFIER typename tvec3<T, P>::bool_type notEqual
-//(
-// tvec3<T, P> const & x,
-// tvec3<T, P> const & y
-//)
-//{
-// GLM_STATIC_ASSERT(
-// detail::type<valType>::is_float ||
-// detail::type<valType>::is_int ||
-// detail::type<valType>::is_uint ||
-// detail::type<valType>::is_bool);
-//
-// return typename tvec3<T, P>::bool_type(x.x != y.x, x.y != y.y, x.z != y.z);
-//}
-//
-//template <typename valType>
-//GLM_FUNC_QUALIFIER typename tvec4<T, P>::bool_type notEqual
-//(
-// tvec4<T, P> const & x,
-// tvec4<T, P> const & y
-//)
-//{
-// GLM_STATIC_ASSERT(
-// detail::type<valType>::is_float ||
-// detail::type<valType>::is_int ||
-// detail::type<valType>::is_uint ||
-// detail::type<valType>::is_bool);
-//
-// return typename tvec4<T, P>::bool_type(x.x != y.x, x.y != y.y, x.z != y.z, x.w != y.w);
-//}
-//
-//// any
-//GLM_FUNC_QUALIFIER bool any(tvec2<bool> const & x)
-//{
-// return x.x || x.y;
-//}
-//
-//GLM_FUNC_QUALIFIER bool any(tvec3<bool> const & x)
-//{
-// return x.x || x.y || x.z;
-//}
-//
-//GLM_FUNC_QUALIFIER bool any(tvec4<bool> const & x)
-//{
-// return x.x || x.y || x.z || x.w;
-//}
-//
-//// all
-//GLM_FUNC_QUALIFIER bool all(const tvec2<bool>& x)
-//{
-// return x.x && x.y;
-//}
-//
-//GLM_FUNC_QUALIFIER bool all(const tvec3<bool>& x)
-//{
-// return x.x && x.y && x.z;
-//}
-//
-//GLM_FUNC_QUALIFIER bool all(const tvec4<bool>& x)
-//{
-// return x.x && x.y && x.z && x.w;
-//}
-//
-//// not
-//GLM_FUNC_QUALIFIER tvec2<bool>::bool_type not_
-//(
-// tvec2<bool> const & v
-//)
-//{
-// return tvec2<bool>::bool_type(!v.x, !v.y);
-//}
-//
-//GLM_FUNC_QUALIFIER tvec3<bool>::bool_type not_
-//(
-// tvec3<bool> const & v
-//)
-//{
-// return tvec3<bool>::bool_type(!v.x, !v.y, !v.z);
-//}
-//
-//GLM_FUNC_QUALIFIER tvec4<bool>::bool_type not_
-//(
-// tvec4<bool> const & v
-//)
-//{
-// return tvec4<bool>::bool_type(!v.x, !v.y, !v.z, !v.w);
-//}
\ No newline at end of file diff --git a/inc/glm/detail/precision.hpp b/inc/glm/detail/precision.hpp deleted file mode 100644 index 581503a..0000000 --- a/inc/glm/detail/precision.hpp +++ /dev/null @@ -1,44 +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 core
-/// @file glm/detail/precision.hpp
-/// @date 2013-04-01 / 2013-04-01
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-namespace glm
-{
- enum precision
- {
- highp,
- mediump,
- lowp,
- defaultp = highp
- };
-}//namespace glm
diff --git a/inc/glm/detail/setup.hpp b/inc/glm/detail/setup.hpp deleted file mode 100644 index 2d2a1d5..0000000 --- a/inc/glm/detail/setup.hpp +++ /dev/null @@ -1,963 +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 core
-/// @file glm/detail/setup.hpp
-/// @date 2006-11-13 / 2014-10-05
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include <cassert>
-#include <cstddef>
-
-///////////////////////////////////////////////////////////////////////////////////
-// Version
-
-#define GLM_VERSION 96
-#define GLM_VERSION_MAJOR 0
-#define GLM_VERSION_MINOR 9
-#define GLM_VERSION_PATCH 6
-#define GLM_VERSION_REVISION 3
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_VERSION_DISPLAYED))
-# define GLM_MESSAGE_VERSION_DISPLAYED
-# pragma message ("GLM: version 0.9.6.3")
-#endif//GLM_MESSAGE
-
-///////////////////////////////////////////////////////////////////////////////////
-// Platform
-
-#define GLM_PLATFORM_UNKNOWN 0x00000000
-#define GLM_PLATFORM_WINDOWS 0x00010000
-#define GLM_PLATFORM_LINUX 0x00020000
-#define GLM_PLATFORM_APPLE 0x00040000
-//#define GLM_PLATFORM_IOS 0x00080000
-#define GLM_PLATFORM_ANDROID 0x00100000
-#define GLM_PLATFORM_CHROME_NACL 0x00200000
-#define GLM_PLATFORM_UNIX 0x00400000
-#define GLM_PLATFORM_QNXNTO 0x00800000
-#define GLM_PLATFORM_WINCE 0x01000000
-
-#ifdef GLM_FORCE_PLATFORM_UNKNOWN
-# define GLM_PLATFORM GLM_PLATFORM_UNKNOWN
-#elif defined(__QNXNTO__)
-# define GLM_PLATFORM GLM_PLATFORM_QNXNTO
-#elif defined(__APPLE__)
-# define GLM_PLATFORM GLM_PLATFORM_APPLE
-#elif defined(WINCE)
-# define GLM_PLATFORM GLM_PLATFORM_WINCE
-#elif defined(_WIN32)
-# define GLM_PLATFORM GLM_PLATFORM_WINDOWS
-#elif defined(__native_client__)
-# define GLM_PLATFORM GLM_PLATFORM_CHROME_NACL
-#elif defined(__ANDROID__)
-# define GLM_PLATFORM GLM_PLATFORM_ANDROID
-#elif defined(__linux)
-# define GLM_PLATFORM GLM_PLATFORM_LINUX
-#elif defined(__unix)
-# define GLM_PLATFORM GLM_PLATFORM_UNIX
-#else
-# define GLM_PLATFORM GLM_PLATFORM_UNKNOWN
-#endif//
-
-// Report platform detection
-#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_PLATFORM_DISPLAYED))
-# define GLM_MESSAGE_PLATFORM_DISPLAYED
-# if(GLM_PLATFORM & GLM_PLATFORM_QNXNTO)
-# pragma message("GLM: QNX platform detected")
-//# elif(GLM_PLATFORM & GLM_PLATFORM_IOS)
-//# pragma message("GLM: iOS platform detected")
-# elif(GLM_PLATFORM & GLM_PLATFORM_APPLE)
-# pragma message("GLM: Apple platform detected")
-# elif(GLM_PLATFORM & GLM_PLATFORM_WINCE)
-# pragma message("GLM: WinCE platform detected")
-# elif(GLM_PLATFORM & GLM_PLATFORM_WINDOWS)
-# pragma message("GLM: Windows platform detected")
-# elif(GLM_PLATFORM & GLM_PLATFORM_CHROME_NACL)
-# pragma message("GLM: Native Client detected")
-# elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
-# pragma message("GLM: Android platform detected")
-# elif(GLM_PLATFORM & GLM_PLATFORM_LINUX)
-# pragma message("GLM: Linux platform detected")
-# elif(GLM_PLATFORM & GLM_PLATFORM_UNIX)
-# pragma message("GLM: UNIX platform detected")
-# elif(GLM_PLATFORM & GLM_PLATFORM_UNKNOWN)
-# pragma message("GLM: platform unknown")
-# else
-# pragma message("GLM: platform not detected")
-# endif
-#endif//GLM_MESSAGE
-
-///////////////////////////////////////////////////////////////////////////////////
-// Compiler
-
-// User defines: GLM_FORCE_COMPILER_UNKNOWN
-// TODO ? __llvm__
-
-#define GLM_COMPILER_UNKNOWN 0x00000000
-
-// Intel
-#define GLM_COMPILER_INTEL 0x00100000
-#define GLM_COMPILER_INTEL12 0x00100010
-#define GLM_COMPILER_INTEL12_1 0x00100020
-#define GLM_COMPILER_INTEL13 0x00100030
-#define GLM_COMPILER_INTEL14 0x00100040
-#define GLM_COMPILER_INTEL15 0x00100050
-
-// Visual C++ defines
-#define GLM_COMPILER_VC 0x01000000
-#define GLM_COMPILER_VC2010 0x01000090
-#define GLM_COMPILER_VC2012 0x010000A0
-#define GLM_COMPILER_VC2013 0x010000B0
-#define GLM_COMPILER_VC2015 0x010000C0
-
-// GCC defines
-#define GLM_COMPILER_GCC 0x02000000
-#define GLM_COMPILER_GCC44 0x020000B0
-#define GLM_COMPILER_GCC45 0x020000C0
-#define GLM_COMPILER_GCC46 0x020000D0
-#define GLM_COMPILER_GCC47 0x020000E0
-#define GLM_COMPILER_GCC48 0x020000F0
-#define GLM_COMPILER_GCC49 0x02000100
-#define GLM_COMPILER_GCC50 0x02000200
-
-// CUDA
-#define GLM_COMPILER_CUDA 0x10000000
-#define GLM_COMPILER_CUDA40 0x10000040
-#define GLM_COMPILER_CUDA41 0x10000050
-#define GLM_COMPILER_CUDA42 0x10000060
-#define GLM_COMPILER_CUDA50 0x10000070
-#define GLM_COMPILER_CUDA60 0x10000080
-#define GLM_COMPILER_CUDA65 0x10000090
-
-// LLVM
-#define GLM_COMPILER_LLVM 0x20000000
-#define GLM_COMPILER_LLVM32 0x20000030
-#define GLM_COMPILER_LLVM33 0x20000040
-#define GLM_COMPILER_LLVM34 0x20000050
-#define GLM_COMPILER_LLVM35 0x20000060
-
-// Apple Clang
-#define GLM_COMPILER_APPLE_CLANG 0x40000000
-#define GLM_COMPILER_APPLE_CLANG40 0x40000010
-#define GLM_COMPILER_APPLE_CLANG41 0x40000020
-#define GLM_COMPILER_APPLE_CLANG42 0x40000030
-#define GLM_COMPILER_APPLE_CLANG50 0x40000040
-#define GLM_COMPILER_APPLE_CLANG51 0x40000050
-#define GLM_COMPILER_APPLE_CLANG60 0x40000060
-
-// Build model
-#define GLM_MODEL_32 0x00000010
-#define GLM_MODEL_64 0x00000020
-
-// Force generic C++ compiler
-#ifdef GLM_FORCE_COMPILER_UNKNOWN
-# define GLM_COMPILER GLM_COMPILER_UNKNOWN
-
-#elif defined(__INTEL_COMPILER)
-# if __INTEL_COMPILER == 1200
-# define GLM_COMPILER GLM_COMPILER_INTEL12
-# elif __INTEL_COMPILER == 1210
-# define GLM_COMPILER GLM_COMPILER_INTEL12_1
-# elif __INTEL_COMPILER == 1300
-# define GLM_COMPILER GLM_COMPILER_INTEL13
-# elif __INTEL_COMPILER == 1400
-# define GLM_COMPILER GLM_COMPILER_INTEL14
-# elif __INTEL_COMPILER >= 1500
-# define GLM_COMPILER GLM_COMPILER_INTEL15
-# else
-# define GLM_COMPILER GLM_COMPILER_INTEL
-# endif
-
-// CUDA
-#elif defined(__CUDACC__)
-# if !defined(CUDA_VERSION) && !defined(GLM_FORCE_CUDA)
-# include <cuda.h> // make sure version is defined since nvcc does not define it itself!
-# endif
-# if CUDA_VERSION < 3000
-# error "GLM requires CUDA 3.0 or higher"
-# else
-# define GLM_COMPILER GLM_COMPILER_CUDA
-# endif
-
-// Visual C++
-#elif defined(_MSC_VER)
-# if _MSC_VER < 1600
-# error "GLM requires Visual C++ 2010 or higher"
-# elif _MSC_VER == 1600
-# define GLM_COMPILER GLM_COMPILER_VC2010
-# elif _MSC_VER == 1700
-# define GLM_COMPILER GLM_COMPILER_VC2012
-# elif _MSC_VER == 1800
-# define GLM_COMPILER GLM_COMPILER_VC2013
-# elif _MSC_VER >= 1900
-# define GLM_COMPILER GLM_COMPILER_VC2015
-# else//_MSC_VER
-# define GLM_COMPILER GLM_COMPILER_VC
-# endif//_MSC_VER
-
-// Clang
-#elif defined(__clang__)
-# if GLM_PLATFORM & GLM_PLATFORM_APPLE
-# if __clang_major__ == 4 && __clang_minor__ == 0
-# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG40
-# elif __clang_major__ == 4 && __clang_minor__ == 1
-# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG41
-# elif __clang_major__ == 4 && __clang_minor__ == 2
-# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG42
-# elif __clang_major__ == 5 && __clang_minor__ == 0
-# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG50
-# elif __clang_major__ == 5 && __clang_minor__ == 1
-# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG51
-# elif __clang_major__ >= 6
-# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG60
-# endif
-# else
-# if __clang_major__ == 3 && __clang_minor__ == 0
-# define GLM_COMPILER GLM_COMPILER_LLVM30
-# elif __clang_major__ == 3 && __clang_minor__ == 1
-# define GLM_COMPILER GLM_COMPILER_LLVM31
-# elif __clang_major__ == 3 && __clang_minor__ == 2
-# define GLM_COMPILER GLM_COMPILER_LLVM32
-# elif __clang_major__ == 3 && __clang_minor__ == 3
-# define GLM_COMPILER GLM_COMPILER_LLVM33
-# elif __clang_major__ == 3 && __clang_minor__ == 4
-# define GLM_COMPILER GLM_COMPILER_LLVM34
-# elif __clang_major__ == 3 && __clang_minor__ == 5
-# define GLM_COMPILER GLM_COMPILER_LLVM35
-# else
-# define GLM_COMPILER GLM_COMPILER_LLVM35
-# endif
-# endif
-
-// G++
-#elif defined(__GNUC__) || defined(__MINGW32__)
-# if (__GNUC__ == 4) && (__GNUC_MINOR__ == 2)
-# define GLM_COMPILER (GLM_COMPILER_GCC42)
-# elif (__GNUC__ == 4) && (__GNUC_MINOR__ == 3)
-# define GLM_COMPILER (GLM_COMPILER_GCC43)
-# elif (__GNUC__ == 4) && (__GNUC_MINOR__ == 4)
-# define GLM_COMPILER (GLM_COMPILER_GCC44)
-# elif (__GNUC__ == 4) && (__GNUC_MINOR__ == 5)
-# define GLM_COMPILER (GLM_COMPILER_GCC45)
-# elif (__GNUC__ == 4) && (__GNUC_MINOR__ == 6)
-# define GLM_COMPILER (GLM_COMPILER_GCC46)
-# elif (__GNUC__ == 4) && (__GNUC_MINOR__ == 7)
-# define GLM_COMPILER (GLM_COMPILER_GCC47)
-# elif (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
-# define GLM_COMPILER (GLM_COMPILER_GCC48)
-# elif (__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)
-# define GLM_COMPILER (GLM_COMPILER_GCC49)
-# elif (__GNUC__ > 4 )
-# define GLM_COMPILER (GLM_COMPILER_GCC50)
-# else
-# define GLM_COMPILER (GLM_COMPILER_GCC)
-# endif
-
-#else
-# define GLM_COMPILER GLM_COMPILER_UNKNOWN
-#endif
-
-#ifndef GLM_COMPILER
-#error "GLM_COMPILER undefined, your compiler may not be supported by GLM. Add #define GLM_COMPILER 0 to ignore this message."
-#endif//GLM_COMPILER
-
-// Report compiler detection
-#if defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_COMPILER_DISPLAYED)
-# define GLM_MESSAGE_COMPILER_DISPLAYED
-# if GLM_COMPILER & GLM_COMPILER_CUDA
-# pragma message("GLM: CUDA compiler detected")
-# elif GLM_COMPILER & GLM_COMPILER_VC
-# pragma message("GLM: Visual C++ compiler detected")
-# elif GLM_COMPILER & GLM_COMPILER_APPLE_CLANG
-# pragma message("GLM: Clang compiler detected")
-# elif GLM_COMPILER & GLM_COMPILER_LLVM
-# pragma message("GLM: LLVM compiler detected")
-# elif GLM_COMPILER & GLM_COMPILER_INTEL
-# pragma message("GLM: Intel Compiler detected")
-# elif GLM_COMPILER & GLM_COMPILER_GCC
-# pragma message("GLM: GCC compiler detected")
-# else
-# pragma message("GLM: Compiler not detected")
-# endif
-#endif//GLM_MESSAGE
-
-///////////////////////////////////////////////////////////////////////////////////
-// Build model
-
-#if defined(__arch64__) || defined(__LP64__) || defined(_M_X64) || defined(__ppc64__) || defined(__x86_64__)
-# define GLM_MODEL GLM_MODEL_64
-#elif defined(__i386__) || defined(__ppc__)
-# define GLM_MODEL GLM_MODEL_32
-#else
-# define GLM_MODEL GLM_MODEL_32
-#endif//
-
-#if !defined(GLM_MODEL) && GLM_COMPILER != 0
-# error "GLM_MODEL undefined, your compiler may not be supported by GLM. Add #define GLM_MODEL 0 to ignore this message."
-#endif//GLM_MODEL
-
-#if defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_MODEL_DISPLAYED)
-# define GLM_MESSAGE_MODEL_DISPLAYED
-# if(GLM_MODEL == GLM_MODEL_64)
-# pragma message("GLM: 64 bits model")
-# elif(GLM_MODEL == GLM_MODEL_32)
-# pragma message("GLM: 32 bits model")
-# endif//GLM_MODEL
-#endif//GLM_MESSAGE
-
-///////////////////////////////////////////////////////////////////////////////////
-// C++ Version
-
-// User defines: GLM_FORCE_CXX98, GLM_FORCE_CXX03, GLM_FORCE_CXX11, GLM_FORCE_CXX14
-
-#define GLM_LANG_CXX98_FLAG (1 << 1)
-#define GLM_LANG_CXX03_FLAG (1 << 2)
-#define GLM_LANG_CXX0X_FLAG (1 << 3)
-#define GLM_LANG_CXX11_FLAG (1 << 4)
-#define GLM_LANG_CXX1Y_FLAG (1 << 5)
-#define GLM_LANG_CXX14_FLAG (1 << 6)
-#define GLM_LANG_CXX1Z_FLAG (1 << 7)
-#define GLM_LANG_CXXMS_FLAG (1 << 8)
-#define GLM_LANG_CXXGNU_FLAG (1 << 9)
-
-#define GLM_LANG_CXX98 GLM_LANG_CXX98_FLAG
-#define GLM_LANG_CXX03 (GLM_LANG_CXX98 | GLM_LANG_CXX03_FLAG)
-#define GLM_LANG_CXX0X (GLM_LANG_CXX03 | GLM_LANG_CXX0X_FLAG)
-#define GLM_LANG_CXX11 (GLM_LANG_CXX0X | GLM_LANG_CXX11_FLAG)
-#define GLM_LANG_CXX1Y (GLM_LANG_CXX11 | GLM_LANG_CXX1Y_FLAG)
-#define GLM_LANG_CXX14 (GLM_LANG_CXX1Y | GLM_LANG_CXX14_FLAG)
-#define GLM_LANG_CXX1Z (GLM_LANG_CXX14 | GLM_LANG_CXX1Z_FLAG)
-#define GLM_LANG_CXXMS GLM_LANG_CXXMS_FLAG
-#define GLM_LANG_CXXGNU GLM_LANG_CXXGNU_FLAG
-
-#if defined(GLM_FORCE_CXX14)
-# undef GLM_FORCE_CXX11
-# undef GLM_FORCE_CXX03
-# undef GLM_FORCE_CXX98
-# define GLM_LANG GLM_LANG_CXX14
-#elif defined(GLM_FORCE_CXX11)
-# undef GLM_FORCE_CXX03
-# undef GLM_FORCE_CXX98
-# define GLM_LANG GLM_LANG_CXX11
-#elif defined(GLM_FORCE_CXX03)
-# undef GLM_FORCE_CXX98
-# define GLM_LANG GLM_LANG_CXX03
-#elif defined(GLM_FORCE_CXX98)
-# define GLM_LANG GLM_LANG_CXX98
-#else
-# if GLM_COMPILER & (GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM)
-# if __cplusplus >= 201402L // GLM_COMPILER_LLVM34 + -std=c++14
-# define GLM_LANG GLM_LANG_CXX14
-# elif __has_feature(cxx_decltype_auto) && __has_feature(cxx_aggregate_nsdmi) // GLM_COMPILER_LLVM33 + -std=c++1y
-# define GLM_LANG GLM_LANG_CXX1Y
-# elif __cplusplus >= 201103L // GLM_COMPILER_LLVM33 + -std=c++11
-# define GLM_LANG GLM_LANG_CXX11
-# elif __has_feature(cxx_static_assert) // GLM_COMPILER_LLVM29 + -std=c++11
-# define GLM_LANG GLM_LANG_CXX0X
-# elif __cplusplus >= 199711L
-# define GLM_LANG GLM_LANG_CXX98
-# else
-# define GLM_LANG GLM_LANG_CXX
-# endif
-# elif GLM_COMPILER & GLM_COMPILER_GCC
-# if __cplusplus >= 201402L
-# define GLM_LANG GLM_LANG_CXX14
-# elif __cplusplus >= 201103L
-# define GLM_LANG GLM_LANG_CXX11
-# elif defined(__GXX_EXPERIMENTAL_CXX0X__)
-# define GLM_LANG GLM_LANG_CXX0X
-# else
-# define GLM_LANG GLM_LANG_CXX98
-# endif
-# elif GLM_COMPILER & GLM_COMPILER_VC
-# ifdef _MSC_EXTENSIONS
-# if __cplusplus >= 201402L
-# define GLM_LANG (GLM_LANG_CXX14 | GLM_LANG_CXXMS_FLAG)
-//# elif GLM_COMPILER >= GLM_COMPILER_VC2015
-//# define GLM_LANG (GLM_LANG_CXX1Y | GLM_LANG_CXXMS_FLAG)
-# elif __cplusplus >= 201103L
-# define GLM_LANG (GLM_LANG_CXX11 | GLM_LANG_CXXMS_FLAG)
-# elif GLM_COMPILER >= GLM_COMPILER_VC2010
-# define GLM_LANG (GLM_LANG_CXX0X | GLM_LANG_CXXMS_FLAG)
-# elif __cplusplus >= 199711L
-# define GLM_LANG (GLM_LANG_CXX98 | GLM_LANG_CXXMS_FLAG)
-# else
-# define GLM_LANG (GLM_LANG_CXX | GLM_LANG_CXXMS_FLAG)
-# endif
-# else
-# if __cplusplus >= 201402L
-# define GLM_LANG GLM_LANG_CXX14
-//# elif GLM_COMPILER >= GLM_COMPILER_VC2015
-//# define GLM_LANG GLM_LANG_CXX1Y
-# elif __cplusplus >= 201103L
-# define GLM_LANG GLM_LANG_CXX11
-# elif GLM_COMPILER >= GLM_COMPILER_VC2010
-# define GLM_LANG GLM_LANG_CXX0X
-# elif __cplusplus >= 199711L
-# define GLM_LANG GLM_LANG_CXX98
-# else
-# define GLM_LANG GLM_LANG_CXX
-# endif
-# endif
-# elif GLM_COMPILER & GLM_COMPILER_INTEL
-# ifdef _MSC_EXTENSIONS
-# if __cplusplus >= 201402L
-# define GLM_LANG (GLM_LANG_CXX14 | GLM_LANG_CXXMS_FLAG)
-# elif __cplusplus >= 201103L
-# define GLM_LANG (GLM_LANG_CXX11 | GLM_LANG_CXXMS_FLAG)
-# elif GLM_COMPILER >= GLM_COMPILER_INTEL13
-# define GLM_LANG (GLM_LANG_CXX0X | GLM_LANG_CXXMS_FLAG)
-# elif __cplusplus >= 199711L
-# define GLM_LANG (GLM_LANG_CXX98 | GLM_LANG_CXXMS_FLAG)
-# else
-# define GLM_LANG (GLM_LANG_CXX | GLM_LANG_CXXMS_FLAG)
-# endif
-# else
-# if __cplusplus >= 201402L
-# define GLM_LANG (GLM_LANG_CXX14 | GLM_LANG_CXXMS_FLAG)
-# elif __cplusplus >= 201103L
-# define GLM_LANG (GLM_LANG_CXX11 | GLM_LANG_CXXMS_FLAG)
-# elif GLM_COMPILER >= GLM_COMPILER_INTEL13
-# define GLM_LANG (GLM_LANG_CXX0X | GLM_LANG_CXXMS_FLAG)
-# elif __cplusplus >= 199711L
-# define GLM_LANG (GLM_LANG_CXX98 | GLM_LANG_CXXMS_FLAG)
-# else
-# define GLM_LANG (GLM_LANG_CXX | GLM_LANG_CXXMS_FLAG)
-# endif
-# endif
-# else // Unkown compiler
-# if __cplusplus >= 201402L
-# define GLM_LANG GLM_LANG_CXX14
-# elif __cplusplus >= 201103L
-# define GLM_LANG GLM_LANG_CXX11
-# elif __cplusplus >= 199711L
-# define GLM_LANG GLM_LANG_CXX98
-# else
-# define GLM_LANG GLM_LANG_CXX // Good luck with that!
-# endif
-# ifndef GLM_FORCE_PURE
-# define GLM_FORCE_PURE
-# endif
-# endif
-#endif
-
-#if defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_LANG_DISPLAYED)
-# define GLM_MESSAGE_LANG_DISPLAYED
-
-# if GLM_LANG & GLM_LANG_CXX1Z_FLAG
-# pragma message("GLM: C++1z")
-# elif GLM_LANG & GLM_LANG_CXX14_FLAG
-# pragma message("GLM: C++14")
-# elif GLM_LANG & GLM_LANG_CXX1Y_FLAG
-# pragma message("GLM: C++1y")
-# elif GLM_LANG & GLM_LANG_CXX11_FLAG
-# pragma message("GLM: C++11")
-# elif GLM_LANG & GLM_LANG_CXX0X_FLAG
-# pragma message("GLM: C++0x")
-# elif GLM_LANG & GLM_LANG_CXX03_FLAG
-# pragma message("GLM: C++03")
-# elif GLM_LANG & GLM_LANG_CXX98_FLAG
-# pragma message("GLM: C++98")
-# else
-# pragma message("GLM: C++ language undetected")
-# endif//GLM_LANG
-
-# if GLM_LANG & (GLM_LANG_CXXGNU_FLAG | GLM_LANG_CXXMS_FLAG)
-# pragma message("GLM: Language extensions enabled")
-# endif//GLM_LANG
-#endif//GLM_MESSAGE
-
-///////////////////////////////////////////////////////////////////////////////////
-// Has of C++ features
-
-// http://clang.llvm.org/cxx_status.html
-// http://gcc.gnu.org/projects/cxx0x.html
-// http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx
-
-#if GLM_PLATFORM == GLM_PLATFORM_ANDROID
-# define GLM_HAS_CXX11_STL 0
-#elif GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
-# define GLM_HAS_CXX11_STL __has_include(<__config>)
-#else
-# define GLM_HAS_CXX11_STL ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && \
- ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC48)) || \
- ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)))
-#endif
-
-// N1720
-#if GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
-# define GLM_HAS_STATIC_ASSERT __has_feature(cxx_static_assert)
-#elif GLM_LANG & GLM_LANG_CXX11_FLAG
-# define GLM_HAS_STATIC_ASSERT 1
-#else
-# define GLM_HAS_STATIC_ASSERT (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
- ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC43)) || \
- ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2010)))
-#endif
-
-// N1988
-#if GLM_LANG & GLM_LANG_CXX11_FLAG
-# define GLM_HAS_EXTENDED_INTEGER_TYPE 1
-#else
-# define GLM_HAS_EXTENDED_INTEGER_TYPE (\
- ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2012)) || \
- ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC43)) || \
- ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_LLVM) && (GLM_COMPILER >= GLM_COMPILER_LLVM30)) || \
- ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_APPLE_CLANG) && (GLM_COMPILER >= GLM_COMPILER_APPLE_CLANG40)))
-#endif
-
-// N2235
-#if GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
-# define GLM_HAS_CONSTEXPR __has_feature(cxx_constexpr)
-# define GLM_HAS_CONSTEXPR_PARTIAL GLM_HAS_CONSTEXPR
-#elif GLM_LANG & GLM_LANG_CXX11_FLAG
-# define GLM_HAS_CONSTEXPR 1
-# define GLM_HAS_CONSTEXPR_PARTIAL GLM_HAS_CONSTEXPR
-#else
-# define GLM_HAS_CONSTEXPR (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
- ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC46)))
-# define GLM_HAS_CONSTEXPR_PARTIAL GLM_HAS_CONSTEXPR || ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2015))
-#endif
-
-// N2672
-#if GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
-# define GLM_HAS_INITIALIZER_LISTS __has_feature(cxx_generalized_initializers)
-#elif GLM_LANG & GLM_LANG_CXX11_FLAG
-# define GLM_HAS_INITIALIZER_LISTS 1
-#else
-# define GLM_HAS_INITIALIZER_LISTS (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
- ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC44)) || \
- ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)))
-#endif
-
-// N2544 Unrestricted unions
-#if GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
-# define GLM_HAS_UNRESTRICTED_UNIONS __has_feature(cxx_unrestricted_unions)
-#elif GLM_LANG & (GLM_LANG_CXX11_FLAG | GLM_LANG_CXXMS_FLAG)
-# define GLM_HAS_UNRESTRICTED_UNIONS 1
-#else
-# define GLM_HAS_UNRESTRICTED_UNIONS (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
- ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC46)))
-#endif
-
-// N2346
-#if GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
-# define GLM_HAS_DEFAULTED_FUNCTIONS __has_feature(cxx_defaulted_functions)
-#elif GLM_LANG & GLM_LANG_CXX11_FLAG
-# define GLM_HAS_DEFAULTED_FUNCTIONS 1
-#else
-# define GLM_HAS_DEFAULTED_FUNCTIONS (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
- ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC44)) || \
- ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)))
-#endif
-
-// N2118
-#if GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
-# define GLM_HAS_RVALUE_REFERENCES __has_feature(cxx_rvalue_references)
-#elif GLM_LANG & GLM_LANG_CXX11_FLAG
-# define GLM_HAS_RVALUE_REFERENCES 1
-#else
-# define GLM_HAS_RVALUE_REFERENCES (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
- ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC43)) || \
- ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2012)))
-#endif
-
-// N2437 http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2437.pdf
-#if GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
-# define GLM_HAS_EXPLICIT_CONVERSION_OPERATORS __has_feature(cxx_explicit_conversions)
-#elif GLM_LANG & GLM_LANG_CXX11_FLAG
-# define GLM_HAS_EXPLICIT_CONVERSION_OPERATORS 1
-#else
-# define GLM_HAS_EXPLICIT_CONVERSION_OPERATORS (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
- ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC45)) || \
- ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL14)) || \
- ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)))
-#endif
-
-// N2258 http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2258.pdf
-#if GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
-# define GLM_HAS_TEMPLATE_ALIASES __has_feature(cxx_alias_templates)
-#elif GLM_LANG & GLM_LANG_CXX11_FLAG
-# define GLM_HAS_TEMPLATE_ALIASES 1
-#else
-# define GLM_HAS_TEMPLATE_ALIASES (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
- ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL12_1)) || \
- ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC47)) || \
- ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)))
-#endif
-
-// N2930 http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2009/n2930.html
-#if GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
-# define GLM_HAS_RANGE_FOR __has_feature(cxx_range_for)
-#elif GLM_LANG & GLM_LANG_CXX11_FLAG
-# define GLM_HAS_RANGE_FOR 1
-#else
-# define GLM_HAS_RANGE_FOR (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
- ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC46)) || \
- ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL13)) || \
- ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2012)))
-#endif
-
-//
-#if GLM_LANG & GLM_LANG_CXX11_FLAG
-# define GLM_HAS_ASSIGNABLE 1
-#else
-# define GLM_HAS_ASSIGNABLE (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
- ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC49)))
-#endif
-
-//
-#define GLM_HAS_TRIVIAL_QUERIES 0
-//
- //((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)))
-
-//
-#if GLM_LANG & GLM_LANG_CXX11_FLAG
-# define GLM_HAS_MAKE_SIGNED 1
-#else
-# define GLM_HAS_MAKE_SIGNED (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
- ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)))
-#endif
-
-//
-#if GLM_ARCH == GLM_ARCH_PURE
-# define GLM_HAS_BITSCAN_WINDOWS 0
-#else
-# define GLM_HAS_BITSCAN_WINDOWS (GLM_PLATFORM & GLM_PLATFORM_WINDOWS) && (\
- (GLM_COMPILER & (GLM_COMPILER_VC | GLM_COMPILER_LLVM | GLM_COMPILER_INTEL))
-#endif
-
-// OpenMP
-#ifdef _OPENMP
-# if GLM_COMPILER & GLM_COMPILER_GCC
-# if GLM_COMPILER >= GLM_COMPILER_GCC47
-# define GLM_HAS_OPENMP 31
-# elif GLM_COMPILER >= GLM_COMPILER_GCC44
-# define GLM_HAS_OPENMP 30
-# elif GLM_COMPILER >= GLM_COMPILER_GCC42
-# define GLM_HAS_OPENMP 25
-# endif
-# endif// GLM_COMPILER & GLM_COMPILER_GCC
-
-# if GLM_COMPILER & GLM_COMPILER_VC
-# if GLM_COMPILER >= GLM_COMPILER_VC2010
-# define GLM_HAS_OPENMP 20
-# endif
-# endif// GLM_COMPILER & GLM_COMPILER_VC
-#endif
-
-// Not standard
-#define GLM_HAS_ANONYMOUS_UNION (GLM_LANG & GLM_LANG_CXXMS_FLAG)
-
-///////////////////////////////////////////////////////////////////////////////////
-// Platform
-
-// User defines: GLM_FORCE_PURE GLM_FORCE_SSE2 GLM_FORCE_SSE3 GLM_FORCE_AVX GLM_FORCE_AVX2
-
-#define GLM_ARCH_PURE 0x0000
-#define GLM_ARCH_ARM 0x0001
-#define GLM_ARCH_X86 0x0002
-#define GLM_ARCH_SSE2 0x0004
-#define GLM_ARCH_SSE3 0x0008
-#define GLM_ARCH_SSE4 0x0010
-#define GLM_ARCH_AVX 0x0020
-#define GLM_ARCH_AVX2 0x0040
-
-#if defined(GLM_FORCE_PURE)
-# define GLM_ARCH GLM_ARCH_PURE
-#elif defined(GLM_FORCE_AVX2)
-# define GLM_ARCH (GLM_ARCH_AVX2 | GLM_ARCH_AVX | GLM_ARCH_SSE4 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
-#elif defined(GLM_FORCE_AVX)
-# define GLM_ARCH (GLM_ARCH_AVX | GLM_ARCH_SSE4 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
-#elif defined(GLM_FORCE_SSE4)
-# define GLM_ARCH (GLM_ARCH_SSE4 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
-#elif defined(GLM_FORCE_SSE3)
-# define GLM_ARCH (GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
-#elif defined(GLM_FORCE_SSE2)
-# define GLM_ARCH (GLM_ARCH_SSE2)
-#elif (GLM_COMPILER & (GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM | GLM_COMPILER_GCC)) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_LINUX))
-# if(__AVX2__)
-# define GLM_ARCH (GLM_ARCH_AVX2 | GLM_ARCH_AVX | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
-# elif(__AVX__)
-# define GLM_ARCH (GLM_ARCH_AVX | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
-# elif(__SSE3__)
-# define GLM_ARCH (GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
-# elif(__SSE2__)
-# define GLM_ARCH (GLM_ARCH_SSE2)
-# else
-# define GLM_ARCH GLM_ARCH_PURE
-# endif
-#elif (GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS))
-# if defined(_M_ARM_FP)
-# define GLM_ARCH (GLM_ARCH_ARM)
-# elif defined(__AVX2__)
-# define GLM_ARCH (GLM_ARCH_AVX2 | GLM_ARCH_AVX | GLM_ARCH_SSE4 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
-# elif defined(__AVX__)
-# define GLM_ARCH (GLM_ARCH_AVX | GLM_ARCH_SSE4 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
-# elif _M_IX86_FP == 2
-# define GLM_ARCH (GLM_ARCH_SSE2)
-# else
-# define GLM_ARCH (GLM_ARCH_PURE)
-# endif
-#elif (GLM_COMPILER & GLM_COMPILER_GCC) && (defined(__i386__) || defined(__x86_64__))
-# if defined(__AVX2__)
-# define GLM_ARCH (GLM_ARCH_AVX2 | GLM_ARCH_AVX | GLM_ARCH_SSE4 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
-# elif defined(__AVX__)
-# define GLM_ARCH (GLM_ARCH_AVX | GLM_ARCH_SSE4 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
-# elif defined(__SSE4_1__ )
-# define GLM_ARCH (GLM_ARCH_SSE4 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
-# elif defined(__SSE3__)
-# define GLM_ARCH (GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
-# elif defined(__SSE2__)
-# define GLM_ARCH (GLM_ARCH_SSE2)
-# else
-# define GLM_ARCH (GLM_ARCH_PURE)
-# endif
-#else
-# define GLM_ARCH GLM_ARCH_PURE
-#endif
-
-// With MinGW-W64, including intrinsic headers before intrin.h will produce some errors. The problem is
-// that windows.h (and maybe other headers) will silently include intrin.h, which of course causes problems.
-// To fix, we just explicitly include intrin.h here.
-#if defined(__MINGW64__) && (GLM_ARCH != GLM_ARCH_PURE)
-# include <intrin.h>
-#endif
-
-#if GLM_ARCH & GLM_ARCH_AVX2
-# include <immintrin.h>
-#endif//GLM_ARCH
-#if GLM_ARCH & GLM_ARCH_AVX
-# include <immintrin.h>
-#endif//GLM_ARCH
-#if GLM_ARCH & GLM_ARCH_SSE4
-# include <smmintrin.h>
-#endif//GLM_ARCH
-#if GLM_ARCH & GLM_ARCH_SSE3
-# include <pmmintrin.h>
-#endif//GLM_ARCH
-#if GLM_ARCH & GLM_ARCH_SSE2
-# include <emmintrin.h>
-# if(GLM_COMPILER == GLM_COMPILER_VC2005) // VC2005 is missing some intrinsics, workaround
- inline float _mm_cvtss_f32(__m128 A) { return A.m128_f32[0]; }
- inline __m128 _mm_castpd_ps(__m128d PD) { union { __m128 ps; __m128d pd; } c; c.pd = PD; return c.ps; }
- inline __m128d _mm_castps_pd(__m128 PS) { union { __m128 ps; __m128d pd; } c; c.ps = PS; return c.pd; }
- inline __m128i _mm_castps_si128(__m128 PS) { union { __m128 ps; __m128i pi; } c; c.ps = PS; return c.pi; }
- inline __m128 _mm_castsi128_ps(__m128i PI) { union { __m128 ps; __m128i pi; } c; c.pi = PI; return c.ps; }
-# endif
-#endif//GLM_ARCH
-
-#if defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_ARCH_DISPLAYED)
-# define GLM_MESSAGE_ARCH_DISPLAYED
-# if(GLM_ARCH == GLM_ARCH_PURE)
-# pragma message("GLM: Platform independent code")
-# elif(GLM_ARCH & GLM_ARCH_ARM)
-# pragma message("GLM: ARM instruction set")
-# elif(GLM_ARCH & GLM_ARCH_AVX2)
-# pragma message("GLM: AVX2 instruction set")
-# elif(GLM_ARCH & GLM_ARCH_AVX)
-# pragma message("GLM: AVX instruction set")
-# elif(GLM_ARCH & GLM_ARCH_SSE3)
-# pragma message("GLM: SSE3 instruction set")
-# elif(GLM_ARCH & GLM_ARCH_SSE2)
-# pragma message("GLM: SSE2 instruction set")
-# endif//GLM_ARCH
-#endif//GLM_MESSAGE
-
-///////////////////////////////////////////////////////////////////////////////////
-// Static assert
-
-#if GLM_HAS_STATIC_ASSERT
-# define GLM_STATIC_ASSERT(x, message) static_assert(x, message)
-#elif defined(BOOST_STATIC_ASSERT)
-# define GLM_STATIC_ASSERT(x, message) BOOST_STATIC_ASSERT(x)
-#elif GLM_COMPILER & GLM_COMPILER_VC
-# define GLM_STATIC_ASSERT(x, message) typedef char __CASSERT__##__LINE__[(x) ? 1 : -1]
-#else
-# define GLM_STATIC_ASSERT(x, message)
-# define GLM_STATIC_ASSERT_NULL
-#endif//GLM_LANG
-
-///////////////////////////////////////////////////////////////////////////////////
-// Qualifiers
-
-#if GLM_COMPILER & GLM_COMPILER_CUDA
-# define GLM_CUDA_FUNC_DEF __device__ __host__
-# define GLM_CUDA_FUNC_DECL __device__ __host__
-#else
-# define GLM_CUDA_FUNC_DEF
-# define GLM_CUDA_FUNC_DECL
-#endif
-
-#if GLM_COMPILER & GLM_COMPILER_GCC
-# define GLM_VAR_USED __attribute__ ((unused))
-#else
-# define GLM_VAR_USED
-#endif
-
-#if defined(GLM_FORCE_INLINE)
-# if GLM_COMPILER & GLM_COMPILER_VC
-# define GLM_INLINE __forceinline
-# define GLM_NEVER_INLINE __declspec((noinline))
-# elif GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM)
-# define GLM_INLINE inline __attribute__((__always_inline__))
-# define GLM_NEVER_INLINE __attribute__((__noinline__))
-# else
-# define GLM_INLINE inline
-# define GLM_NEVER_INLINE
-# endif//GLM_COMPILER
-#else
-# define GLM_INLINE inline
-# define GLM_NEVER_INLINE
-#endif//defined(GLM_FORCE_INLINE)
-
-#define GLM_FUNC_DECL GLM_CUDA_FUNC_DECL
-#define GLM_FUNC_QUALIFIER GLM_CUDA_FUNC_DEF GLM_INLINE
-
-///////////////////////////////////////////////////////////////////////////////////
-// Swizzle operators
-
-// User defines: GLM_SWIZZLE
-
-#if defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_SWIZZLE_DISPLAYED)
-# define GLM_MESSAGE_SWIZZLE_DISPLAYED
-# if defined(GLM_SWIZZLE)
-# pragma message("GLM: Swizzling operators enabled")
-# else
-# pragma message("GLM: Swizzling operators disabled, #define GLM_SWIZZLE to enable swizzle operators")
-# endif
-#endif//GLM_MESSAGE
-
-///////////////////////////////////////////////////////////////////////////////////
-// Qualifiers
-
-#if (GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS))
-# define GLM_DEPRECATED __declspec(deprecated)
-# define GLM_ALIGN(x) __declspec(align(x))
-# define GLM_ALIGNED_STRUCT(x) struct __declspec(align(x))
-# define GLM_ALIGNED_TYPEDEF(type, name, alignment) typedef __declspec(align(alignment)) type name
-# define GLM_RESTRICT __declspec(restrict)
-# define GLM_RESTRICT_VAR __restrict
-#elif GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM | GLM_COMPILER_CUDA | GLM_COMPILER_INTEL)
-# define GLM_DEPRECATED __attribute__((__deprecated__))
-# define GLM_ALIGN(x) __attribute__((aligned(x)))
-# define GLM_ALIGNED_STRUCT(x) struct __attribute__((aligned(x)))
-# define GLM_ALIGNED_TYPEDEF(type, name, alignment) typedef type name __attribute__((aligned(alignment)))
-# define GLM_RESTRICT __restrict__
-# define GLM_RESTRICT_VAR __restrict__
-#else
-# define GLM_DEPRECATED
-# define GLM_ALIGN
-# define GLM_ALIGNED_STRUCT(x) struct
-# define GLM_ALIGNED_TYPEDEF(type, name, alignment) typedef type name
-# define GLM_RESTRICT
-# define GLM_RESTRICT_VAR
-#endif//GLM_COMPILER
-
-#if GLM_HAS_CONSTEXPR
-# define GLM_CONSTEXPR constexpr
-#else
-# define GLM_CONSTEXPR
-#endif
-
-///////////////////////////////////////////////////////////////////////////////////
-// Length type
-
-// User defines: GLM_FORCE_SIZE_T_LENGTH GLM_FORCE_SIZE_FUNC
-
-namespace glm
-{
- using std::size_t;
-# if defined(GLM_FORCE_SIZE_T_LENGTH) || defined(GLM_FORCE_SIZE_FUNC)
- typedef size_t length_t;
-# else
- typedef int length_t;
-# endif
-
-namespace detail
-{
-# ifdef GLM_FORCE_SIZE_FUNC
- typedef size_t component_count_t;
-# else
- typedef length_t component_count_t;
-# endif
-
- template <typename genType>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR component_count_t component_count(genType const & m)
- {
-# ifdef GLM_FORCE_SIZE_FUNC
- return m.size();
-# else
- return m.length();
-# endif
- }
-}//namespace detail
-}//namespace glm
-
-#if defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_FORCE_SIZE_T_LENGTH)
-# define GLM_MESSAGE_FORCE_SIZE_T_LENGTH
-# if defined GLM_FORCE_SIZE_FUNC
-# pragma message("GLM: .length() is replaced by .size() and returns a std::size_t")
-# elif defined GLM_FORCE_SIZE_T_LENGTH
-# pragma message("GLM: .length() returns glm::length_t, a typedef of std::size_t")
-# else
-# pragma message("GLM: .length() returns glm::length_t, a typedef of int following the GLSL specification")
-# endif
-#endif//GLM_MESSAGE
-
-///////////////////////////////////////////////////////////////////////////////////
-// countof
-
-#ifndef __has_feature
-# define __has_feature(x) 0 // Compatibility with non-clang compilers.
-#endif
-
-#if GLM_HAS_CONSTEXPR_PARTIAL
- namespace glm
- {
- template <typename T, std::size_t N>
- constexpr std::size_t countof(T const (&)[N])
- {
- return N;
- }
- }//namespace glm
-# define GLM_COUNTOF(arr) glm::countof(arr)
-#elif _MSC_VER
-# define GLM_COUNTOF(arr) _countof(arr)
-#else
-# define GLM_COUNTOF(arr) sizeof(arr) / sizeof(arr[0])
-#endif
-
-///////////////////////////////////////////////////////////////////////////////////
-// Uninitialize constructors
-
-namespace glm
-{
- enum ctor{uninitialize};
-}//namespace glm
diff --git a/inc/glm/detail/type_float.hpp b/inc/glm/detail/type_float.hpp deleted file mode 100644 index fa6c15c..0000000 --- a/inc/glm/detail/type_float.hpp +++ /dev/null @@ -1,96 +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 core
-/// @file glm/detail/type_float.hpp
-/// @date 2008-08-22 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "setup.hpp"
-
-namespace glm{
-namespace detail
-{
- typedef float float32;
- typedef double float64;
-}//namespace detail
-
- typedef float lowp_float_t;
- typedef float mediump_float_t;
- typedef double highp_float_t;
-
- /// @addtogroup core_precision
- /// @{
-
- /// Low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.4 Floats</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef lowp_float_t lowp_float;
-
- /// Medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.4 Floats</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef mediump_float_t mediump_float;
-
- /// High precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.4 Floats</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef highp_float_t highp_float;
-
-#if(!defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT))
- typedef mediump_float float_t;
-#elif(defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT))
- typedef highp_float float_t;
-#elif(!defined(GLM_PRECISION_HIGHP_FLOAT) && defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT))
- typedef mediump_float float_t;
-#elif(!defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && defined(GLM_PRECISION_LOWP_FLOAT))
- typedef lowp_float float_t;
-#else
-# error "GLM error: multiple default precision requested for floating-point types"
-#endif
-
- typedef float float32;
- typedef double float64;
-
-////////////////////
-// check type sizes
-#ifndef GLM_STATIC_ASSERT_NULL
- GLM_STATIC_ASSERT(sizeof(glm::float32) == 4, "float32 size isn't 4 bytes on this platform");
- GLM_STATIC_ASSERT(sizeof(glm::float64) == 8, "float64 size isn't 8 bytes on this platform");
-#endif//GLM_STATIC_ASSERT_NULL
-
- /// @}
-
-}//namespace glm
diff --git a/inc/glm/detail/type_gentype.hpp b/inc/glm/detail/type_gentype.hpp deleted file mode 100644 index 9583a6c..0000000 --- a/inc/glm/detail/type_gentype.hpp +++ /dev/null @@ -1,224 +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 core
-/// @file glm/detail/type_gentype.hpp
-/// @date 2008-10-05 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-namespace glm
-{
- enum profile
- {
- nice,
- fast,
- simd
- };
-
- typedef std::size_t sizeType;
-
-namespace detail
-{
- template
- <
- typename VALTYPE,
- template <typename> class TYPE
- >
- struct genType
- {
- public:
- enum ctor{null};
-
- typedef VALTYPE value_type;
- typedef VALTYPE & value_reference;
- typedef VALTYPE * value_pointer;
- typedef VALTYPE const * value_const_pointer;
- typedef TYPE<bool> bool_type;
-
- typedef sizeType size_type;
- static bool is_vector();
- static bool is_matrix();
-
- typedef TYPE<VALTYPE> type;
- typedef TYPE<VALTYPE> * pointer;
- typedef TYPE<VALTYPE> const * const_pointer;
- typedef TYPE<VALTYPE> const * const const_pointer_const;
- typedef TYPE<VALTYPE> * const pointer_const;
- typedef TYPE<VALTYPE> & reference;
- typedef TYPE<VALTYPE> const & const_reference;
- typedef TYPE<VALTYPE> const & param_type;
-
- //////////////////////////////////////
- // Address (Implementation details)
-
- value_const_pointer value_address() const{return value_pointer(this);}
- value_pointer value_address(){return value_pointer(this);}
-
- //protected:
- // enum kind
- // {
- // GEN_TYPE,
- // VEC_TYPE,
- // MAT_TYPE
- // };
-
- // typedef typename TYPE::kind kind;
- };
-
- template
- <
- typename VALTYPE,
- template <typename> class TYPE
- >
- bool genType<VALTYPE, TYPE>::is_vector()
- {
- return true;
- }
-/*
- template <typename valTypeT, unsigned int colT, unsigned int rowT, profile proT = nice>
- class base
- {
- public:
- //////////////////////////////////////
- // Traits
-
- typedef sizeType size_type;
- typedef valTypeT value_type;
-
- typedef base<value_type, colT, rowT> class_type;
-
- typedef base<bool, colT, rowT> bool_type;
- typedef base<value_type, rowT, 1> col_type;
- typedef base<value_type, colT, 1> row_type;
- typedef base<value_type, rowT, colT> transpose_type;
-
- static size_type col_size();
- static size_type row_size();
- static size_type value_size();
- static bool is_scalar();
- static bool is_vector();
- static bool is_matrix();
-
- private:
- // Data
- col_type value[colT];
-
- public:
- //////////////////////////////////////
- // Constructors
- base();
- base(class_type const & m);
-
- explicit base(T const & x);
- explicit base(value_type const * const x);
- explicit base(col_type const * const x);
-
- //////////////////////////////////////
- // Conversions
- template <typename vU, uint cU, uint rU, profile pU>
- explicit base(base<vU, cU, rU, pU> const & m);
-
- //////////////////////////////////////
- // Accesses
- col_type& operator[](size_type i);
- col_type const & operator[](size_type i) const;
-
- //////////////////////////////////////
- // Unary updatable operators
- class_type& operator= (class_type const & x);
- class_type& operator+= (T const & x);
- class_type& operator+= (class_type const & x);
- class_type& operator-= (T const & x);
- class_type& operator-= (class_type const & x);
- class_type& operator*= (T const & x);
- class_type& operator*= (class_type const & x);
- class_type& operator/= (T const & x);
- class_type& operator/= (class_type const & x);
- class_type& operator++ ();
- class_type& operator-- ();
- };
-*/
-
- //template <typename T>
- //struct traits
- //{
- // static const bool is_signed = false;
- // static const bool is_float = false;
- // static const bool is_vector = false;
- // static const bool is_matrix = false;
- // static const bool is_genType = false;
- // static const bool is_genIType = false;
- // static const bool is_genUType = false;
- //};
-
- //template <>
- //struct traits<half>
- //{
- // static const bool is_float = true;
- // static const bool is_genType = true;
- //};
-
- //template <>
- //struct traits<float>
- //{
- // static const bool is_float = true;
- // static const bool is_genType = true;
- //};
-
- //template <>
- //struct traits<double>
- //{
- // static const bool is_float = true;
- // static const bool is_genType = true;
- //};
-
- //template <typename genType>
- //struct desc
- //{
- // typedef genType type;
- // typedef genType * pointer;
- // typedef genType const* const_pointer;
- // typedef genType const *const const_pointer_const;
- // typedef genType *const pointer_const;
- // typedef genType & reference;
- // typedef genType const& const_reference;
- // typedef genType const& param_type;
-
- // typedef typename genType::value_type value_type;
- // typedef typename genType::size_type size_type;
- // static const typename size_type value_size;
- //};
-
- //template <typename genType>
- //const typename desc<genType>::size_type desc<genType>::value_size = genType::value_size();
-
-}//namespace detail
-}//namespace glm
-
-//#include "type_gentype.inl"
diff --git a/inc/glm/detail/type_gentype.inl b/inc/glm/detail/type_gentype.inl deleted file mode 100644 index 684caa4..0000000 --- a/inc/glm/detail/type_gentype.inl +++ /dev/null @@ -1,370 +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 core
-/// @file glm/detail/type_gentype.inl
-/// @date 2008-10-05 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm{
-namespace detail{
-
-/////////////////////////////////
-// Static functions
-
-template <typename vT, uint cT, uint rT, profile pT>
-typename base<vT, cT, rT, pT>::size_type base<vT, cT, rT, pT>::col_size()
-{
- return cT;
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-typename base<vT, cT, rT, pT>::size_type base<vT, cT, rT, pT>::row_size()
-{
- return rT;
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-typename base<vT, cT, rT, pT>::size_type base<vT, cT, rT, pT>::value_size()
-{
- return rT * cT;
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-bool base<vT, cT, rT, pT>::is_scalar()
-{
- return rT == 1 && cT == 1;
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-bool base<vT, cT, rT, pT>::is_vector()
-{
- return rT == 1;
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-bool base<vT, cT, rT, pT>::is_matrix()
-{
- return rT != 1;
-}
-
-/////////////////////////////////
-// Constructor
-
-template <typename vT, uint cT, uint rT, profile pT>
-base<vT, cT, rT, pT>::base()
-{
- memset(&this->value, 0, cT * rT * sizeof(vT));
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-base<vT, cT, rT, pT>::base
-(
- typename base<vT, cT, rT, pT>::class_type const & m
-)
-{
- for
- (
- typename genType<vT, cT, rT, pT>::size_type i = typename base<vT, cT, rT, pT>::size_type(0);
- i < base<vT, cT, rT, pT>::col_size();
- ++i
- )
- {
- this->value[i] = m[i];
- }
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-base<vT, cT, rT, pT>::base
-(
- typename base<vT, cT, rT, pT>::T const & x
-)
-{
- if(rT == 1) // vector
- {
- for
- (
- typename base<vT, cT, rT, pT>::size_type i = typename base<vT, cT, rT, pT>::size_type(0);
- i < base<vT, cT, rT, pT>::col_size();
- ++i
- )
- {
- this->value[i][rT] = x;
- }
- }
- else // matrix
- {
- memset(&this->value, 0, cT * rT * sizeof(vT));
-
- typename base<vT, cT, rT, pT>::size_type stop = cT < rT ? cT : rT;
-
- for
- (
- typename base<vT, cT, rT, pT>::size_type i = typename base<vT, cT, rT, pT>::size_type(0);
- i < stop;
- ++i
- )
- {
- this->value[i][i] = x;
- }
- }
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-base<vT, cT, rT, pT>::base
-(
- typename base<vT, cT, rT, pT>::value_type const * const x
-)
-{
- memcpy(&this->value, &x.value, cT * rT * sizeof(vT));
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-base<vT, cT, rT, pT>::base
-(
- typename base<vT, cT, rT, pT>::col_type const * const x
-)
-{
- for
- (
- typename base<vT, cT, rT, pT>::size_type i = typename base<vT, cT, rT, pT>::size_type(0);
- i < base<vT, cT, rT, pT>::col_size();
- ++i
- )
- {
- this->value[i] = x[i];
- }
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-template <typename vU, uint cU, uint rU, profile pU>
-base<vT, cT, rT, pT>::base
-(
- base<vU, cU, rU, pU> const & m
-)
-{
- for
- (
- typename base<vT, cT, rT, pT>::size_type i = typename base<vT, cT, rT, pT>::size_type(0);
- i < base<vT, cT, rT, pT>::col_size();
- ++i
- )
- {
- this->value[i] = base<vT, cT, rT, pT>(m[i]);
- }
-}
-
-//////////////////////////////////////
-// Accesses
-
-template <typename vT, uint cT, uint rT, profile pT>
-typename base<vT, cT, rT, pT>::col_type& base<vT, cT, rT, pT>::operator[]
-(
- typename base<vT, cT, rT, pT>::size_type i
-)
-{
- return this->value[i];
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-typename base<vT, cT, rT, pT>::col_type const & base<vT, cT, rT, pT>::operator[]
-(
- typename base<vT, cT, rT, pT>::size_type i
-) const
-{
- return this->value[i];
-}
-
-//////////////////////////////////////
-// Unary updatable operators
-
-template <typename vT, uint cT, uint rT, profile pT>
-typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator=
-(
- typename base<vT, cT, rT, pT>::class_type const & x
-)
-{
- memcpy(&this->value, &x.value, cT * rT * sizeof(vT));
- return *this;
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator+=
-(
- typename base<vT, cT, rT, pT>::T const & x
-)
-{
- typename base<vT, cT, rT, pT>::size_type stop_col = x.col_size();
- typename base<vT, cT, rT, pT>::size_type stop_row = x.row_size();
-
- for(typename base<vT, cT, rT, pT>::size_type j = 0; j < stop_col; ++j)
- for(typename base<vT, cT, rT, pT>::size_type i = 0; i < stop_row; ++i)
- this->value[j][i] += x;
-
- return *this;
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator+=
-(
- typename base<vT, cT, rT, pT>::class_type const & x
-)
-{
- typename base<vT, cT, rT, pT>::size_type stop_col = x.col_size();
- typename base<vT, cT, rT, pT>::size_type stop_row = x.row_size();
-
- for(typename base<vT, cT, rT, pT>::size_type j = 0; j < stop_col; ++j)
- for(typename base<vT, cT, rT, pT>::size_type i = 0; i < stop_row; ++i)
- this->value[j][i] += x[j][i];
-
- return *this;
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator-=
-(
- typename base<vT, cT, rT, pT>::T const & x
-)
-{
- typename base<vT, cT, rT, pT>::size_type stop_col = x.col_size();
- typename base<vT, cT, rT, pT>::size_type stop_row = x.row_size();
-
- for(typename base<vT, cT, rT, pT>::size_type j = 0; j < stop_col; ++j)
- for(typename base<vT, cT, rT, pT>::size_type i = 0; i < stop_row; ++i)
- this->value[j][i] -= x;
-
- return *this;
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator-=
-(
- typename base<vT, cT, rT, pT>::class_type const & x
-)
-{
- typename base<vT, cT, rT, pT>::size_type stop_col = x.col_size();
- typename base<vT, cT, rT, pT>::size_type stop_row = x.row_size();
-
- for(typename base<vT, cT, rT, pT>::size_type j = 0; j < stop_col; ++j)
- for(typename base<vT, cT, rT, pT>::size_type i = 0; i < stop_row; ++i)
- this->value[j][i] -= x[j][i];
-
- return *this;
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator*=
-(
- typename base<vT, cT, rT, pT>::T const & x
-)
-{
- typename base<vT, cT, rT, pT>::size_type stop_col = x.col_size();
- typename base<vT, cT, rT, pT>::size_type stop_row = x.row_size();
-
- for(typename base<vT, cT, rT, pT>::size_type j = 0; j < stop_col; ++j)
- for(typename base<vT, cT, rT, pT>::size_type i = 0; i < stop_row; ++i)
- this->value[j][i] *= x;
-
- return *this;
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator*=
-(
- typename base<vT, cT, rT, pT>::class_type const & x
-)
-{
- typename base<vT, cT, rT, pT>::size_type stop_col = x.col_size();
- typename base<vT, cT, rT, pT>::size_type stop_row = x.row_size();
-
- for(typename base<vT, cT, rT, pT>::size_type j = 0; j < stop_col; ++j)
- for(typename base<vT, cT, rT, pT>::size_type i = 0; i < stop_row; ++i)
- this->value[j][i] *= x[j][i];
-
- return *this;
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator/=
-(
- typename base<vT, cT, rT, pT>::T const & x
-)
-{
- typename base<vT, cT, rT, pT>::size_type stop_col = x.col_size();
- typename base<vT, cT, rT, pT>::size_type stop_row = x.row_size();
-
- for(typename base<vT, cT, rT, pT>::size_type j = 0; j < stop_col; ++j)
- for(typename base<vT, cT, rT, pT>::size_type i = 0; i < stop_row; ++i)
- this->value[j][i] /= x;
-
- return *this;
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator/=
-(
- typename base<vT, cT, rT, pT>::class_type const & x
-)
-{
- typename base<vT, cT, rT, pT>::size_type stop_col = x.col_size();
- typename base<vT, cT, rT, pT>::size_type stop_row = x.row_size();
-
- for(typename base<vT, cT, rT, pT>::size_type j = 0; j < stop_col; ++j)
- for(typename base<vT, cT, rT, pT>::size_type i = 0; i < stop_row; ++i)
- this->value[j][i] /= x[j][i];
-
- return *this;
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator++ ()
-{
- typename base<vT, cT, rT, pT>::size_type stop_col = col_size();
- typename base<vT, cT, rT, pT>::size_type stop_row = row_size();
-
- for(typename base<vT, cT, rT, pT>::size_type j = 0; j < stop_col; ++j)
- for(typename base<vT, cT, rT, pT>::size_type i = 0; i < stop_row; ++i)
- ++this->value[j][i];
-
- return *this;
-}
-
-template <typename vT, uint cT, uint rT, profile pT>
-typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator-- ()
-{
- typename base<vT, cT, rT, pT>::size_type stop_col = col_size();
- typename base<vT, cT, rT, pT>::size_type stop_row = row_size();
-
- for(typename base<vT, cT, rT, pT>::size_type j = 0; j < stop_col; ++j)
- for(typename base<vT, cT, rT, pT>::size_type i = 0; i < stop_row; ++i)
- --this->value[j][i];
-
- return *this;
-}
-
-} //namespace detail
-} //namespace glm
diff --git a/inc/glm/detail/type_half.hpp b/inc/glm/detail/type_half.hpp deleted file mode 100644 index 3066d53..0000000 --- a/inc/glm/detail/type_half.hpp +++ /dev/null @@ -1,48 +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 core
-/// @file glm/detail/type_half.hpp
-/// @date 2008-08-17 / 2011-09-20
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "setup.hpp"
-
-namespace glm{
-namespace detail
-{
- typedef short hdata;
-
- GLM_FUNC_DECL float toFloat32(hdata value);
- GLM_FUNC_DECL hdata toFloat16(float const & value);
-
-}//namespace detail
-}//namespace glm
-
-#include "type_half.inl"
diff --git a/inc/glm/detail/type_half.inl b/inc/glm/detail/type_half.inl deleted file mode 100644 index 4632bd4..0000000 --- a/inc/glm/detail/type_half.inl +++ /dev/null @@ -1,277 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////////
-/// OpenGL Mathematics (glm.g-truc.net)
-///
-/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net)
-///
-/// This half implementation is based on OpenEXR which is Copyright (c) 2002,
-/// Industrial Light & Magic, a division of Lucas Digital Ltd. LLC
-///
-/// Permission is hereby granted, free of charge, to any person obtaining a copy
-/// of this software and associated documentation files (the "Software"), to deal
-/// in the Software without restriction, including without limitation the rights
-/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-/// copies of the Software, and to permit persons to whom the Software is
-/// furnished to do so, subject to the following conditions:
-///
-/// The above copyright notice and this permission notice shall be included in
-/// all copies or substantial portions of the Software.
-///
-/// Restrictions:
-/// By making use of the Software for military purposes, you choose to make
-/// a Bunny unhappy.
-///
-/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-/// THE SOFTWARE.
-///
-/// @ref core
-/// @file glm/detail/type_half.inl
-/// @date 2008-08-17 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm{
-namespace detail
-{
- GLM_FUNC_QUALIFIER float overflow()
- {
- volatile float f = 1e10;
-
- for(int i = 0; i < 10; ++i)
- f *= f; // this will overflow before the for loop terminates
- return f;
- }
-
- union uif32
- {
- GLM_FUNC_QUALIFIER uif32() :
- i(0)
- {}
-
- GLM_FUNC_QUALIFIER uif32(float f) :
- f(f)
- {}
-
- GLM_FUNC_QUALIFIER uif32(uint32 i) :
- i(i)
- {}
-
- float f;
- uint32 i;
- };
-
- GLM_FUNC_QUALIFIER float toFloat32(hdata value)
- {
- int s = (value >> 15) & 0x00000001;
- int e = (value >> 10) & 0x0000001f;
- int m = value & 0x000003ff;
-
- if(e == 0)
- {
- if(m == 0)
- {
- //
- // Plus or minus zero
- //
-
- detail::uif32 result;
- result.i = (unsigned int)(s << 31);
- return result.f;
- }
- else
- {
- //
- // Denormalized number -- renormalize it
- //
-
- while(!(m & 0x00000400))
- {
- m <<= 1;
- e -= 1;
- }
-
- e += 1;
- m &= ~0x00000400;
- }
- }
- else if(e == 31)
- {
- if(m == 0)
- {
- //
- // Positive or negative infinity
- //
-
- uif32 result;
- result.i = (unsigned int)((s << 31) | 0x7f800000);
- return result.f;
- }
- else
- {
- //
- // Nan -- preserve sign and significand bits
- //
-
- uif32 result;
- result.i = (unsigned int)((s << 31) | 0x7f800000 | (m << 13));
- return result.f;
- }
- }
-
- //
- // Normalized number
- //
-
- e = e + (127 - 15);
- m = m << 13;
-
- //
- // Assemble s, e and m.
- //
-
- uif32 Result;
- Result.i = (unsigned int)((s << 31) | (e << 23) | m);
- return Result.f;
- }
-
- GLM_FUNC_QUALIFIER hdata toFloat16(float const & f)
- {
- uif32 Entry;
- Entry.f = f;
- int i = (int)Entry.i;
-
- //
- // Our floating point number, f, is represented by the bit
- // pattern in integer i. Disassemble that bit pattern into
- // the sign, s, the exponent, e, and the significand, m.
- // Shift s into the position where it will go in in the
- // resulting half number.
- // Adjust e, accounting for the different exponent bias
- // of float and half (127 versus 15).
- //
-
- int s = (i >> 16) & 0x00008000;
- int e = ((i >> 23) & 0x000000ff) - (127 - 15);
- int m = i & 0x007fffff;
-
- //
- // Now reassemble s, e and m into a half:
- //
-
- if(e <= 0)
- {
- if(e < -10)
- {
- //
- // E is less than -10. The absolute value of f is
- // less than half_MIN (f may be a small normalized
- // float, a denormalized float or a zero).
- //
- // We convert f to a half zero.
- //
-
- return hdata(s);
- }
-
- //
- // E is between -10 and 0. F is a normalized float,
- // whose magnitude is less than __half_NRM_MIN.
- //
- // We convert f to a denormalized half.
- //
-
- m = (m | 0x00800000) >> (1 - e);
-
- //
- // Round to nearest, round "0.5" up.
- //
- // Rounding may cause the significand to overflow and make
- // our number normalized. Because of the way a half's bits
- // are laid out, we don't have to treat this case separately;
- // the code below will handle it correctly.
- //
-
- if(m & 0x00001000)
- m += 0x00002000;
-
- //
- // Assemble the half from s, e (zero) and m.
- //
-
- return hdata(s | (m >> 13));
- }
- else if(e == 0xff - (127 - 15))
- {
- if(m == 0)
- {
- //
- // F is an infinity; convert f to a half
- // infinity with the same sign as f.
- //
-
- return hdata(s | 0x7c00);
- }
- else
- {
- //
- // F is a NAN; we produce a half NAN that preserves
- // the sign bit and the 10 leftmost bits of the
- // significand of f, with one exception: If the 10
- // leftmost bits are all zero, the NAN would turn
- // into an infinity, so we have to set at least one
- // bit in the significand.
- //
-
- m >>= 13;
-
- return hdata(s | 0x7c00 | m | (m == 0));
- }
- }
- else
- {
- //
- // E is greater than zero. F is a normalized float.
- // We try to convert f to a normalized half.
- //
-
- //
- // Round to nearest, round "0.5" up
- //
-
- if(m & 0x00001000)
- {
- m += 0x00002000;
-
- if(m & 0x00800000)
- {
- m = 0; // overflow in significand,
- e += 1; // adjust exponent
- }
- }
-
- //
- // Handle exponent overflow
- //
-
- if (e > 30)
- {
- overflow(); // Cause a hardware floating point overflow;
-
- return hdata(s | 0x7c00);
- // if this returns, the half becomes an
- } // infinity with the same sign as f.
-
- //
- // Assemble the half from s, e and m.
- //
-
- return hdata(s | (e << 10) | (m >> 13));
- }
- }
-
-}//namespace detail
-}//namespace glm
diff --git a/inc/glm/detail/type_int.hpp b/inc/glm/detail/type_int.hpp deleted file mode 100644 index af6d556..0000000 --- a/inc/glm/detail/type_int.hpp +++ /dev/null @@ -1,326 +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 core
-/// @file glm/detail/type_int.hpp
-/// @date 2008-08-22 / 2013-03-30
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "setup.hpp"
-#if GLM_HAS_MAKE_SIGNED
-# include <type_traits>
-#endif
-
-#if GLM_HAS_EXTENDED_INTEGER_TYPE
-# include <cstdint>
-#endif
-
-namespace glm{
-namespace detail
-{
-# if GLM_HAS_EXTENDED_INTEGER_TYPE
- typedef std::int8_t int8;
- typedef std::int16_t int16;
- typedef std::int32_t int32;
- typedef std::int64_t int64;
-
- typedef std::uint8_t uint8;
- typedef std::uint16_t uint16;
- typedef std::uint32_t uint32;
- typedef std::uint64_t uint64;
-# else
-# if(defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) // C99 detected, 64 bit types available
- typedef int64_t sint64;
- typedef uint64_t uint64;
-# elif GLM_COMPILER & GLM_COMPILER_VC
- typedef signed __int64 sint64;
- typedef unsigned __int64 uint64;
-# elif GLM_COMPILER & GLM_COMPILER_GCC
- __extension__ typedef signed long long sint64;
- __extension__ typedef unsigned long long uint64;
-# else//unknown compiler
- typedef signed long long sint64;
- typedef unsigned long long uint64;
-# endif//GLM_COMPILER
-
- typedef signed char int8;
- typedef signed short int16;
- typedef signed int int32;
- typedef sint64 int64;
-
- typedef unsigned char uint8;
- typedef unsigned short uint16;
- typedef unsigned int uint32;
- typedef uint64 uint64;
-#endif//
-
- typedef signed int lowp_int_t;
- typedef signed int mediump_int_t;
- typedef signed int highp_int_t;
-
- typedef unsigned int lowp_uint_t;
- typedef unsigned int mediump_uint_t;
- typedef unsigned int highp_uint_t;
-
-# if GLM_HAS_MAKE_SIGNED
- using std::make_signed;
- using std::make_unsigned;
-
-# else//GLM_HAS_MAKE_SIGNED
- template <typename genType>
- struct make_signed
- {};
-
- template <>
- struct make_signed<char>
- {
- typedef char type;
- };
-
- template <>
- struct make_signed<short>
- {
- typedef short type;
- };
-
- template <>
- struct make_signed<int>
- {
- typedef int type;
- };
-
- template <>
- struct make_signed<long>
- {
- typedef long type;
- };
-
- template <>
- struct make_signed<long long>
- {
- typedef long long type;
- };
-
- template <>
- struct make_signed<unsigned char>
- {
- typedef char type;
- };
-
- template <>
- struct make_signed<unsigned short>
- {
- typedef short type;
- };
-
- template <>
- struct make_signed<unsigned int>
- {
- typedef int type;
- };
-
- template <>
- struct make_signed<unsigned long>
- {
- typedef long type;
- };
-
- template <>
- struct make_signed<unsigned long long>
- {
- typedef long long type;
- };
-
- template <typename genType>
- struct make_unsigned
- {};
-
- template <>
- struct make_unsigned<char>
- {
- typedef unsigned char type;
- };
-
- template <>
- struct make_unsigned<short>
- {
- typedef unsigned short type;
- };
-
- template <>
- struct make_unsigned<int>
- {
- typedef unsigned int type;
- };
-
- template <>
- struct make_unsigned<long>
- {
- typedef unsigned long type;
- };
-
- template <>
- struct make_unsigned<long long>
- {
- typedef unsigned long long type;
- };
-
- template <>
- struct make_unsigned<unsigned char>
- {
- typedef unsigned char type;
- };
-
- template <>
- struct make_unsigned<unsigned short>
- {
- typedef unsigned short type;
- };
-
- template <>
- struct make_unsigned<unsigned int>
- {
- typedef unsigned int type;
- };
-
- template <>
- struct make_unsigned<unsigned long>
- {
- typedef unsigned long type;
- };
-
- template <>
- struct make_unsigned<unsigned long long>
- {
- typedef unsigned long long type;
- };
-# endif//GLM_HAS_MAKE_SIGNED
-}//namespace detail
-
- typedef detail::int8 int8;
- typedef detail::int16 int16;
- typedef detail::int32 int32;
- typedef detail::int64 int64;
-
- typedef detail::uint8 uint8;
- typedef detail::uint16 uint16;
- typedef detail::uint32 uint32;
- typedef detail::uint64 uint64;
-
- /// @addtogroup core_precision
- /// @{
-
- /// Low precision signed integer.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.3 Integers</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef detail::lowp_int_t lowp_int;
-
- /// Medium precision signed integer.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.3 Integers</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef detail::mediump_int_t mediump_int;
-
- /// High precision signed integer.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.3 Integers</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef detail::highp_int_t highp_int;
-
- /// Low precision unsigned integer.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.3 Integers</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef detail::lowp_uint_t lowp_uint;
-
- /// Medium precision unsigned integer.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.3 Integers</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef detail::mediump_uint_t mediump_uint;
-
- /// High precision unsigned integer.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.3 Integers</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef detail::highp_uint_t highp_uint;
-
-#if(!defined(GLM_PRECISION_HIGHP_INT) && !defined(GLM_PRECISION_MEDIUMP_INT) && !defined(GLM_PRECISION_LOWP_INT))
- typedef mediump_int int_t;
-#elif(defined(GLM_PRECISION_HIGHP_INT) && !defined(GLM_PRECISION_MEDIUMP_INT) && !defined(GLM_PRECISION_LOWP_INT))
- typedef highp_int int_t;
-#elif(!defined(GLM_PRECISION_HIGHP_INT) && defined(GLM_PRECISION_MEDIUMP_INT) && !defined(GLM_PRECISION_LOWP_INT))
- typedef mediump_int int_t;
-#elif(!defined(GLM_PRECISION_HIGHP_INT) && !defined(GLM_PRECISION_MEDIUMP_INT) && defined(GLM_PRECISION_LOWP_INT))
- typedef lowp_int int_t;
-#else
-# error "GLM error: multiple default precision requested for signed interger types"
-#endif
-
-#if(!defined(GLM_PRECISION_HIGHP_UINT) && !defined(GLM_PRECISION_MEDIUMP_UINT) && !defined(GLM_PRECISION_LOWP_UINT))
- typedef mediump_uint uint_t;
-#elif(defined(GLM_PRECISION_HIGHP_UINT) && !defined(GLM_PRECISION_MEDIUMP_UINT) && !defined(GLM_PRECISION_LOWP_UINT))
- typedef highp_uint uint_t;
-#elif(!defined(GLM_PRECISION_HIGHP_UINT) && defined(GLM_PRECISION_MEDIUMP_UINT) && !defined(GLM_PRECISION_LOWP_UINT))
- typedef mediump_uint uint_t;
-#elif(!defined(GLM_PRECISION_HIGHP_UINT) && !defined(GLM_PRECISION_MEDIUMP_UINT) && defined(GLM_PRECISION_LOWP_UINT))
- typedef lowp_uint uint_t;
-#else
-# error "GLM error: multiple default precision requested for unsigned interger types"
-#endif
-
- /// Unsigned integer type.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.3 Integers</a>
- typedef unsigned int uint;
-
- /// @}
-
-////////////////////
-// check type sizes
-#ifndef GLM_STATIC_ASSERT_NULL
- GLM_STATIC_ASSERT(sizeof(glm::int8) == 1, "int8 size isn't 1 byte on this platform");
- GLM_STATIC_ASSERT(sizeof(glm::int16) == 2, "int16 size isn't 2 bytes on this platform");
- GLM_STATIC_ASSERT(sizeof(glm::int32) == 4, "int32 size isn't 4 bytes on this platform");
- GLM_STATIC_ASSERT(sizeof(glm::int64) == 8, "int64 size isn't 8 bytes on this platform");
-
- GLM_STATIC_ASSERT(sizeof(glm::uint8) == 1, "uint8 size isn't 1 byte on this platform");
- GLM_STATIC_ASSERT(sizeof(glm::uint16) == 2, "uint16 size isn't 2 bytes on this platform");
- GLM_STATIC_ASSERT(sizeof(glm::uint32) == 4, "uint32 size isn't 4 bytes on this platform");
- GLM_STATIC_ASSERT(sizeof(glm::uint64) == 8, "uint64 size isn't 8 bytes on this platform");
-#endif//GLM_STATIC_ASSERT_NULL
-
-}//namespace glm
diff --git a/inc/glm/detail/type_mat.hpp b/inc/glm/detail/type_mat.hpp deleted file mode 100644 index 221505e..0000000 --- a/inc/glm/detail/type_mat.hpp +++ /dev/null @@ -1,793 +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 core
-/// @file glm/detail/type_mat.hpp
-/// @date 2010-01-26 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "precision.hpp"
-
-namespace glm{
-namespace detail
-{
- template <typename T, precision P, template <class, precision> class colType, template <class, precision> class rowType>
- struct outerProduct_trait{};
-}//namespace detail
-
- template <typename T, precision P> struct tvec2;
- template <typename T, precision P> struct tvec3;
- template <typename T, precision P> struct tvec4;
- template <typename T, precision P> struct tmat2x2;
- template <typename T, precision P> struct tmat2x3;
- template <typename T, precision P> struct tmat2x4;
- template <typename T, precision P> struct tmat3x2;
- template <typename T, precision P> struct tmat3x3;
- template <typename T, precision P> struct tmat3x4;
- template <typename T, precision P> struct tmat4x2;
- template <typename T, precision P> struct tmat4x3;
- template <typename T, precision P> struct tmat4x4;
-
- /// @addtogroup core_precision
- /// @{
-
- /// 2 columns of 2 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x2<float, lowp> lowp_mat2;
-
- /// 2 columns of 2 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x2<float, mediump> mediump_mat2;
-
- /// 2 columns of 2 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x2<float, highp> highp_mat2;
-
- /// 2 columns of 2 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x2<float, lowp> lowp_mat2x2;
-
- /// 2 columns of 2 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x2<float, mediump> mediump_mat2x2;
-
- /// 2 columns of 2 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x2<float, highp> highp_mat2x2;
-
- /// @}
-
- /// @addtogroup core_precision
- /// @{
-
- /// 2 columns of 3 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x3<float, lowp> lowp_mat2x3;
-
- /// 2 columns of 3 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x3<float, mediump> mediump_mat2x3;
-
- /// 2 columns of 3 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x3<float, highp> highp_mat2x3;
-
- /// @}
-
- /// @addtogroup core_precision
- /// @{
-
- /// 2 columns of 4 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x4<float, lowp> lowp_mat2x4;
-
- /// 2 columns of 4 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x4<float, mediump> mediump_mat2x4;
-
- /// 2 columns of 4 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x4<float, highp> highp_mat2x4;
-
- /// @}
-
- /// @addtogroup core_precision
- /// @{
-
- /// 3 columns of 2 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x2<float, lowp> lowp_mat3x2;
-
- /// 3 columns of 2 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x2<float, mediump> mediump_mat3x2;
-
- /// 3 columns of 2 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x2<float, highp> highp_mat3x2;
-
- /// @}
-
- /// @addtogroup core_precision
- /// @{
-
- /// 3 columns of 3 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x3<float, lowp> lowp_mat3;
-
- /// 3 columns of 3 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x3<float, mediump> mediump_mat3;
-
- /// 3 columns of 3 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x3<float, highp> highp_mat3;
-
- /// 3 columns of 3 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x3<float, lowp> lowp_mat3x3;
-
- /// 3 columns of 3 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x3<float, mediump> mediump_mat3x3;
-
- /// 3 columns of 3 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x3<float, highp> highp_mat3x3;
-
- /// @}
-
- /// @addtogroup core_precision
- /// @{
-
- /// 3 columns of 4 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x4<float, lowp> lowp_mat3x4;
-
- /// 3 columns of 4 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x4<float, mediump> mediump_mat3x4;
-
- /// 3 columns of 4 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x4<float, highp> highp_mat3x4;
-
- /// @}
-
- /// @addtogroup core_precision
- /// @{
-
- /// 4 columns of 2 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x2<float, lowp> lowp_mat4x2;
-
- /// 4 columns of 2 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x2<float, mediump> mediump_mat4x2;
-
- /// 4 columns of 2 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x2<float, highp> highp_mat4x2;
-
- /// @}
-
- /// @addtogroup core_precision
- /// @{
-
- /// 4 columns of 3 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x3<float, lowp> lowp_mat4x3;
-
- /// 4 columns of 3 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x3<float, mediump> mediump_mat4x3;
-
- /// 4 columns of 3 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x3<float, highp> highp_mat4x3;
-
- /// @}
-
-
- /// @addtogroup core_precision
- /// @{
-
- /// 4 columns of 4 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x4<float, lowp> lowp_mat4;
-
- /// 4 columns of 4 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x4<float, mediump> mediump_mat4;
-
- /// 4 columns of 4 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x4<float, highp> highp_mat4;
-
- /// 4 columns of 4 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x4<float, lowp> lowp_mat4x4;
-
- /// 4 columns of 4 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x4<float, mediump> mediump_mat4x4;
-
- /// 4 columns of 4 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x4<float, highp> highp_mat4x4;
-
- /// @}
-
- /// @addtogroup core_types
- /// @{
-
- //////////////////////////
- // Float definition
-
-#if(defined(GLM_PRECISION_LOWP_FLOAT))
- typedef lowp_mat2x2 mat2x2;
- typedef lowp_mat2x3 mat2x3;
- typedef lowp_mat2x4 mat2x4;
- typedef lowp_mat3x2 mat3x2;
- typedef lowp_mat3x3 mat3x3;
- typedef lowp_mat3x4 mat3x4;
- typedef lowp_mat4x2 mat4x2;
- typedef lowp_mat4x3 mat4x3;
- typedef lowp_mat4x4 mat4x4;
-#elif(defined(GLM_PRECISION_MEDIUMP_FLOAT))
- typedef mediump_mat2x2 mat2x2;
- typedef mediump_mat2x3 mat2x3;
- typedef mediump_mat2x4 mat2x4;
- typedef mediump_mat3x2 mat3x2;
- typedef mediump_mat3x3 mat3x3;
- typedef mediump_mat3x4 mat3x4;
- typedef mediump_mat4x2 mat4x2;
- typedef mediump_mat4x3 mat4x3;
- typedef mediump_mat4x4 mat4x4;
-#else
- //! 2 columns of 2 components matrix of floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_mat2x2 mat2x2;
-
- //! 2 columns of 3 components matrix of floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_mat2x3 mat2x3;
-
- //! 2 columns of 4 components matrix of floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_mat2x4 mat2x4;
-
- //! 3 columns of 2 components matrix of floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_mat3x2 mat3x2;
-
- //! 3 columns of 3 components matrix of floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_mat3x3 mat3x3;
-
- //! 3 columns of 4 components matrix of floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_mat3x4 mat3x4;
-
- //! 4 columns of 2 components matrix of floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_mat4x2 mat4x2;
-
- //! 4 columns of 3 components matrix of floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_mat4x3 mat4x3;
-
- //! 4 columns of 4 components matrix of floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_mat4x4 mat4x4;
-
-#endif//GLM_PRECISION
-
- //! 2 columns of 2 components matrix of floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef mat2x2 mat2;
-
- //! 3 columns of 3 components matrix of floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef mat3x3 mat3;
-
- //! 4 columns of 4 components matrix of floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef mat4x4 mat4;
-
- //////////////////////////
- // Double definition
-
- /// @addtogroup core_precision
- /// @{
-
- /// 2 columns of 2 components matrix of low precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x2<double, lowp> lowp_dmat2;
-
- /// 2 columns of 2 components matrix of medium precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x2<double, mediump> mediump_dmat2;
-
- /// 2 columns of 2 components matrix of high precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x2<double, highp> highp_dmat2;
-
- /// 2 columns of 2 components matrix of low precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x2<double, lowp> lowp_dmat2x2;
-
- /// 2 columns of 2 components matrix of medium precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x2<double, mediump> mediump_dmat2x2;
-
- /// 2 columns of 2 components matrix of high precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x2<double, highp> highp_dmat2x2;
-
- /// @}
-
- /// @addtogroup core_precision
- /// @{
-
- /// 2 columns of 3 components matrix of low precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x3<double, lowp> lowp_dmat2x3;
-
- /// 2 columns of 3 components matrix of medium precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x3<double, mediump> mediump_dmat2x3;
-
- /// 2 columns of 3 components matrix of high precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x3<double, highp> highp_dmat2x3;
-
- /// @}
-
- /// @addtogroup core_precision
- /// @{
-
- /// 2 columns of 4 components matrix of low precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x4<double, lowp> lowp_dmat2x4;
-
- /// 2 columns of 4 components matrix of medium precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x4<double, mediump> mediump_dmat2x4;
-
- /// 2 columns of 4 components matrix of high precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x4<double, highp> highp_dmat2x4;
-
- /// @}
-
- /// @addtogroup core_precision
- /// @{
-
- /// 3 columns of 2 components matrix of low precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x2<double, lowp> lowp_dmat3x2;
-
- /// 3 columns of 2 components matrix of medium precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x2<double, mediump> mediump_dmat3x2;
-
- /// 3 columns of 2 components matrix of high precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x2<double, highp> highp_dmat3x2;
-
- /// @}
-
- /// @addtogroup core_precision
- /// @{
-
- /// 3 columns of 3 components matrix of low precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x3<float, lowp> lowp_dmat3;
-
- /// 3 columns of 3 components matrix of medium precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x3<double, mediump> mediump_dmat3;
-
- /// 3 columns of 3 components matrix of high precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x3<double, highp> highp_dmat3;
-
- /// 3 columns of 3 components matrix of low precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x3<double, lowp> lowp_dmat3x3;
-
- /// 3 columns of 3 components matrix of medium precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x3<double, mediump> mediump_dmat3x3;
-
- /// 3 columns of 3 components matrix of high precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x3<double, highp> highp_dmat3x3;
-
- /// @}
-
- /// @addtogroup core_precision
- /// @{
-
- /// 3 columns of 4 components matrix of low precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x4<double, lowp> lowp_dmat3x4;
-
- /// 3 columns of 4 components matrix of medium precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x4<double, mediump> mediump_dmat3x4;
-
- /// 3 columns of 4 components matrix of high precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x4<double, highp> highp_dmat3x4;
-
- /// @}
-
- /// @addtogroup core_precision
- /// @{
-
- /// 4 columns of 2 components matrix of low precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x2<double, lowp> lowp_dmat4x2;
-
- /// 4 columns of 2 components matrix of medium precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x2<double, mediump> mediump_dmat4x2;
-
- /// 4 columns of 2 components matrix of high precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x2<double, highp> highp_dmat4x2;
-
- /// @}
-
- /// @addtogroup core_precision
- /// @{
-
- /// 4 columns of 3 components matrix of low precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x3<double, lowp> lowp_dmat4x3;
-
- /// 4 columns of 3 components matrix of medium precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x3<double, mediump> mediump_dmat4x3;
-
- /// 4 columns of 3 components matrix of high precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x3<double, highp> highp_dmat4x3;
-
- /// @}
-
- /// @addtogroup core_precision
- /// @{
-
- /// 4 columns of 4 components matrix of low precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x4<double, lowp> lowp_dmat4;
-
- /// 4 columns of 4 components matrix of medium precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x4<double, mediump> mediump_dmat4;
-
- /// 4 columns of 4 components matrix of high precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x4<double, highp> highp_dmat4;
-
- /// 4 columns of 4 components matrix of low precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x4<double, lowp> lowp_dmat4x4;
-
- /// 4 columns of 4 components matrix of medium precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x4<double, mediump> mediump_dmat4x4;
-
- /// 4 columns of 4 components matrix of high precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x4<double, highp> highp_dmat4x4;
-
- /// @}
-
-#if(defined(GLM_PRECISION_LOWP_DOUBLE))
- typedef lowp_dmat2x2 dmat2x2;
- typedef lowp_dmat2x3 dmat2x3;
- typedef lowp_dmat2x4 dmat2x4;
- typedef lowp_dmat3x2 dmat3x2;
- typedef lowp_dmat3x3 dmat3x3;
- typedef lowp_dmat3x4 dmat3x4;
- typedef lowp_dmat4x2 dmat4x2;
- typedef lowp_dmat4x3 dmat4x3;
- typedef lowp_dmat4x4 dmat4x4;
-#elif(defined(GLM_PRECISION_MEDIUMP_DOUBLE))
- typedef mediump_dmat2x2 dmat2x2;
- typedef mediump_dmat2x3 dmat2x3;
- typedef mediump_dmat2x4 dmat2x4;
- typedef mediump_dmat3x2 dmat3x2;
- typedef mediump_dmat3x3 dmat3x3;
- typedef mediump_dmat3x4 dmat3x4;
- typedef mediump_dmat4x2 dmat4x2;
- typedef mediump_dmat4x3 dmat4x3;
- typedef mediump_dmat4x4 dmat4x4;
-#else //defined(GLM_PRECISION_HIGHP_DOUBLE)
-
- //! 2 * 2 matrix of double-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_dmat2x2 dmat2;
-
- //! 3 * 3 matrix of double-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_dmat3x3 dmat3;
-
- //! 4 * 4 matrix of double-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_dmat4x4 dmat4;
-
- //! 2 * 2 matrix of double-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_dmat2x2 dmat2x2;
-
- //! 2 * 3 matrix of double-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_dmat2x3 dmat2x3;
-
- //! 2 * 4 matrix of double-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_dmat2x4 dmat2x4;
-
- //! 3 * 2 matrix of double-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_dmat3x2 dmat3x2;
-
- /// 3 * 3 matrix of double-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_dmat3x3 dmat3x3;
-
- /// 3 * 4 matrix of double-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_dmat3x4 dmat3x4;
-
- /// 4 * 2 matrix of double-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_dmat4x2 dmat4x2;
-
- /// 4 * 3 matrix of double-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_dmat4x3 dmat4x3;
-
- /// 4 * 4 matrix of double-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- typedef highp_dmat4x4 dmat4x4;
-
-#endif//GLM_PRECISION
-
- /// @}
-}//namespace glm
diff --git a/inc/glm/detail/type_mat.inl b/inc/glm/detail/type_mat.inl deleted file mode 100644 index 6680af3..0000000 --- a/inc/glm/detail/type_mat.inl +++ /dev/null @@ -1,32 +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 core
-/// @file glm/detail/type_mat.inl
-/// @date 2011-06-15 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
diff --git a/inc/glm/detail/type_mat2x2.hpp b/inc/glm/detail/type_mat2x2.hpp deleted file mode 100644 index e5b8c8f..0000000 --- a/inc/glm/detail/type_mat2x2.hpp +++ /dev/null @@ -1,223 +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 core
-/// @file glm/detail/type_mat2x2.hpp
-/// @date 2005-01-27 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "../fwd.hpp"
-#include "type_vec2.hpp"
-#include "type_mat.hpp"
-#include <limits>
-#include <cstddef>
-
-namespace glm
-{
- template <typename T, precision P = defaultp>
- struct tmat2x2
- {
- typedef tvec2<T, P> col_type;
- typedef tvec2<T, P> row_type;
- typedef tmat2x2<T, P> type;
- typedef tmat2x2<T, P> transpose_type;
- typedef T value_type;
-
- template <typename U, precision Q>
- friend tvec2<U, Q> operator/(tmat2x2<U, Q> const & m, tvec2<U, Q> const & v);
- template <typename U, precision Q>
- friend tvec2<U, Q> operator/(tvec2<U, Q> const & v, tmat2x2<U, Q> const & m);
-
- private:
- /// @cond DETAIL
- col_type value[2];
- /// @endcond
-
- public:
- //////////////////////////////////////
- // Constructors
- GLM_FUNC_DECL tmat2x2();
- GLM_FUNC_DECL tmat2x2(tmat2x2<T, P> const & m);
- template <precision Q>
- GLM_FUNC_DECL tmat2x2(tmat2x2<T, Q> const & m);
-
- GLM_FUNC_DECL explicit tmat2x2(ctor);
- GLM_FUNC_DECL explicit tmat2x2(T const & x);
- GLM_FUNC_DECL tmat2x2(
- T const & x1, T const & y1,
- T const & x2, T const & y2);
- GLM_FUNC_DECL tmat2x2(
- col_type const & v1,
- col_type const & v2);
-
- //////////////////////////////////////
- // Conversions
- template <typename U, typename V, typename M, typename N>
- GLM_FUNC_DECL tmat2x2(
- U const & x1, V const & y1,
- M const & x2, N const & y2);
-
- template <typename U, typename V>
- GLM_FUNC_DECL tmat2x2(
- tvec2<U, P> const & v1,
- tvec2<V, P> const & v2);
-
- //////////////////////////////////////
- // Matrix conversions
-
-# ifdef GLM_FORCE_EXPLICIT_CTOR
- template <typename U, precision Q>
- GLM_FUNC_DECL explicit tmat2x2(tmat2x2<U, Q> const & m);
-# else
- template <typename U, precision Q>
- GLM_FUNC_DECL tmat2x2(tmat2x2<U, Q> const & m);
-# endif
-
- GLM_FUNC_DECL explicit tmat2x2(tmat3x3<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x2(tmat4x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x2(tmat2x3<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x2(tmat3x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x2(tmat2x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x2(tmat4x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x2(tmat3x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x2(tmat4x3<T, P> const & x);
-
- //////////////////////////////////////
- // Accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- typedef size_t size_type;
- GLM_FUNC_DECL GLM_CONSTEXPR size_t size() const;
-
- GLM_FUNC_DECL col_type & operator[](size_type i);
- GLM_FUNC_DECL col_type const & operator[](size_type i) const;
-# else
- typedef length_t length_type;
- GLM_FUNC_DECL GLM_CONSTEXPR length_type length() const;
-
- GLM_FUNC_DECL col_type & operator[](length_type i);
- GLM_FUNC_DECL col_type const & operator[](length_type i) const;
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////
- // Unary arithmetic operators
-
- GLM_FUNC_DECL tmat2x2<T, P> & operator=(tmat2x2<T, P> const & v);
-
- template <typename U>
- GLM_FUNC_DECL tmat2x2<T, P> & operator=(tmat2x2<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat2x2<T, P> & operator+=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat2x2<T, P> & operator+=(tmat2x2<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat2x2<T, P> & operator-=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat2x2<T, P> & operator-=(tmat2x2<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat2x2<T, P> & operator*=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat2x2<T, P> & operator*=(tmat2x2<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat2x2<T, P> & operator/=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat2x2<T, P> & operator/=(tmat2x2<U, P> const & m);
-
- //////////////////////////////////////
- // Increment and decrement operators
-
- GLM_FUNC_DECL tmat2x2<T, P> & operator++ ();
- GLM_FUNC_DECL tmat2x2<T, P> & operator-- ();
- GLM_FUNC_DECL tmat2x2<T, P> operator++(int);
- GLM_FUNC_DECL tmat2x2<T, P> operator--(int);
- };
-
- // Binary operators
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x2<T, P> operator+(tmat2x2<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x2<T, P> operator+(T const & s, tmat2x2<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x2<T, P> operator+(tmat2x2<T, P> const & m1, tmat2x2<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x2<T, P> operator-(tmat2x2<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x2<T, P> operator-(T const & s, tmat2x2<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x2<T, P> operator-(tmat2x2<T, P> const & m1, tmat2x2<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x2<T, P> operator*(tmat2x2<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x2<T, P> operator*(T const & s, tmat2x2<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat2x2<T, P>::col_type operator*(tmat2x2<T, P> const & m, typename tmat2x2<T, P>::row_type const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat2x2<T, P>::row_type operator*(typename tmat2x2<T, P>::col_type const & v, tmat2x2<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x2<T, P> operator*(tmat2x2<T, P> const & m1, tmat2x2<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x2<T, P> operator*(tmat2x2<T, P> const & m1, tmat3x2<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x2<T, P> operator*(tmat2x2<T, P> const & m1, tmat4x2<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x2<T, P> operator/(tmat2x2<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x2<T, P> operator/(T const & s, tmat2x2<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat2x2<T, P>::col_type operator/(tmat2x2<T, P> const & m, typename tmat2x2<T, P>::row_type const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat2x2<T, P>::row_type operator/(typename tmat2x2<T, P>::col_type const & v, tmat2x2<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x2<T, P> operator/(tmat2x2<T, P> const & m1, tmat2x2<T, P> const & m2);
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x2<T, P> const operator-(tmat2x2<T, P> const & m);
-} //namespace glm
-
-#ifndef GLM_EXTERNAL_TEMPLATE
-#include "type_mat2x2.inl"
-#endif
diff --git a/inc/glm/detail/type_mat2x2.inl b/inc/glm/detail/type_mat2x2.inl deleted file mode 100644 index 4a19cb9..0000000 --- a/inc/glm/detail/type_mat2x2.inl +++ /dev/null @@ -1,548 +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 core
-/// @file glm/detail/type_mat2x2.inl
-/// @date 2005-01-16 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm{
-namespace detail
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> compute_inverse(tmat2x2<T, P> const & m)
- {
- T OneOverDeterminant = static_cast<T>(1) / (
- + m[0][0] * m[1][1]
- - m[1][0] * m[0][1]);
-
- tmat2x2<T, P> Inverse(
- + m[1][1] * OneOverDeterminant,
- - m[0][1] * OneOverDeterminant,
- - m[1][0] * OneOverDeterminant,
- + m[0][0] * OneOverDeterminant);
-
- return Inverse;
- }
-}//namespace detail
-
- //////////////////////////////////////////////////////////////
- // Constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>::tmat2x2()
- {
-# ifndef GLM_FORCE_NO_CTOR_INIT
- this->value[0] = col_type(1, 0);
- this->value[1] = col_type(0, 1);
-# endif
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>::tmat2x2(tmat2x2<T, P> const & m)
- {
- this->value[0] = m.value[0];
- this->value[1] = m.value[1];
- }
-
- template <typename T, precision P>
- template <precision Q>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>::tmat2x2(tmat2x2<T, Q> const & m)
- {
- this->value[0] = m.value[0];
- this->value[1] = m.value[1];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>::tmat2x2(ctor)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>::tmat2x2(T const & s)
- {
- this->value[0] = col_type(s, 0);
- this->value[1] = col_type(0, s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>::tmat2x2
- (
- T const & x0, T const & y0,
- T const & x1, T const & y1
- )
- {
- this->value[0] = col_type(x0, y0);
- this->value[1] = col_type(x1, y1);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>::tmat2x2(col_type const & v0, col_type const & v1)
- {
- this->value[0] = v0;
- this->value[1] = v1;
- }
-
- //////////////////////////////////////
- // Conversion constructors
- template <typename T, precision P>
- template <typename X1, typename Y1, typename X2, typename Y2>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>::tmat2x2
- (
- X1 const & x1, Y1 const & y1,
- X2 const & x2, Y2 const & y2
- )
- {
- this->value[0] = col_type(static_cast<T>(x1), value_type(y1));
- this->value[1] = col_type(static_cast<T>(x2), value_type(y2));
- }
-
- template <typename T, precision P>
- template <typename V1, typename V2>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>::tmat2x2(tvec2<V1, P> const & v1, tvec2<V2, P> const & v2)
- {
- this->value[0] = col_type(v1);
- this->value[1] = col_type(v2);
- }
-
- //////////////////////////////////////////////////////////////
- // mat2x2 matrix conversions
-
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>::tmat2x2(tmat2x2<U, Q> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>::tmat2x2(tmat3x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>::tmat2x2(tmat4x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>::tmat2x2(tmat2x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>::tmat2x2(tmat3x2<T, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>::tmat2x2(tmat2x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>::tmat2x2(tmat4x2<T, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>::tmat2x2(tmat3x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>::tmat2x2(tmat4x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- }
-
- //////////////////////////////////////
- // Accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tmat2x2<T, P>::size_type tmat2x2<T, P>::size() const
- {
- return 2;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat2x2<T, P>::col_type & tmat2x2<T, P>::operator[](typename tmat2x2<T, P>::size_type i)
- {
- assert(i < this->size());
- return this->value[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat2x2<T, P>::col_type const & tmat2x2<T, P>::operator[](typename tmat2x2<T, P>::size_type i) const
- {
- assert(i < this->size());
- return this->value[i];
- }
-# else
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tmat2x2<T, P>::length_type tmat2x2<T, P>::length() const
- {
- return 2;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat2x2<T, P>::col_type & tmat2x2<T, P>::operator[](typename tmat2x2<T, P>::length_type i)
- {
- assert(i < this->length());
- return this->value[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat2x2<T, P>::col_type const & tmat2x2<T, P>::operator[](typename tmat2x2<T, P>::length_type i) const
- {
- assert(i < this->length());
- return this->value[i];
- }
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////////////////////////////
- // Unary updatable operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>& tmat2x2<T, P>::operator=(tmat2x2<T, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>& tmat2x2<T, P>::operator=(tmat2x2<U, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>& tmat2x2<T, P>::operator+=(U s)
- {
- this->value[0] += s;
- this->value[1] += s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>& tmat2x2<T, P>::operator+=(tmat2x2<U, P> const & m)
- {
- this->value[0] += m[0];
- this->value[1] += m[1];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>& tmat2x2<T, P>::operator-=(U s)
- {
- this->value[0] -= s;
- this->value[1] -= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>& tmat2x2<T, P>::operator-=(tmat2x2<U, P> const & m)
- {
- this->value[0] -= m[0];
- this->value[1] -= m[1];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>& tmat2x2<T, P>::operator*=(U s)
- {
- this->value[0] *= s;
- this->value[1] *= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>& tmat2x2<T, P>::operator*=(tmat2x2<U, P> const & m)
- {
- return (*this = *this * m);
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>& tmat2x2<T, P>::operator/=(U s)
- {
- this->value[0] /= s;
- this->value[1] /= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>& tmat2x2<T, P>::operator/=(tmat2x2<U, P> const & m)
- {
- return (*this = *this * detail::compute_inverse<T, P>(m));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>& tmat2x2<T, P>::operator++()
- {
- ++this->value[0];
- ++this->value[1];
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P>& tmat2x2<T, P>::operator--()
- {
- --this->value[0];
- --this->value[1];
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> tmat2x2<T, P>::operator++(int)
- {
- tmat2x2<T, P> Result(*this);
- ++*this;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> tmat2x2<T, P>::operator--(int)
- {
- tmat2x2<T, P> Result(*this);
- --*this;
- return Result;
- }
-
- //////////////////////////////////////////////////////////////
- // Binary operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> operator+(tmat2x2<T, P> const & m, T const & s)
- {
- return tmat2x2<T, P>(
- m[0] + s,
- m[1] + s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> operator+(T const & s, tmat2x2<T, P> const & m)
- {
- return tmat2x2<T, P>(
- m[0] + s,
- m[1] + s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> operator+(tmat2x2<T, P> const & m1, tmat2x2<T, P> const & m2)
- {
- return tmat2x2<T, P>(
- m1[0] + m2[0],
- m1[1] + m2[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> operator-(tmat2x2<T, P> const & m, T const & s)
- {
- return tmat2x2<T, P>(
- m[0] - s,
- m[1] - s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> operator-(T const & s, tmat2x2<T, P> const & m)
- {
- return tmat2x2<T, P>(
- s - m[0],
- s - m[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> operator-(tmat2x2<T, P> const & m1, tmat2x2<T, P> const & m2)
- {
- return tmat2x2<T, P>(
- m1[0] - m2[0],
- m1[1] - m2[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> operator*(tmat2x2<T, P> const & m, T const & s)
- {
- return tmat2x2<T, P>(
- m[0] * s,
- m[1] * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> operator*(T const & s, tmat2x2<T, P> const & m)
- {
- return tmat2x2<T, P>(
- m[0] * s,
- m[1] * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat2x2<T, P>::col_type operator*
- (
- tmat2x2<T, P> const & m,
- typename tmat2x2<T, P>::row_type const & v
- )
- {
- return tvec2<T, P>(
- m[0][0] * v.x + m[1][0] * v.y,
- m[0][1] * v.x + m[1][1] * v.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat2x2<T, P>::row_type operator*
- (
- typename tmat2x2<T, P>::col_type const & v,
- tmat2x2<T, P> const & m
- )
- {
- return tvec2<T, P>(
- v.x * m[0][0] + v.y * m[0][1],
- v.x * m[1][0] + v.y * m[1][1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> operator*(tmat2x2<T, P> const & m1, tmat2x2<T, P> const & m2)
- {
- return tmat2x2<T, P>(
- m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1],
- m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1],
- m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1],
- m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P> operator*(tmat2x2<T, P> const & m1, tmat3x2<T, P> const & m2)
- {
- return tmat3x2<T, P>(
- m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1],
- m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1],
- m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1],
- m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1],
- m1[0][0] * m2[2][0] + m1[1][0] * m2[2][1],
- m1[0][1] * m2[2][0] + m1[1][1] * m2[2][1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> operator*(tmat2x2<T, P> const & m1, tmat4x2<T, P> const & m2)
- {
- return tmat4x2<T, P>(
- m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1],
- m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1],
- m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1],
- m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1],
- m1[0][0] * m2[2][0] + m1[1][0] * m2[2][1],
- m1[0][1] * m2[2][0] + m1[1][1] * m2[2][1],
- m1[0][0] * m2[3][0] + m1[1][0] * m2[3][1],
- m1[0][1] * m2[3][0] + m1[1][1] * m2[3][1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> operator/(tmat2x2<T, P> const & m, T const & s)
- {
- return tmat2x2<T, P>(
- m[0] / s,
- m[1] / s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> operator/(T const & s, tmat2x2<T, P> const & m)
- {
- return tmat2x2<T, P>(
- s / m[0],
- s / m[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat2x2<T, P>::col_type operator/(tmat2x2<T, P> const & m, typename tmat2x2<T, P>::row_type const & v)
- {
- return detail::compute_inverse<T, P>(m) * v;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat2x2<T, P>::row_type operator/(typename tmat2x2<T, P>::col_type const & v, tmat2x2<T, P> const & m)
- {
- return v * detail::compute_inverse<T, P>(m);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> operator/(tmat2x2<T, P> const & m1, tmat2x2<T, P> const & m2)
- {
- tmat2x2<T, P> m1_copy(m1);
- return m1_copy /= m2;
- }
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> const operator-(tmat2x2<T, P> const & m)
- {
- return tmat2x2<T, P>(
- -m[0],
- -m[1]);
- }
-
- //////////////////////////////////////
- // Boolean operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator==(tmat2x2<T, P> const & m1, tmat2x2<T, P> const & m2)
- {
- return (m1[0] == m2[0]) && (m1[1] == m2[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator!=(tmat2x2<T, P> const & m1, tmat2x2<T, P> const & m2)
- {
- return (m1[0] != m2[0]) || (m1[1] != m2[1]);
- }
-} //namespace glm
diff --git a/inc/glm/detail/type_mat2x3.hpp b/inc/glm/detail/type_mat2x3.hpp deleted file mode 100644 index 142bd9e..0000000 --- a/inc/glm/detail/type_mat2x3.hpp +++ /dev/null @@ -1,201 +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 core
-/// @file glm/detail/type_mat2x3.hpp
-/// @date 2006-10-01 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "../fwd.hpp"
-#include "type_vec2.hpp"
-#include "type_vec3.hpp"
-#include "type_mat.hpp"
-#include <limits>
-#include <cstddef>
-
-namespace glm
-{
- template <typename T, precision P = defaultp>
- struct tmat2x3
- {
- typedef tvec3<T, P> col_type;
- typedef tvec2<T, P> row_type;
- typedef tmat2x3<T, P> type;
- typedef tmat3x2<T, P> transpose_type;
- typedef T value_type;
-
- private:
- /// @cond DETAIL
- col_type value[2];
- /// @endcond
-
- public:
- // Constructors
- GLM_FUNC_DECL tmat2x3();
- GLM_FUNC_DECL tmat2x3(tmat2x3<T, P> const & m);
- template <precision Q>
- GLM_FUNC_DECL tmat2x3(tmat2x3<T, Q> const & m);
-
- GLM_FUNC_DECL explicit tmat2x3(ctor);
- GLM_FUNC_DECL explicit tmat2x3(T const & s);
- GLM_FUNC_DECL tmat2x3(
- T const & x0, T const & y0, T const & z0,
- T const & x1, T const & y1, T const & z1);
- GLM_FUNC_DECL tmat2x3(
- col_type const & v0,
- col_type const & v1);
-
- //////////////////////////////////////
- // Conversions
-
- template <typename X1, typename Y1, typename Z1, typename X2, typename Y2, typename Z2>
- GLM_FUNC_DECL tmat2x3(
- X1 const & x1, Y1 const & y1, Z1 const & z1,
- X2 const & x2, Y2 const & y2, Z2 const & z2);
-
- template <typename U, typename V>
- GLM_FUNC_DECL tmat2x3(
- tvec3<U, P> const & v1,
- tvec3<V, P> const & v2);
-
- //////////////////////////////////////
- // Matrix conversion
-
-# ifdef GLM_FORCE_EXPLICIT_CTOR
- template <typename U, precision Q>
- GLM_FUNC_DECL explicit tmat2x3(tmat2x3<U, Q> const & m);
-# else
- template <typename U, precision Q>
- GLM_FUNC_DECL tmat2x3(tmat2x3<U, Q> const & m);
-# endif
-
- GLM_FUNC_DECL explicit tmat2x3(tmat2x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x3(tmat3x3<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x3(tmat4x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x3(tmat2x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x3(tmat3x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x3(tmat3x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x3(tmat4x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x3(tmat4x3<T, P> const & x);
-
- //////////////////////////////////////
- // Accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- typedef size_t size_type;
- GLM_FUNC_DECL GLM_CONSTEXPR size_t size() const;
-
- GLM_FUNC_DECL col_type & operator[](size_type i);
- GLM_FUNC_DECL col_type const & operator[](size_type i) const;
-# else
- typedef length_t length_type;
- GLM_FUNC_DECL GLM_CONSTEXPR length_type length() const;
-
- GLM_FUNC_DECL col_type & operator[](length_type i);
- GLM_FUNC_DECL col_type const & operator[](length_type i) const;
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////
- // Unary arithmetic operators
-
- GLM_FUNC_DECL tmat2x3<T, P> & operator=(tmat2x3<T, P> const & m);
-
- template <typename U>
- GLM_FUNC_DECL tmat2x3<T, P> & operator=(tmat2x3<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat2x3<T, P> & operator+=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat2x3<T, P> & operator+=(tmat2x3<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat2x3<T, P> & operator-=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat2x3<T, P> & operator-=(tmat2x3<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat2x3<T, P> & operator*=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat2x3<T, P> & operator/=(U s);
-
- //////////////////////////////////////
- // Increment and decrement operators
-
- GLM_FUNC_DECL tmat2x3<T, P> & operator++ ();
- GLM_FUNC_DECL tmat2x3<T, P> & operator-- ();
- GLM_FUNC_DECL tmat2x3<T, P> operator++(int);
- GLM_FUNC_DECL tmat2x3<T, P> operator--(int);
- };
-
- // Binary operators
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x3<T, P> operator+(tmat2x3<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x3<T, P> operator+(tmat2x3<T, P> const & m1, tmat2x3<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x3<T, P> operator-(tmat2x3<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x3<T, P> operator-(tmat2x3<T, P> const & m1, tmat2x3<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x3<T, P> operator*(tmat2x3<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x3<T, P> operator*(T const & s, tmat2x3<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat2x3<T, P>::col_type operator*(tmat2x3<T, P> const & m, typename tmat2x3<T, P>::row_type const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat2x3<T, P>::row_type operator*(typename tmat2x3<T, P>::col_type const & v, tmat2x3<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x3<T, P> operator*(tmat2x3<T, P> const & m1, tmat2x2<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> operator*(tmat2x3<T, P> const & m1, tmat3x2<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x3<T, P> operator*(tmat2x3<T, P> const & m1, tmat4x2<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x3<T, P> operator/(tmat2x3<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x3<T, P> operator/(T const & s, tmat2x3<T, P> const & m);
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x3<T, P> const operator-(tmat2x3<T, P> const & m);
-}//namespace glm
-
-#ifndef GLM_EXTERNAL_TEMPLATE
-#include "type_mat2x3.inl"
-#endif
diff --git a/inc/glm/detail/type_mat2x3.inl b/inc/glm/detail/type_mat2x3.inl deleted file mode 100644 index 5db880e..0000000 --- a/inc/glm/detail/type_mat2x3.inl +++ /dev/null @@ -1,506 +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 core
-/// @file glm/detail/type_mat2x3.inl
-/// @date 2006-08-05 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- //////////////////////////////////////////////////////////////
- // Constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>::tmat2x3()
- {
-# ifndef GLM_FORCE_NO_CTOR_INIT
- this->value[0] = col_type(1, 0, 0);
- this->value[1] = col_type(0, 1, 0);
-# endif
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>::tmat2x3(tmat2x3<T, P> const & m)
- {
- this->value[0] = m.value[0];
- this->value[1] = m.value[1];
- }
-
- template <typename T, precision P>
- template <precision Q>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>::tmat2x3(tmat2x3<T, Q> const & m)
- {
- this->value[0] = m.value[0];
- this->value[1] = m.value[1];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>::tmat2x3(ctor)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>::tmat2x3(T const & s)
- {
- this->value[0] = col_type(s, 0, 0);
- this->value[1] = col_type(0, s, 0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>::tmat2x3
- (
- T const & x0, T const & y0, T const & z0,
- T const & x1, T const & y1, T const & z1
- )
- {
- this->value[0] = col_type(x0, y0, z0);
- this->value[1] = col_type(x1, y1, z1);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>::tmat2x3(col_type const & v0, col_type const & v1)
- {
- this->value[0] = v0;
- this->value[1] = v1;
- }
-
- //////////////////////////////////////
- // Conversion constructors
- template <typename T, precision P>
- template <
- typename X1, typename Y1, typename Z1,
- typename X2, typename Y2, typename Z2>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>::tmat2x3
- (
- X1 const & x1, Y1 const & y1, Z1 const & z1,
- X2 const & x2, Y2 const & y2, Z2 const & z2
- )
- {
- this->value[0] = col_type(static_cast<T>(x1), value_type(y1), value_type(z1));
- this->value[1] = col_type(static_cast<T>(x2), value_type(y2), value_type(z2));
- }
-
- template <typename T, precision P>
- template <typename V1, typename V2>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>::tmat2x3(tvec3<V1, P> const & v1, tvec3<V2, P> const & v2)
- {
- this->value[0] = col_type(v1);
- this->value[1] = col_type(v2);
- }
-
- //////////////////////////////////////
- // Matrix conversions
-
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>::tmat2x3(tmat2x3<U, Q> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>::tmat2x3(tmat2x2<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0);
- this->value[1] = col_type(m[1], 0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>::tmat2x3(tmat3x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>::tmat2x3(tmat4x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>::tmat2x3(tmat2x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>::tmat2x3(tmat3x2<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0);
- this->value[1] = col_type(m[1], 0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>::tmat2x3(tmat3x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>::tmat2x3(tmat4x2<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0);
- this->value[1] = col_type(m[1], 0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>::tmat2x3(tmat4x3<T, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- }
-
- //////////////////////////////////////
- // Accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tmat2x3<T, P>::size_type tmat2x3<T, P>::size() const
- {
- return 2;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat2x3<T, P>::col_type & tmat2x3<T, P>::operator[](typename tmat2x3<T, P>::size_type i)
- {
- assert(i < this->size());
- return this->value[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat2x3<T, P>::col_type const & tmat2x3<T, P>::operator[](typename tmat2x3<T, P>::size_type i) const
- {
- assert(i < this->size());
- return this->value[i];
- }
-# else
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tmat2x3<T, P>::length_type tmat2x3<T, P>::length() const
- {
- return 2;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat2x3<T, P>::col_type & tmat2x3<T, P>::operator[](typename tmat2x3<T, P>::length_type i)
- {
- assert(i < this->length());
- return this->value[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat2x3<T, P>::col_type const & tmat2x3<T, P>::operator[](typename tmat2x3<T, P>::length_type i) const
- {
- assert(i < this->length());
- return this->value[i];
- }
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////////////////////////////
- // Unary updatable operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>& tmat2x3<T, P>::operator=(tmat2x3<T, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>& tmat2x3<T, P>::operator=(tmat2x3<U, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x3<T, P> & tmat2x3<T, P>::operator+=(U s)
- {
- this->value[0] += s;
- this->value[1] += s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>& tmat2x3<T, P>::operator+=(tmat2x3<U, P> const & m)
- {
- this->value[0] += m[0];
- this->value[1] += m[1];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>& tmat2x3<T, P>::operator-=(U s)
- {
- this->value[0] -= s;
- this->value[1] -= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>& tmat2x3<T, P>::operator-=(tmat2x3<U, P> const & m)
- {
- this->value[0] -= m[0];
- this->value[1] -= m[1];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x3<T, P>& tmat2x3<T, P>::operator*=(U s)
- {
- this->value[0] *= s;
- this->value[1] *= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x3<T, P> & tmat2x3<T, P>::operator/=(U s)
- {
- this->value[0] /= s;
- this->value[1] /= s;
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P> & tmat2x3<T, P>::operator++()
- {
- ++this->value[0];
- ++this->value[1];
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P> & tmat2x3<T, P>::operator--()
- {
- --this->value[0];
- --this->value[1];
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P> tmat2x3<T, P>::operator++(int)
- {
- tmat2x3<T, P> Result(*this);
- ++*this;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P> tmat2x3<T, P>::operator--(int)
- {
- tmat2x3<T, P> Result(*this);
- --*this;
- return Result;
- }
-
- //////////////////////////////////////////////////////////////
- // Binary operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P> operator+(tmat2x3<T, P> const & m, T const & s)
- {
- return tmat2x3<T, P>(
- m[0] + s,
- m[1] + s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P> operator+(tmat2x3<T, P> const & m1, tmat2x3<T, P> const & m2)
- {
- return tmat2x3<T, P>(
- m1[0] + m2[0],
- m1[1] + m2[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P> operator-(tmat2x3<T, P> const & m, T const & s)
- {
- return tmat2x3<T, P>(
- m[0] - s,
- m[1] - s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P> operator-(tmat2x3<T, P> const & m1, tmat2x3<T, P> const & m2)
- {
- return tmat2x3<T, P>(
- m1[0] - m2[0],
- m1[1] - m2[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P> operator*(tmat2x3<T, P> const & m, T const & s)
- {
- return tmat2x3<T, P>(
- m[0] * s,
- m[1] * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P> operator*(T const & s, tmat2x3<T, P> const & m)
- {
- return tmat2x3<T, P>(
- m[0] * s,
- m[1] * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat2x3<T, P>::col_type operator*
- (
- tmat2x3<T, P> const & m,
- typename tmat2x3<T, P>::row_type const & v)
- {
- return typename tmat2x3<T, P>::col_type(
- m[0][0] * v.x + m[1][0] * v.y,
- m[0][1] * v.x + m[1][1] * v.y,
- m[0][2] * v.x + m[1][2] * v.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat2x3<T, P>::row_type operator*
- (
- typename tmat2x3<T, P>::col_type const & v,
- tmat2x3<T, P> const & m)
- {
- return typename tmat2x3<T, P>::row_type(
- v.x * m[0][0] + v.y * m[0][1] + v.z * m[0][2],
- v.x * m[1][0] + v.y * m[1][1] + v.z * m[1][2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P> operator*(tmat2x3<T, P> const & m1, tmat2x2<T, P> const & m2)
- {
- return tmat2x3<T, P>(
- m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1],
- m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1],
- m1[0][2] * m2[0][0] + m1[1][2] * m2[0][1],
- m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1],
- m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1],
- m1[0][2] * m2[1][0] + m1[1][2] * m2[1][1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> operator*(tmat2x3<T, P> const & m1, tmat3x2<T, P> const & m2)
- {
- T SrcA00 = m1[0][0];
- T SrcA01 = m1[0][1];
- T SrcA02 = m1[0][2];
- T SrcA10 = m1[1][0];
- T SrcA11 = m1[1][1];
- T SrcA12 = m1[1][2];
-
- T SrcB00 = m2[0][0];
- T SrcB01 = m2[0][1];
- T SrcB10 = m2[1][0];
- T SrcB11 = m2[1][1];
- T SrcB20 = m2[2][0];
- T SrcB21 = m2[2][1];
-
- tmat3x3<T, P> Result(uninitialize);
- Result[0][0] = SrcA00 * SrcB00 + SrcA10 * SrcB01;
- Result[0][1] = SrcA01 * SrcB00 + SrcA11 * SrcB01;
- Result[0][2] = SrcA02 * SrcB00 + SrcA12 * SrcB01;
- Result[1][0] = SrcA00 * SrcB10 + SrcA10 * SrcB11;
- Result[1][1] = SrcA01 * SrcB10 + SrcA11 * SrcB11;
- Result[1][2] = SrcA02 * SrcB10 + SrcA12 * SrcB11;
- Result[2][0] = SrcA00 * SrcB20 + SrcA10 * SrcB21;
- Result[2][1] = SrcA01 * SrcB20 + SrcA11 * SrcB21;
- Result[2][2] = SrcA02 * SrcB20 + SrcA12 * SrcB21;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> operator*(tmat2x3<T, P> const & m1, tmat4x2<T, P> const & m2)
- {
- return tmat4x3<T, P>(
- m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1],
- m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1],
- m1[0][2] * m2[0][0] + m1[1][2] * m2[0][1],
- m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1],
- m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1],
- m1[0][2] * m2[1][0] + m1[1][2] * m2[1][1],
- m1[0][0] * m2[2][0] + m1[1][0] * m2[2][1],
- m1[0][1] * m2[2][0] + m1[1][1] * m2[2][1],
- m1[0][2] * m2[2][0] + m1[1][2] * m2[2][1],
- m1[0][0] * m2[3][0] + m1[1][0] * m2[3][1],
- m1[0][1] * m2[3][0] + m1[1][1] * m2[3][1],
- m1[0][2] * m2[3][0] + m1[1][2] * m2[3][1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P> operator/(tmat2x3<T, P> const & m, T const & s)
- {
- return tmat2x3<T, P>(
- m[0] / s,
- m[1] / s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P> operator/(T const & s, tmat2x3<T, P> const & m)
- {
- return tmat2x3<T, P>(
- s / m[0],
- s / m[1]);
- }
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P> const operator-(tmat2x3<T, P> const & m)
- {
- return tmat2x3<T, P>(
- -m[0],
- -m[1]);
- }
-
- //////////////////////////////////////
- // Boolean operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator==(tmat2x3<T, P> const & m1, tmat2x3<T, P> const & m2)
- {
- return (m1[0] == m2[0]) && (m1[1] == m2[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator!=(tmat2x3<T, P> const & m1, tmat2x3<T, P> const & m2)
- {
- return (m1[0] != m2[0]) || (m1[1] != m2[1]);
- }
-} //namespace glm
diff --git a/inc/glm/detail/type_mat2x4.hpp b/inc/glm/detail/type_mat2x4.hpp deleted file mode 100644 index 425c807..0000000 --- a/inc/glm/detail/type_mat2x4.hpp +++ /dev/null @@ -1,202 +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 core
-/// @file glm/detail/type_mat2x4.hpp
-/// @date 2006-08-05 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "../fwd.hpp"
-#include "type_vec2.hpp"
-#include "type_vec4.hpp"
-#include "type_mat.hpp"
-#include <limits>
-#include <cstddef>
-
-namespace glm
-{
- template <typename T, precision P = defaultp>
- struct tmat2x4
- {
- typedef tvec4<T, P> col_type;
- typedef tvec2<T, P> row_type;
- typedef tmat2x4<T, P> type;
- typedef tmat4x2<T, P> transpose_type;
- typedef T value_type;
-
- private:
- /// @cond DETAIL
- col_type value[2];
- /// @endcond
-
- public:
- // Constructors
- GLM_FUNC_DECL tmat2x4();
- GLM_FUNC_DECL tmat2x4(tmat2x4<T, P> const & m);
- template <precision Q>
- GLM_FUNC_DECL tmat2x4(tmat2x4<T, Q> const & m);
-
- GLM_FUNC_DECL explicit tmat2x4(ctor);
- GLM_FUNC_DECL explicit tmat2x4(T const & s);
- GLM_FUNC_DECL tmat2x4(
- T const & x0, T const & y0, T const & z0, T const & w0,
- T const & x1, T const & y1, T const & z1, T const & w1);
- GLM_FUNC_DECL tmat2x4(
- col_type const & v0,
- col_type const & v1);
-
- //////////////////////////////////////
- // Conversions
- template <
- typename X1, typename Y1, typename Z1, typename W1,
- typename X2, typename Y2, typename Z2, typename W2>
- GLM_FUNC_DECL tmat2x4(
- X1 const & x1, Y1 const & y1, Z1 const & z1, W1 const & w1,
- X2 const & x2, Y2 const & y2, Z2 const & z2, W2 const & w2);
-
- template <typename U, typename V>
- GLM_FUNC_DECL tmat2x4(
- tvec4<U, P> const & v1,
- tvec4<V, P> const & v2);
-
- //////////////////////////////////////
- // Matrix conversions
-
-# ifdef GLM_FORCE_EXPLICIT_CTOR
- template <typename U, precision Q>
- GLM_FUNC_DECL explicit tmat2x4(tmat2x4<U, Q> const & m);
-# else
- template <typename U, precision Q>
- GLM_FUNC_DECL tmat2x4(tmat2x4<U, Q> const & m);
-# endif
-
- GLM_FUNC_DECL explicit tmat2x4(tmat2x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x4(tmat3x3<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x4(tmat4x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x4(tmat2x3<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x4(tmat3x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x4(tmat3x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x4(tmat4x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat2x4(tmat4x3<T, P> const & x);
-
- //////////////////////////////////////
- // Accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- typedef size_t size_type;
- GLM_FUNC_DECL GLM_CONSTEXPR size_t size() const;
-
- GLM_FUNC_DECL col_type & operator[](size_type i);
- GLM_FUNC_DECL col_type const & operator[](size_type i) const;
-# else
- typedef length_t length_type;
- GLM_FUNC_DECL GLM_CONSTEXPR length_type length() const;
-
- GLM_FUNC_DECL col_type & operator[](length_type i);
- GLM_FUNC_DECL col_type const & operator[](length_type i) const;
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////
- // Unary arithmetic operators
-
- GLM_FUNC_DECL tmat2x4<T, P> & operator=(tmat2x4<T, P> const & m);
-
- template <typename U>
- GLM_FUNC_DECL tmat2x4<T, P> & operator=(tmat2x4<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat2x4<T, P> & operator+=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat2x4<T, P> & operator+=(tmat2x4<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat2x4<T, P> & operator-=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat2x4<T, P> & operator-=(tmat2x4<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat2x4<T, P> & operator*=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat2x4<T, P> & operator/=(U s);
-
- //////////////////////////////////////
- // Increment and decrement operators
-
- GLM_FUNC_DECL tmat2x4<T, P> & operator++ ();
- GLM_FUNC_DECL tmat2x4<T, P> & operator-- ();
- GLM_FUNC_DECL tmat2x4<T, P> operator++(int);
- GLM_FUNC_DECL tmat2x4<T, P> operator--(int);
- };
-
- // Binary operators
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x4<T, P> operator+(tmat2x4<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x4<T, P> operator+(tmat2x4<T, P> const & m1, tmat2x4<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x4<T, P> operator-(tmat2x4<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x4<T, P> operator-(tmat2x4<T, P> const & m1, tmat2x4<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x4<T, P> operator*(tmat2x4<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x4<T, P> operator*(T const & s, tmat2x4<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat2x4<T, P>::col_type operator*(tmat2x4<T, P> const & m, typename tmat2x4<T, P>::row_type const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat2x4<T, P>::row_type operator*(typename tmat2x4<T, P>::col_type const & v, tmat2x4<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> operator*(tmat2x4<T, P> const & m1, tmat4x2<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x4<T, P> operator*(tmat2x4<T, P> const & m1, tmat2x2<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x4<T, P> operator*(tmat2x4<T, P> const & m1, tmat3x2<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x4<T, P> operator/(tmat2x4<T, P> const & m, T s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x4<T, P> operator/(T s, tmat2x4<T, P> const & m);
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x4<T, P> const operator-(tmat2x4<T, P> const & m);
-}//namespace glm
-
-#ifndef GLM_EXTERNAL_TEMPLATE
-#include "type_mat2x4.inl"
-#endif
diff --git a/inc/glm/detail/type_mat2x4.inl b/inc/glm/detail/type_mat2x4.inl deleted file mode 100644 index 3f95e9c..0000000 --- a/inc/glm/detail/type_mat2x4.inl +++ /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 core
-/// @file glm/detail/type_mat2x4.inl
-/// @date 2006-08-05 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- //////////////////////////////////////////////////////////////
- // Constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>::tmat2x4()
- {
-# ifndef GLM_FORCE_NO_CTOR_INIT
- this->value[0] = col_type(1, 0, 0, 0);
- this->value[1] = col_type(0, 1, 0, 0);
-# endif
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>::tmat2x4(tmat2x4<T, P> const & m)
- {
- this->value[0] = m.value[0];
- this->value[1] = m.value[1];
- }
-
- template <typename T, precision P>
- template <precision Q>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>::tmat2x4(tmat2x4<T, Q> const & m)
- {
- this->value[0] = m.value[0];
- this->value[1] = m.value[1];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>::tmat2x4(ctor)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>::tmat2x4(T const & s)
- {
- value_type const Zero(0);
- this->value[0] = col_type(s, Zero, Zero, Zero);
- this->value[1] = col_type(Zero, s, Zero, Zero);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>::tmat2x4
- (
- T const & x0, T const & y0, T const & z0, T const & w0,
- T const & x1, T const & y1, T const & z1, T const & w1
- )
- {
- this->value[0] = col_type(x0, y0, z0, w0);
- this->value[1] = col_type(x1, y1, z1, w1);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>::tmat2x4(col_type const & v0, col_type const & v1)
- {
- this->value[0] = v0;
- this->value[1] = v1;
- }
-
- //////////////////////////////////////
- // Conversion constructors
- template <typename T, precision P>
- template <
- typename X1, typename Y1, typename Z1, typename W1,
- typename X2, typename Y2, typename Z2, typename W2>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>::tmat2x4
- (
- X1 const & x1, Y1 const & y1, Z1 const & z1, W1 const & w1,
- X2 const & x2, Y2 const & y2, Z2 const & z2, W2 const & w2
- )
- {
- this->value[0] = col_type(static_cast<T>(x1), value_type(y1), value_type(z1), value_type(w1));
- this->value[1] = col_type(static_cast<T>(x2), value_type(y2), value_type(z2), value_type(w2));
- }
-
- template <typename T, precision P>
- template <typename V1, typename V2>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>::tmat2x4(tvec4<V1, P> const & v1, tvec4<V2, P> const & v2)
- {
- this->value[0] = col_type(v1);
- this->value[1] = col_type(v2);
- }
-
- //////////////////////////////////////
- // Matrix conversions
-
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>::tmat2x4(tmat2x4<U, Q> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>::tmat2x4(tmat2x2<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0, 0);
- this->value[1] = col_type(m[1], 0, 0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>::tmat2x4(tmat3x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0);
- this->value[1] = col_type(m[1], 0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>::tmat2x4(tmat4x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>::tmat2x4(tmat2x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0);
- this->value[1] = col_type(m[1], 0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>::tmat2x4(tmat3x2<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0, 0);
- this->value[1] = col_type(m[1], 0, 0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>::tmat2x4(tmat3x4<T, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>::tmat2x4(tmat4x2<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0, 0);
- this->value[1] = col_type(m[1], 0, 0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>::tmat2x4(tmat4x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0);
- this->value[1] = col_type(m[1], 0);
- }
-
- //////////////////////////////////////
- // Accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tmat2x4<T, P>::size_type tmat2x4<T, P>::size() const
- {
- return 2;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat2x4<T, P>::col_type & tmat2x4<T, P>::operator[](typename tmat2x4<T, P>::size_type i)
- {
- assert(i < this->size());
- return this->value[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat2x4<T, P>::col_type const & tmat2x4<T, P>::operator[](typename tmat2x4<T, P>::size_type i) const
- {
- assert(i < this->size());
- return this->value[i];
- }
-# else
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tmat2x4<T, P>::length_type tmat2x4<T, P>::length() const
- {
- return 2;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat2x4<T, P>::col_type & tmat2x4<T, P>::operator[](typename tmat2x4<T, P>::length_type i)
- {
- assert(i < this->length());
- return this->value[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat2x4<T, P>::col_type const & tmat2x4<T, P>::operator[](typename tmat2x4<T, P>::length_type i) const
- {
- assert(i < this->length());
- return this->value[i];
- }
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////////////////////////////
- // Unary updatable operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>& tmat2x4<T, P>::operator=(tmat2x4<T, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>& tmat2x4<T, P>::operator=(tmat2x4<U, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>& tmat2x4<T, P>::operator+=(U s)
- {
- this->value[0] += s;
- this->value[1] += s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>& tmat2x4<T, P>::operator+=(tmat2x4<U, P> const & m)
- {
- this->value[0] += m[0];
- this->value[1] += m[1];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>& tmat2x4<T, P>::operator-=(U s)
- {
- this->value[0] -= s;
- this->value[1] -= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>& tmat2x4<T, P>::operator-=(tmat2x4<U, P> const & m)
- {
- this->value[0] -= m[0];
- this->value[1] -= m[1];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>& tmat2x4<T, P>::operator*=(U s)
- {
- this->value[0] *= s;
- this->value[1] *= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat2x4<T, P> & tmat2x4<T, P>::operator/=(U s)
- {
- this->value[0] /= s;
- this->value[1] /= s;
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>& tmat2x4<T, P>::operator++()
- {
- ++this->value[0];
- ++this->value[1];
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P>& tmat2x4<T, P>::operator--()
- {
- --this->value[0];
- --this->value[1];
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P> tmat2x4<T, P>::operator++(int)
- {
- tmat2x4<T, P> Result(*this);
- ++*this;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P> tmat2x4<T, P>::operator--(int)
- {
- tmat2x4<T, P> Result(*this);
- --*this;
- return Result;
- }
-
- //////////////////////////////////////////////////////////////
- // Binary operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P> operator+(tmat2x4<T, P> const & m, T const & s)
- {
- return tmat2x4<T, P>(
- m[0] + s,
- m[1] + s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P> operator+(tmat2x4<T, P> const & m1, tmat2x4<T, P> const & m2)
- {
- return tmat2x4<T, P>(
- m1[0] + m2[0],
- m1[1] + m2[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P> operator-(tmat2x4<T, P> const & m, T const & s)
- {
- return tmat2x4<T, P>(
- m[0] - s,
- m[1] - s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P> operator-(tmat2x4<T, P> const & m1, tmat2x4<T, P> const & m2)
- {
- return tmat2x4<T, P>(
- m1[0] - m2[0],
- m1[1] - m2[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P> operator*(tmat2x4<T, P> const & m, T const & s)
- {
- return tmat2x4<T, P>(
- m[0] * s,
- m[1] * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P> operator*(T const & s, tmat2x4<T, P> const & m)
- {
- return tmat2x4<T, P>(
- m[0] * s,
- m[1] * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat2x4<T, P>::col_type operator*(tmat2x4<T, P> const & m, typename tmat2x4<T, P>::row_type const & v)
- {
- return typename tmat2x4<T, P>::col_type(
- m[0][0] * v.x + m[1][0] * v.y,
- m[0][1] * v.x + m[1][1] * v.y,
- m[0][2] * v.x + m[1][2] * v.y,
- m[0][3] * v.x + m[1][3] * v.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat2x4<T, P>::row_type operator*(typename tmat2x4<T, P>::col_type const & v, tmat2x4<T, P> const & m)
- {
- return typename tmat2x4<T, P>::row_type(
- v.x * m[0][0] + v.y * m[0][1] + v.z * m[0][2] + v.w * m[0][3],
- v.x * m[1][0] + v.y * m[1][1] + v.z * m[1][2] + v.w * m[1][3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator*(tmat2x4<T, P> const & m1, tmat4x2<T, P> const & m2)
- {
- T SrcA00 = m1[0][0];
- T SrcA01 = m1[0][1];
- T SrcA02 = m1[0][2];
- T SrcA03 = m1[0][3];
- T SrcA10 = m1[1][0];
- T SrcA11 = m1[1][1];
- T SrcA12 = m1[1][2];
- T SrcA13 = m1[1][3];
-
- T SrcB00 = m2[0][0];
- T SrcB01 = m2[0][1];
- T SrcB10 = m2[1][0];
- T SrcB11 = m2[1][1];
- T SrcB20 = m2[2][0];
- T SrcB21 = m2[2][1];
- T SrcB30 = m2[3][0];
- T SrcB31 = m2[3][1];
-
- tmat4x4<T, P> Result(uninitialize);
- Result[0][0] = SrcA00 * SrcB00 + SrcA10 * SrcB01;
- Result[0][1] = SrcA01 * SrcB00 + SrcA11 * SrcB01;
- Result[0][2] = SrcA02 * SrcB00 + SrcA12 * SrcB01;
- Result[0][3] = SrcA03 * SrcB00 + SrcA13 * SrcB01;
- Result[1][0] = SrcA00 * SrcB10 + SrcA10 * SrcB11;
- Result[1][1] = SrcA01 * SrcB10 + SrcA11 * SrcB11;
- Result[1][2] = SrcA02 * SrcB10 + SrcA12 * SrcB11;
- Result[1][3] = SrcA03 * SrcB10 + SrcA13 * SrcB11;
- Result[2][0] = SrcA00 * SrcB20 + SrcA10 * SrcB21;
- Result[2][1] = SrcA01 * SrcB20 + SrcA11 * SrcB21;
- Result[2][2] = SrcA02 * SrcB20 + SrcA12 * SrcB21;
- Result[2][3] = SrcA03 * SrcB20 + SrcA13 * SrcB21;
- Result[3][0] = SrcA00 * SrcB30 + SrcA10 * SrcB31;
- Result[3][1] = SrcA01 * SrcB30 + SrcA11 * SrcB31;
- Result[3][2] = SrcA02 * SrcB30 + SrcA12 * SrcB31;
- Result[3][3] = SrcA03 * SrcB30 + SrcA13 * SrcB31;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P> operator*(tmat2x4<T, P> const & m1, tmat2x2<T, P> const & m2)
- {
- return tmat2x4<T, P>(
- m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1],
- m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1],
- m1[0][2] * m2[0][0] + m1[1][2] * m2[0][1],
- m1[0][3] * m2[0][0] + m1[1][3] * m2[0][1],
- m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1],
- m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1],
- m1[0][2] * m2[1][0] + m1[1][2] * m2[1][1],
- m1[0][3] * m2[1][0] + m1[1][3] * m2[1][1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P> operator*(tmat2x4<T, P> const & m1, tmat3x2<T, P> const & m2)
- {
- return tmat3x4<T, P>(
- m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1],
- m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1],
- m1[0][2] * m2[0][0] + m1[1][2] * m2[0][1],
- m1[0][3] * m2[0][0] + m1[1][3] * m2[0][1],
- m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1],
- m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1],
- m1[0][2] * m2[1][0] + m1[1][2] * m2[1][1],
- m1[0][3] * m2[1][0] + m1[1][3] * m2[1][1],
- m1[0][0] * m2[2][0] + m1[1][0] * m2[2][1],
- m1[0][1] * m2[2][0] + m1[1][1] * m2[2][1],
- m1[0][2] * m2[2][0] + m1[1][2] * m2[2][1],
- m1[0][3] * m2[2][0] + m1[1][3] * m2[2][1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P> operator/(tmat2x4<T, P> const & m, T s)
- {
- return tmat2x4<T, P>(
- m[0] / s,
- m[1] / s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P> operator/(T s, tmat2x4<T, P> const & m)
- {
- return tmat2x4<T, P>(
- s / m[0],
- s / m[1]);
- }
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P> const operator-(tmat2x4<T, P> const & m)
- {
- return tmat2x4<T, P>(
- -m[0],
- -m[1]);
- }
-
- //////////////////////////////////////
- // Boolean operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator==(tmat2x4<T, P> const & m1, tmat2x4<T, P> const & m2)
- {
- return (m1[0] == m2[0]) && (m1[1] == m2[1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator!=(tmat2x4<T, P> const & m1, tmat2x4<T, P> const & m2)
- {
- return (m1[0] != m2[0]) || (m1[1] != m2[1]);
- }
-} //namespace glm
diff --git a/inc/glm/detail/type_mat3x2.hpp b/inc/glm/detail/type_mat3x2.hpp deleted file mode 100644 index f06fce1..0000000 --- a/inc/glm/detail/type_mat3x2.hpp +++ /dev/null @@ -1,207 +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 core
-/// @file glm/detail/type_mat3x2.hpp
-/// @date 2006-08-05 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "../fwd.hpp"
-#include "type_vec2.hpp"
-#include "type_vec3.hpp"
-#include "type_mat.hpp"
-#include <limits>
-#include <cstddef>
-
-namespace glm
-{
- template <typename T, precision P = defaultp>
- struct tmat3x2
- {
- typedef tvec2<T, P> col_type;
- typedef tvec3<T, P> row_type;
- typedef tmat3x2<T, P> type;
- typedef tmat2x3<T, P> transpose_type;
- typedef T value_type;
-
- private:
- /// @cond DETAIL
- col_type value[3];
- /// @endcond
-
- public:
- // Constructors
- GLM_FUNC_DECL tmat3x2();
- GLM_FUNC_DECL tmat3x2(tmat3x2<T, P> const & m);
- template <precision Q>
- GLM_FUNC_DECL tmat3x2(tmat3x2<T, Q> const & m);
-
- GLM_FUNC_DECL explicit tmat3x2(ctor);
- GLM_FUNC_DECL explicit tmat3x2(T const & s);
- GLM_FUNC_DECL tmat3x2(
- T const & x0, T const & y0,
- T const & x1, T const & y1,
- T const & x2, T const & y2);
- GLM_FUNC_DECL tmat3x2(
- col_type const & v0,
- col_type const & v1,
- col_type const & v2);
-
- //////////////////////////////////////
- // Conversions
-
- template<
- typename X1, typename Y1,
- typename X2, typename Y2,
- typename X3, typename Y3>
- GLM_FUNC_DECL tmat3x2(
- X1 const & x1, Y1 const & y1,
- X2 const & x2, Y2 const & y2,
- X3 const & x3, Y3 const & y3);
-
- template <typename V1, typename V2, typename V3>
- GLM_FUNC_DECL tmat3x2(
- tvec2<V1, P> const & v1,
- tvec2<V2, P> const & v2,
- tvec2<V3, P> const & v3);
-
- //////////////////////////////////////
- // Matrix conversions
-
-# ifdef GLM_FORCE_EXPLICIT_CTOR
- template <typename U, precision Q>
- GLM_FUNC_DECL explicit tmat3x2(tmat3x2<U, Q> const & m);
-# else
- template <typename U, precision Q>
- GLM_FUNC_DECL tmat3x2(tmat3x2<U, Q> const & m);
-# endif
-
- GLM_FUNC_DECL explicit tmat3x2(tmat2x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x2(tmat3x3<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x2(tmat4x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x2(tmat2x3<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x2(tmat2x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x2(tmat3x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x2(tmat4x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x2(tmat4x3<T, P> const & x);
-
- //////////////////////////////////////
- // Accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- typedef size_t size_type;
- GLM_FUNC_DECL GLM_CONSTEXPR size_t size() const;
-
- GLM_FUNC_DECL col_type & operator[](size_type i);
- GLM_FUNC_DECL col_type const & operator[](size_type i) const;
-# else
- typedef length_t length_type;
- GLM_FUNC_DECL GLM_CONSTEXPR length_type length() const;
-
- GLM_FUNC_DECL col_type & operator[](length_type i);
- GLM_FUNC_DECL col_type const & operator[](length_type i) const;
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////
- // Unary arithmetic operators
-
- GLM_FUNC_DECL tmat3x2<T, P> & operator=(tmat3x2<T, P> const & m);
-
- template <typename U>
- GLM_FUNC_DECL tmat3x2<T, P> & operator=(tmat3x2<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat3x2<T, P> & operator+=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat3x2<T, P> & operator+=(tmat3x2<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat3x2<T, P> & operator-=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat3x2<T, P> & operator-=(tmat3x2<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat3x2<T, P> & operator*=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat3x2<T, P> & operator/=(U s);
-
- //////////////////////////////////////
- // Increment and decrement operators
-
- GLM_FUNC_DECL tmat3x2<T, P> & operator++ ();
- GLM_FUNC_DECL tmat3x2<T, P> & operator-- ();
- GLM_FUNC_DECL tmat3x2<T, P> operator++(int);
- GLM_FUNC_DECL tmat3x2<T, P> operator--(int);
- };
-
- // Binary operators
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x2<T, P> operator+(tmat3x2<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x2<T, P> operator+(tmat3x2<T, P> const & m1, tmat3x2<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x2<T, P> operator-(tmat3x2<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x2<T, P> operator-(tmat3x2<T, P> const & m1, tmat3x2<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x2<T, P> operator*(tmat3x2<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x2<T, P> operator*(T const & s, tmat3x2<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat3x2<T, P>::col_type operator*(tmat3x2<T, P> const & m, typename tmat3x2<T, P>::row_type const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat3x2<T, P>::row_type operator*(typename tmat3x2<T, P>::col_type const & v, tmat3x2<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x2<T, P> operator*(tmat3x2<T, P> const & m1, tmat2x3<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x2<T, P> operator*(tmat3x2<T, P> const & m1, tmat3x3<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x2<T, P> operator*(tmat3x2<T, P> const & m1, tmat4x3<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x2<T, P> operator/(tmat3x2<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x2<T, P> operator/(T const & s, tmat3x2<T, P> const & m);
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x2<T, P> const operator-(tmat3x2<T, P> const & m);
-}//namespace glm
-
-#ifndef GLM_EXTERNAL_TEMPLATE
-#include "type_mat3x2.inl"
-#endif
diff --git a/inc/glm/detail/type_mat3x2.inl b/inc/glm/detail/type_mat3x2.inl deleted file mode 100644 index a503542..0000000 --- a/inc/glm/detail/type_mat3x2.inl +++ /dev/null @@ -1,540 +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 core
-/// @file glm/detail/type_mat3x2.inl
-/// @date 2006-08-05 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- //////////////////////////////////////////////////////////////
- // Constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>::tmat3x2()
- {
-# ifndef GLM_FORCE_NO_CTOR_INIT
- this->value[0] = col_type(1, 0);
- this->value[1] = col_type(0, 1);
- this->value[2] = col_type(0, 0);
-# endif
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>::tmat3x2(tmat3x2<T, P> const & m)
- {
- this->value[0] = m.value[0];
- this->value[1] = m.value[1];
- this->value[2] = m.value[2];
- }
-
- template <typename T, precision P>
- template <precision Q>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>::tmat3x2(tmat3x2<T, Q> const & m)
- {
- this->value[0] = m.value[0];
- this->value[1] = m.value[1];
- this->value[2] = m.value[2];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>::tmat3x2(ctor)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>::tmat3x2(T const & s)
- {
- this->value[0] = col_type(s, 0);
- this->value[1] = col_type(0, s);
- this->value[2] = col_type(0, 0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>::tmat3x2
- (
- T const & x0, T const & y0,
- T const & x1, T const & y1,
- T const & x2, T const & y2
- )
- {
- this->value[0] = col_type(x0, y0);
- this->value[1] = col_type(x1, y1);
- this->value[2] = col_type(x2, y2);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>::tmat3x2
- (
- col_type const & v0,
- col_type const & v1,
- col_type const & v2
- )
- {
- this->value[0] = v0;
- this->value[1] = v1;
- this->value[2] = v2;
- }
-
- //////////////////////////////////////
- // Conversion constructors
- template <typename T, precision P>
- template <
- typename X1, typename Y1,
- typename X2, typename Y2,
- typename X3, typename Y3>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>::tmat3x2
- (
- X1 const & x1, Y1 const & y1,
- X2 const & x2, Y2 const & y2,
- X3 const & x3, Y3 const & y3
- )
- {
- this->value[0] = col_type(static_cast<T>(x1), value_type(y1));
- this->value[1] = col_type(static_cast<T>(x2), value_type(y2));
- this->value[2] = col_type(static_cast<T>(x3), value_type(y3));
- }
-
- template <typename T, precision P>
- template <typename V1, typename V2, typename V3>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>::tmat3x2
- (
- tvec2<V1, P> const & v1,
- tvec2<V2, P> const & v2,
- tvec2<V3, P> const & v3
- )
- {
- this->value[0] = col_type(v1);
- this->value[1] = col_type(v2);
- this->value[2] = col_type(v3);
- }
-
- //////////////////////////////////////////////////////////////
- // mat3x2 matrix conversions
-
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>::tmat3x2(tmat3x2<U, Q> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>::tmat3x2(tmat2x2<T, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- this->value[2] = col_type(0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>::tmat3x2(tmat3x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>::tmat3x2(tmat4x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>::tmat3x2(tmat2x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(T(0));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>::tmat3x2(tmat2x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(T(0));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>::tmat3x2(tmat3x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>::tmat3x2(tmat4x2<T, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- this->value[2] = m[2];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>::tmat3x2(tmat4x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- }
-
- //////////////////////////////////////
- // Accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tmat3x2<T, P>::size_type tmat3x2<T, P>::size() const
- {
- return 3;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat3x2<T, P>::col_type & tmat3x2<T, P>::operator[](typename tmat3x2<T, P>::size_type i)
- {
- assert(i < this->size());
- return this->value[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat3x2<T, P>::col_type const & tmat3x2<T, P>::operator[](typename tmat3x2<T, P>::size_type i) const
- {
- assert(i < this->size());
- return this->value[i];
- }
-# else
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tmat3x2<T, P>::length_type tmat3x2<T, P>::length() const
- {
- return 3;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat3x2<T, P>::col_type & tmat3x2<T, P>::operator[](typename tmat3x2<T, P>::length_type i)
- {
- assert(i < this->length());
- return this->value[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat3x2<T, P>::col_type const & tmat3x2<T, P>::operator[](typename tmat3x2<T, P>::length_type i) const
- {
- assert(i < this->length());
- return this->value[i];
- }
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////////////////////////////
- // Unary updatable operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>& tmat3x2<T, P>::operator=(tmat3x2<T, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- this->value[2] = m[2];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>& tmat3x2<T, P>::operator=(tmat3x2<U, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- this->value[2] = m[2];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>& tmat3x2<T, P>::operator+=(U s)
- {
- this->value[0] += s;
- this->value[1] += s;
- this->value[2] += s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>& tmat3x2<T, P>::operator+=(tmat3x2<U, P> const & m)
- {
- this->value[0] += m[0];
- this->value[1] += m[1];
- this->value[2] += m[2];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>& tmat3x2<T, P>::operator-=(U s)
- {
- this->value[0] -= s;
- this->value[1] -= s;
- this->value[2] -= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>& tmat3x2<T, P>::operator-=(tmat3x2<U, P> const & m)
- {
- this->value[0] -= m[0];
- this->value[1] -= m[1];
- this->value[2] -= m[2];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>& tmat3x2<T, P>::operator*=(U s)
- {
- this->value[0] *= s;
- this->value[1] *= s;
- this->value[2] *= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x2<T, P> & tmat3x2<T, P>::operator/=(U s)
- {
- this->value[0] /= s;
- this->value[1] /= s;
- this->value[2] /= s;
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>& tmat3x2<T, P>::operator++()
- {
- ++this->value[0];
- ++this->value[1];
- ++this->value[2];
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P>& tmat3x2<T, P>::operator--()
- {
- --this->value[0];
- --this->value[1];
- --this->value[2];
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P> tmat3x2<T, P>::operator++(int)
- {
- tmat3x2<T, P> Result(*this);
- ++*this;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P> tmat3x2<T, P>::operator--(int)
- {
- tmat3x2<T, P> Result(*this);
- --*this;
- return Result;
- }
-
- //////////////////////////////////////////////////////////////
- // Binary operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P> operator+(tmat3x2<T, P> const & m, T const & s)
- {
- return tmat3x2<T, P>(
- m[0] + s,
- m[1] + s,
- m[2] + s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P> operator+(tmat3x2<T, P> const & m1, tmat3x2<T, P> const & m2)
- {
- return tmat3x2<T, P>(
- m1[0] + m2[0],
- m1[1] + m2[1],
- m1[2] + m2[2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P> operator-(tmat3x2<T, P> const & m, T const & s)
- {
- return tmat3x2<T, P>(
- m[0] - s,
- m[1] - s,
- m[2] - s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P> operator-(tmat3x2<T, P> const & m1, tmat3x2<T, P> const & m2)
- {
- return tmat3x2<T, P>(
- m1[0] - m2[0],
- m1[1] - m2[1],
- m1[2] - m2[2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P> operator*(tmat3x2<T, P> const & m, T const & s)
- {
- return tmat3x2<T, P>(
- m[0] * s,
- m[1] * s,
- m[2] * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P> operator*(T const & s, tmat3x2<T, P> const & m)
- {
- return tmat3x2<T, P>(
- m[0] * s,
- m[1] * s,
- m[2] * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat3x2<T, P>::col_type operator*(tmat3x2<T, P> const & m, typename tmat3x2<T, P>::row_type const & v)
- {
- return typename tmat3x2<T, P>::col_type(
- m[0][0] * v.x + m[1][0] * v.y + m[2][0] * v.z,
- m[0][1] * v.x + m[1][1] * v.y + m[2][1] * v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat3x2<T, P>::row_type operator*(typename tmat3x2<T, P>::col_type const & v, tmat3x2<T, P> const & m)
- {
- return typename tmat3x2<T, P>::row_type(
- v.x * m[0][0] + v.y * m[0][1],
- v.x * m[1][0] + v.y * m[1][1],
- v.x * m[2][0] + v.y * m[2][1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> operator*(tmat3x2<T, P> const & m1, tmat2x3<T, P> const & m2)
- {
- const T SrcA00 = m1[0][0];
- const T SrcA01 = m1[0][1];
- const T SrcA10 = m1[1][0];
- const T SrcA11 = m1[1][1];
- const T SrcA20 = m1[2][0];
- const T SrcA21 = m1[2][1];
-
- const T SrcB00 = m2[0][0];
- const T SrcB01 = m2[0][1];
- const T SrcB02 = m2[0][2];
- const T SrcB10 = m2[1][0];
- const T SrcB11 = m2[1][1];
- const T SrcB12 = m2[1][2];
-
- tmat2x2<T, P> Result(uninitialize);
- Result[0][0] = SrcA00 * SrcB00 + SrcA10 * SrcB01 + SrcA20 * SrcB02;
- Result[0][1] = SrcA01 * SrcB00 + SrcA11 * SrcB01 + SrcA21 * SrcB02;
- Result[1][0] = SrcA00 * SrcB10 + SrcA10 * SrcB11 + SrcA20 * SrcB12;
- Result[1][1] = SrcA01 * SrcB10 + SrcA11 * SrcB11 + SrcA21 * SrcB12;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P> operator*(tmat3x2<T, P> const & m1, tmat3x3<T, P> const & m2)
- {
- return tmat3x2<T, P>(
- m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2],
- m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1] + m1[2][1] * m2[0][2],
- m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1] + m1[2][0] * m2[1][2],
- m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1] + m1[2][1] * m2[1][2],
- m1[0][0] * m2[2][0] + m1[1][0] * m2[2][1] + m1[2][0] * m2[2][2],
- m1[0][1] * m2[2][0] + m1[1][1] * m2[2][1] + m1[2][1] * m2[2][2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> operator*(tmat3x2<T, P> const & m1, tmat4x3<T, P> const & m2)
- {
- return tmat4x2<T, P>(
- m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2],
- m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1] + m1[2][1] * m2[0][2],
- m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1] + m1[2][0] * m2[1][2],
- m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1] + m1[2][1] * m2[1][2],
- m1[0][0] * m2[2][0] + m1[1][0] * m2[2][1] + m1[2][0] * m2[2][2],
- m1[0][1] * m2[2][0] + m1[1][1] * m2[2][1] + m1[2][1] * m2[2][2],
- m1[0][0] * m2[3][0] + m1[1][0] * m2[3][1] + m1[2][0] * m2[3][2],
- m1[0][1] * m2[3][0] + m1[1][1] * m2[3][1] + m1[2][1] * m2[3][2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P> operator/(tmat3x2<T, P> const & m, T const & s)
- {
- return tmat3x2<T, P>(
- m[0] / s,
- m[1] / s,
- m[2] / s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P> operator/(T const & s, tmat3x2<T, P> const & m)
- {
- return tmat3x2<T, P>(
- s / m[0],
- s / m[1],
- s / m[2]);
- }
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P> const operator-(tmat3x2<T, P> const & m)
- {
- return tmat3x2<T, P>(
- -m[0],
- -m[1],
- -m[2]);
- }
-
- //////////////////////////////////////
- // Boolean operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator==(tmat3x2<T, P> const & m1, tmat3x2<T, P> const & m2)
- {
- return (m1[0] == m2[0]) && (m1[1] == m2[1]) && (m1[2] == m2[2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator!=(tmat3x2<T, P> const & m1, tmat3x2<T, P> const & m2)
- {
- return (m1[0] != m2[0]) || (m1[1] != m2[1]) || (m1[2] != m2[2]);
- }
-} //namespace glm
diff --git a/inc/glm/detail/type_mat3x3.hpp b/inc/glm/detail/type_mat3x3.hpp deleted file mode 100644 index 26e90e3..0000000 --- a/inc/glm/detail/type_mat3x3.hpp +++ /dev/null @@ -1,230 +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 core
-/// @file glm/detail/type_mat3x3.hpp
-/// @date 2005-01-27 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "../fwd.hpp"
-#include "type_vec3.hpp"
-#include "type_mat.hpp"
-#include <limits>
-#include <cstddef>
-
-namespace glm
-{
- template <typename T, precision P = defaultp>
- struct tmat3x3
- {
- typedef tvec3<T, P> col_type;
- typedef tvec3<T, P> row_type;
- typedef tmat3x3<T, P> type;
- typedef tmat3x3<T, P> transpose_type;
- typedef T value_type;
-
- template <typename U, precision Q>
- friend tvec3<U, Q> operator/(tmat3x3<U, Q> const & m, tvec3<U, Q> const & v);
- template <typename U, precision Q>
- friend tvec3<U, Q> operator/(tvec3<U, Q> const & v, tmat3x3<U, Q> const & m);
-
- private:
- /// @cond DETAIL
- col_type value[3];
- /// @endcond
-
- public:
- // Constructors
- GLM_FUNC_DECL tmat3x3();
- GLM_FUNC_DECL tmat3x3(tmat3x3<T, P> const & m);
- template <precision Q>
- GLM_FUNC_DECL tmat3x3(tmat3x3<T, Q> const & m);
-
- GLM_FUNC_DECL explicit tmat3x3(ctor);
- GLM_FUNC_DECL explicit tmat3x3(T const & s);
- GLM_FUNC_DECL tmat3x3(
- T const & x0, T const & y0, T const & z0,
- T const & x1, T const & y1, T const & z1,
- T const & x2, T const & y2, T const & z2);
- GLM_FUNC_DECL tmat3x3(
- col_type const & v0,
- col_type const & v1,
- col_type const & v2);
-
- //////////////////////////////////////
- // Conversions
-
- template<
- typename X1, typename Y1, typename Z1,
- typename X2, typename Y2, typename Z2,
- typename X3, typename Y3, typename Z3>
- GLM_FUNC_DECL tmat3x3(
- X1 const & x1, Y1 const & y1, Z1 const & z1,
- X2 const & x2, Y2 const & y2, Z2 const & z2,
- X3 const & x3, Y3 const & y3, Z3 const & z3);
-
- template <typename V1, typename V2, typename V3>
- GLM_FUNC_DECL tmat3x3(
- tvec3<V1, P> const & v1,
- tvec3<V2, P> const & v2,
- tvec3<V3, P> const & v3);
-
- //////////////////////////////////////
- // Matrix conversions
-
-# ifdef GLM_FORCE_EXPLICIT_CTOR
- template <typename U, precision Q>
- GLM_FUNC_DECL explicit tmat3x3(tmat3x3<U, Q> const & m);
-# else
- template <typename U, precision Q>
- GLM_FUNC_DECL tmat3x3(tmat3x3<U, Q> const & m);
-# endif
-
- GLM_FUNC_DECL explicit tmat3x3(tmat2x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x3(tmat4x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x3(tmat2x3<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x3(tmat3x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x3(tmat2x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x3(tmat4x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x3(tmat3x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x3(tmat4x3<T, P> const & x);
-
- //////////////////////////////////////
- // Accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- typedef size_t size_type;
- GLM_FUNC_DECL GLM_CONSTEXPR size_t size() const;
-
- GLM_FUNC_DECL col_type & operator[](size_type i);
- GLM_FUNC_DECL col_type const & operator[](size_type i) const;
-# else
- typedef length_t length_type;
- GLM_FUNC_DECL GLM_CONSTEXPR length_type length() const;
-
- GLM_FUNC_DECL col_type & operator[](length_type i);
- GLM_FUNC_DECL col_type const & operator[](length_type i) const;
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////
- // Unary arithmetic operators
-
- GLM_FUNC_DECL tmat3x3<T, P> & operator=(tmat3x3<T, P> const & m);
-
- template <typename U>
- GLM_FUNC_DECL tmat3x3<T, P> & operator=(tmat3x3<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat3x3<T, P> & operator+=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat3x3<T, P> & operator+=(tmat3x3<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat3x3<T, P> & operator-=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat3x3<T, P> & operator-=(tmat3x3<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat3x3<T, P> & operator*=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat3x3<T, P> & operator*=(tmat3x3<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat3x3<T, P> & operator/=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat3x3<T, P> & operator/=(tmat3x3<U, P> const & m);
-
- //////////////////////////////////////
- // Increment and decrement operators
-
- GLM_FUNC_DECL tmat3x3<T, P> & operator++();
- GLM_FUNC_DECL tmat3x3<T, P> & operator--();
- GLM_FUNC_DECL tmat3x3<T, P> operator++(int);
- GLM_FUNC_DECL tmat3x3<T, P> operator--(int);
- };
-
- // Binary operators
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> operator+(tmat3x3<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> operator+(T const & s, tmat3x3<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> operator+(tmat3x3<T, P> const & m1, tmat3x3<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> operator-(tmat3x3<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> operator-(T const & s, tmat3x3<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> operator-(tmat3x3<T, P> const & m1, tmat3x3<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> operator*(tmat3x3<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> operator*(T const & s, tmat3x3<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat3x3<T, P>::col_type operator*(tmat3x3<T, P> const & m, typename tmat3x3<T, P>::row_type const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat3x3<T, P>::row_type operator*(typename tmat3x3<T, P>::col_type const & v, tmat3x3<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> operator*(tmat3x3<T, P> const & m1, tmat3x3<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x3<T, P> operator*(tmat3x3<T, P> const & m1, tmat2x3<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x3<T, P> operator*(tmat3x3<T, P> const & m1, tmat4x3<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> operator/(tmat3x3<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> operator/(T const & s, tmat3x3<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat3x3<T, P>::col_type operator/(tmat3x3<T, P> const & m, typename tmat3x3<T, P>::row_type const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat3x3<T, P>::row_type operator/(typename tmat3x3<T, P>::col_type const & v, tmat3x3<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> operator/(tmat3x3<T, P> const & m1, tmat3x3<T, P> const & m2);
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> const operator-(tmat3x3<T, P> const & m);
-}//namespace glm
-
-#ifndef GLM_EXTERNAL_TEMPLATE
-#include "type_mat3x3.inl"
-#endif
diff --git a/inc/glm/detail/type_mat3x3.inl b/inc/glm/detail/type_mat3x3.inl deleted file mode 100644 index 5e43252..0000000 --- a/inc/glm/detail/type_mat3x3.inl +++ /dev/null @@ -1,631 +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 core
-/// @file glm/detail/type_mat3x3.inl
-/// @date 2005-01-27 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm{
-namespace detail
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> compute_inverse(tmat3x3<T, P> const & m)
- {
- T OneOverDeterminant = static_cast<T>(1) / (
- + m[0][0] * (m[1][1] * m[2][2] - m[2][1] * m[1][2])
- - m[1][0] * (m[0][1] * m[2][2] - m[2][1] * m[0][2])
- + m[2][0] * (m[0][1] * m[1][2] - m[1][1] * m[0][2]));
-
- tmat3x3<T, P> Inverse(uninitialize);
- Inverse[0][0] = + (m[1][1] * m[2][2] - m[2][1] * m[1][2]) * OneOverDeterminant;
- Inverse[1][0] = - (m[1][0] * m[2][2] - m[2][0] * m[1][2]) * OneOverDeterminant;
- Inverse[2][0] = + (m[1][0] * m[2][1] - m[2][0] * m[1][1]) * OneOverDeterminant;
- Inverse[0][1] = - (m[0][1] * m[2][2] - m[2][1] * m[0][2]) * OneOverDeterminant;
- Inverse[1][1] = + (m[0][0] * m[2][2] - m[2][0] * m[0][2]) * OneOverDeterminant;
- Inverse[2][1] = - (m[0][0] * m[2][1] - m[2][0] * m[0][1]) * OneOverDeterminant;
- Inverse[0][2] = + (m[0][1] * m[1][2] - m[1][1] * m[0][2]) * OneOverDeterminant;
- Inverse[1][2] = - (m[0][0] * m[1][2] - m[1][0] * m[0][2]) * OneOverDeterminant;
- Inverse[2][2] = + (m[0][0] * m[1][1] - m[1][0] * m[0][1]) * OneOverDeterminant;
-
- return Inverse;
- }
-}//namespace detail
-
- //////////////////////////////////////////////////////////////
- // Constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P>::tmat3x3()
- {
-# ifndef GLM_FORCE_NO_CTOR_INIT
- this->value[0] = col_type(1, 0, 0);
- this->value[1] = col_type(0, 1, 0);
- this->value[2] = col_type(0, 0, 1);
-# endif
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P>::tmat3x3(ctor)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P>::tmat3x3(tmat3x3<T, P> const & m)
- {
- this->value[0] = m.value[0];
- this->value[1] = m.value[1];
- this->value[2] = m.value[2];
- }
-
- template <typename T, precision P>
- template <precision Q>
- GLM_FUNC_QUALIFIER tmat3x3<T, P>::tmat3x3(tmat3x3<T, Q> const & m)
- {
- this->value[0] = m.value[0];
- this->value[1] = m.value[1];
- this->value[2] = m.value[2];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P>::tmat3x3(T const & s)
- {
- this->value[0] = col_type(s, 0, 0);
- this->value[1] = col_type(0, s, 0);
- this->value[2] = col_type(0, 0, s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P>::tmat3x3
- (
- T const & x0, T const & y0, T const & z0,
- T const & x1, T const & y1, T const & z1,
- T const & x2, T const & y2, T const & z2
- )
- {
- this->value[0] = col_type(x0, y0, z0);
- this->value[1] = col_type(x1, y1, z1);
- this->value[2] = col_type(x2, y2, z2);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P>::tmat3x3
- (
- col_type const & v0,
- col_type const & v1,
- col_type const & v2
- )
- {
- this->value[0] = v0;
- this->value[1] = v1;
- this->value[2] = v2;
- }
-
- //////////////////////////////////////
- // Conversion constructors
- template <typename T, precision P>
- template <
- typename X1, typename Y1, typename Z1,
- typename X2, typename Y2, typename Z2,
- typename X3, typename Y3, typename Z3>
- GLM_FUNC_QUALIFIER tmat3x3<T, P>::tmat3x3
- (
- X1 const & x1, Y1 const & y1, Z1 const & z1,
- X2 const & x2, Y2 const & y2, Z2 const & z2,
- X3 const & x3, Y3 const & y3, Z3 const & z3
- )
- {
- this->value[0] = col_type(static_cast<T>(x1), value_type(y1), value_type(z1));
- this->value[1] = col_type(static_cast<T>(x2), value_type(y2), value_type(z2));
- this->value[2] = col_type(static_cast<T>(x3), value_type(y3), value_type(z3));
- }
-
- template <typename T, precision P>
- template <typename V1, typename V2, typename V3>
- GLM_FUNC_QUALIFIER tmat3x3<T, P>::tmat3x3
- (
- tvec3<V1, P> const & v1,
- tvec3<V2, P> const & v2,
- tvec3<V3, P> const & v3
- )
- {
- this->value[0] = col_type(v1);
- this->value[1] = col_type(v2);
- this->value[2] = col_type(v3);
- }
-
- //////////////////////////////////////////////////////////////
- // Conversions
-
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tmat3x3<T, P>::tmat3x3(tmat3x3<U, Q> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P>::tmat3x3(tmat2x2<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0);
- this->value[1] = col_type(m[1], 0);
- this->value[2] = col_type(0, 0, 1);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P>::tmat3x3(tmat4x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P>::tmat3x3(tmat2x3<T, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- this->value[2] = col_type(0, 0, 1);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P>::tmat3x3(tmat3x2<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0);
- this->value[1] = col_type(m[1], 0);
- this->value[2] = col_type(m[2], 1);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P>::tmat3x3(tmat2x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(0, 0, 1);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P>::tmat3x3(tmat4x2<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0);
- this->value[1] = col_type(m[1], 0);
- this->value[2] = col_type(m[2], 1);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P>::tmat3x3(tmat3x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P>::tmat3x3(tmat4x3<T, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- this->value[2] = m[2];
- }
-
- //////////////////////////////////////
- // Accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tmat3x3<T, P>::size_type tmat3x3<T, P>::size() const
- {
- return 3;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat3x3<T, P>::col_type & tmat3x3<T, P>::operator[](typename tmat3x3<T, P>::size_type i)
- {
- assert(i < this->size());
- return this->value[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat3x3<T, P>::col_type const & tmat3x3<T, P>::operator[](typename tmat3x3<T, P>::size_type i) const
- {
- assert(i < this->size());
- return this->value[i];
- }
-# else
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tmat3x3<T, P>::length_type tmat3x3<T, P>::length() const
- {
- return 3;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat3x3<T, P>::col_type & tmat3x3<T, P>::operator[](typename tmat3x3<T, P>::length_type i)
- {
- assert(i < this->length());
- return this->value[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat3x3<T, P>::col_type const & tmat3x3<T, P>::operator[](typename tmat3x3<T, P>::length_type i) const
- {
- assert(i < this->length());
- return this->value[i];
- }
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////////////////////////////
- // Operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> & tmat3x3<T, P>::operator=(tmat3x3<T, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- this->value[2] = m[2];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> & tmat3x3<T, P>::operator=(tmat3x3<U, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- this->value[2] = m[2];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> & tmat3x3<T, P>::operator+=(U s)
- {
- this->value[0] += s;
- this->value[1] += s;
- this->value[2] += s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> & tmat3x3<T, P>::operator+=(tmat3x3<U, P> const & m)
- {
- this->value[0] += m[0];
- this->value[1] += m[1];
- this->value[2] += m[2];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> & tmat3x3<T, P>::operator-=(U s)
- {
- this->value[0] -= s;
- this->value[1] -= s;
- this->value[2] -= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> & tmat3x3<T, P>::operator-=(tmat3x3<U, P> const & m)
- {
- this->value[0] -= m[0];
- this->value[1] -= m[1];
- this->value[2] -= m[2];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> & tmat3x3<T, P>::operator*=(U s)
- {
- this->value[0] *= s;
- this->value[1] *= s;
- this->value[2] *= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> & tmat3x3<T, P>::operator*=(tmat3x3<U, P> const & m)
- {
- return (*this = *this * m);
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> & tmat3x3<T, P>::operator/=(U s)
- {
- this->value[0] /= s;
- this->value[1] /= s;
- this->value[2] /= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> & tmat3x3<T, P>::operator/=(tmat3x3<U, P> const & m)
- {
- return (*this = *this * detail::compute_inverse<T, P>(m));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> & tmat3x3<T, P>::operator++()
- {
- ++this->value[0];
- ++this->value[1];
- ++this->value[2];
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> & tmat3x3<T, P>::operator--()
- {
- --this->value[0];
- --this->value[1];
- --this->value[2];
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> tmat3x3<T, P>::operator++(int)
- {
- tmat3x3<T, P> Result(*this);
- ++*this;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> tmat3x3<T, P>::operator--(int)
- {
- tmat3x3<T, P> Result(*this);
- --*this;
- return Result;
- }
-
- //////////////////////////////////////////////////////////////
- // Binary operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> operator+(tmat3x3<T, P> const & m, T const & s)
- {
- return tmat3x3<T, P>(
- m[0] + s,
- m[1] + s,
- m[2] + s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> operator+(T const & s, tmat3x3<T, P> const & m)
- {
- return tmat3x3<T, P>(
- m[0] + s,
- m[1] + s,
- m[2] + s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> operator+(tmat3x3<T, P> const & m1, tmat3x3<T, P> const & m2)
- {
- return tmat3x3<T, P>(
- m1[0] + m2[0],
- m1[1] + m2[1],
- m1[2] + m2[2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> operator-(tmat3x3<T, P> const & m, T const & s)
- {
- return tmat3x3<T, P>(
- m[0] - s,
- m[1] - s,
- m[2] - s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> operator-(T const & s, tmat3x3<T, P> const & m)
- {
- return tmat3x3<T, P>(
- s - m[0],
- s - m[1],
- s - m[2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> operator-(tmat3x3<T, P> const & m1, tmat3x3<T, P> const & m2)
- {
- return tmat3x3<T, P>(
- m1[0] - m2[0],
- m1[1] - m2[1],
- m1[2] - m2[2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> operator*(tmat3x3<T, P> const & m, T const & s)
- {
- return tmat3x3<T, P>(
- m[0] * s,
- m[1] * s,
- m[2] * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> operator*(T const & s, tmat3x3<T, P> const & m)
- {
- return tmat3x3<T, P>(
- m[0] * s,
- m[1] * s,
- m[2] * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat3x3<T, P>::col_type operator*(tmat3x3<T, P> const & m, typename tmat3x3<T, P>::row_type const & v)
- {
- return typename tmat3x3<T, P>::col_type(
- m[0][0] * v.x + m[1][0] * v.y + m[2][0] * v.z,
- m[0][1] * v.x + m[1][1] * v.y + m[2][1] * v.z,
- m[0][2] * v.x + m[1][2] * v.y + m[2][2] * v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat3x3<T, P>::row_type operator*(typename tmat3x3<T, P>::col_type const & v, tmat3x3<T, P> const & m)
- {
- return typename tmat3x3<T, P>::row_type(
- m[0][0] * v.x + m[0][1] * v.y + m[0][2] * v.z,
- m[1][0] * v.x + m[1][1] * v.y + m[1][2] * v.z,
- m[2][0] * v.x + m[2][1] * v.y + m[2][2] * v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> operator*(tmat3x3<T, P> const & m1, tmat3x3<T, P> const & m2)
- {
- T const SrcA00 = m1[0][0];
- T const SrcA01 = m1[0][1];
- T const SrcA02 = m1[0][2];
- T const SrcA10 = m1[1][0];
- T const SrcA11 = m1[1][1];
- T const SrcA12 = m1[1][2];
- T const SrcA20 = m1[2][0];
- T const SrcA21 = m1[2][1];
- T const SrcA22 = m1[2][2];
-
- T const SrcB00 = m2[0][0];
- T const SrcB01 = m2[0][1];
- T const SrcB02 = m2[0][2];
- T const SrcB10 = m2[1][0];
- T const SrcB11 = m2[1][1];
- T const SrcB12 = m2[1][2];
- T const SrcB20 = m2[2][0];
- T const SrcB21 = m2[2][1];
- T const SrcB22 = m2[2][2];
-
- tmat3x3<T, P> Result(uninitialize);
- Result[0][0] = SrcA00 * SrcB00 + SrcA10 * SrcB01 + SrcA20 * SrcB02;
- Result[0][1] = SrcA01 * SrcB00 + SrcA11 * SrcB01 + SrcA21 * SrcB02;
- Result[0][2] = SrcA02 * SrcB00 + SrcA12 * SrcB01 + SrcA22 * SrcB02;
- Result[1][0] = SrcA00 * SrcB10 + SrcA10 * SrcB11 + SrcA20 * SrcB12;
- Result[1][1] = SrcA01 * SrcB10 + SrcA11 * SrcB11 + SrcA21 * SrcB12;
- Result[1][2] = SrcA02 * SrcB10 + SrcA12 * SrcB11 + SrcA22 * SrcB12;
- Result[2][0] = SrcA00 * SrcB20 + SrcA10 * SrcB21 + SrcA20 * SrcB22;
- Result[2][1] = SrcA01 * SrcB20 + SrcA11 * SrcB21 + SrcA21 * SrcB22;
- Result[2][2] = SrcA02 * SrcB20 + SrcA12 * SrcB21 + SrcA22 * SrcB22;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P> operator*(tmat3x3<T, P> const & m1, tmat2x3<T, P> const & m2)
- {
- return tmat2x3<T, P>(
- m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2],
- m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1] + m1[2][1] * m2[0][2],
- m1[0][2] * m2[0][0] + m1[1][2] * m2[0][1] + m1[2][2] * m2[0][2],
- m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1] + m1[2][0] * m2[1][2],
- m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1] + m1[2][1] * m2[1][2],
- m1[0][2] * m2[1][0] + m1[1][2] * m2[1][1] + m1[2][2] * m2[1][2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> operator*(tmat3x3<T, P> const & m1, tmat4x3<T, P> const & m2)
- {
- return tmat4x3<T, P>(
- m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2],
- m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1] + m1[2][1] * m2[0][2],
- m1[0][2] * m2[0][0] + m1[1][2] * m2[0][1] + m1[2][2] * m2[0][2],
- m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1] + m1[2][0] * m2[1][2],
- m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1] + m1[2][1] * m2[1][2],
- m1[0][2] * m2[1][0] + m1[1][2] * m2[1][1] + m1[2][2] * m2[1][2],
- m1[0][0] * m2[2][0] + m1[1][0] * m2[2][1] + m1[2][0] * m2[2][2],
- m1[0][1] * m2[2][0] + m1[1][1] * m2[2][1] + m1[2][1] * m2[2][2],
- m1[0][2] * m2[2][0] + m1[1][2] * m2[2][1] + m1[2][2] * m2[2][2],
- m1[0][0] * m2[3][0] + m1[1][0] * m2[3][1] + m1[2][0] * m2[3][2],
- m1[0][1] * m2[3][0] + m1[1][1] * m2[3][1] + m1[2][1] * m2[3][2],
- m1[0][2] * m2[3][0] + m1[1][2] * m2[3][1] + m1[2][2] * m2[3][2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> operator/(tmat3x3<T, P> const & m, T const & s)
- {
- return tmat3x3<T, P>(
- m[0] / s,
- m[1] / s,
- m[2] / s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> operator/(T const & s, tmat3x3<T, P> const & m)
- {
- return tmat3x3<T, P>(
- s / m[0],
- s / m[1],
- s / m[2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat3x3<T, P>::col_type operator/(tmat3x3<T, P> const & m, typename tmat3x3<T, P>::row_type const & v)
- {
- return detail::compute_inverse<T, P>(m) * v;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat3x3<T, P>::row_type operator/(typename tmat3x3<T, P>::col_type const & v, tmat3x3<T, P> const & m)
- {
- return v * detail::compute_inverse<T, P>(m);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> operator/(tmat3x3<T, P> const & m1, tmat3x3<T, P> const & m2)
- {
- tmat3x3<T, P> m1_copy(m1);
- return m1_copy /= m2;
- }
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> const operator-(tmat3x3<T, P> const & m)
- {
- return tmat3x3<T, P>(
- -m[0],
- -m[1],
- -m[2]);
- }
-
- //////////////////////////////////////
- // Boolean operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator==(tmat3x3<T, P> const & m1, tmat3x3<T, P> const & m2)
- {
- return (m1[0] == m2[0]) && (m1[1] == m2[1]) && (m1[2] == m2[2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator!=(tmat3x3<T, P> const & m1, tmat3x3<T, P> const & m2)
- {
- return (m1[0] != m2[0]) || (m1[1] != m2[1]) || (m1[2] != m2[2]);
- }
-} //namespace glm
diff --git a/inc/glm/detail/type_mat3x4.hpp b/inc/glm/detail/type_mat3x4.hpp deleted file mode 100644 index 508f01f..0000000 --- a/inc/glm/detail/type_mat3x4.hpp +++ /dev/null @@ -1,206 +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 core
-/// @file glm/detail/type_mat3x4.hpp
-/// @date 2006-08-05 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "../fwd.hpp"
-#include "type_vec3.hpp"
-#include "type_vec4.hpp"
-#include "type_mat.hpp"
-#include <limits>
-#include <cstddef>
-
-namespace glm
-{
- template <typename T, precision P = defaultp>
- struct tmat3x4
- {
- typedef tvec4<T, P> col_type;
- typedef tvec3<T, P> row_type;
- typedef tmat3x4<T, P> type;
- typedef tmat4x3<T, P> transpose_type;
- typedef T value_type;
-
- private:
- /// @cond DETAIL
- col_type value[3];
- /// @endcond
-
- public:
- // Constructors
- GLM_FUNC_DECL tmat3x4();
- GLM_FUNC_DECL tmat3x4(tmat3x4<T, P> const & m);
- template <precision Q>
- GLM_FUNC_DECL tmat3x4(tmat3x4<T, Q> const & m);
-
- GLM_FUNC_DECL explicit tmat3x4(ctor);
- GLM_FUNC_DECL explicit tmat3x4(T const & s);
- GLM_FUNC_DECL tmat3x4(
- T const & x0, T const & y0, T const & z0, T const & w0,
- T const & x1, T const & y1, T const & z1, T const & w1,
- T const & x2, T const & y2, T const & z2, T const & w2);
- GLM_FUNC_DECL tmat3x4(
- col_type const & v0,
- col_type const & v1,
- col_type const & v2);
-
- //////////////////////////////////////
- // Conversions
- template<
- typename X1, typename Y1, typename Z1, typename W1,
- typename X2, typename Y2, typename Z2, typename W2,
- typename X3, typename Y3, typename Z3, typename W3>
- GLM_FUNC_DECL tmat3x4(
- X1 const & x1, Y1 const & y1, Z1 const & z1, W1 const & w1,
- X2 const & x2, Y2 const & y2, Z2 const & z2, W2 const & w2,
- X3 const & x3, Y3 const & y3, Z3 const & z3, W3 const & w3);
-
- template <typename V1, typename V2, typename V3>
- GLM_FUNC_DECL tmat3x4(
- tvec4<V1, P> const & v1,
- tvec4<V2, P> const & v2,
- tvec4<V3, P> const & v3);
-
- //////////////////////////////////////
- // Matrix conversion
-
-# ifdef GLM_FORCE_EXPLICIT_CTOR
- template <typename U, precision Q>
- GLM_FUNC_DECL explicit tmat3x4(tmat3x4<U, Q> const & m);
-# else
- template <typename U, precision Q>
- GLM_FUNC_DECL tmat3x4(tmat3x4<U, Q> const & m);
-# endif
-
- GLM_FUNC_DECL explicit tmat3x4(tmat2x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x4(tmat3x3<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x4(tmat4x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x4(tmat2x3<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x4(tmat3x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x4(tmat2x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x4(tmat4x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat3x4(tmat4x3<T, P> const & x);
-
- //////////////////////////////////////
- // Accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- typedef size_t size_type;
- GLM_FUNC_DECL GLM_CONSTEXPR size_t size() const;
-
- GLM_FUNC_DECL col_type & operator[](size_type i);
- GLM_FUNC_DECL col_type const & operator[](size_type i) const;
-# else
- typedef length_t length_type;
- GLM_FUNC_DECL GLM_CONSTEXPR length_type length() const;
-
- GLM_FUNC_DECL col_type & operator[](length_type i);
- GLM_FUNC_DECL col_type const & operator[](length_type i) const;
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////
- // Unary arithmetic operators
-
- GLM_FUNC_DECL tmat3x4<T, P> & operator=(tmat3x4<T, P> const & m);
-
- template <typename U>
- GLM_FUNC_DECL tmat3x4<T, P> & operator=(tmat3x4<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat3x4<T, P> & operator+=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat3x4<T, P> & operator+=(tmat3x4<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat3x4<T, P> & operator-=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat3x4<T, P> & operator-=(tmat3x4<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat3x4<T, P> & operator*=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat3x4<T, P> & operator/=(U s);
-
- //////////////////////////////////////
- // Increment and decrement operators
-
- GLM_FUNC_DECL tmat3x4<T, P> & operator++();
- GLM_FUNC_DECL tmat3x4<T, P> & operator--();
- GLM_FUNC_DECL tmat3x4<T, P> operator++(int);
- GLM_FUNC_DECL tmat3x4<T, P> operator--(int);
- };
-
- // Binary operators
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x4<T, P> operator+(tmat3x4<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x4<T, P> operator+(tmat3x4<T, P> const & m1, tmat3x4<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x4<T, P> operator-(tmat3x4<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x4<T, P> operator-(tmat3x4<T, P> const & m1, tmat3x4<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x4<T, P> operator*(tmat3x4<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x4<T, P> operator*(T const & s, tmat3x4<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat3x4<T, P>::col_type operator*(tmat3x4<T, P> const & m, typename tmat3x4<T, P>::row_type const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat3x4<T, P>::row_type operator*(typename tmat3x4<T, P>::col_type const & v, tmat3x4<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> operator*(tmat3x4<T, P> const & m1, tmat4x3<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x4<T, P> operator*(tmat3x4<T, P> const & m1, tmat2x3<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x4<T, P> operator*(tmat3x4<T, P> const & m1, tmat3x3<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x4<T, P> operator/(tmat3x4<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x4<T, P> operator/(T const & s, tmat3x4<T, P> const & m);
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x4<T, P> const operator-(tmat3x4<T, P> const & m);
-}//namespace glm
-
-#ifndef GLM_EXTERNAL_TEMPLATE
-#include "type_mat3x4.inl"
-#endif
diff --git a/inc/glm/detail/type_mat3x4.inl b/inc/glm/detail/type_mat3x4.inl deleted file mode 100644 index 761bc02..0000000 --- a/inc/glm/detail/type_mat3x4.inl +++ /dev/null @@ -1,579 +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 core
-/// @file glm/detail/type_mat3x4.inl
-/// @date 2006-08-05 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- //////////////////////////////////////////////////////////////
- // Constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4()
- {
-# ifndef GLM_FORCE_NO_CTOR_INIT
- this->value[0] = col_type(1, 0, 0, 0);
- this->value[1] = col_type(0, 1, 0, 0);
- this->value[2] = col_type(0, 0, 1, 0);
-# endif
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat3x4<T, P> const & m)
- {
- this->value[0] = m.value[0];
- this->value[1] = m.value[1];
- this->value[2] = m.value[2];
- }
-
- template <typename T, precision P>
- template <precision Q>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat3x4<T, Q> const & m)
- {
- this->value[0] = m.value[0];
- this->value[1] = m.value[1];
- this->value[2] = m.value[2];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(ctor)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(T const & s)
- {
- value_type const Zero(0);
- this->value[0] = col_type(s, Zero, Zero, Zero);
- this->value[1] = col_type(Zero, s, Zero, Zero);
- this->value[2] = col_type(Zero, Zero, s, Zero);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4
- (
- T const & x0, T const & y0, T const & z0, T const & w0,
- T const & x1, T const & y1, T const & z1, T const & w1,
- T const & x2, T const & y2, T const & z2, T const & w2
- )
- {
- this->value[0] = col_type(x0, y0, z0, w0);
- this->value[1] = col_type(x1, y1, z1, w1);
- this->value[2] = col_type(x2, y2, z2, w2);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4
- (
- col_type const & v0,
- col_type const & v1,
- col_type const & v2
- )
- {
- this->value[0] = v0;
- this->value[1] = v1;
- this->value[2] = v2;
- }
-
- //////////////////////////////////////
- // Conversion constructors
- template <typename T, precision P>
- template <
- typename X1, typename Y1, typename Z1, typename W1,
- typename X2, typename Y2, typename Z2, typename W2,
- typename X3, typename Y3, typename Z3, typename W3>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4
- (
- X1 const & x1, Y1 const & y1, Z1 const & z1, W1 const & w1,
- X2 const & x2, Y2 const & y2, Z2 const & z2, W2 const & w2,
- X3 const & x3, Y3 const & y3, Z3 const & z3, W3 const & w3
- )
- {
- this->value[0] = col_type(static_cast<T>(x1), value_type(y1), value_type(z1), value_type(w1));
- this->value[1] = col_type(static_cast<T>(x2), value_type(y2), value_type(z2), value_type(w2));
- this->value[2] = col_type(static_cast<T>(x3), value_type(y3), value_type(z3), value_type(w3));
- }
-
- template <typename T, precision P>
- template <typename V1, typename V2, typename V3>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4
- (
- tvec4<V1, P> const & v1,
- tvec4<V2, P> const & v2,
- tvec4<V3, P> const & v3
- )
- {
- this->value[0] = col_type(v1);
- this->value[1] = col_type(v2);
- this->value[2] = col_type(v3);
- }
-
- // Conversion
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat3x4<U, Q> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat2x2<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0, 0);
- this->value[1] = col_type(m[1], 0, 0);
- this->value[2] = col_type(0, 0, 1, 0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat3x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0);
- this->value[1] = col_type(m[1], 0);
- this->value[2] = col_type(m[2], 0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat4x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat2x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0);
- this->value[1] = col_type(m[1], 0);
- this->value[2] = col_type(0, 0, 1, 0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat3x2<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0, 0);
- this->value[1] = col_type(m[1], 0, 0);
- this->value[2] = col_type(m[2], 0, 1);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat2x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(0, 0, 1, 0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat4x2<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0, 0);
- this->value[1] = col_type(m[1], 0, 0);
- this->value[2] = col_type(m[2], 1, 0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat4x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0);
- this->value[1] = col_type(m[1], 0);
- this->value[2] = col_type(m[2], 0);
- }
-
- //////////////////////////////////////
- // Accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tmat3x4<T, P>::size_type tmat3x4<T, P>::size() const
- {
- return 3;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat3x4<T, P>::col_type & tmat3x4<T, P>::operator[](typename tmat3x4<T, P>::size_type i)
- {
- assert(i < this->size());
- return this->value[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat3x4<T, P>::col_type const & tmat3x4<T, P>::operator[](typename tmat3x4<T, P>::size_type i) const
- {
- assert(i < this->size());
- return this->value[i];
- }
-# else
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tmat3x4<T, P>::length_type tmat3x4<T, P>::length() const
- {
- return 3;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat3x4<T, P>::col_type & tmat3x4<T, P>::operator[](typename tmat3x4<T, P>::length_type i)
- {
- assert(i < this->length());
- return this->value[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat3x4<T, P>::col_type const & tmat3x4<T, P>::operator[](typename tmat3x4<T, P>::length_type i) const
- {
- assert(i < this->length());
- return this->value[i];
- }
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////////////////////////////
- // Unary updatable operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>& tmat3x4<T, P>::operator=(tmat3x4<T, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- this->value[2] = m[2];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>& tmat3x4<T, P>::operator=(tmat3x4<U, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- this->value[2] = m[2];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>& tmat3x4<T, P>::operator+=(U s)
- {
- this->value[0] += s;
- this->value[1] += s;
- this->value[2] += s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>& tmat3x4<T, P>::operator+=(tmat3x4<U, P> const & m)
- {
- this->value[0] += m[0];
- this->value[1] += m[1];
- this->value[2] += m[2];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>& tmat3x4<T, P>::operator-=(U s)
- {
- this->value[0] -= s;
- this->value[1] -= s;
- this->value[2] -= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>& tmat3x4<T, P>::operator-=(tmat3x4<U, P> const & m)
- {
- this->value[0] -= m[0];
- this->value[1] -= m[1];
- this->value[2] -= m[2];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>& tmat3x4<T, P>::operator*=(U s)
- {
- this->value[0] *= s;
- this->value[1] *= s;
- this->value[2] *= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat3x4<T, P> & tmat3x4<T, P>::operator/=(U s)
- {
- this->value[0] /= s;
- this->value[1] /= s;
- this->value[2] /= s;
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>& tmat3x4<T, P>::operator++()
- {
- ++this->value[0];
- ++this->value[1];
- ++this->value[2];
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P>& tmat3x4<T, P>::operator--()
- {
- --this->value[0];
- --this->value[1];
- --this->value[2];
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P> tmat3x4<T, P>::operator++(int)
- {
- tmat3x4<T, P> Result(*this);
- ++*this;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P> tmat3x4<T, P>::operator--(int)
- {
- tmat3x4<T, P> Result(*this);
- --*this;
- return Result;
- }
-
- //////////////////////////////////////////////////////////////
- // Binary operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P> operator+(tmat3x4<T, P> const & m, T const & s)
- {
- return tmat3x4<T, P>(
- m[0] + s,
- m[1] + s,
- m[2] + s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P> operator+(tmat3x4<T, P> const & m1, tmat3x4<T, P> const & m2)
- {
- return tmat3x4<T, P>(
- m1[0] + m2[0],
- m1[1] + m2[1],
- m1[2] + m2[2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P> operator-(tmat3x4<T, P> const & m, T const & s)
- {
- return tmat3x4<T, P>(
- m[0] - s,
- m[1] - s,
- m[2] - s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P> operator-(tmat3x4<T, P> const & m1, tmat3x4<T, P> const & m2)
- {
- return tmat3x4<T, P>(
- m1[0] - m2[0],
- m1[1] - m2[1],
- m1[2] - m2[2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P> operator*(tmat3x4<T, P> const & m, T const & s)
- {
- return tmat3x4<T, P>(
- m[0] * s,
- m[1] * s,
- m[2] * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P> operator*(T const & s, tmat3x4<T, P> const & m)
- {
- return tmat3x4<T, P>(
- m[0] * s,
- m[1] * s,
- m[2] * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat3x4<T, P>::col_type operator*
- (
- tmat3x4<T, P> const & m,
- typename tmat3x4<T, P>::row_type const & v
- )
- {
- return typename tmat3x4<T, P>::col_type(
- m[0][0] * v.x + m[1][0] * v.y + m[2][0] * v.z,
- m[0][1] * v.x + m[1][1] * v.y + m[2][1] * v.z,
- m[0][2] * v.x + m[1][2] * v.y + m[2][2] * v.z,
- m[0][3] * v.x + m[1][3] * v.y + m[2][3] * v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat3x4<T, P>::row_type operator*
- (
- typename tmat3x4<T, P>::col_type const & v,
- tmat3x4<T, P> const & m
- )
- {
- return typename tmat3x4<T, P>::row_type(
- v.x * m[0][0] + v.y * m[0][1] + v.z * m[0][2] + v.w * m[0][3],
- v.x * m[1][0] + v.y * m[1][1] + v.z * m[1][2] + v.w * m[1][3],
- v.x * m[2][0] + v.y * m[2][1] + v.z * m[2][2] + v.w * m[2][3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator*(tmat3x4<T, P> const & m1, tmat4x3<T, P> const & m2)
- {
- const T SrcA00 = m1[0][0];
- const T SrcA01 = m1[0][1];
- const T SrcA02 = m1[0][2];
- const T SrcA03 = m1[0][3];
- const T SrcA10 = m1[1][0];
- const T SrcA11 = m1[1][1];
- const T SrcA12 = m1[1][2];
- const T SrcA13 = m1[1][3];
- const T SrcA20 = m1[2][0];
- const T SrcA21 = m1[2][1];
- const T SrcA22 = m1[2][2];
- const T SrcA23 = m1[2][3];
-
- const T SrcB00 = m2[0][0];
- const T SrcB01 = m2[0][1];
- const T SrcB02 = m2[0][2];
- const T SrcB10 = m2[1][0];
- const T SrcB11 = m2[1][1];
- const T SrcB12 = m2[1][2];
- const T SrcB20 = m2[2][0];
- const T SrcB21 = m2[2][1];
- const T SrcB22 = m2[2][2];
- const T SrcB30 = m2[3][0];
- const T SrcB31 = m2[3][1];
- const T SrcB32 = m2[3][2];
-
- tmat4x4<T, P> Result(uninitialize);
- Result[0][0] = SrcA00 * SrcB00 + SrcA10 * SrcB01 + SrcA20 * SrcB02;
- Result[0][1] = SrcA01 * SrcB00 + SrcA11 * SrcB01 + SrcA21 * SrcB02;
- Result[0][2] = SrcA02 * SrcB00 + SrcA12 * SrcB01 + SrcA22 * SrcB02;
- Result[0][3] = SrcA03 * SrcB00 + SrcA13 * SrcB01 + SrcA23 * SrcB02;
- Result[1][0] = SrcA00 * SrcB10 + SrcA10 * SrcB11 + SrcA20 * SrcB12;
- Result[1][1] = SrcA01 * SrcB10 + SrcA11 * SrcB11 + SrcA21 * SrcB12;
- Result[1][2] = SrcA02 * SrcB10 + SrcA12 * SrcB11 + SrcA22 * SrcB12;
- Result[1][3] = SrcA03 * SrcB10 + SrcA13 * SrcB11 + SrcA23 * SrcB12;
- Result[2][0] = SrcA00 * SrcB20 + SrcA10 * SrcB21 + SrcA20 * SrcB22;
- Result[2][1] = SrcA01 * SrcB20 + SrcA11 * SrcB21 + SrcA21 * SrcB22;
- Result[2][2] = SrcA02 * SrcB20 + SrcA12 * SrcB21 + SrcA22 * SrcB22;
- Result[2][3] = SrcA03 * SrcB20 + SrcA13 * SrcB21 + SrcA23 * SrcB22;
- Result[3][0] = SrcA00 * SrcB30 + SrcA10 * SrcB31 + SrcA20 * SrcB32;
- Result[3][1] = SrcA01 * SrcB30 + SrcA11 * SrcB31 + SrcA21 * SrcB32;
- Result[3][2] = SrcA02 * SrcB30 + SrcA12 * SrcB31 + SrcA22 * SrcB32;
- Result[3][3] = SrcA03 * SrcB30 + SrcA13 * SrcB31 + SrcA23 * SrcB32;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P> operator*(tmat3x4<T, P> const & m1, tmat2x3<T, P> const & m2)
- {
- return tmat2x4<T, P>(
- m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2],
- m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1] + m1[2][1] * m2[0][2],
- m1[0][2] * m2[0][0] + m1[1][2] * m2[0][1] + m1[2][2] * m2[0][2],
- m1[0][3] * m2[0][0] + m1[1][3] * m2[0][1] + m1[2][3] * m2[0][2],
- m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1] + m1[2][0] * m2[1][2],
- m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1] + m1[2][1] * m2[1][2],
- m1[0][2] * m2[1][0] + m1[1][2] * m2[1][1] + m1[2][2] * m2[1][2],
- m1[0][3] * m2[1][0] + m1[1][3] * m2[1][1] + m1[2][3] * m2[1][2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P> operator*(tmat3x4<T, P> const & m1, tmat3x3<T, P> const & m2)
- {
- return tmat3x4<T, P>(
- m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2],
- m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1] + m1[2][1] * m2[0][2],
- m1[0][2] * m2[0][0] + m1[1][2] * m2[0][1] + m1[2][2] * m2[0][2],
- m1[0][3] * m2[0][0] + m1[1][3] * m2[0][1] + m1[2][3] * m2[0][2],
- m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1] + m1[2][0] * m2[1][2],
- m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1] + m1[2][1] * m2[1][2],
- m1[0][2] * m2[1][0] + m1[1][2] * m2[1][1] + m1[2][2] * m2[1][2],
- m1[0][3] * m2[1][0] + m1[1][3] * m2[1][1] + m1[2][3] * m2[1][2],
- m1[0][0] * m2[2][0] + m1[1][0] * m2[2][1] + m1[2][0] * m2[2][2],
- m1[0][1] * m2[2][0] + m1[1][1] * m2[2][1] + m1[2][1] * m2[2][2],
- m1[0][2] * m2[2][0] + m1[1][2] * m2[2][1] + m1[2][2] * m2[2][2],
- m1[0][3] * m2[2][0] + m1[1][3] * m2[2][1] + m1[2][3] * m2[2][2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P> operator/(tmat3x4<T, P> const & m, T const & s)
- {
- return tmat3x4<T, P>(
- m[0] / s,
- m[1] / s,
- m[2] / s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P> operator/(T const & s, tmat3x4<T, P> const & m)
- {
- return tmat3x4<T, P>(
- s / m[0],
- s / m[1],
- s / m[2]);
- }
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P> const operator-(tmat3x4<T, P> const & m)
- {
- return tmat3x4<T, P>(
- -m[0],
- -m[1],
- -m[2]);
- }
-
- //////////////////////////////////////
- // Boolean operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator==(tmat3x4<T, P> const & m1, tmat3x4<T, P> const & m2)
- {
- return (m1[0] == m2[0]) && (m1[1] == m2[1]) && (m1[2] == m2[2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator!=(tmat3x4<T, P> const & m1, tmat3x4<T, P> const & m2)
- {
- return (m1[0] != m2[0]) || (m1[1] != m2[1]) || (m1[2] != m2[2]);
- }
-} //namespace glm
diff --git a/inc/glm/detail/type_mat4x2.hpp b/inc/glm/detail/type_mat4x2.hpp deleted file mode 100644 index 5aff50c..0000000 --- a/inc/glm/detail/type_mat4x2.hpp +++ /dev/null @@ -1,212 +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 core
-/// @file glm/detail/type_mat4x2.hpp
-/// @date 2006-10-01 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "../fwd.hpp"
-#include "type_vec2.hpp"
-#include "type_vec4.hpp"
-#include "type_mat.hpp"
-#include <limits>
-#include <cstddef>
-
-namespace glm
-{
- template <typename T, precision P = defaultp>
- struct tmat4x2
- {
- typedef tvec2<T, P> col_type;
- typedef tvec4<T, P> row_type;
- typedef tmat4x2<T, P> type;
- typedef tmat2x4<T, P> transpose_type;
- typedef T value_type;
-
- private:
- /// @cond DETAIL
- col_type value[4];
- /// @endcond
-
- public:
- // Constructors
- GLM_FUNC_DECL tmat4x2();
- GLM_FUNC_DECL tmat4x2(tmat4x2<T, P> const & m);
- template <precision Q>
- GLM_FUNC_DECL tmat4x2(tmat4x2<T, Q> const & m);
-
- GLM_FUNC_DECL explicit tmat4x2(ctor);
- GLM_FUNC_DECL explicit tmat4x2(T const & x);
- GLM_FUNC_DECL tmat4x2(
- T const & x0, T const & y0,
- T const & x1, T const & y1,
- T const & x2, T const & y2,
- T const & x3, T const & y3);
- GLM_FUNC_DECL tmat4x2(
- col_type const & v0,
- col_type const & v1,
- col_type const & v2,
- col_type const & v3);
-
- //////////////////////////////////////
- // Conversions
-
- template <
- typename X1, typename Y1,
- typename X2, typename Y2,
- typename X3, typename Y3,
- typename X4, typename Y4>
- GLM_FUNC_DECL tmat4x2(
- X1 const & x1, Y1 const & y1,
- X2 const & x2, Y2 const & y2,
- X3 const & x3, Y3 const & y3,
- X4 const & x4, Y4 const & y4);
-
- template <typename V1, typename V2, typename V3, typename V4>
- GLM_FUNC_DECL tmat4x2(
- tvec2<V1, P> const & v1,
- tvec2<V2, P> const & v2,
- tvec2<V3, P> const & v3,
- tvec2<V4, P> const & v4);
-
- //////////////////////////////////////
- // Matrix conversions
-
-# ifdef GLM_FORCE_EXPLICIT_CTOR
- template <typename U, precision Q>
- GLM_FUNC_DECL explicit tmat4x2(tmat4x2<U, Q> const & m);
-# else
- template <typename U, precision Q>
- GLM_FUNC_DECL tmat4x2(tmat4x2<U, Q> const & m);
-# endif
-
- GLM_FUNC_DECL explicit tmat4x2(tmat2x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x2(tmat3x3<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x2(tmat4x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x2(tmat2x3<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x2(tmat3x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x2(tmat2x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x2(tmat4x3<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x2(tmat3x4<T, P> const & x);
-
- //////////////////////////////////////
- // Accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- typedef size_t size_type;
- GLM_FUNC_DECL GLM_CONSTEXPR size_t size() const;
-
- GLM_FUNC_DECL col_type & operator[](size_type i);
- GLM_FUNC_DECL col_type const & operator[](size_type i) const;
-# else
- typedef length_t length_type;
- GLM_FUNC_DECL GLM_CONSTEXPR length_type length() const;
-
- GLM_FUNC_DECL col_type & operator[](length_type i);
- GLM_FUNC_DECL col_type const & operator[](length_type i) const;
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////
- // Unary arithmetic operators
-
- GLM_FUNC_DECL tmat4x2<T, P> & operator=(tmat4x2<T, P> const & m);
-
- template <typename U>
- GLM_FUNC_DECL tmat4x2<T, P> & operator=(tmat4x2<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat4x2<T, P> & operator+=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat4x2<T, P> & operator+=(tmat4x2<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat4x2<T, P> & operator-=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat4x2<T, P> & operator-=(tmat4x2<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat4x2<T, P> & operator*=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat4x2<T, P> & operator/=(U s);
-
- //////////////////////////////////////
- // Increment and decrement operators
-
- GLM_FUNC_DECL tmat4x2<T, P> & operator++ ();
- GLM_FUNC_DECL tmat4x2<T, P> & operator-- ();
- GLM_FUNC_DECL tmat4x2<T, P> operator++(int);
- GLM_FUNC_DECL tmat4x2<T, P> operator--(int);
- };
-
- // Binary operators
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x2<T, P> operator+(tmat4x2<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x2<T, P> operator+(tmat4x2<T, P> const & m1, tmat4x2<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x2<T, P> operator-(tmat4x2<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x2<T, P> operator-(tmat4x2<T, P> const & m1, tmat4x2<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x2<T, P> operator*(tmat4x2<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x2<T, P> operator*(T const & s, tmat4x2<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat4x2<T, P>::col_type operator*(tmat4x2<T, P> const & m, typename tmat4x2<T, P>::row_type const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat4x2<T, P>::row_type operator*(typename tmat4x2<T, P>::col_type const & v, tmat4x2<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x2<T, P> operator*(tmat4x2<T, P> const & m1, tmat3x4<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x2<T, P> operator*(tmat4x2<T, P> const & m1, tmat4x4<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x3<T, P> operator*(tmat4x3<T, P> const & m1, tmat2x4<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x2<T, P> operator/(tmat4x2<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x2<T, P> operator/(T const & s, tmat4x2<T, P> const & m);
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x2<T, P> const operator-(tmat4x2<T, P> const & m);
-}//namespace glm
-
-#ifndef GLM_EXTERNAL_TEMPLATE
-#include "type_mat4x2.inl"
-#endif
diff --git a/inc/glm/detail/type_mat4x2.inl b/inc/glm/detail/type_mat4x2.inl deleted file mode 100644 index 5b14015..0000000 --- a/inc/glm/detail/type_mat4x2.inl +++ /dev/null @@ -1,587 +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 core
-/// @file glm/detail/type_mat4x2.inl
-/// @date 2006-10-01 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- //////////////////////////////////////////////////////////////
- // Constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P>::tmat4x2()
- {
-# ifndef GLM_FORCE_NO_CTOR_INIT
- this->value[0] = col_type(1, 0);
- this->value[1] = col_type(0, 1);
- this->value[2] = col_type(0, 0);
- this->value[3] = col_type(0, 0);
-# endif
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P>::tmat4x2(tmat4x2<T, P> const & m)
- {
- this->value[0] = m.value[0];
- this->value[1] = m.value[1];
- this->value[2] = m.value[2];
- this->value[3] = m.value[3];
- }
-
- template <typename T, precision P>
- template <precision Q>
- GLM_FUNC_QUALIFIER tmat4x2<T, P>::tmat4x2(tmat4x2<T, Q> const & m)
- {
- this->value[0] = m.value[0];
- this->value[1] = m.value[1];
- this->value[2] = m.value[2];
- this->value[3] = m.value[3];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P>::tmat4x2(ctor)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P>::tmat4x2(T const & s)
- {
- value_type const Zero(0);
- this->value[0] = col_type(s, Zero);
- this->value[1] = col_type(Zero, s);
- this->value[2] = col_type(Zero, Zero);
- this->value[3] = col_type(Zero, Zero);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P>::tmat4x2
- (
- T const & x0, T const & y0,
- T const & x1, T const & y1,
- T const & x2, T const & y2,
- T const & x3, T const & y3
- )
- {
- this->value[0] = col_type(x0, y0);
- this->value[1] = col_type(x1, y1);
- this->value[2] = col_type(x2, y2);
- this->value[3] = col_type(x3, y3);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P>::tmat4x2
- (
- col_type const & v0,
- col_type const & v1,
- col_type const & v2,
- col_type const & v3
- )
- {
- this->value[0] = v0;
- this->value[1] = v1;
- this->value[2] = v2;
- this->value[3] = v3;
- }
-
- //////////////////////////////////////
- // Conversion constructors
-
- template <typename T, precision P>
- template <
- typename X1, typename Y1,
- typename X2, typename Y2,
- typename X3, typename Y3,
- typename X4, typename Y4>
- GLM_FUNC_QUALIFIER tmat4x2<T, P>::tmat4x2
- (
- X1 const & x1, Y1 const & y1,
- X2 const & x2, Y2 const & y2,
- X3 const & x3, Y3 const & y3,
- X4 const & x4, Y4 const & y4
- )
- {
- this->value[0] = col_type(static_cast<T>(x1), value_type(y1));
- this->value[1] = col_type(static_cast<T>(x2), value_type(y2));
- this->value[2] = col_type(static_cast<T>(x3), value_type(y3));
- this->value[3] = col_type(static_cast<T>(x4), value_type(y4));
- }
-
- template <typename T, precision P>
- template <typename V1, typename V2, typename V3, typename V4>
- GLM_FUNC_QUALIFIER tmat4x2<T, P>::tmat4x2
- (
- tvec2<V1, P> const & v1,
- tvec2<V2, P> const & v2,
- tvec2<V3, P> const & v3,
- tvec2<V4, P> const & v4
- )
- {
- this->value[0] = col_type(v1);
- this->value[1] = col_type(v2);
- this->value[2] = col_type(v3);
- this->value[3] = col_type(v4);
- }
-
- //////////////////////////////////////
- // Conversion
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tmat4x2<T, P>::tmat4x2(tmat4x2<U, Q> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- this->value[3] = col_type(m[3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P>::tmat4x2(tmat2x2<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(0);
- this->value[3] = col_type(0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P>::tmat4x2(tmat3x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- this->value[3] = col_type(0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P>::tmat4x2(tmat4x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- this->value[3] = col_type(m[3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P>::tmat4x2(tmat2x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(0);
- this->value[3] = col_type(0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P>::tmat4x2(tmat3x2<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- this->value[3] = col_type(0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P>::tmat4x2(tmat2x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(0);
- this->value[3] = col_type(0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P>::tmat4x2(tmat4x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- this->value[3] = col_type(m[3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P>::tmat4x2(tmat3x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- this->value[3] = col_type(0);
- }
-
- //////////////////////////////////////
- // Accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tmat4x2<T, P>::size_type tmat4x2<T, P>::size() const
- {
- return 4;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x2<T, P>::col_type & tmat4x2<T, P>::operator[](typename tmat4x2<T, P>::size_type i)
- {
- assert(i < this->size());
- return this->value[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x2<T, P>::col_type const & tmat4x2<T, P>::operator[](typename tmat4x2<T, P>::size_type i) const
- {
- assert(i < this->size());
- return this->value[i];
- }
-# else
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tmat4x2<T, P>::length_type tmat4x2<T, P>::length() const
- {
- return 4;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x2<T, P>::col_type & tmat4x2<T, P>::operator[](typename tmat4x2<T, P>::length_type i)
- {
- assert(i < this->length());
- return this->value[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x2<T, P>::col_type const & tmat4x2<T, P>::operator[](typename tmat4x2<T, P>::length_type i) const
- {
- assert(i < this->length());
- return this->value[i];
- }
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////////////////////////////
- // Unary updatable operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P>& tmat4x2<T, P>::operator=(tmat4x2<T, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- this->value[2] = m[2];
- this->value[3] = m[3];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x2<T, P>& tmat4x2<T, P>::operator=(tmat4x2<U, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- this->value[2] = m[2];
- this->value[3] = m[3];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> & tmat4x2<T, P>::operator+=(U s)
- {
- this->value[0] += s;
- this->value[1] += s;
- this->value[2] += s;
- this->value[3] += s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> & tmat4x2<T, P>::operator+=(tmat4x2<U, P> const & m)
- {
- this->value[0] += m[0];
- this->value[1] += m[1];
- this->value[2] += m[2];
- this->value[3] += m[3];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> & tmat4x2<T, P>::operator-=(U s)
- {
- this->value[0] -= s;
- this->value[1] -= s;
- this->value[2] -= s;
- this->value[3] -= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> & tmat4x2<T, P>::operator-=(tmat4x2<U, P> const & m)
- {
- this->value[0] -= m[0];
- this->value[1] -= m[1];
- this->value[2] -= m[2];
- this->value[3] -= m[3];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> & tmat4x2<T, P>::operator*=(U s)
- {
- this->value[0] *= s;
- this->value[1] *= s;
- this->value[2] *= s;
- this->value[3] *= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> & tmat4x2<T, P>::operator/=(U s)
- {
- this->value[0] /= s;
- this->value[1] /= s;
- this->value[2] /= s;
- this->value[3] /= s;
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> & tmat4x2<T, P>::operator++()
- {
- ++this->value[0];
- ++this->value[1];
- ++this->value[2];
- ++this->value[3];
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> & tmat4x2<T, P>::operator--()
- {
- --this->value[0];
- --this->value[1];
- --this->value[2];
- --this->value[3];
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> tmat4x2<T, P>::operator++(int)
- {
- tmat4x2<T, P> Result(*this);
- ++*this;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> tmat4x2<T, P>::operator--(int)
- {
- tmat4x2<T, P> Result(*this);
- --*this;
- return Result;
- }
-
- //////////////////////////////////////////////////////////////
- // Binary operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> operator+(tmat4x2<T, P> const & m, T const & s)
- {
- return tmat4x2<T, P>(
- m[0] + s,
- m[1] + s,
- m[2] + s,
- m[3] + s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> operator+(tmat4x2<T, P> const & m1, tmat4x2<T, P> const & m2)
- {
- return tmat4x2<T, P>(
- m1[0] + m2[0],
- m1[1] + m2[1],
- m1[2] + m2[2],
- m1[3] + m2[3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> operator-(tmat4x2<T, P> const & m, T const & s)
- {
- return tmat4x2<T, P>(
- m[0] - s,
- m[1] - s,
- m[2] - s,
- m[3] - s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> operator-(tmat4x2<T, P> const & m1, tmat4x2<T, P> const & m2)
- {
- return tmat4x2<T, P>(
- m1[0] - m2[0],
- m1[1] - m2[1],
- m1[2] - m2[2],
- m1[3] - m2[3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> operator*(tmat4x2<T, P> const & m, T const & s)
- {
- return tmat4x2<T, P>(
- m[0] * s,
- m[1] * s,
- m[2] * s,
- m[3] * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> operator*(T const & s, tmat4x2<T, P> const & m)
- {
- return tmat4x2<T, P>(
- m[0] * s,
- m[1] * s,
- m[2] * s,
- m[3] * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x2<T, P>::col_type operator*(tmat4x2<T, P> const & m, typename tmat4x2<T, P>::row_type const & v)
- {
- return typename tmat4x2<T, P>::col_type(
- m[0][0] * v.x + m[1][0] * v.y + m[2][0] * v.z + m[3][0] * v.w,
- m[0][1] * v.x + m[1][1] * v.y + m[2][1] * v.z + m[3][1] * v.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x2<T, P>::row_type operator*(typename tmat4x2<T, P>::col_type const & v, tmat4x2<T, P> const & m)
- {
- return typename tmat4x2<T, P>::row_type(
- v.x * m[0][0] + v.y * m[0][1],
- v.x * m[1][0] + v.y * m[1][1],
- v.x * m[2][0] + v.y * m[2][1],
- v.x * m[3][0] + v.y * m[3][1]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> operator*(tmat4x2<T, P> const & m1, tmat2x4<T, P> const & m2)
- {
- T const SrcA00 = m1[0][0];
- T const SrcA01 = m1[0][1];
- T const SrcA10 = m1[1][0];
- T const SrcA11 = m1[1][1];
- T const SrcA20 = m1[2][0];
- T const SrcA21 = m1[2][1];
- T const SrcA30 = m1[3][0];
- T const SrcA31 = m1[3][1];
-
- T const SrcB00 = m2[0][0];
- T const SrcB01 = m2[0][1];
- T const SrcB02 = m2[0][2];
- T const SrcB03 = m2[0][3];
- T const SrcB10 = m2[1][0];
- T const SrcB11 = m2[1][1];
- T const SrcB12 = m2[1][2];
- T const SrcB13 = m2[1][3];
-
- tmat2x2<T, P> Result(uninitialize);
- Result[0][0] = SrcA00 * SrcB00 + SrcA10 * SrcB01 + SrcA20 * SrcB02 + SrcA30 * SrcB03;
- Result[0][1] = SrcA01 * SrcB00 + SrcA11 * SrcB01 + SrcA21 * SrcB02 + SrcA31 * SrcB03;
- Result[1][0] = SrcA00 * SrcB10 + SrcA10 * SrcB11 + SrcA20 * SrcB12 + SrcA30 * SrcB13;
- Result[1][1] = SrcA01 * SrcB10 + SrcA11 * SrcB11 + SrcA21 * SrcB12 + SrcA31 * SrcB13;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P> operator*(tmat4x2<T, P> const & m1, tmat3x4<T, P> const & m2)
- {
- return tmat3x2<T, P>(
- m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2] + m1[3][0] * m2[0][3],
- m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1] + m1[2][1] * m2[0][2] + m1[3][1] * m2[0][3],
- m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1] + m1[2][0] * m2[1][2] + m1[3][0] * m2[1][3],
- m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1] + m1[2][1] * m2[1][2] + m1[3][1] * m2[1][3],
- m1[0][0] * m2[2][0] + m1[1][0] * m2[2][1] + m1[2][0] * m2[2][2] + m1[3][0] * m2[2][3],
- m1[0][1] * m2[2][0] + m1[1][1] * m2[2][1] + m1[2][1] * m2[2][2] + m1[3][1] * m2[2][3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> operator*(tmat4x2<T, P> const & m1, tmat4x4<T, P> const & m2)
- {
- return tmat4x2<T, P>(
- m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2] + m1[3][0] * m2[0][3],
- m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1] + m1[2][1] * m2[0][2] + m1[3][1] * m2[0][3],
- m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1] + m1[2][0] * m2[1][2] + m1[3][0] * m2[1][3],
- m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1] + m1[2][1] * m2[1][2] + m1[3][1] * m2[1][3],
- m1[0][0] * m2[2][0] + m1[1][0] * m2[2][1] + m1[2][0] * m2[2][2] + m1[3][0] * m2[2][3],
- m1[0][1] * m2[2][0] + m1[1][1] * m2[2][1] + m1[2][1] * m2[2][2] + m1[3][1] * m2[2][3],
- m1[0][0] * m2[3][0] + m1[1][0] * m2[3][1] + m1[2][0] * m2[3][2] + m1[3][0] * m2[3][3],
- m1[0][1] * m2[3][0] + m1[1][1] * m2[3][1] + m1[2][1] * m2[3][2] + m1[3][1] * m2[3][3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> operator/(tmat4x2<T, P> const & m, T const & s)
- {
- return tmat4x2<T, P>(
- m[0] / s,
- m[1] / s,
- m[2] / s,
- m[3] / s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> operator/(T const & s, tmat4x2<T, P> const & m)
- {
- return tmat4x2<T, P>(
- s / m[0],
- s / m[1],
- s / m[2],
- s / m[3]);
- }
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> const operator-(tmat4x2<T, P> const & m)
- {
- return tmat4x2<T, P>(
- -m[0],
- -m[1],
- -m[2],
- -m[3]);
- }
-
- //////////////////////////////////////
- // Boolean operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator==(tmat4x2<T, P> const & m1, tmat4x2<T, P> const & m2)
- {
- return (m1[0] == m2[0]) && (m1[1] == m2[1]) && (m1[2] == m2[2]) && (m1[3] == m2[3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator!=(tmat4x2<T, P> const & m1, tmat4x2<T, P> const & m2)
- {
- return (m1[0] != m2[0]) || (m1[1] != m2[1]) || (m1[2] != m2[2]) || (m1[3] != m2[3]);
- }
-} //namespace glm
diff --git a/inc/glm/detail/type_mat4x3.hpp b/inc/glm/detail/type_mat4x3.hpp deleted file mode 100644 index bf4c4ed..0000000 --- a/inc/glm/detail/type_mat4x3.hpp +++ /dev/null @@ -1,211 +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 core
-/// @file glm/detail/type_mat4x3.hpp
-/// @date 2006-08-04 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "../fwd.hpp"
-#include "type_vec3.hpp"
-#include "type_vec4.hpp"
-#include "type_mat.hpp"
-#include <limits>
-#include <cstddef>
-
-namespace glm
-{
- template <typename T, precision P = defaultp>
- struct tmat4x3
- {
- typedef tvec3<T, P> col_type;
- typedef tvec4<T, P> row_type;
- typedef tmat4x3<T, P> type;
- typedef tmat3x4<T, P> transpose_type;
- typedef T value_type;
-
- private:
- // Data
- col_type value[4];
-
- public:
- // Constructors
- GLM_FUNC_DECL tmat4x3();
- GLM_FUNC_DECL tmat4x3(tmat4x3<T, P> const & m);
- template <precision Q>
- GLM_FUNC_DECL tmat4x3(tmat4x3<T, Q> const & m);
-
- GLM_FUNC_DECL explicit tmat4x3(ctor);
- GLM_FUNC_DECL explicit tmat4x3(T const & x);
- GLM_FUNC_DECL tmat4x3(
- T const & x0, T const & y0, T const & z0,
- T const & x1, T const & y1, T const & z1,
- T const & x2, T const & y2, T const & z2,
- T const & x3, T const & y3, T const & z3);
- GLM_FUNC_DECL tmat4x3(
- col_type const & v0,
- col_type const & v1,
- col_type const & v2,
- col_type const & v3);
-
- //////////////////////////////////////
- // Conversions
-
- template <
- typename X1, typename Y1, typename Z1,
- typename X2, typename Y2, typename Z2,
- typename X3, typename Y3, typename Z3,
- typename X4, typename Y4, typename Z4>
- GLM_FUNC_DECL tmat4x3(
- X1 const & x1, Y1 const & y1, Z1 const & z1,
- X2 const & x2, Y2 const & y2, Z2 const & z2,
- X3 const & x3, Y3 const & y3, Z3 const & z3,
- X4 const & x4, Y4 const & y4, Z4 const & z4);
-
- template <typename V1, typename V2, typename V3, typename V4>
- GLM_FUNC_DECL tmat4x3(
- tvec3<V1, P> const & v1,
- tvec3<V2, P> const & v2,
- tvec3<V3, P> const & v3,
- tvec3<V4, P> const & v4);
-
- //////////////////////////////////////
- // Matrix conversions
-
-# ifdef GLM_FORCE_EXPLICIT_CTOR
- template <typename U, precision Q>
- GLM_FUNC_DECL explicit tmat4x3(tmat4x3<U, Q> const & m);
-# else
- template <typename U, precision Q>
- GLM_FUNC_DECL tmat4x3(tmat4x3<U, Q> const & m);
-# endif
-
- GLM_FUNC_DECL explicit tmat4x3(tmat2x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x3(tmat3x3<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x3(tmat4x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x3(tmat2x3<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x3(tmat3x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x3(tmat2x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x3(tmat4x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x3(tmat3x4<T, P> const & x);
-
- //////////////////////////////////////
- // Accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- typedef size_t size_type;
- GLM_FUNC_DECL GLM_CONSTEXPR size_t size() const;
-
- GLM_FUNC_DECL col_type & operator[](size_type i);
- GLM_FUNC_DECL col_type const & operator[](size_type i) const;
-# else
- typedef length_t length_type;
- GLM_FUNC_DECL GLM_CONSTEXPR length_type length() const;
-
- GLM_FUNC_DECL col_type & operator[](length_type i);
- GLM_FUNC_DECL col_type const & operator[](length_type i) const;
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////
- // Unary arithmetic operators
-
- GLM_FUNC_DECL tmat4x3<T, P> & operator=(tmat4x3<T, P> const & m);
-
- template <typename U>
- GLM_FUNC_DECL tmat4x3<T, P> & operator=(tmat4x3<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat4x3<T, P> & operator+=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat4x3<T, P> & operator+=(tmat4x3<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat4x3<T, P> & operator-=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat4x3<T, P> & operator-=(tmat4x3<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat4x3<T, P> & operator*=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat4x3<T, P> & operator/=(U s);
-
- //////////////////////////////////////
- // Increment and decrement operators
-
- GLM_FUNC_DECL tmat4x3<T, P> & operator++();
- GLM_FUNC_DECL tmat4x3<T, P> & operator--();
- GLM_FUNC_DECL tmat4x3<T, P> operator++(int);
- GLM_FUNC_DECL tmat4x3<T, P> operator--(int);
- };
-
- // Binary operators
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x3<T, P> operator+(tmat4x3<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x3<T, P> operator+(tmat4x3<T, P> const & m1, tmat4x3<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x3<T, P> operator-(tmat4x3<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x3<T, P> operator-(tmat4x3<T, P> const & m1, tmat4x3<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x3<T, P> operator*(tmat4x3<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x3<T, P> operator*(T const & s, tmat4x3<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat4x3<T, P>::col_type operator*(tmat4x3<T, P> const & m, typename tmat4x3<T, P>::row_type const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat4x3<T, P>::row_type operator*(typename tmat4x3<T, P>::col_type const & v, tmat4x3<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x3<T, P> operator*(tmat4x3<T, P> const & m1, tmat2x4<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> operator*(tmat4x3<T, P> const & m1, tmat3x4<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x3<T, P> operator*(tmat4x3<T, P> const & m1, tmat4x4<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x3<T, P> operator/(tmat4x3<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x3<T, P> operator/(T const & s, tmat4x3<T, P> const & m);
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x3<T, P> const operator-(tmat4x3<T, P> const & m);
-}//namespace glm
-
-#ifndef GLM_EXTERNAL_TEMPLATE
-#include "type_mat4x3.inl"
-#endif //GLM_EXTERNAL_TEMPLATE
diff --git a/inc/glm/detail/type_mat4x3.inl b/inc/glm/detail/type_mat4x3.inl deleted file mode 100644 index ce61fdd..0000000 --- a/inc/glm/detail/type_mat4x3.inl +++ /dev/null @@ -1,631 +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 core
-/// @file glm/detail/type_mat4x3.inl
-/// @date 2006-04-17 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- //////////////////////////////////////////////////////////////
- // Constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P>::tmat4x3()
- {
-# ifndef GLM_FORCE_NO_CTOR_INIT
- this->value[0] = col_type(1, 0, 0);
- this->value[1] = col_type(0, 1, 0);
- this->value[2] = col_type(0, 0, 1);
- this->value[3] = col_type(0, 0, 0);
-# endif
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P>::tmat4x3(tmat4x3<T, P> const & m)
- {
- this->value[0] = m.value[0];
- this->value[1] = m.value[1];
- this->value[2] = m.value[2];
- this->value[3] = m.value[3];
- }
-
- template <typename T, precision P>
- template <precision Q>
- GLM_FUNC_QUALIFIER tmat4x3<T, P>::tmat4x3(tmat4x3<T, Q> const & m)
- {
- this->value[0] = m.value[0];
- this->value[1] = m.value[1];
- this->value[2] = m.value[2];
- this->value[3] = m.value[3];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P>::tmat4x3(ctor)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P>::tmat4x3(T const & s)
- {
- this->value[0] = col_type(s, 0, 0);
- this->value[1] = col_type(0, s, 0);
- this->value[2] = col_type(0, 0, s);
- this->value[3] = col_type(0, 0, 0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P>::tmat4x3
- (
- T const & x0, T const & y0, T const & z0,
- T const & x1, T const & y1, T const & z1,
- T const & x2, T const & y2, T const & z2,
- T const & x3, T const & y3, T const & z3
- )
- {
- this->value[0] = col_type(x0, y0, z0);
- this->value[1] = col_type(x1, y1, z1);
- this->value[2] = col_type(x2, y2, z2);
- this->value[3] = col_type(x3, y3, z3);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P>::tmat4x3
- (
- col_type const & v0,
- col_type const & v1,
- col_type const & v2,
- col_type const & v3
- )
- {
- this->value[0] = v0;
- this->value[1] = v1;
- this->value[2] = v2;
- this->value[3] = v3;
- }
-
- //////////////////////////////////////
- // Conversion constructors
-
- template <typename T, precision P>
- template <
- typename X1, typename Y1, typename Z1,
- typename X2, typename Y2, typename Z2,
- typename X3, typename Y3, typename Z3,
- typename X4, typename Y4, typename Z4>
- GLM_FUNC_QUALIFIER tmat4x3<T, P>::tmat4x3
- (
- X1 const & x1, Y1 const & y1, Z1 const & z1,
- X2 const & x2, Y2 const & y2, Z2 const & z2,
- X3 const & x3, Y3 const & y3, Z3 const & z3,
- X4 const & x4, Y4 const & y4, Z4 const & z4
- )
- {
- this->value[0] = col_type(static_cast<T>(x1), value_type(y1), value_type(z1));
- this->value[1] = col_type(static_cast<T>(x2), value_type(y2), value_type(z2));
- this->value[2] = col_type(static_cast<T>(x3), value_type(y3), value_type(z3));
- this->value[3] = col_type(static_cast<T>(x4), value_type(y4), value_type(z4));
- }
-
- template <typename T, precision P>
- template <typename V1, typename V2, typename V3, typename V4>
- GLM_FUNC_QUALIFIER tmat4x3<T, P>::tmat4x3
- (
- tvec3<V1, P> const & v1,
- tvec3<V2, P> const & v2,
- tvec3<V3, P> const & v3,
- tvec3<V4, P> const & v4
- )
- {
- this->value[0] = col_type(v1);
- this->value[1] = col_type(v2);
- this->value[2] = col_type(v3);
- this->value[3] = col_type(v4);
- }
-
- //////////////////////////////////////////////////////////////
- // Matrix conversions
-
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tmat4x3<T, P>::tmat4x3(tmat4x3<U, Q> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- this->value[3] = col_type(m[3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P>::tmat4x3(tmat2x2<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0);
- this->value[1] = col_type(m[1], 0);
- this->value[2] = col_type(m[2], 1);
- this->value[3] = col_type(0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P>::tmat4x3(tmat3x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- this->value[3] = col_type(0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P>::tmat4x3(tmat4x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- this->value[3] = col_type(m[3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P>::tmat4x3(tmat2x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(0, 0, 1);
- this->value[3] = col_type(0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P>::tmat4x3(tmat3x2<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0);
- this->value[1] = col_type(m[1], 0);
- this->value[2] = col_type(m[2], 1);
- this->value[3] = col_type(0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P>::tmat4x3(tmat2x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(0, 0, 1);
- this->value[3] = col_type(0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P>::tmat4x3(tmat4x2<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0);
- this->value[1] = col_type(m[1], 0);
- this->value[2] = col_type(m[2], 1);
- this->value[3] = col_type(m[3], 0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P>::tmat4x3(tmat3x4<T, P> const & m)
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- this->value[3] = col_type(0);
- }
-
- //////////////////////////////////////
- // Accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tmat4x3<T, P>::size_type tmat4x3<T, P>::size() const
- {
- return 4;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x3<T, P>::col_type & tmat4x3<T, P>::operator[](typename tmat4x3<T, P>::size_type i)
- {
- assert(i < this->size());
- return this->value[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x3<T, P>::col_type const & tmat4x3<T, P>::operator[](typename tmat4x3<T, P>::size_type i) const
- {
- assert(i < this->size());
- return this->value[i];
- }
-# else
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tmat4x3<T, P>::length_type tmat4x3<T, P>::length() const
- {
- return 4;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x3<T, P>::col_type & tmat4x3<T, P>::operator[](typename tmat4x3<T, P>::length_type i)
- {
- assert(i < this->length());
- return this->value[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x3<T, P>::col_type const & tmat4x3<T, P>::operator[](typename tmat4x3<T, P>::length_type i) const
- {
- assert(i < this->length());
- return this->value[i];
- }
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////////////////////////////
- // Unary updatable operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P>& tmat4x3<T, P>::operator=(tmat4x3<T, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- this->value[2] = m[2];
- this->value[3] = m[3];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x3<T, P>& tmat4x3<T, P>::operator=(tmat4x3<U, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- this->value[2] = m[2];
- this->value[3] = m[3];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> & tmat4x3<T, P>::operator+=(U s)
- {
- this->value[0] += s;
- this->value[1] += s;
- this->value[2] += s;
- this->value[3] += s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> & tmat4x3<T, P>::operator+=(tmat4x3<U, P> const & m)
- {
- this->value[0] += m[0];
- this->value[1] += m[1];
- this->value[2] += m[2];
- this->value[3] += m[3];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> & tmat4x3<T, P>::operator-=(U s)
- {
- this->value[0] -= s;
- this->value[1] -= s;
- this->value[2] -= s;
- this->value[3] -= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> & tmat4x3<T, P>::operator-=(tmat4x3<U, P> const & m)
- {
- this->value[0] -= m[0];
- this->value[1] -= m[1];
- this->value[2] -= m[2];
- this->value[3] -= m[3];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> & tmat4x3<T, P>::operator*=(U s)
- {
- this->value[0] *= s;
- this->value[1] *= s;
- this->value[2] *= s;
- this->value[3] *= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> & tmat4x3<T, P>::operator/=(U s)
- {
- this->value[0] /= s;
- this->value[1] /= s;
- this->value[2] /= s;
- this->value[3] /= s;
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> & tmat4x3<T, P>::operator++()
- {
- ++this->value[0];
- ++this->value[1];
- ++this->value[2];
- ++this->value[3];
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> & tmat4x3<T, P>::operator--()
- {
- --this->value[0];
- --this->value[1];
- --this->value[2];
- --this->value[3];
- return *this;
- }
-
- //////////////////////////////////////////////////////////////
- // Binary operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> operator+(tmat4x3<T, P> const & m, T const & s)
- {
- return tmat4x3<T, P>(
- m[0] + s,
- m[1] + s,
- m[2] + s,
- m[3] + s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> operator+(tmat4x3<T, P> const & m1, tmat4x3<T, P> const & m2)
- {
- return tmat4x3<T, P>(
- m1[0] + m2[0],
- m1[1] + m2[1],
- m1[2] + m2[2],
- m1[3] + m2[3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> operator-(tmat4x3<T, P> const & m, T const & s)
- {
- return tmat4x3<T, P>(
- m[0] - s,
- m[1] - s,
- m[2] - s,
- m[3] - s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> operator-(tmat4x3<T, P> const & m1, tmat4x3<T, P> const & m2)
- {
- return tmat4x3<T, P>(
- m1[0] - m2[0],
- m1[1] - m2[1],
- m1[2] - m2[2],
- m1[3] - m2[3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> operator*(tmat4x3<T, P> const & m, T const & s)
- {
- return tmat4x3<T, P>(
- m[0] * s,
- m[1] * s,
- m[2] * s,
- m[3] * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> operator*(T const & s, tmat4x3<T, P> const & m)
- {
- return tmat4x3<T, P>(
- m[0] * s,
- m[1] * s,
- m[2] * s,
- m[3] * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x3<T, P>::col_type operator*
- (
- tmat4x3<T, P> const & m,
- typename tmat4x3<T, P>::row_type const & v)
- {
- return typename tmat4x3<T, P>::col_type(
- m[0][0] * v.x + m[1][0] * v.y + m[2][0] * v.z + m[3][0] * v.w,
- m[0][1] * v.x + m[1][1] * v.y + m[2][1] * v.z + m[3][1] * v.w,
- m[0][2] * v.x + m[1][2] * v.y + m[2][2] * v.z + m[3][2] * v.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x3<T, P>::row_type operator*
- (
- typename tmat4x3<T, P>::col_type const & v,
- tmat4x3<T, P> const & m)
- {
- return typename tmat4x3<T, P>::row_type(
- v.x * m[0][0] + v.y * m[0][1] + v.z * m[0][2],
- v.x * m[1][0] + v.y * m[1][1] + v.z * m[1][2],
- v.x * m[2][0] + v.y * m[2][1] + v.z * m[2][2],
- v.x * m[3][0] + v.y * m[3][1] + v.z * m[3][2]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P> operator*(tmat4x3<T, P> const & m1, tmat2x4<T, P> const & m2)
- {
- return tmat2x3<T, P>(
- m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2] + m1[3][0] * m2[0][3],
- m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1] + m1[2][1] * m2[0][2] + m1[3][1] * m2[0][3],
- m1[0][2] * m2[0][0] + m1[1][2] * m2[0][1] + m1[2][2] * m2[0][2] + m1[3][2] * m2[0][3],
- m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1] + m1[2][0] * m2[1][2] + m1[3][0] * m2[1][3],
- m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1] + m1[2][1] * m2[1][2] + m1[3][1] * m2[1][3],
- m1[0][2] * m2[1][0] + m1[1][2] * m2[1][1] + m1[2][2] * m2[1][2] + m1[3][2] * m2[1][3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> operator*(tmat4x3<T, P> const & m1, tmat3x4<T, P> const & m2)
- {
- T const SrcA00 = m1[0][0];
- T const SrcA01 = m1[0][1];
- T const SrcA02 = m1[0][2];
- T const SrcA10 = m1[1][0];
- T const SrcA11 = m1[1][1];
- T const SrcA12 = m1[1][2];
- T const SrcA20 = m1[2][0];
- T const SrcA21 = m1[2][1];
- T const SrcA22 = m1[2][2];
- T const SrcA30 = m1[3][0];
- T const SrcA31 = m1[3][1];
- T const SrcA32 = m1[3][2];
-
- T const SrcB00 = m2[0][0];
- T const SrcB01 = m2[0][1];
- T const SrcB02 = m2[0][2];
- T const SrcB03 = m2[0][3];
- T const SrcB10 = m2[1][0];
- T const SrcB11 = m2[1][1];
- T const SrcB12 = m2[1][2];
- T const SrcB13 = m2[1][3];
- T const SrcB20 = m2[2][0];
- T const SrcB21 = m2[2][1];
- T const SrcB22 = m2[2][2];
- T const SrcB23 = m2[2][3];
-
- tmat3x3<T, P> Result(uninitialize);
- Result[0][0] = SrcA00 * SrcB00 + SrcA10 * SrcB01 + SrcA20 * SrcB02 + SrcA30 * SrcB03;
- Result[0][1] = SrcA01 * SrcB00 + SrcA11 * SrcB01 + SrcA21 * SrcB02 + SrcA31 * SrcB03;
- Result[0][2] = SrcA02 * SrcB00 + SrcA12 * SrcB01 + SrcA22 * SrcB02 + SrcA32 * SrcB03;
- Result[1][0] = SrcA00 * SrcB10 + SrcA10 * SrcB11 + SrcA20 * SrcB12 + SrcA30 * SrcB13;
- Result[1][1] = SrcA01 * SrcB10 + SrcA11 * SrcB11 + SrcA21 * SrcB12 + SrcA31 * SrcB13;
- Result[1][2] = SrcA02 * SrcB10 + SrcA12 * SrcB11 + SrcA22 * SrcB12 + SrcA32 * SrcB13;
- Result[2][0] = SrcA00 * SrcB20 + SrcA10 * SrcB21 + SrcA20 * SrcB22 + SrcA30 * SrcB23;
- Result[2][1] = SrcA01 * SrcB20 + SrcA11 * SrcB21 + SrcA21 * SrcB22 + SrcA31 * SrcB23;
- Result[2][2] = SrcA02 * SrcB20 + SrcA12 * SrcB21 + SrcA22 * SrcB22 + SrcA32 * SrcB23;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> operator*(tmat4x3<T, P> const & m1, tmat4x4<T, P> const & m2)
- {
- return tmat4x3<T, P>(
- m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2] + m1[3][0] * m2[0][3],
- m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1] + m1[2][1] * m2[0][2] + m1[3][1] * m2[0][3],
- m1[0][2] * m2[0][0] + m1[1][2] * m2[0][1] + m1[2][2] * m2[0][2] + m1[3][2] * m2[0][3],
- m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1] + m1[2][0] * m2[1][2] + m1[3][0] * m2[1][3],
- m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1] + m1[2][1] * m2[1][2] + m1[3][1] * m2[1][3],
- m1[0][2] * m2[1][0] + m1[1][2] * m2[1][1] + m1[2][2] * m2[1][2] + m1[3][2] * m2[1][3],
- m1[0][0] * m2[2][0] + m1[1][0] * m2[2][1] + m1[2][0] * m2[2][2] + m1[3][0] * m2[2][3],
- m1[0][1] * m2[2][0] + m1[1][1] * m2[2][1] + m1[2][1] * m2[2][2] + m1[3][1] * m2[2][3],
- m1[0][2] * m2[2][0] + m1[1][2] * m2[2][1] + m1[2][2] * m2[2][2] + m1[3][2] * m2[2][3],
- m1[0][0] * m2[3][0] + m1[1][0] * m2[3][1] + m1[2][0] * m2[3][2] + m1[3][0] * m2[3][3],
- m1[0][1] * m2[3][0] + m1[1][1] * m2[3][1] + m1[2][1] * m2[3][2] + m1[3][1] * m2[3][3],
- m1[0][2] * m2[3][0] + m1[1][2] * m2[3][1] + m1[2][2] * m2[3][2] + m1[3][2] * m2[3][3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> operator/(tmat4x3<T, P> const & m, T const & s)
- {
- return tmat4x3<T, P>(
- m[0] / s,
- m[1] / s,
- m[2] / s,
- m[3] / s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> operator/(T const & s, tmat4x3<T, P> const & m)
- {
- return tmat4x3<T, P>(
- s / m[0],
- s / m[1],
- s / m[2],
- s / m[3]);
- }
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> const operator-(tmat4x3<T, P> const & m)
- {
- return tmat4x3<T, P>(
- -m[0],
- -m[1],
- -m[2],
- -m[3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> const operator++(tmat4x3<T, P> const & m, int)
- {
- return tmat4x3<T, P>(
- m[0] + T(1),
- m[1] + T(1),
- m[2] + T(1),
- m[3] + T(1));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> const operator--(tmat4x3<T, P> const & m, int)
- {
- return tmat4x3<T, P>(
- m[0] - T(1),
- m[1] - T(1),
- m[2] - T(1),
- m[3] - T(1));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> tmat4x3<T, P>::operator++(int)
- {
- tmat4x3<T, P> Result(*this);
- ++*this;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> tmat4x3<T, P>::operator--(int)
- {
- tmat4x3<T, P> Result(*this);
- --*this;
- return Result;
- }
-
- //////////////////////////////////////
- // Boolean operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator==(tmat4x3<T, P> const & m1, tmat4x3<T, P> const & m2)
- {
- return (m1[0] == m2[0]) && (m1[1] == m2[1]) && (m1[2] == m2[2]) && (m1[3] == m2[3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator!=(tmat4x3<T, P> const & m1, tmat4x3<T, P> const & m2)
- {
- return (m1[0] != m2[0]) || (m1[1] != m2[1]) || (m1[2] != m2[2]) || (m1[3] != m2[3]);
- }
-} //namespace glm
diff --git a/inc/glm/detail/type_mat4x4.hpp b/inc/glm/detail/type_mat4x4.hpp deleted file mode 100644 index 9a60148..0000000 --- a/inc/glm/detail/type_mat4x4.hpp +++ /dev/null @@ -1,235 +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 core
-/// @file glm/detail/type_mat4x4.hpp
-/// @date 2005-01-27 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "../fwd.hpp"
-#include "type_vec4.hpp"
-#include "type_mat.hpp"
-#include <limits>
-#include <cstddef>
-
-namespace glm
-{
- template <typename T, precision P = defaultp>
- struct tmat4x4
- {
- typedef tvec4<T, P> col_type;
- typedef tvec4<T, P> row_type;
- typedef tmat4x4<T, P> type;
- typedef tmat4x4<T, P> transpose_type;
- typedef T value_type;
-
- template <typename U, precision Q>
- friend tvec4<U, Q> operator/(tmat4x4<U, Q> const & m, tvec4<U, Q> const & v);
- template <typename U, precision Q>
- friend tvec4<U, Q> operator/(tvec4<U, Q> const & v, tmat4x4<U, Q> const & m);
-
- private:
- /// @cond DETAIL
- col_type value[4];
- /// @endcond
-
- public:
- // Constructors
- GLM_FUNC_DECL tmat4x4();
- GLM_FUNC_DECL tmat4x4(tmat4x4<T, P> const & m);
- template <precision Q>
- GLM_FUNC_DECL tmat4x4(tmat4x4<T, Q> const & m);
-
- GLM_FUNC_DECL explicit tmat4x4(ctor);
- GLM_FUNC_DECL explicit tmat4x4(T const & x);
- GLM_FUNC_DECL tmat4x4(
- T const & x0, T const & y0, T const & z0, T const & w0,
- T const & x1, T const & y1, T const & z1, T const & w1,
- T const & x2, T const & y2, T const & z2, T const & w2,
- T const & x3, T const & y3, T const & z3, T const & w3);
- GLM_FUNC_DECL tmat4x4(
- col_type const & v0,
- col_type const & v1,
- col_type const & v2,
- col_type const & v3);
-
- //////////////////////////////////////
- // Conversions
-
- template <
- typename X1, typename Y1, typename Z1, typename W1,
- typename X2, typename Y2, typename Z2, typename W2,
- typename X3, typename Y3, typename Z3, typename W3,
- typename X4, typename Y4, typename Z4, typename W4>
- GLM_FUNC_DECL tmat4x4(
- X1 const & x1, Y1 const & y1, Z1 const & z1, W1 const & w1,
- X2 const & x2, Y2 const & y2, Z2 const & z2, W2 const & w2,
- X3 const & x3, Y3 const & y3, Z3 const & z3, W3 const & w3,
- X4 const & x4, Y4 const & y4, Z4 const & z4, W4 const & w4);
-
- template <typename V1, typename V2, typename V3, typename V4>
- GLM_FUNC_DECL tmat4x4(
- tvec4<V1, P> const & v1,
- tvec4<V2, P> const & v2,
- tvec4<V3, P> const & v3,
- tvec4<V4, P> const & v4);
-
- //////////////////////////////////////
- // Matrix conversions
-
-# ifdef GLM_FORCE_EXPLICIT_CTOR
- template <typename U, precision Q>
- GLM_FUNC_DECL explicit tmat4x4(tmat4x4<U, Q> const & m);
-# else
- template <typename U, precision Q>
- GLM_FUNC_DECL tmat4x4(tmat4x4<U, Q> const & m);
-# endif
-
- GLM_FUNC_DECL explicit tmat4x4(tmat2x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x4(tmat3x3<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x4(tmat2x3<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x4(tmat3x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x4(tmat2x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x4(tmat4x2<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x4(tmat3x4<T, P> const & x);
- GLM_FUNC_DECL explicit tmat4x4(tmat4x3<T, P> const & x);
-
- //////////////////////////////////////
- // Accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- typedef size_t size_type;
- GLM_FUNC_DECL GLM_CONSTEXPR size_t size() const;
-
- GLM_FUNC_DECL col_type & operator[](size_type i);
- GLM_FUNC_DECL col_type const & operator[](size_type i) const;
-# else
- typedef length_t length_type;
- GLM_FUNC_DECL GLM_CONSTEXPR length_type length() const;
-
- GLM_FUNC_DECL col_type & operator[](length_type i);
- GLM_FUNC_DECL col_type const & operator[](length_type i) const;
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////
- // Unary arithmetic operators
-
- GLM_FUNC_DECL tmat4x4<T, P> & operator=(tmat4x4<T, P> const & m);
-
- template <typename U>
- GLM_FUNC_DECL tmat4x4<T, P> & operator=(tmat4x4<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat4x4<T, P> & operator+=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat4x4<T, P> & operator+=(tmat4x4<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat4x4<T, P> & operator-=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat4x4<T, P> & operator-=(tmat4x4<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat4x4<T, P> & operator*=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat4x4<T, P> & operator*=(tmat4x4<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tmat4x4<T, P> & operator/=(U s);
- template <typename U>
- GLM_FUNC_DECL tmat4x4<T, P> & operator/=(tmat4x4<U, P> const & m);
-
- //////////////////////////////////////
- // Increment and decrement operators
-
- GLM_FUNC_DECL tmat4x4<T, P> & operator++();
- GLM_FUNC_DECL tmat4x4<T, P> & operator--();
- GLM_FUNC_DECL tmat4x4<T, P> operator++(int);
- GLM_FUNC_DECL tmat4x4<T, P> operator--(int);
- };
-
- // Binary operators
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> operator+(tmat4x4<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> operator+(T const & s, tmat4x4<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> operator+(tmat4x4<T, P> const & m1, tmat4x4<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> operator-(tmat4x4<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> operator-(T const & s, tmat4x4<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> operator-(tmat4x4<T, P> const & m1, tmat4x4<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> operator*(tmat4x4<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> operator*(T const & s, tmat4x4<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat4x4<T, P>::col_type operator*(tmat4x4<T, P> const & m, typename tmat4x4<T, P>::row_type const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat4x4<T, P>::row_type operator*(typename tmat4x4<T, P>::col_type const & v, tmat4x4<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x4<T, P> operator*(tmat4x4<T, P> const & m1, tmat2x4<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x4<T, P> operator*(tmat4x4<T, P> const & m1, tmat3x4<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> operator*(tmat4x4<T, P> const & m1, tmat4x4<T, P> const & m2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> operator/(tmat4x4<T, P> const & m, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> operator/(T const & s, tmat4x4<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat4x4<T, P>::col_type operator/(tmat4x4<T, P> const & m, typename tmat4x4<T, P>::row_type const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL typename tmat4x4<T, P>::row_type operator/(typename tmat4x4<T, P>::col_type & v, tmat4x4<T, P> const & m);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> operator/(tmat4x4<T, P> const & m1, tmat4x4<T, P> const & m2);
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> const operator-(tmat4x4<T, P> const & m);
-}//namespace glm
-
-#ifndef GLM_EXTERNAL_TEMPLATE
-#include "type_mat4x4.inl"
-#endif//GLM_EXTERNAL_TEMPLATE
diff --git a/inc/glm/detail/type_mat4x4.inl b/inc/glm/detail/type_mat4x4.inl deleted file mode 100644 index ec9a17c..0000000 --- a/inc/glm/detail/type_mat4x4.inl +++ /dev/null @@ -1,790 +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 core
-/// @file glm/detail/type_mat4x4.inl
-/// @date 2005-01-27 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm{
-namespace detail
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> compute_inverse(tmat4x4<T, P> const & m)
- {
- T Coef00 = m[2][2] * m[3][3] - m[3][2] * m[2][3];
- T Coef02 = m[1][2] * m[3][3] - m[3][2] * m[1][3];
- T Coef03 = m[1][2] * m[2][3] - m[2][2] * m[1][3];
-
- T Coef04 = m[2][1] * m[3][3] - m[3][1] * m[2][3];
- T Coef06 = m[1][1] * m[3][3] - m[3][1] * m[1][3];
- T Coef07 = m[1][1] * m[2][3] - m[2][1] * m[1][3];
-
- T Coef08 = m[2][1] * m[3][2] - m[3][1] * m[2][2];
- T Coef10 = m[1][1] * m[3][2] - m[3][1] * m[1][2];
- T Coef11 = m[1][1] * m[2][2] - m[2][1] * m[1][2];
-
- T Coef12 = m[2][0] * m[3][3] - m[3][0] * m[2][3];
- T Coef14 = m[1][0] * m[3][3] - m[3][0] * m[1][3];
- T Coef15 = m[1][0] * m[2][3] - m[2][0] * m[1][3];
-
- T Coef16 = m[2][0] * m[3][2] - m[3][0] * m[2][2];
- T Coef18 = m[1][0] * m[3][2] - m[3][0] * m[1][2];
- T Coef19 = m[1][0] * m[2][2] - m[2][0] * m[1][2];
-
- T Coef20 = m[2][0] * m[3][1] - m[3][0] * m[2][1];
- T Coef22 = m[1][0] * m[3][1] - m[3][0] * m[1][1];
- T Coef23 = m[1][0] * m[2][1] - m[2][0] * m[1][1];
-
- tvec4<T, P> Fac0(Coef00, Coef00, Coef02, Coef03);
- tvec4<T, P> Fac1(Coef04, Coef04, Coef06, Coef07);
- tvec4<T, P> Fac2(Coef08, Coef08, Coef10, Coef11);
- tvec4<T, P> Fac3(Coef12, Coef12, Coef14, Coef15);
- tvec4<T, P> Fac4(Coef16, Coef16, Coef18, Coef19);
- tvec4<T, P> Fac5(Coef20, Coef20, Coef22, Coef23);
-
- tvec4<T, P> Vec0(m[1][0], m[0][0], m[0][0], m[0][0]);
- tvec4<T, P> Vec1(m[1][1], m[0][1], m[0][1], m[0][1]);
- tvec4<T, P> Vec2(m[1][2], m[0][2], m[0][2], m[0][2]);
- tvec4<T, P> Vec3(m[1][3], m[0][3], m[0][3], m[0][3]);
-
- tvec4<T, P> Inv0(Vec1 * Fac0 - Vec2 * Fac1 + Vec3 * Fac2);
- tvec4<T, P> Inv1(Vec0 * Fac0 - Vec2 * Fac3 + Vec3 * Fac4);
- tvec4<T, P> Inv2(Vec0 * Fac1 - Vec1 * Fac3 + Vec3 * Fac5);
- tvec4<T, P> Inv3(Vec0 * Fac2 - Vec1 * Fac4 + Vec2 * Fac5);
-
- tvec4<T, P> SignA(+1, -1, +1, -1);
- tvec4<T, P> SignB(-1, +1, -1, +1);
- tmat4x4<T, P> Inverse(Inv0 * SignA, Inv1 * SignB, Inv2 * SignA, Inv3 * SignB);
-
- tvec4<T, P> Row0(Inverse[0][0], Inverse[1][0], Inverse[2][0], Inverse[3][0]);
-
- tvec4<T, P> Dot0(m[0] * Row0);
- T Dot1 = (Dot0.x + Dot0.y) + (Dot0.z + Dot0.w);
-
- T OneOverDeterminant = static_cast<T>(1) / Dot1;
-
- return Inverse * OneOverDeterminant;
- }
-}//namespace detail
-
- //////////////////////////////////////////////////////////////
- // Constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4()
- {
-# ifndef GLM_FORCE_NO_CTOR_INIT
- this->value[0] = col_type(1, 0, 0, 0);
- this->value[1] = col_type(0, 1, 0, 0);
- this->value[2] = col_type(0, 0, 1, 0);
- this->value[3] = col_type(0, 0, 0, 1);
-# endif
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(tmat4x4<T, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- this->value[2] = m[2];
- this->value[3] = m[3];
- }
-
- template <typename T, precision P>
- template <precision Q>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(tmat4x4<T, Q> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- this->value[2] = m[2];
- this->value[3] = m[3];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(ctor)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(T const & s)
- {
- this->value[0] = col_type(s, 0, 0, 0);
- this->value[1] = col_type(0, s, 0, 0);
- this->value[2] = col_type(0, 0, s, 0);
- this->value[3] = col_type(0, 0, 0, s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4
- (
- T const & x0, T const & y0, T const & z0, T const & w0,
- T const & x1, T const & y1, T const & z1, T const & w1,
- T const & x2, T const & y2, T const & z2, T const & w2,
- T const & x3, T const & y3, T const & z3, T const & w3
- )
- {
- this->value[0] = col_type(x0, y0, z0, w0);
- this->value[1] = col_type(x1, y1, z1, w1);
- this->value[2] = col_type(x2, y2, z2, w2);
- this->value[3] = col_type(x3, y3, z3, w3);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4
- (
- col_type const & v0,
- col_type const & v1,
- col_type const & v2,
- col_type const & v3
- )
- {
- this->value[0] = v0;
- this->value[1] = v1;
- this->value[2] = v2;
- this->value[3] = v3;
- }
-
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4
- (
- tmat4x4<U, Q> const & m
- )
- {
- this->value[0] = col_type(m[0]);
- this->value[1] = col_type(m[1]);
- this->value[2] = col_type(m[2]);
- this->value[3] = col_type(m[3]);
- }
-
- //////////////////////////////////////
- // Conversion constructors
- template <typename T, precision P>
- template <
- typename X1, typename Y1, typename Z1, typename W1,
- typename X2, typename Y2, typename Z2, typename W2,
- typename X3, typename Y3, typename Z3, typename W3,
- typename X4, typename Y4, typename Z4, typename W4>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4
- (
- X1 const & x1, Y1 const & y1, Z1 const & z1, W1 const & w1,
- X2 const & x2, Y2 const & y2, Z2 const & z2, W2 const & w2,
- X3 const & x3, Y3 const & y3, Z3 const & z3, W3 const & w3,
- X4 const & x4, Y4 const & y4, Z4 const & z4, W4 const & w4
- )
- {
- GLM_STATIC_ASSERT(std::numeric_limits<X1>::is_iec559 || std::numeric_limits<X1>::is_integer, "*mat4x4 constructor only takes float and integer types, 1st parameter type invalid.");
- GLM_STATIC_ASSERT(std::numeric_limits<Y1>::is_iec559 || std::numeric_limits<Y1>::is_integer, "*mat4x4 constructor only takes float and integer types, 2nd parameter type invalid.");
- GLM_STATIC_ASSERT(std::numeric_limits<Z1>::is_iec559 || std::numeric_limits<Z1>::is_integer, "*mat4x4 constructor only takes float and integer types, 3rd parameter type invalid.");
- GLM_STATIC_ASSERT(std::numeric_limits<W1>::is_iec559 || std::numeric_limits<W1>::is_integer, "*mat4x4 constructor only takes float and integer types, 4th parameter type invalid.");
-
- GLM_STATIC_ASSERT(std::numeric_limits<X2>::is_iec559 || std::numeric_limits<X2>::is_integer, "*mat4x4 constructor only takes float and integer types, 5th parameter type invalid.");
- GLM_STATIC_ASSERT(std::numeric_limits<Y2>::is_iec559 || std::numeric_limits<Y2>::is_integer, "*mat4x4 constructor only takes float and integer types, 6th parameter type invalid.");
- GLM_STATIC_ASSERT(std::numeric_limits<Z2>::is_iec559 || std::numeric_limits<Z2>::is_integer, "*mat4x4 constructor only takes float and integer types, 7th parameter type invalid.");
- GLM_STATIC_ASSERT(std::numeric_limits<W2>::is_iec559 || std::numeric_limits<W2>::is_integer, "*mat4x4 constructor only takes float and integer types, 8th parameter type invalid.");
-
- GLM_STATIC_ASSERT(std::numeric_limits<X3>::is_iec559 || std::numeric_limits<X3>::is_integer, "*mat4x4 constructor only takes float and integer types, 9th parameter type invalid.");
- GLM_STATIC_ASSERT(std::numeric_limits<Y3>::is_iec559 || std::numeric_limits<Y3>::is_integer, "*mat4x4 constructor only takes float and integer types, 10th parameter type invalid.");
- GLM_STATIC_ASSERT(std::numeric_limits<Z3>::is_iec559 || std::numeric_limits<Z3>::is_integer, "*mat4x4 constructor only takes float and integer types, 11th parameter type invalid.");
- GLM_STATIC_ASSERT(std::numeric_limits<W3>::is_iec559 || std::numeric_limits<W3>::is_integer, "*mat4x4 constructor only takes float and integer types, 12th parameter type invalid.");
-
- GLM_STATIC_ASSERT(std::numeric_limits<X4>::is_iec559 || std::numeric_limits<X4>::is_integer, "*mat4x4 constructor only takes float and integer types, 13th parameter type invalid.");
- GLM_STATIC_ASSERT(std::numeric_limits<Y4>::is_iec559 || std::numeric_limits<Y4>::is_integer, "*mat4x4 constructor only takes float and integer types, 14th parameter type invalid.");
- GLM_STATIC_ASSERT(std::numeric_limits<Z4>::is_iec559 || std::numeric_limits<Z4>::is_integer, "*mat4x4 constructor only takes float and integer types, 15th parameter type invalid.");
- GLM_STATIC_ASSERT(std::numeric_limits<W4>::is_iec559 || std::numeric_limits<W4>::is_integer, "*mat4x4 constructor only takes float and integer types, 16th parameter type invalid.");
-
- this->value[0] = col_type(static_cast<T>(x1), value_type(y1), value_type(z1), value_type(w1));
- this->value[1] = col_type(static_cast<T>(x2), value_type(y2), value_type(z2), value_type(w2));
- this->value[2] = col_type(static_cast<T>(x3), value_type(y3), value_type(z3), value_type(w3));
- this->value[3] = col_type(static_cast<T>(x4), value_type(y4), value_type(z4), value_type(w4));
- }
-
- template <typename T, precision P>
- template <typename V1, typename V2, typename V3, typename V4>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4
- (
- tvec4<V1, P> const & v1,
- tvec4<V2, P> const & v2,
- tvec4<V3, P> const & v3,
- tvec4<V4, P> const & v4
- )
- {
- GLM_STATIC_ASSERT(std::numeric_limits<V1>::is_iec559 || std::numeric_limits<V1>::is_integer, "*mat4x4 constructor only takes float and integer types, 1st parameter type invalid.");
- GLM_STATIC_ASSERT(std::numeric_limits<V2>::is_iec559 || std::numeric_limits<V2>::is_integer, "*mat4x4 constructor only takes float and integer types, 2nd parameter type invalid.");
- GLM_STATIC_ASSERT(std::numeric_limits<V3>::is_iec559 || std::numeric_limits<V3>::is_integer, "*mat4x4 constructor only takes float and integer types, 3rd parameter type invalid.");
- GLM_STATIC_ASSERT(std::numeric_limits<V4>::is_iec559 || std::numeric_limits<V4>::is_integer, "*mat4x4 constructor only takes float and integer types, 4th parameter type invalid.");
-
- this->value[0] = col_type(v1);
- this->value[1] = col_type(v2);
- this->value[2] = col_type(v3);
- this->value[3] = col_type(v4);
- }
-
- //////////////////////////////////////
- // Matrix convertion constructors
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(tmat2x2<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0, 0);
- this->value[1] = col_type(m[1], 0, 0);
- this->value[2] = col_type(0);
- this->value[3] = col_type(0, 0, 0, 1);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(tmat3x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0);
- this->value[1] = col_type(m[1], 0);
- this->value[2] = col_type(m[2], 0);
- this->value[3] = col_type(0, 0, 0, 1);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(tmat2x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0);
- this->value[1] = col_type(m[1], 0);
- this->value[2] = col_type(0);
- this->value[3] = col_type(0, 0, 0, 1);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(tmat3x2<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0, 0);
- this->value[1] = col_type(m[1], 0, 0);
- this->value[2] = col_type(m[2], 0, 0);
- this->value[3] = col_type(0, 0, 0, 1);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(tmat2x4<T, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- this->value[2] = col_type(0);
- this->value[3] = col_type(0, 0, 0, 1);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(tmat4x2<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0, 0);
- this->value[1] = col_type(m[1], 0, 0);
- this->value[2] = col_type(0);
- this->value[3] = col_type(0, 0, 0, 1);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(tmat3x4<T, P> const & m)
- {
- this->value[0] = m[0];
- this->value[1] = m[1];
- this->value[2] = m[2];
- this->value[3] = col_type(0, 0, 0, 1);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(tmat4x3<T, P> const & m)
- {
- this->value[0] = col_type(m[0], 0);
- this->value[1] = col_type(m[1], 0);
- this->value[2] = col_type(m[2], 0);
- this->value[3] = col_type(m[3], 1);
- }
-
- //////////////////////////////////////
- // Accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tmat4x4<T, P>::size_type tmat4x4<T, P>::size() const
- {
- return 4;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x4<T, P>::col_type & tmat4x4<T, P>::operator[](typename tmat4x4<T, P>::size_type i)
- {
- assert(i < this->size());
- return this->value[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x4<T, P>::col_type const & tmat4x4<T, P>::operator[](typename tmat4x4<T, P>::size_type i) const
- {
- assert(i < this->size());
- return this->value[i];
- }
-# else
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tmat4x4<T, P>::length_type tmat4x4<T, P>::length() const
- {
- return 4;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x4<T, P>::col_type & tmat4x4<T, P>::operator[](typename tmat4x4<T, P>::length_type i)
- {
- assert(i < this->length());
- return this->value[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x4<T, P>::col_type const & tmat4x4<T, P>::operator[](typename tmat4x4<T, P>::length_type i) const
- {
- assert(i < this->length());
- return this->value[i];
- }
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////////////////////////////
- // Operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>& tmat4x4<T, P>::operator=(tmat4x4<T, P> const & m)
- {
- //memcpy could be faster
- //memcpy(&this->value, &m.value, 16 * sizeof(valType));
- this->value[0] = m[0];
- this->value[1] = m[1];
- this->value[2] = m[2];
- this->value[3] = m[3];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>& tmat4x4<T, P>::operator=(tmat4x4<U, P> const & m)
- {
- //memcpy could be faster
- //memcpy(&this->value, &m.value, 16 * sizeof(valType));
- this->value[0] = m[0];
- this->value[1] = m[1];
- this->value[2] = m[2];
- this->value[3] = m[3];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>& tmat4x4<T, P>::operator+=(U s)
- {
- this->value[0] += s;
- this->value[1] += s;
- this->value[2] += s;
- this->value[3] += s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>& tmat4x4<T, P>::operator+=(tmat4x4<U, P> const & m)
- {
- this->value[0] += m[0];
- this->value[1] += m[1];
- this->value[2] += m[2];
- this->value[3] += m[3];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> & tmat4x4<T, P>::operator-=(U s)
- {
- this->value[0] -= s;
- this->value[1] -= s;
- this->value[2] -= s;
- this->value[3] -= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> & tmat4x4<T, P>::operator-=(tmat4x4<U, P> const & m)
- {
- this->value[0] -= m[0];
- this->value[1] -= m[1];
- this->value[2] -= m[2];
- this->value[3] -= m[3];
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> & tmat4x4<T, P>::operator*=(U s)
- {
- this->value[0] *= s;
- this->value[1] *= s;
- this->value[2] *= s;
- this->value[3] *= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> & tmat4x4<T, P>::operator*=(tmat4x4<U, P> const & m)
- {
- return (*this = *this * m);
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> & tmat4x4<T, P>::operator/=(U s)
- {
- this->value[0] /= s;
- this->value[1] /= s;
- this->value[2] /= s;
- this->value[3] /= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> & tmat4x4<T, P>::operator/=(tmat4x4<U, P> const & m)
- {
- return (*this = *this * detail::compute_inverse<T, P>(m));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> & tmat4x4<T, P>::operator++()
- {
- ++this->value[0];
- ++this->value[1];
- ++this->value[2];
- ++this->value[3];
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> & tmat4x4<T, P>::operator--()
- {
- --this->value[0];
- --this->value[1];
- --this->value[2];
- --this->value[3];
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> tmat4x4<T, P>::operator++(int)
- {
- tmat4x4<T, P> Result(*this);
- ++*this;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> tmat4x4<T, P>::operator--(int)
- {
- tmat4x4<T, P> Result(*this);
- --*this;
- return Result;
- }
-
- // Binary operators
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator+(tmat4x4<T, P> const & m, T const & s)
- {
- return tmat4x4<T, P>(
- m[0] + s,
- m[1] + s,
- m[2] + s,
- m[3] + s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator+(T const & s, tmat4x4<T, P> const & m)
- {
- return tmat4x4<T, P>(
- m[0] + s,
- m[1] + s,
- m[2] + s,
- m[3] + s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator+(tmat4x4<T, P> const & m1, tmat4x4<T, P> const & m2)
- {
- return tmat4x4<T, P>(
- m1[0] + m2[0],
- m1[1] + m2[1],
- m1[2] + m2[2],
- m1[3] + m2[3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator-(tmat4x4<T, P> const & m, T const & s)
- {
- return tmat4x4<T, P>(
- m[0] - s,
- m[1] - s,
- m[2] - s,
- m[3] - s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator-(T const & s, tmat4x4<T, P> const & m)
- {
- return tmat4x4<T, P>(
- s - m[0],
- s - m[1],
- s - m[2],
- s - m[3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator-(tmat4x4<T, P> const & m1, tmat4x4<T, P> const & m2)
- {
- return tmat4x4<T, P>(
- m1[0] - m2[0],
- m1[1] - m2[1],
- m1[2] - m2[2],
- m1[3] - m2[3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator*(tmat4x4<T, P> const & m, T const & s)
- {
- return tmat4x4<T, P>(
- m[0] * s,
- m[1] * s,
- m[2] * s,
- m[3] * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator*(T const & s, tmat4x4<T, P> const & m)
- {
- return tmat4x4<T, P>(
- m[0] * s,
- m[1] * s,
- m[2] * s,
- m[3] * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x4<T, P>::col_type operator*
- (
- tmat4x4<T, P> const & m,
- typename tmat4x4<T, P>::row_type const & v
- )
- {
-/*
- __m128 v0 = _mm_shuffle_ps(v.data, v.data, _MM_SHUFFLE(0, 0, 0, 0));
- __m128 v1 = _mm_shuffle_ps(v.data, v.data, _MM_SHUFFLE(1, 1, 1, 1));
- __m128 v2 = _mm_shuffle_ps(v.data, v.data, _MM_SHUFFLE(2, 2, 2, 2));
- __m128 v3 = _mm_shuffle_ps(v.data, v.data, _MM_SHUFFLE(3, 3, 3, 3));
-
- __m128 m0 = _mm_mul_ps(m[0].data, v0);
- __m128 m1 = _mm_mul_ps(m[1].data, v1);
- __m128 a0 = _mm_add_ps(m0, m1);
-
- __m128 m2 = _mm_mul_ps(m[2].data, v2);
- __m128 m3 = _mm_mul_ps(m[3].data, v3);
- __m128 a1 = _mm_add_ps(m2, m3);
-
- __m128 a2 = _mm_add_ps(a0, a1);
-
- return typename tmat4x4<T, P>::col_type(a2);
-*/
-
- typename tmat4x4<T, P>::col_type const Mov0(v[0]);
- typename tmat4x4<T, P>::col_type const Mov1(v[1]);
- typename tmat4x4<T, P>::col_type const Mul0 = m[0] * Mov0;
- typename tmat4x4<T, P>::col_type const Mul1 = m[1] * Mov1;
- typename tmat4x4<T, P>::col_type const Add0 = Mul0 + Mul1;
- typename tmat4x4<T, P>::col_type const Mov2(v[2]);
- typename tmat4x4<T, P>::col_type const Mov3(v[3]);
- typename tmat4x4<T, P>::col_type const Mul2 = m[2] * Mov2;
- typename tmat4x4<T, P>::col_type const Mul3 = m[3] * Mov3;
- typename tmat4x4<T, P>::col_type const Add1 = Mul2 + Mul3;
- typename tmat4x4<T, P>::col_type const Add2 = Add0 + Add1;
- return Add2;
-
-/*
- return typename tmat4x4<T, P>::col_type(
- m[0][0] * v[0] + m[1][0] * v[1] + m[2][0] * v[2] + m[3][0] * v[3],
- m[0][1] * v[0] + m[1][1] * v[1] + m[2][1] * v[2] + m[3][1] * v[3],
- m[0][2] * v[0] + m[1][2] * v[1] + m[2][2] * v[2] + m[3][2] * v[3],
- m[0][3] * v[0] + m[1][3] * v[1] + m[2][3] * v[2] + m[3][3] * v[3]);
-*/
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x4<T, P>::row_type operator*
- (
- typename tmat4x4<T, P>::col_type const & v,
- tmat4x4<T, P> const & m
- )
- {
- return typename tmat4x4<T, P>::row_type(
- m[0][0] * v[0] + m[0][1] * v[1] + m[0][2] * v[2] + m[0][3] * v[3],
- m[1][0] * v[0] + m[1][1] * v[1] + m[1][2] * v[2] + m[1][3] * v[3],
- m[2][0] * v[0] + m[2][1] * v[1] + m[2][2] * v[2] + m[2][3] * v[3],
- m[3][0] * v[0] + m[3][1] * v[1] + m[3][2] * v[2] + m[3][3] * v[3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P> operator*(tmat4x4<T, P> const & m1, tmat2x4<T, P> const & m2)
- {
- return tmat2x4<T, P>(
- m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2] + m1[3][0] * m2[0][3],
- m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1] + m1[2][1] * m2[0][2] + m1[3][1] * m2[0][3],
- m1[0][2] * m2[0][0] + m1[1][2] * m2[0][1] + m1[2][2] * m2[0][2] + m1[3][2] * m2[0][3],
- m1[0][3] * m2[0][0] + m1[1][3] * m2[0][1] + m1[2][3] * m2[0][2] + m1[3][3] * m2[0][3],
- m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1] + m1[2][0] * m2[1][2] + m1[3][0] * m2[1][3],
- m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1] + m1[2][1] * m2[1][2] + m1[3][1] * m2[1][3],
- m1[0][2] * m2[1][0] + m1[1][2] * m2[1][1] + m1[2][2] * m2[1][2] + m1[3][2] * m2[1][3],
- m1[0][3] * m2[1][0] + m1[1][3] * m2[1][1] + m1[2][3] * m2[1][2] + m1[3][3] * m2[1][3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P> operator*(tmat4x4<T, P> const & m1, tmat3x4<T, P> const & m2)
- {
- return tmat3x4<T, P>(
- m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2] + m1[3][0] * m2[0][3],
- m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1] + m1[2][1] * m2[0][2] + m1[3][1] * m2[0][3],
- m1[0][2] * m2[0][0] + m1[1][2] * m2[0][1] + m1[2][2] * m2[0][2] + m1[3][2] * m2[0][3],
- m1[0][3] * m2[0][0] + m1[1][3] * m2[0][1] + m1[2][3] * m2[0][2] + m1[3][3] * m2[0][3],
- m1[0][0] * m2[1][0] + m1[1][0] * m2[1][1] + m1[2][0] * m2[1][2] + m1[3][0] * m2[1][3],
- m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1] + m1[2][1] * m2[1][2] + m1[3][1] * m2[1][3],
- m1[0][2] * m2[1][0] + m1[1][2] * m2[1][1] + m1[2][2] * m2[1][2] + m1[3][2] * m2[1][3],
- m1[0][3] * m2[1][0] + m1[1][3] * m2[1][1] + m1[2][3] * m2[1][2] + m1[3][3] * m2[1][3],
- m1[0][0] * m2[2][0] + m1[1][0] * m2[2][1] + m1[2][0] * m2[2][2] + m1[3][0] * m2[2][3],
- m1[0][1] * m2[2][0] + m1[1][1] * m2[2][1] + m1[2][1] * m2[2][2] + m1[3][1] * m2[2][3],
- m1[0][2] * m2[2][0] + m1[1][2] * m2[2][1] + m1[2][2] * m2[2][2] + m1[3][2] * m2[2][3],
- m1[0][3] * m2[2][0] + m1[1][3] * m2[2][1] + m1[2][3] * m2[2][2] + m1[3][3] * m2[2][3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator*(tmat4x4<T, P> const & m1, tmat4x4<T, P> const & m2)
- {
- typename tmat4x4<T, P>::col_type const SrcA0 = m1[0];
- typename tmat4x4<T, P>::col_type const SrcA1 = m1[1];
- typename tmat4x4<T, P>::col_type const SrcA2 = m1[2];
- typename tmat4x4<T, P>::col_type const SrcA3 = m1[3];
-
- typename tmat4x4<T, P>::col_type const SrcB0 = m2[0];
- typename tmat4x4<T, P>::col_type const SrcB1 = m2[1];
- typename tmat4x4<T, P>::col_type const SrcB2 = m2[2];
- typename tmat4x4<T, P>::col_type const SrcB3 = m2[3];
-
- tmat4x4<T, P> Result(uninitialize);
- Result[0] = SrcA0 * SrcB0[0] + SrcA1 * SrcB0[1] + SrcA2 * SrcB0[2] + SrcA3 * SrcB0[3];
- Result[1] = SrcA0 * SrcB1[0] + SrcA1 * SrcB1[1] + SrcA2 * SrcB1[2] + SrcA3 * SrcB1[3];
- Result[2] = SrcA0 * SrcB2[0] + SrcA1 * SrcB2[1] + SrcA2 * SrcB2[2] + SrcA3 * SrcB2[3];
- Result[3] = SrcA0 * SrcB3[0] + SrcA1 * SrcB3[1] + SrcA2 * SrcB3[2] + SrcA3 * SrcB3[3];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator/(tmat4x4<T, P> const & m, T const & s)
- {
- return tmat4x4<T, P>(
- m[0] / s,
- m[1] / s,
- m[2] / s,
- m[3] / s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator/(T const & s, tmat4x4<T, P> const & m)
- {
- return tmat4x4<T, P>(
- s / m[0],
- s / m[1],
- s / m[2],
- s / m[3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x4<T, P>::col_type operator/(tmat4x4<T, P> const & m, typename tmat4x4<T, P>::row_type const & v)
- {
- return detail::compute_inverse<T, P>(m) * v;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x4<T, P>::row_type operator/(typename tmat4x4<T, P>::col_type const & v, tmat4x4<T, P> const & m)
- {
- return v * detail::compute_inverse<T, P>(m);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator/(tmat4x4<T, P> const & m1, tmat4x4<T, P> const & m2)
- {
- tmat4x4<T, P> m1_copy(m1);
- return m1_copy /= m2;
- }
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> const operator-(tmat4x4<T, P> const & m)
- {
- return tmat4x4<T, P>(
- -m[0],
- -m[1],
- -m[2],
- -m[3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> const operator++(tmat4x4<T, P> const & m, int)
- {
- return tmat4x4<T, P>(
- m[0] + static_cast<T>(1),
- m[1] + static_cast<T>(1),
- m[2] + static_cast<T>(1),
- m[3] + static_cast<T>(1));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> const operator--(tmat4x4<T, P> const & m, int)
- {
- return tmat4x4<T, P>(
- m[0] - static_cast<T>(1),
- m[1] - static_cast<T>(1),
- m[2] - static_cast<T>(1),
- m[3] - static_cast<T>(1));
- }
-
- //////////////////////////////////////
- // Boolean operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator==(tmat4x4<T, P> const & m1, tmat4x4<T, P> const & m2)
- {
- return (m1[0] == m2[0]) && (m1[1] == m2[1]) && (m1[2] == m2[2]) && (m1[3] == m2[3]);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator!=(tmat4x4<T, P> const & m1, tmat4x4<T, P> const & m2)
- {
- return (m1[0] != m2[0]) || (m1[1] != m2[1]) || (m1[2] != m2[2]) || (m1[3] != m2[3]);
- }
-}//namespace glm
diff --git a/inc/glm/detail/type_vec.hpp b/inc/glm/detail/type_vec.hpp deleted file mode 100644 index 8e50ce3..0000000 --- a/inc/glm/detail/type_vec.hpp +++ /dev/null @@ -1,518 +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 core
-/// @file glm/detail/type_vec.hpp
-/// @date 2010-01-26 / 2014-10-05
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "precision.hpp"
-#include "type_int.hpp"
-
-namespace glm
-{
- template <typename T, precision P> struct tvec1;
- template <typename T, precision P> struct tvec2;
- template <typename T, precision P> struct tvec3;
- template <typename T, precision P> struct tvec4;
-
- typedef tvec1<float, highp> highp_vec1_t;
- typedef tvec1<float, mediump> mediump_vec1_t;
- typedef tvec1<float, lowp> lowp_vec1_t;
- typedef tvec1<double, highp> highp_dvec1_t;
- typedef tvec1<double, mediump> mediump_dvec1_t;
- typedef tvec1<double, lowp> lowp_dvec1_t;
- typedef tvec1<int, highp> highp_ivec1_t;
- typedef tvec1<int, mediump> mediump_ivec1_t;
- typedef tvec1<int, lowp> lowp_ivec1_t;
- typedef tvec1<uint, highp> highp_uvec1_t;
- typedef tvec1<uint, mediump> mediump_uvec1_t;
- typedef tvec1<uint, lowp> lowp_uvec1_t;
- typedef tvec1<bool, highp> highp_bvec1_t;
- typedef tvec1<bool, mediump> mediump_bvec1_t;
- typedef tvec1<bool, lowp> lowp_bvec1_t;
-
- /// @addtogroup core_precision
- /// @{
-
- /// 2 components vector of high single-precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec2<float, highp> highp_vec2;
-
- /// 2 components vector of medium single-precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec2<float, mediump> mediump_vec2;
-
- /// 2 components vector of low single-precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec2<float, lowp> lowp_vec2;
-
- /// 2 components vector of high double-precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec2<double, highp> highp_dvec2;
-
- /// 2 components vector of medium double-precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec2<double, mediump> mediump_dvec2;
-
- /// 2 components vector of low double-precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec2<double, lowp> lowp_dvec2;
-
- /// 2 components vector of high precision signed integer numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec2<int, highp> highp_ivec2;
-
- /// 2 components vector of medium precision signed integer numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec2<int, mediump> mediump_ivec2;
-
- /// 2 components vector of low precision signed integer numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec2<int, lowp> lowp_ivec2;
-
- /// 2 components vector of high precision unsigned integer numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec2<uint, highp> highp_uvec2;
-
- /// 2 components vector of medium precision unsigned integer numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec2<uint, mediump> mediump_uvec2;
-
- /// 2 components vector of low precision unsigned integer numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec2<uint, lowp> lowp_uvec2;
-
- /// 2 components vector of high precision bool numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec2<bool, highp> highp_bvec2;
-
- /// 2 components vector of medium precision bool numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec2<bool, mediump> mediump_bvec2;
-
- /// 2 components vector of low precision bool numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec2<bool, lowp> lowp_bvec2;
-
- /// @}
-
-
- /// @addtogroup core_precision
- /// @{
-
- /// 3 components vector of high single-precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec3<float, highp> highp_vec3;
-
- /// 3 components vector of medium single-precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec3<float, mediump> mediump_vec3;
-
- /// 3 components vector of low single-precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec3<float, lowp> lowp_vec3;
-
- /// 3 components vector of high double-precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec3<double, highp> highp_dvec3;
-
- /// 3 components vector of medium double-precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec3<double, mediump> mediump_dvec3;
-
- /// 3 components vector of low double-precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec3<double, lowp> lowp_dvec3;
-
- /// 3 components vector of high precision signed integer numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec3<int, highp> highp_ivec3;
-
- /// 3 components vector of medium precision signed integer numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec3<int, mediump> mediump_ivec3;
-
- /// 3 components vector of low precision signed integer numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec3<int, lowp> lowp_ivec3;
-
- /// 3 components vector of high precision unsigned integer numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec3<uint, highp> highp_uvec3;
-
- /// 3 components vector of medium precision unsigned integer numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec3<uint, mediump> mediump_uvec3;
-
- /// 3 components vector of low precision unsigned integer numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec3<uint, lowp> lowp_uvec3;
-
- /// 3 components vector of high precision bool numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec3<bool, highp> highp_bvec3;
-
- /// 3 components vector of medium precision bool numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec3<bool, mediump> mediump_bvec3;
-
- /// 3 components vector of low precision bool numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec3<bool, lowp> lowp_bvec3;
-
- /// @}
-
- /// @addtogroup core_precision
- /// @{
-
- /// 4 components vector of high single-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec4<float, highp> highp_vec4;
-
- /// 4 components vector of medium single-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec4<float, mediump> mediump_vec4;
-
- /// 4 components vector of low single-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec4<float, lowp> lowp_vec4;
-
- /// 4 components vector of high double-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec4<double, highp> highp_dvec4;
-
- /// 4 components vector of medium double-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec4<double, mediump> mediump_dvec4;
-
- /// 4 components vector of low double-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec4<double, lowp> lowp_dvec4;
-
- /// 4 components vector of high precision signed integer numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec4<int, highp> highp_ivec4;
-
- /// 4 components vector of medium precision signed integer numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec4<int, mediump> mediump_ivec4;
-
- /// 4 components vector of low precision signed integer numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec4<int, lowp> lowp_ivec4;
-
- /// 4 components vector of high precision unsigned integer numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec4<uint, highp> highp_uvec4;
-
- /// 4 components vector of medium precision unsigned integer numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec4<uint, mediump> mediump_uvec4;
-
- /// 4 components vector of low precision unsigned integer numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec4<uint, lowp> lowp_uvec4;
-
- /// 4 components vector of high precision bool numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec4<bool, highp> highp_bvec4;
-
- /// 4 components vector of medium precision bool numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec4<bool, mediump> mediump_bvec4;
-
- /// 4 components vector of low precision bool numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tvec4<bool, lowp> lowp_bvec4;
-
- /// @}
-
- /// @addtogroup core_types
- /// @{
-
- //////////////////////////
- // Default float definition
-
-#if(defined(GLM_PRECISION_LOWP_FLOAT))
- typedef lowp_vec2 vec2;
- typedef lowp_vec3 vec3;
- typedef lowp_vec4 vec4;
-#elif(defined(GLM_PRECISION_MEDIUMP_FLOAT))
- typedef mediump_vec2 vec2;
- typedef mediump_vec3 vec3;
- typedef mediump_vec4 vec4;
-#else //defined(GLM_PRECISION_HIGHP_FLOAT)
- /// 2 components vector of floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- typedef highp_vec2 vec2;
-
- //! 3 components vector of floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- typedef highp_vec3 vec3;
-
- //! 4 components vector of floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- typedef highp_vec4 vec4;
-#endif//GLM_PRECISION
-
- //////////////////////////
- // Default double definition
-
-#if(defined(GLM_PRECISION_LOWP_DOUBLE))
- typedef lowp_dvec2 dvec2;
- typedef lowp_dvec3 dvec3;
- typedef lowp_dvec4 dvec4;
-#elif(defined(GLM_PRECISION_MEDIUMP_DOUBLE))
- typedef mediump_dvec2 dvec2;
- typedef mediump_dvec3 dvec3;
- typedef mediump_dvec4 dvec4;
-#else //defined(GLM_PRECISION_HIGHP_DOUBLE)
- /// 2 components vector of double-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- typedef highp_dvec2 dvec2;
-
- //! 3 components vector of double-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- typedef highp_dvec3 dvec3;
-
- //! 4 components vector of double-precision floating-point numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- typedef highp_dvec4 dvec4;
-#endif//GLM_PRECISION
-
- //////////////////////////
- // Signed integer definition
-
-#if(defined(GLM_PRECISION_LOWP_INT))
- typedef lowp_ivec2 ivec2;
- typedef lowp_ivec3 ivec3;
- typedef lowp_ivec4 ivec4;
-#elif(defined(GLM_PRECISION_MEDIUMP_INT))
- typedef mediump_ivec2 ivec2;
- typedef mediump_ivec3 ivec3;
- typedef mediump_ivec4 ivec4;
-#else //defined(GLM_PRECISION_HIGHP_INT)
- //! 2 components vector of signed integer numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- typedef highp_ivec2 ivec2;
-
- //! 3 components vector of signed integer numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- typedef highp_ivec3 ivec3;
-
- //! 4 components vector of signed integer numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- typedef highp_ivec4 ivec4;
-#endif//GLM_PRECISION
-
- //////////////////////////
- // Unsigned integer definition
-
-#if(defined(GLM_PRECISION_LOWP_UINT))
- typedef lowp_uvec2 uvec2;
- typedef lowp_uvec3 uvec3;
- typedef lowp_uvec4 uvec4;
-#elif(defined(GLM_PRECISION_MEDIUMP_UINT))
- typedef mediump_uvec2 uvec2;
- typedef mediump_uvec3 uvec3;
- typedef mediump_uvec4 uvec4;
-#else //defined(GLM_PRECISION_HIGHP_UINT)
- /// 2 components vector of unsigned integer numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- typedef highp_uvec2 uvec2;
-
- /// 3 components vector of unsigned integer numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- typedef highp_uvec3 uvec3;
-
- /// 4 components vector of unsigned integer numbers.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- typedef highp_uvec4 uvec4;
-#endif//GLM_PRECISION
-
- //////////////////////////
- // Boolean definition
-
-#if(defined(GLM_PRECISION_LOWP_BOOL))
- typedef lowp_bvec2 bvec2;
- typedef lowp_bvec3 bvec3;
- typedef lowp_bvec4 bvec4;
-#elif(defined(GLM_PRECISION_MEDIUMP_BOOL))
- typedef mediump_bvec2 bvec2;
- typedef mediump_bvec3 bvec3;
- typedef mediump_bvec4 bvec4;
-#else //defined(GLM_PRECISION_HIGHP_BOOL)
- //! 2 components vector of boolean.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- typedef highp_bvec2 bvec2;
-
- //! 3 components vector of boolean.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- typedef highp_bvec3 bvec3;
-
- //! 4 components vector of boolean.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.5 Vectors</a>
- typedef highp_bvec4 bvec4;
-#endif//GLM_PRECISION
-
- /// @}
-}//namespace glm
diff --git a/inc/glm/detail/type_vec.inl b/inc/glm/detail/type_vec.inl deleted file mode 100644 index bc03472..0000000 --- a/inc/glm/detail/type_vec.inl +++ /dev/null @@ -1,31 +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 core
-/// @file glm/detail/type_vec.inl
-/// @date 2011-06-15 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
diff --git a/inc/glm/detail/type_vec1.hpp b/inc/glm/detail/type_vec1.hpp deleted file mode 100644 index 4a59b3d..0000000 --- a/inc/glm/detail/type_vec1.hpp +++ /dev/null @@ -1,322 +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 core
-/// @file glm/detail/type_vec1.hpp
-/// @date 2008-08-25 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "../fwd.hpp"
-#include "type_vec.hpp"
-#ifdef GLM_SWIZZLE
-# if GLM_HAS_ANONYMOUS_UNION
-# include "_swizzle.hpp"
-# else
-# include "_swizzle_func.hpp"
-# endif
-#endif //GLM_SWIZZLE
-#include <cstddef>
-
-namespace glm
-{
- template <typename T, precision P = defaultp>
- struct tvec1
- {
- //////////////////////////////////////
- // Implementation detail
-
- typedef tvec1<T, P> type;
- typedef tvec1<bool, P> bool_type;
- typedef T value_type;
-
- //////////////////////////////////////
- // Data
-
-# if GLM_HAS_ANONYMOUS_UNION
- union
- {
- T x;
- T r;
- T s;
-/*
-# ifdef GLM_SWIZZLE
- _GLM_SWIZZLE1_2_MEMBERS(T, P, tvec2, x)
- _GLM_SWIZZLE1_2_MEMBERS(T, P, tvec2, r)
- _GLM_SWIZZLE1_2_MEMBERS(T, P, tvec2, s)
- _GLM_SWIZZLE1_3_MEMBERS(T, P, tvec3, x)
- _GLM_SWIZZLE1_3_MEMBERS(T, P, tvec3, r)
- _GLM_SWIZZLE1_3_MEMBERS(T, P, tvec3, s)
- _GLM_SWIZZLE1_4_MEMBERS(T, P, tvec4, x)
- _GLM_SWIZZLE1_4_MEMBERS(T, P, tvec4, r)
- _GLM_SWIZZLE1_4_MEMBERS(T, P, tvec4, s)
-# endif//GLM_SWIZZLE*/
- };
-# else
- union {T x, r, s;};
-/*
-# ifdef GLM_SWIZZLE
- GLM_SWIZZLE_GEN_VEC_FROM_VEC1(T, P, tvec2, tvec2, tvec3, tvec4)
-# endif//GLM_SWIZZLE*/
-# endif
-
- //////////////////////////////////////
- // Accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- /// Return the count of components of the vector
- typedef size_t size_type;
- 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
- /// Return the count of components of the vector
- typedef length_t length_type;
- 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 tvec1();
- GLM_FUNC_DECL tvec1(tvec1<T, P> const & v);
- template <precision Q>
- GLM_FUNC_DECL tvec1(tvec1<T, Q> const & v);
-
- //////////////////////////////////////
- // Explicit basic constructors
-
- GLM_FUNC_DECL explicit tvec1(ctor);
- GLM_FUNC_DECL explicit tvec1(T const & s);
-
- //////////////////////////////////////
- // Conversion vector constructors
-
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename U, precision Q>
- GLM_FUNC_DECL explicit tvec1(tvec2<U, Q> const & v);
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename U, precision Q>
- GLM_FUNC_DECL explicit tvec1(tvec3<U, Q> const & v);
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename U, precision Q>
- GLM_FUNC_DECL explicit tvec1(tvec4<U, Q> const & v);
-
-# ifdef GLM_FORCE_EXPLICIT_CTOR
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename U, precision Q>
- GLM_FUNC_DECL explicit tvec1(tvec1<U, Q> const & v);
-# else
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename U, precision Q>
- GLM_FUNC_DECL tvec1(tvec1<U, Q> const & v);
-# endif
-
- //////////////////////////////////////
- // Swizzle constructors
-
-# if(GLM_HAS_ANONYMOUS_UNION && defined(GLM_SWIZZLE))
- template <int E0>
- GLM_FUNC_DECL tvec1(detail::_swizzle<1, T, P, tvec1<T, P>, E0, -1,-2,-3> const & that)
- {
- *this = that();
- }
-# endif//(GLM_HAS_ANONYMOUS_UNION && defined(GLM_SWIZZLE))
-
- //////////////////////////////////////
- // Unary arithmetic operators
-
- GLM_FUNC_DECL tvec1<T, P> & operator=(tvec1<T, P> const & v);
-
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator+=(U const & s);
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator+=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator-=(U const & s);
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator-=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator*=(U const & s);
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator*=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator/=(U const & s);
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator/=(tvec1<U, P> const & v);
-
- //////////////////////////////////////
- // Increment and decrement operators
-
- GLM_FUNC_DECL tvec1<T, P> & operator++();
- GLM_FUNC_DECL tvec1<T, P> & operator--();
- GLM_FUNC_DECL tvec1<T, P> operator++(int);
- GLM_FUNC_DECL tvec1<T, P> operator--(int);
-
- //////////////////////////////////////
- // Unary bit operators
-
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator%=(U const & s);
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator%=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator&=(U const & s);
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator&=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator|=(U const & s);
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator|=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator^=(U const & s);
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator^=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator<<=(U const & s);
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator<<=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator>>=(U const & s);
- template <typename U>
- GLM_FUNC_DECL tvec1<T, P> & operator>>=(tvec1<U, P> const & v);
- };
-
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator+(tvec1<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator+(T const & s, tvec1<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator+(tvec1<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator-(tvec1<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator-(T const & s, tvec1<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator- (tvec1<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator*(tvec1<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator*(T const & s, tvec1<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator*(tvec1<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator/(tvec1<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator/(T const & s, tvec1<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator/(tvec1<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator-(tvec1<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL bool operator==(tvec1<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL bool operator!=(tvec1<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator%(tvec1<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator%(T const & s, tvec1<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator%(tvec1<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator&(tvec1<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator&(T const & s, tvec1<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator&(tvec1<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator|(tvec1<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator|(T const & s, tvec1<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator|(tvec1<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator^(tvec1<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator^(T const & s, tvec1<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator^(tvec1<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator<<(tvec1<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator<<(T const & s, tvec1<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator<<(tvec1<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator>>(tvec1<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator>>(T const & s, tvec1<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator>>(tvec1<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec1<T, P> operator~(tvec1<T, P> const & v);
-}//namespace glm
-
-#ifndef GLM_EXTERNAL_TEMPLATE
-#include "type_vec1.inl"
-#endif//GLM_EXTERNAL_TEMPLATE
diff --git a/inc/glm/detail/type_vec1.inl b/inc/glm/detail/type_vec1.inl deleted file mode 100644 index 15a44e7..0000000 --- a/inc/glm/detail/type_vec1.inl +++ /dev/null @@ -1,616 +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 core
-/// @file glm/detail/type_vec1.inl
-/// @date 2008-08-25 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- //////////////////////////////////////
- // Implicit basic constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P>::tvec1()
-# ifndef GLM_FORCE_NO_CTOR_INIT
- : x(0)
-# endif
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P>::tvec1(tvec1<T, P> const & v)
- : x(v.x)
- {}
-
- template <typename T, precision P>
- template <precision Q>
- GLM_FUNC_QUALIFIER tvec1<T, P>::tvec1(tvec1<T, Q> const & v)
- : x(v.x)
- {}
-
- //////////////////////////////////////
- // Explicit basic constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P>::tvec1(ctor)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P>::tvec1(T const & s)
- : x(s)
- {}
-
- //////////////////////////////////////
- // Conversion vector constructors
-
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tvec1<T, P>::tvec1(tvec1<U, Q> const & v)
- : x(static_cast<T>(v.x))
- {}
-
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tvec1<T, P>::tvec1(tvec2<U, Q> const & v)
- : x(static_cast<T>(v.x))
- {}
-
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tvec1<T, P>::tvec1(tvec3<U, Q> const & v)
- : x(static_cast<T>(v.x))
- {}
-
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tvec1<T, P>::tvec1(tvec4<U, Q> const & v)
- : x(static_cast<T>(v.x))
- {}
-
- //////////////////////////////////////
- // Component accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tvec1<T, P>::size_type tvec1<T, P>::size() const
- {
- return 1;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T & tvec1<T, P>::operator[](typename tvec1<T, P>::size_type i)
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&x)[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T const & tvec1<T, P>::operator[](typename tvec1<T, P>::size_type i) const
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&x)[i];
- }
-# else
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tvec1<T, P>::length_type tvec1<T, P>::length() const
- {
- return 1;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T & tvec1<T, P>::operator[](typename tvec1<T, P>::length_type i)
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&x)[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T const & tvec1<T, P>::operator[](typename tvec1<T, P>::length_type i) const
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&x)[i];
- }
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////
- // Unary arithmetic operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator=(tvec1<T, P> const & v)
- {
- this->x = v.x;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator=(tvec1<U, P> const & v)
- {
- this->x = static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator+=(U const & s)
- {
- this->x += static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator+=(tvec1<U, P> const & v)
- {
- this->x += static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator-=(U const & s)
- {
- this->x -= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator-=(tvec1<U, P> const & v)
- {
- this->x -= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator*=(U const & s)
- {
- this->x *= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator*=(tvec1<U, P> const & v)
- {
- this->x *= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator/=(U const & s)
- {
- this->x /= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator/=(tvec1<U, P> const & v)
- {
- this->x /= static_cast<T>(v.x);
- return *this;
- }
-
- //////////////////////////////////////
- // Increment and decrement operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator++()
- {
- ++this->x;
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator--()
- {
- --this->x;
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> tvec1<T, P>::operator++(int)
- {
- tvec1<T, P> Result(*this);
- ++*this;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> tvec1<T, P>::operator--(int)
- {
- tvec1<T, P> Result(*this);
- --*this;
- return Result;
- }
-
- //////////////////////////////////////
- // Boolean operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator==(tvec1<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return (v1.x == v2.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator!=(tvec1<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return (v1.x != v2.x);
- }
-
- //////////////////////////////////////
- // Unary bit operators
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator%=(U const & s)
- {
- this->x %= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator%=(tvec1<U, P> const & v)
- {
- this->x %= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator&=(U const & s)
- {
- this->x &= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator&=(tvec1<U, P> const & v)
- {
- this->x &= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator|=(U const & s)
- {
- this->x |= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator|=(tvec1<U, P> const & v)
- {
- this->x |= U(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator^=(U const & s)
- {
- this->x ^= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator^=(tvec1<U, P> const & v)
- {
- this->x ^= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator<<=(U const & s)
- {
- this->x <<= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator<<=(tvec1<U, P> const & v)
- {
- this->x <<= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator>>=(U const & s)
- {
- this->x >>= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator>>=(tvec1<U, P> const & v)
- {
- this->x >>= static_cast<T>(v.x);
- return *this;
- }
-
- //////////////////////////////////////
- // Binary arithmetic operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator+(tvec1<T, P> const & v, T const & s)
- {
- return tvec1<T, P>(
- v.x + s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator+(T const & s, tvec1<T, P> const & v)
- {
- return tvec1<T, P>(
- s + v.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator+(tvec1<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return tvec1<T, P>(
- v1.x + v2.x);
- }
-
- //operator-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator-(tvec1<T, P> const & v, T const & s)
- {
- return tvec1<T, P>(
- v.x - s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator-(T const & s, tvec1<T, P> const & v)
- {
- return tvec1<T, P>(
- s - v.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator-(tvec1<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return tvec1<T, P>(
- v1.x - v2.x);
- }
-
- //operator*
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator*(tvec1<T, P> const & v, T const & s)
- {
- return tvec1<T, P>(
- v.x * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator*(T const & s, tvec1<T, P> const & v)
- {
- return tvec1<T, P>(
- s * v.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator*(tvec1<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return tvec1<T, P>(
- v1.x * v2.x);
- }
-
- //operator/
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator/(tvec1<T, P> const & v, T const & s)
- {
- return tvec1<T, P>(
- v.x / s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator/(T const & s, tvec1<T, P> const & v)
- {
- return tvec1<T, P>(
- s / v.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator/(tvec1<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return tvec1<T, P>(
- v1.x / v2.x);
- }
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator-(tvec1<T, P> const & v)
- {
- return tvec1<T, P>(
- -v.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator++(tvec1<T, P> const & v, int)
- {
- return tvec1<T, P>(
- v.x + T(1));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator--(tvec1<T, P> const & v, int)
- {
- return tvec1<T, P>(
- v.x - T(1));
- }
-
- //////////////////////////////////////
- // Binary bit operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator%(tvec1<T, P> const & v, T const & s)
- {
- return tvec1<T, P>(
- v.x % s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator%(T const & s, tvec1<T, P> const & v)
- {
- return tvec1<T, P>(
- s % v.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator%(tvec1<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return tvec1<T, P>(
- v1.x % v2.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator&(tvec1<T, P> const & v, T const & s)
- {
- return tvec1<T, P>(
- v.x & s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator&(T const & s, tvec1<T, P> const & v)
- {
- return tvec1<T, P>(
- s & v.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator&(tvec1<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return tvec1<T, P>(
- v1.x & v2.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator|(tvec1<T, P> const & v, T const & s)
- {
- return tvec1<T, P>(
- v.x | s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator|(T const & s, tvec1<T, P> const & v)
- {
- return tvec1<T, P>(
- s | v.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator|(tvec1<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return tvec1<T, P>(
- v1.x | v2.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator^(tvec1<T, P> const & v, T const & s)
- {
- return tvec1<T, P>(
- v.x ^ s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator^(T const & s, tvec1<T, P> const & v)
- {
- return tvec1<T, P>(
- s ^ v.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator^(tvec1<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return tvec1<T, P>(
- v1.x ^ v2.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator<<(tvec1<T, P> const & v, T const & s)
- {
- return tvec1<T, P>(
- v.x << s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator<<(T const & s, tvec1<T, P> const & v)
- {
- return tvec1<T, P>(
- s << v.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator<<(tvec1<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return tvec1<T, P>(
- v1.x << v2.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator>>(tvec1<T, P> const & v, T const & s)
- {
- return tvec1<T, P>(
- v.x >> s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator>>(T const & s, tvec1<T, P> const & v)
- {
- return tvec1<T, P>(
- s >> v.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator>>(tvec1<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return tvec1<T, P>(
- v1.x >> v2.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec1<T, P> operator~(tvec1<T, P> const & v)
- {
- return tvec1<T, P>(
- ~v.x);
- }
-}//namespace glm
diff --git a/inc/glm/detail/type_vec2.hpp b/inc/glm/detail/type_vec2.hpp deleted file mode 100644 index 9b1553b..0000000 --- a/inc/glm/detail/type_vec2.hpp +++ /dev/null @@ -1,403 +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 core
-/// @file glm/detail/type_vec2.hpp
-/// @date 2008-08-18 / 2013-08-27
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-//#include "../fwd.hpp"
-#include "type_vec.hpp"
-#ifdef GLM_SWIZZLE
-# if GLM_HAS_ANONYMOUS_UNION
-# include "_swizzle.hpp"
-# else
-# include "_swizzle_func.hpp"
-# endif
-#endif //GLM_SWIZZLE
-#include <cstddef>
-
-namespace glm
-{
- template <typename T, precision P = defaultp>
- struct tvec2
- {
- //////////////////////////////////////
- // Implementation detail
-
- typedef tvec2<T, P> type;
- typedef tvec2<bool, P> bool_type;
- typedef T value_type;
-
- //////////////////////////////////////
- // Data
-
-# if GLM_HAS_ANONYMOUS_UNION
- union
- {
- struct{ T x, y; };
- struct{ T r, g; };
- struct{ T s, t; };
-
-# ifdef GLM_SWIZZLE
- _GLM_SWIZZLE2_2_MEMBERS(T, P, tvec2, x, y)
- _GLM_SWIZZLE2_2_MEMBERS(T, P, tvec2, r, g)
- _GLM_SWIZZLE2_2_MEMBERS(T, P, tvec2, s, t)
- _GLM_SWIZZLE2_3_MEMBERS(T, P, tvec3, x, y)
- _GLM_SWIZZLE2_3_MEMBERS(T, P, tvec3, r, g)
- _GLM_SWIZZLE2_3_MEMBERS(T, P, tvec3, s, t)
- _GLM_SWIZZLE2_4_MEMBERS(T, P, tvec4, x, y)
- _GLM_SWIZZLE2_4_MEMBERS(T, P, tvec4, r, g)
- _GLM_SWIZZLE2_4_MEMBERS(T, P, tvec4, s, t)
-# endif//GLM_SWIZZLE
- };
-# else
- union {T x, r, s;};
- union {T y, g, t;};
-
-# ifdef GLM_SWIZZLE
- GLM_SWIZZLE_GEN_VEC_FROM_VEC2(T, P, tvec2, tvec2, tvec3, tvec4)
-# endif//GLM_SWIZZLE
-# endif
-
- //////////////////////////////////////
- // Component accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- /// Return the count of components of the vector
- typedef size_t size_type;
- 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
- /// Return the count of components of the vector
- typedef length_t length_type;
- 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 tvec2();
- GLM_FUNC_DECL tvec2(tvec2<T, P> const & v);
- template <precision Q>
- GLM_FUNC_DECL tvec2(tvec2<T, Q> const & v);
-
- //////////////////////////////////////
- // Explicit basic constructors
-
- GLM_FUNC_DECL explicit tvec2(ctor);
- GLM_FUNC_DECL explicit tvec2(T const & s);
- GLM_FUNC_DECL tvec2(T const & s1, T const & s2);
-
- //////////////////////////////////////
- // Conversion constructors
-
- /// Explicit converions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename A, typename B>
- GLM_FUNC_DECL tvec2(A const & x, B const & y);
- template <typename A, typename B>
- GLM_FUNC_DECL tvec2(tvec1<A, P> const & v1, tvec1<B, P> const & v2);
-
- //////////////////////////////////////
- // Conversion vector constructors
-
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename U, precision Q>
- GLM_FUNC_DECL explicit tvec2(tvec3<U, Q> const & v);
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename U, precision Q>
- GLM_FUNC_DECL explicit tvec2(tvec4<U, Q> const & v);
-
-# ifdef GLM_FORCE_EXPLICIT_CTOR
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename U, precision Q>
- GLM_FUNC_DECL explicit tvec2(tvec2<U, Q> const & v);
-# else
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename U, precision Q>
- GLM_FUNC_DECL tvec2(tvec2<U, Q> const & v);
-# endif
-
- //////////////////////////////////////
- // Swizzle constructors
-
-# if GLM_HAS_ANONYMOUS_UNION && defined(GLM_SWIZZLE)
- template <int E0, int E1>
- GLM_FUNC_DECL tvec2(detail::_swizzle<2, T, P, tvec2<T, P>, E0, E1,-1,-2> const & that)
- {
- *this = that();
- }
-# endif// GLM_HAS_ANONYMOUS_UNION && defined(GLM_SWIZZLE)
-
- //////////////////////////////////////
- // Unary arithmetic operators
-
- GLM_FUNC_DECL tvec2<T, P>& operator=(tvec2<T, P> const & v);
-
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P>& operator=(tvec2<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P>& operator+=(U s);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P>& operator+=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P>& operator+=(tvec2<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P>& operator-=(U s);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P>& operator-=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P>& operator-=(tvec2<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P>& operator*=(U s);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P>& operator*=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P>& operator*=(tvec2<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P>& operator/=(U s);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P>& operator/=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P>& operator/=(tvec2<U, P> const & v);
-
- //////////////////////////////////////
- // Increment and decrement operators
-
- GLM_FUNC_DECL tvec2<T, P> & operator++();
- GLM_FUNC_DECL tvec2<T, P> & operator--();
- GLM_FUNC_DECL tvec2<T, P> operator++(int);
- GLM_FUNC_DECL tvec2<T, P> operator--(int);
-
- //////////////////////////////////////
- // Unary bit operators
-
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P> & operator%=(U s);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P> & operator%=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P> & operator%=(tvec2<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P> & operator&=(U s);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P> & operator&=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P> & operator&=(tvec2<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P> & operator|=(U s);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P> & operator|=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P> & operator|=(tvec2<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P> & operator^=(U s);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P> & operator^=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P> & operator^=(tvec2<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P> & operator<<=(U s);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P> & operator<<=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P> & operator<<=(tvec2<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P> & operator>>=(U s);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P> & operator>>=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec2<T, P> & operator>>=(tvec2<U, P> const & v);
- };
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator+(tvec2<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator+(tvec2<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator+(T const & s, tvec2<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator+(tvec1<T, P> const & v1, tvec2<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator+(tvec2<T, P> const & v1, tvec2<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator-(tvec2<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator-(tvec2<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator-(T const & s, tvec2<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator-(tvec1<T, P> const & v1, tvec2<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator-(tvec2<T, P> const & v1, tvec2<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator*(tvec2<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator*(tvec2<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator*(T const & s, tvec2<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator*(tvec1<T, P> const & v1, tvec2<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator*(tvec2<T, P> const & v1, tvec2<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator/(tvec2<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator/(tvec2<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator/(T const & s, tvec2<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator/(tvec1<T, P> const & v1, tvec2<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator/(tvec2<T, P> const & v1, tvec2<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator-(tvec2<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator%(tvec2<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator%(tvec2<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator%(T const & s, tvec2<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator%(tvec1<T, P> const & v1, tvec2<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator%(tvec2<T, P> const & v1, tvec2<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator&(tvec2<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator&(tvec2<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator&(T const & s, tvec2<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator&(tvec1<T, P> const & v1, tvec2<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator&(tvec2<T, P> const & v1, tvec2<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator|(tvec2<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator|(tvec2<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator|(T const & s, tvec2<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator|(tvec1<T, P> const & v1, tvec2<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator|(tvec2<T, P> const & v1, tvec2<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator^(tvec2<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator^(tvec2<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator^(T const & s, tvec2<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator^(tvec1<T, P> const & v1, tvec2<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator^(tvec2<T, P> const & v1, tvec2<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator<<(tvec2<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator<<(tvec2<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator<<(T const & s, tvec2<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator<<(tvec1<T, P> const & v1, tvec2<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator<<(tvec2<T, P> const & v1, tvec2<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator>>(tvec2<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator>>(tvec2<T, P> const & v1, tvec1<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator>>(T const & s, tvec2<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator>>(tvec1<T, P> const & v1, tvec2<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator>>(tvec2<T, P> const & v1, tvec2<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> operator~(tvec2<T, P> const & v);
-}//namespace glm
-
-#ifndef GLM_EXTERNAL_TEMPLATE
-#include "type_vec2.inl"
-#endif//GLM_EXTERNAL_TEMPLATE
diff --git a/inc/glm/detail/type_vec2.inl b/inc/glm/detail/type_vec2.inl deleted file mode 100644 index fa778de..0000000 --- a/inc/glm/detail/type_vec2.inl +++ /dev/null @@ -1,909 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////////
-/// OpenGL Mathematics (glm.g-truc.net)
-///
-/// Copyright (c) 2005 - 2014 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.
-///
-/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-/// THE SOFTWARE.
-///
-/// @ref core
-/// @file glm/core/type_tvec2.inl
-/// @date 2008-08-18 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
-#ifdef GLM_FORCE_SIZE_FUNC
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR size_t tvec2<T, P>::size() const
- {
- return 2;
- }
-#else
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR length_t tvec2<T, P>::length() const
- {
- return 2;
- }
-#endif
-
- //////////////////////////////////////
- // Accesses
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T & tvec2<T, P>::operator[](length_t i)
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&x)[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T const & tvec2<T, P>::operator[](length_t i) const
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&x)[i];
- }
-
- //////////////////////////////////////
- // Implicit basic constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P>::tvec2()
-# ifndef GLM_FORCE_NO_CTOR_INIT
- : x(0), y(0)
-# endif
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P>::tvec2(tvec2<T, P> const & v)
- : x(v.x), y(v.y)
- {}
-
- template <typename T, precision P>
- template <precision Q>
- GLM_FUNC_QUALIFIER tvec2<T, P>::tvec2(tvec2<T, Q> const & v)
- : x(v.x), y(v.y)
- {}
-
- //////////////////////////////////////
- // Explicit basic constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P>::tvec2(ctor)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P>::tvec2(T const & s)
- : x(s), y(s)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P>::tvec2(T const & s1, T const & s2)
- : x(s1), y(s2)
- {}
-
- //////////////////////////////////////
- // Conversion scalar constructors
-
- template <typename T, precision P>
- template <typename A, typename B>
- GLM_FUNC_QUALIFIER tvec2<T, P>::tvec2(A const & a, B const & b)
- : x(static_cast<T>(a))
- , y(static_cast<T>(b))
- {}
-
- template <typename T, precision P>
- template <typename A, typename B>
- GLM_FUNC_QUALIFIER tvec2<T, P>::tvec2(tvec1<A, P> const & a, tvec1<B, P> const & b)
- : x(static_cast<T>(a.x))
- , y(static_cast<T>(b.x))
- {}
-
- //////////////////////////////////////
- // Conversion vector constructors
-
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tvec2<T, P>::tvec2(tvec2<U, Q> const & v)
- : x(static_cast<T>(v.x))
- , y(static_cast<T>(v.y))
- {}
-
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tvec2<T, P>::tvec2(tvec3<U, Q> const & v)
- : x(static_cast<T>(v.x))
- , y(static_cast<T>(v.y))
- {}
-
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tvec2<T, P>::tvec2(tvec4<U, Q> const & v)
- : x(static_cast<T>(v.x))
- , y(static_cast<T>(v.y))
- {}
-
- //////////////////////////////////////
- // Unary arithmetic operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator=(tvec2<T, P> const & v)
- {
- this->x = v.x;
- this->y = v.y;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator=(tvec2<U, P> const & v)
- {
- this->x = static_cast<T>(v.x);
- this->y = static_cast<T>(v.y);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator+=(U s)
- {
- this->x += static_cast<T>(s);
- this->y += static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator+=(tvec1<U, P> const & v)
- {
- this->x += static_cast<T>(v.x);
- this->y += static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator+=(tvec2<U, P> const & v)
- {
- this->x += static_cast<T>(v.x);
- this->y += static_cast<T>(v.y);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator-=(U s)
- {
- this->x -= static_cast<T>(s);
- this->y -= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator-=(tvec1<U, P> const & v)
- {
- this->x -= static_cast<T>(v.x);
- this->y -= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator-=(tvec2<U, P> const & v)
- {
- this->x -= static_cast<T>(v.x);
- this->y -= static_cast<T>(v.y);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator*=(U s)
- {
- this->x *= static_cast<T>(s);
- this->y *= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator*=(tvec1<U, P> const & v)
- {
- this->x *= static_cast<T>(v.x);
- this->y *= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator*=(tvec2<U, P> const & v)
- {
- this->x *= static_cast<T>(v.x);
- this->y *= static_cast<T>(v.y);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator/=(U s)
- {
- this->x /= static_cast<T>(s);
- this->y /= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator/=(tvec1<U, P> const & v)
- {
- this->x /= static_cast<T>(v.x);
- this->y /= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator/=(tvec2<U, P> const & v)
- {
- this->x /= static_cast<T>(v.x);
- this->y /= static_cast<T>(v.y);
- return *this;
- }
-
- //////////////////////////////////////
- // Increment and decrement operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator++()
- {
- ++this->x;
- ++this->y;
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator--()
- {
- --this->x;
- --this->y;
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> tvec2<T, P>::operator++(int)
- {
- tvec2<T, P> Result(*this);
- ++*this;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> tvec2<T, P>::operator--(int)
- {
- tvec2<T, P> Result(*this);
- --*this;
- return Result;
- }
-
- //////////////////////////////////////
- // Boolean operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator==(tvec2<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return (v1.x == v2.x) && (v1.y == v2.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator!=(tvec2<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return (v1.x != v2.x) || (v1.y != v2.y);
- }
-
- //////////////////////////////////////
- // Unary bit operators
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator%=(U s)
- {
- this->x %= static_cast<T>(s);
- this->y %= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator%=(tvec1<U, P> const & v)
- {
- this->x %= static_cast<T>(v.x);
- this->y %= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator%=(tvec2<U, P> const & v)
- {
- this->x %= static_cast<T>(v.x);
- this->y %= static_cast<T>(v.y);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator&=(U s)
- {
- this->x &= static_cast<T>(s);
- this->y &= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator&=(tvec1<U, P> const & v)
- {
- this->x &= static_cast<T>(v.x);
- this->y &= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator&=(tvec2<U, P> const & v)
- {
- this->x &= static_cast<T>(v.x);
- this->y &= static_cast<T>(v.y);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator|=(U s)
- {
- this->x |= static_cast<T>(s);
- this->y |= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator|=(tvec1<U, P> const & v)
- {
- this->x |= static_cast<T>(v.x);
- this->y |= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator|=(tvec2<U, P> const & v)
- {
- this->x |= static_cast<T>(v.x);
- this->y |= static_cast<T>(v.y);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator^=(U s)
- {
- this->x ^= static_cast<T>(s);
- this->y ^= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator^=(tvec1<U, P> const & v)
- {
- this->x ^= static_cast<T>(v.x);
- this->y ^= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator^=(tvec2<U, P> const & v)
- {
- this->x ^= static_cast<T>(v.x);
- this->y ^= static_cast<T>(v.y);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator<<=(U s)
- {
- this->x <<= static_cast<T>(s);
- this->y <<= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator<<=(tvec1<U, P> const & v)
- {
- this->x <<= static_cast<T>(v.x);
- this->y <<= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator<<=(tvec2<U, P> const & v)
- {
- this->x <<= static_cast<T>(v.x);
- this->y <<= static_cast<T>(v.y);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator>>=(U s)
- {
- this->x >>= static_cast<T>(s);
- this->y >>= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator>>=(tvec1<U, P> const & v)
- {
- this->x >>= static_cast<T>(v.x);
- this->y >>= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec2<T, P> & tvec2<T, P>::operator>>=(tvec2<U, P> const & v)
- {
- this->x >>= static_cast<T>(v.x);
- this->y >>= static_cast<T>(v.y);
- return *this;
- }
-
- //////////////////////////////////////
- // Binary arithmetic operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator+(tvec2<T, P> const & v, T const & s)
- {
- return tvec2<T, P>(
- v.x + s,
- v.y + s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator+(tvec2<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x + v2.x,
- v1.y + v2.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator+(T const & s, tvec2<T, P> const & v)
- {
- return tvec2<T, P>(
- s + v.x,
- s + v.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator+(tvec1<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x + v2.x,
- v1.x + v2.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator+(tvec2<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x + v2.x,
- v1.y + v2.y);
- }
-
- //operator-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator-(tvec2<T, P> const & v, T const & s)
- {
- return tvec2<T, P>(
- v.x - s,
- v.y - s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator-(tvec2<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x - v2.x,
- v1.y - v2.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator-(T const & s, tvec2<T, P> const & v)
- {
- return tvec2<T, P>(
- s - v.x,
- s - v.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator-(tvec1<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x - v2.x,
- v1.x - v2.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator-(tvec2<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x - v2.x,
- v1.y - v2.y);
- }
-
- //operator*
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator*(tvec2<T, P> const & v1, T const & v2)
- {
- return tvec2<T, P>(
- v1.x * v2,
- v1.y * v2);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator*(tvec2<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x * v2.x,
- v1.y * v2.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator*(T const & s, tvec2<T, P> const & v)
- {
- return tvec2<T, P>(
- s * v.x,
- s * v.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator*(tvec1<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x * v2.x,
- v1.x * v2.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator*(tvec2<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x * v2.x,
- v1.y * v2.y);
- }
-
- //operator/
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator/(tvec2<T, P> const & v, T const & s)
- {
- return tvec2<T, P>(
- v.x / s,
- v.y / s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator/(tvec2<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x / v2.x,
- v1.y / v2.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator/(T const & s, tvec2<T, P> const & v)
- {
- return tvec2<T, P>(
- s / v.x,
- s / v.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator/(tvec1<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x / v2.x,
- v1.x / v2.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator/(tvec2<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x / v2.x,
- v1.y / v2.y);
- }
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator-(tvec2<T, P> const & v)
- {
- return tvec2<T, P>(
- -v.x,
- -v.y);
- }
-
- //////////////////////////////////////
- // Binary bit operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator%(tvec2<T, P> const & v, T const & s)
- {
- return tvec2<T, P>(
- v.x % s,
- v.y % s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator%(tvec2<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x % v2.x,
- v1.y % v2.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator%(T const & s, tvec2<T, P> const & v)
- {
- return tvec2<T, P>(
- s % v.x,
- s % v.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator%(tvec1<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x % v2.x,
- v1.x % v2.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator%(tvec2<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x % v2.x,
- v1.y % v2.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator&(tvec2<T, P> const & v, T const & s)
- {
- return tvec2<T, P>(
- v.x & s,
- v.y & s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator&(tvec2<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x & v2.x,
- v1.y & v2.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator&(T const & s, tvec2<T, P> const & v)
- {
- return tvec2<T, P>(
- s & v.x,
- s & v.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator&(tvec1<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x & v2.x,
- v1.x & v2.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator&(tvec2<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x & v2.x,
- v1.y & v2.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator|(tvec2<T, P> const & v, T const & s)
- {
- return tvec2<T, P>(
- v.x | s,
- v.y | s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator|(tvec2<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x | v2.x,
- v1.y | v2.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator|(T const & s, tvec2<T, P> const & v)
- {
- return tvec2<T, P>(
- s | v.x,
- s | v.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator|(tvec1<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x | v2.x,
- v1.x | v2.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator|(tvec2<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x | v2.x,
- v1.y | v2.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator^(tvec2<T, P> const & v, T const & s)
- {
- return tvec2<T, P>(
- v.x ^ s,
- v.y ^ s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator^(tvec2<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x ^ v2.x,
- v1.y ^ v2.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator^(T const & s, tvec2<T, P> const & v)
- {
- return tvec2<T, P>(
- s ^ v.x,
- s ^ v.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator^(tvec1<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x ^ v2.x,
- v1.x ^ v2.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator^(tvec2<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x ^ v2.x,
- v1.y ^ v2.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator<<(tvec2<T, P> const & v, T const & s)
- {
- return tvec2<T, P>(
- v.x << s,
- v.y << s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator<<(tvec2<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x << v2.x,
- v1.y << v2.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator<<(T const & s, tvec2<T, P> const & v)
- {
- return tvec2<T, P>(
- s << v.x,
- s << v.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator<<(tvec1<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x << v2.x,
- v1.x << v2.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator<<(tvec2<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x << v2.x,
- v1.y << v2.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator>>(tvec2<T, P> const & v, T const & s)
- {
- return tvec2<T, P>(
- v.x >> s,
- v.y >> s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator>>(tvec2<T, P> const & v1, tvec1<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x >> v2.x,
- v1.y >> v2.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator>>(T const & s, tvec2<T, P> const & v)
- {
- return tvec2<T, P>(
- s >> v.x,
- s >> v.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator>>(tvec1<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x >> v2.x,
- v1.x >> v2.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator>>(tvec2<T, P> const & v1, tvec2<T, P> const & v2)
- {
- return tvec2<T, P>(
- v1.x >> v2.x,
- v1.y >> v2.y);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> operator~(tvec2<T, P> const & v)
- {
- return tvec2<T, P>(
- ~v.x,
- ~v.y);
- }
-}//namespace glm
diff --git a/inc/glm/detail/type_vec3.hpp b/inc/glm/detail/type_vec3.hpp deleted file mode 100644 index e97ea27..0000000 --- a/inc/glm/detail/type_vec3.hpp +++ /dev/null @@ -1,425 +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 core
-/// @file glm/detail/type_vec3.hpp
-/// @date 2008-08-22 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-//#include "../fwd.hpp"
-#include "type_vec.hpp"
-#ifdef GLM_SWIZZLE
-# if GLM_HAS_ANONYMOUS_UNION
-# include "_swizzle.hpp"
-# else
-# include "_swizzle_func.hpp"
-# endif
-#endif //GLM_SWIZZLE
-#include <cstddef>
-
-namespace glm
-{
- template <typename T, precision P = defaultp>
- struct tvec3
- {
- //////////////////////////////////////
- // Implementation detail
-
- typedef tvec3<T, P> type;
- typedef tvec3<bool, P> bool_type;
- typedef T value_type;
-
- //////////////////////////////////////
- // Data
-
-# if GLM_HAS_ANONYMOUS_UNION
- union
- {
- struct{ T x, y, z; };
- struct{ T r, g, b; };
- struct{ T s, t, p; };
-
-# ifdef GLM_SWIZZLE
- _GLM_SWIZZLE3_2_MEMBERS(T, P, tvec2, x, y, z)
- _GLM_SWIZZLE3_2_MEMBERS(T, P, tvec2, r, g, b)
- _GLM_SWIZZLE3_2_MEMBERS(T, P, tvec2, s, t, p)
- _GLM_SWIZZLE3_3_MEMBERS(T, P, tvec3, x, y, z)
- _GLM_SWIZZLE3_3_MEMBERS(T, P, tvec3, r, g, b)
- _GLM_SWIZZLE3_3_MEMBERS(T, P, tvec3, s, t, p)
- _GLM_SWIZZLE3_4_MEMBERS(T, P, tvec4, x, y, z)
- _GLM_SWIZZLE3_4_MEMBERS(T, P, tvec4, r, g, b)
- _GLM_SWIZZLE3_4_MEMBERS(T, P, tvec4, s, t, p)
-# endif//GLM_SWIZZLE
- };
-# else
- union { T x, r, s; };
- union { T y, g, t; };
- union { T z, b, p; };
-
-# ifdef GLM_SWIZZLE
- GLM_SWIZZLE_GEN_VEC_FROM_VEC3(T, P, tvec3, tvec2, tvec3, tvec4)
-# endif//GLM_SWIZZLE
-# endif//GLM_LANG
-
- //////////////////////////////////////
- // Component accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- /// Return the count of components of the vector
- typedef size_t size_type;
- 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
- /// Return the count of components of the vector
- typedef length_t length_type;
- 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 tvec3();
- GLM_FUNC_DECL tvec3(tvec3<T, P> const & v);
- template <precision Q>
- GLM_FUNC_DECL tvec3(tvec3<T, Q> const & v);
-
- //////////////////////////////////////
- // Explicit basic constructors
-
- GLM_FUNC_DECL explicit tvec3(ctor);
- GLM_FUNC_DECL explicit tvec3(T const & s);
- GLM_FUNC_DECL tvec3(T const & a, T const & b, T const & c);
-
- //////////////////////////////////////
- // Conversion scalar constructors
-
- /// Explicit converions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename A, typename B, typename C>
- GLM_FUNC_DECL tvec3(A const & a, B const & b, C const & c);
- template <typename A, typename B, typename C>
- GLM_FUNC_DECL tvec3(tvec1<A, P> const & a, tvec1<B, P> const & b, tvec1<C, P> const & c);
-
- //////////////////////////////////////
- // Conversion vector constructors
-
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename A, typename B, precision Q>
- GLM_FUNC_DECL explicit tvec3(tvec2<A, Q> const & a, B const & b);
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename A, typename B, precision Q>
- GLM_FUNC_DECL explicit tvec3(tvec2<A, Q> const & a, tvec1<B, Q> const & b);
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename A, typename B, precision Q>
- GLM_FUNC_DECL explicit tvec3(A const & a, tvec2<B, Q> const & b);
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename A, typename B, precision Q>
- GLM_FUNC_DECL explicit tvec3(tvec1<A, Q> const & a, tvec2<B, Q> const & b);
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename U, precision Q>
- GLM_FUNC_DECL explicit tvec3(tvec4<U, Q> const & v);
-
-# ifdef GLM_FORCE_EXPLICIT_CTOR
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename U, precision Q>
- GLM_FUNC_DECL explicit tvec3(tvec3<U, Q> const & v);
-# else
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename U, precision Q>
- GLM_FUNC_DECL tvec3(tvec3<U, Q> const & v);
-# endif
-
- //////////////////////////////////////
- // Swizzle constructors
-
-# if GLM_HAS_ANONYMOUS_UNION && defined(GLM_SWIZZLE)
- template <int E0, int E1, int E2>
- GLM_FUNC_DECL tvec3(detail::_swizzle<3, T, P, tvec3<T, P>, E0, E1, E2, -1> const & that)
- {
- *this = that();
- }
-
- template <int E0, int E1>
- GLM_FUNC_DECL tvec3(detail::_swizzle<2, T, P, tvec2<T, P>, E0, E1, -1, -2> const & v, T const & s)
- {
- *this = tvec3<T, P>(v(), s);
- }
-
- template <int E0, int E1>
- GLM_FUNC_DECL tvec3(T const & s, detail::_swizzle<2, T, P, tvec2<T, P>, E0, E1, -1, -2> const & v)
- {
- *this = tvec3<T, P>(s, v());
- }
-# endif// GLM_HAS_ANONYMOUS_UNION && defined(GLM_SWIZZLE)
-
- //////////////////////////////////////
- // Unary arithmetic operators
-
- GLM_FUNC_DECL tvec3<T, P> & operator=(tvec3<T, P> const & v);
-
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator=(tvec3<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator+=(U s);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator+=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator+=(tvec3<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator-=(U s);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator-=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator-=(tvec3<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator*=(U s);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator*=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator*=(tvec3<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator/=(U s);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator/=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator/=(tvec3<U, P> const & v);
-
- //////////////////////////////////////
- // Increment and decrement operators
-
- GLM_FUNC_DECL tvec3<T, P> & operator++();
- GLM_FUNC_DECL tvec3<T, P> & operator--();
- GLM_FUNC_DECL tvec3<T, P> operator++(int);
- GLM_FUNC_DECL tvec3<T, P> operator--(int);
-
- //////////////////////////////////////
- // Unary bit operators
-
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator%=(U s);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator%=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator%=(tvec3<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator&=(U s);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator&=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator&=(tvec3<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator|=(U s);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator|=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator|=(tvec3<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator^=(U s);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator^=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator^=(tvec3<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator<<=(U s);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator<<=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator<<=(tvec3<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator>>=(U s);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator>>=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec3<T, P> & operator>>=(tvec3<U, P> const & v);
- };
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator+(tvec3<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator+(tvec3<T, P> const & v, tvec1<T, P> const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator+(T const & s, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator+(tvec1<T, P> const & s, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator+(tvec3<T, P> const & v1, tvec3<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator-(tvec3<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator-(tvec3<T, P> const & v, tvec1<T, P> const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator-(T const & s, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator-(tvec1<T, P> const & s, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator-(tvec3<T, P> const & v1, tvec3<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator*(tvec3<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator*(tvec3<T, P> const & v, tvec1<T, P> const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator*(T const & s, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator*(tvec1<T, P> const & s, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator*(tvec3<T, P> const & v1, tvec3<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator/(tvec3<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator/(tvec3<T, P> const & v, tvec1<T, P> const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator/(T const & s, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator/(tvec1<T, P> const & s, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator/(tvec3<T, P> const & v1, tvec3<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator-(tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator%(tvec3<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator%(tvec3<T, P> const & v, tvec1<T, P> const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator%(T const & s, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator%(tvec1<T, P> const & s, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator%(tvec3<T, P> const & v1, tvec3<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator&(tvec3<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator&(tvec3<T, P> const & v, tvec1<T, P> const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator&(T const & s, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator&(tvec1<T, P> const & s, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator&(tvec3<T, P> const & v1, tvec3<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator|(tvec3<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator|(tvec3<T, P> const & v, tvec1<T, P> const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator|(T const & s, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator|(tvec1<T, P> const & s, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator|(tvec3<T, P> const & v1, tvec3<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator^(tvec3<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator^(tvec3<T, P> const & v, tvec1<T, P> const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator^(T const & s, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator^(tvec1<T, P> const & s, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator^(tvec3<T, P> const & v1, tvec3<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator<<(tvec3<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator<<(tvec3<T, P> const & v, tvec1<T, P> const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator<<(T const & s, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator<<(tvec1<T, P> const & s, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator<<(tvec3<T, P> const & v1, tvec3<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator>>(tvec3<T, P> const & v, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator>>(tvec3<T, P> const & v, tvec1<T, P> const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator>>(T const & s, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator>>(tvec1<T, P> const & s, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator>>(tvec3<T, P> const & v1, tvec3<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator~(tvec3<T, P> const & v);
-}//namespace glm
-
-#ifndef GLM_EXTERNAL_TEMPLATE
-#include "type_vec3.inl"
-#endif//GLM_EXTERNAL_TEMPLATE
diff --git a/inc/glm/detail/type_vec3.inl b/inc/glm/detail/type_vec3.inl deleted file mode 100644 index 97f6454..0000000 --- a/inc/glm/detail/type_vec3.inl +++ /dev/null @@ -1,1042 +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 core
-/// @file glm/detail/type_tvec3.inl
-/// @date 2008-08-22 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- //////////////////////////////////////
- // Implicit basic constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P>::tvec3()
-# ifndef GLM_FORCE_NO_CTOR_INIT
- : x(0), y(0), z(0)
-# endif
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P>::tvec3(tvec3<T, P> const & v)
- : x(v.x), y(v.y), z(v.z)
- {}
-
- template <typename T, precision P>
- template <precision Q>
- GLM_FUNC_QUALIFIER tvec3<T, P>::tvec3(tvec3<T, Q> const & v)
- : x(v.x), y(v.y), z(v.z)
- {}
-
- //////////////////////////////////////
- // Explicit basic constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P>::tvec3(ctor)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P>::tvec3(T const & s)
- : x(s), y(s), z(s)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P>::tvec3(T const & a, T const & b, T const & c)
- : x(a), y(b), z(c)
- {}
-
- //////////////////////////////////////
- // Conversion scalar constructors
-
- template <typename T, precision P>
- template <typename A, typename B, typename C>
- GLM_FUNC_QUALIFIER tvec3<T, P>::tvec3(A const & a, B const & b, C const & c) :
- x(static_cast<T>(a)),
- y(static_cast<T>(b)),
- z(static_cast<T>(c))
- {}
-
- template <typename T, precision P>
- template <typename A, typename B, typename C>
- GLM_FUNC_QUALIFIER tvec3<T, P>::tvec3(tvec1<A, P> const & a, tvec1<B, P> const & b, tvec1<C, P> const & c) :
- x(static_cast<T>(a)),
- y(static_cast<T>(b)),
- z(static_cast<T>(c))
- {}
-
- //////////////////////////////////////
- // Conversion vector constructors
-
- template <typename T, precision P>
- template <typename A, typename B, precision Q>
- GLM_FUNC_QUALIFIER tvec3<T, P>::tvec3(tvec2<A, Q> const & a, B const & b) :
- x(static_cast<T>(a.x)),
- y(static_cast<T>(a.y)),
- z(static_cast<T>(b))
- {}
-
- template <typename T, precision P>
- template <typename A, typename B, precision Q>
- GLM_FUNC_QUALIFIER tvec3<T, P>::tvec3(tvec2<A, Q> const & a, tvec1<B, Q> const & b) :
- x(static_cast<T>(a.x)),
- y(static_cast<T>(a.y)),
- z(static_cast<T>(b.x))
- {}
-
- template <typename T, precision P>
- template <typename A, typename B, precision Q>
- GLM_FUNC_QUALIFIER tvec3<T, P>::tvec3(A const & a, tvec2<B, Q> const & b) :
- x(static_cast<T>(a)),
- y(static_cast<T>(b.x)),
- z(static_cast<T>(b.y))
- {}
-
- template <typename T, precision P>
- template <typename A, typename B, precision Q>
- GLM_FUNC_QUALIFIER tvec3<T, P>::tvec3(tvec1<A, Q> const & a, tvec2<B, Q> const & b) :
- x(static_cast<T>(a.x)),
- y(static_cast<T>(b.x)),
- z(static_cast<T>(b.y))
- {}
-
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tvec3<T, P>::tvec3(tvec3<U, Q> const & v) :
- x(static_cast<T>(v.x)),
- y(static_cast<T>(v.y)),
- z(static_cast<T>(v.z))
- {}
-
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tvec3<T, P>::tvec3(tvec4<U, Q> const & v) :
- x(static_cast<T>(v.x)),
- y(static_cast<T>(v.y)),
- z(static_cast<T>(v.z))
- {}
-
- //////////////////////////////////////
- // Component accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tvec3<T, P>::size_type tvec3<T, P>::size() const
- {
- return 3;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T & tvec3<T, P>::operator[](typename tvec3<T, P>::size_type i)
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&x)[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T const & tvec3<T, P>::operator[](typename tvec3<T, P>::size_type i) const
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&x)[i];
- }
-# else
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tvec3<T, P>::length_type tvec3<T, P>::length() const
- {
- return 3;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T & tvec3<T, P>::operator[](typename tvec3<T, P>::length_type i)
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&x)[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T const & tvec3<T, P>::operator[](typename tvec3<T, P>::length_type i) const
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&x)[i];
- }
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////
- // Unary arithmetic operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P>& tvec3<T, P>::operator=(tvec3<T, P> const & v)
- {
- this->x = v.x;
- this->y = v.y;
- this->z = v.z;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P>& tvec3<T, P>::operator=(tvec3<U, P> const & v)
- {
- this->x = static_cast<T>(v.x);
- this->y = static_cast<T>(v.y);
- this->z = static_cast<T>(v.z);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator+=(U s)
- {
- this->x += static_cast<T>(s);
- this->y += static_cast<T>(s);
- this->z += static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator+=(tvec1<U, P> const & v)
- {
- this->x += static_cast<T>(v.x);
- this->y += static_cast<T>(v.x);
- this->z += static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator+=(tvec3<U, P> const & v)
- {
- this->x += static_cast<T>(v.x);
- this->y += static_cast<T>(v.y);
- this->z += static_cast<T>(v.z);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator-=(U s)
- {
- this->x -= static_cast<T>(s);
- this->y -= static_cast<T>(s);
- this->z -= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator-=(tvec1<U, P> const & v)
- {
- this->x -= static_cast<T>(v.x);
- this->y -= static_cast<T>(v.x);
- this->z -= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator-=(tvec3<U, P> const & v)
- {
- this->x -= static_cast<T>(v.x);
- this->y -= static_cast<T>(v.y);
- this->z -= static_cast<T>(v.z);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator*=(U s)
- {
- this->x *= static_cast<T>(s);
- this->y *= static_cast<T>(s);
- this->z *= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator*=(tvec1<U, P> const & v)
- {
- this->x *= static_cast<T>(v.x);
- this->y *= static_cast<T>(v.x);
- this->z *= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator*=(tvec3<U, P> const & v)
- {
- this->x *= static_cast<T>(v.x);
- this->y *= static_cast<T>(v.y);
- this->z *= static_cast<T>(v.z);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator/=(U s)
- {
- this->x /= static_cast<T>(s);
- this->y /= static_cast<T>(s);
- this->z /= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator/=(tvec1<U, P> const & v)
- {
- this->x /= static_cast<T>(v.x);
- this->y /= static_cast<T>(v.x);
- this->z /= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator/=(tvec3<U, P> const & v)
- {
- this->x /= static_cast<T>(v.x);
- this->y /= static_cast<T>(v.y);
- this->z /= static_cast<T>(v.z);
- return *this;
- }
-
- //////////////////////////////////////
- // Increment and decrement operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator++()
- {
- ++this->x;
- ++this->y;
- ++this->z;
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator--()
- {
- --this->x;
- --this->y;
- --this->z;
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> tvec3<T, P>::operator++(int)
- {
- tvec3<T, P> Result(*this);
- ++*this;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> tvec3<T, P>::operator--(int)
- {
- tvec3<T, P> Result(*this);
- --*this;
- return Result;
- }
-
- //////////////////////////////////////
- // Unary bit operators
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator%=(U s)
- {
- this->x %= s;
- this->y %= s;
- this->z %= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator%=(tvec1<U, P> const & v)
- {
- this->x %= v.x;
- this->y %= v.x;
- this->z %= v.x;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator%=(tvec3<U, P> const & v)
- {
- this->x %= v.x;
- this->y %= v.y;
- this->z %= v.z;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator&=(U s)
- {
- this->x &= s;
- this->y &= s;
- this->z &= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator&=(tvec1<U, P> const & v)
- {
- this->x &= v.x;
- this->y &= v.x;
- this->z &= v.x;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator&=(tvec3<U, P> const & v)
- {
- this->x &= v.x;
- this->y &= v.y;
- this->z &= v.z;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator|=(U s)
- {
- this->x |= s;
- this->y |= s;
- this->z |= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator|=(tvec1<U, P> const & v)
- {
- this->x |= v.x;
- this->y |= v.x;
- this->z |= v.x;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator|=(tvec3<U, P> const & v)
- {
- this->x |= v.x;
- this->y |= v.y;
- this->z |= v.z;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator^=(U s)
- {
- this->x ^= s;
- this->y ^= s;
- this->z ^= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator^=(tvec1<U, P> const & v)
- {
- this->x ^= v.x;
- this->y ^= v.x;
- this->z ^= v.x;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator^=(tvec3<U, P> const & v)
- {
- this->x ^= v.x;
- this->y ^= v.y;
- this->z ^= v.z;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator<<=(U s)
- {
- this->x <<= s;
- this->y <<= s;
- this->z <<= s;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator<<=(tvec1<U, P> const & v)
- {
- this->x <<= static_cast<T>(v.x);
- this->y <<= static_cast<T>(v.x);
- this->z <<= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator<<=(tvec3<U, P> const & v)
- {
- this->x <<= static_cast<T>(v.x);
- this->y <<= static_cast<T>(v.y);
- this->z <<= static_cast<T>(v.z);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator>>=(U s)
- {
- this->x >>= static_cast<T>(s);
- this->y >>= static_cast<T>(s);
- this->z >>= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator>>=(tvec1<U, P> const & v)
- {
- this->x >>= static_cast<T>(v.x);
- this->y >>= static_cast<T>(v.x);
- this->z >>= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec3<T, P> & tvec3<T, P>::operator>>=(tvec3<U, P> const & v)
- {
- this->x >>= static_cast<T>(v.x);
- this->y >>= static_cast<T>(v.y);
- this->z >>= static_cast<T>(v.z);
- return *this;
- }
-
- //////////////////////////////////////
- // Boolean operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator==(tvec3<T, P> const & v1, tvec3<T, P> const & v2)
- {
- return (v1.x == v2.x) && (v1.y == v2.y) && (v1.z == v2.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator!=(tvec3<T, P> const & v1, tvec3<T, P> const & v2)
- {
- return (v1.x != v2.x) || (v1.y != v2.y) || (v1.z != v2.z);
- }
-
- //////////////////////////////////////
- // Binary arithmetic operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator+(tvec3<T, P> const & v, T const & s)
- {
- return tvec3<T, P>(
- v.x + s,
- v.y + s,
- v.z + s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator+(tvec3<T, P> const & v, tvec1<T, P> const & s)
- {
- return tvec3<T, P>(
- v.x + s.x,
- v.y + s.x,
- v.z + s.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator+(T const & s, tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- s + v.x,
- s + v.y,
- s + v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator+(tvec1<T, P> const & s, tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- s.x + v.x,
- s.x + v.y,
- s.x + v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator+(tvec3<T, P> const & v1, tvec3<T, P> const & v2)
- {
- return tvec3<T, P>(
- v1.x + v2.x,
- v1.y + v2.y,
- v1.z + v2.z);
- }
-
- //operator-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator-(tvec3<T, P> const & v, T const & s)
- {
- return tvec3<T, P>(
- v.x - s,
- v.y - s,
- v.z - s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator-(tvec3<T, P> const & v, tvec1<T, P> const & s)
- {
- return tvec3<T, P>(
- v.x - s.x,
- v.y - s.x,
- v.z - s.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator-(T const & s, tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- s - v.x,
- s - v.y,
- s - v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator-(tvec1<T, P> const & s, tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- s.x - v.x,
- s.x - v.y,
- s.x - v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator-(tvec3<T, P> const & v1, tvec3<T, P> const & v2)
- {
- return tvec3<T, P>(
- v1.x - v2.x,
- v1.y - v2.y,
- v1.z - v2.z);
- }
-
- //operator*
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator*(tvec3<T, P> const & v, T const & s)
- {
- return tvec3<T, P>(
- v.x * s,
- v.y * s,
- v.z * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator*(tvec3<T, P> const & v, tvec1<T, P> const & s)
- {
- return tvec3<T, P>(
- v.x * s.x,
- v.y * s.x,
- v.z * s.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator*(T const & s, tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- s * v.x,
- s * v.y,
- s * v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator*(tvec1<T, P> const & s, tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- s.x * v.x,
- s.x * v.y,
- s.x * v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator*(tvec3<T, P> const & v1, tvec3<T, P> const & v2)
- {
- return tvec3<T, P>(
- v1.x * v2.x,
- v1.y * v2.y,
- v1.z * v2.z);
- }
-
- //operator/
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator/(tvec3<T, P> const & v, T const & s)
- {
- return tvec3<T, P>(
- v.x / s,
- v.y / s,
- v.z / s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator/(tvec3<T, P> const & v, tvec1<T, P> const & s)
- {
- return tvec3<T, P>(
- v.x / s.x,
- v.y / s.x,
- v.z / s.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator/(T const & s, tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- s / v.x,
- s / v.y,
- s / v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator/(tvec1<T, P> const & s, tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- s.x / v.x,
- s.x / v.y,
- s.x / v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator/(tvec3<T, P> const & v1, tvec3<T, P> const & v2)
- {
- return tvec3<T, P>(
- v1.x / v2.x,
- v1.y / v2.y,
- v1.z / v2.z);
- }
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator-(tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- -v.x,
- -v.y,
- -v.z);
- }
-
- //////////////////////////////////////
- // Binary bit operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator%(tvec3<T, P> const & v, T const & s)
- {
- return tvec3<T, P>(
- v.x % s,
- v.y % s,
- v.z % s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator%(tvec3<T, P> const & v, tvec1<T, P> const & s)
- {
- return tvec3<T, P>(
- v.x % s.x,
- v.y % s.x,
- v.z % s.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator%(T const & s, tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- s % v.x,
- s % v.y,
- s % v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator%(tvec1<T, P> const & s, tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- s.x % v.x,
- s.x % v.y,
- s.x % v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator%(tvec3<T, P> const & v1, tvec3<T, P> const & v2)
- {
- return tvec3<T, P>(
- v1.x % v2.x,
- v1.y % v2.y,
- v1.z % v2.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator&(tvec3<T, P> const & v, T const & s)
- {
- return tvec3<T, P>(
- v.x & s,
- v.y & s,
- v.z & s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator&(tvec3<T, P> const & v, tvec1<T, P> const & s)
- {
- return tvec3<T, P>(
- v.x & s.x,
- v.y & s.x,
- v.z & s.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator&(T const & s, tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- s & v.x,
- s & v.y,
- s & v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator&(tvec1<T, P> const & s, tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- s.x & v.x,
- s.x & v.y,
- s.x & v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator&(tvec3<T, P> const & v1, tvec3<T, P> const & v2)
- {
- return tvec3<T, P>(
- v1.x & v2.x,
- v1.y & v2.y,
- v1.z & v2.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator|(tvec3<T, P> const & v, T const & s)
- {
- return tvec3<T, P>(
- v.x | s,
- v.y | s,
- v.z | s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator|(tvec3<T, P> const & v, tvec1<T, P> const & s)
- {
- return tvec3<T, P>(
- v.x | s.x,
- v.y | s.x,
- v.z | s.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator|(T const & s, tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- s | v.x,
- s | v.y,
- s | v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator|(tvec1<T, P> const & s, tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- s.x | v.x,
- s.x | v.y,
- s.x | v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator|(tvec3<T, P> const & v1, tvec3<T, P> const & v2)
- {
- return tvec3<T, P>(
- v1.x | v2.x,
- v1.y | v2.y,
- v1.z | v2.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator^(tvec3<T, P> const & v, T const & s)
- {
- return tvec3<T, P>(
- v.x ^ s,
- v.y ^ s,
- v.z ^ s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator^(tvec3<T, P> const & v, tvec1<T, P> const & s)
- {
- return tvec3<T, P>(
- v.x ^ s.x,
- v.y ^ s.x,
- v.z ^ s.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator^(T const & s, tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- s ^ v.x,
- s ^ v.y,
- s ^ v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator^(tvec1<T, P> const & s, tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- s.x ^ v.x,
- s.x ^ v.y,
- s.x ^ v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator^(tvec3<T, P> const & v1, tvec3<T, P> const & v2)
- {
- return tvec3<T, P>(
- v1.x ^ v2.x,
- v1.y ^ v2.y,
- v1.z ^ v2.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator<<(tvec3<T, P> const & v, T const & s)
- {
- return tvec3<T, P>(
- v.x << s,
- v.y << s,
- v.z << s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator<<(tvec3<T, P> const & v, tvec1<T, P> const & s)
- {
- return tvec3<T, P>(
- v.x << s.x,
- v.y << s.x,
- v.z << s.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator<<(T const & s, tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- s << v.x,
- s << v.y,
- s << v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator<<(tvec1<T, P> const & s, tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- s.x << v.x,
- s.x << v.y,
- s.x << v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator<<(tvec3<T, P> const & v1, tvec3<T, P> const & v2)
- {
- return tvec3<T, P>(
- v1.x << v2.x,
- v1.y << v2.y,
- v1.z << v2.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator>>(tvec3<T, P> const & v, T const & s)
- {
- return tvec3<T, P>(
- v.x >> s,
- v.y >> s,
- v.z >> s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator>>(tvec3<T, P> const & v, tvec1<T, P> const & s)
- {
- return tvec3<T, P>(
- v.x >> s.x,
- v.y >> s.x,
- v.z >> s.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator>>(T const & s, tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- s >> v.x,
- s >> v.y,
- s >> v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator>>(tvec1<T, P> const & s, tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- s.x >> v.x,
- s.x >> v.y,
- s.x >> v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator>>(tvec3<T, P> const & v1, tvec3<T, P> const & v2)
- {
- return tvec3<T, P>(
- v1.x >> v2.x,
- v1.y >> v2.y,
- v1.z >> v2.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator~(tvec3<T, P> const & v)
- {
- return tvec3<T, P>(
- ~v.x,
- ~v.y,
- ~v.z);
- }
-}//namespace glm
diff --git a/inc/glm/detail/type_vec4.hpp b/inc/glm/detail/type_vec4.hpp deleted file mode 100644 index 85e3f80..0000000 --- a/inc/glm/detail/type_vec4.hpp +++ /dev/null @@ -1,531 +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 core
-/// @file glm/detail/type_vec4.hpp
-/// @date 2008-08-22 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-//#include "../fwd.hpp"
-#include "setup.hpp"
-#include "type_vec.hpp"
-#ifdef GLM_SWIZZLE
-# if GLM_HAS_ANONYMOUS_UNION
-# include "_swizzle.hpp"
-# else
-# include "_swizzle_func.hpp"
-# endif
-#endif //GLM_SWIZZLE
-#include <cstddef>
-
-namespace glm{
-namespace detail
-{
- template <typename T>
- struct simd
- {
- typedef T type[4];
- };
-
-# define GLM_NOT_BUGGY_VC32BITS !(GLM_MODEL == GLM_MODEL_32 && GLM_COMPILER & GLM_COMPILER_VC && GLM_COMPILER < GLM_COMPILER_VC2013)
-
-# if GLM_ARCH & GLM_ARCH_SSE2 && GLM_NOT_BUGGY_VC32BITS
- template <>
- struct simd<float>
- {
- typedef __m128 type;
- };
-
- template <>
- struct simd<int>
- {
- typedef __m128i type;
- };
-
- template <>
- struct simd<unsigned int>
- {
- typedef __m128i type;
- };
-# endif
-
-# if GLM_ARCH & GLM_ARCH_AVX && GLM_NOT_BUGGY_VC32BITS
- template <>
- struct simd<double>
- {
- typedef __m256d type;
- };
-# endif
-
-# if GLM_ARCH & GLM_ARCH_AVX2 && GLM_NOT_BUGGY_VC32BITS
- template <>
- struct simd<int64>
- {
- typedef __m256i type;
- };
-
- template <>
- struct simd<uint64>
- {
- typedef __m256i type;
- };
-# endif
-
-}//namespace detail
-
- template <typename T, precision P = defaultp>
- struct tvec4
- {
- //////////////////////////////////////
- // Implementation detail
-
- typedef tvec4<T, P> type;
- typedef tvec4<bool, P> bool_type;
- typedef T value_type;
-
- //////////////////////////////////////
- // Data
-
-# if GLM_HAS_ANONYMOUS_UNION
- union
- {
- struct { T x, y, z, w;};
- struct { T r, g, b, a; };
- struct { T s, t, p, q; };
-
- typename detail::simd<T>::type data;
-
-# ifdef GLM_SWIZZLE
- _GLM_SWIZZLE4_2_MEMBERS(T, P, tvec2, x, y, z, w)
- _GLM_SWIZZLE4_2_MEMBERS(T, P, tvec2, r, g, b, a)
- _GLM_SWIZZLE4_2_MEMBERS(T, P, tvec2, s, t, p, q)
- _GLM_SWIZZLE4_3_MEMBERS(T, P, tvec3, x, y, z, w)
- _GLM_SWIZZLE4_3_MEMBERS(T, P, tvec3, r, g, b, a)
- _GLM_SWIZZLE4_3_MEMBERS(T, P, tvec3, s, t, p, q)
- _GLM_SWIZZLE4_4_MEMBERS(T, P, tvec4, x, y, z, w)
- _GLM_SWIZZLE4_4_MEMBERS(T, P, tvec4, r, g, b, a)
- _GLM_SWIZZLE4_4_MEMBERS(T, P, tvec4, s, t, p, q)
-# endif//GLM_SWIZZLE
- };
-# else
- union { T x, r, s; };
- union { T y, g, t; };
- union { T z, b, p; };
- union { T w, a, q; };
-
-# ifdef GLM_SWIZZLE
- GLM_SWIZZLE_GEN_VEC_FROM_VEC4(T, P, tvec4, tvec2, tvec3, tvec4)
-# endif//GLM_SWIZZLE
-# endif//GLM_LANG
-
- //////////////////////////////////////
- // Component accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- /// Return the count of components of the vector
- typedef size_t size_type;
- 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
- /// Return the count of components of the vector
- typedef length_t length_type;
- 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 tvec4();
- GLM_FUNC_DECL tvec4(tvec4<T, P> const & v);
- template <precision Q>
- GLM_FUNC_DECL tvec4(tvec4<T, Q> const & v);
-
- //////////////////////////////////////
- // Explicit basic constructors
-
- GLM_FUNC_DECL explicit tvec4(ctor);
- GLM_FUNC_DECL explicit tvec4(T s);
- GLM_FUNC_DECL tvec4(T a, T b, T c, T d);
- GLM_FUNC_DECL ~tvec4(){}
-
- //////////////////////////////////////
- // Conversion scalar constructors
-
- /// Explicit converions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename A, typename B, typename C, typename D>
- GLM_FUNC_DECL tvec4(A a, B b, C c, D d);
- template <typename A, typename B, typename C, typename D>
- GLM_FUNC_DECL tvec4(tvec1<A, P> const & a, tvec1<B, P> const & b, tvec1<C, P> const & c, tvec1<D, P> const & d);
-
- //////////////////////////////////////
- // Conversion vector constructors
-
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename A, typename B, typename C, precision Q>
- GLM_FUNC_DECL explicit tvec4(tvec2<A, Q> const & a, B b, C c);
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename A, typename B, typename C, precision Q>
- GLM_FUNC_DECL explicit tvec4(tvec2<A, Q> const & a, tvec1<B, Q> const & b, tvec1<C, Q> const & c);
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename A, typename B, typename C, precision Q>
- GLM_FUNC_DECL explicit tvec4(A a, tvec2<B, Q> const & b, C c);
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename A, typename B, typename C, precision Q>
- GLM_FUNC_DECL explicit tvec4(tvec1<A, Q> const & a, tvec2<B, Q> const & b, tvec1<C, Q> const & c);
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename A, typename B, typename C, precision Q>
- GLM_FUNC_DECL explicit tvec4(A a, B b, tvec2<C, Q> const & c);
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename A, typename B, typename C, precision Q>
- GLM_FUNC_DECL explicit tvec4(tvec1<A, Q> const & a, tvec1<B, Q> const & b, tvec2<C, Q> const & c);
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename A, typename B, precision Q>
- GLM_FUNC_DECL explicit tvec4(tvec3<A, Q> const & a, B b);
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename A, typename B, precision Q>
- GLM_FUNC_DECL explicit tvec4(tvec3<A, Q> const & a, tvec1<B, Q> const & b);
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename A, typename B, precision Q>
- GLM_FUNC_DECL explicit tvec4(A a, tvec3<B, Q> const & b);
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename A, typename B, precision Q>
- GLM_FUNC_DECL explicit tvec4(tvec1<A, Q> const & a, tvec3<B, Q> const & b);
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename A, typename B, precision Q>
- GLM_FUNC_DECL explicit tvec4(tvec2<A, Q> const & a, tvec2<B, Q> const & b);
-
-# ifdef GLM_FORCE_EXPLICIT_CTOR
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename U, precision Q>
- GLM_FUNC_DECL explicit tvec4(tvec4<U, Q> const & v);
-# else
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
- template <typename U, precision Q>
- GLM_FUNC_DECL tvec4(tvec4<U, Q> const & v);
-# endif
-
- //////////////////////////////////////
- // Swizzle constructors
-
-# if GLM_HAS_ANONYMOUS_UNION && defined(GLM_SWIZZLE)
- template <int E0, int E1, int E2, int E3>
- GLM_FUNC_DECL tvec4(detail::_swizzle<4, T, P, tvec4<T, P>, E0, E1, E2, E3> const & that)
- {
- *this = that();
- }
-
- template <int E0, int E1, int F0, int F1>
- GLM_FUNC_DECL tvec4(detail::_swizzle<2, T, P, tvec2<T, P>, E0, E1, -1, -2> const & v, detail::_swizzle<2, T, P, tvec2<T, P>, F0, F1, -1, -2> const & u)
- {
- *this = tvec4<T, P>(v(), u());
- }
-
- template <int E0, int E1>
- GLM_FUNC_DECL tvec4(T const & x, T const & y, detail::_swizzle<2, T, P, tvec2<T, P>, E0, E1, -1, -2> const & v)
- {
- *this = tvec4<T, P>(x, y, v());
- }
-
- template <int E0, int E1>
- GLM_FUNC_DECL tvec4(T const & x, detail::_swizzle<2, T, P, tvec2<T, P>, E0, E1, -1, -2> const & v, T const & w)
- {
- *this = tvec4<T, P>(x, v(), w);
- }
-
- template <int E0, int E1>
- GLM_FUNC_DECL tvec4(detail::_swizzle<2, T, P, tvec2<T, P>, E0, E1, -1, -2> const & v, T const & z, T const & w)
- {
- *this = tvec4<T, P>(v(), z, w);
- }
-
- template <int E0, int E1, int E2>
- GLM_FUNC_DECL tvec4(detail::_swizzle<3, T, P, tvec3<T, P>, E0, E1, E2, -1> const & v, T const & w)
- {
- *this = tvec4<T, P>(v(), w);
- }
-
- template <int E0, int E1, int E2>
- GLM_FUNC_DECL tvec4(T const & x, detail::_swizzle<3, T, P, tvec3<T, P>, E0, E1, E2, -1> const & v)
- {
- *this = tvec4<T, P>(x, v());
- }
-# endif// GLM_HAS_ANONYMOUS_UNION && defined(GLM_SWIZZLE)
-
- //////////////////////////////////////
- // Unary arithmetic operators
-
- GLM_FUNC_DECL tvec4<T, P> & operator=(tvec4<T, P> const & v);
-
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator=(tvec4<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator+=(U scalar);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator+=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator+=(tvec4<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator-=(U scalar);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator-=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator-=(tvec4<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator*=(U scalar);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator*=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator*=(tvec4<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator/=(U scalar);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator/=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator/=(tvec4<U, P> const & v);
-
- //////////////////////////////////////
- // Increment and decrement operators
-
- GLM_FUNC_DECL tvec4<T, P> & operator++();
- GLM_FUNC_DECL tvec4<T, P> & operator--();
- GLM_FUNC_DECL tvec4<T, P> operator++(int);
- GLM_FUNC_DECL tvec4<T, P> operator--(int);
-
- //////////////////////////////////////
- // Unary bit operators
-
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator%=(U scalar);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator%=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator%=(tvec4<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator&=(U scalar);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator&=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator&=(tvec4<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator|=(U scalar);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator|=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator|=(tvec4<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator^=(U scalar);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator^=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator^=(tvec4<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator<<=(U scalar);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator<<=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator<<=(tvec4<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator>>=(U scalar);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator>>=(tvec1<U, P> const & v);
- template <typename U>
- GLM_FUNC_DECL tvec4<T, P> & operator>>=(tvec4<U, P> const & v);
- };
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator+(tvec4<T, P> const & v, T scalar);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator+(tvec4<T, P> const & v, tvec1<T, P> const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator+(T scalar, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator+(tvec1<T, P> const & s, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator+(tvec4<T, P> const & v1, tvec4<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator-(tvec4<T, P> const & v, T scalar);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator-(tvec4<T, P> const & v, tvec1<T, P> const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator-(T scalar, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator-(tvec1<T, P> const & s, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator-(tvec4<T, P> const & v1, tvec4<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator*(tvec4<T, P> const & v, T scalar);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator*(tvec4<T, P> const & v, tvec1<T, P> const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator*(T scalar, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator*(tvec1<T, P> const & s, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator*(tvec4<T, P> const & v1, tvec4<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator/(tvec4<T, P> const & v, T scalar);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator/(tvec4<T, P> const & v, tvec1<T, P> const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator/(T scalar, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator/(tvec1<T, P> const & s, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator/(tvec4<T, P> const & v1, tvec4<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator-(tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL bool operator==(tvec4<T, P> const & v1, tvec4<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL bool operator!=(tvec4<T, P> const & v1, tvec4<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator%(tvec4<T, P> const & v, T scalar);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator%(tvec4<T, P> const & v, tvec1<T, P> const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator%(T scalar, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator%(tvec1<T, P> const & s, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator%(tvec4<T, P> const & v1, tvec4<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator&(tvec4<T, P> const & v, T scalar);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator&(tvec4<T, P> const & v, tvec1<T, P> const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator&(T scalar, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator&(tvec1<T, P> const & s, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator&(tvec4<T, P> const & v1, tvec4<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator|(tvec4<T, P> const & v, T scalar);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator|(tvec4<T, P> const & v, tvec1<T, P> const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator|(T scalar, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator|(tvec1<T, P> const & s, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator|(tvec4<T, P> const & v1, tvec4<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator^(tvec4<T, P> const & v, T scalar);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator^(tvec4<T, P> const & v, tvec1<T, P> const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator^(T scalar, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator^(tvec1<T, P> const & s, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator^(tvec4<T, P> const & v1, tvec4<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator<<(tvec4<T, P> const & v, T scalar);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator<<(tvec4<T, P> const & v, tvec1<T, P> const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator<<(T scalar, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator<<(tvec1<T, P> const & s, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator<<(tvec4<T, P> const & v1, tvec4<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator>>(tvec4<T, P> const & v, T scalar);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator>>(tvec4<T, P> const & v, tvec1<T, P> const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator>>(T scalar, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator>>(tvec1<T, P> const & s, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator>>(tvec4<T, P> const & v1, tvec4<T, P> const & v2);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator~(tvec4<T, P> const & v);
-}//namespace glm
-
-#ifndef GLM_EXTERNAL_TEMPLATE
-#include "type_vec4.inl"
-#endif//GLM_EXTERNAL_TEMPLATE
diff --git a/inc/glm/detail/type_vec4.inl b/inc/glm/detail/type_vec4.inl deleted file mode 100644 index a3e9bb2..0000000 --- a/inc/glm/detail/type_vec4.inl +++ /dev/null @@ -1,1124 +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 core
-/// @file glm/detail/type_tvec4.inl
-/// @date 2008-08-23 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- //////////////////////////////////////
- // Implicit basic constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4()
-# ifndef GLM_FORCE_NO_CTOR_INIT
- : x(0), y(0), z(0), w(0)
-# endif
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(tvec4<T, P> const & v)
- : x(v.x), y(v.y), z(v.z), w(v.w)
- {}
-
- template <typename T, precision P>
- template <precision Q>
- GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(tvec4<T, Q> const & v)
- : x(v.x), y(v.y), z(v.z), w(v.w)
- {}
-
- //////////////////////////////////////
- // Explicit basic constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(ctor)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(T s)
- : x(s), y(s), z(s), w(s)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(T a, T b, T c, T d)
- : x(a), y(b), z(c), w(d)
- {}
-
- //////////////////////////////////////
- // Conversion scalar constructors
-
- template <typename T, precision P>
- template <typename A, typename B, typename C, typename D>
- GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(A a, B b, C c, D d) :
- x(static_cast<T>(a)),
- y(static_cast<T>(b)),
- z(static_cast<T>(c)),
- w(static_cast<T>(d))
- {}
-
- template <typename T, precision P>
- template <typename A, typename B, typename C, typename D>
- GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(tvec1<A, P> const & a, tvec1<B, P> const & b, tvec1<C, P> const & c, tvec1<D, P> const & d) :
- x(static_cast<T>(a.x)),
- y(static_cast<T>(b.x)),
- z(static_cast<T>(c.x)),
- w(static_cast<T>(d.x))
- {}
-
- //////////////////////////////////////
- // Conversion vector constructors
-
- template <typename T, precision P>
- template <typename A, typename B, typename C, precision Q>
- GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(tvec2<A, Q> const & a, B b, C c) :
- x(static_cast<T>(a.x)),
- y(static_cast<T>(a.y)),
- z(static_cast<T>(b)),
- w(static_cast<T>(c))
- {}
-
- template <typename T, precision P>
- template <typename A, typename B, typename C, precision Q>
- GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(tvec2<A, Q> const & a, tvec1<B, Q> const & b, tvec1<C, Q> const & c) :
- x(static_cast<T>(a.x)),
- y(static_cast<T>(a.y)),
- z(static_cast<T>(b.x)),
- w(static_cast<T>(c.x))
- {}
-
- template <typename T, precision P>
- template <typename A, typename B, typename C, precision Q>
- GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(A s1, tvec2<B, Q> const & v, C s2) :
- x(static_cast<T>(s1)),
- y(static_cast<T>(v.x)),
- z(static_cast<T>(v.y)),
- w(static_cast<T>(s2))
- {}
-
- template <typename T, precision P>
- template <typename A, typename B, typename C, precision Q>
- GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(tvec1<A, Q> const & a, tvec2<B, Q> const & b, tvec1<C, Q> const & c) :
- x(static_cast<T>(a.x)),
- y(static_cast<T>(b.x)),
- z(static_cast<T>(b.y)),
- w(static_cast<T>(c.x))
- {}
-
- template <typename T, precision P>
- template <typename A, typename B, typename C, precision Q>
- GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(A s1, B s2, tvec2<C, Q> const & v) :
- x(static_cast<T>(s1)),
- y(static_cast<T>(s2)),
- z(static_cast<T>(v.x)),
- w(static_cast<T>(v.y))
- {}
-
- template <typename T, precision P>
- template <typename A, typename B, typename C, precision Q>
- GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(tvec1<A, Q> const & a, tvec1<B, Q> const & b, tvec2<C, Q> const & c) :
- x(static_cast<T>(a.x)),
- y(static_cast<T>(b.x)),
- z(static_cast<T>(c.x)),
- w(static_cast<T>(c.y))
- {}
-
- template <typename T, precision P>
- template <typename A, typename B, precision Q>
- GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(tvec3<A, Q> const & a, B b) :
- x(static_cast<T>(a.x)),
- y(static_cast<T>(a.y)),
- z(static_cast<T>(a.z)),
- w(static_cast<T>(b))
- {}
-
- template <typename T, precision P>
- template <typename A, typename B, precision Q>
- GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(tvec3<A, Q> const & a, tvec1<B, Q> const & b) :
- x(static_cast<T>(a.x)),
- y(static_cast<T>(a.y)),
- z(static_cast<T>(a.z)),
- w(static_cast<T>(b.x))
- {}
-
- template <typename T, precision P>
- template <typename A, typename B, precision Q>
- GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(A a, tvec3<B, Q> const & b) :
- x(static_cast<T>(a)),
- y(static_cast<T>(b.x)),
- z(static_cast<T>(b.y)),
- w(static_cast<T>(b.z))
- {}
-
- template <typename T, precision P>
- template <typename A, typename B, precision Q>
- GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(tvec1<A, Q> const & a, tvec3<B, Q> const & b) :
- x(static_cast<T>(a.x)),
- y(static_cast<T>(b.x)),
- z(static_cast<T>(b.y)),
- w(static_cast<T>(b.z))
- {}
-
- template <typename T, precision P>
- template <typename A, typename B, precision Q>
- GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(tvec2<A, Q> const & a, tvec2<B, Q> const & b) :
- x(static_cast<T>(a.x)),
- y(static_cast<T>(a.y)),
- z(static_cast<T>(b.x)),
- w(static_cast<T>(b.y))
- {}
-
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(tvec4<U, Q> const & v) :
- x(static_cast<T>(v.x)),
- y(static_cast<T>(v.y)),
- z(static_cast<T>(v.z)),
- w(static_cast<T>(v.w))
- {}
-
- //////////////////////////////////////
- // Component accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tvec4<T, P>::size_type tvec4<T, P>::size() const
- {
- return 4;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T & tvec4<T, P>::operator[](typename tvec4<T, P>::size_type i)
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&x)[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T const & tvec4<T, P>::operator[](typename tvec4<T, P>::size_type i) const
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&x)[i];
- }
-# else
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tvec4<T, P>::length_type tvec4<T, P>::length() const
- {
- return 4;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T & tvec4<T, P>::operator[](typename tvec4<T, P>::length_type i)
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&x)[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T const & tvec4<T, P>::operator[](typename tvec4<T, P>::length_type i) const
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&x)[i];
- }
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////
- // Unary arithmetic operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator=(tvec4<T, P> const & v)
- {
- this->x = v.x;
- this->y = v.y;
- this->z = v.z;
- this->w = v.w;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator=(tvec4<U, P> const & v)
- {
- this->x = static_cast<T>(v.x);
- this->y = static_cast<T>(v.y);
- this->z = static_cast<T>(v.z);
- this->w = static_cast<T>(v.w);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator+=(U scalar)
- {
- this->x += static_cast<T>(scalar);
- this->y += static_cast<T>(scalar);
- this->z += static_cast<T>(scalar);
- this->w += static_cast<T>(scalar);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator+=(tvec1<U, P> const & v)
- {
- T const scalar = static_cast<T>(v.x);
- this->x += scalar;
- this->y += scalar;
- this->z += scalar;
- this->w += scalar;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator+=(tvec4<U, P> const & v)
- {
- this->x += static_cast<T>(v.x);
- this->y += static_cast<T>(v.y);
- this->z += static_cast<T>(v.z);
- this->w += static_cast<T>(v.w);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator-=(U scalar)
- {
- this->x -= static_cast<T>(scalar);
- this->y -= static_cast<T>(scalar);
- this->z -= static_cast<T>(scalar);
- this->w -= static_cast<T>(scalar);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator-=(tvec1<U, P> const & v)
- {
- T const scalar = static_cast<T>(v.x);
- this->x -= scalar;
- this->y -= scalar;
- this->z -= scalar;
- this->w -= scalar;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator-=(tvec4<U, P> const & v)
- {
- this->x -= static_cast<T>(v.x);
- this->y -= static_cast<T>(v.y);
- this->z -= static_cast<T>(v.z);
- this->w -= static_cast<T>(v.w);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator*=(U s)
- {
- this->x *= static_cast<T>(s);
- this->y *= static_cast<T>(s);
- this->z *= static_cast<T>(s);
- this->w *= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator*=(tvec1<U, P> const & v)
- {
- this->x *= static_cast<T>(v.x);
- this->y *= static_cast<T>(v.x);
- this->z *= static_cast<T>(v.x);
- this->w *= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator*=(tvec4<U, P> const & v)
- {
- this->x *= static_cast<T>(v.x);
- this->y *= static_cast<T>(v.y);
- this->z *= static_cast<T>(v.z);
- this->w *= static_cast<T>(v.w);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator/=(U s)
- {
- this->x /= static_cast<T>(s);
- this->y /= static_cast<T>(s);
- this->z /= static_cast<T>(s);
- this->w /= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator/=(tvec1<U, P> const & v)
- {
- this->x /= static_cast<T>(v.x);
- this->y /= static_cast<T>(v.x);
- this->z /= static_cast<T>(v.x);
- this->w /= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator/=(tvec4<U, P> const & v)
- {
- this->x /= static_cast<T>(v.x);
- this->y /= static_cast<T>(v.y);
- this->z /= static_cast<T>(v.z);
- this->w /= static_cast<T>(v.w);
- return *this;
- }
-
- //////////////////////////////////////
- // Increment and decrement operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator++()
- {
- ++this->x;
- ++this->y;
- ++this->z;
- ++this->w;
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator--()
- {
- --this->x;
- --this->y;
- --this->z;
- --this->w;
- return *this;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> tvec4<T, P>::operator++(int)
- {
- tvec4<T, P> Result(*this);
- ++*this;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> tvec4<T, P>::operator--(int)
- {
- tvec4<T, P> Result(*this);
- --*this;
- return Result;
- }
-
- //////////////////////////////////////
- // Unary bit operators
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator%=(U scalar)
- {
- this->x %= static_cast<T>(scalar);
- this->y %= static_cast<T>(scalar);
- this->z %= static_cast<T>(scalar);
- this->w %= static_cast<T>(scalar);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator%=(tvec1<U, P> const & v)
- {
- this->x %= static_cast<T>(v.x);
- this->y %= static_cast<T>(v.x);
- this->z %= static_cast<T>(v.x);
- this->w %= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator%=(tvec4<U, P> const & v)
- {
- this->x %= static_cast<T>(v.x);
- this->y %= static_cast<T>(v.y);
- this->z %= static_cast<T>(v.z);
- this->w %= static_cast<T>(v.w);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator&=(U scalar)
- {
- this->x &= static_cast<T>(scalar);
- this->y &= static_cast<T>(scalar);
- this->z &= static_cast<T>(scalar);
- this->w &= static_cast<T>(scalar);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator&=(tvec1<U, P> const & v)
- {
- this->x &= static_cast<T>(v.x);
- this->y &= static_cast<T>(v.x);
- this->z &= static_cast<T>(v.x);
- this->w &= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator&=(tvec4<U, P> const & v)
- {
- this->x &= static_cast<T>(v.x);
- this->y &= static_cast<T>(v.y);
- this->z &= static_cast<T>(v.z);
- this->w &= static_cast<T>(v.w);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator|=(U scalar)
- {
- this->x |= static_cast<T>(scalar);
- this->y |= static_cast<T>(scalar);
- this->z |= static_cast<T>(scalar);
- this->w |= static_cast<T>(scalar);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator|=(tvec1<U, P> const & v)
- {
- this->x |= static_cast<T>(v.x);
- this->y |= static_cast<T>(v.x);
- this->z |= static_cast<T>(v.x);
- this->w |= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator|=(tvec4<U, P> const & v)
- {
- this->x |= static_cast<T>(v.x);
- this->y |= static_cast<T>(v.y);
- this->z |= static_cast<T>(v.z);
- this->w |= static_cast<T>(v.w);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator^=(U scalar)
- {
- this->x ^= static_cast<T>(scalar);
- this->y ^= static_cast<T>(scalar);
- this->z ^= static_cast<T>(scalar);
- this->w ^= static_cast<T>(scalar);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator^=(tvec1<U, P> const & v)
- {
- this->x ^= static_cast<T>(v.x);
- this->y ^= static_cast<T>(v.x);
- this->z ^= static_cast<T>(v.x);
- this->w ^= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator^=(tvec4<U, P> const & v)
- {
- this->x ^= static_cast<T>(v.x);
- this->y ^= static_cast<T>(v.y);
- this->z ^= static_cast<T>(v.z);
- this->w ^= static_cast<T>(v.w);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator<<=(U scalar)
- {
- this->x <<= static_cast<T>(scalar);
- this->y <<= static_cast<T>(scalar);
- this->z <<= static_cast<T>(scalar);
- this->w <<= static_cast<T>(scalar);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator<<=(tvec1<U, P> const & v)
- {
- this->x <<= static_cast<T>(v.x);
- this->y <<= static_cast<T>(v.x);
- this->z <<= static_cast<T>(v.x);
- this->w <<= static_cast<T>(v.x);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator<<=(tvec4<U, P> const & v)
- {
- this->x <<= static_cast<T>(v.x);
- this->y <<= static_cast<T>(v.y);
- this->z <<= static_cast<T>(v.z);
- this->w <<= static_cast<T>(v.w);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator>>=(U scalar)
- {
- this->x >>= static_cast<T>(scalar);
- this->y >>= static_cast<T>(scalar);
- this->z >>= static_cast<T>(scalar);
- this->w >>= static_cast<T>(scalar);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator>>=(tvec1<U, P> const & v)
- {
- this->x >>= static_cast<T>(v.x);
- this->y >>= static_cast<T>(v.y);
- this->z >>= static_cast<T>(v.z);
- this->w >>= static_cast<T>(v.w);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator>>=(tvec4<U, P> const & v)
- {
- this->x >>= static_cast<T>(v.x);
- this->y >>= static_cast<T>(v.y);
- this->z >>= static_cast<T>(v.z);
- this->w >>= static_cast<T>(v.w);
- return *this;
- }
-
- //////////////////////////////////////
- // Boolean operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator==(tvec4<T, P> const & v1, tvec4<T, P> const & v2)
- {
- return (v1.x == v2.x) && (v1.y == v2.y) && (v1.z == v2.z) && (v1.w == v2.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator!=(tvec4<T, P> const & v1, tvec4<T, P> const & v2)
- {
- return (v1.x != v2.x) || (v1.y != v2.y) || (v1.z != v2.z) || (v1.w != v2.w);
- }
-
- //////////////////////////////////////
- // Binary arithmetic operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator+(tvec4<T, P> const & v, T scalar)
- {
- return tvec4<T, P>(
- v.x + scalar,
- v.y + scalar,
- v.z + scalar,
- v.w + scalar);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator+(T scalar, tvec4<T, P> const & v)
- {
- return tvec4<T, P>(
- scalar + v.x,
- scalar + v.y,
- scalar + v.z,
- scalar + v.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator+(tvec4<T, P> const & v1, tvec4<T, P> const & v2)
- {
- return tvec4<T, P>(
- v1.x + v2.x,
- v1.y + v2.y,
- v1.z + v2.z,
- v1.w + v2.w);
- }
-
- //operator-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator-(tvec4<T, P> const & v, T scalar)
- {
- return tvec4<T, P>(
- v.x - scalar,
- v.y - scalar,
- v.z - scalar,
- v.w - scalar);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator-(T scalar, tvec4<T, P> const & v)
- {
- return tvec4<T, P>(
- scalar - v.x,
- scalar - v.y,
- scalar - v.z,
- scalar - v.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator-(tvec4<T, P> const & v1, tvec4<T, P> const & v2)
- {
- return tvec4<T, P>(
- v1.x - v2.x,
- v1.y - v2.y,
- v1.z - v2.z,
- v1.w - v2.w);
- }
-
- //operator*
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator*(tvec4<T, P> const & v, T scalar)
- {
- return tvec4<T, P>(
- v.x * scalar,
- v.y * scalar,
- v.z * scalar,
- v.w * scalar);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator*(T scalar, tvec4<T, P> const & v)
- {
- return tvec4<T, P>(
- scalar * v.x,
- scalar * v.y,
- scalar * v.z,
- scalar * v.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator*(tvec4<T, P> const & v1, tvec4<T, P> const & v2)
- {
- return tvec4<T, P>(
- v1.x * v2.x,
- v1.y * v2.y,
- v1.z * v2.z,
- v1.w * v2.w);
- }
-
- //operator/
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator/(tvec4<T, P> const & v, T scalar)
- {
- return tvec4<T, P>(
- v.x / scalar,
- v.y / scalar,
- v.z / scalar,
- v.w / scalar);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator/(T scalar, tvec4<T, P> const & v)
- {
- return tvec4<T, P>(
- scalar / v.x,
- scalar / v.y,
- scalar / v.z,
- scalar / v.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator/(tvec4<T, P> const & v1, tvec4<T, P> const & v2)
- {
- return tvec4<T, P>(
- v1.x / v2.x,
- v1.y / v2.y,
- v1.z / v2.z,
- v1.w / v2.w);
- }
-
- // Unary constant operators
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator-(tvec4<T, P> const & v)
- {
- return tvec4<T, P>(
- -v.x,
- -v.y,
- -v.z,
- -v.w);
- }
-
- //////////////////////////////////////
- // Binary bit operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator%(tvec4<T, P> const & v, T s)
- {
- return tvec4<T, P>(
- v.x % s,
- v.y % s,
- v.z % s,
- v.w % s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator%(tvec4<T, P> const & v, tvec1<T, P> const & s)
- {
- return tvec4<T, P>(
- v.x % s.x,
- v.y % s.x,
- v.z % s.x,
- v.w % s.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator%(T s, tvec4<T, P> const & v)
- {
- return tvec4<T, P>(
- s % v.x,
- s % v.y,
- s % v.z,
- s % v.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator%(tvec1<T, P> const & s, tvec4<T, P> const & v)
- {
- return tvec4<T, P>(
- s.x % v.x,
- s.x % v.y,
- s.x % v.z,
- s.x % v.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator%(tvec4<T, P> const & v1, tvec4<T, P> const & v2)
- {
- return tvec4<T, P>(
- v1.x % v2.x,
- v1.y % v2.y,
- v1.z % v2.z,
- v1.w % v2.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator&(tvec4<T, P> const & v, T s)
- {
- return tvec4<T, P>(
- v.x & s,
- v.y & s,
- v.z & s,
- v.w & s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator&(tvec4<T, P> const & v, tvec1<T, P> const & s)
- {
- return tvec4<T, P>(
- v.x & s.x,
- v.y & s.x,
- v.z & s.x,
- v.w & s.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator&(T s, tvec4<T, P> const & v)
- {
- return tvec4<T, P>(
- s & v.x,
- s & v.y,
- s & v.z,
- s & v.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator&(tvec1<T, P> const & s, tvec4<T, P> const & v)
- {
- return tvec4<T, P>(
- s.x & v.x,
- s.x & v.y,
- s.x & v.z,
- s.x & v.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator&(tvec4<T, P> const & v1, tvec4<T, P> const & v2)
- {
- return tvec4<T, P>(
- v1.x & v2.x,
- v1.y & v2.y,
- v1.z & v2.z,
- v1.w & v2.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator|(tvec4<T, P> const & v, T s)
- {
- return tvec4<T, P>(
- v.x | s,
- v.y | s,
- v.z | s,
- v.w | s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator|(tvec4<T, P> const & v, tvec1<T, P> const & s)
- {
- return tvec4<T, P>(
- v.x | s.x,
- v.y | s.x,
- v.z | s.x,
- v.w | s.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator|(T s, tvec4<T, P> const & v)
- {
- return tvec4<T, P>(
- s | v.x,
- s | v.y,
- s | v.z,
- s | v.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator|(tvec1<T, P> const & s, tvec4<T, P> const & v)
- {
- return tvec4<T, P>(
- s.x | v.x,
- s.x | v.y,
- s.x | v.z,
- s.x | v.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator|(tvec4<T, P> const & v1, tvec4<T, P> const & v2)
- {
- return tvec4<T, P>(
- v1.x | v2.x,
- v1.y | v2.y,
- v1.z | v2.z,
- v1.w | v2.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator^(tvec4<T, P> const & v, T s)
- {
- return tvec4<T, P>(
- v.x ^ s,
- v.y ^ s,
- v.z ^ s,
- v.w ^ s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator^(tvec4<T, P> const & v, tvec1<T, P> const & s)
- {
- return tvec4<T, P>(
- v.x ^ s.x,
- v.y ^ s.x,
- v.z ^ s.x,
- v.w ^ s.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator^(T scalar, tvec4<T, P> const & v)
- {
- return tvec4<T, P>(
- scalar ^ v.x,
- scalar ^ v.y,
- scalar ^ v.z,
- scalar ^ v.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator^(tvec1<T, P> const & s, tvec4<T, P> const & v)
- {
- return tvec4<T, P>(
- s.x ^ v.x,
- s.x ^ v.y,
- s.x ^ v.z,
- s.x ^ v.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator^(tvec4<T, P> const & v1, tvec4<T, P> const & v2)
- {
- return tvec4<T, P>(
- v1.x ^ v2.x,
- v1.y ^ v2.y,
- v1.z ^ v2.z,
- v1.w ^ v2.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator<<(tvec4<T, P> const & v, T scalar)
- {
- return tvec4<T, P>(
- v.x << scalar,
- v.y << scalar,
- v.z << scalar,
- v.w << scalar);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator<<(tvec4<T, P> const & v, tvec1<T, P> const & s)
- {
- return tvec4<T, P>(
- v.x << s.x,
- v.y << s.x,
- v.z << s.x,
- v.w << s.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator<<(T scalar, tvec4<T, P> const & v)
- {
- return tvec4<T, P>(
- scalar << v.x,
- scalar << v.y,
- scalar << v.z,
- scalar << v.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator<<(tvec1<T, P> const & s, tvec4<T, P> const & v)
- {
- return tvec4<T, P>(
- s.x << v.x,
- s.x << v.y,
- s.x << v.z,
- s.x << v.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator<<(tvec4<T, P> const & v1, tvec4<T, P> const & v2)
- {
- return tvec4<T, P>(
- v1.x << v2.x,
- v1.y << v2.y,
- v1.z << v2.z,
- v1.w << v2.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator>>(tvec4<T, P> const & v, T scalar)
- {
- return tvec4<T, P>(
- v.x >> scalar,
- v.y >> scalar,
- v.z >> scalar,
- v.w >> scalar);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator>>(tvec4<T, P> const & v, tvec1<T, P> const & s)
- {
- return tvec4<T, P>(
- v.x >> s.x,
- v.y >> s.x,
- v.z >> s.x,
- v.w >> s.x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator>>(T scalar, tvec4<T, P> const & v)
- {
- return tvec4<T, P>(
- scalar >> v.x,
- scalar >> v.y,
- scalar >> v.z,
- scalar >> v.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator>>(tvec1<T, P> const & s, tvec4<T, P> const & v)
- {
- return tvec4<T, P>(
- s.x >> v.x,
- s.x >> v.y,
- s.x >> v.z,
- s.x >> v.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator>>(tvec4<T, P> const & v1, tvec4<T, P> const & v2)
- {
- return tvec4<T, P>(
- v1.x >> v2.x,
- v1.y >> v2.y,
- v1.z >> v2.z,
- v1.w >> v2.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator~(tvec4<T, P> const & v)
- {
- return tvec4<T, P>(
- ~v.x,
- ~v.y,
- ~v.z,
- ~v.w);
- }
-}//namespace glm
-
-#if GLM_HAS_ANONYMOUS_UNION && GLM_NOT_BUGGY_VC32BITS
-#if GLM_ARCH & GLM_ARCH_SSE2
-# include "type_vec4_sse2.inl"
-#endif
-#if GLM_ARCH & GLM_ARCH_AVX
-# include "type_vec4_avx.inl"
-#endif
-#if GLM_ARCH & GLM_ARCH_AVX2
-# include "type_vec4_avx2.inl"
-#endif
-#endif//
diff --git a/inc/glm/detail/type_vec4_avx.inl b/inc/glm/detail/type_vec4_avx.inl deleted file mode 100644 index 4784301..0000000 --- a/inc/glm/detail/type_vec4_avx.inl +++ /dev/null @@ -1,41 +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 core
-/// @file glm/detail/type_tvec4_avx.inl
-/// @date 2014-12-01 / 2014-12-01
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm{
-namespace detail
-{
-
-}//namespace detail
-
-
-
-}//namespace glm
diff --git a/inc/glm/detail/type_vec4_avx2.inl b/inc/glm/detail/type_vec4_avx2.inl deleted file mode 100644 index f6151d7..0000000 --- a/inc/glm/detail/type_vec4_avx2.inl +++ /dev/null @@ -1,41 +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 core
-/// @file glm/detail/type_tvec4_avx2.inl
-/// @date 2014-12-01 / 2014-12-01
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm{
-namespace detail
-{
-
-}//namespace detail
-
-
-
-}//namespace glm
diff --git a/inc/glm/detail/type_vec4_sse2.inl b/inc/glm/detail/type_vec4_sse2.inl deleted file mode 100644 index ec3087b..0000000 --- a/inc/glm/detail/type_vec4_sse2.inl +++ /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 core
-/// @file glm/detail/type_tvec4_sse2.inl
-/// @date 2014-12-01 / 2014-12-01
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm{
-namespace detail
-{
-
-}//namespace detail
-
- template <>
- GLM_FUNC_QUALIFIER tvec4<float, lowp>::tvec4()
-# ifndef GLM_FORCE_NO_CTOR_INIT
- : data(_mm_setzero_ps())
-# endif
- {}
-
- template <>
- GLM_FUNC_QUALIFIER tvec4<float, mediump>::tvec4()
-# ifndef GLM_FORCE_NO_CTOR_INIT
- : data(_mm_setzero_ps())
-# endif
- {}
-
- template <>
- GLM_FUNC_QUALIFIER tvec4<float, lowp>::tvec4(float s) :
- data(_mm_set1_ps(s))
- {}
-
- template <>
- GLM_FUNC_QUALIFIER tvec4<float, mediump>::tvec4(float s) :
- data(_mm_set1_ps(s))
- {}
-
- template <>
- GLM_FUNC_QUALIFIER tvec4<float, lowp>::tvec4(float a, float b, float c, float d) :
- data(_mm_set_ps(d, c, b, a))
- {}
-
- template <>
- GLM_FUNC_QUALIFIER tvec4<float, mediump>::tvec4(float a, float b, float c, float d) :
- data(_mm_set_ps(d, c, b, a))
- {}
-
- template <>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<float, lowp> & tvec4<float, lowp>::operator+=(U scalar)
- {
- this->data = _mm_add_ps(this->data, _mm_set_ps1(static_cast<float>(scalar)));
- return *this;
- }
-
- template <>
- template <>
- GLM_FUNC_QUALIFIER tvec4<float, lowp> & tvec4<float, lowp>::operator+=<float>(float scalar)
- {
- this->data = _mm_add_ps(this->data, _mm_set_ps1(scalar));
- return *this;
- }
-
- template <>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<float, mediump> & tvec4<float, mediump>::operator+=(U scalar)
- {
- this->data = _mm_add_ps(this->data, _mm_set_ps1(static_cast<float>(scalar)));
- return *this;
- }
-
- template <>
- template <>
- GLM_FUNC_QUALIFIER tvec4<float, mediump> & tvec4<float, mediump>::operator+=<float>(float scalar)
- {
- this->data = _mm_add_ps(this->data, _mm_set_ps1(scalar));
- return *this;
- }
-
- template <>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<float, lowp> & tvec4<float, lowp>::operator+=(tvec1<U, lowp> const & v)
- {
- this->data = _mm_add_ps(this->data, _mm_set_ps1(static_cast<float>(v.x)));
- return *this;
- }
-
- template <>
- template <typename U>
- GLM_FUNC_QUALIFIER tvec4<float, mediump> & tvec4<float, mediump>::operator+=(tvec1<U, mediump> const & v)
- {
- this->data = _mm_add_ps(this->data, _mm_set_ps1(static_cast<float>(v.x)));
- return *this;
- }
-}//namespace glm
diff --git a/inc/glm/exponential.hpp b/inc/glm/exponential.hpp deleted file mode 100644 index 1912e35..0000000 --- a/inc/glm/exponential.hpp +++ /dev/null @@ -1,35 +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 core
-/// @file glm/exponential.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/func_exponential.hpp"
diff --git a/inc/glm/ext.hpp b/inc/glm/ext.hpp deleted file mode 100644 index bd353a2..0000000 --- a/inc/glm/ext.hpp +++ /dev/null @@ -1,143 +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.
-///
-/// @file glm/glm.hpp
-/// @date 2009-05-01 / 2011-05-16
-/// @author Christophe Riccio
-///
-/// @ref core (Dependence)
-///
-/// @defgroup gtc GTC Extensions (Stable)
-///
-/// @brief Functions and types that the GLSL specification doesn't define, but useful to have for a C++ program.
-///
-/// GTC extensions aim to be stable.
-///
-/// Even if it's highly unrecommended, it's possible to include all the extensions at once by
-/// including <glm/ext.hpp>. Otherwise, each extension needs to be included a specific file.
-///
-/// @defgroup gtx GTX Extensions (Experimental)
-///
-/// @brief Functions and types that the GLSL specification doesn't define, but
-/// useful to have for a C++ program.
-///
-/// Experimental extensions are useful functions and types, but the development of
-/// their API and functionality is not necessarily stable. They can change
-/// substantially between versions. Backwards compatibility is not much of an issue
-/// for them.
-///
-/// Even if it's highly unrecommended, it's possible to include all the extensions
-/// at once by including <glm/ext.hpp>. Otherwise, each extension needs to be
-/// included a specific file.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_EXT_INCLUDED_DISPLAYED))
-# define GLM_MESSAGE_EXT_INCLUDED_DISPLAYED
-# pragma message("GLM: All extensions included (not recommanded)")
-#endif//GLM_MESSAGES
-
-#include "./gtc/bitfield.hpp"
-#include "./gtc/constants.hpp"
-#include "./gtc/epsilon.hpp"
-#include "./gtc/integer.hpp"
-#include "./gtc/matrix_access.hpp"
-#include "./gtc/matrix_integer.hpp"
-#include "./gtc/matrix_inverse.hpp"
-#include "./gtc/matrix_transform.hpp"
-#include "./gtc/noise.hpp"
-#include "./gtc/packing.hpp"
-#include "./gtc/quaternion.hpp"
-#include "./gtc/random.hpp"
-#include "./gtc/reciprocal.hpp"
-#include "./gtc/round.hpp"
-#include "./gtc/type_precision.hpp"
-#include "./gtc/type_ptr.hpp"
-#include "./gtc/ulp.hpp"
-#include "./gtc/vec1.hpp"
-
-#include "./gtx/associated_min_max.hpp"
-#include "./gtx/bit.hpp"
-#include "./gtx/closest_point.hpp"
-#include "./gtx/color_space.hpp"
-#include "./gtx/color_space_YCoCg.hpp"
-#include "./gtx/compatibility.hpp"
-#include "./gtx/component_wise.hpp"
-#include "./gtx/dual_quaternion.hpp"
-#include "./gtx/euler_angles.hpp"
-#include "./gtx/extend.hpp"
-#include "./gtx/extented_min_max.hpp"
-#include "./gtx/fast_exponential.hpp"
-#include "./gtx/fast_square_root.hpp"
-#include "./gtx/fast_trigonometry.hpp"
-#include "./gtx/gradient_paint.hpp"
-#include "./gtx/handed_coordinate_space.hpp"
-#include "./gtx/integer.hpp"
-#include "./gtx/intersect.hpp"
-#include "./gtx/log_base.hpp"
-#include "./gtx/matrix_cross_product.hpp"
-#include "./gtx/matrix_interpolation.hpp"
-#include "./gtx/matrix_major_storage.hpp"
-#include "./gtx/matrix_operation.hpp"
-#include "./gtx/matrix_query.hpp"
-#include "./gtx/mixed_product.hpp"
-#include "./gtx/norm.hpp"
-#include "./gtx/normal.hpp"
-#include "./gtx/normalize_dot.hpp"
-#include "./gtx/number_precision.hpp"
-#include "./gtx/optimum_pow.hpp"
-#include "./gtx/orthonormalize.hpp"
-#include "./gtx/perpendicular.hpp"
-#include "./gtx/polar_coordinates.hpp"
-#include "./gtx/projection.hpp"
-#include "./gtx/quaternion.hpp"
-#include "./gtx/raw_data.hpp"
-#include "./gtx/rotate_vector.hpp"
-#include "./gtx/spline.hpp"
-#include "./gtx/std_based_type.hpp"
-#if !(GLM_COMPILER & GLM_COMPILER_CUDA)
-# include "./gtx/string_cast.hpp"
-#endif
-#include "./gtx/transform.hpp"
-#include "./gtx/transform2.hpp"
-#include "./gtx/type_aligned.hpp"
-#include "./gtx/vector_angle.hpp"
-#include "./gtx/vector_query.hpp"
-#include "./gtx/wrap.hpp"
-
-#if GLM_HAS_TEMPLATE_ALIASES
-# include "./gtx/scalar_multiplication.hpp"
-#endif
-
-#if GLM_HAS_RANGE_FOR
-# include "./gtx/range.hpp"
-#endif
-
-#if GLM_ARCH & GLM_ARCH_SSE2
-# include "./gtx/simd_vec4.hpp"
-# include "./gtx/simd_mat4.hpp"
-#endif
diff --git a/inc/glm/fwd.hpp b/inc/glm/fwd.hpp deleted file mode 100644 index 19d83d2..0000000 --- a/inc/glm/fwd.hpp +++ /dev/null @@ -1,2601 +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 core
-/// @file glm/fwd.hpp
-/// @date 2013-03-30 / 2013-03-31
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/type_int.hpp"
-#include "detail/type_float.hpp"
-#include "detail/type_vec.hpp"
-#include "detail/type_mat.hpp"
-
-//////////////////////
-// GLM_GTC_quaternion
-namespace glm
-{
- template <typename T, precision P> struct tquat;
-
- /// Quaternion of low single-precision floating-point numbers.
- ///
- /// @see gtc_quaternion
- typedef tquat<float, lowp> lowp_quat;
-
- /// Quaternion of medium single-precision floating-point numbers.
- ///
- /// @see gtc_quaternion
- typedef tquat<float, mediump> mediump_quat;
-
- /// Quaternion of high single-precision floating-point numbers.
- ///
- /// @see gtc_quaternion
- typedef tquat<float, highp> highp_quat;
-
-#if(defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT))
- typedef highp_quat quat;
-#elif(!defined(GLM_PRECISION_HIGHP_FLOAT) && defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT))
- typedef mediump_quat quat;
-#elif(!defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && defined(GLM_PRECISION_LOWP_FLOAT))
- typedef lowp_quat quat;
-#elif(!defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT))
- /// Quaternion of default single-precision floating-point numbers.
- typedef highp_quat quat;
-#endif
-
- /// Quaternion of low single-precision floating-point numbers.
- ///
- /// @see gtc_quaternion
- typedef lowp_quat lowp_fquat;
-
- /// Quaternion of medium single-precision floating-point numbers.
- ///
- /// @see gtc_quaternion
- typedef mediump_quat mediump_fquat;
-
- /// Quaternion of high single-precision floating-point numbers.
- ///
- /// @see gtc_quaternion
- typedef highp_quat highp_fquat;
-
- /// Quaternion of default single-precision floating-point numbers.
- ///
- /// @see gtc_quaternion
- typedef quat fquat;
-
-
- /// Quaternion of low double-precision floating-point numbers.
- ///
- /// @see gtc_quaternion
- typedef tquat<double, lowp> lowp_dquat;
-
- /// Quaternion of medium double-precision floating-point numbers.
- ///
- /// @see gtc_quaternion
- typedef tquat<double, mediump> mediump_dquat;
-
- /// Quaternion of high double-precision floating-point numbers.
- ///
- /// @see gtc_quaternion
- typedef tquat<double, highp> highp_dquat;
-
-#if(defined(GLM_PRECISION_HIGHP_DOUBLE) && !defined(GLM_PRECISION_MEDIUMP_DOUBLE) && !defined(GLM_PRECISION_LOWP_DOUBLE))
- typedef highp_dquat dquat;
-#elif(!defined(GLM_PRECISION_HIGHP_DOUBLE) && defined(GLM_PRECISION_MEDIUMP_DOUBLE) && !defined(GLM_PRECISION_LOWP_DOUBLE))
- typedef mediump_dquat dquat;
-#elif(!defined(GLM_PRECISION_HIGHP_DOUBLE) && !defined(GLM_PRECISION_MEDIUMP_DOUBLE) && defined(GLM_PRECISION_LOWP_DOUBLE))
- typedef lowp_dquat dquat;
-#elif(!defined(GLM_PRECISION_HIGHP_DOUBLE) && !defined(GLM_PRECISION_MEDIUMP_DOUBLE) && !defined(GLM_PRECISION_LOWP_DOUBLE))
- /// Quaternion of default double-precision floating-point numbers.
- ///
- /// @see gtc_quaternion
- typedef highp_dquat dquat;
-#endif
-
-}//namespace glm
-
-//////////////////////
-// GLM_GTC_precision
-namespace glm
-{
- /// @addtogroup gtc_type_precision
- /// @{
-
- /// Low precision 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 lowp_int8;
-
- /// Low precision 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 lowp_int16;
-
- /// Low precision 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 lowp_int32;
-
- /// Low precision 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 lowp_int64;
-
- /// Low precision 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 lowp_int8_t;
-
- /// Low precision 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 lowp_int16_t;
-
- /// Low precision 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 lowp_int32_t;
-
- /// Low precision 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 lowp_int64_t;
-
- /// Low precision 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 lowp_i8;
-
- /// Low precision 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 lowp_i16;
-
- /// Low precision 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 lowp_i32;
-
- /// Low precision 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 lowp_i64;
-
- /// Medium precision 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 mediump_int8;
-
- /// Medium precision 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 mediump_int16;
-
- /// Medium precision 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 mediump_int32;
-
- /// Medium precision 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 mediump_int64;
-
- /// Medium precision 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 mediump_int8_t;
-
- /// Medium precision 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 mediump_int16_t;
-
- /// Medium precision 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 mediump_int32_t;
-
- /// Medium precision 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 mediump_int64_t;
-
- /// Medium precision 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 mediump_i8;
-
- /// Medium precision 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 mediump_i16;
-
- /// Medium precision 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 mediump_i32;
-
- /// Medium precision 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 mediump_i64;
-
- /// High precision 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 highp_int8;
-
- /// High precision 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 highp_int16;
-
- /// High precision 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 highp_int32;
-
- /// High precision 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 highp_int64;
-
- /// High precision 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 highp_int8_t;
-
- /// High precision 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 highp_int16_t;
-
- /// 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 highp_int32_t;
-
- /// High precision 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 highp_int64_t;
-
- /// High precision 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 highp_i8;
-
- /// High precision 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 highp_i16;
-
- /// High precision 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 highp_i32;
-
- /// High precision 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 highp_i64;
-
-
- /// 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 int8;
-
- /// 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 int16;
-
- /// 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 int32;
-
- /// 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 int64;
-
-
-#if GLM_HAS_EXTENDED_INTEGER_TYPE
- using std::int8_t;
- using std::int16_t;
- using std::int32_t;
- using std::int64_t;
-#else
- /// 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 int8_t;
-
- /// 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 int16_t;
-
- /// 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 int32_t;
-
- /// 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 int64_t;
-#endif
-
- /// 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 i8;
-
- /// 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 i16;
-
- /// 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 i32;
-
- /// 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 i64;
-
-
-
- /// Low precision 8 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<i8, lowp> lowp_i8vec1;
-
- /// Low precision 8 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<i8, lowp> lowp_i8vec2;
-
- /// Low precision 8 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<i8, lowp> lowp_i8vec3;
-
- /// Low precision 8 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<i8, lowp> lowp_i8vec4;
-
-
- /// Medium precision 8 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<i8, mediump> mediump_i8vec1;
-
- /// Medium precision 8 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<i8, mediump> mediump_i8vec2;
-
- /// Medium precision 8 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<i8, mediump> mediump_i8vec3;
-
- /// Medium precision 8 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<i8, mediump> mediump_i8vec4;
-
-
- /// High precision 8 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<i8, highp> highp_i8vec1;
-
- /// High precision 8 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<i8, highp> highp_i8vec2;
-
- /// High precision 8 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<i8, highp> highp_i8vec3;
-
- /// High precision 8 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<i8, highp> highp_i8vec4;
-
-#if(defined(GLM_PRECISION_LOWP_INT))
- typedef lowp_i8vec1 i8vec1;
- typedef lowp_i8vec2 i8vec2;
- typedef lowp_i8vec3 i8vec3;
- typedef lowp_i8vec4 i8vec4;
-#elif(defined(GLM_PRECISION_MEDIUMP_INT))
- typedef mediump_i8vec1 i8vec1;
- typedef mediump_i8vec2 i8vec2;
- typedef mediump_i8vec3 i8vec3;
- typedef mediump_i8vec4 i8vec4;
-#else
- /// Default precision 8 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef highp_i8vec1 i8vec1;
-
- /// Default precision 8 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef highp_i8vec2 i8vec2;
-
- /// Default precision 8 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef highp_i8vec3 i8vec3;
-
- /// Default precision 8 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef highp_i8vec4 i8vec4;
-#endif
-
-
- /// Low precision 16 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<i16, lowp> lowp_i16vec1;
-
- /// Low precision 16 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<i16, lowp> lowp_i16vec2;
-
- /// Low precision 16 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<i16, lowp> lowp_i16vec3;
-
- /// Low precision 16 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<i16, lowp> lowp_i16vec4;
-
-
- /// Medium precision 16 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<i16, mediump> mediump_i16vec1;
-
- /// Medium precision 16 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<i16, mediump> mediump_i16vec2;
-
- /// Medium precision 16 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<i16, mediump> mediump_i16vec3;
-
- /// Medium precision 16 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<i16, mediump> mediump_i16vec4;
-
-
- /// High precision 16 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<i16, highp> highp_i16vec1;
-
- /// High precision 16 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<i16, highp> highp_i16vec2;
-
- /// High precision 16 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<i16, highp> highp_i16vec3;
-
- /// High precision 16 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<i16, highp> highp_i16vec4;
-
-
-#if(defined(GLM_PRECISION_LOWP_INT))
- typedef lowp_i16vec1 i16vec1;
- typedef lowp_i16vec2 i16vec2;
- typedef lowp_i16vec3 i16vec3;
- typedef lowp_i16vec4 i16vec4;
-#elif(defined(GLM_PRECISION_MEDIUMP_INT))
- typedef mediump_i16vec1 i16vec1;
- typedef mediump_i16vec2 i16vec2;
- typedef mediump_i16vec3 i16vec3;
- typedef mediump_i16vec4 i16vec4;
-#else
- /// Default precision 16 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef highp_i16vec1 i16vec1;
-
- /// Default precision 16 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef highp_i16vec2 i16vec2;
-
- /// Default precision 16 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef highp_i16vec3 i16vec3;
-
- /// Default precision 16 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef highp_i16vec4 i16vec4;
-#endif
-
-
- /// Low precision 32 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<i32, lowp> lowp_i32vec1;
-
- /// Low precision 32 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<i32, lowp> lowp_i32vec2;
-
- /// Low precision 32 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<i32, lowp> lowp_i32vec3;
-
- /// Low precision 32 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<i32, lowp> lowp_i32vec4;
-
-
- /// Medium precision 32 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<i32, mediump> mediump_i32vec1;
-
- /// Medium precision 32 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<i32, mediump> mediump_i32vec2;
-
- /// Medium precision 32 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<i32, mediump> mediump_i32vec3;
-
- /// Medium precision 32 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<i32, mediump> mediump_i32vec4;
-
-
- /// High precision 32 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<i32, highp> highp_i32vec1;
-
- /// High precision 32 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<i32, highp> highp_i32vec2;
-
- /// High precision 32 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<i32, highp> highp_i32vec3;
-
- /// High precision 32 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<i32, highp> highp_i32vec4;
-
-#if(defined(GLM_PRECISION_LOWP_INT))
- typedef lowp_i32vec1 i32vec1;
- typedef lowp_i32vec2 i32vec2;
- typedef lowp_i32vec3 i32vec3;
- typedef lowp_i32vec4 i32vec4;
-#elif(defined(GLM_PRECISION_MEDIUMP_INT))
- typedef mediump_i32vec1 i32vec1;
- typedef mediump_i32vec2 i32vec2;
- typedef mediump_i32vec3 i32vec3;
- typedef mediump_i32vec4 i32vec4;
-#else
- /// Default precision 32 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef highp_i32vec1 i32vec1;
-
- /// Default precision 32 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef highp_i32vec2 i32vec2;
-
- /// Default precision 32 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef highp_i32vec3 i32vec3;
-
- /// Default precision 32 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef highp_i32vec4 i32vec4;
-#endif
-
-
- /// Low precision 32 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<i32, lowp> lowp_i32vec1;
-
- /// Low precision 32 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<i32, lowp> lowp_i32vec2;
-
- /// Low precision 32 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<i32, lowp> lowp_i32vec3;
-
- /// Low precision 32 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<i32, lowp> lowp_i32vec4;
-
-
- /// Medium precision 32 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<i32, mediump> mediump_i32vec1;
-
- /// Medium precision 32 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<i32, mediump> mediump_i32vec2;
-
- /// Medium precision 32 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<i32, mediump> mediump_i32vec3;
-
- /// Medium precision 32 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<i32, mediump> mediump_i32vec4;
-
-
- /// High precision 32 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<i32, highp> highp_i32vec1;
-
- /// High precision 32 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<i32, highp> highp_i32vec2;
-
- /// High precision 32 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<i32, highp> highp_i32vec3;
-
- /// High precision 32 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<i32, highp> highp_i32vec4;
-
-#if(defined(GLM_PRECISION_LOWP_INT))
- typedef lowp_i32vec1 i32vec1;
- typedef lowp_i32vec2 i32vec2;
- typedef lowp_i32vec3 i32vec3;
- typedef lowp_i32vec4 i32vec4;
-#elif(defined(GLM_PRECISION_MEDIUMP_INT))
- typedef mediump_i32vec1 i32vec1;
- typedef mediump_i32vec2 i32vec2;
- typedef mediump_i32vec3 i32vec3;
- typedef mediump_i32vec4 i32vec4;
-#else
- /// Default precision 32 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef highp_i32vec1 i32vec1;
-
- /// Default precision 32 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef highp_i32vec2 i32vec2;
-
- /// Default precision 32 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef highp_i32vec3 i32vec3;
-
- /// Default precision 32 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef highp_i32vec4 i32vec4;
-#endif
-
-
-
- /// Low precision 64 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<i64, lowp> lowp_i64vec1;
-
- /// Low precision 64 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<i64, lowp> lowp_i64vec2;
-
- /// Low precision 64 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<i64, lowp> lowp_i64vec3;
-
- /// Low precision 64 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<i64, lowp> lowp_i64vec4;
-
-
- /// Medium precision 64 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<i64, mediump> mediump_i64vec1;
-
- /// Medium precision 64 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<i64, mediump> mediump_i64vec2;
-
- /// Medium precision 64 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<i64, mediump> mediump_i64vec3;
-
- /// Medium precision 64 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<i64, mediump> mediump_i64vec4;
-
-
- /// High precision 64 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<i64, highp> highp_i64vec1;
-
- /// High precision 64 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<i64, highp> highp_i64vec2;
-
- /// High precision 64 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<i64, highp> highp_i64vec3;
-
- /// High precision 64 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<i64, highp> highp_i64vec4;
-
-#if(defined(GLM_PRECISION_LOWP_INT))
- typedef lowp_i64vec1 i64vec1;
- typedef lowp_i64vec2 i64vec2;
- typedef lowp_i64vec3 i64vec3;
- typedef lowp_i64vec4 i64vec4;
-#elif(defined(GLM_PRECISION_MEDIUMP_INT))
- typedef mediump_i64vec1 i64vec1;
- typedef mediump_i64vec2 i64vec2;
- typedef mediump_i64vec3 i64vec3;
- typedef mediump_i64vec4 i64vec4;
-#else
- /// Default precision 64 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef highp_i64vec1 i64vec1;
-
- /// Default precision 64 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef highp_i64vec2 i64vec2;
-
- /// Default precision 64 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef highp_i64vec3 i64vec3;
-
- /// Default precision 64 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef highp_i64vec4 i64vec4;
-#endif
-
-
- /////////////////////////////
- // Unsigned int vector types
-
- /// Low precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 lowp_uint8;
-
- /// Low precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 lowp_uint16;
-
- /// Low precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 lowp_uint32;
-
- /// Low precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 lowp_uint64;
-
-
- /// Low precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 lowp_uint8_t;
-
- /// Low precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 lowp_uint16_t;
-
- /// Low precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 lowp_uint32_t;
-
- /// Low precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 lowp_uint64_t;
-
-
- /// Low precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 lowp_u8;
-
- /// Low precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 lowp_u16;
-
- /// Low precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 lowp_u32;
-
- /// Low precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 lowp_u64;
-
-
-
- /// Medium precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 mediump_uint8;
-
- /// Medium precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 mediump_uint16;
-
- /// Medium precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 mediump_uint32;
-
- /// Medium precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 mediump_uint64;
-
- /// Medium precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 mediump_uint8_t;
-
- /// Medium precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 mediump_uint16_t;
-
- /// Medium precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 mediump_uint32_t;
-
- /// Medium precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 mediump_uint64_t;
-
- /// Medium precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 mediump_u8;
-
- /// Medium precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 mediump_u16;
-
- /// Medium precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 mediump_u32;
-
- /// Medium precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 mediump_u64;
-
-
-
- /// Medium precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 highp_uint8;
-
- /// Medium precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 highp_uint16;
-
- /// Medium precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 highp_uint32;
-
- /// Medium precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 highp_uint64;
-
- /// Medium precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 highp_uint8_t;
-
- /// Medium precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 highp_uint16_t;
-
- /// Medium precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 highp_uint32_t;
-
- /// Medium precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 highp_uint64_t;
-
- /// Medium precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 highp_u8;
-
- /// Medium precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 highp_u16;
-
- /// Medium precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 highp_u32;
-
- /// Medium precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 highp_u64;
-
-
-
- /// 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 uint8;
-
- /// 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 uint16;
-
- /// 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 uint32;
-
- /// 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 uint64;
-
-#if GLM_HAS_EXTENDED_INTEGER_TYPE
- using std::uint8_t;
- using std::uint16_t;
- using std::uint32_t;
- using std::uint64_t;
-#else
- /// 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 uint8_t;
-
- /// 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 uint16_t;
-
- /// 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 uint32_t;
-
- /// 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 uint64_t;
-#endif
-
- /// 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 u8;
-
- /// 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 u16;
-
- /// 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 u32;
-
- /// 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 u64;
-
-
-
- /// Low precision 8 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<u8, lowp> lowp_u8vec1;
-
- /// Low precision 8 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<u8, lowp> lowp_u8vec2;
-
- /// Low precision 8 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<u8, lowp> lowp_u8vec3;
-
- /// Low precision 8 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<u8, lowp> lowp_u8vec4;
-
-
- /// Medium precision 8 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<u8, mediump> mediump_u8vec1;
-
- /// Medium precision 8 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<u8, mediump> mediump_u8vec2;
-
- /// Medium precision 8 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<u8, mediump> mediump_u8vec3;
-
- /// Medium precision 8 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<u8, mediump> mediump_u8vec4;
-
-
- /// High precision 8 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<u8, highp> highp_u8vec1;
-
- /// High precision 8 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<u8, highp> highp_u8vec2;
-
- /// High precision 8 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<u8, highp> highp_u8vec3;
-
- /// High precision 8 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<u8, highp> highp_u8vec4;
-
-#if(defined(GLM_PRECISION_LOWP_INT))
- typedef lowp_u8vec1 u8vec1;
- typedef lowp_u8vec2 u8vec2;
- typedef lowp_u8vec3 u8vec3;
- typedef lowp_u8vec4 u8vec4;
-#elif(defined(GLM_PRECISION_MEDIUMP_INT))
- typedef mediump_u8vec1 u8vec1;
- typedef mediump_u8vec2 u8vec2;
- typedef mediump_u8vec3 u8vec3;
- typedef mediump_u8vec4 u8vec4;
-#else
- /// Default precision 8 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef highp_u8vec1 u8vec1;
-
- /// Default precision 8 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef highp_u8vec2 u8vec2;
-
- /// Default precision 8 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef highp_u8vec3 u8vec3;
-
- /// Default precision 8 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef highp_u8vec4 u8vec4;
-#endif
-
-
- /// Low precision 16 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<u16, lowp> lowp_u16vec1;
-
- /// Low precision 16 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<u16, lowp> lowp_u16vec2;
-
- /// Low precision 16 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<u16, lowp> lowp_u16vec3;
-
- /// Low precision 16 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<u16, lowp> lowp_u16vec4;
-
-
- /// Medium precision 16 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<u16, mediump> mediump_u16vec1;
-
- /// Medium precision 16 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<u16, mediump> mediump_u16vec2;
-
- /// Medium precision 16 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<u16, mediump> mediump_u16vec3;
-
- /// Medium precision 16 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<u16, mediump> mediump_u16vec4;
-
-
- /// High precision 16 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<u16, highp> highp_u16vec1;
-
- /// High precision 16 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<u16, highp> highp_u16vec2;
-
- /// High precision 16 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<u16, highp> highp_u16vec3;
-
- /// High precision 16 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<u16, highp> highp_u16vec4;
-
-
-#if(defined(GLM_PRECISION_LOWP_INT))
- typedef lowp_u16vec1 u16vec1;
- typedef lowp_u16vec2 u16vec2;
- typedef lowp_u16vec3 u16vec3;
- typedef lowp_u16vec4 u16vec4;
-#elif(defined(GLM_PRECISION_MEDIUMP_INT))
- typedef mediump_u16vec1 u16vec1;
- typedef mediump_u16vec2 u16vec2;
- typedef mediump_u16vec3 u16vec3;
- typedef mediump_u16vec4 u16vec4;
-#else
- /// Default precision 16 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef highp_u16vec1 u16vec1;
-
- /// Default precision 16 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef highp_u16vec2 u16vec2;
-
- /// Default precision 16 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef highp_u16vec3 u16vec3;
-
- /// Default precision 16 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef highp_u16vec4 u16vec4;
-#endif
-
-
- /// Low precision 32 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<u32, lowp> lowp_u32vec1;
-
- /// Low precision 32 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<u32, lowp> lowp_u32vec2;
-
- /// Low precision 32 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<u32, lowp> lowp_u32vec3;
-
- /// Low precision 32 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<u32, lowp> lowp_u32vec4;
-
-
- /// Medium precision 32 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<u32, mediump> mediump_u32vec1;
-
- /// Medium precision 32 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<u32, mediump> mediump_u32vec2;
-
- /// Medium precision 32 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<u32, mediump> mediump_u32vec3;
-
- /// Medium precision 32 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<u32, mediump> mediump_u32vec4;
-
-
- /// High precision 32 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<u32, highp> highp_u32vec1;
-
- /// High precision 32 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<u32, highp> highp_u32vec2;
-
- /// High precision 32 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<u32, highp> highp_u32vec3;
-
- /// High precision 32 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<u32, highp> highp_u32vec4;
-
-#if(defined(GLM_PRECISION_LOWP_INT))
- typedef lowp_u32vec1 u32vec1;
- typedef lowp_u32vec2 u32vec2;
- typedef lowp_u32vec3 u32vec3;
- typedef lowp_u32vec4 u32vec4;
-#elif(defined(GLM_PRECISION_MEDIUMP_INT))
- typedef mediump_u32vec1 u32vec1;
- typedef mediump_u32vec2 u32vec2;
- typedef mediump_u32vec3 u32vec3;
- typedef mediump_u32vec4 u32vec4;
-#else
- /// Default precision 32 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef highp_u32vec1 u32vec1;
-
- /// Default precision 32 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef highp_u32vec2 u32vec2;
-
- /// Default precision 32 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef highp_u32vec3 u32vec3;
-
- /// Default precision 32 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef highp_u32vec4 u32vec4;
-#endif
-
-
- /// Low precision 32 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<u32, lowp> lowp_u32vec1;
-
- /// Low precision 32 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<u32, lowp> lowp_u32vec2;
-
- /// Low precision 32 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<u32, lowp> lowp_u32vec3;
-
- /// Low precision 32 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<u32, lowp> lowp_u32vec4;
-
-
- /// Medium precision 32 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<u32, mediump> mediump_u32vec1;
-
- /// Medium precision 32 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<u32, mediump> mediump_u32vec2;
-
- /// Medium precision 32 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<u32, mediump> mediump_u32vec3;
-
- /// Medium precision 32 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<u32, mediump> mediump_u32vec4;
-
-
- /// High precision 32 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<u32, highp> highp_u32vec1;
-
- /// High precision 32 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<u32, highp> highp_u32vec2;
-
- /// High precision 32 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<u32, highp> highp_u32vec3;
-
- /// High precision 32 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<u32, highp> highp_u32vec4;
-
-#if(defined(GLM_PRECISION_LOWP_INT))
- typedef lowp_u32vec1 u32vec1;
- typedef lowp_u32vec2 u32vec2;
- typedef lowp_u32vec3 u32vec3;
- typedef lowp_u32vec4 u32vec4;
-#elif(defined(GLM_PRECISION_MEDIUMP_INT))
- typedef mediump_u32vec1 u32vec1;
- typedef mediump_u32vec2 u32vec2;
- typedef mediump_u32vec3 u32vec3;
- typedef mediump_u32vec4 u32vec4;
-#else
- /// Default precision 32 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef highp_u32vec1 u32vec1;
-
- /// Default precision 32 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef highp_u32vec2 u32vec2;
-
- /// Default precision 32 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef highp_u32vec3 u32vec3;
-
- /// Default precision 32 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef highp_u32vec4 u32vec4;
-#endif
-
-
-
- /// Low precision 64 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<u64, lowp> lowp_u64vec1;
-
- /// Low precision 64 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<u64, lowp> lowp_u64vec2;
-
- /// Low precision 64 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<u64, lowp> lowp_u64vec3;
-
- /// Low precision 64 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<u64, lowp> lowp_u64vec4;
-
-
- /// Medium precision 64 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<u64, mediump> mediump_u64vec1;
-
- /// Medium precision 64 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<u64, mediump> mediump_u64vec2;
-
- /// Medium precision 64 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<u64, mediump> mediump_u64vec3;
-
- /// Medium precision 64 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<u64, mediump> mediump_u64vec4;
-
-
- /// High precision 64 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<u64, highp> highp_u64vec1;
-
- /// High precision 64 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<u64, highp> highp_u64vec2;
-
- /// High precision 64 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<u64, highp> highp_u64vec3;
-
- /// High precision 64 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<u64, highp> highp_u64vec4;
-
-#if(defined(GLM_PRECISION_LOWP_UINT))
- typedef lowp_u64vec1 u64vec1;
- typedef lowp_u64vec2 u64vec2;
- typedef lowp_u64vec3 u64vec3;
- typedef lowp_u64vec4 u64vec4;
-#elif(defined(GLM_PRECISION_MEDIUMP_UINT))
- typedef mediump_u64vec1 u64vec1;
- typedef mediump_u64vec2 u64vec2;
- typedef mediump_u64vec3 u64vec3;
- typedef mediump_u64vec4 u64vec4;
-#else
- /// Default precision 64 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef highp_u64vec1 u64vec1;
-
- /// Default precision 64 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef highp_u64vec2 u64vec2;
-
- /// Default precision 64 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef highp_u64vec3 u64vec3;
-
- /// Default precision 64 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef highp_u64vec4 u64vec4;
-#endif
-
-
- //////////////////////
- // Float vector types
-
- /// Low 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float32 lowp_float32;
-
- /// Low 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float64 lowp_float64;
-
- /// Low 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float32 lowp_float32_t;
-
- /// Low 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float64 lowp_float64_t;
-
- /// Low 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef float32 lowp_f32;
-
- /// Low 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef float64 lowp_f64;
-
- /// Low 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float32 lowp_float32;
-
- /// Low 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float64 lowp_float64;
-
- /// Low 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float32 lowp_float32_t;
-
- /// Low 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float64 lowp_float64_t;
-
- /// Low 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef float32 lowp_f32;
-
- /// Low 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef float64 lowp_f64;
-
-
- /// Low 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float32 lowp_float32;
-
- /// Low 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float64 lowp_float64;
-
- /// Low 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float32 lowp_float32_t;
-
- /// Low 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float64 lowp_float64_t;
-
- /// Low 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef float32 lowp_f32;
-
- /// Low 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef float64 lowp_f64;
-
-
- /// Medium 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float32 mediump_float32;
-
- /// Medium 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float64 mediump_float64;
-
- /// Medium 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float32 mediump_float32_t;
-
- /// Medium 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float64 mediump_float64_t;
-
- /// Medium 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef float32 mediump_f32;
-
- /// Medium 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef float64 mediump_f64;
-
-
- /// High 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float32 highp_float32;
-
- /// High 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float64 highp_float64;
-
- /// High 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float32 highp_float32_t;
-
- /// High 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float64 highp_float64_t;
-
- /// High 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef float32 highp_f32;
-
- /// High 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef float64 highp_f64;
-
-
-#if(defined(GLM_PRECISION_LOWP_FLOAT))
- /// Default 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef lowp_float32 float32;
-
- /// Default 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef lowp_float64 float64;
-
- /// Default 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef lowp_float32_t float32_t;
-
- /// Default 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef lowp_float64_t float64_t;
-
- /// Default 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef lowp_f32 f32;
-
- /// Default 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef lowp_f64 f64;
-
-#elif(defined(GLM_PRECISION_MEDIUMP_FLOAT))
-
- /// Default 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef mediump_float32 float32;
-
- /// Default 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef mediump_float64 float64;
-
- /// Default 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef mediump_float32 float32_t;
-
- /// Default 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef mediump_float64 float64_t;
-
- /// Default 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef mediump_float32 f32;
-
- /// Default 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef mediump_float64 f64;
-
-#else//(defined(GLM_PRECISION_HIGHP_FLOAT))
-
- /// Default 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef highp_float32 float32;
-
- /// Default 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef highp_float64 float64;
-
- /// Default 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef highp_float32_t float32_t;
-
- /// Default 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef highp_float64_t float64_t;
-
- /// Default 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef highp_float32_t f32;
-
- /// Default 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef highp_float64_t f64;
-#endif
-
-
- /// Low single-precision floating-point vector of 1 component.
- /// @see gtc_type_precision
- typedef tvec1<float, lowp> lowp_vec1;
-
- /// Low single-precision floating-point vector of 2 components.
- /// @see gtc_type_precision
- typedef tvec2<float, lowp> lowp_vec2;
-
- /// Low single-precision floating-point vector of 3 components.
- /// @see gtc_type_precision
- typedef tvec3<float, lowp> lowp_vec3;
-
- /// Low single-precision floating-point vector of 4 components.
- /// @see gtc_type_precision
- typedef tvec4<float, lowp> lowp_vec4;
-
- /// Low single-precision floating-point vector of 1 component.
- /// @see gtc_type_precision
- typedef tvec1<float, lowp> lowp_fvec1;
-
- /// Low single-precision floating-point vector of 2 components.
- /// @see gtc_type_precision
- typedef tvec2<float, lowp> lowp_fvec2;
-
- /// Low single-precision floating-point vector of 3 components.
- /// @see gtc_type_precision
- typedef tvec3<float, lowp> lowp_fvec3;
-
- /// Low single-precision floating-point vector of 4 components.
- /// @see gtc_type_precision
- typedef tvec4<float, lowp> lowp_fvec4;
-
-
- /// Medium single-precision floating-point vector of 1 component.
- /// @see gtc_type_precision
- typedef tvec1<float, mediump> mediump_vec1;
-
- /// Medium Single-precision floating-point vector of 2 components.
- /// @see gtc_type_precision
- typedef tvec2<float, mediump> mediump_vec2;
-
- /// Medium Single-precision floating-point vector of 3 components.
- /// @see gtc_type_precision
- typedef tvec3<float, mediump> mediump_vec3;
-
- /// Medium Single-precision floating-point vector of 4 components.
- /// @see gtc_type_precision
- typedef tvec4<float, mediump> mediump_vec4;
-
- /// Medium single-precision floating-point vector of 1 component.
- /// @see gtc_type_precision
- typedef tvec1<float, mediump> mediump_fvec1;
-
- /// Medium Single-precision floating-point vector of 2 components.
- /// @see gtc_type_precision
- typedef tvec2<float, mediump> mediump_fvec2;
-
- /// Medium Single-precision floating-point vector of 3 components.
- /// @see gtc_type_precision
- typedef tvec3<float, mediump> mediump_fvec3;
-
- /// Medium Single-precision floating-point vector of 4 components.
- /// @see gtc_type_precision
- typedef tvec4<float, mediump> mediump_fvec4;
-
-
- /// High single-precision floating-point vector of 1 component.
- /// @see gtc_type_precision
- typedef tvec1<float, highp> highp_vec1;
-
- /// High Single-precision floating-point vector of 2 components.
- /// @see gtc_type_precision
- typedef tvec2<float, highp> highp_vec2;
-
- /// High Single-precision floating-point vector of 3 components.
- /// @see gtc_type_precision
- typedef tvec3<float, highp> highp_vec3;
-
- /// High Single-precision floating-point vector of 4 components.
- /// @see gtc_type_precision
- typedef tvec4<float, highp> highp_vec4;
-
- /// High single-precision floating-point vector of 1 component.
- /// @see gtc_type_precision
- typedef tvec1<float, highp> highp_fvec1;
-
- /// High Single-precision floating-point vector of 2 components.
- /// @see gtc_type_precision
- typedef tvec2<float, highp> highp_fvec2;
-
- /// High Single-precision floating-point vector of 3 components.
- /// @see gtc_type_precision
- typedef tvec3<float, highp> highp_fvec3;
-
- /// High Single-precision floating-point vector of 4 components.
- /// @see gtc_type_precision
- typedef tvec4<float, highp> highp_fvec4;
-
-
- /// Low single-precision floating-point vector of 1 component.
- /// @see gtc_type_precision
- typedef tvec1<f32, lowp> lowp_f32vec1;
-
- /// Low single-precision floating-point vector of 2 components.
- /// @see gtc_type_precision
- typedef tvec2<f32, lowp> lowp_f32vec2;
-
- /// Low single-precision floating-point vector of 3 components.
- /// @see gtc_type_precision
- typedef tvec3<f32, lowp> lowp_f32vec3;
-
- /// Low single-precision floating-point vector of 4 components.
- /// @see gtc_type_precision
- typedef tvec4<f32, lowp> lowp_f32vec4;
-
- /// Medium single-precision floating-point vector of 1 component.
- /// @see gtc_type_precision
- typedef tvec1<f32, mediump> mediump_f32vec1;
-
- /// Medium single-precision floating-point vector of 2 components.
- /// @see gtc_type_precision
- typedef tvec2<f32, mediump> mediump_f32vec2;
-
- /// Medium single-precision floating-point vector of 3 components.
- /// @see gtc_type_precision
- typedef tvec3<f32, mediump> mediump_f32vec3;
-
- /// Medium single-precision floating-point vector of 4 components.
- /// @see gtc_type_precision
- typedef tvec4<f32, mediump> mediump_f32vec4;
-
- /// High single-precision floating-point vector of 1 component.
- /// @see gtc_type_precision
- typedef tvec1<f32, highp> highp_f32vec1;
-
- /// High single-precision floating-point vector of 2 components.
- /// @see gtc_type_precision
- typedef tvec2<f32, highp> highp_f32vec2;
-
- /// High single-precision floating-point vector of 3 components.
- /// @see gtc_type_precision
- typedef tvec3<f32, highp> highp_f32vec3;
-
- /// High single-precision floating-point vector of 4 components.
- /// @see gtc_type_precision
- typedef tvec4<f32, highp> highp_f32vec4;
-
-
- /// Low double-precision floating-point vector of 1 component.
- /// @see gtc_type_precision
- typedef tvec1<f64, lowp> lowp_f64vec1;
-
- /// Low double-precision floating-point vector of 2 components.
- /// @see gtc_type_precision
- typedef tvec2<f64, lowp> lowp_f64vec2;
-
- /// Low double-precision floating-point vector of 3 components.
- /// @see gtc_type_precision
- typedef tvec3<f64, lowp> lowp_f64vec3;
-
- /// Low double-precision floating-point vector of 4 components.
- /// @see gtc_type_precision
- typedef tvec4<f64, lowp> lowp_f64vec4;
-
- /// Medium double-precision floating-point vector of 1 component.
- /// @see gtc_type_precision
- typedef tvec1<f64, mediump> mediump_f64vec1;
-
- /// Medium double-precision floating-point vector of 2 components.
- /// @see gtc_type_precision
- typedef tvec2<f64, mediump> mediump_f64vec2;
-
- /// Medium double-precision floating-point vector of 3 components.
- /// @see gtc_type_precision
- typedef tvec3<f64, mediump> mediump_f64vec3;
-
- /// Medium double-precision floating-point vector of 4 components.
- /// @see gtc_type_precision
- typedef tvec4<f64, mediump> mediump_f64vec4;
-
- /// High double-precision floating-point vector of 1 component.
- /// @see gtc_type_precision
- typedef tvec1<f64, highp> highp_f64vec1;
-
- /// High double-precision floating-point vector of 2 components.
- /// @see gtc_type_precision
- typedef tvec2<f64, highp> highp_f64vec2;
-
- /// High double-precision floating-point vector of 3 components.
- /// @see gtc_type_precision
- typedef tvec3<f64, highp> highp_f64vec3;
-
- /// High double-precision floating-point vector of 4 components.
- /// @see gtc_type_precision
- typedef tvec4<f64, highp> highp_f64vec4;
-
-
- //////////////////////
- // Float matrix types
-
- /// Low single-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef lowp_f32 lowp_fmat1x1;
-
- /// Low single-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef tmat2x2<f32, lowp> lowp_fmat2x2;
-
- /// Low single-precision floating-point 2x3 matrix.
- /// @see gtc_type_precision
- typedef tmat2x3<f32, lowp> lowp_fmat2x3;
-
- /// Low single-precision floating-point 2x4 matrix.
- /// @see gtc_type_precision
- typedef tmat2x4<f32, lowp> lowp_fmat2x4;
-
- /// Low single-precision floating-point 3x2 matrix.
- /// @see gtc_type_precision
- typedef tmat3x2<f32, lowp> lowp_fmat3x2;
-
- /// Low single-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef tmat3x3<f32, lowp> lowp_fmat3x3;
-
- /// Low single-precision floating-point 3x4 matrix.
- /// @see gtc_type_precision
- typedef tmat3x4<f32, lowp> lowp_fmat3x4;
-
- /// Low single-precision floating-point 4x2 matrix.
- /// @see gtc_type_precision
- typedef tmat4x2<f32, lowp> lowp_fmat4x2;
-
- /// Low single-precision floating-point 4x3 matrix.
- /// @see gtc_type_precision
- typedef tmat4x3<f32, lowp> lowp_fmat4x3;
-
- /// Low single-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef tmat4x4<f32, lowp> lowp_fmat4x4;
-
- /// Low single-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef lowp_fmat1x1 lowp_fmat1;
-
- /// Low single-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef lowp_fmat2x2 lowp_fmat2;
-
- /// Low single-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef lowp_fmat3x3 lowp_fmat3;
-
- /// Low single-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef lowp_fmat4x4 lowp_fmat4;
-
-
- /// Medium single-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef mediump_f32 mediump_fmat1x1;
-
- /// Medium single-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef tmat2x2<f32, mediump> mediump_fmat2x2;
-
- /// Medium single-precision floating-point 2x3 matrix.
- /// @see gtc_type_precision
- typedef tmat2x3<f32, mediump> mediump_fmat2x3;
-
- /// Medium single-precision floating-point 2x4 matrix.
- /// @see gtc_type_precision
- typedef tmat2x4<f32, mediump> mediump_fmat2x4;
-
- /// Medium single-precision floating-point 3x2 matrix.
- /// @see gtc_type_precision
- typedef tmat3x2<f32, mediump> mediump_fmat3x2;
-
- /// Medium single-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef tmat3x3<f32, mediump> mediump_fmat3x3;
-
- /// Medium single-precision floating-point 3x4 matrix.
- /// @see gtc_type_precision
- typedef tmat3x4<f32, mediump> mediump_fmat3x4;
-
- /// Medium single-precision floating-point 4x2 matrix.
- /// @see gtc_type_precision
- typedef tmat4x2<f32, mediump> mediump_fmat4x2;
-
- /// Medium single-precision floating-point 4x3 matrix.
- /// @see gtc_type_precision
- typedef tmat4x3<f32, mediump> mediump_fmat4x3;
-
- /// Medium single-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef tmat4x4<f32, mediump> mediump_fmat4x4;
-
- /// Medium single-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef mediump_fmat1x1 mediump_fmat1;
-
- /// Medium single-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef mediump_fmat2x2 mediump_fmat2;
-
- /// Medium single-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef mediump_fmat3x3 mediump_fmat3;
-
- /// Medium single-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef mediump_fmat4x4 mediump_fmat4;
-
-
- /// High single-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef highp_f32 highp_fmat1x1;
-
- /// High single-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef tmat2x2<f32, highp> highp_fmat2x2;
-
- /// High single-precision floating-point 2x3 matrix.
- /// @see gtc_type_precision
- typedef tmat2x3<f32, highp> highp_fmat2x3;
-
- /// High single-precision floating-point 2x4 matrix.
- /// @see gtc_type_precision
- typedef tmat2x4<f32, highp> highp_fmat2x4;
-
- /// High single-precision floating-point 3x2 matrix.
- /// @see gtc_type_precision
- typedef tmat3x2<f32, highp> highp_fmat3x2;
-
- /// High single-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef tmat3x3<f32, highp> highp_fmat3x3;
-
- /// High single-precision floating-point 3x4 matrix.
- /// @see gtc_type_precision
- typedef tmat3x4<f32, highp> highp_fmat3x4;
-
- /// High single-precision floating-point 4x2 matrix.
- /// @see gtc_type_precision
- typedef tmat4x2<f32, highp> highp_fmat4x2;
-
- /// High single-precision floating-point 4x3 matrix.
- /// @see gtc_type_precision
- typedef tmat4x3<f32, highp> highp_fmat4x3;
-
- /// High single-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef tmat4x4<f32, highp> highp_fmat4x4;
-
- /// High single-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef highp_fmat1x1 highp_fmat1;
-
- /// High single-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef highp_fmat2x2 highp_fmat2;
-
- /// High single-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef highp_fmat3x3 highp_fmat3;
-
- /// High single-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef highp_fmat4x4 highp_fmat4;
-
-
- /// Low single-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef f32 lowp_f32mat1x1;
-
- /// Low single-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef tmat2x2<f32, lowp> lowp_f32mat2x2;
-
- /// Low single-precision floating-point 2x3 matrix.
- /// @see gtc_type_precision
- typedef tmat2x3<f32, lowp> lowp_f32mat2x3;
-
- /// Low single-precision floating-point 2x4 matrix.
- /// @see gtc_type_precision
- typedef tmat2x4<f32, lowp> lowp_f32mat2x4;
-
- /// Low single-precision floating-point 3x2 matrix.
- /// @see gtc_type_precision
- typedef tmat3x2<f32, lowp> lowp_f32mat3x2;
-
- /// Low single-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef tmat3x3<f32, lowp> lowp_f32mat3x3;
-
- /// Low single-precision floating-point 3x4 matrix.
- /// @see gtc_type_precision
- typedef tmat3x4<f32, lowp> lowp_f32mat3x4;
-
- /// Low single-precision floating-point 4x2 matrix.
- /// @see gtc_type_precision
- typedef tmat4x2<f32, lowp> lowp_f32mat4x2;
-
- /// Low single-precision floating-point 4x3 matrix.
- /// @see gtc_type_precision
- typedef tmat4x3<f32, lowp> lowp_f32mat4x3;
-
- /// Low single-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef tmat4x4<f32, lowp> lowp_f32mat4x4;
-
- /// Low single-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef detail::tmat1x1<f32, lowp> lowp_f32mat1;
-
- /// Low single-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef lowp_f32mat2x2 lowp_f32mat2;
-
- /// Low single-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef lowp_f32mat3x3 lowp_f32mat3;
-
- /// Low single-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef lowp_f32mat4x4 lowp_f32mat4;
-
-
- /// High single-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef f32 mediump_f32mat1x1;
-
- /// Low single-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef tmat2x2<f32, mediump> mediump_f32mat2x2;
-
- /// Medium single-precision floating-point 2x3 matrix.
- /// @see gtc_type_precision
- typedef tmat2x3<f32, mediump> mediump_f32mat2x3;
-
- /// Medium single-precision floating-point 2x4 matrix.
- /// @see gtc_type_precision
- typedef tmat2x4<f32, mediump> mediump_f32mat2x4;
-
- /// Medium single-precision floating-point 3x2 matrix.
- /// @see gtc_type_precision
- typedef tmat3x2<f32, mediump> mediump_f32mat3x2;
-
- /// Medium single-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef tmat3x3<f32, mediump> mediump_f32mat3x3;
-
- /// Medium single-precision floating-point 3x4 matrix.
- /// @see gtc_type_precision
- typedef tmat3x4<f32, mediump> mediump_f32mat3x4;
-
- /// Medium single-precision floating-point 4x2 matrix.
- /// @see gtc_type_precision
- typedef tmat4x2<f32, mediump> mediump_f32mat4x2;
-
- /// Medium single-precision floating-point 4x3 matrix.
- /// @see gtc_type_precision
- typedef tmat4x3<f32, mediump> mediump_f32mat4x3;
-
- /// Medium single-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef tmat4x4<f32, mediump> mediump_f32mat4x4;
-
- /// Medium single-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef detail::tmat1x1<f32, mediump> f32mat1;
-
- /// Medium single-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef mediump_f32mat2x2 mediump_f32mat2;
-
- /// Medium single-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef mediump_f32mat3x3 mediump_f32mat3;
-
- /// Medium single-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef mediump_f32mat4x4 mediump_f32mat4;
-
-
- /// High single-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef f32 highp_f32mat1x1;
-
- /// High single-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef tmat2x2<f32, highp> highp_f32mat2x2;
-
- /// High single-precision floating-point 2x3 matrix.
- /// @see gtc_type_precision
- typedef tmat2x3<f32, highp> highp_f32mat2x3;
-
- /// High single-precision floating-point 2x4 matrix.
- /// @see gtc_type_precision
- typedef tmat2x4<f32, highp> highp_f32mat2x4;
-
- /// High single-precision floating-point 3x2 matrix.
- /// @see gtc_type_precision
- typedef tmat3x2<f32, highp> highp_f32mat3x2;
-
- /// High single-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef tmat3x3<f32, highp> highp_f32mat3x3;
-
- /// High single-precision floating-point 3x4 matrix.
- /// @see gtc_type_precision
- typedef tmat3x4<f32, highp> highp_f32mat3x4;
-
- /// High single-precision floating-point 4x2 matrix.
- /// @see gtc_type_precision
- typedef tmat4x2<f32, highp> highp_f32mat4x2;
-
- /// High single-precision floating-point 4x3 matrix.
- /// @see gtc_type_precision
- typedef tmat4x3<f32, highp> highp_f32mat4x3;
-
- /// High single-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef tmat4x4<f32, highp> highp_f32mat4x4;
-
- /// High single-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef detail::tmat1x1<f32, highp> f32mat1;
-
- /// High single-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat2x2 highp_f32mat2;
-
- /// High single-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat3x3 highp_f32mat3;
-
- /// High single-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat4x4 highp_f32mat4;
-
-
- /// Low double-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef f64 lowp_f64mat1x1;
-
- /// Low double-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef tmat2x2<f64, lowp> lowp_f64mat2x2;
-
- /// Low double-precision floating-point 2x3 matrix.
- /// @see gtc_type_precision
- typedef tmat2x3<f64, lowp> lowp_f64mat2x3;
-
- /// Low double-precision floating-point 2x4 matrix.
- /// @see gtc_type_precision
- typedef tmat2x4<f64, lowp> lowp_f64mat2x4;
-
- /// Low double-precision floating-point 3x2 matrix.
- /// @see gtc_type_precision
- typedef tmat3x2<f64, lowp> lowp_f64mat3x2;
-
- /// Low double-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef tmat3x3<f64, lowp> lowp_f64mat3x3;
-
- /// Low double-precision floating-point 3x4 matrix.
- /// @see gtc_type_precision
- typedef tmat3x4<f64, lowp> lowp_f64mat3x4;
-
- /// Low double-precision floating-point 4x2 matrix.
- /// @see gtc_type_precision
- typedef tmat4x2<f64, lowp> lowp_f64mat4x2;
-
- /// Low double-precision floating-point 4x3 matrix.
- /// @see gtc_type_precision
- typedef tmat4x3<f64, lowp> lowp_f64mat4x3;
-
- /// Low double-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef tmat4x4<f64, lowp> lowp_f64mat4x4;
-
- /// Low double-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef lowp_f64mat1x1 lowp_f64mat1;
-
- /// Low double-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef lowp_f64mat2x2 lowp_f64mat2;
-
- /// Low double-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef lowp_f64mat3x3 lowp_f64mat3;
-
- /// Low double-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef lowp_f64mat4x4 lowp_f64mat4;
-
-
- /// Medium double-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef f64 Highp_f64mat1x1;
-
- /// Medium double-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef tmat2x2<f64, mediump> mediump_f64mat2x2;
-
- /// Medium double-precision floating-point 2x3 matrix.
- /// @see gtc_type_precision
- typedef tmat2x3<f64, mediump> mediump_f64mat2x3;
-
- /// Medium double-precision floating-point 2x4 matrix.
- /// @see gtc_type_precision
- typedef tmat2x4<f64, mediump> mediump_f64mat2x4;
-
- /// Medium double-precision floating-point 3x2 matrix.
- /// @see gtc_type_precision
- typedef tmat3x2<f64, mediump> mediump_f64mat3x2;
-
- /// Medium double-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef tmat3x3<f64, mediump> mediump_f64mat3x3;
-
- /// Medium double-precision floating-point 3x4 matrix.
- /// @see gtc_type_precision
- typedef tmat3x4<f64, mediump> mediump_f64mat3x4;
-
- /// Medium double-precision floating-point 4x2 matrix.
- /// @see gtc_type_precision
- typedef tmat4x2<f64, mediump> mediump_f64mat4x2;
-
- /// Medium double-precision floating-point 4x3 matrix.
- /// @see gtc_type_precision
- typedef tmat4x3<f64, mediump> mediump_f64mat4x3;
-
- /// Medium double-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef tmat4x4<f64, mediump> mediump_f64mat4x4;
-
- /// Medium double-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef mediump_f64mat1x1 mediump_f64mat1;
-
- /// Medium double-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef mediump_f64mat2x2 mediump_f64mat2;
-
- /// Medium double-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef mediump_f64mat3x3 mediump_f64mat3;
-
- /// Medium double-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef mediump_f64mat4x4 mediump_f64mat4;
-
- /// High double-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef f64 highp_f64mat1x1;
-
- /// High double-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef tmat2x2<f64, highp> highp_f64mat2x2;
-
- /// High double-precision floating-point 2x3 matrix.
- /// @see gtc_type_precision
- typedef tmat2x3<f64, highp> highp_f64mat2x3;
-
- /// High double-precision floating-point 2x4 matrix.
- /// @see gtc_type_precision
- typedef tmat2x4<f64, highp> highp_f64mat2x4;
-
- /// High double-precision floating-point 3x2 matrix.
- /// @see gtc_type_precision
- typedef tmat3x2<f64, highp> highp_f64mat3x2;
-
- /// High double-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef tmat3x3<f64, highp> highp_f64mat3x3;
-
- /// High double-precision floating-point 3x4 matrix.
- /// @see gtc_type_precision
- typedef tmat3x4<f64, highp> highp_f64mat3x4;
-
- /// High double-precision floating-point 4x2 matrix.
- /// @see gtc_type_precision
- typedef tmat4x2<f64, highp> highp_f64mat4x2;
-
- /// High double-precision floating-point 4x3 matrix.
- /// @see gtc_type_precision
- typedef tmat4x3<f64, highp> highp_f64mat4x3;
-
- /// High double-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef tmat4x4<f64, highp> highp_f64mat4x4;
-
- /// High double-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef highp_f64mat1x1 highp_f64mat1;
-
- /// High double-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef highp_f64mat2x2 highp_f64mat2;
-
- /// High double-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef highp_f64mat3x3 highp_f64mat3;
-
- /// High double-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef highp_f64mat4x4 highp_f64mat4;
-
- //////////////////////////
- // Quaternion types
-
- /// Low single-precision floating-point quaternion.
- /// @see gtc_type_precision
- typedef tquat<f32, lowp> lowp_f32quat;
-
- /// Low double-precision floating-point quaternion.
- /// @see gtc_type_precision
- typedef tquat<f64, lowp> lowp_f64quat;
-
- /// Medium single-precision floating-point quaternion.
- /// @see gtc_type_precision
- typedef tquat<f32, mediump> mediump_f32quat;
-
- /// Medium double-precision floating-point quaternion.
- /// @see gtc_type_precision
- typedef tquat<f64, mediump> mediump_f64quat;
-
- /// High single-precision floating-point quaternion.
- /// @see gtc_type_precision
- typedef tquat<f32, highp> highp_f32quat;
-
- /// High double-precision floating-point quaternion.
- /// @see gtc_type_precision
- typedef tquat<f64, highp> highp_f64quat;
-
-
-#if(defined(GLM_PRECISION_LOWP_FLOAT))
- typedef lowp_f32vec1 fvec1;
- typedef lowp_f32vec2 fvec2;
- typedef lowp_f32vec3 fvec3;
- typedef lowp_f32vec4 fvec4;
- typedef lowp_f32mat2 fmat2;
- typedef lowp_f32mat3 fmat3;
- typedef lowp_f32mat4 fmat4;
- typedef lowp_f32mat2x2 fmat2x2;
- typedef lowp_f32mat3x2 fmat3x2;
- typedef lowp_f32mat4x2 fmat4x2;
- typedef lowp_f32mat2x3 fmat2x3;
- typedef lowp_f32mat3x3 fmat3x3;
- typedef lowp_f32mat4x3 fmat4x3;
- typedef lowp_f32mat2x4 fmat2x4;
- typedef lowp_f32mat3x4 fmat3x4;
- typedef lowp_f32mat4x4 fmat4x4;
- typedef lowp_f32quat fquat;
-
- typedef lowp_f32vec1 f32vec1;
- typedef lowp_f32vec2 f32vec2;
- typedef lowp_f32vec3 f32vec3;
- typedef lowp_f32vec4 f32vec4;
- typedef lowp_f32mat2 f32mat2;
- typedef lowp_f32mat3 f32mat3;
- typedef lowp_f32mat4 f32mat4;
- typedef lowp_f32mat2x2 f32mat2x2;
- typedef lowp_f32mat3x2 f32mat3x2;
- typedef lowp_f32mat4x2 f32mat4x2;
- typedef lowp_f32mat2x3 f32mat2x3;
- typedef lowp_f32mat3x3 f32mat3x3;
- typedef lowp_f32mat4x3 f32mat4x3;
- typedef lowp_f32mat2x4 f32mat2x4;
- typedef lowp_f32mat3x4 f32mat3x4;
- typedef lowp_f32mat4x4 f32mat4x4;
- typedef lowp_f32quat f32quat;
-#elif(defined(GLM_PRECISION_MEDIUMP_FLOAT))
- typedef mediump_f32vec1 fvec1;
- typedef mediump_f32vec2 fvec2;
- typedef mediump_f32vec3 fvec3;
- typedef mediump_f32vec4 fvec4;
- typedef mediump_f32mat2 fmat2;
- typedef mediump_f32mat3 fmat3;
- typedef mediump_f32mat4 fmat4;
- typedef mediump_f32mat2x2 fmat2x2;
- typedef mediump_f32mat3x2 fmat3x2;
- typedef mediump_f32mat4x2 fmat4x2;
- typedef mediump_f32mat2x3 fmat2x3;
- typedef mediump_f32mat3x3 fmat3x3;
- typedef mediump_f32mat4x3 fmat4x3;
- typedef mediump_f32mat2x4 fmat2x4;
- typedef mediump_f32mat3x4 fmat3x4;
- typedef mediump_f32mat4x4 fmat4x4;
- typedef mediump_f32quat fquat;
-
- typedef mediump_f32vec1 f32vec1;
- typedef mediump_f32vec2 f32vec2;
- typedef mediump_f32vec3 f32vec3;
- typedef mediump_f32vec4 f32vec4;
- typedef mediump_f32mat2 f32mat2;
- typedef mediump_f32mat3 f32mat3;
- typedef mediump_f32mat4 f32mat4;
- typedef mediump_f32mat2x2 f32mat2x2;
- typedef mediump_f32mat3x2 f32mat3x2;
- typedef mediump_f32mat4x2 f32mat4x2;
- typedef mediump_f32mat2x3 f32mat2x3;
- typedef mediump_f32mat3x3 f32mat3x3;
- typedef mediump_f32mat4x3 f32mat4x3;
- typedef mediump_f32mat2x4 f32mat2x4;
- typedef mediump_f32mat3x4 f32mat3x4;
- typedef mediump_f32mat4x4 f32mat4x4;
- typedef mediump_f32quat f32quat;
-#else//if(defined(GLM_PRECISION_HIGHP_FLOAT))
- /// Default single-precision floating-point vector of 1 components.
- /// @see gtc_type_precision
- typedef highp_f32vec1 fvec1;
-
- /// Default single-precision floating-point vector of 2 components.
- /// @see gtc_type_precision
- typedef highp_f32vec2 fvec2;
-
- /// Default single-precision floating-point vector of 3 components.
- /// @see gtc_type_precision
- typedef highp_f32vec3 fvec3;
-
- /// Default single-precision floating-point vector of 4 components.
- /// @see gtc_type_precision
- typedef highp_f32vec4 fvec4;
-
- /// Default single-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat2x2 fmat2x2;
-
- /// Default single-precision floating-point 2x3 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat2x3 fmat2x3;
-
- /// Default single-precision floating-point 2x4 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat2x4 fmat2x4;
-
- /// Default single-precision floating-point 3x2 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat3x2 fmat3x2;
-
- /// Default single-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat3x3 fmat3x3;
-
- /// Default single-precision floating-point 3x4 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat3x4 fmat3x4;
-
- /// Default single-precision floating-point 4x2 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat4x2 fmat4x2;
-
- /// Default single-precision floating-point 4x3 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat4x3 fmat4x3;
-
- /// Default single-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat4x4 fmat4x4;
-
- /// Default single-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef fmat2x2 fmat2;
-
- /// Default single-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef fmat3x3 fmat3;
-
- /// Default single-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef fmat4x4 fmat4;
-
- /// Default single-precision floating-point quaternion.
- /// @see gtc_type_precision
- typedef highp_fquat fquat;
-
-
-
- /// Default single-precision floating-point vector of 1 components.
- /// @see gtc_type_precision
- typedef highp_f32vec1 f32vec1;
-
- /// Default single-precision floating-point vector of 2 components.
- /// @see gtc_type_precision
- typedef highp_f32vec2 f32vec2;
-
- /// Default single-precision floating-point vector of 3 components.
- /// @see gtc_type_precision
- typedef highp_f32vec3 f32vec3;
-
- /// Default single-precision floating-point vector of 4 components.
- /// @see gtc_type_precision
- typedef highp_f32vec4 f32vec4;
-
- /// Default single-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat2x2 f32mat2x2;
-
- /// Default single-precision floating-point 2x3 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat2x3 f32mat2x3;
-
- /// Default single-precision floating-point 2x4 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat2x4 f32mat2x4;
-
- /// Default single-precision floating-point 3x2 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat3x2 f32mat3x2;
-
- /// Default single-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat3x3 f32mat3x3;
-
- /// Default single-precision floating-point 3x4 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat3x4 f32mat3x4;
-
- /// Default single-precision floating-point 4x2 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat4x2 f32mat4x2;
-
- /// Default single-precision floating-point 4x3 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat4x3 f32mat4x3;
-
- /// Default single-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef highp_f32mat4x4 f32mat4x4;
-
- /// Default single-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef f32mat2x2 f32mat2;
-
- /// Default single-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef f32mat3x3 f32mat3;
-
- /// Default single-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef f32mat4x4 f32mat4;
-
- /// Default single-precision floating-point quaternion.
- /// @see gtc_type_precision
- typedef highp_f32quat f32quat;
-#endif
-
-#if(defined(GLM_PRECISION_LOWP_DOUBLE))
- typedef lowp_f64vec1 f64vec1;
- typedef lowp_f64vec2 f64vec2;
- typedef lowp_f64vec3 f64vec3;
- typedef lowp_f64vec4 f64vec4;
- typedef lowp_f64mat2 f64mat2;
- typedef lowp_f64mat3 f64mat3;
- typedef lowp_f64mat4 f64mat4;
- typedef lowp_f64mat2x2 f64mat2x2;
- typedef lowp_f64mat3x2 f64mat3x2;
- typedef lowp_f64mat4x2 f64mat4x2;
- typedef lowp_f64mat2x3 f64mat2x3;
- typedef lowp_f64mat3x3 f64mat3x3;
- typedef lowp_f64mat4x3 f64mat4x3;
- typedef lowp_f64mat2x4 f64mat2x4;
- typedef lowp_f64mat3x4 f64mat3x4;
- typedef lowp_f64mat4x4 f64mat4x4;
- typedef lowp_f64quat f64quat;
-#elif(defined(GLM_PRECISION_MEDIUMP_DOUBLE))
- typedef mediump_f64vec1 f64vec1;
- typedef mediump_f64vec2 f64vec2;
- typedef mediump_f64vec3 f64vec3;
- typedef mediump_f64vec4 f64vec4;
- typedef mediump_f64mat2 f64mat2;
- typedef mediump_f64mat3 f64mat3;
- typedef mediump_f64mat4 f64mat4;
- typedef mediump_f64mat2x2 f64mat2x2;
- typedef mediump_f64mat3x2 f64mat3x2;
- typedef mediump_f64mat4x2 f64mat4x2;
- typedef mediump_f64mat2x3 f64mat2x3;
- typedef mediump_f64mat3x3 f64mat3x3;
- typedef mediump_f64mat4x3 f64mat4x3;
- typedef mediump_f64mat2x4 f64mat2x4;
- typedef mediump_f64mat3x4 f64mat3x4;
- typedef mediump_f64mat4x4 f64mat4x4;
- typedef mediump_f64quat f64quat;
-#else
- /// Default double-precision floating-point vector of 1 components.
- /// @see gtc_type_precision
- typedef highp_f64vec1 f64vec1;
-
- /// Default double-precision floating-point vector of 2 components.
- /// @see gtc_type_precision
- typedef highp_f64vec2 f64vec2;
-
- /// Default double-precision floating-point vector of 3 components.
- /// @see gtc_type_precision
- typedef highp_f64vec3 f64vec3;
-
- /// Default double-precision floating-point vector of 4 components.
- /// @see gtc_type_precision
- typedef highp_f64vec4 f64vec4;
-
- /// Default double-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef highp_f64mat2x2 f64mat2x2;
-
- /// Default double-precision floating-point 2x3 matrix.
- /// @see gtc_type_precision
- typedef highp_f64mat2x3 f64mat2x3;
-
- /// Default double-precision floating-point 2x4 matrix.
- /// @see gtc_type_precision
- typedef highp_f64mat2x4 f64mat2x4;
-
- /// Default double-precision floating-point 3x2 matrix.
- /// @see gtc_type_precision
- typedef highp_f64mat3x2 f64mat3x2;
-
- /// Default double-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef highp_f64mat3x3 f64mat3x3;
-
- /// Default double-precision floating-point 3x4 matrix.
- /// @see gtc_type_precision
- typedef highp_f64mat3x4 f64mat3x4;
-
- /// Default double-precision floating-point 4x2 matrix.
- /// @see gtc_type_precision
- typedef highp_f64mat4x2 f64mat4x2;
-
- /// Default double-precision floating-point 4x3 matrix.
- /// @see gtc_type_precision
- typedef highp_f64mat4x3 f64mat4x3;
-
- /// Default double-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef highp_f64mat4x4 f64mat4x4;
-
- /// Default double-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef f64mat2x2 f64mat2;
-
- /// Default double-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef f64mat3x3 f64mat3;
-
- /// Default double-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef f64mat4x4 f64mat4;
-
- /// Default double-precision floating-point quaternion.
- /// @see gtc_type_precision
- typedef highp_f64quat f64quat;
-#endif
-}//namespace glm
diff --git a/inc/glm/geometric.hpp b/inc/glm/geometric.hpp deleted file mode 100644 index 8f6fca9..0000000 --- a/inc/glm/geometric.hpp +++ /dev/null @@ -1,35 +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 core
-/// @file glm/geometric.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/func_geometric.hpp"
diff --git a/inc/glm/glm.hpp b/inc/glm/glm.hpp deleted file mode 100644 index cefdd76..0000000 --- a/inc/glm/glm.hpp +++ /dev/null @@ -1,117 +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 core
-/// @file glm/glm.hpp
-/// @date 2005-01-14 / 2011-10-24
-/// @author Christophe Riccio
-///
-/// @defgroup core GLM Core
-///
-/// @brief The core of GLM, which implements exactly and only the GLSL specification to the degree possible.
-///
-/// The GLM core consists of @ref core_types "C++ types that mirror GLSL types" and
-/// C++ functions that mirror the GLSL functions. It also includes
-/// @ref core_precision "a set of precision-based types" that can be used in the appropriate
-/// functions. The C++ types are all based on a basic set of @ref core_template "template types".
-///
-/// The best documentation for GLM Core is the current GLSL specification,
-/// <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.clean.pdf">version 4.2
-/// (pdf file)</a>.
-///
-/// GLM core functionnalities require <glm/glm.hpp> to be included to be used.
-///
-/// @defgroup core_types Types
-///
-/// @brief The standard types defined by the specification.
-///
-/// These types are all typedefs of more generalized, template types. To see the definiton
-/// of these template types, go to @ref core_template.
-///
-/// @ingroup core
-///
-/// @defgroup core_precision Precision types
-///
-/// @brief Non-GLSL types that are used to define precision-based types.
-///
-/// The GLSL language allows the user to define the precision of a particular variable.
-/// In OpenGL's GLSL, these precision qualifiers have no effect; they are there for compatibility
-/// with OpenGL ES's precision qualifiers, where they @em do have an effect.
-///
-/// C++ has no language equivalent to precision qualifiers. So GLM provides the next-best thing:
-/// a number of typedefs of the @ref core_template that use a particular precision.
-///
-/// None of these types make any guarantees about the actual precision used.
-///
-/// @ingroup core
-///
-/// @defgroup core_template Template types
-///
-/// @brief The generic template types used as the basis for the core types.
-///
-/// These types are all templates used to define the actual @ref core_types.
-/// These templetes are implementation details of GLM types and should not be used explicitly.
-///
-/// @ingroup core
-///////////////////////////////////////////////////////////////////////////////////
-
-#include "detail/_fixes.hpp"
-
-#pragma once
-
-#include <cmath>
-#include <climits>
-#include <cfloat>
-#include <limits>
-#include <cassert>
-#include "fwd.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_CORE_INCLUDED_DISPLAYED))
-# define GLM_MESSAGE_CORE_INCLUDED_DISPLAYED
-# pragma message("GLM: Core library included")
-#endif//GLM_MESSAGE
-
-#include "vec2.hpp"
-#include "vec3.hpp"
-#include "vec4.hpp"
-#include "mat2x2.hpp"
-#include "mat2x3.hpp"
-#include "mat2x4.hpp"
-#include "mat3x2.hpp"
-#include "mat3x3.hpp"
-#include "mat3x4.hpp"
-#include "mat4x2.hpp"
-#include "mat4x3.hpp"
-#include "mat4x4.hpp"
-
-#include "trigonometric.hpp"
-#include "exponential.hpp"
-#include "common.hpp"
-#include "packing.hpp"
-#include "geometric.hpp"
-#include "matrix.hpp"
-#include "vector_relational.hpp"
-#include "integer.hpp"
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
-///
-/// <glm/gtc/bitfield.hpp> 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 <limits>
-
-#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 <typename genIUType>
- GLM_FUNC_DECL genIUType mask(genIUType Bits);
-
- /// Build a mask of 'count' bits
- ///
- /// @see gtc_bitfield
- template <typename T, precision P, template <typename, precision> class vecIUType>
- GLM_FUNC_DECL vecIUType<T, P> mask(vecIUType<T, P> 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 <typename genIUType>
- 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 <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> bitfieldRotateRight(vecType<T, P> 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 <typename genIUType>
- 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 <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> bitfieldRotateLeft(vecType<T, P> const & In, int Shift);
-
- /// Set to 1 a range of bits.
- ///
- /// @see gtc_bitfield
- template <typename genIUType>
- GLM_FUNC_DECL genIUType bitfieldFillOne(genIUType Value, int FirstBit, int BitCount);
-
- /// Set to 1 a range of bits.
- ///
- /// @see gtc_bitfield
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> bitfieldFillOne(vecType<T, P> const & Value, int FirstBit, int BitCount);
-
- /// Set to 0 a range of bits.
- ///
- /// @see gtc_bitfield
- template <typename genIUType>
- GLM_FUNC_DECL genIUType bitfieldFillZero(genIUType Value, int FirstBit, int BitCount);
-
- /// Set to 0 a range of bits.
- ///
- /// @see gtc_bitfield
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> bitfieldFillZero(vecType<T, P> 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 <typename PARAM, typename RET>
- GLM_FUNC_DECL RET bitfieldInterleave(PARAM x, PARAM y);
-
- template <typename PARAM, typename RET>
- GLM_FUNC_DECL RET bitfieldInterleave(PARAM x, PARAM y, PARAM z);
-
- template <typename PARAM, typename RET>
- 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 <typename genIUType>
- GLM_FUNC_QUALIFIER genIUType mask(genIUType Bits)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genIUType>::is_integer, "'mask' accepts only integer values");
-
- return Bits >= sizeof(genIUType) * 8 ? ~static_cast<genIUType>(0) : (static_cast<genIUType>(1) << Bits) - static_cast<genIUType>(1);
- }
-
- template <typename T, precision P, template <typename, precision> class vecIUType>
- GLM_FUNC_QUALIFIER vecIUType<T, P> mask(vecIUType<T, P> const & v)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'mask' accepts only integer values");
-
- return detail::functor1<T, T, P, vecIUType>::call(mask, v);
- }
-
- template <typename genIType>
- GLM_FUNC_QUALIFIER genIType bitfieldRotateRight(genIType In, int Shift)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genIType>::is_integer, "'bitfieldRotateRight' accepts only integer values");
-
- int const BitSize = static_cast<genIType>(sizeof(genIType) * 8);
- return (In << static_cast<genIType>(Shift)) | (In >> static_cast<genIType>(BitSize - Shift));
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> bitfieldRotateRight(vecType<T, P> const & In, int Shift)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'bitfieldRotateRight' accepts only integer values");
-
- int const BitSize = static_cast<int>(sizeof(T) * 8);
- return (In << static_cast<T>(Shift)) | (In >> static_cast<T>(BitSize - Shift));
- }
-
- template <typename genIType>
- GLM_FUNC_QUALIFIER genIType bitfieldRotateLeft(genIType In, int Shift)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genIType>::is_integer, "'bitfieldRotateLeft' accepts only integer values");
-
- int const BitSize = static_cast<genIType>(sizeof(genIType) * 8);
- return (In >> static_cast<genIType>(Shift)) | (In << static_cast<genIType>(BitSize - Shift));
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> bitfieldRotateLeft(vecType<T, P> const & In, int Shift)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'bitfieldRotateLeft' accepts only integer values");
-
- int const BitSize = static_cast<int>(sizeof(T) * 8);
- return (In >> static_cast<T>(Shift)) | (In << static_cast<T>(BitSize - Shift));
- }
-
- template <typename genIUType>
- GLM_FUNC_QUALIFIER genIUType bitfieldFillOne(genIUType Value, int FirstBit, int BitCount)
- {
- return Value | static_cast<genIUType>(mask(BitCount) << FirstBit);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> bitfieldFillOne(vecType<T, P> const & Value, int FirstBit, int BitCount)
- {
- return Value | static_cast<T>(mask(BitCount) << FirstBit);
- }
-
- template <typename genIUType>
- GLM_FUNC_QUALIFIER genIUType bitfieldFillZero(genIUType Value, int FirstBit, int BitCount)
- {
- return Value & static_cast<genIUType>(~(mask(BitCount) << FirstBit));
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> bitfieldFillZero(vecType<T, P> const & Value, int FirstBit, int BitCount)
- {
- return Value & static_cast<T>(~(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<uint8, uint16>(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<uint16, uint32>(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<uint32, uint64>(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<uint8, uint32>(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<uint32, uint64>(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<uint32, uint64>(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<uint8, uint32>(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<uint16, uint64>(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.
-///
-/// <glm/gtc/constants.hpp> 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 <typename genType>
- GLM_FUNC_DECL genType epsilon();
-
- /// Return 0.
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType zero();
-
- /// Return 1.
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType one();
-
- /// Return the pi constant.
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType pi();
-
- /// Return pi * 2.
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType two_pi();
-
- /// Return square root of pi.
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType root_pi();
-
- /// Return pi / 2.
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType half_pi();
-
- /// Return pi / 2 * 3.
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType three_over_two_pi();
-
- /// Return pi / 4.
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType quarter_pi();
-
- /// Return 1 / pi.
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType one_over_pi();
-
- /// Return 1 / (pi * 2).
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType one_over_two_pi();
-
- /// Return 2 / pi.
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType two_over_pi();
-
- /// Return 4 / pi.
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType four_over_pi();
-
- /// Return 2 / sqrt(pi).
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType two_over_root_pi();
-
- /// Return 1 / sqrt(2).
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType one_over_root_two();
-
- /// Return sqrt(pi / 2).
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType root_half_pi();
-
- /// Return sqrt(2 * pi).
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType root_two_pi();
-
- /// Return sqrt(ln(4)).
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType root_ln_four();
-
- /// Return e constant.
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType e();
-
- /// Return Euler's constant.
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType euler();
-
- /// Return sqrt(2).
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType root_two();
-
- /// Return sqrt(3).
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType root_three();
-
- /// Return sqrt(5).
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType root_five();
-
- /// Return ln(2).
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType ln_two();
-
- /// Return ln(10).
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType ln_ten();
-
- /// Return ln(ln(2)).
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType ln_ln_two();
-
- /// Return 1 / 3.
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType third();
-
- /// Return 2 / 3.
- /// @see gtc_constants
- template <typename genType>
- GLM_FUNC_DECL genType two_thirds();
-
- /// Return the golden ratio constant.
- /// @see gtc_constants
- template <typename genType>
- 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 <limits>
-
-namespace glm
-{
- template <typename genType>
- GLM_FUNC_QUALIFIER genType epsilon()
- {
- return std::numeric_limits<genType>::epsilon();
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType zero()
- {
- return genType(0);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType one()
- {
- return genType(1);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType pi()
- {
- return genType(3.14159265358979323846264338327950288);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType two_pi()
- {
- return genType(6.28318530717958647692528676655900576);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType root_pi()
- {
- return genType(1.772453850905516027);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType half_pi()
- {
- return genType(1.57079632679489661923132169163975144);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType three_over_two_pi()
- {
- return genType(4.71238898038468985769396507491925432);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType quarter_pi()
- {
- return genType(0.785398163397448309615660845819875721);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType one_over_pi()
- {
- return genType(0.318309886183790671537767526745028724);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType one_over_two_pi()
- {
- return genType(0.159154943091895335768883763372514362);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType two_over_pi()
- {
- return genType(0.636619772367581343075535053490057448);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType four_over_pi()
- {
- return genType(1.273239544735162686151070106980114898);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType two_over_root_pi()
- {
- return genType(1.12837916709551257389615890312154517);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType one_over_root_two()
- {
- return genType(0.707106781186547524400844362104849039);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType root_half_pi()
- {
- return genType(1.253314137315500251);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType root_two_pi()
- {
- return genType(2.506628274631000502);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType root_ln_four()
- {
- return genType(1.17741002251547469);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType e()
- {
- return genType(2.71828182845904523536);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType euler()
- {
- return genType(0.577215664901532860606);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType root_two()
- {
- return genType(1.41421356237309504880168872420969808);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType root_three()
- {
- return genType(1.73205080756887729352744634150587236);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType root_five()
- {
- return genType(2.23606797749978969640917366873127623);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType ln_two()
- {
- return genType(0.693147180559945309417232121458176568);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType ln_ten()
- {
- return genType(2.30258509299404568401799145468436421);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType ln_ln_two()
- {
- return genType(-0.3665129205816643);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType third()
- {
- return genType(0.3333333333333333333333333333333333333333);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType two_thirds()
- {
- return genType(0.666666666666666666666666666666666666667);
- }
-
- template <typename genType>
- 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.
-///
-/// <glm/gtc/epsilon.hpp> 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 <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<bool, P> epsilonEqual(
- vecType<T, P> const & x,
- vecType<T, P> const & y,
- T const & epsilon);
-
- /// Returns the component-wise comparison of |x - y| < epsilon.
- /// True if this expression is satisfied.
- ///
- /// @see gtc_epsilon
- template <typename genType>
- 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 <typename genType>
- 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 <typename genType>
- 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 <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<bool, P> epsilonEqual
- (
- vecType<T, P> const & x,
- vecType<T, P> const & y,
- T const & epsilon
- )
- {
- return lessThan(abs(x - y), vecType<T, P>(epsilon));
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<bool, P> epsilonEqual
- (
- vecType<T, P> const & x,
- vecType<T, P> const & y,
- vecType<T, P> const & epsilon
- )
- {
- return lessThan(abs(x - y), vecType<T, P>(epsilon));
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<bool, P> epsilonNotEqual
- (
- vecType<T, P> const & x,
- vecType<T, P> const & y,
- T const & epsilon
- )
- {
- return greaterThanEqual(abs(x - y), vecType<T, P>(epsilon));
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<bool, P> epsilonNotEqual
- (
- vecType<T, P> const & x,
- vecType<T, P> const & y,
- vecType<T, P> const & epsilon
- )
- {
- return greaterThanEqual(abs(x - y), vecType<T, P>(epsilon));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<bool, P> epsilonEqual
- (
- tquat<T, P> const & x,
- tquat<T, P> const & y,
- T const & epsilon
- )
- {
- tvec4<T, P> v(x.x - y.x, x.y - y.y, x.z - y.z, x.w - y.w);
- return lessThan(abs(v), tvec4<T, P>(epsilon));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<bool, P> epsilonNotEqual
- (
- tquat<T, P> const & x,
- tquat<T, P> const & y,
- T const & epsilon
- )
- {
- tvec4<T, P> v(x.x - y.x, x.y - y.y, x.z - y.z, x.w - y.w);
- return greaterThanEqual(abs(v), tvec4<T, P>(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
-///
-/// <glm/gtc/integer.hpp> 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 <limits>
-
-#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 <typename genIUType>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mod.xml">GLSL mod man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename genIUType>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mod.xml">GLSL mod man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> mod(vecType<T, P> 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mod.xml">GLSL mod man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> mod(vecType<T, P> const & x, vecType<T, P> 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 <typename T, precision P, template <class, precision> class vecType>
- struct compute_log2<T, P, vecType, false>
- {
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & vec)
- {
- //Equivalent to return findMSB(vec); but save one function call in ASM with VC
- //return findMSB(vec);
- return vecType<T, P>(detail::compute_findMSB_vec<T, P, vecType, sizeof(T) * 8>::call(vec));
- }
- };
-
-# if GLM_HAS_BITSCAN_WINDOWS
- template <precision P>
- struct compute_log2<int, P, tvec4, false>
- {
- GLM_FUNC_QUALIFIER static tvec4<int, P> call(tvec4<int, P> const & vec)
- {
- tvec4<int, P> Result(glm::uninitialize);
-
- _BitScanReverse(reinterpret_cast<unsigned long*>(&Result.x), vec.x);
- _BitScanReverse(reinterpret_cast<unsigned long*>(&Result.y), vec.y);
- _BitScanReverse(reinterpret_cast<unsigned long*>(&Result.z), vec.z);
- _BitScanReverse(reinterpret_cast<unsigned long*>(&Result.w), vec.w);
-
- return Result;
- }
- };
-# endif//GLM_HAS_BITSCAN_WINDOWS
-
- template <typename T, precision P, template <class, precision> class vecType, typename genType>
- struct compute_mod<T, P, vecType, genType, false>
- {
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> 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.
-/// <glm/gtc/matrix_access.hpp> 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 <typename genType>
- 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 <typename genType>
- 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 <typename genType>
- 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 <typename genType>
- 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 <typename genType>
- GLM_FUNC_QUALIFIER genType row
- (
- genType const & m,
- length_t index,
- typename genType::row_type const & x
- )
- {
- assert(index >= 0 && static_cast<detail::component_count_t>(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 <typename genType>
- GLM_FUNC_QUALIFIER typename genType::row_type row
- (
- genType const & m,
- length_t index
- )
- {
- assert(index >= 0 && static_cast<detail::component_count_t>(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 <typename genType>
- GLM_FUNC_QUALIFIER genType column
- (
- genType const & m,
- length_t index,
- typename genType::col_type const & x
- )
- {
- assert(index >= 0 && static_cast<detail::component_count_t>(index) < detail::component_count(m));
-
- genType Result = m;
- Result[index] = x;
- return Result;
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER typename genType::col_type column
- (
- genType const & m,
- length_t index
- )
- {
- assert(index >= 0 && static_cast<detail::component_count_t>(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.
-/// <glm/gtc/matrix_integer.hpp> 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<int, highp> highp_imat2;
-
- /// High-precision signed integer 3x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x3<int, highp> highp_imat3;
-
- /// High-precision signed integer 4x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x4<int, highp> highp_imat4;
-
- /// High-precision signed integer 2x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x2<int, highp> highp_imat2x2;
-
- /// High-precision signed integer 2x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x3<int, highp> highp_imat2x3;
-
- /// High-precision signed integer 2x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x4<int, highp> highp_imat2x4;
-
- /// High-precision signed integer 3x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x2<int, highp> highp_imat3x2;
-
- /// High-precision signed integer 3x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x3<int, highp> highp_imat3x3;
-
- /// High-precision signed integer 3x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x4<int, highp> highp_imat3x4;
-
- /// High-precision signed integer 4x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x2<int, highp> highp_imat4x2;
-
- /// High-precision signed integer 4x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x3<int, highp> highp_imat4x3;
-
- /// High-precision signed integer 4x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x4<int, highp> highp_imat4x4;
-
-
- /// Medium-precision signed integer 2x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x2<int, mediump> mediump_imat2;
-
- /// Medium-precision signed integer 3x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x3<int, mediump> mediump_imat3;
-
- /// Medium-precision signed integer 4x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x4<int, mediump> mediump_imat4;
-
-
- /// Medium-precision signed integer 2x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x2<int, mediump> mediump_imat2x2;
-
- /// Medium-precision signed integer 2x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x3<int, mediump> mediump_imat2x3;
-
- /// Medium-precision signed integer 2x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x4<int, mediump> mediump_imat2x4;
-
- /// Medium-precision signed integer 3x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x2<int, mediump> mediump_imat3x2;
-
- /// Medium-precision signed integer 3x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x3<int, mediump> mediump_imat3x3;
-
- /// Medium-precision signed integer 3x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x4<int, mediump> mediump_imat3x4;
-
- /// Medium-precision signed integer 4x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x2<int, mediump> mediump_imat4x2;
-
- /// Medium-precision signed integer 4x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x3<int, mediump> mediump_imat4x3;
-
- /// Medium-precision signed integer 4x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x4<int, mediump> mediump_imat4x4;
-
-
- /// Low-precision signed integer 2x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x2<int, lowp> lowp_imat2;
-
- /// Low-precision signed integer 3x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x3<int, lowp> lowp_imat3;
-
- /// Low-precision signed integer 4x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x4<int, lowp> lowp_imat4;
-
-
- /// Low-precision signed integer 2x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x2<int, lowp> lowp_imat2x2;
-
- /// Low-precision signed integer 2x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x3<int, lowp> lowp_imat2x3;
-
- /// Low-precision signed integer 2x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x4<int, lowp> lowp_imat2x4;
-
- /// Low-precision signed integer 3x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x2<int, lowp> lowp_imat3x2;
-
- /// Low-precision signed integer 3x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x3<int, lowp> lowp_imat3x3;
-
- /// Low-precision signed integer 3x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x4<int, lowp> lowp_imat3x4;
-
- /// Low-precision signed integer 4x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x2<int, lowp> lowp_imat4x2;
-
- /// Low-precision signed integer 4x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x3<int, lowp> lowp_imat4x3;
-
- /// Low-precision signed integer 4x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x4<int, lowp> lowp_imat4x4;
-
-
- /// High-precision unsigned integer 2x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x2<uint, highp> highp_umat2;
-
- /// High-precision unsigned integer 3x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x3<uint, highp> highp_umat3;
-
- /// High-precision unsigned integer 4x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x4<uint, highp> highp_umat4;
-
- /// High-precision unsigned integer 2x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x2<uint, highp> highp_umat2x2;
-
- /// High-precision unsigned integer 2x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x3<uint, highp> highp_umat2x3;
-
- /// High-precision unsigned integer 2x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x4<uint, highp> highp_umat2x4;
-
- /// High-precision unsigned integer 3x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x2<uint, highp> highp_umat3x2;
-
- /// High-precision unsigned integer 3x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x3<uint, highp> highp_umat3x3;
-
- /// High-precision unsigned integer 3x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x4<uint, highp> highp_umat3x4;
-
- /// High-precision unsigned integer 4x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x2<uint, highp> highp_umat4x2;
-
- /// High-precision unsigned integer 4x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x3<uint, highp> highp_umat4x3;
-
- /// High-precision unsigned integer 4x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x4<uint, highp> highp_umat4x4;
-
-
- /// Medium-precision unsigned integer 2x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x2<uint, mediump> mediump_umat2;
-
- /// Medium-precision unsigned integer 3x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x3<uint, mediump> mediump_umat3;
-
- /// Medium-precision unsigned integer 4x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x4<uint, mediump> mediump_umat4;
-
-
- /// Medium-precision unsigned integer 2x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x2<uint, mediump> mediump_umat2x2;
-
- /// Medium-precision unsigned integer 2x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x3<uint, mediump> mediump_umat2x3;
-
- /// Medium-precision unsigned integer 2x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x4<uint, mediump> mediump_umat2x4;
-
- /// Medium-precision unsigned integer 3x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x2<uint, mediump> mediump_umat3x2;
-
- /// Medium-precision unsigned integer 3x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x3<uint, mediump> mediump_umat3x3;
-
- /// Medium-precision unsigned integer 3x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x4<uint, mediump> mediump_umat3x4;
-
- /// Medium-precision unsigned integer 4x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x2<uint, mediump> mediump_umat4x2;
-
- /// Medium-precision unsigned integer 4x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x3<uint, mediump> mediump_umat4x3;
-
- /// Medium-precision unsigned integer 4x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x4<uint, mediump> mediump_umat4x4;
-
-
- /// Low-precision unsigned integer 2x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x2<uint, lowp> lowp_umat2;
-
- /// Low-precision unsigned integer 3x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x3<uint, lowp> lowp_umat3;
-
- /// Low-precision unsigned integer 4x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x4<uint, lowp> lowp_umat4;
-
-
- /// Low-precision unsigned integer 2x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x2<uint, lowp> lowp_umat2x2;
-
- /// Low-precision unsigned integer 2x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x3<uint, lowp> lowp_umat2x3;
-
- /// Low-precision unsigned integer 2x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat2x4<uint, lowp> lowp_umat2x4;
-
- /// Low-precision unsigned integer 3x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x2<uint, lowp> lowp_umat3x2;
-
- /// Low-precision unsigned integer 3x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x3<uint, lowp> lowp_umat3x3;
-
- /// Low-precision unsigned integer 3x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat3x4<uint, lowp> lowp_umat3x4;
-
- /// Low-precision unsigned integer 4x2 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x2<uint, lowp> lowp_umat4x2;
-
- /// Low-precision unsigned integer 4x3 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x3<uint, lowp> lowp_umat4x3;
-
- /// Low-precision unsigned integer 4x4 matrix.
- /// @see gtc_matrix_integer
- typedef tmat4x4<uint, lowp> 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.
-/// <glm/gtc/matrix_inverse.hpp> 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 <typename genType>
- 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 <typename genType>
- 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 <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> affineInverse(tmat3x3<T, P> const & m)
- {
- tmat3x3<T, P> Result(m);
- Result[2] = tvec3<T, P>(0, 0, 1);
- Result = transpose(Result);
- tvec3<T, P> Translation = Result * tvec3<T, P>(-tvec2<T, P>(m[2]), m[2][2]);
- Result[2] = Translation;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> affineInverse(tmat4x4<T, P> const & m)
- {
- tmat4x4<T, P> Result(m);
- Result[3] = tvec4<T, P>(0, 0, 0, 1);
- Result = transpose(Result);
- tvec4<T, P> Translation = Result * tvec4<T, P>(-tvec3<T, P>(m[3]), m[3][3]);
- Result[3] = Translation;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> inverseTranspose(tmat2x2<T, P> const & m)
- {
- T Determinant = m[0][0] * m[1][1] - m[1][0] * m[0][1];
-
- tmat2x2<T, P> Inverse(
- + m[1][1] / Determinant,
- - m[0][1] / Determinant,
- - m[1][0] / Determinant,
- + m[0][0] / Determinant);
-
- return Inverse;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> inverseTranspose(tmat3x3<T, P> 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<T, P> 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 <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> inverseTranspose(tmat4x4<T, P> 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<T, P> 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.
-///
-/// <glm/gtc/matrix_transform.hpp> 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 <glm/glm.hpp>
- /// #include <glm/gtc/matrix_transform.hpp>
- /// ...
- /// 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<T, P> const & m, T x, T y, T z)
- /// @see - translate(tvec3<T, P> const & v)
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> translate(
- tmat4x4<T, P> const & m,
- tvec3<T, P> 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<T, P> const & m, T angle, T x, T y, T z)
- /// @see - rotate(T angle, tvec3<T, P> const & v)
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> rotate(
- tmat4x4<T, P> const & m,
- T angle,
- tvec3<T, P> 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<T, P> const & m, T x, T y, T z)
- /// @see - scale(tvec3<T, P> const & v)
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> scale(
- tmat4x4<T, P> const & m,
- tvec3<T, P> 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 <typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> 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 <typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> 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 <typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> 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 <typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> 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 <typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> 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 <typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> 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 <typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> 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 <typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> 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 <typename T, typename U, precision P>
- GLM_FUNC_DECL tvec3<T, P> project(
- tvec3<T, P> const & obj,
- tmat4x4<T, P> const & model,
- tmat4x4<T, P> const & proj,
- tvec4<U, P> 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 <typename T, typename U, precision P>
- GLM_FUNC_DECL tvec3<T, P> unProject(
- tvec3<T, P> const & win,
- tmat4x4<T, P> const & model,
- tmat4x4<T, P> const & proj,
- tvec4<U, P> 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 <typename T, precision P, typename U>
- GLM_FUNC_DECL tmat4x4<T, P> pickMatrix(
- tvec2<T, P> const & center,
- tvec2<T, P> const & delta,
- tvec4<U, P> 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 <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> lookAt(
- tvec3<T, P> const & eye,
- tvec3<T, P> const & center,
- tvec3<T, P> 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 <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> translate
- (
- tmat4x4<T, P> const & m,
- tvec3<T, P> const & v
- )
- {
- tmat4x4<T, P> Result(m);
- Result[3] = m[0] * v[0] + m[1] * v[1] + m[2] * v[2] + m[3];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> rotate
- (
- tmat4x4<T, P> const & m,
- T angle,
- tvec3<T, P> const & v
- )
- {
- T const a = angle;
- T const c = cos(a);
- T const s = sin(a);
-
- tvec3<T, P> axis(normalize(v));
- tvec3<T, P> temp((T(1) - c) * axis);
-
- tmat4x4<T, P> Rotate(uninitialize);
- Rotate[0][0] = c + temp[0] * axis[0];
- Rotate[0][1] = 0 + temp[0] * axis[1] + s * axis[2];
- Rotate[0][2] = 0 + temp[0] * axis[2] - s * axis[1];
-
- Rotate[1][0] = 0 + temp[1] * axis[0] - s * axis[2];
- Rotate[1][1] = c + temp[1] * axis[1];
- Rotate[1][2] = 0 + temp[1] * axis[2] + s * axis[0];
-
- Rotate[2][0] = 0 + temp[2] * axis[0] + s * axis[1];
- Rotate[2][1] = 0 + temp[2] * axis[1] - s * axis[0];
- Rotate[2][2] = c + temp[2] * axis[2];
-
- tmat4x4<T, P> Result(uninitialize);
- Result[0] = m[0] * Rotate[0][0] + m[1] * Rotate[0][1] + m[2] * Rotate[0][2];
- Result[1] = m[0] * Rotate[1][0] + m[1] * Rotate[1][1] + m[2] * Rotate[1][2];
- Result[2] = m[0] * Rotate[2][0] + m[1] * Rotate[2][1] + m[2] * Rotate[2][2];
- Result[3] = m[3];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> rotate_slow
- (
- tmat4x4<T, P> const & m,
- T angle,
- tvec3<T, P> const & v
- )
- {
- T const a = angle;
- T const c = cos(a);
- T const s = sin(a);
- tmat4x4<T, P> Result;
-
- tvec3<T, P> 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<T, P>(0, 0, 0, 1);
- return m * Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> scale
- (
- tmat4x4<T, P> const & m,
- tvec3<T, P> const & v
- )
- {
- tmat4x4<T, P> 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 <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> scale_slow
- (
- tmat4x4<T, P> const & m,
- tvec3<T, P> const & v
- )
- {
- tmat4x4<T, P> Result(T(1));
- Result[0][0] = v.x;
- Result[1][1] = v.y;
- Result[2][2] = v.z;
- return m * Result;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> ortho
- (
- T left,
- T right,
- T bottom,
- T top,
- T zNear,
- T zFar
- )
- {
- tmat4x4<T, defaultp> Result(1);
- Result[0][0] = static_cast<T>(2) / (right - left);
- Result[1][1] = static_cast<T>(2) / (top - bottom);
- Result[2][2] = - static_cast<T>(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 <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> ortho
- (
- T left,
- T right,
- T bottom,
- T top
- )
- {
- tmat4x4<T, defaultp> Result(1);
- Result[0][0] = static_cast<T>(2) / (right - left);
- Result[1][1] = static_cast<T>(2) / (top - bottom);
- Result[2][2] = - static_cast<T>(1);
- Result[3][0] = - (right + left) / (right - left);
- Result[3][1] = - (top + bottom) / (top - bottom);
- return Result;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> frustum
- (
- T left,
- T right,
- T bottom,
- T top,
- T nearVal,
- T farVal
- )
- {
- tmat4x4<T, defaultp> Result(0);
- Result[0][0] = (static_cast<T>(2) * nearVal) / (right - left);
- Result[1][1] = (static_cast<T>(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<T>(-1);
- Result[3][2] = -(static_cast<T>(2) * farVal * nearVal) / (farVal - nearVal);
- return Result;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> perspective
- (
- T fovy,
- T aspect,
- T zNear,
- T zFar
- )
- {
- assert(abs(aspect - std::numeric_limits<T>::epsilon()) > static_cast<T>(0));
-
- T const tanHalfFovy = tan(fovy / static_cast<T>(2));
-
- tmat4x4<T, defaultp> Result(static_cast<T>(0));
- Result[0][0] = static_cast<T>(1) / (aspect * tanHalfFovy);
- Result[1][1] = static_cast<T>(1) / (tanHalfFovy);
- Result[2][2] = - (zFar + zNear) / (zFar - zNear);
- Result[2][3] = - static_cast<T>(1);
- Result[3][2] = - (static_cast<T>(2) * zFar * zNear) / (zFar - zNear);
- return Result;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> perspectiveFov
- (
- T fov,
- T width,
- T height,
- T zNear,
- T zFar
- )
- {
- assert(width > static_cast<T>(0));
- assert(height > static_cast<T>(0));
- assert(fov > static_cast<T>(0));
-
- T const rad = fov;
- T const h = glm::cos(static_cast<T>(0.5) * rad) / glm::sin(static_cast<T>(0.5) * rad);
- T const w = h * height / width; ///todo max(width , Height) / min(width , Height)?
-
- tmat4x4<T, defaultp> Result(static_cast<T>(0));
- Result[0][0] = w;
- Result[1][1] = h;
- Result[2][2] = - (zFar + zNear) / (zFar - zNear);
- Result[2][3] = - static_cast<T>(1);
- Result[3][2] = - (static_cast<T>(2) * zFar * zNear) / (zFar - zNear);
- return Result;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> 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<T, defaultp> 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 <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> 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<T, defaultp> Result(T(0));
- Result[0][0] = (static_cast<T>(2) * zNear) / (right - left);
- Result[1][1] = (static_cast<T>(2) * zNear) / (top - bottom);
- Result[2][2] = ep - static_cast<T>(1);
- Result[2][3] = static_cast<T>(-1);
- Result[3][2] = (ep - static_cast<T>(2)) * zNear;
- return Result;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> tweakedInfinitePerspective
- (
- T fovy,
- T aspect,
- T zNear
- )
- {
- return tweakedInfinitePerspective(fovy, aspect, zNear, epsilon<T>());
- }
-
- template <typename T, typename U, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> project
- (
- tvec3<T, P> const & obj,
- tmat4x4<T, P> const & model,
- tmat4x4<T, P> const & proj,
- tvec4<U, P> const & viewport
- )
- {
- tvec4<T, P> tmp = tvec4<T, P>(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<T, P>(tmp);
- }
-
- template <typename T, typename U, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> unProject
- (
- tvec3<T, P> const & win,
- tmat4x4<T, P> const & model,
- tmat4x4<T, P> const & proj,
- tvec4<U, P> const & viewport
- )
- {
- tmat4x4<T, P> Inverse = inverse(proj * model);
-
- tvec4<T, P> tmp = tvec4<T, P>(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<T, P> obj = Inverse * tmp;
- obj /= obj.w;
-
- return tvec3<T, P>(obj);
- }
-
- template <typename T, precision P, typename U>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> pickMatrix
- (
- tvec2<T, P> const & center,
- tvec2<T, P> const & delta,
- tvec4<U, P> const & viewport
- )
- {
- assert(delta.x > T(0) && delta.y > T(0));
- tmat4x4<T, P> Result(1.0f);
-
- if(!(delta.x > T(0) && delta.y > T(0)))
- return Result; // Error
-
- tvec3<T, P> 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, P>(T(viewport[2]) / delta.x, T(viewport[3]) / delta.y, T(1)));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> lookAt
- (
- tvec3<T, P> const & eye,
- tvec3<T, P> const & center,
- tvec3<T, P> const & up
- )
- {
- tvec3<T, P> const f(normalize(center - eye));
- tvec3<T, P> const s(normalize(cross(f, up)));
- tvec3<T, P> const u(cross(s, f));
-
- tmat4x4<T, P> 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
-/// <glm/gtc/noise.hpp> 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 <typename T, precision P, template<typename, precision> class vecType>
- GLM_FUNC_DECL T perlin(
- vecType<T, P> const & p);
-
- /// Periodic perlin noise.
- /// @see gtc_noise
- template <typename T, precision P, template<typename, precision> class vecType>
- GLM_FUNC_DECL T perlin(
- vecType<T, P> const & p,
- vecType<T, P> const & rep);
-
- /// Simplex noise.
- /// @see gtc_noise
- template <typename T, precision P, template<typename, precision> class vecType>
- GLM_FUNC_DECL T simplex(
- vecType<T, P> 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 <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> grad4(T const & j, tvec4<T, P> const & ip)
- {
- tvec3<T, P> pXYZ = floor(fract(tvec3<T, P>(j) * tvec3<T, P>(ip)) * T(7)) * ip[2] - T(1);
- T pW = static_cast<T>(1.5) - dot(abs(pXYZ), tvec3<T, P>(1));
- tvec4<T, P> s = tvec4<T, P>(lessThan(tvec4<T, P>(pXYZ, pW), tvec4<T, P>(0.0)));
- pXYZ = pXYZ + (tvec3<T, P>(s) * T(2) - T(1)) * s.w;
- return tvec4<T, P>(pXYZ, pW);
- }
-}//namespace gtc
-
- // Classic Perlin noise
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T perlin(tvec2<T, P> const & Position)
- {
- tvec4<T, P> Pi = glm::floor(tvec4<T, P>(Position.x, Position.y, Position.x, Position.y)) + tvec4<T, P>(0.0, 0.0, 1.0, 1.0);
- tvec4<T, P> Pf = glm::fract(tvec4<T, P>(Position.x, Position.y, Position.x, Position.y)) - tvec4<T, P>(0.0, 0.0, 1.0, 1.0);
- Pi = mod(Pi, tvec4<T, P>(289)); // To avoid truncation effects in permutation
- tvec4<T, P> ix(Pi.x, Pi.z, Pi.x, Pi.z);
- tvec4<T, P> iy(Pi.y, Pi.y, Pi.w, Pi.w);
- tvec4<T, P> fx(Pf.x, Pf.z, Pf.x, Pf.z);
- tvec4<T, P> fy(Pf.y, Pf.y, Pf.w, Pf.w);
-
- tvec4<T, P> i = detail::permute(detail::permute(ix) + iy);
-
- tvec4<T, P> gx = static_cast<T>(2) * glm::fract(i / T(41)) - T(1);
- tvec4<T, P> gy = glm::abs(gx) - T(0.5);
- tvec4<T, P> tx = glm::floor(gx + T(0.5));
- gx = gx - tx;
-
- tvec2<T, P> g00(gx.x, gy.x);
- tvec2<T, P> g10(gx.y, gy.y);
- tvec2<T, P> g01(gx.z, gy.z);
- tvec2<T, P> g11(gx.w, gy.w);
-
- tvec4<T, P> norm = detail::taylorInvSqrt(tvec4<T, P>(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<T, P>(fx.x, fy.x));
- T n10 = dot(g10, tvec2<T, P>(fx.y, fy.y));
- T n01 = dot(g01, tvec2<T, P>(fx.z, fy.z));
- T n11 = dot(g11, tvec2<T, P>(fx.w, fy.w));
-
- tvec2<T, P> fade_xy = detail::fade(tvec2<T, P>(Pf.x, Pf.y));
- tvec2<T, P> n_x = mix(tvec2<T, P>(n00, n01), tvec2<T, P>(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 <typename T, precision P>
- GLM_FUNC_QUALIFIER T perlin(tvec3<T, P> const & Position)
- {
- tvec3<T, P> Pi0 = floor(Position); // Integer part for indexing
- tvec3<T, P> Pi1 = Pi0 + T(1); // Integer part + 1
- Pi0 = detail::mod289(Pi0);
- Pi1 = detail::mod289(Pi1);
- tvec3<T, P> Pf0 = fract(Position); // Fractional part for interpolation
- tvec3<T, P> Pf1 = Pf0 - T(1); // Fractional part - 1.0
- tvec4<T, P> ix(Pi0.x, Pi1.x, Pi0.x, Pi1.x);
- tvec4<T, P> iy = tvec4<T, P>(tvec2<T, P>(Pi0.y), tvec2<T, P>(Pi1.y));
- tvec4<T, P> iz0(Pi0.z);
- tvec4<T, P> iz1(Pi1.z);
-
- tvec4<T, P> ixy = detail::permute(detail::permute(ix) + iy);
- tvec4<T, P> ixy0 = detail::permute(ixy + iz0);
- tvec4<T, P> ixy1 = detail::permute(ixy + iz1);
-
- tvec4<T, P> gx0 = ixy0 * T(1.0 / 7.0);
- tvec4<T, P> gy0 = fract(floor(gx0) * T(1.0 / 7.0)) - T(0.5);
- gx0 = fract(gx0);
- tvec4<T, P> gz0 = tvec4<T, P>(0.5) - abs(gx0) - abs(gy0);
- tvec4<T, P> sz0 = step(gz0, tvec4<T, P>(0.0));
- gx0 -= sz0 * (step(T(0), gx0) - T(0.5));
- gy0 -= sz0 * (step(T(0), gy0) - T(0.5));
-
- tvec4<T, P> gx1 = ixy1 * T(1.0 / 7.0);
- tvec4<T, P> gy1 = fract(floor(gx1) * T(1.0 / 7.0)) - T(0.5);
- gx1 = fract(gx1);
- tvec4<T, P> gz1 = tvec4<T, P>(0.5) - abs(gx1) - abs(gy1);
- tvec4<T, P> sz1 = step(gz1, tvec4<T, P>(0.0));
- gx1 -= sz1 * (step(T(0), gx1) - T(0.5));
- gy1 -= sz1 * (step(T(0), gy1) - T(0.5));
-
- tvec3<T, P> g000(gx0.x, gy0.x, gz0.x);
- tvec3<T, P> g100(gx0.y, gy0.y, gz0.y);
- tvec3<T, P> g010(gx0.z, gy0.z, gz0.z);
- tvec3<T, P> g110(gx0.w, gy0.w, gz0.w);
- tvec3<T, P> g001(gx1.x, gy1.x, gz1.x);
- tvec3<T, P> g101(gx1.y, gy1.y, gz1.y);
- tvec3<T, P> g011(gx1.z, gy1.z, gz1.z);
- tvec3<T, P> g111(gx1.w, gy1.w, gz1.w);
-
- tvec4<T, P> norm0 = detail::taylorInvSqrt(tvec4<T, P>(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<T, P> norm1 = detail::taylorInvSqrt(tvec4<T, P>(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<T, P>(Pf1.x, Pf0.y, Pf0.z));
- T n010 = dot(g010, tvec3<T, P>(Pf0.x, Pf1.y, Pf0.z));
- T n110 = dot(g110, tvec3<T, P>(Pf1.x, Pf1.y, Pf0.z));
- T n001 = dot(g001, tvec3<T, P>(Pf0.x, Pf0.y, Pf1.z));
- T n101 = dot(g101, tvec3<T, P>(Pf1.x, Pf0.y, Pf1.z));
- T n011 = dot(g011, tvec3<T, P>(Pf0.x, Pf1.y, Pf1.z));
- T n111 = dot(g111, Pf1);
-
- tvec3<T, P> fade_xyz = detail::fade(Pf0);
- tvec4<T, P> n_z = mix(tvec4<T, P>(n000, n100, n010, n110), tvec4<T, P>(n001, n101, n011, n111), fade_xyz.z);
- tvec2<T, P> n_yz = mix(tvec2<T, P>(n_z.x, n_z.y), tvec2<T, P>(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 <typename T, precision P>
- GLM_FUNC_QUALIFIER T perlin(tvec3<T, P> const & P)
- {
- tvec3<T, P> Pi0 = floor(P); // Integer part for indexing
- tvec3<T, P> Pi1 = Pi0 + T(1); // Integer part + 1
- Pi0 = mod(Pi0, T(289));
- Pi1 = mod(Pi1, T(289));
- tvec3<T, P> Pf0 = fract(P); // Fractional part for interpolation
- tvec3<T, P> Pf1 = Pf0 - T(1); // Fractional part - 1.0
- tvec4<T, P> ix(Pi0.x, Pi1.x, Pi0.x, Pi1.x);
- tvec4<T, P> iy(Pi0.y, Pi0.y, Pi1.y, Pi1.y);
- tvec4<T, P> iz0(Pi0.z);
- tvec4<T, P> iz1(Pi1.z);
-
- tvec4<T, P> ixy = permute(permute(ix) + iy);
- tvec4<T, P> ixy0 = permute(ixy + iz0);
- tvec4<T, P> ixy1 = permute(ixy + iz1);
-
- tvec4<T, P> gx0 = ixy0 / T(7);
- tvec4<T, P> gy0 = fract(floor(gx0) / T(7)) - T(0.5);
- gx0 = fract(gx0);
- tvec4<T, P> gz0 = tvec4<T, P>(0.5) - abs(gx0) - abs(gy0);
- tvec4<T, P> sz0 = step(gz0, tvec4<T, P>(0.0));
- gx0 -= sz0 * (step(0.0, gx0) - T(0.5));
- gy0 -= sz0 * (step(0.0, gy0) - T(0.5));
-
- tvec4<T, P> gx1 = ixy1 / T(7);
- tvec4<T, P> gy1 = fract(floor(gx1) / T(7)) - T(0.5);
- gx1 = fract(gx1);
- tvec4<T, P> gz1 = tvec4<T, P>(0.5) - abs(gx1) - abs(gy1);
- tvec4<T, P> sz1 = step(gz1, tvec4<T, P>(0.0));
- gx1 -= sz1 * (step(T(0), gx1) - T(0.5));
- gy1 -= sz1 * (step(T(0), gy1) - T(0.5));
-
- tvec3<T, P> g000(gx0.x, gy0.x, gz0.x);
- tvec3<T, P> g100(gx0.y, gy0.y, gz0.y);
- tvec3<T, P> g010(gx0.z, gy0.z, gz0.z);
- tvec3<T, P> g110(gx0.w, gy0.w, gz0.w);
- tvec3<T, P> g001(gx1.x, gy1.x, gz1.x);
- tvec3<T, P> g101(gx1.y, gy1.y, gz1.y);
- tvec3<T, P> g011(gx1.z, gy1.z, gz1.z);
- tvec3<T, P> g111(gx1.w, gy1.w, gz1.w);
-
- tvec4<T, P> norm0 = taylorInvSqrt(tvec4<T, P>(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<T, P> norm1 = taylorInvSqrt(tvec4<T, P>(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<T, P>(Pf1.x, Pf0.y, Pf0.z));
- T n010 = dot(g010, tvec3<T, P>(Pf0.x, Pf1.y, Pf0.z));
- T n110 = dot(g110, tvec3<T, P>(Pf1.x, Pf1.y, Pf0.z));
- T n001 = dot(g001, tvec3<T, P>(Pf0.x, Pf0.y, Pf1.z));
- T n101 = dot(g101, tvec3<T, P>(Pf1.x, Pf0.y, Pf1.z));
- T n011 = dot(g011, tvec3<T, P>(Pf0.x, Pf1.y, Pf1.z));
- T n111 = dot(g111, Pf1);
-
- tvec3<T, P> fade_xyz = fade(Pf0);
- tvec4<T, P> n_z = mix(tvec4<T, P>(n000, n100, n010, n110), tvec4<T, P>(n001, n101, n011, n111), fade_xyz.z);
- tvec2<T, P> n_yz = mix(
- tvec2<T, P>(n_z.x, n_z.y),
- tvec2<T, P>(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 <typename T, precision P>
- GLM_FUNC_QUALIFIER T perlin(tvec4<T, P> const & Position)
- {
- tvec4<T, P> Pi0 = floor(Position); // Integer part for indexing
- tvec4<T, P> Pi1 = Pi0 + T(1); // Integer part + 1
- Pi0 = mod(Pi0, tvec4<T, P>(289));
- Pi1 = mod(Pi1, tvec4<T, P>(289));
- tvec4<T, P> Pf0 = fract(Position); // Fractional part for interpolation
- tvec4<T, P> Pf1 = Pf0 - T(1); // Fractional part - 1.0
- tvec4<T, P> ix(Pi0.x, Pi1.x, Pi0.x, Pi1.x);
- tvec4<T, P> iy(Pi0.y, Pi0.y, Pi1.y, Pi1.y);
- tvec4<T, P> iz0(Pi0.z);
- tvec4<T, P> iz1(Pi1.z);
- tvec4<T, P> iw0(Pi0.w);
- tvec4<T, P> iw1(Pi1.w);
-
- tvec4<T, P> ixy = detail::permute(detail::permute(ix) + iy);
- tvec4<T, P> ixy0 = detail::permute(ixy + iz0);
- tvec4<T, P> ixy1 = detail::permute(ixy + iz1);
- tvec4<T, P> ixy00 = detail::permute(ixy0 + iw0);
- tvec4<T, P> ixy01 = detail::permute(ixy0 + iw1);
- tvec4<T, P> ixy10 = detail::permute(ixy1 + iw0);
- tvec4<T, P> ixy11 = detail::permute(ixy1 + iw1);
-
- tvec4<T, P> gx00 = ixy00 / T(7);
- tvec4<T, P> gy00 = floor(gx00) / T(7);
- tvec4<T, P> gz00 = floor(gy00) / T(6);
- gx00 = fract(gx00) - T(0.5);
- gy00 = fract(gy00) - T(0.5);
- gz00 = fract(gz00) - T(0.5);
- tvec4<T, P> gw00 = tvec4<T, P>(0.75) - abs(gx00) - abs(gy00) - abs(gz00);
- tvec4<T, P> sw00 = step(gw00, tvec4<T, P>(0.0));
- gx00 -= sw00 * (step(T(0), gx00) - T(0.5));
- gy00 -= sw00 * (step(T(0), gy00) - T(0.5));
-
- tvec4<T, P> gx01 = ixy01 / T(7);
- tvec4<T, P> gy01 = floor(gx01) / T(7);
- tvec4<T, P> gz01 = floor(gy01) / T(6);
- gx01 = fract(gx01) - T(0.5);
- gy01 = fract(gy01) - T(0.5);
- gz01 = fract(gz01) - T(0.5);
- tvec4<T, P> gw01 = tvec4<T, P>(0.75) - abs(gx01) - abs(gy01) - abs(gz01);
- tvec4<T, P> sw01 = step(gw01, tvec4<T, P>(0.0));
- gx01 -= sw01 * (step(T(0), gx01) - T(0.5));
- gy01 -= sw01 * (step(T(0), gy01) - T(0.5));
-
- tvec4<T, P> gx10 = ixy10 / T(7);
- tvec4<T, P> gy10 = floor(gx10) / T(7);
- tvec4<T, P> gz10 = floor(gy10) / T(6);
- gx10 = fract(gx10) - T(0.5);
- gy10 = fract(gy10) - T(0.5);
- gz10 = fract(gz10) - T(0.5);
- tvec4<T, P> gw10 = tvec4<T, P>(0.75) - abs(gx10) - abs(gy10) - abs(gz10);
- tvec4<T, P> sw10 = step(gw10, tvec4<T, P>(0));
- gx10 -= sw10 * (step(T(0), gx10) - T(0.5));
- gy10 -= sw10 * (step(T(0), gy10) - T(0.5));
-
- tvec4<T, P> gx11 = ixy11 / T(7);
- tvec4<T, P> gy11 = floor(gx11) / T(7);
- tvec4<T, P> gz11 = floor(gy11) / T(6);
- gx11 = fract(gx11) - T(0.5);
- gy11 = fract(gy11) - T(0.5);
- gz11 = fract(gz11) - T(0.5);
- tvec4<T, P> gw11 = tvec4<T, P>(0.75) - abs(gx11) - abs(gy11) - abs(gz11);
- tvec4<T, P> sw11 = step(gw11, tvec4<T, P>(0.0));
- gx11 -= sw11 * (step(T(0), gx11) - T(0.5));
- gy11 -= sw11 * (step(T(0), gy11) - T(0.5));
-
- tvec4<T, P> g0000(gx00.x, gy00.x, gz00.x, gw00.x);
- tvec4<T, P> g1000(gx00.y, gy00.y, gz00.y, gw00.y);
- tvec4<T, P> g0100(gx00.z, gy00.z, gz00.z, gw00.z);
- tvec4<T, P> g1100(gx00.w, gy00.w, gz00.w, gw00.w);
- tvec4<T, P> g0010(gx10.x, gy10.x, gz10.x, gw10.x);
- tvec4<T, P> g1010(gx10.y, gy10.y, gz10.y, gw10.y);
- tvec4<T, P> g0110(gx10.z, gy10.z, gz10.z, gw10.z);
- tvec4<T, P> g1110(gx10.w, gy10.w, gz10.w, gw10.w);
- tvec4<T, P> g0001(gx01.x, gy01.x, gz01.x, gw01.x);
- tvec4<T, P> g1001(gx01.y, gy01.y, gz01.y, gw01.y);
- tvec4<T, P> g0101(gx01.z, gy01.z, gz01.z, gw01.z);
- tvec4<T, P> g1101(gx01.w, gy01.w, gz01.w, gw01.w);
- tvec4<T, P> g0011(gx11.x, gy11.x, gz11.x, gw11.x);
- tvec4<T, P> g1011(gx11.y, gy11.y, gz11.y, gw11.y);
- tvec4<T, P> g0111(gx11.z, gy11.z, gz11.z, gw11.z);
- tvec4<T, P> g1111(gx11.w, gy11.w, gz11.w, gw11.w);
-
- tvec4<T, P> norm00 = detail::taylorInvSqrt(tvec4<T, P>(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<T, P> norm01 = detail::taylorInvSqrt(tvec4<T, P>(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<T, P> norm10 = detail::taylorInvSqrt(tvec4<T, P>(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<T, P> norm11 = detail::taylorInvSqrt(tvec4<T, P>(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<T, P>(Pf1.x, Pf0.y, Pf0.z, Pf0.w));
- T n0100 = dot(g0100, tvec4<T, P>(Pf0.x, Pf1.y, Pf0.z, Pf0.w));
- T n1100 = dot(g1100, tvec4<T, P>(Pf1.x, Pf1.y, Pf0.z, Pf0.w));
- T n0010 = dot(g0010, tvec4<T, P>(Pf0.x, Pf0.y, Pf1.z, Pf0.w));
- T n1010 = dot(g1010, tvec4<T, P>(Pf1.x, Pf0.y, Pf1.z, Pf0.w));
- T n0110 = dot(g0110, tvec4<T, P>(Pf0.x, Pf1.y, Pf1.z, Pf0.w));
- T n1110 = dot(g1110, tvec4<T, P>(Pf1.x, Pf1.y, Pf1.z, Pf0.w));
- T n0001 = dot(g0001, tvec4<T, P>(Pf0.x, Pf0.y, Pf0.z, Pf1.w));
- T n1001 = dot(g1001, tvec4<T, P>(Pf1.x, Pf0.y, Pf0.z, Pf1.w));
- T n0101 = dot(g0101, tvec4<T, P>(Pf0.x, Pf1.y, Pf0.z, Pf1.w));
- T n1101 = dot(g1101, tvec4<T, P>(Pf1.x, Pf1.y, Pf0.z, Pf1.w));
- T n0011 = dot(g0011, tvec4<T, P>(Pf0.x, Pf0.y, Pf1.z, Pf1.w));
- T n1011 = dot(g1011, tvec4<T, P>(Pf1.x, Pf0.y, Pf1.z, Pf1.w));
- T n0111 = dot(g0111, tvec4<T, P>(Pf0.x, Pf1.y, Pf1.z, Pf1.w));
- T n1111 = dot(g1111, Pf1);
-
- tvec4<T, P> fade_xyzw = detail::fade(Pf0);
- tvec4<T, P> n_0w = mix(tvec4<T, P>(n0000, n1000, n0100, n1100), tvec4<T, P>(n0001, n1001, n0101, n1101), fade_xyzw.w);
- tvec4<T, P> n_1w = mix(tvec4<T, P>(n0010, n1010, n0110, n1110), tvec4<T, P>(n0011, n1011, n0111, n1111), fade_xyzw.w);
- tvec4<T, P> n_zw = mix(n_0w, n_1w, fade_xyzw.z);
- tvec2<T, P> n_yzw = mix(tvec2<T, P>(n_zw.x, n_zw.y), tvec2<T, P>(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 <typename T, precision P>
- GLM_FUNC_QUALIFIER T perlin(tvec2<T, P> const & Position, tvec2<T, P> const & rep)
- {
- tvec4<T, P> Pi = floor(tvec4<T, P>(Position.x, Position.y, Position.x, Position.y)) + tvec4<T, P>(0.0, 0.0, 1.0, 1.0);
- tvec4<T, P> Pf = fract(tvec4<T, P>(Position.x, Position.y, Position.x, Position.y)) - tvec4<T, P>(0.0, 0.0, 1.0, 1.0);
- Pi = mod(Pi, tvec4<T, P>(rep.x, rep.y, rep.x, rep.y)); // To create noise with explicit period
- Pi = mod(Pi, tvec4<T, P>(289)); // To avoid truncation effects in permutation
- tvec4<T, P> ix(Pi.x, Pi.z, Pi.x, Pi.z);
- tvec4<T, P> iy(Pi.y, Pi.y, Pi.w, Pi.w);
- tvec4<T, P> fx(Pf.x, Pf.z, Pf.x, Pf.z);
- tvec4<T, P> fy(Pf.y, Pf.y, Pf.w, Pf.w);
-
- tvec4<T, P> i = detail::permute(detail::permute(ix) + iy);
-
- tvec4<T, P> gx = static_cast<T>(2) * fract(i / T(41)) - T(1);
- tvec4<T, P> gy = abs(gx) - T(0.5);
- tvec4<T, P> tx = floor(gx + T(0.5));
- gx = gx - tx;
-
- tvec2<T, P> g00(gx.x, gy.x);
- tvec2<T, P> g10(gx.y, gy.y);
- tvec2<T, P> g01(gx.z, gy.z);
- tvec2<T, P> g11(gx.w, gy.w);
-
- tvec4<T, P> norm = detail::taylorInvSqrt(tvec4<T, P>(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<T, P>(fx.x, fy.x));
- T n10 = dot(g10, tvec2<T, P>(fx.y, fy.y));
- T n01 = dot(g01, tvec2<T, P>(fx.z, fy.z));
- T n11 = dot(g11, tvec2<T, P>(fx.w, fy.w));
-
- tvec2<T, P> fade_xy = detail::fade(tvec2<T, P>(Pf.x, Pf.y));
- tvec2<T, P> n_x = mix(tvec2<T, P>(n00, n01), tvec2<T, P>(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 <typename T, precision P>
- GLM_FUNC_QUALIFIER T perlin(tvec3<T, P> const & Position, tvec3<T, P> const & rep)
- {
- tvec3<T, P> Pi0 = mod(floor(Position), rep); // Integer part, modulo period
- tvec3<T, P> Pi1 = mod(Pi0 + tvec3<T, P>(T(1)), rep); // Integer part + 1, mod period
- Pi0 = mod(Pi0, tvec3<T, P>(289));
- Pi1 = mod(Pi1, tvec3<T, P>(289));
- tvec3<T, P> Pf0 = fract(Position); // Fractional part for interpolation
- tvec3<T, P> Pf1 = Pf0 - tvec3<T, P>(T(1)); // Fractional part - 1.0
- tvec4<T, P> ix = tvec4<T, P>(Pi0.x, Pi1.x, Pi0.x, Pi1.x);
- tvec4<T, P> iy = tvec4<T, P>(Pi0.y, Pi0.y, Pi1.y, Pi1.y);
- tvec4<T, P> iz0(Pi0.z);
- tvec4<T, P> iz1(Pi1.z);
-
- tvec4<T, P> ixy = detail::permute(detail::permute(ix) + iy);
- tvec4<T, P> ixy0 = detail::permute(ixy + iz0);
- tvec4<T, P> ixy1 = detail::permute(ixy + iz1);
-
- tvec4<T, P> gx0 = ixy0 / T(7);
- tvec4<T, P> gy0 = fract(floor(gx0) / T(7)) - T(0.5);
- gx0 = fract(gx0);
- tvec4<T, P> gz0 = tvec4<T, P>(0.5) - abs(gx0) - abs(gy0);
- tvec4<T, P> sz0 = step(gz0, tvec4<T, P>(0));
- gx0 -= sz0 * (step(T(0), gx0) - T(0.5));
- gy0 -= sz0 * (step(T(0), gy0) - T(0.5));
-
- tvec4<T, P> gx1 = ixy1 / T(7);
- tvec4<T, P> gy1 = fract(floor(gx1) / T(7)) - T(0.5);
- gx1 = fract(gx1);
- tvec4<T, P> gz1 = tvec4<T, P>(0.5) - abs(gx1) - abs(gy1);
- tvec4<T, P> sz1 = step(gz1, tvec4<T, P>(T(0)));
- gx1 -= sz1 * (step(T(0), gx1) - T(0.5));
- gy1 -= sz1 * (step(T(0), gy1) - T(0.5));
-
- tvec3<T, P> g000 = tvec3<T, P>(gx0.x, gy0.x, gz0.x);
- tvec3<T, P> g100 = tvec3<T, P>(gx0.y, gy0.y, gz0.y);
- tvec3<T, P> g010 = tvec3<T, P>(gx0.z, gy0.z, gz0.z);
- tvec3<T, P> g110 = tvec3<T, P>(gx0.w, gy0.w, gz0.w);
- tvec3<T, P> g001 = tvec3<T, P>(gx1.x, gy1.x, gz1.x);
- tvec3<T, P> g101 = tvec3<T, P>(gx1.y, gy1.y, gz1.y);
- tvec3<T, P> g011 = tvec3<T, P>(gx1.z, gy1.z, gz1.z);
- tvec3<T, P> g111 = tvec3<T, P>(gx1.w, gy1.w, gz1.w);
-
- tvec4<T, P> norm0 = detail::taylorInvSqrt(tvec4<T, P>(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<T, P> norm1 = detail::taylorInvSqrt(tvec4<T, P>(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<T, P>(Pf1.x, Pf0.y, Pf0.z));
- T n010 = dot(g010, tvec3<T, P>(Pf0.x, Pf1.y, Pf0.z));
- T n110 = dot(g110, tvec3<T, P>(Pf1.x, Pf1.y, Pf0.z));
- T n001 = dot(g001, tvec3<T, P>(Pf0.x, Pf0.y, Pf1.z));
- T n101 = dot(g101, tvec3<T, P>(Pf1.x, Pf0.y, Pf1.z));
- T n011 = dot(g011, tvec3<T, P>(Pf0.x, Pf1.y, Pf1.z));
- T n111 = dot(g111, Pf1);
-
- tvec3<T, P> fade_xyz = detail::fade(Pf0);
- tvec4<T, P> n_z = mix(tvec4<T, P>(n000, n100, n010, n110), tvec4<T, P>(n001, n101, n011, n111), fade_xyz.z);
- tvec2<T, P> n_yz = mix(tvec2<T, P>(n_z.x, n_z.y), tvec2<T, P>(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 <typename T, precision P>
- GLM_FUNC_QUALIFIER T perlin(tvec4<T, P> const & Position, tvec4<T, P> const & rep)
- {
- tvec4<T, P> Pi0 = mod(floor(Position), rep); // Integer part modulo rep
- tvec4<T, P> Pi1 = mod(Pi0 + T(1), rep); // Integer part + 1 mod rep
- tvec4<T, P> Pf0 = fract(Position); // Fractional part for interpolation
- tvec4<T, P> Pf1 = Pf0 - T(1); // Fractional part - 1.0
- tvec4<T, P> ix = tvec4<T, P>(Pi0.x, Pi1.x, Pi0.x, Pi1.x);
- tvec4<T, P> iy = tvec4<T, P>(Pi0.y, Pi0.y, Pi1.y, Pi1.y);
- tvec4<T, P> iz0(Pi0.z);
- tvec4<T, P> iz1(Pi1.z);
- tvec4<T, P> iw0(Pi0.w);
- tvec4<T, P> iw1(Pi1.w);
-
- tvec4<T, P> ixy = detail::permute(detail::permute(ix) + iy);
- tvec4<T, P> ixy0 = detail::permute(ixy + iz0);
- tvec4<T, P> ixy1 = detail::permute(ixy + iz1);
- tvec4<T, P> ixy00 = detail::permute(ixy0 + iw0);
- tvec4<T, P> ixy01 = detail::permute(ixy0 + iw1);
- tvec4<T, P> ixy10 = detail::permute(ixy1 + iw0);
- tvec4<T, P> ixy11 = detail::permute(ixy1 + iw1);
-
- tvec4<T, P> gx00 = ixy00 / T(7);
- tvec4<T, P> gy00 = floor(gx00) / T(7);
- tvec4<T, P> gz00 = floor(gy00) / T(6);
- gx00 = fract(gx00) - T(0.5);
- gy00 = fract(gy00) - T(0.5);
- gz00 = fract(gz00) - T(0.5);
- tvec4<T, P> gw00 = tvec4<T, P>(0.75) - abs(gx00) - abs(gy00) - abs(gz00);
- tvec4<T, P> sw00 = step(gw00, tvec4<T, P>(0));
- gx00 -= sw00 * (step(T(0), gx00) - T(0.5));
- gy00 -= sw00 * (step(T(0), gy00) - T(0.5));
-
- tvec4<T, P> gx01 = ixy01 / T(7);
- tvec4<T, P> gy01 = floor(gx01) / T(7);
- tvec4<T, P> gz01 = floor(gy01) / T(6);
- gx01 = fract(gx01) - T(0.5);
- gy01 = fract(gy01) - T(0.5);
- gz01 = fract(gz01) - T(0.5);
- tvec4<T, P> gw01 = tvec4<T, P>(0.75) - abs(gx01) - abs(gy01) - abs(gz01);
- tvec4<T, P> sw01 = step(gw01, tvec4<T, P>(0.0));
- gx01 -= sw01 * (step(T(0), gx01) - T(0.5));
- gy01 -= sw01 * (step(T(0), gy01) - T(0.5));
-
- tvec4<T, P> gx10 = ixy10 / T(7);
- tvec4<T, P> gy10 = floor(gx10) / T(7);
- tvec4<T, P> gz10 = floor(gy10) / T(6);
- gx10 = fract(gx10) - T(0.5);
- gy10 = fract(gy10) - T(0.5);
- gz10 = fract(gz10) - T(0.5);
- tvec4<T, P> gw10 = tvec4<T, P>(0.75) - abs(gx10) - abs(gy10) - abs(gz10);
- tvec4<T, P> sw10 = step(gw10, tvec4<T, P>(0.0));
- gx10 -= sw10 * (step(T(0), gx10) - T(0.5));
- gy10 -= sw10 * (step(T(0), gy10) - T(0.5));
-
- tvec4<T, P> gx11 = ixy11 / T(7);
- tvec4<T, P> gy11 = floor(gx11) / T(7);
- tvec4<T, P> gz11 = floor(gy11) / T(6);
- gx11 = fract(gx11) - T(0.5);
- gy11 = fract(gy11) - T(0.5);
- gz11 = fract(gz11) - T(0.5);
- tvec4<T, P> gw11 = tvec4<T, P>(0.75) - abs(gx11) - abs(gy11) - abs(gz11);
- tvec4<T, P> sw11 = step(gw11, tvec4<T, P>(T(0)));
- gx11 -= sw11 * (step(T(0), gx11) - T(0.5));
- gy11 -= sw11 * (step(T(0), gy11) - T(0.5));
-
- tvec4<T, P> g0000(gx00.x, gy00.x, gz00.x, gw00.x);
- tvec4<T, P> g1000(gx00.y, gy00.y, gz00.y, gw00.y);
- tvec4<T, P> g0100(gx00.z, gy00.z, gz00.z, gw00.z);
- tvec4<T, P> g1100(gx00.w, gy00.w, gz00.w, gw00.w);
- tvec4<T, P> g0010(gx10.x, gy10.x, gz10.x, gw10.x);
- tvec4<T, P> g1010(gx10.y, gy10.y, gz10.y, gw10.y);
- tvec4<T, P> g0110(gx10.z, gy10.z, gz10.z, gw10.z);
- tvec4<T, P> g1110(gx10.w, gy10.w, gz10.w, gw10.w);
- tvec4<T, P> g0001(gx01.x, gy01.x, gz01.x, gw01.x);
- tvec4<T, P> g1001(gx01.y, gy01.y, gz01.y, gw01.y);
- tvec4<T, P> g0101(gx01.z, gy01.z, gz01.z, gw01.z);
- tvec4<T, P> g1101(gx01.w, gy01.w, gz01.w, gw01.w);
- tvec4<T, P> g0011(gx11.x, gy11.x, gz11.x, gw11.x);
- tvec4<T, P> g1011(gx11.y, gy11.y, gz11.y, gw11.y);
- tvec4<T, P> g0111(gx11.z, gy11.z, gz11.z, gw11.z);
- tvec4<T, P> g1111(gx11.w, gy11.w, gz11.w, gw11.w);
-
- tvec4<T, P> norm00 = detail::taylorInvSqrt(tvec4<T, P>(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<T, P> norm01 = detail::taylorInvSqrt(tvec4<T, P>(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<T, P> norm10 = detail::taylorInvSqrt(tvec4<T, P>(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<T, P> norm11 = detail::taylorInvSqrt(tvec4<T, P>(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<T, P>(Pf1.x, Pf0.y, Pf0.z, Pf0.w));
- T n0100 = dot(g0100, tvec4<T, P>(Pf0.x, Pf1.y, Pf0.z, Pf0.w));
- T n1100 = dot(g1100, tvec4<T, P>(Pf1.x, Pf1.y, Pf0.z, Pf0.w));
- T n0010 = dot(g0010, tvec4<T, P>(Pf0.x, Pf0.y, Pf1.z, Pf0.w));
- T n1010 = dot(g1010, tvec4<T, P>(Pf1.x, Pf0.y, Pf1.z, Pf0.w));
- T n0110 = dot(g0110, tvec4<T, P>(Pf0.x, Pf1.y, Pf1.z, Pf0.w));
- T n1110 = dot(g1110, tvec4<T, P>(Pf1.x, Pf1.y, Pf1.z, Pf0.w));
- T n0001 = dot(g0001, tvec4<T, P>(Pf0.x, Pf0.y, Pf0.z, Pf1.w));
- T n1001 = dot(g1001, tvec4<T, P>(Pf1.x, Pf0.y, Pf0.z, Pf1.w));
- T n0101 = dot(g0101, tvec4<T, P>(Pf0.x, Pf1.y, Pf0.z, Pf1.w));
- T n1101 = dot(g1101, tvec4<T, P>(Pf1.x, Pf1.y, Pf0.z, Pf1.w));
- T n0011 = dot(g0011, tvec4<T, P>(Pf0.x, Pf0.y, Pf1.z, Pf1.w));
- T n1011 = dot(g1011, tvec4<T, P>(Pf1.x, Pf0.y, Pf1.z, Pf1.w));
- T n0111 = dot(g0111, tvec4<T, P>(Pf0.x, Pf1.y, Pf1.z, Pf1.w));
- T n1111 = dot(g1111, Pf1);
-
- tvec4<T, P> fade_xyzw = detail::fade(Pf0);
- tvec4<T, P> n_0w = mix(tvec4<T, P>(n0000, n1000, n0100, n1100), tvec4<T, P>(n0001, n1001, n0101, n1101), fade_xyzw.w);
- tvec4<T, P> n_1w = mix(tvec4<T, P>(n0010, n1010, n0110, n1110), tvec4<T, P>(n0011, n1011, n0111, n1111), fade_xyzw.w);
- tvec4<T, P> n_zw = mix(n_0w, n_1w, fade_xyzw.z);
- tvec2<T, P> n_yzw = mix(tvec2<T, P>(n_zw.x, n_zw.y), tvec2<T, P>(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 <typename T, precision P>
- GLM_FUNC_QUALIFIER T simplex(glm::tvec2<T, P> const & v)
- {
- tvec4<T, P> const C = tvec4<T, P>(
- 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<T, P> i = floor(v + dot(v, tvec2<T, P>(C[1])));
- tvec2<T, P> x0 = v - i + dot(i, tvec2<T, P>(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<T, P> i1 = (x0.x > x0.y) ? tvec2<T, P>(1, 0) : tvec2<T, P>(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<T, P> x12 = tvec4<T, P>(x0.x, x0.y, x0.x, x0.y) + tvec4<T, P>(C.x, C.x, C.z, C.z);
- x12 = tvec4<T, P>(tvec2<T, P>(x12) - i1, x12.z, x12.w);
-
- // Permutations
- i = mod(i, tvec2<T, P>(289)); // Avoid truncation effects in permutation
- tvec3<T, P> p = detail::permute(
- detail::permute(i.y + tvec3<T, P>(T(0), i1.y, T(1)))
- + i.x + tvec3<T, P>(T(0), i1.x, T(1)));
-
- tvec3<T, P> m = max(tvec3<T, P>(0.5) - tvec3<T, P>(
- dot(x0, x0),
- dot(tvec2<T, P>(x12.x, x12.y), tvec2<T, P>(x12.x, x12.y)),
- dot(tvec2<T, P>(x12.z, x12.w), tvec2<T, P>(x12.z, x12.w))), tvec3<T, P>(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<T, P> x = static_cast<T>(2) * fract(p * C.w) - T(1);
- tvec3<T, P> h = abs(x) - T(0.5);
- tvec3<T, P> ox = floor(x + T(0.5));
- tvec3<T, P> a0 = x - ox;
-
- // Normalise gradients implicitly by scaling m
- // Inlined for speed: m *= taylorInvSqrt( a0*a0 + h*h );
- m *= static_cast<T>(1.79284291400159) - T(0.85373472095314) * (a0 * a0 + h * h);
-
- // Compute final noise value at P
- tvec3<T, P> 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 <typename T, precision P>
- GLM_FUNC_QUALIFIER T simplex(tvec3<T, P> const & v)
- {
- tvec2<T, P> const C(1.0 / 6.0, 1.0 / 3.0);
- tvec4<T, P> const D(0.0, 0.5, 1.0, 2.0);
-
- // First corner
- tvec3<T, P> i(floor(v + dot(v, tvec3<T, P>(C.y))));
- tvec3<T, P> x0(v - i + dot(i, tvec3<T, P>(C.x)));
-
- // Other corners
- tvec3<T, P> g(step(tvec3<T, P>(x0.y, x0.z, x0.x), x0));
- tvec3<T, P> l(T(1) - g);
- tvec3<T, P> i1(min(g, tvec3<T, P>(l.z, l.x, l.y)));
- tvec3<T, P> i2(max(g, tvec3<T, P>(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<T, P> x1(x0 - i1 + C.x);
- tvec3<T, P> x2(x0 - i2 + C.y); // 2.0*C.x = 1/3 = C.y
- tvec3<T, P> x3(x0 - D.y); // -1.0+3.0*C.x = -0.5 = -D.y
-
- // Permutations
- i = detail::mod289(i);
- tvec4<T, P> p(detail::permute(detail::permute(detail::permute(
- i.z + tvec4<T, P>(T(0), i1.z, i2.z, T(1))) +
- i.y + tvec4<T, P>(T(0), i1.y, i2.y, T(1))) +
- i.x + tvec4<T, P>(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<T>(0.142857142857); // 1.0/7.0
- tvec3<T, P> ns(n_ * tvec3<T, P>(D.w, D.y, D.z) - tvec3<T, P>(D.x, D.z, D.x));
-
- tvec4<T, P> j(p - T(49) * floor(p * ns.z * ns.z)); // mod(p,7*7)
-
- tvec4<T, P> x_(floor(j * ns.z));
- tvec4<T, P> y_(floor(j - T(7) * x_)); // mod(j,N)
-
- tvec4<T, P> x(x_ * ns.x + ns.y);
- tvec4<T, P> y(y_ * ns.x + ns.y);
- tvec4<T, P> h(T(1) - abs(x) - abs(y));
-
- tvec4<T, P> b0(x.x, x.y, y.x, y.y);
- tvec4<T, P> 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<T, P> s0(floor(b0) * T(2) + T(1));
- tvec4<T, P> s1(floor(b1) * T(2) + T(1));
- tvec4<T, P> sh(-step(h, tvec4<T, P>(0.0)));
-
- tvec4<T, P> a0 = tvec4<T, P>(b0.x, b0.z, b0.y, b0.w) + tvec4<T, P>(s0.x, s0.z, s0.y, s0.w) * tvec4<T, P>(sh.x, sh.x, sh.y, sh.y);
- tvec4<T, P> a1 = tvec4<T, P>(b1.x, b1.z, b1.y, b1.w) + tvec4<T, P>(s1.x, s1.z, s1.y, s1.w) * tvec4<T, P>(sh.z, sh.z, sh.w, sh.w);
-
- tvec3<T, P> p0(a0.x, a0.y, h.x);
- tvec3<T, P> p1(a0.z, a0.w, h.y);
- tvec3<T, P> p2(a1.x, a1.y, h.z);
- tvec3<T, P> p3(a1.z, a1.w, h.w);
-
- // Normalise gradients
- tvec4<T, P> norm = detail::taylorInvSqrt(tvec4<T, P>(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<T, P> m = max(T(0.6) - tvec4<T, P>(dot(x0, x0), dot(x1, x1), dot(x2, x2), dot(x3, x3)), tvec4<T, P>(0));
- m = m * m;
- return T(42) * dot(m * m, tvec4<T, P>(dot(p0, x0), dot(p1, x1), dot(p2, x2), dot(p3, x3)));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T simplex(tvec4<T, P> const & v)
- {
- tvec4<T, P> 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<T>(0.309016994374947451);
-
- // First corner
- tvec4<T, P> i = floor(v + dot(v, vec4(F4)));
- tvec4<T, P> x0 = v - i + dot(i, vec4(C.x));
-
- // Other corners
-
- // Rank sorting originally contributed by Bill Licea-Kane, AMD (formerly ATI)
- tvec4<T, P> i0;
- tvec3<T, P> isX = step(tvec3<T, P>(x0.y, x0.z, x0.w), tvec3<T, P>(x0.x));
- tvec3<T, P> isYZ = step(tvec3<T, P>(x0.z, x0.w, x0.w), tvec3<T, P>(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<T>(1) - isX;
- i0 = tvec4<T, P>(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<T, P>(isYZ.x, isYZ.y);
- i0.z += static_cast<T>(1) - isYZ.x;
- i0.w += static_cast<T>(1) - isYZ.y;
- i0.z += isYZ.z;
- i0.w += static_cast<T>(1) - isYZ.z;
-
- // i0 now contains the unique values 0,1,2,3 in each channel
- tvec4<T, P> i3 = clamp(i0, T(0), T(1));
- tvec4<T, P> i2 = clamp(i0 - T(1), T(0), T(1));
- tvec4<T, P> 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<T, P> x1 = x0 - i1 + C.x;
- tvec4<T, P> x2 = x0 - i2 + C.y;
- tvec4<T, P> x3 = x0 - i3 + C.z;
- tvec4<T, P> x4 = x0 + C.w;
-
- // Permutations
- i = mod(i, tvec4<T, P>(289));
- T j0 = detail::permute(detail::permute(detail::permute(detail::permute(i.w) + i.z) + i.y) + i.x);
- tvec4<T, P> j1 = detail::permute(detail::permute(detail::permute(detail::permute(
- i.w + tvec4<T, P>(i1.w, i2.w, i3.w, T(1))) +
- i.z + tvec4<T, P>(i1.z, i2.z, i3.z, T(1))) +
- i.y + tvec4<T, P>(i1.y, i2.y, i3.y, T(1))) +
- i.x + tvec4<T, P>(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<T, P> ip = tvec4<T, P>(T(1) / T(294), T(1) / T(49), T(1) / T(7), T(0));
-
- tvec4<T, P> p0 = gtc::grad4(j0, ip);
- tvec4<T, P> p1 = gtc::grad4(j1.x, ip);
- tvec4<T, P> p2 = gtc::grad4(j1.y, ip);
- tvec4<T, P> p3 = gtc::grad4(j1.z, ip);
- tvec4<T, P> p4 = gtc::grad4(j1.w, ip);
-
- // Normalise gradients
- tvec4<T, P> norm = detail::taylorInvSqrt(tvec4<T, P>(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<T, P> m0 = max(T(0.6) - tvec3<T, P>(dot(x0, x0), dot(x1, x1), dot(x2, x2)), tvec3<T, P>(0));
- tvec2<T, P> m1 = max(T(0.6) - tvec2<T, P>(dot(x3, x3), dot(x4, x4) ), tvec2<T, P>(0));
- m0 = m0 * m0;
- m1 = m1 * m1;
- return T(49) *
- (dot(m0 * m0, tvec3<T, P>(dot(p0, x0), dot(p1, x1), dot(p2, x2))) +
- dot(m1 * m1, tvec2<T, P>(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.
-///
-/// <glm/gtc/packing.hpp> 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/packUnorm4x8.xml">GLSL packUnorm4x8 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/unpackUnorm4x8.xml">GLSL unpackUnorm4x8 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/packUnorm4x8.xml">GLSL packUnorm4x8 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/unpackUnorm4x8.xml">GLSL unpackUnorm4x8 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/packSnorm4x8.xml">GLSL packSnorm4x8 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/unpackSnorm4x8.xml">GLSL unpackSnorm4x8 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/packSnorm4x8.xml">GLSL packSnorm4x8 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/unpackSnorm4x8.xml">GLSL unpackSnorm4x8 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/packUnorm4x8.xml">GLSL packUnorm4x8 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/unpackUnorm2x16.xml">GLSL unpackUnorm2x16 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/packUnorm4x8.xml">GLSL packUnorm4x8 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/unpackUnorm2x16.xml">GLSL unpackUnorm2x16 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/packSnorm4x8.xml">GLSL packSnorm4x8 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/unpackSnorm1x16.xml">GLSL unpackSnorm4x8 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/packSnorm4x8.xml">GLSL packSnorm4x8 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/unpackSnorm2x16.xml">GLSL unpackSnorm4x8 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/packHalf2x16.xml">GLSL packHalf2x16 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/unpackHalf2x16.xml">GLSL unpackHalf2x16 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/packHalf2x16.xml">GLSL packHalf2x16 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- 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 <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/unpackHalf2x16.xml">GLSL unpackHalf2x16 man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
- 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 <cstring>
-
-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<uint&>(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<float&>(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<uint&>(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<float&>(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<uint8>(round(clamp(v, 0.0f, 1.0f) * 255.0f));
- }
-
- GLM_FUNC_QUALIFIER float unpackUnorm1x8(uint8 p)
- {
- float const Unpack(p);
- return Unpack * static_cast<float>(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<uint16 const &>(Topack);
- }
-
- GLM_FUNC_QUALIFIER vec2 unpackUnorm2x8(uint16 p)
- {
- vec2 const Unpack(reinterpret_cast<u8vec2 const &>(p));
- return Unpack * float(0.0039215686274509803921568627451); // 1 / 255
- }
-
- GLM_FUNC_QUALIFIER uint8 packSnorm1x8(float v)
- {
- int8 const Topack(static_cast<int8>(round(clamp(v ,-1.0f, 1.0f) * 127.0f)));
- return reinterpret_cast<uint8 const &>(Topack);
- }
-
- GLM_FUNC_QUALIFIER float unpackSnorm1x8(uint8 p)
- {
- float const Unpack(reinterpret_cast<int8 const &>(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<uint16 const &>(Topack);
- }
-
- GLM_FUNC_QUALIFIER vec2 unpackSnorm2x8(uint16 p)
- {
- vec2 const Unpack(reinterpret_cast<i8vec2 const &>(p));
- return clamp(
- Unpack * 0.00787401574803149606299212598425f, // 1.0f / 127.0f
- -1.0f, 1.0f);
- }
-
- GLM_FUNC_QUALIFIER uint16 packUnorm1x16(float s)
- {
- return static_cast<uint16>(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<uint64 const &>(Topack);
- }
-
- GLM_FUNC_QUALIFIER vec4 unpackUnorm4x16(uint64 p)
- {
- vec4 const Unpack(reinterpret_cast<u16vec4 const &>(p));
- return Unpack * 1.5259021896696421759365224689097e-5f; // 1.0 / 65535.0
- }
-
- GLM_FUNC_QUALIFIER uint16 packSnorm1x16(float v)
- {
- int16 const Topack = static_cast<int16>(round(clamp(v ,-1.0f, 1.0f) * 32767.0f));
- return reinterpret_cast<uint16 const &>(Topack);
- }
-
- GLM_FUNC_QUALIFIER float unpackSnorm1x16(uint16 p)
- {
- float const Unpack(reinterpret_cast<int16 const &>(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<uint64 const &>(Topack);
- }
-
- GLM_FUNC_QUALIFIER vec4 unpackSnorm4x16(uint64 p)
- {
- vec4 const Unpack(reinterpret_cast<i16vec4 const &>(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<uint16 const &>(Topack);
- }
-
- GLM_FUNC_QUALIFIER float unpackHalf1x16(uint16 v)
- {
- return detail::toFloat32(reinterpret_cast<int16 const &>(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<uint64 const &>(Unpack);
- }
-
- GLM_FUNC_QUALIFIER glm::vec4 unpackHalf4x16(uint64 v)
- {
- i16vec4 Unpack(reinterpret_cast<i16vec4 const &>(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.
-///
-/// <glm/gtc/quaternion.hpp> 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 <typename T, precision P>
- struct tquat
- {
- typedef tquat<T, P> 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<T, P> const & q);
- template <precision Q>
- GLM_FUNC_DECL tquat(tquat<T, Q> const & q);
-
- //////////////////////////////////////
- // Explicit basic constructors
-
- GLM_FUNC_DECL explicit tquat(ctor);
- GLM_FUNC_DECL explicit tquat(T const & s, tvec3<T, P> 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 <typename U, precision Q>
- GLM_FUNC_DECL explicit tquat(tquat<U, Q> const & q);
-# else
- template <typename U, precision Q>
- GLM_FUNC_DECL tquat(tquat<U, Q> const & q);
-# endif
-
- // explicit conversion operators
-# if GLM_HAS_EXPLICIT_CONVERSION_OPERATORS
- GLM_FUNC_DECL explicit operator tmat3x3<T, P>();
- GLM_FUNC_DECL explicit operator tmat4x4<T, P>();
-# 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<T, P> const & u, tvec3<T, P> const & v);
-
- /// Build a quaternion from euler angles (pitch, yaw, roll), in radians.
- GLM_FUNC_DECL explicit tquat(tvec3<T, P> const & eulerAngles);
- GLM_FUNC_DECL explicit tquat(tmat3x3<T, P> const & m);
- GLM_FUNC_DECL explicit tquat(tmat4x4<T, P> const & m);
-
- //////////////////////////////////////
- // Operators
-
- GLM_FUNC_DECL tquat<T, P> & operator=(tquat<T, P> const & m);
-
- template <typename U>
- GLM_FUNC_DECL tquat<T, P> & operator=(tquat<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tquat<T, P> & operator+=(tquat<U, P> const & q);
- template <typename U>
- GLM_FUNC_DECL tquat<T, P> & operator*=(tquat<U, P> const & q);
- template <typename U>
- GLM_FUNC_DECL tquat<T, P> & operator*=(U s);
- template <typename U>
- GLM_FUNC_DECL tquat<T, P> & operator/=(U s);
- };
-
- template <typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> operator-(tquat<T, P> const & q);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> operator+(tquat<T, P> const & q, tquat<T, P> const & p);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> operator*(tquat<T, P> const & q, tquat<T, P> const & p);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator*(tquat<T, P> const & q, tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator*(tvec3<T, P> const & v, tquat<T, P> const & q);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator*(tquat<T, P> const & q, tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator*(tvec4<T, P> const & v, tquat<T, P> const & q);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> operator*(tquat<T, P> const & q, T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> operator*(T const & s, tquat<T, P> const & q);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> operator/(tquat<T, P> const & q, T const & s);
-
- /// Returns the length of the quaternion.
- ///
- /// @see gtc_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL T length(tquat<T, P> const & q);
-
- /// Returns the normalized quaternion.
- ///
- /// @see gtc_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> normalize(tquat<T, P> const & q);
-
- /// Returns dot product of q1 and q2, i.e., q1[0] * q2[0] + q1[1] * q2[1] + ...
- ///
- /// @see gtc_quaternion
- template <typename T, precision P, template <typename, precision> class quatType>
- GLM_FUNC_DECL T dot(quatType<T, P> const & x, quatType<T, P> 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<T, P> const & x, tquat<T, P> const & y, T const & a)
- template <typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> mix(tquat<T, P> const & x, tquat<T, P> 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 <typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> lerp(tquat<T, P> const & x, tquat<T, P> 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 <typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> slerp(tquat<T, P> const & x, tquat<T, P> const & y, T a);
-
- /// Returns the q conjugate.
- ///
- /// @see gtc_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> conjugate(tquat<T, P> const & q);
-
- /// Returns the q inverse.
- ///
- /// @see gtc_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> inverse(tquat<T, P> 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 <typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> rotate(tquat<T, P> const & q, T const & angle, tvec3<T, P> 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 <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> eulerAngles(tquat<T, P> const & x);
-
- /// Returns roll value of euler angles expressed in radians.
- ///
- /// @see gtx_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL T roll(tquat<T, P> const & x);
-
- /// Returns pitch value of euler angles expressed in radians.
- ///
- /// @see gtx_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL T pitch(tquat<T, P> const & x);
-
- /// Returns yaw value of euler angles expressed in radians.
- ///
- /// @see gtx_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL T yaw(tquat<T, P> const & x);
-
- /// Converts a quaternion to a 3 * 3 matrix.
- ///
- /// @see gtc_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> mat3_cast(tquat<T, P> const & x);
-
- /// Converts a quaternion to a 4 * 4 matrix.
- ///
- /// @see gtc_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> mat4_cast(tquat<T, P> const & x);
-
- /// Converts a 3 * 3 matrix to a quaternion.
- ///
- /// @see gtc_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> quat_cast(tmat3x3<T, P> const & x);
-
- /// Converts a 4 * 4 matrix to a quaternion.
- ///
- /// @see gtc_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> quat_cast(tmat4x4<T, P> const & x);
-
- /// Returns the quaternion rotation angle.
- ///
- /// @see gtc_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL T angle(tquat<T, P> const & x);
-
- /// Returns the q rotation axis.
- ///
- /// @see gtc_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> axis(tquat<T, P> 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 <typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> angleAxis(T const & angle, tvec3<T, P> const & axis);
-
- /// Returns the component-wise comparison result of x < y.
- ///
- /// @tparam quatType Floating-point quaternion types.
- ///
- /// @see gtc_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<bool, P> lessThan(tquat<T, P> const & x, tquat<T, P> const & y);
-
- /// Returns the component-wise comparison of result x <= y.
- ///
- /// @tparam quatType Floating-point quaternion types.
- ///
- /// @see gtc_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<bool, P> lessThanEqual(tquat<T, P> const & x, tquat<T, P> const & y);
-
- /// Returns the component-wise comparison of result x > y.
- ///
- /// @tparam quatType Floating-point quaternion types.
- ///
- /// @see gtc_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<bool, P> greaterThan(tquat<T, P> const & x, tquat<T, P> const & y);
-
- /// Returns the component-wise comparison of result x >= y.
- ///
- /// @tparam quatType Floating-point quaternion types.
- ///
- /// @see gtc_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<bool, P> greaterThanEqual(tquat<T, P> const & x, tquat<T, P> const & y);
-
- /// Returns the component-wise comparison of result x == y.
- ///
- /// @tparam quatType Floating-point quaternion types.
- ///
- /// @see gtc_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<bool, P> equal(tquat<T, P> const & x, tquat<T, P> const & y);
-
- /// Returns the component-wise comparison of result x != y.
- ///
- /// @tparam quatType Floating-point quaternion types.
- ///
- /// @see gtc_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<bool, P> notEqual(tquat<T, P> const & x, tquat<T, P> 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 <limits>
-
-namespace glm{
-namespace detail
-{
- template <typename T, precision P>
- struct compute_dot<tquat, T, P>
- {
- static GLM_FUNC_QUALIFIER T call(tquat<T, P> const & x, tquat<T, P> const & y)
- {
- tvec4<T, P> 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 <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tquat<T, P>::size_type tquat<T, P>::size() const
- {
- return 4;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T & tquat<T, P>::operator[](typename tquat<T, P>::size_type i)
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&x)[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T const & tquat<T, P>::operator[](typename tquat<T, P>::size_type i) const
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&x)[i];
- }
-# else
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tquat<T, P>::length_type tquat<T, P>::length() const
- {
- return 4;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T & tquat<T, P>::operator[](typename tquat<T, P>::length_type i)
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&x)[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T const & tquat<T, P>::operator[](typename tquat<T, P>::length_type i) const
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&x)[i];
- }
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////
- // Implicit basic constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P>::tquat()
-# ifndef GLM_FORCE_NO_CTOR_INIT
- : x(0), y(0), z(0), w(1)
-# endif
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P>::tquat(tquat<T, P> const & q)
- : x(q.x), y(q.y), z(q.z), w(q.w)
- {}
-
- template <typename T, precision P>
- template <precision Q>
- GLM_FUNC_QUALIFIER tquat<T, P>::tquat(tquat<T, Q> const & q)
- : x(q.x), y(q.y), z(q.z), w(q.w)
- {}
-
- //////////////////////////////////////
- // Explicit basic constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P>::tquat(ctor)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P>::tquat(T const & s, tvec3<T, P> const & v)
- : x(v.x), y(v.y), z(v.z), w(s)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P>::tquat(T const & w, T const & x, T const & y, T const & z)
- : x(x), y(y), z(z), w(w)
- {}
-
- //////////////////////////////////////////////////////////////
- // Conversions
-
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tquat<T, P>::tquat(tquat<U, Q> const & q)
- : x(static_cast<T>(q.x))
- , y(static_cast<T>(q.y))
- , z(static_cast<T>(q.z))
- , w(static_cast<T>(q.w))
- {}
-
- //template <typename valType>
- //GLM_FUNC_QUALIFIER tquat<valType>::tquat
- //(
- // valType const & pitch,
- // valType const & yaw,
- // valType const & roll
- //)
- //{
- // tvec3<valType> eulerAngle(pitch * valType(0.5), yaw * valType(0.5), roll * valType(0.5));
- // tvec3<valType> c = glm::cos(eulerAngle * valType(0.5));
- // tvec3<valType> 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 <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P>::tquat(tvec3<T, P> const & u, tvec3<T, P> const & v)
- {
- tvec3<T, P> const LocalW(cross(u, v));
- T Dot = detail::compute_dot<tvec3, T, P>::call(u, v);
- tquat<T, P> q(T(1) + Dot, LocalW.x, LocalW.y, LocalW.z);
-
- *this = normalize(q);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P>::tquat(tvec3<T, P> const & eulerAngle)
- {
- tvec3<T, P> c = glm::cos(eulerAngle * T(0.5));
- tvec3<T, P> 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 <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P>::tquat(tmat3x3<T, P> const & m)
- {
- *this = quat_cast(m);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P>::tquat(tmat4x4<T, P> const & m)
- {
- *this = quat_cast(m);
- }
-
-# if GLM_HAS_EXPLICIT_CONVERSION_OPERATORS
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P>::operator tmat3x3<T, P>()
- {
- return mat3_cast(*this);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P>::operator tmat4x4<T, P>()
- {
- return mat4_cast(*this);
- }
-# endif//GLM_HAS_EXPLICIT_CONVERSION_OPERATORS
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> conjugate(tquat<T, P> const & q)
- {
- return tquat<T, P>(q.w, -q.x, -q.y, -q.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> inverse(tquat<T, P> const & q)
- {
- return conjugate(q) / dot(q, q);
- }
-
- //////////////////////////////////////////////////////////////
- // tquat<valType> operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> & tquat<T, P>::operator=(tquat<T, P> const & q)
- {
- this->w = q.w;
- this->x = q.x;
- this->y = q.y;
- this->z = q.z;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tquat<T, P> & tquat<T, P>::operator=(tquat<U, P> const & q)
- {
- this->w = static_cast<T>(q.w);
- this->x = static_cast<T>(q.x);
- this->y = static_cast<T>(q.y);
- this->z = static_cast<T>(q.z);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tquat<T, P> & tquat<T, P>::operator+=(tquat<U, P> const & q)
- {
- this->w += static_cast<T>(q.w);
- this->x += static_cast<T>(q.x);
- this->y += static_cast<T>(q.y);
- this->z += static_cast<T>(q.z);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tquat<T, P> & tquat<T, P>::operator*=(tquat<U, P> const & r)
- {
- tquat<T, P> const p(*this);
- tquat<T, P> 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 <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tquat<T, P> & tquat<T, P>::operator*=(U s)
- {
- this->w *= static_cast<U>(s);
- this->x *= static_cast<U>(s);
- this->y *= static_cast<U>(s);
- this->z *= static_cast<U>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tquat<T, P> & tquat<T, P>::operator/=(U s)
- {
- this->w /= static_cast<U>(s);
- this->x /= static_cast<U>(s);
- this->y /= static_cast<U>(s);
- this->z /= static_cast<U>(s);
- return *this;
- }
-
- //////////////////////////////////////////////////////////////
- // tquat<T, P> external operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> operator-(tquat<T, P> const & q)
- {
- return tquat<T, P>(-q.w, -q.x, -q.y, -q.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> operator+(tquat<T, P> const & q, tquat<T, P> const & p)
- {
- return tquat<T, P>(q) += p;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> operator*(tquat<T, P> const & q, tquat<T, P> const & p)
- {
- return tquat<T, P>(q) *= p;
- }
-
- // Transformation
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator*(tquat<T, P> const & q, tvec3<T, P> const & v)
- {
- tvec3<T, P> const QuatVector(q.x, q.y, q.z);
- tvec3<T, P> const uv(glm::cross(QuatVector, v));
- tvec3<T, P> const uuv(glm::cross(QuatVector, uv));
-
- return v + ((uv * q.w) + uuv) * static_cast<T>(2);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator*(tvec3<T, P> const & v, tquat<T, P> const & q)
- {
- return glm::inverse(q) * v;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator*(tquat<T, P> const & q, tvec4<T, P> const & v)
- {
- return tvec4<T, P>(q * tvec3<T, P>(v), v.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator*(tvec4<T, P> const & v, tquat<T, P> const & q)
- {
- return glm::inverse(q) * v;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> operator*(tquat<T, P> const & q, T const & s)
- {
- return tquat<T, P>(
- q.w * s, q.x * s, q.y * s, q.z * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> operator*(T const & s, tquat<T, P> const & q)
- {
- return q * s;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> operator/(tquat<T, P> const & q, T const & s)
- {
- return tquat<T, P>(
- q.w / s, q.x / s, q.y / s, q.z / s);
- }
-
- //////////////////////////////////////
- // Boolean operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator==(tquat<T, P> const & q1, tquat<T, P> const & q2)
- {
- return (q1.x == q2.x) && (q1.y == q2.y) && (q1.z == q2.z) && (q1.w == q2.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator!=(tquat<T, P> const & q1, tquat<T, P> const & q2)
- {
- return (q1.x != q2.x) || (q1.y != q2.y) || (q1.z != q2.z) || (q1.w != q2.w);
- }
-
- ////////////////////////////////////////////////////////
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T length(tquat<T, P> const & q)
- {
- return glm::sqrt(dot(q, q));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> normalize(tquat<T, P> const & q)
- {
- T len = length(q);
- if(len <= T(0)) // Problem
- return tquat<T, P>(1, 0, 0, 0);
- T oneOverLen = T(1) / len;
- return tquat<T, P>(q.w * oneOverLen, q.x * oneOverLen, q.y * oneOverLen, q.z * oneOverLen);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> cross(tquat<T, P> const & q1, tquat<T, P> const & q2)
- {
- return tquat<T, P>(
- 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 <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> mix(tquat<T, P> const & x, tquat<T, P> const & y, T const & a)
- {
- if(a <= T(0)) return x;
- if(a >= T(1)) return y;
-
- float fCos = dot(x, y);
- tquat<T, P> y2(y); //BUG!!! tquat<T, P> 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<T>(1) / fSin;
- k0 = sin((T(1) - a) * fAngle) * fOneOverSin;
- k1 = sin((T(0) + a) * fAngle) * fOneOverSin;
- }
-
- return tquat<T, P>(
- k0 * x.w + k1 * y2.w,
- k0 * x.x + k1 * y2.x,
- k0 * x.y + k1 * y2.y,
- k0 * x.z + k1 * y2.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> mix2
- (
- tquat<T, P> const & x,
- tquat<T, P> const & y,
- T const & a
- )
- {
- bool flip = false;
- if(a <= static_cast<T>(0)) return x;
- if(a >= static_cast<T>(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<T>(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 <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> mix(tquat<T, P> const & x, tquat<T, P> 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<T>())
- {
- // Linear interpolation
- return tquat<T, P>(
- 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 <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> lerp(tquat<T, P> const & x, tquat<T, P> const & y, T a)
- {
- // Lerp is only defined in [0, 1]
- assert(a >= static_cast<T>(0));
- assert(a <= static_cast<T>(1));
-
- return x * (T(1) - a) + (y * a);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> slerp(tquat<T, P> const & x, tquat<T, P> const & y, T a)
- {
- tquat<T, P> 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<T>())
- {
- // Linear interpolation
- return tquat<T, P>(
- 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 <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> rotate(tquat<T, P> const & q, T const & angle, tvec3<T, P> const & v)
- {
- tvec3<T, P> 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<T>(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<T, P>(cos(AngleRad * T(0.5)), Tmp.x * Sin, Tmp.y * Sin, Tmp.z * Sin);
- //return gtc::quaternion::cross(q, tquat<T, P>(cos(AngleRad * T(0.5)), Tmp.x * fSin, Tmp.y * fSin, Tmp.z * fSin));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> eulerAngles(tquat<T, P> const & x)
- {
- return tvec3<T, P>(pitch(x), yaw(x), roll(x));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T roll(tquat<T, P> 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 <typename T, precision P>
- GLM_FUNC_QUALIFIER T pitch(tquat<T, P> 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 <typename T, precision P>
- GLM_FUNC_QUALIFIER T yaw(tquat<T, P> const & q)
- {
- return asin(T(-2) * (q.x * q.z - q.w * q.y));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> mat3_cast(tquat<T, P> const & q)
- {
- tmat3x3<T, P> 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 <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> mat4_cast(tquat<T, P> const & q)
- {
- return tmat4x4<T, P>(mat3_cast(q));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> quat_cast(tmat3x3<T, P> 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<T>(0.25) / biggestVal;
-
- tquat<T, P> 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 <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> quat_cast(tmat4x4<T, P> const & m4)
- {
- return quat_cast(tmat3x3<T, P>(m4));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T angle(tquat<T, P> const & x)
- {
- return acos(x.w) * T(2);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> axis(tquat<T, P> const & x)
- {
- T tmp1 = static_cast<T>(1) - x.w * x.w;
- if(tmp1 <= static_cast<T>(0))
- return tvec3<T, P>(0, 0, 1);
- T tmp2 = static_cast<T>(1) / sqrt(tmp1);
- return tvec3<T, P>(x.x * tmp2, x.y * tmp2, x.z * tmp2);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> angleAxis(T const & angle, tvec3<T, P> const & v)
- {
- tquat<T, P> Result(uninitialize);
-
- T const a(angle);
- T const s = glm::sin(a * static_cast<T>(0.5));
-
- Result.w = glm::cos(a * static_cast<T>(0.5));
- Result.x = v.x * s;
- Result.y = v.y * s;
- Result.z = v.z * s;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<bool, P> lessThan(tquat<T, P> const & x, tquat<T, P> const & y)
- {
- tvec4<bool, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(x); ++i)
- Result[i] = x[i] < y[i];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<bool, P> lessThanEqual(tquat<T, P> const & x, tquat<T, P> const & y)
- {
- tvec4<bool, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(x); ++i)
- Result[i] = x[i] <= y[i];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<bool, P> greaterThan(tquat<T, P> const & x, tquat<T, P> const & y)
- {
- tvec4<bool, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(x); ++i)
- Result[i] = x[i] > y[i];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<bool, P> greaterThanEqual(tquat<T, P> const & x, tquat<T, P> const & y)
- {
- tvec4<bool, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(x); ++i)
- Result[i] = x[i] >= y[i];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<bool, P> equal(tquat<T, P> const & x, tquat<T, P> const & y)
- {
- tvec4<bool, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(x); ++i)
- Result[i] = x[i] == y[i];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<bool, P> notEqual(tquat<T, P> const & x, tquat<T, P> const & y)
- {
- tvec4<bool, P> 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.
-///
-/// <glm/gtc/random.hpp> 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 <typename genTYpe>
- GLM_FUNC_DECL genTYpe linearRand(
- genTYpe Min,
- genTYpe Max);
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> linearRand(
- vecType<T, P> const & Min,
- vecType<T, P> const & Max);
-
- /// Generate random numbers in the interval [Min, Max], according a gaussian distribution
- ///
- /// @param Mean
- /// @param Deviation
- /// @see gtc_random
- template <typename genType>
- 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 <typename T>
- GLM_FUNC_DECL tvec2<T, defaultp> 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 <typename T>
- GLM_FUNC_DECL tvec3<T, defaultp> 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 <typename T>
- GLM_FUNC_DECL tvec2<T, defaultp> 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 <typename T>
- GLM_FUNC_DECL tvec3<T, defaultp> 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 <cstdlib>
-#include <ctime>
-#include <cassert>
-
-namespace glm{
-namespace detail
-{
- template <typename T, precision P, template <class, precision> class vecType>
- struct compute_rand
- {
- GLM_FUNC_QUALIFIER static vecType<T, P> call();
- };
-
- template <precision P>
- struct compute_rand<uint8, P, tvec1>
- {
- GLM_FUNC_QUALIFIER static tvec1<uint8, P> call()
- {
- return tvec1<uint8, P>(
- std::rand()) % std::numeric_limits<uint8>::max();
- }
- };
-
- template <precision P>
- struct compute_rand<uint8, P, tvec2>
- {
- GLM_FUNC_QUALIFIER static tvec2<uint8, P> call()
- {
- return tvec2<uint8, P>(
- std::rand(),
- std::rand()) % std::numeric_limits<uint8>::max();
- }
- };
-
- template <precision P>
- struct compute_rand<uint8, P, tvec3>
- {
- GLM_FUNC_QUALIFIER static tvec3<uint8, P> call()
- {
- return tvec3<uint8, P>(
- std::rand(),
- std::rand(),
- std::rand()) % std::numeric_limits<uint8>::max();
- }
- };
-
- template <precision P>
- struct compute_rand<uint8, P, tvec4>
- {
- GLM_FUNC_QUALIFIER static tvec4<uint8, P> call()
- {
- return tvec4<uint8, P>(
- std::rand(),
- std::rand(),
- std::rand(),
- std::rand()) % std::numeric_limits<uint8>::max();
- }
- };
-
- template <precision P, template <class, precision> class vecType>
- struct compute_rand<uint16, P, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<uint16, P> call()
- {
- return
- (vecType<uint16, P>(compute_rand<uint8, P, vecType>::call()) << static_cast<uint16>(8)) |
- (vecType<uint16, P>(compute_rand<uint8, P, vecType>::call()) << static_cast<uint16>(0));
- }
- };
-
- template <precision P, template <class, precision> class vecType>
- struct compute_rand<uint32, P, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<uint32, P> call()
- {
- return
- (vecType<uint32, P>(compute_rand<uint16, P, vecType>::call()) << static_cast<uint32>(16)) |
- (vecType<uint32, P>(compute_rand<uint16, P, vecType>::call()) << static_cast<uint32>(0));
- }
- };
-
- template <precision P, template <class, precision> class vecType>
- struct compute_rand<uint64, P, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<uint64, P> call()
- {
- return
- (vecType<uint64, P>(compute_rand<uint32, P, vecType>::call()) << static_cast<uint64>(32)) |
- (vecType<uint64, P>(compute_rand<uint32, P, vecType>::call()) << static_cast<uint64>(0));
- }
- };
-
- template <typename T, precision P, template <class, precision> class vecType>
- struct compute_linearRand
- {
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & Min, vecType<T, P> const & Max);
- };
-
- template <precision P, template <class, precision> class vecType>
- struct compute_linearRand<int8, P, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<int8, P> call(vecType<int8, P> const & Min, vecType<int8, P> const & Max)
- {
- return (vecType<int8, P>(compute_rand<uint8, P, vecType>::call() % vecType<uint8, P>(Max + static_cast<int8>(1) - Min))) + Min;
- }
- };
-
- template <precision P, template <class, precision> class vecType>
- struct compute_linearRand<uint8, P, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<uint8, P> call(vecType<uint8, P> const & Min, vecType<uint8, P> const & Max)
- {
- return (compute_rand<uint8, P, vecType>::call() % (Max + static_cast<uint8>(1) - Min)) + Min;
- }
- };
-
- template <precision P, template <class, precision> class vecType>
- struct compute_linearRand<int16, P, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<int16, P> call(vecType<int16, P> const & Min, vecType<int16, P> const & Max)
- {
- return (vecType<int16, P>(compute_rand<uint16, P, vecType>::call() % vecType<uint16, P>(Max + static_cast<int16>(1) - Min))) + Min;
- }
- };
-
- template <precision P, template <class, precision> class vecType>
- struct compute_linearRand<uint16, P, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<uint16, P> call(vecType<uint16, P> const & Min, vecType<uint16, P> const & Max)
- {
- return (compute_rand<uint16, P, vecType>::call() % (Max + static_cast<uint16>(1) - Min)) + Min;
- }
- };
-
- template <precision P, template <class, precision> class vecType>
- struct compute_linearRand<int32, P, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<int32, P> call(vecType<int32, P> const & Min, vecType<int32, P> const & Max)
- {
- return (vecType<int32, P>(compute_rand<uint32, P, vecType>::call() % vecType<uint32, P>(Max + static_cast<int32>(1) - Min))) + Min;
- }
- };
-
- template <precision P, template <class, precision> class vecType>
- struct compute_linearRand<uint32, P, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<uint32, P> call(vecType<uint32, P> const & Min, vecType<uint32, P> const & Max)
- {
- return (compute_rand<uint32, P, vecType>::call() % (Max + static_cast<uint32>(1) - Min)) + Min;
- }
- };
-
- template <precision P, template <class, precision> class vecType>
- struct compute_linearRand<int64, P, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<int64, P> call(vecType<int64, P> const & Min, vecType<int64, P> const & Max)
- {
- return (vecType<int64, P>(compute_rand<uint64, P, vecType>::call() % vecType<uint64, P>(Max + static_cast<int64>(1) - Min))) + Min;
- }
- };
-
- template <precision P, template <class, precision> class vecType>
- struct compute_linearRand<uint64, P, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<uint64, P> call(vecType<uint64, P> const & Min, vecType<uint64, P> const & Max)
- {
- return (compute_rand<uint64, P, vecType>::call() % (Max + static_cast<uint64>(1) - Min)) + Min;
- }
- };
-
- template <template <class, precision> class vecType>
- struct compute_linearRand<float, lowp, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<float, lowp> call(vecType<float, lowp> const & Min, vecType<float, lowp> const & Max)
- {
- return vecType<float, lowp>(compute_rand<uint8, lowp, vecType>::call()) / static_cast<float>(std::numeric_limits<uint8>::max()) * (Max - Min) + Min;
- }
- };
-
- template <template <class, precision> class vecType>
- struct compute_linearRand<float, mediump, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<float, mediump> call(vecType<float, mediump> const & Min, vecType<float, mediump> const & Max)
- {
- return vecType<float, mediump>(compute_rand<uint16, mediump, vecType>::call()) / static_cast<float>(std::numeric_limits<uint16>::max()) * (Max - Min) + Min;
- }
- };
-
- template <template <class, precision> class vecType>
- struct compute_linearRand<float, highp, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<float, highp> call(vecType<float, highp> const & Min, vecType<float, highp> const & Max)
- {
- return vecType<float, highp>(compute_rand<uint32, highp, vecType>::call()) / static_cast<float>(std::numeric_limits<uint32>::max()) * (Max - Min) + Min;
- }
- };
-
- template <template <class, precision> class vecType>
- struct compute_linearRand<double, lowp, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<double, lowp> call(vecType<double, lowp> const & Min, vecType<double, lowp> const & Max)
- {
- return vecType<double, lowp>(compute_rand<uint16, lowp, vecType>::call()) / static_cast<double>(std::numeric_limits<uint16>::max()) * (Max - Min) + Min;
- }
- };
-
- template <template <class, precision> class vecType>
- struct compute_linearRand<double, mediump, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<double, mediump> call(vecType<double, mediump> const & Min, vecType<double, mediump> const & Max)
- {
- return vecType<double, mediump>(compute_rand<uint32, mediump, vecType>::call()) / static_cast<double>(std::numeric_limits<uint32>::max()) * (Max - Min) + Min;
- }
- };
-
- template <template <class, precision> class vecType>
- struct compute_linearRand<double, highp, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<double, highp> call(vecType<double, highp> const & Min, vecType<double, highp> const & Max)
- {
- return vecType<double, highp>(compute_rand<uint64, highp, vecType>::call()) / static_cast<double>(std::numeric_limits<uint64>::max()) * (Max - Min) + Min;
- }
- };
-
- template <template <class, precision> class vecType>
- struct compute_linearRand<long double, lowp, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<long double, lowp> call(vecType<long double, lowp> const & Min, vecType<long double, lowp> const & Max)
- {
- return vecType<long double, lowp>(compute_rand<uint32, lowp, vecType>::call()) / static_cast<long double>(std::numeric_limits<uint32>::max()) * (Max - Min) + Min;
- }
- };
-
- template <template <class, precision> class vecType>
- struct compute_linearRand<long double, mediump, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<long double, mediump> call(vecType<long double, mediump> const & Min, vecType<long double, mediump> const & Max)
- {
- return vecType<long double, mediump>(compute_rand<uint64, mediump, vecType>::call()) / static_cast<long double>(std::numeric_limits<uint64>::max()) * (Max - Min) + Min;
- }
- };
-
- template <template <class, precision> class vecType>
- struct compute_linearRand<long double, highp, vecType>
- {
- GLM_FUNC_QUALIFIER static vecType<long double, highp> call(vecType<long double, highp> const & Min, vecType<long double, highp> const & Max)
- {
- return vecType<long double, highp>(compute_rand<uint64, highp, vecType>::call()) / static_cast<long double>(std::numeric_limits<uint64>::max()) * (Max - Min) + Min;
- }
- };
-}//namespace detail
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType linearRand(genType Min, genType Max)
- {
- return detail::compute_linearRand<genType, highp, tvec1>::call(
- tvec1<genType, highp>(Min),
- tvec1<genType, highp>(Max)).x;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> linearRand(vecType<T, P> const & Min, vecType<T, P> const & Max)
- {
- return detail::compute_linearRand<T, P, vecType>::call(Min, Max);
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType gaussRand(genType Mean, genType Deviation)
- {
- genType w, x1, x2;
-
- do
- {
- x1 = linearRand(genType(-1), genType(1));
- x2 = linearRand(genType(-1), genType(1));
-
- w = x1 * x1 + x2 * x2;
- } while(w > genType(1));
-
- return x2 * Deviation * Deviation * sqrt((genType(-2) * log(w)) / w) + Mean;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> gaussRand(vecType<T, P> const & Mean, vecType<T, P> const & Deviation)
- {
- return detail::functor2<T, P, vecType>::call(gaussRand, Mean, Deviation);
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tvec2<T, defaultp> diskRand(T Radius)
- {
- tvec2<T, defaultp> Result(T(0));
- T LenRadius(T(0));
-
- do
- {
- Result = linearRand(
- tvec2<T, defaultp>(-Radius),
- tvec2<T, defaultp>(Radius));
- LenRadius = length(Result);
- }
- while(LenRadius > Radius);
-
- return Result;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tvec3<T, defaultp> ballRand(T Radius)
- {
- tvec3<T, defaultp> Result(T(0));
- T LenRadius(T(0));
-
- do
- {
- Result = linearRand(
- tvec3<T, defaultp>(-Radius),
- tvec3<T, defaultp>(Radius));
- LenRadius = length(Result);
- }
- while(LenRadius > Radius);
-
- return Result;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tvec2<T, defaultp> circularRand(T Radius)
- {
- T a = linearRand(T(0), T(6.283185307179586476925286766559f));
- return tvec2<T, defaultp>(cos(a), sin(a)) * Radius;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tvec3<T, defaultp> sphericalRand(T Radius)
- {
- T z = linearRand(T(-1), T(1));
- T a = linearRand(T(0), T(6.283185307179586476925286766559f));
-
- T r = sqrt(T(1) - z * z);
-
- T x = r * cos(a);
- T y = r * sin(a);
-
- return tvec3<T, defaultp>(x, y, z) * Radius;
- }
-}//namespace glm
diff --git a/inc/glm/gtc/reciprocal.hpp b/inc/glm/gtc/reciprocal.hpp deleted file mode 100644 index aa625ab..0000000 --- a/inc/glm/gtc/reciprocal.hpp +++ /dev/null @@ -1,134 +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_reciprocal
-/// @file glm/gtc/reciprocal.hpp
-/// @date 2008-10-09 / 2012-01-25
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtc_reciprocal GLM_GTC_reciprocal
-/// @ingroup gtc
-///
-/// @brief Define secant, cosecant and cotangent functions.
-///
-/// <glm/gtc/reciprocal.hpp> 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_reciprocal extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtc_reciprocal
- /// @{
-
- /// Secant function.
- /// hypotenuse / adjacent or 1 / cos(x)
- ///
- /// @see gtc_reciprocal
- template <typename genType>
- GLM_FUNC_DECL genType sec(genType const & angle);
-
- /// Cosecant function.
- /// hypotenuse / opposite or 1 / sin(x)
- ///
- /// @see gtc_reciprocal
- template <typename genType>
- GLM_FUNC_DECL genType csc(genType const & angle);
-
- /// Cotangent function.
- /// adjacent / opposite or 1 / tan(x)
- ///
- /// @see gtc_reciprocal
- template <typename genType>
- GLM_FUNC_DECL genType cot(genType const & angle);
-
- /// Inverse secant function.
- ///
- /// @see gtc_reciprocal
- template <typename genType>
- GLM_FUNC_DECL genType asec(genType const & x);
-
- /// Inverse cosecant function.
- ///
- /// @see gtc_reciprocal
- template <typename genType>
- GLM_FUNC_DECL genType acsc(genType const & x);
-
- /// Inverse cotangent function.
- ///
- /// @see gtc_reciprocal
- template <typename genType>
- GLM_FUNC_DECL genType acot(genType const & x);
-
- /// Secant hyperbolic function.
- ///
- /// @see gtc_reciprocal
- template <typename genType>
- GLM_FUNC_DECL genType sech(genType const & angle);
-
- /// Cosecant hyperbolic function.
- ///
- /// @see gtc_reciprocal
- template <typename genType>
- GLM_FUNC_DECL genType csch(genType const & angle);
-
- /// Cotangent hyperbolic function.
- ///
- /// @see gtc_reciprocal
- template <typename genType>
- GLM_FUNC_DECL genType coth(genType const & angle);
-
- /// Inverse secant hyperbolic function.
- ///
- /// @see gtc_reciprocal
- template <typename genType>
- GLM_FUNC_DECL genType asech(genType const & x);
-
- /// Inverse cosecant hyperbolic function.
- ///
- /// @see gtc_reciprocal
- template <typename genType>
- GLM_FUNC_DECL genType acsch(genType const & x);
-
- /// Inverse cotangent hyperbolic function.
- ///
- /// @see gtc_reciprocal
- template <typename genType>
- GLM_FUNC_DECL genType acoth(genType const & x);
-
- /// @}
-}//namespace glm
-
-#include "reciprocal.inl"
diff --git a/inc/glm/gtc/reciprocal.inl b/inc/glm/gtc/reciprocal.inl deleted file mode 100644 index 9e20c2c..0000000 --- a/inc/glm/gtc/reciprocal.inl +++ /dev/null @@ -1,221 +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_reciprocal
-/// @file glm/gtc/reciprocal.inl
-/// @date 2008-10-09 / 2012-04-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#include "../trigonometric.hpp"
-#include <limits>
-
-namespace glm
-{
- // sec
- template <typename genType>
- GLM_FUNC_QUALIFIER genType sec(genType angle)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'sec' only accept floating-point values");
- return genType(1) / glm::cos(angle);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> sec(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'sec' only accept floating-point inputs");
- return detail::functor1<T, T, P, vecType>::call(sec, x);
- }
-
- // csc
- template <typename genType>
- GLM_FUNC_QUALIFIER genType csc(genType angle)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'csc' only accept floating-point values");
- return genType(1) / glm::sin(angle);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> csc(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'csc' only accept floating-point inputs");
- return detail::functor1<T, T, P, vecType>::call(csc, x);
- }
-
- // cot
- template <typename genType>
- GLM_FUNC_QUALIFIER genType cot(genType angle)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'cot' only accept floating-point values");
-
- genType const pi_over_2 = genType(3.1415926535897932384626433832795 / 2.0);
- return glm::tan(pi_over_2 - angle);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> cot(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'cot' only accept floating-point inputs");
- return detail::functor1<T, T, P, vecType>::call(cot, x);
- }
-
- // asec
- template <typename genType>
- GLM_FUNC_QUALIFIER genType asec(genType x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'asec' only accept floating-point values");
- return acos(genType(1) / x);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> asec(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'asec' only accept floating-point inputs");
- return detail::functor1<T, T, P, vecType>::call(asec, x);
- }
-
- // acsc
- template <typename genType>
- GLM_FUNC_QUALIFIER genType acsc(genType x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'acsc' only accept floating-point values");
- return asin(genType(1) / x);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> acsc(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'acsc' only accept floating-point inputs");
- return detail::functor1<T, T, P, vecType>::call(acsc, x);
- }
-
- // acot
- template <typename genType>
- GLM_FUNC_QUALIFIER genType acot(genType x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'acot' only accept floating-point values");
-
- genType const pi_over_2 = genType(3.1415926535897932384626433832795 / 2.0);
- return pi_over_2 - atan(x);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> acot(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'acot' only accept floating-point inputs");
- return detail::functor1<T, T, P, vecType>::call(acot, x);
- }
-
- // sech
- template <typename genType>
- GLM_FUNC_QUALIFIER genType sech(genType angle)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'sech' only accept floating-point values");
- return genType(1) / glm::cosh(angle);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> sech(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'sech' only accept floating-point inputs");
- return detail::functor1<T, T, P, vecType>::call(sech, x);
- }
-
- // csch
- template <typename genType>
- GLM_FUNC_QUALIFIER genType csch(genType angle)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'csch' only accept floating-point values");
- return genType(1) / glm::sinh(angle);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> csch(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'csch' only accept floating-point inputs");
- return detail::functor1<T, T, P, vecType>::call(csch, x);
- }
-
- // coth
- template <typename genType>
- GLM_FUNC_QUALIFIER genType coth(genType angle)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'coth' only accept floating-point values");
- return glm::cosh(angle) / glm::sinh(angle);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> coth(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'coth' only accept floating-point inputs");
- return detail::functor1<T, T, P, vecType>::call(coth, x);
- }
-
- // asech
- template <typename genType>
- GLM_FUNC_QUALIFIER genType asech(genType x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'asech' only accept floating-point values");
- return acosh(genType(1) / x);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> asech(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'asech' only accept floating-point inputs");
- return detail::functor1<T, T, P, vecType>::call(asech, x);
- }
-
- // acsch
- template <typename genType>
- GLM_FUNC_QUALIFIER genType acsch(genType x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'acsch' only accept floating-point values");
- return acsch(genType(1) / x);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> acsch(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'acsch' only accept floating-point inputs");
- return detail::functor1<T, T, P, vecType>::call(acsch, x);
- }
-
- // acoth
- template <typename genType>
- GLM_FUNC_QUALIFIER genType acoth(genType x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'acoth' only accept floating-point values");
- return atanh(genType(1) / x);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> acoth(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'acoth' only accept floating-point inputs");
- return detail::functor1<T, T, P, vecType>::call(acoth, x);
- }
-}//namespace glm
diff --git a/inc/glm/gtc/round.hpp b/inc/glm/gtc/round.hpp deleted file mode 100644 index 56bd038..0000000 --- a/inc/glm/gtc/round.hpp +++ /dev/null @@ -1,203 +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_round
-/// @file glm/gtc/round.hpp
-/// @date 2014-11-03 / 2014-11-03
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtc_round (dependence)
-///
-/// @defgroup gtc_round GLM_GTC_round
-/// @ingroup gtc
-///
-/// @brief rounding value to specific boundings
-///
-/// <glm/gtc/round.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependencies
-#include "../detail/setup.hpp"
-#include "../detail/precision.hpp"
-#include "../detail/_vectorize.hpp"
-#include "../vector_relational.hpp"
-#include "../common.hpp"
-#include <limits>
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTC_integer extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtc_round
- /// @{
-
- /// Return true if the value is a power of two number.
- ///
- /// @see gtc_round
- template <typename genIUType>
- GLM_FUNC_DECL bool isPowerOfTwo(genIUType Value);
-
- /// Return true if the value is a power of two number.
- ///
- /// @see gtc_round
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<bool, P> isPowerOfTwo(vecType<T, P> const & value);
-
- /// Return the power of two number which value is just higher the input value,
- /// round up to a power of two.
- ///
- /// @see gtc_round
- template <typename genIUType>
- GLM_FUNC_DECL genIUType ceilPowerOfTwo(genIUType Value);
-
- /// Return the power of two number which value is just higher the input value,
- /// round up to a power of two.
- ///
- /// @see gtc_round
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> ceilPowerOfTwo(vecType<T, P> const & value);
-
- /// Return the power of two number which value is just lower the input value,
- /// round down to a power of two.
- ///
- /// @see gtc_round
- template <typename genIUType>
- GLM_FUNC_DECL genIUType floorPowerOfTwo(genIUType Value);
-
- /// Return the power of two number which value is just lower the input value,
- /// round down to a power of two.
- ///
- /// @see gtc_round
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> floorPowerOfTwo(vecType<T, P> const & value);
-
- /// Return the power of two number which value is the closet to the input value.
- ///
- /// @see gtc_round
- template <typename genIUType>
- GLM_FUNC_DECL genIUType roundPowerOfTwo(genIUType Value);
-
- /// Return the power of two number which value is the closet to the input value.
- ///
- /// @see gtc_round
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> roundPowerOfTwo(vecType<T, P> const & value);
-
- /// Return true if the 'Value' is a multiple of 'Multiple'.
- ///
- /// @see gtc_round
- template <typename genIUType>
- GLM_FUNC_DECL bool isMultiple(genIUType Value, genIUType Multiple);
-
- /// Return true if the 'Value' is a multiple of 'Multiple'.
- ///
- /// @see gtc_round
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<bool, P> isMultiple(vecType<T, P> const & Value, T Multiple);
-
- /// Return true if the 'Value' is a multiple of 'Multiple'.
- ///
- /// @see gtc_round
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<bool, P> isMultiple(vecType<T, P> const & Value, vecType<T, P> const & Multiple);
-
- /// Higher multiple number of Source.
- ///
- /// @tparam genType Floating-point or integer scalar or vector types.
- /// @param Source
- /// @param Multiple Must be a null or positive value
- ///
- /// @see gtc_round
- template <typename genType>
- GLM_FUNC_DECL genType ceilMultiple(genType Source, genType Multiple);
-
- /// Higher multiple number of Source.
- ///
- /// @tparam genType Floating-point or integer scalar or vector types.
- /// @param Source
- /// @param Multiple Must be a null or positive value
- ///
- /// @see gtc_round
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> ceilMultiple(vecType<T, P> const & Source, vecType<T, P> const & Multiple);
-
- /// Lower multiple number of Source.
- ///
- /// @tparam genType Floating-point or integer scalar or vector types.
- /// @param Source
- /// @param Multiple Must be a null or positive value
- ///
- /// @see gtc_round
- template <typename genType>
- GLM_FUNC_DECL genType floorMultiple(
- genType Source,
- genType Multiple);
-
- /// Lower multiple number of Source.
- ///
- /// @tparam genType Floating-point or integer scalar or vector types.
- /// @param Source
- /// @param Multiple Must be a null or positive value
- ///
- /// @see gtc_round
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> floorMultiple(
- vecType<T, P> const & Source,
- vecType<T, P> const & Multiple);
-
- /// Lower multiple number of Source.
- ///
- /// @tparam genType Floating-point or integer scalar or vector types.
- /// @param Source
- /// @param Multiple Must be a null or positive value
- ///
- /// @see gtc_round
- template <typename genType>
- GLM_FUNC_DECL genType roundMultiple(
- genType Source,
- genType Multiple);
-
- /// Lower multiple number of Source.
- ///
- /// @tparam genType Floating-point or integer scalar or vector types.
- /// @param Source
- /// @param Multiple Must be a null or positive value
- ///
- /// @see gtc_round
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> roundMultiple(
- vecType<T, P> const & Source,
- vecType<T, P> const & Multiple);
-
- /// @}
-} //namespace glm
-
-#include "round.inl"
diff --git a/inc/glm/gtc/round.inl b/inc/glm/gtc/round.inl deleted file mode 100644 index 4dc91b1..0000000 --- a/inc/glm/gtc/round.inl +++ /dev/null @@ -1,378 +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_round
-/// @file glm/gtc/round.inl
-/// @date 2014-11-03 / 2014-11-03
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
-namespace detail
-{
- template <typename T, precision P, template <typename, precision> class vecType, bool compute = false>
- struct compute_ceilShift
- {
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & v, T)
- {
- return v;
- }
- };
-
- template <typename T, precision P, template <typename, precision> class vecType>
- struct compute_ceilShift<T, P, vecType, true>
- {
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & v, T Shift)
- {
- return v | (v >> Shift);
- }
- };
-
- template <typename T, precision P, template <typename, precision> class vecType, bool isSigned = true>
- struct compute_ceilPowerOfTwo
- {
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(!std::numeric_limits<T>::is_iec559, "'ceilPowerOfTwo' only accept integer scalar or vector inputs");
-
- vecType<T, P> const Sign(sign(x));
-
- vecType<T, P> v(abs(x));
-
- v = v - static_cast<T>(1);
- v = v | (v >> static_cast<T>(1));
- v = v | (v >> static_cast<T>(2));
- v = v | (v >> static_cast<T>(4));
- v = compute_ceilShift<T, P, vecType, sizeof(T) >= 2>::call(v, 8);
- v = compute_ceilShift<T, P, vecType, sizeof(T) >= 4>::call(v, 16);
- v = compute_ceilShift<T, P, vecType, sizeof(T) >= 8>::call(v, 32);
- return (v + static_cast<T>(1)) * Sign;
- }
- };
-
- template <typename T, precision P, template <typename, precision> class vecType>
- struct compute_ceilPowerOfTwo<T, P, vecType, false>
- {
- GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(!std::numeric_limits<T>::is_iec559, "'ceilPowerOfTwo' only accept integer scalar or vector inputs");
-
- vecType<T, P> v(x);
-
- v = v - static_cast<T>(1);
- v = v | (v >> static_cast<T>(1));
- v = v | (v >> static_cast<T>(2));
- v = v | (v >> static_cast<T>(4));
- v = compute_ceilShift<T, P, vecType, sizeof(T) >= 2>::call(v, 8);
- v = compute_ceilShift<T, P, vecType, sizeof(T) >= 4>::call(v, 16);
- v = compute_ceilShift<T, P, vecType, sizeof(T) >= 8>::call(v, 32);
- return v + static_cast<T>(1);
- }
- };
-
- template <bool is_float, bool is_signed>
- struct compute_ceilMultiple{};
-
- template <>
- struct compute_ceilMultiple<true, true>
- {
- template <typename genType>
- GLM_FUNC_QUALIFIER static genType call(genType Source, genType Multiple)
- {
- if(Source > genType(0))
- {
- genType Tmp = Source - genType(1);
- return Tmp + (Multiple - std::fmod(Tmp, Multiple));
- }
- else
- return Source + std::fmod(-Source, Multiple);
- }
- };
-
- template <>
- struct compute_ceilMultiple<false, false>
- {
- template <typename genType>
- GLM_FUNC_QUALIFIER static genType call(genType Source, genType Multiple)
- {
- genType Tmp = Source - genType(1);
- return Tmp + (Multiple - (Tmp % Multiple));
- }
- };
-
- template <>
- struct compute_ceilMultiple<false, true>
- {
- template <typename genType>
- GLM_FUNC_QUALIFIER static genType call(genType Source, genType Multiple)
- {
- if(Source > genType(0))
- {
- genType Tmp = Source - genType(1);
- return Tmp + (Multiple - (Tmp % Multiple));
- }
- else
- return Source + (-Source % Multiple);
- }
- };
-
- template <bool is_float, bool is_signed>
- struct compute_floorMultiple{};
-
- template <>
- struct compute_floorMultiple<true, true>
- {
- template <typename genType>
- GLM_FUNC_QUALIFIER static genType call(genType Source, genType Multiple)
- {
- if(Source >= genType(0))
- return Source - std::fmod(Source, Multiple);
- else
- {
- genType Tmp = Source + genType(1);
- return Tmp - std::fmod(Tmp, Multiple) - Multiple;
- }
- }
- };
-
- template <>
- struct compute_floorMultiple<false, false>
- {
- template <typename genType>
- GLM_FUNC_QUALIFIER static genType call(genType Source, genType Multiple)
- {
- if(Source >= genType(0))
- return Source - Source % Multiple;
- else
- {
- genType Tmp = Source + genType(1);
- return Tmp - Tmp % Multiple - Multiple;
- }
- }
- };
-
- template <>
- struct compute_floorMultiple<false, true>
- {
- template <typename genType>
- GLM_FUNC_QUALIFIER static genType call(genType Source, genType Multiple)
- {
- if(Source >= genType(0))
- return Source - Source % Multiple;
- else
- {
- genType Tmp = Source + genType(1);
- return Tmp - Tmp % Multiple - Multiple;
- }
- }
- };
-
- template <bool is_float, bool is_signed>
- struct compute_roundMultiple{};
-
- template <>
- struct compute_roundMultiple<true, true>
- {
- template <typename genType>
- GLM_FUNC_QUALIFIER static genType call(genType Source, genType Multiple)
- {
- if(Source >= genType(0))
- return Source - std::fmod(Source, Multiple);
- else
- {
- genType Tmp = Source + genType(1);
- return Tmp - std::fmod(Tmp, Multiple) - Multiple;
- }
- }
- };
-
- template <>
- struct compute_roundMultiple<false, false>
- {
- template <typename genType>
- GLM_FUNC_QUALIFIER static genType call(genType Source, genType Multiple)
- {
- if(Source >= genType(0))
- return Source - Source % Multiple;
- else
- {
- genType Tmp = Source + genType(1);
- return Tmp - Tmp % Multiple - Multiple;
- }
- }
- };
-
- template <>
- struct compute_roundMultiple<false, true>
- {
- template <typename genType>
- GLM_FUNC_QUALIFIER static genType call(genType Source, genType Multiple)
- {
- if(Source >= genType(0))
- return Source - Source % Multiple;
- else
- {
- genType Tmp = Source + genType(1);
- return Tmp - Tmp % Multiple - Multiple;
- }
- }
- };
-}//namespace detail
-
- ////////////////
- // isPowerOfTwo
-
- template <typename genType>
- GLM_FUNC_QUALIFIER bool isPowerOfTwo(genType Value)
- {
- genType const Result = glm::abs(Value);
- return !(Result & (Result - 1));
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<bool, P> isPowerOfTwo(vecType<T, P> const & Value)
- {
- vecType<T, P> const Result(abs(Value));
- return equal(Result & (Result - 1), vecType<T, P>(0));
- }
-
- //////////////////
- // ceilPowerOfTwo
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType ceilPowerOfTwo(genType value)
- {
- return detail::compute_ceilPowerOfTwo<genType, defaultp, tvec1, std::numeric_limits<genType>::is_signed>::call(tvec1<genType, defaultp>(value)).x;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> ceilPowerOfTwo(vecType<T, P> const & v)
- {
- return detail::compute_ceilPowerOfTwo<T, P, vecType, std::numeric_limits<T>::is_signed>::call(v);
- }
-
- ///////////////////
- // floorPowerOfTwo
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType floorPowerOfTwo(genType value)
- {
- return isPowerOfTwo(value) ? value : highestBitValue(value);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> floorPowerOfTwo(vecType<T, P> const & v)
- {
- return detail::functor1<T, T, P, vecType>::call(floorPowerOfTwo, v);
- }
-
- ///////////////////
- // roundPowerOfTwo
-
- template <typename genIUType>
- GLM_FUNC_QUALIFIER genIUType roundPowerOfTwo(genIUType value)
- {
- if(isPowerOfTwo(value))
- return value;
-
- genIUType const prev = highestBitValue(value);
- genIUType const next = prev << 1;
- return (next - value) < (value - prev) ? next : prev;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> roundPowerOfTwo(vecType<T, P> const & v)
- {
- return detail::functor1<T, T, P, vecType>::call(roundPowerOfTwo, v);
- }
-
- ////////////////
- // isMultiple
-
- template <typename genType>
- GLM_FUNC_QUALIFIER bool isMultiple(genType Value, genType Multiple)
- {
- return isMultiple(tvec1<genType>(Value), tvec1<genType>(Multiple)).x;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<bool, P> isMultiple(vecType<T, P> const & Value, T Multiple)
- {
- return (Value % Multiple) == vecType<T, P>(0);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<bool, P> isMultiple(vecType<T, P> const & Value, vecType<T, P> const & Multiple)
- {
- return (Value % Multiple) == vecType<T, P>(0);
- }
-
- //////////////////////
- // ceilMultiple
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType ceilMultiple(genType Source, genType Multiple)
- {
- return detail::compute_ceilMultiple<std::numeric_limits<genType>::is_iec559, std::numeric_limits<genType>::is_signed>::call(Source, Multiple);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> ceilMultiple(vecType<T, P> const & Source, vecType<T, P> const & Multiple)
- {
- return detail::functor2<T, P, vecType>::call(ceilMultiple, Source, Multiple);
- }
-
- //////////////////////
- // floorMultiple
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType floorMultiple(genType Source, genType Multiple)
- {
- return detail::compute_floorMultiple<std::numeric_limits<genType>::is_iec559, std::numeric_limits<genType>::is_signed>::call(Source, Multiple);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> floorMultiple(vecType<T, P> const & Source, vecType<T, P> const & Multiple)
- {
- return detail::functor2<T, P, vecType>::call(floorMultiple, Source, Multiple);
- }
-
- //////////////////////
- // roundMultiple
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType roundMultiple(genType Source, genType Multiple)
- {
- return detail::compute_roundMultiple<std::numeric_limits<genType>::is_iec559, std::numeric_limits<genType>::is_signed>::call(Source, Multiple);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> roundMultiple(vecType<T, P> const & Source, vecType<T, P> const & Multiple)
- {
- return detail::functor2<T, P, vecType>::call(roundMultiple, Source, Multiple);
- }
-}//namespace glm
diff --git a/inc/glm/gtc/type_precision.hpp b/inc/glm/gtc/type_precision.hpp deleted file mode 100644 index 744eb06..0000000 --- a/inc/glm/gtc/type_precision.hpp +++ /dev/null @@ -1,890 +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_type_precision
-/// @file glm/gtc/type_precision.hpp
-/// @date 2009-06-04 / 2011-12-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtc_half_float (dependence)
-/// @see gtc_quaternion (dependence)
-///
-/// @defgroup gtc_type_precision GLM_GTC_type_precision
-/// @ingroup gtc
-///
-/// @brief Defines specific C++-based precision types.
-///
-/// @ref core_precision defines types based on GLSL's precision qualifiers. This
-/// extension defines types based on explicitly-sized C++ data types.
-///
-/// <glm/gtc/type_precision.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../gtc/quaternion.hpp"
-#include "../gtc/vec1.hpp"
-#include "../vec2.hpp"
-#include "../vec3.hpp"
-#include "../vec4.hpp"
-#include "../mat2x2.hpp"
-#include "../mat2x3.hpp"
-#include "../mat2x4.hpp"
-#include "../mat3x2.hpp"
-#include "../mat3x3.hpp"
-#include "../mat3x4.hpp"
-#include "../mat4x2.hpp"
-#include "../mat4x3.hpp"
-#include "../mat4x4.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTC_type_precision extension included")
-#endif
-
-namespace glm
-{
- ///////////////////////////
- // Signed int vector types
-
- /// @addtogroup gtc_type_precision
- /// @{
-
- /// Low precision 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 lowp_int8;
-
- /// Low precision 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 lowp_int16;
-
- /// Low precision 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 lowp_int32;
-
- /// Low precision 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 lowp_int64;
-
- /// Low precision 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 lowp_int8_t;
-
- /// Low precision 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 lowp_int16_t;
-
- /// Low precision 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 lowp_int32_t;
-
- /// Low precision 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 lowp_int64_t;
-
- /// Low precision 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 lowp_i8;
-
- /// Low precision 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 lowp_i16;
-
- /// Low precision 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 lowp_i32;
-
- /// Low precision 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 lowp_i64;
-
- /// Medium precision 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 mediump_int8;
-
- /// Medium precision 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 mediump_int16;
-
- /// Medium precision 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 mediump_int32;
-
- /// Medium precision 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 mediump_int64;
-
- /// Medium precision 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 mediump_int8_t;
-
- /// Medium precision 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 mediump_int16_t;
-
- /// Medium precision 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 mediump_int32_t;
-
- /// Medium precision 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 mediump_int64_t;
-
- /// Medium precision 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 mediump_i8;
-
- /// Medium precision 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 mediump_i16;
-
- /// Medium precision 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 mediump_i32;
-
- /// Medium precision 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 mediump_i64;
-
- /// High precision 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 highp_int8;
-
- /// High precision 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 highp_int16;
-
- /// High precision 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 highp_int32;
-
- /// High precision 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 highp_int64;
-
- /// High precision 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 highp_int8_t;
-
- /// High precision 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 highp_int16_t;
-
- /// 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 highp_int32_t;
-
- /// High precision 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 highp_int64_t;
-
- /// High precision 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 highp_i8;
-
- /// High precision 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 highp_i16;
-
- /// High precision 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 highp_i32;
-
- /// High precision 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 highp_i64;
-
-
- /// 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 int8;
-
- /// 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 int16;
-
- /// 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 int32;
-
- /// 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 int64;
-
-#if GLM_HAS_EXTENDED_INTEGER_TYPE
- using std::int8_t;
- using std::int16_t;
- using std::int32_t;
- using std::int64_t;
-#else
- /// 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 int8_t;
-
- /// 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 int16_t;
-
- /// 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 int32_t;
-
- /// 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 int64_t;
-#endif
-
- /// 8 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int8 i8;
-
- /// 16 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int16 i16;
-
- /// 32 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int32 i32;
-
- /// 64 bit signed integer type.
- /// @see gtc_type_precision
- typedef detail::int64 i64;
-
-
- /// 8 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<i8, defaultp> i8vec1;
-
- /// 8 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<i8, defaultp> i8vec2;
-
- /// 8 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<i8, defaultp> i8vec3;
-
- /// 8 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<i8, defaultp> i8vec4;
-
-
- /// 16 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<i16, defaultp> i16vec1;
-
- /// 16 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<i16, defaultp> i16vec2;
-
- /// 16 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<i16, defaultp> i16vec3;
-
- /// 16 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<i16, defaultp> i16vec4;
-
-
- /// 32 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<i32, defaultp> i32vec1;
-
- /// 32 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<i32, defaultp> i32vec2;
-
- /// 32 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<i32, defaultp> i32vec3;
-
- /// 32 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<i32, defaultp> i32vec4;
-
-
- /// 64 bit signed integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<i64, defaultp> i64vec1;
-
- /// 64 bit signed integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<i64, defaultp> i64vec2;
-
- /// 64 bit signed integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<i64, defaultp> i64vec3;
-
- /// 64 bit signed integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<i64, defaultp> i64vec4;
-
-
- /////////////////////////////
- // Unsigned int vector types
-
- /// Low precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 lowp_uint8;
-
- /// Low precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 lowp_uint16;
-
- /// Low precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 lowp_uint32;
-
- /// Low precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 lowp_uint64;
-
- /// Low precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 lowp_uint8_t;
-
- /// Low precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 lowp_uint16_t;
-
- /// Low precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 lowp_uint32_t;
-
- /// Low precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 lowp_uint64_t;
-
- /// Low precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 lowp_u8;
-
- /// Low precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 lowp_u16;
-
- /// Low precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 lowp_u32;
-
- /// Low precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 lowp_u64;
-
- /// Medium precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 mediump_uint8;
-
- /// Medium precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 mediump_uint16;
-
- /// Medium precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 mediump_uint32;
-
- /// Medium precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 mediump_uint64;
-
- /// Medium precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 mediump_uint8_t;
-
- /// Medium precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 mediump_uint16_t;
-
- /// Medium precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 mediump_uint32_t;
-
- /// Medium precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 mediump_uint64_t;
-
- /// Medium precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 mediump_u8;
-
- /// Medium precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 mediump_u16;
-
- /// Medium precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 mediump_u32;
-
- /// Medium precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 mediump_u64;
-
- /// High precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 highp_uint8;
-
- /// High precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 highp_uint16;
-
- /// High precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 highp_uint32;
-
- /// High precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 highp_uint64;
-
- /// High precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 highp_uint8_t;
-
- /// High precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 highp_uint16_t;
-
- /// High precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 highp_uint32_t;
-
- /// High precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 highp_uint64_t;
-
- /// High precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 highp_u8;
-
- /// High precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 highp_u16;
-
- /// High precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 highp_u32;
-
- /// High precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 highp_u64;
-
- /// Default precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 uint8;
-
- /// Default precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 uint16;
-
- /// Default precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 uint32;
-
- /// Default precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 uint64;
-
-#if GLM_HAS_EXTENDED_INTEGER_TYPE
- using std::uint8_t;
- using std::uint16_t;
- using std::uint32_t;
- using std::uint64_t;
-#else
- /// Default precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 uint8_t;
-
- /// Default precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 uint16_t;
-
- /// Default precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 uint32_t;
-
- /// Default precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 uint64_t;
-#endif
-
- /// Default precision 8 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint8 u8;
-
- /// Default precision 16 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint16 u16;
-
- /// Default precision 32 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint32 u32;
-
- /// Default precision 64 bit unsigned integer type.
- /// @see gtc_type_precision
- typedef detail::uint64 u64;
-
-
-
- /// Default precision 8 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<u8, defaultp> u8vec1;
-
- /// Default precision 8 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<u8, defaultp> u8vec2;
-
- /// Default precision 8 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<u8, defaultp> u8vec3;
-
- /// Default precision 8 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<u8, defaultp> u8vec4;
-
-
- /// Default precision 16 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<u16, defaultp> u16vec1;
-
- /// Default precision 16 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<u16, defaultp> u16vec2;
-
- /// Default precision 16 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<u16, defaultp> u16vec3;
-
- /// Default precision 16 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<u16, defaultp> u16vec4;
-
-
- /// Default precision 32 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<u32, defaultp> u32vec1;
-
- /// Default precision 32 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<u32, defaultp> u32vec2;
-
- /// Default precision 32 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<u32, defaultp> u32vec3;
-
- /// Default precision 32 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<u32, defaultp> u32vec4;
-
-
- /// Default precision 64 bit unsigned integer scalar type.
- /// @see gtc_type_precision
- typedef tvec1<u64, defaultp> u64vec1;
-
- /// Default precision 64 bit unsigned integer vector of 2 components type.
- /// @see gtc_type_precision
- typedef tvec2<u64, defaultp> u64vec2;
-
- /// Default precision 64 bit unsigned integer vector of 3 components type.
- /// @see gtc_type_precision
- typedef tvec3<u64, defaultp> u64vec3;
-
- /// Default precision 64 bit unsigned integer vector of 4 components type.
- /// @see gtc_type_precision
- typedef tvec4<u64, defaultp> u64vec4;
-
-
- //////////////////////
- // Float vector types
-
- /// 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float32 float32;
-
- /// 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float64 float64;
-
-
- /// 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float32 float32_t;
-
- /// 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef detail::float64 float64_t;
-
-
- /// 32 bit single-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef float32 f32;
-
- /// 64 bit double-precision floating-point scalar.
- /// @see gtc_type_precision
- typedef float64 f64;
-
-
- /// Single-precision floating-point vector of 1 component.
- /// @see gtc_type_precision
- typedef tvec1<float, defaultp> fvec1;
-
- /// Single-precision floating-point vector of 2 components.
- /// @see gtc_type_precision
- typedef tvec2<float, defaultp> fvec2;
-
- /// Single-precision floating-point vector of 3 components.
- /// @see gtc_type_precision
- typedef tvec3<float, defaultp> fvec3;
-
- /// Single-precision floating-point vector of 4 components.
- /// @see gtc_type_precision
- typedef tvec4<float, defaultp> fvec4;
-
-
- /// Single-precision floating-point vector of 1 component.
- /// @see gtc_type_precision
- typedef tvec1<f32, defaultp> f32vec1;
-
- /// Single-precision floating-point vector of 2 components.
- /// @see gtc_type_precision
- typedef tvec2<f32, defaultp> f32vec2;
-
- /// Single-precision floating-point vector of 3 components.
- /// @see gtc_type_precision
- typedef tvec3<f32, defaultp> f32vec3;
-
- /// Single-precision floating-point vector of 4 components.
- /// @see gtc_type_precision
- typedef tvec4<f32, defaultp> f32vec4;
-
-
- /// Double-precision floating-point vector of 1 component.
- /// @see gtc_type_precision
- typedef tvec1<f64, defaultp> f64vec1;
-
- /// Double-precision floating-point vector of 2 components.
- /// @see gtc_type_precision
- typedef tvec2<f64, defaultp> f64vec2;
-
- /// Double-precision floating-point vector of 3 components.
- /// @see gtc_type_precision
- typedef tvec3<f64, defaultp> f64vec3;
-
- /// Double-precision floating-point vector of 4 components.
- /// @see gtc_type_precision
- typedef tvec4<f64, defaultp> f64vec4;
-
-
- //////////////////////
- // Float matrix types
-
- /// Single-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef detail::tmat1x1<f32> fmat1;
-
- /// Single-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef tmat2x2<f32, defaultp> fmat2;
-
- /// Single-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef tmat3x3<f32, defaultp> fmat3;
-
- /// Single-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef tmat4x4<f32, defaultp> fmat4;
-
-
- /// Single-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef f32 fmat1x1;
-
- /// Single-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef tmat2x2<f32, defaultp> fmat2x2;
-
- /// Single-precision floating-point 2x3 matrix.
- /// @see gtc_type_precision
- typedef tmat2x3<f32, defaultp> fmat2x3;
-
- /// Single-precision floating-point 2x4 matrix.
- /// @see gtc_type_precision
- typedef tmat2x4<f32, defaultp> fmat2x4;
-
- /// Single-precision floating-point 3x2 matrix.
- /// @see gtc_type_precision
- typedef tmat3x2<f32, defaultp> fmat3x2;
-
- /// Single-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef tmat3x3<f32, defaultp> fmat3x3;
-
- /// Single-precision floating-point 3x4 matrix.
- /// @see gtc_type_precision
- typedef tmat3x4<f32, defaultp> fmat3x4;
-
- /// Single-precision floating-point 4x2 matrix.
- /// @see gtc_type_precision
- typedef tmat4x2<f32, defaultp> fmat4x2;
-
- /// Single-precision floating-point 4x3 matrix.
- /// @see gtc_type_precision
- typedef tmat4x3<f32, defaultp> fmat4x3;
-
- /// Single-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef tmat4x4<f32, defaultp> fmat4x4;
-
-
- /// Single-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef detail::tmat1x1<f32, defaultp> f32mat1;
-
- /// Single-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef tmat2x2<f32, defaultp> f32mat2;
-
- /// Single-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef tmat3x3<f32, defaultp> f32mat3;
-
- /// Single-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef tmat4x4<f32, defaultp> f32mat4;
-
-
- /// Single-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef f32 f32mat1x1;
-
- /// Single-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef tmat2x2<f32, defaultp> f32mat2x2;
-
- /// Single-precision floating-point 2x3 matrix.
- /// @see gtc_type_precision
- typedef tmat2x3<f32, defaultp> f32mat2x3;
-
- /// Single-precision floating-point 2x4 matrix.
- /// @see gtc_type_precision
- typedef tmat2x4<f32, defaultp> f32mat2x4;
-
- /// Single-precision floating-point 3x2 matrix.
- /// @see gtc_type_precision
- typedef tmat3x2<f32, defaultp> f32mat3x2;
-
- /// Single-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef tmat3x3<f32, defaultp> f32mat3x3;
-
- /// Single-precision floating-point 3x4 matrix.
- /// @see gtc_type_precision
- typedef tmat3x4<f32, defaultp> f32mat3x4;
-
- /// Single-precision floating-point 4x2 matrix.
- /// @see gtc_type_precision
- typedef tmat4x2<f32, defaultp> f32mat4x2;
-
- /// Single-precision floating-point 4x3 matrix.
- /// @see gtc_type_precision
- typedef tmat4x3<f32, defaultp> f32mat4x3;
-
- /// Single-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef tmat4x4<f32, defaultp> f32mat4x4;
-
-
- /// Double-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef detail::tmat1x1<f64, defaultp> f64mat1;
-
- /// Double-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef tmat2x2<f64, defaultp> f64mat2;
-
- /// Double-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef tmat3x3<f64, defaultp> f64mat3;
-
- /// Double-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef tmat4x4<f64, defaultp> f64mat4;
-
-
- /// Double-precision floating-point 1x1 matrix.
- /// @see gtc_type_precision
- //typedef f64 f64mat1x1;
-
- /// Double-precision floating-point 2x2 matrix.
- /// @see gtc_type_precision
- typedef tmat2x2<f64, defaultp> f64mat2x2;
-
- /// Double-precision floating-point 2x3 matrix.
- /// @see gtc_type_precision
- typedef tmat2x3<f64, defaultp> f64mat2x3;
-
- /// Double-precision floating-point 2x4 matrix.
- /// @see gtc_type_precision
- typedef tmat2x4<f64, defaultp> f64mat2x4;
-
- /// Double-precision floating-point 3x2 matrix.
- /// @see gtc_type_precision
- typedef tmat3x2<f64, defaultp> f64mat3x2;
-
- /// Double-precision floating-point 3x3 matrix.
- /// @see gtc_type_precision
- typedef tmat3x3<f64, defaultp> f64mat3x3;
-
- /// Double-precision floating-point 3x4 matrix.
- /// @see gtc_type_precision
- typedef tmat3x4<f64, defaultp> f64mat3x4;
-
- /// Double-precision floating-point 4x2 matrix.
- /// @see gtc_type_precision
- typedef tmat4x2<f64, defaultp> f64mat4x2;
-
- /// Double-precision floating-point 4x3 matrix.
- /// @see gtc_type_precision
- typedef tmat4x3<f64, defaultp> f64mat4x3;
-
- /// Double-precision floating-point 4x4 matrix.
- /// @see gtc_type_precision
- typedef tmat4x4<f64, defaultp> f64mat4x4;
-
-
- //////////////////////////
- // Quaternion types
-
- /// Single-precision floating-point quaternion.
- /// @see gtc_type_precision
- typedef tquat<f32, defaultp> f32quat;
-
- /// Double-precision floating-point quaternion.
- /// @see gtc_type_precision
- typedef tquat<f64, defaultp> f64quat;
-
- /// @}
-}//namespace glm
-
-#include "type_precision.inl"
diff --git a/inc/glm/gtc/type_precision.inl b/inc/glm/gtc/type_precision.inl deleted file mode 100644 index 8a81782..0000000 --- a/inc/glm/gtc/type_precision.inl +++ /dev/null @@ -1,36 +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_swizzle
-/// @file glm/gtc/swizzle.inl
-/// @date 2009-06-14 / 2011-06-15
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
-
-}
diff --git a/inc/glm/gtc/type_ptr.hpp b/inc/glm/gtc/type_ptr.hpp deleted file mode 100644 index edb2bf3..0000000 --- a/inc/glm/gtc/type_ptr.hpp +++ /dev/null @@ -1,178 +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_type_ptr
-/// @file glm/gtc/type_ptr.hpp
-/// @date 2009-05-06 / 2011-06-05
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtc_half_float (dependence)
-/// @see gtc_quaternion (dependence)
-///
-/// @defgroup gtc_type_ptr GLM_GTC_type_ptr
-/// @ingroup gtc
-///
-/// @brief Handles the interaction between pointers and vector, matrix types.
-///
-/// This extension defines an overloaded function, glm::value_ptr, which
-/// takes any of the \ref core_template "core template types". It returns
-/// a pointer to the memory layout of the object. Matrix types store their values
-/// in column-major order.
-///
-/// This is useful for uploading data to matrices or copying data to buffer objects.
-///
-/// Example:
-/// @code
-/// #include <glm/glm.hpp>
-/// #include <glm/gtc/type_ptr.hpp>
-///
-/// glm::vec3 aVector(3);
-/// glm::mat4 someMatrix(1.0);
-///
-/// glUniform3fv(uniformLoc, 1, glm::value_ptr(aVector));
-/// glUniformMatrix4fv(uniformMatrixLoc, 1, GL_FALSE, glm::value_ptr(someMatrix));
-/// @endcode
-///
-/// <glm/gtc/type_ptr.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../gtc/quaternion.hpp"
-#include "../vec2.hpp"
-#include "../vec3.hpp"
-#include "../vec4.hpp"
-#include "../mat2x2.hpp"
-#include "../mat2x3.hpp"
-#include "../mat2x4.hpp"
-#include "../mat3x2.hpp"
-#include "../mat3x3.hpp"
-#include "../mat3x4.hpp"
-#include "../mat4x2.hpp"
-#include "../mat4x3.hpp"
-#include "../mat4x4.hpp"
-#include <cstring>
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTC_type_ptr extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtc_type_ptr
- /// @{
-
- /// Return the constant address to the data of the input parameter.
- /// @see gtc_type_ptr
- template<typename genType>
- GLM_FUNC_DECL typename genType::value_type const * value_ptr(genType const & vec);
-
- /// Build a vector from a pointer.
- /// @see gtc_type_ptr
- template<typename T>
- GLM_FUNC_DECL tvec2<T, defaultp> make_vec2(T const * const ptr);
-
- /// Build a vector from a pointer.
- /// @see gtc_type_ptr
- template<typename T>
- GLM_FUNC_DECL tvec3<T, defaultp> make_vec3(T const * const ptr);
-
- /// Build a vector from a pointer.
- /// @see gtc_type_ptr
- template<typename T>
- GLM_FUNC_DECL tvec4<T, defaultp> make_vec4(T const * const ptr);
-
- /// Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template<typename T>
- GLM_FUNC_DECL tmat2x2<T, defaultp> make_mat2x2(T const * const ptr);
-
- /// Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template<typename T>
- GLM_FUNC_DECL tmat2x3<T, defaultp> make_mat2x3(T const * const ptr);
-
- /// Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template<typename T>
- GLM_FUNC_DECL tmat2x4<T, defaultp> make_mat2x4(T const * const ptr);
-
- /// Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template<typename T>
- GLM_FUNC_DECL tmat3x2<T, defaultp> make_mat3x2(T const * const ptr);
-
- /// Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template<typename T>
- GLM_FUNC_DECL tmat3x3<T, defaultp> make_mat3x3(T const * const ptr);
-
- /// Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template<typename T>
- GLM_FUNC_DECL tmat3x4<T, defaultp> make_mat3x4(T const * const ptr);
-
- /// Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template<typename T>
- GLM_FUNC_DECL tmat4x2<T, defaultp> make_mat4x2(T const * const ptr);
-
- /// Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template<typename T>
- GLM_FUNC_DECL tmat4x3<T, defaultp> make_mat4x3(T const * const ptr);
-
- /// Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template<typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> make_mat4x4(T const * const ptr);
-
- /// Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template<typename T>
- GLM_FUNC_DECL tmat2x2<T, defaultp> make_mat2(T const * const ptr);
-
- /// Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template<typename T>
- GLM_FUNC_DECL tmat3x3<T, defaultp> make_mat3(T const * const ptr);
-
- /// Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template<typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> make_mat4(T const * const ptr);
-
- /// Build a quaternion from a pointer.
- /// @see gtc_type_ptr
- template<typename T>
- GLM_FUNC_DECL tquat<T, defaultp> make_quat(T const * const ptr);
-
- /// @}
-}//namespace glm
-
-#include "type_ptr.inl"
diff --git a/inc/glm/gtc/type_ptr.inl b/inc/glm/gtc/type_ptr.inl deleted file mode 100644 index a08ec54..0000000 --- a/inc/glm/gtc/type_ptr.inl +++ /dev/null @@ -1,479 +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_type_ptr
-/// @file glm/gtc/type_ptr.inl
-/// @date 2011-06-15 / 2011-12-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#include <cstring>
-
-namespace glm
-{
- /// @addtogroup gtc_type_ptr
- /// @{
-
- /// Return the constant address to the data of the vector input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T const * value_ptr
- (
- tvec2<T, P> const & vec
- )
- {
- return &(vec.x);
- }
-
- //! Return the address to the data of the vector input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T * value_ptr
- (
- tvec2<T, P> & vec
- )
- {
- return &(vec.x);
- }
-
- /// Return the constant address to the data of the vector input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T const * value_ptr
- (
- tvec3<T, P> const & vec
- )
- {
- return &(vec.x);
- }
-
- //! Return the address to the data of the vector input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T * value_ptr
- (
- tvec3<T, P> & vec
- )
- {
- return &(vec.x);
- }
-
- /// Return the constant address to the data of the vector input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T const * value_ptr
- (
- tvec4<T, P> const & vec
- )
- {
- return &(vec.x);
- }
-
- //! Return the address to the data of the vector input.
- //! From GLM_GTC_type_ptr extension.
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T * value_ptr
- (
- tvec4<T, P> & vec
- )
- {
- return &(vec.x);
- }
-
- /// Return the constant address to the data of the matrix input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T const * value_ptr
- (
- tmat2x2<T, P> const & mat
- )
- {
- return &(mat[0].x);
- }
-
- //! Return the address to the data of the matrix input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T * value_ptr
- (
- tmat2x2<T, P> & mat
- )
- {
- return &(mat[0].x);
- }
-
- /// Return the constant address to the data of the matrix input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T const * value_ptr
- (
- tmat3x3<T, P> const & mat
- )
- {
- return &(mat[0].x);
- }
-
- //! Return the address to the data of the matrix input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T * value_ptr
- (
- tmat3x3<T, P> & mat
- )
- {
- return &(mat[0].x);
- }
-
- /// Return the constant address to the data of the matrix input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T const * value_ptr
- (
- tmat4x4<T, P> const & mat
- )
- {
- return &(mat[0].x);
- }
-
- //! Return the address to the data of the matrix input.
- //! From GLM_GTC_type_ptr extension.
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T * value_ptr
- (
- tmat4x4<T, P> & mat
- )
- {
- return &(mat[0].x);
- }
-
- /// Return the constant address to the data of the matrix input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T const * value_ptr
- (
- tmat2x3<T, P> const & mat
- )
- {
- return &(mat[0].x);
- }
-
- //! Return the address to the data of the matrix input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T * value_ptr
- (
- tmat2x3<T, P> & mat
- )
- {
- return &(mat[0].x);
- }
-
- /// Return the constant address to the data of the matrix input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T const * value_ptr
- (
- tmat3x2<T, P> const & mat
- )
- {
- return &(mat[0].x);
- }
-
- //! Return the address to the data of the matrix input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T * value_ptr
- (
- tmat3x2<T, P> & mat
- )
- {
- return &(mat[0].x);
- }
-
- /// Return the constant address to the data of the matrix input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T const * value_ptr
- (
- tmat2x4<T, P> const & mat
- )
- {
- return &(mat[0].x);
- }
-
- //! Return the address to the data of the matrix input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T * value_ptr
- (
- tmat2x4<T, P> & mat
- )
- {
- return &(mat[0].x);
- }
-
- /// Return the constant address to the data of the matrix input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T const * value_ptr
- (
- tmat4x2<T, P> const & mat
- )
- {
- return &(mat[0].x);
- }
-
- //! Return the address to the data of the matrix input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T * value_ptr
- (
- tmat4x2<T, P> & mat
- )
- {
- return &(mat[0].x);
- }
-
- /// Return the constant address to the data of the matrix input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T const * value_ptr
- (
- tmat3x4<T, P> const & mat
- )
- {
- return &(mat[0].x);
- }
-
- //! Return the address to the data of the matrix input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T * value_ptr
- (
- tmat3x4<T, P> & mat
- )
- {
- return &(mat[0].x);
- }
-
- /// Return the constant address to the data of the matrix input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T const * value_ptr
- (
- tmat4x3<T, P> const & mat
- )
- {
- return &(mat[0].x);
- }
-
- /// Return the address to the data of the matrix input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T * value_ptr(tmat4x3<T, P> & mat)
- {
- return &(mat[0].x);
- }
-
- /// Return the constant address to the data of the input parameter.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T const * value_ptr
- (
- tquat<T, P> const & q
- )
- {
- return &(q[0]);
- }
-
- /// Return the address to the data of the quaternion input.
- /// @see gtc_type_ptr
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER T * value_ptr
- (
- tquat<T, P> & q
- )
- {
- return &(q[0]);
- }
-
- /// Build a vector from a pointer.
- /// @see gtc_type_ptr
- template <typename T>
- GLM_FUNC_QUALIFIER tvec2<T, defaultp> make_vec2(T const * const ptr)
- {
- tvec2<T, defaultp> Result;
- memcpy(value_ptr(Result), ptr, sizeof(tvec2<T, defaultp>));
- return Result;
- }
-
- /// Build a vector from a pointer.
- /// @see gtc_type_ptr
- template <typename T>
- GLM_FUNC_QUALIFIER tvec3<T, defaultp> make_vec3(T const * const ptr)
- {
- tvec3<T, defaultp> Result;
- memcpy(value_ptr(Result), ptr, sizeof(tvec3<T, defaultp>));
- return Result;
- }
-
- /// Build a vector from a pointer.
- /// @see gtc_type_ptr
- template <typename T>
- GLM_FUNC_QUALIFIER tvec4<T, defaultp> make_vec4(T const * const ptr)
- {
- tvec4<T, defaultp> Result;
- memcpy(value_ptr(Result), ptr, sizeof(tvec4<T, defaultp>));
- return Result;
- }
-
- /// Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template <typename T>
- GLM_FUNC_QUALIFIER tmat2x2<T, defaultp> make_mat2x2(T const * const ptr)
- {
- tmat2x2<T, defaultp> Result;
- memcpy(value_ptr(Result), ptr, sizeof(tmat2x2<T, defaultp>));
- return Result;
- }
-
- /// Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template <typename T>
- GLM_FUNC_QUALIFIER tmat2x3<T, defaultp> make_mat2x3(T const * const ptr)
- {
- tmat2x3<T, defaultp> Result;
- memcpy(value_ptr(Result), ptr, sizeof(tmat2x3<T, defaultp>));
- return Result;
- }
-
- /// Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template <typename T>
- GLM_FUNC_QUALIFIER tmat2x4<T, defaultp> make_mat2x4(T const * const ptr)
- {
- tmat2x4<T, defaultp> Result;
- memcpy(value_ptr(Result), ptr, sizeof(tmat2x4<T, defaultp>));
- return Result;
- }
-
- /// Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template <typename T>
- GLM_FUNC_QUALIFIER tmat3x2<T, defaultp> make_mat3x2(T const * const ptr)
- {
- tmat3x2<T, defaultp> Result;
- memcpy(value_ptr(Result), ptr, sizeof(tmat3x2<T, defaultp>));
- return Result;
- }
-
- //! Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template <typename T>
- GLM_FUNC_QUALIFIER tmat3x3<T, defaultp> make_mat3x3(T const * const ptr)
- {
- tmat3x3<T, defaultp> Result;
- memcpy(value_ptr(Result), ptr, sizeof(tmat3x3<T, defaultp>));
- return Result;
- }
-
- //! Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template <typename T>
- GLM_FUNC_QUALIFIER tmat3x4<T, defaultp> make_mat3x4(T const * const ptr)
- {
- tmat3x4<T, defaultp> Result;
- memcpy(value_ptr(Result), ptr, sizeof(tmat3x4<T, defaultp>));
- return Result;
- }
-
- //! Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x2<T, defaultp> make_mat4x2(T const * const ptr)
- {
- tmat4x2<T, defaultp> Result;
- memcpy(value_ptr(Result), ptr, sizeof(tmat4x2<T, defaultp>));
- return Result;
- }
-
- //! Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x3<T, defaultp> make_mat4x3(T const * const ptr)
- {
- tmat4x3<T, defaultp> Result;
- memcpy(value_ptr(Result), ptr, sizeof(tmat4x3<T, defaultp>));
- return Result;
- }
-
- //! Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> make_mat4x4(T const * const ptr)
- {
- tmat4x4<T, defaultp> Result;
- memcpy(value_ptr(Result), ptr, sizeof(tmat4x4<T, defaultp>));
- return Result;
- }
-
- //! Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template <typename T>
- GLM_FUNC_QUALIFIER tmat2x2<T, defaultp> make_mat2(T const * const ptr)
- {
- return make_mat2x2(ptr);
- }
-
- //! Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template <typename T>
- GLM_FUNC_QUALIFIER tmat3x3<T, defaultp> make_mat3(T const * const ptr)
- {
- return make_mat3x3(ptr);
- }
-
- //! Build a matrix from a pointer.
- /// @see gtc_type_ptr
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> make_mat4(T const * const ptr)
- {
- return make_mat4x4(ptr);
- }
-
- //! Build a quaternion from a pointer.
- /// @see gtc_type_ptr
- template <typename T>
- GLM_FUNC_QUALIFIER tquat<T, defaultp> make_quat(T const * const ptr)
- {
- tquat<T, defaultp> Result;
- memcpy(value_ptr(Result), ptr, sizeof(tquat<T, defaultp>));
- return Result;
- }
-
- /// @}
-}//namespace glm
-
diff --git a/inc/glm/gtc/ulp.hpp b/inc/glm/gtc/ulp.hpp deleted file mode 100644 index 7228825..0000000 --- a/inc/glm/gtc/ulp.hpp +++ /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_ulp
-/// @file glm/gtc/ulp.hpp
-/// @date 2011-02-21 / 2011-12-12
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtc_ulp GLM_GTC_ulp
-/// @ingroup gtc
-///
-/// @brief Allow the measurement of the accuracy of a function against a reference
-/// implementation. This extension works on floating-point data and provide results
-/// in ULP.
-/// <glm/gtc/ulp.hpp> need to be included to use these features.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependencies
-#include "../detail/setup.hpp"
-#include "../detail/precision.hpp"
-#include "../detail/type_int.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTC_ulp extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtc_ulp
- /// @{
-
- /// Return the next ULP value(s) after the input value(s).
- /// @see gtc_ulp
- template <typename genType>
- GLM_FUNC_DECL genType next_float(genType const & x);
-
- /// Return the previous ULP value(s) before the input value(s).
- /// @see gtc_ulp
- template <typename genType>
- GLM_FUNC_DECL genType prev_float(genType const & x);
-
- /// Return the value(s) ULP distance after the input value(s).
- /// @see gtc_ulp
- template <typename genType>
- GLM_FUNC_DECL genType next_float(genType const & x, uint const & Distance);
-
- /// Return the value(s) ULP distance before the input value(s).
- /// @see gtc_ulp
- template <typename genType>
- GLM_FUNC_DECL genType prev_float(genType const & x, uint const & Distance);
-
- /// Return the distance in the number of ULP between 2 scalars.
- /// @see gtc_ulp
- template <typename T>
- GLM_FUNC_DECL uint float_distance(T const & x, T const & y);
-
- /// Return the distance in the number of ULP between 2 vectors.
- /// @see gtc_ulp
- template<typename T, template<typename> class vecType>
- GLM_FUNC_DECL vecType<uint> float_distance(vecType<T> const & x, vecType<T> const & y);
-
- /// @}
-}// namespace glm
-
-#include "ulp.inl"
diff --git a/inc/glm/gtc/ulp.inl b/inc/glm/gtc/ulp.inl deleted file mode 100644 index e91fee6..0000000 --- a/inc/glm/gtc/ulp.inl +++ /dev/null @@ -1,350 +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_ulp
-/// @file glm/gtc/ulp.inl
-/// @date 2011-03-07 / 2012-04-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-/// Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
-///
-/// Developed at SunPro, a Sun Microsystems, Inc. business.
-/// Permission to use, copy, modify, and distribute this
-/// software is freely granted, provided that this notice
-/// is preserved.
-///////////////////////////////////////////////////////////////////////////////////
-
-#include "../detail/type_int.hpp"
-#include <cmath>
-#include <cfloat>
-#include <limits>
-
-#if(GLM_COMPILER & GLM_COMPILER_VC)
-# pragma warning(push)
-# pragma warning(disable : 4127)
-#endif
-
-typedef union
-{
- float value;
- /* FIXME: Assumes 32 bit int. */
- unsigned int word;
-} ieee_float_shape_type;
-
-typedef union
-{
- double value;
- struct
- {
- glm::detail::int32 lsw;
- glm::detail::int32 msw;
- } parts;
-} ieee_double_shape_type;
-
-#define GLM_EXTRACT_WORDS(ix0,ix1,d) \
- do { \
- ieee_double_shape_type ew_u; \
- ew_u.value = (d); \
- (ix0) = ew_u.parts.msw; \
- (ix1) = ew_u.parts.lsw; \
- } while (0)
-
-#define GLM_GET_FLOAT_WORD(i,d) \
- do { \
- ieee_float_shape_type gf_u; \
- gf_u.value = (d); \
- (i) = gf_u.word; \
- } while (0)
-
-#define GLM_SET_FLOAT_WORD(d,i) \
- do { \
- ieee_float_shape_type sf_u; \
- sf_u.word = (i); \
- (d) = sf_u.value; \
- } while (0)
-
-#define GLM_INSERT_WORDS(d,ix0,ix1) \
- do { \
- ieee_double_shape_type iw_u; \
- iw_u.parts.msw = (ix0); \
- iw_u.parts.lsw = (ix1); \
- (d) = iw_u.value; \
- } while (0)
-
-namespace glm{
-namespace detail
-{
- GLM_FUNC_QUALIFIER float nextafterf(float x, float y)
- {
- volatile float t;
- glm::detail::int32 hx, hy, ix, iy;
-
- GLM_GET_FLOAT_WORD(hx, x);
- GLM_GET_FLOAT_WORD(hy, y);
- ix = hx&0x7fffffff; // |x|
- iy = hy&0x7fffffff; // |y|
-
- if((ix>0x7f800000) || // x is nan
- (iy>0x7f800000)) // y is nan
- return x+y;
- if(x==y) return y; // x=y, return y
- if(ix==0) { // x == 0
- GLM_SET_FLOAT_WORD(x,(hy&0x80000000)|1);// return +-minsubnormal
- t = x*x;
- if(t==x) return t; else return x; // raise underflow flag
- }
- if(hx>=0) { // x > 0
- if(hx>hy) { // x > y, x -= ulp
- hx -= 1;
- } else { // x < y, x += ulp
- hx += 1;
- }
- } else { // x < 0
- if(hy>=0||hx>hy){ // x < y, x -= ulp
- hx -= 1;
- } else { // x > y, x += ulp
- hx += 1;
- }
- }
- hy = hx&0x7f800000;
- if(hy>=0x7f800000) return x+x; // overflow
- if(hy<0x00800000) { // underflow
- t = x*x;
- if(t!=x) { // raise underflow flag
- GLM_SET_FLOAT_WORD(y,hx);
- return y;
- }
- }
- GLM_SET_FLOAT_WORD(x,hx);
- return x;
- }
-
- GLM_FUNC_QUALIFIER double nextafter(double x, double y)
- {
- volatile double t;
- glm::detail::int32 hx, hy, ix, iy;
- glm::detail::uint32 lx, ly;
-
- GLM_EXTRACT_WORDS(hx, lx, x);
- GLM_EXTRACT_WORDS(hy, ly, y);
- ix = hx & 0x7fffffff; // |x|
- iy = hy & 0x7fffffff; // |y|
-
- if(((ix>=0x7ff00000)&&((ix-0x7ff00000)|lx)!=0) || // x is nan
- ((iy>=0x7ff00000)&&((iy-0x7ff00000)|ly)!=0)) // y is nan
- return x+y;
- if(x==y) return y; // x=y, return y
- if((ix|lx)==0) { // x == 0
- GLM_INSERT_WORDS(x, hy & 0x80000000, 1); // return +-minsubnormal
- t = x*x;
- if(t==x) return t; else return x; // raise underflow flag
- }
- if(hx>=0) { // x > 0
- if(hx>hy||((hx==hy)&&(lx>ly))) { // x > y, x -= ulp
- if(lx==0) hx -= 1;
- lx -= 1;
- } else { // x < y, x += ulp
- lx += 1;
- if(lx==0) hx += 1;
- }
- } else { // x < 0
- if(hy>=0||hx>hy||((hx==hy)&&(lx>ly))){// x < y, x -= ulp
- if(lx==0) hx -= 1;
- lx -= 1;
- } else { // x > y, x += ulp
- lx += 1;
- if(lx==0) hx += 1;
- }
- }
- hy = hx&0x7ff00000;
- if(hy>=0x7ff00000) return x+x; // overflow
- if(hy<0x00100000) { // underflow
- t = x*x;
- if(t!=x) { // raise underflow flag
- GLM_INSERT_WORDS(y,hx,lx);
- return y;
- }
- }
- GLM_INSERT_WORDS(x,hx,lx);
- return x;
- }
-}//namespace detail
-}//namespace glm
-
-#if(GLM_COMPILER & GLM_COMPILER_VC)
-# pragma warning(pop)
-#endif
-
-namespace glm
-{
- template <>
- GLM_FUNC_QUALIFIER float next_float(float const & x)
- {
-# if GLM_HAS_CXX11_STL
- return std::nextafter(x, std::numeric_limits<float>::max());
-# elif((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
- return detail::nextafterf(x, FLT_MAX);
-# elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
- return __builtin_nextafterf(x, FLT_MAX);
-# else
- return nextafterf(x, FLT_MAX);
-# endif
- }
-
- template <>
- GLM_FUNC_QUALIFIER double next_float(double const & x)
- {
-# if GLM_HAS_CXX11_STL
- return std::nextafter(x, std::numeric_limits<double>::max());
-# elif((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
- return detail::nextafter(x, std::numeric_limits<double>::max());
-# elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
- return __builtin_nextafter(x, FLT_MAX);
-# else
- return nextafter(x, DBL_MAX);
-# endif
- }
-
- template<typename T, precision P, template<typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> next_float(vecType<T, P> const & x)
- {
- vecType<T, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- Result[i] = next_float(x[i]);
- return Result;
- }
-
- GLM_FUNC_QUALIFIER float prev_float(float const & x)
- {
-# if GLM_HAS_CXX11_STL
- return std::nextafter(x, std::numeric_limits<float>::min());
-# elif((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
- return detail::nextafterf(x, FLT_MIN);
-# elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
- return __builtin_nextafterf(x, FLT_MIN);
-# else
- return nextafterf(x, FLT_MIN);
-# endif
- }
-
- GLM_FUNC_QUALIFIER double prev_float(double const & x)
- {
-# if GLM_HAS_CXX11_STL
- return std::nextafter(x, std::numeric_limits<double>::min());
-# elif((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
- return _nextafter(x, DBL_MIN);
-# elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
- return __builtin_nextafter(x, DBL_MIN);
-# else
- return nextafter(x, DBL_MIN);
-# endif
- }
-
- template<typename T, precision P, template<typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> prev_float(vecType<T, P> const & x)
- {
- vecType<T, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- Result[i] = prev_float(x[i]);
- return Result;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER T next_float(T const & x, uint const & ulps)
- {
- T temp = x;
- for(uint i = 0; i < ulps; ++i)
- temp = next_float(temp);
- return temp;
- }
-
- template<typename T, precision P, template<typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> next_float(vecType<T, P> const & x, vecType<uint, P> const & ulps)
- {
- vecType<T, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- Result[i] = next_float(x[i], ulps[i]);
- return Result;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER T prev_float(T const & x, uint const & ulps)
- {
- T temp = x;
- for(uint i = 0; i < ulps; ++i)
- temp = prev_float(temp);
- return temp;
- }
-
- template<typename T, precision P, template<typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> prev_float(vecType<T, P> const & x, vecType<uint, P> const & ulps)
- {
- vecType<T, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- Result[i] = prev_float(x[i], ulps[i]);
- return Result;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER uint float_distance(T const & x, T const & y)
- {
- uint ulp = 0;
-
- if(x < y)
- {
- T temp = x;
- while(temp != y)// && ulp < std::numeric_limits<std::size_t>::max())
- {
- ++ulp;
- temp = next_float(temp);
- }
- }
- else if(y < x)
- {
- T temp = y;
- while(temp != x)// && ulp < std::numeric_limits<std::size_t>::max())
- {
- ++ulp;
- temp = next_float(temp);
- }
- }
- else // ==
- {
-
- }
-
- return ulp;
- }
-
- template<typename T, precision P, template<typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<uint, P> float_distance(vecType<T, P> const & x, vecType<T, P> const & y)
- {
- vecType<uint, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- Result[i] = float_distance(x[i], y[i]);
- return Result;
- }
-}//namespace glm
diff --git a/inc/glm/gtc/vec1.hpp b/inc/glm/gtc/vec1.hpp deleted file mode 100644 index d893ad2..0000000 --- a/inc/glm/gtc/vec1.hpp +++ /dev/null @@ -1,193 +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_vec1
-/// @file glm/gtc/vec1.hpp
-/// @date 2010-02-08 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtc_vec1 GLM_GTC_vec1
-/// @ingroup gtc
-///
-/// @brief Add vec1, ivec1, uvec1 and bvec1 types.
-/// <glm/gtc/vec1.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../detail/type_vec1.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTC_vec1 extension included")
-#endif
-
-namespace glm
-{
- /// 1 component vector of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- /// @see gtc_vec1 extension.
- typedef highp_vec1_t highp_vec1;
-
- /// 1 component vector of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- /// @see gtc_vec1 extension.
- typedef mediump_vec1_t mediump_vec1;
-
- /// 1 component vector of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- /// @see gtc_vec1 extension.
- typedef lowp_vec1_t lowp_vec1;
-
- /// 1 component vector of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- /// @see gtc_vec1 extension.
- typedef highp_dvec1_t highp_dvec1;
-
- /// 1 component vector of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- /// @see gtc_vec1 extension.
- typedef mediump_dvec1_t mediump_dvec1;
-
- /// 1 component vector of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- /// @see gtc_vec1 extension.
- typedef lowp_dvec1_t lowp_dvec1;
-
- /// 1 component vector of high precision signed integer numbers.
- /// There is no guarantee on the actual precision.
- /// @see gtc_vec1 extension.
- typedef highp_ivec1_t highp_ivec1;
-
- /// 1 component vector of medium precision signed integer numbers.
- /// There is no guarantee on the actual precision.
- /// @see gtc_vec1 extension.
- typedef mediump_ivec1_t mediump_ivec1;
-
- /// 1 component vector of low precision signed integer numbers.
- /// There is no guarantee on the actual precision.
- /// @see gtc_vec1 extension.
- typedef lowp_ivec1_t lowp_ivec1;
-
- /// 1 component vector of high precision unsigned integer numbers.
- /// There is no guarantee on the actual precision.
- /// @see gtc_vec1 extension.
- typedef highp_uvec1_t highp_uvec1;
-
- /// 1 component vector of medium precision unsigned integer numbers.
- /// There is no guarantee on the actual precision.
- /// @see gtc_vec1 extension.
- typedef mediump_uvec1_t mediump_uvec1;
-
- /// 1 component vector of low precision unsigned integer numbers.
- /// There is no guarantee on the actual precision.
- /// @see gtc_vec1 extension.
- typedef lowp_uvec1_t lowp_uvec1;
-
- /// 1 component vector of high precision boolean.
- /// There is no guarantee on the actual precision.
- /// @see gtc_vec1 extension.
- typedef highp_bvec1_t highp_bvec1;
-
- /// 1 component vector of medium precision boolean.
- /// There is no guarantee on the actual precision.
- /// @see gtc_vec1 extension.
- typedef mediump_bvec1_t mediump_bvec1;
-
- /// 1 component vector of low precision boolean.
- /// There is no guarantee on the actual precision.
- /// @see gtc_vec1 extension.
- typedef lowp_bvec1_t lowp_bvec1;
-
- //////////////////////////
- // vec1 definition
-
-#if(defined(GLM_PRECISION_HIGHP_BOOL))
- typedef highp_bvec1 bvec1;
-#elif(defined(GLM_PRECISION_MEDIUMP_BOOL))
- typedef mediump_bvec1 bvec1;
-#elif(defined(GLM_PRECISION_LOWP_BOOL))
- typedef lowp_bvec1 bvec1;
-#else
- /// 1 component vector of boolean.
- /// @see gtc_vec1 extension.
- typedef highp_bvec1 bvec1;
-#endif//GLM_PRECISION
-
-#if(defined(GLM_PRECISION_HIGHP_FLOAT))
- typedef highp_vec1 vec1;
-#elif(defined(GLM_PRECISION_MEDIUMP_FLOAT))
- typedef mediump_vec1 vec1;
-#elif(defined(GLM_PRECISION_LOWP_FLOAT))
- typedef lowp_vec1 vec1;
-#else
- /// 1 component vector of floating-point numbers.
- /// @see gtc_vec1 extension.
- typedef highp_vec1 vec1;
-#endif//GLM_PRECISION
-
-#if(defined(GLM_PRECISION_HIGHP_DOUBLE))
- typedef highp_dvec1 dvec1;
-#elif(defined(GLM_PRECISION_MEDIUMP_DOUBLE))
- typedef mediump_dvec1 dvec1;
-#elif(defined(GLM_PRECISION_LOWP_DOUBLE))
- typedef lowp_dvec1 dvec1;
-#else
- /// 1 component vector of floating-point numbers.
- /// @see gtc_vec1 extension.
- typedef highp_dvec1 dvec1;
-#endif//GLM_PRECISION
-
-#if(defined(GLM_PRECISION_HIGHP_INT))
- typedef highp_ivec1 ivec1;
-#elif(defined(GLM_PRECISION_MEDIUMP_INT))
- typedef mediump_ivec1 ivec1;
-#elif(defined(GLM_PRECISION_LOWP_INT))
- typedef lowp_ivec1 ivec1;
-#else
- /// 1 component vector of signed integer numbers.
- /// @see gtc_vec1 extension.
- typedef highp_ivec1 ivec1;
-#endif//GLM_PRECISION
-
-#if(defined(GLM_PRECISION_HIGHP_UINT))
- typedef highp_uvec1 uvec1;
-#elif(defined(GLM_PRECISION_MEDIUMP_UINT))
- typedef mediump_uvec1 uvec1;
-#elif(defined(GLM_PRECISION_LOWP_UINT))
- typedef lowp_uvec1 uvec1;
-#else
- /// 1 component vector of unsigned integer numbers.
- /// @see gtc_vec1 extension.
- typedef highp_uvec1 uvec1;
-#endif//GLM_PRECISION
-
-}// namespace glm
-
-#include "vec1.inl"
diff --git a/inc/glm/gtc/vec1.inl b/inc/glm/gtc/vec1.inl deleted file mode 100644 index 06b614a..0000000 --- a/inc/glm/gtc/vec1.inl +++ /dev/null @@ -1,31 +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_vec1
-/// @file glm/gtc/vec1.inl
-/// @date 2013-03-16 / 2013-03-16
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
diff --git a/inc/glm/gtx/associated_min_max.hpp b/inc/glm/gtx/associated_min_max.hpp deleted file mode 100644 index a0f0f69..0000000 --- a/inc/glm/gtx/associated_min_max.hpp +++ /dev/null @@ -1,231 +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 gtx_associated_min_max
-/// @file glm/gtx/associated_min_max.hpp
-/// @date 2008-03-10 / 2014-10-11
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtx_extented_min_max (dependence)
-///
-/// @defgroup gtx_associated_min_max GLM_GTX_associated_min_max
-/// @ingroup gtx
-///
-/// @brief Min and max functions that return associated values not the compared onces.
-/// <glm/gtx/associated_min_max.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_associated_min_max extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_associated_min_max
- /// @{
-
- /// Minimum comparison between 2 variables and returns 2 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U, precision P>
- GLM_FUNC_DECL U associatedMin(T x, U a, T y, U b);
-
- /// Minimum comparison between 2 variables and returns 2 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL tvec2<U, P> associatedMin(
- vecType<T, P> const & x, vecType<U, P> const & a,
- vecType<T, P> const & y, vecType<U, P> const & b);
-
- /// Minimum comparison between 2 variables and returns 2 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<U, P> associatedMin(
- T x, const vecType<U, P>& a,
- T y, const vecType<U, P>& b);
-
- /// Minimum comparison between 2 variables and returns 2 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<U, P> associatedMin(
- vecType<T, P> const & x, U a,
- vecType<T, P> const & y, U b);
-
- /// Minimum comparison between 3 variables and returns 3 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U>
- GLM_FUNC_DECL U associatedMin(
- T x, U a,
- T y, U b,
- T z, U c);
-
- /// Minimum comparison between 3 variables and returns 3 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<U, P> associatedMin(
- vecType<T, P> const & x, vecType<U, P> const & a,
- vecType<T, P> const & y, vecType<U, P> const & b,
- vecType<T, P> const & z, vecType<U, P> const & c);
-
- /// Minimum comparison between 4 variables and returns 4 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U>
- GLM_FUNC_DECL U associatedMin(
- T x, U a,
- T y, U b,
- T z, U c,
- T w, U d);
-
- /// Minimum comparison between 4 variables and returns 4 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<U, P> associatedMin(
- vecType<T, P> const & x, vecType<U, P> const & a,
- vecType<T, P> const & y, vecType<U, P> const & b,
- vecType<T, P> const & z, vecType<U, P> const & c,
- vecType<T, P> const & w, vecType<U, P> const & d);
-
- /// Minimum comparison between 4 variables and returns 4 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<U, P> associatedMin(
- T x, vecType<U, P> const & a,
- T y, vecType<U, P> const & b,
- T z, vecType<U, P> const & c,
- T w, vecType<U, P> const & d);
-
- /// Minimum comparison between 4 variables and returns 4 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<U, P> associatedMin(
- vecType<T, P> const & x, U a,
- vecType<T, P> const & y, U b,
- vecType<T, P> const & z, U c,
- vecType<T, P> const & w, U d);
-
- /// Maximum comparison between 2 variables and returns 2 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U>
- GLM_FUNC_DECL U associatedMax(T x, U a, T y, U b);
-
- /// Maximum comparison between 2 variables and returns 2 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL tvec2<U, P> associatedMax(
- vecType<T, P> const & x, vecType<U, P> const & a,
- vecType<T, P> const & y, vecType<U, P> const & b);
-
- /// Maximum comparison between 2 variables and returns 2 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> associatedMax(
- T x, vecType<U, P> const & a,
- T y, vecType<U, P> const & b);
-
- /// Maximum comparison between 2 variables and returns 2 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<U, P> associatedMax(
- vecType<T, P> const & x, U a,
- vecType<T, P> const & y, U b);
-
- /// Maximum comparison between 3 variables and returns 3 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U>
- GLM_FUNC_DECL U associatedMax(
- T x, U a,
- T y, U b,
- T z, U c);
-
- /// Maximum comparison between 3 variables and returns 3 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<U, P> associatedMax(
- vecType<T, P> const & x, vecType<U, P> const & a,
- vecType<T, P> const & y, vecType<U, P> const & b,
- vecType<T, P> const & z, vecType<U, P> const & c);
-
- /// Maximum comparison between 3 variables and returns 3 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> associatedMax(
- T x, vecType<U, P> const & a,
- T y, vecType<U, P> const & b,
- T z, vecType<U, P> const & c);
-
- /// Maximum comparison between 3 variables and returns 3 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<U, P> associatedMax(
- vecType<T, P> const & x, U a,
- vecType<T, P> const & y, U b,
- vecType<T, P> const & z, U c);
-
- /// Maximum comparison between 4 variables and returns 4 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U>
- GLM_FUNC_DECL U associatedMax(
- T x, U a,
- T y, U b,
- T z, U c,
- T w, U d);
-
- /// Maximum comparison between 4 variables and returns 4 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<U, P> associatedMax(
- vecType<T, P> const & x, vecType<U, P> const & a,
- vecType<T, P> const & y, vecType<U, P> const & b,
- vecType<T, P> const & z, vecType<U, P> const & c,
- vecType<T, P> const & w, vecType<U, P> const & d);
-
- /// Maximum comparison between 4 variables and returns 4 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<U, P> associatedMax(
- T x, vecType<U, P> const & a,
- T y, vecType<U, P> const & b,
- T z, vecType<U, P> const & c,
- T w, vecType<U, P> const & d);
-
- /// Maximum comparison between 4 variables and returns 4 associated variable values
- /// @see gtx_associated_min_max
- template<typename T, typename U, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<U, P> associatedMax(
- vecType<T, P> const & x, U a,
- vecType<T, P> const & y, U b,
- vecType<T, P> const & z, U c,
- vecType<T, P> const & w, U d);
-
- /// @}
-} //namespace glm
-
-#include "associated_min_max.inl"
diff --git a/inc/glm/gtx/associated_min_max.inl b/inc/glm/gtx/associated_min_max.inl deleted file mode 100644 index 0773a21..0000000 --- a/inc/glm/gtx/associated_min_max.inl +++ /dev/null @@ -1,384 +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 gtx_associated_min_max
-/// @file glm/gtx/associated_min_max.inl
-/// @date 2008-03-10 / 2014-10-11
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace glm{
-
-// Min comparison between 2 variables
-template<typename T, typename U, precision P>
-GLM_FUNC_QUALIFIER U associatedMin(T x, U a, T y, U b)
-{
- return x < y ? a : b;
-}
-
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER tvec2<U, P> associatedMin
-(
- vecType<T, P> const & x, vecType<U, P> const & a,
- vecType<T, P> const & y, vecType<U, P> const & b
-)
-{
- vecType<U, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- Result[i] = x[i] < y[i] ? a[i] : b[i];
- return Result;
-}
-
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMin
-(
- T x, const vecType<U, P>& a,
- T y, const vecType<U, P>& b
-)
-{
- vecType<U, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- Result[i] = x < y ? a[i] : b[i];
- return Result;
-}
-
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMin
-(
- vecType<T, P> const & x, U a,
- vecType<T, P> const & y, U b
-)
-{
- vecType<U, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- Result[i] = x[i] < y[i] ? a : b;
- return Result;
-}
-
-// Min comparison between 3 variables
-template<typename T, typename U>
-GLM_FUNC_QUALIFIER U associatedMin
-(
- T x, U a,
- T y, U b,
- T z, U c
-)
-{
- U Result = x < y ? (x < z ? a : c) : (y < z ? b : c);
- return Result;
-}
-
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMin
-(
- vecType<T, P> const & x, vecType<U, P> const & a,
- vecType<T, P> const & y, vecType<U, P> const & b,
- vecType<T, P> const & z, vecType<U, P> const & c
-)
-{
- vecType<U, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- Result[i] = x[i] < y[i] ? (x[i] < z[i] ? a[i] : c[i]) : (y[i] < z[i] ? b[i] : c[i]);
- return Result;
-}
-
-// Min comparison between 4 variables
-template<typename T, typename U>
-GLM_FUNC_QUALIFIER U associatedMin
-(
- T x, U a,
- T y, U b,
- T z, U c,
- T w, U d
-)
-{
- T Test1 = min(x, y);
- T Test2 = min(z, w);;
- U Result1 = x < y ? a : b;
- U Result2 = z < w ? c : d;
- U Result = Test1 < Test2 ? Result1 : Result2;
- return Result;
-}
-
-// Min comparison between 4 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMin
-(
- vecType<T, P> const & x, vecType<U, P> const & a,
- vecType<T, P> const & y, vecType<U, P> const & b,
- vecType<T, P> const & z, vecType<U, P> const & c,
- vecType<T, P> const & w, vecType<U, P> const & d
-)
-{
- vecType<U, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- {
- T Test1 = min(x[i], y[i]);
- T Test2 = min(z[i], w[i]);
- U Result1 = x[i] < y[i] ? a[i] : b[i];
- U Result2 = z[i] < w[i] ? c[i] : d[i];
- Result[i] = Test1 < Test2 ? Result1 : Result2;
- }
- return Result;
-}
-
-// Min comparison between 4 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMin
-(
- T x, vecType<U, P> const & a,
- T y, vecType<U, P> const & b,
- T z, vecType<U, P> const & c,
- T w, vecType<U, P> const & d
-)
-{
- T Test1 = min(x, y);
- T Test2 = min(z, w);
-
- vecType<U, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- {
- U Result1 = x < y ? a[i] : b[i];
- U Result2 = z < w ? c[i] : d[i];
- Result[i] = Test1 < Test2 ? Result1 : Result2;
- }
- return Result;
-}
-
-// Min comparison between 4 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMin
-(
- vecType<T, P> const & x, U a,
- vecType<T, P> const & y, U b,
- vecType<T, P> const & z, U c,
- vecType<T, P> const & w, U d
-)
-{
- vecType<U, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- {
- T Test1 = min(x[i], y[i]);
- T Test2 = min(z[i], w[i]);;
- U Result1 = x[i] < y[i] ? a : b;
- U Result2 = z[i] < w[i] ? c : d;
- Result[i] = Test1 < Test2 ? Result1 : Result2;
- }
- return Result;
-}
-
-// Max comparison between 2 variables
-template<typename T, typename U>
-GLM_FUNC_QUALIFIER U associatedMax(T x, U a, T y, U b)
-{
- return x > y ? a : b;
-}
-
-// Max comparison between 2 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER tvec2<U, P> associatedMax
-(
- vecType<T, P> const & x, vecType<U, P> const & a,
- vecType<T, P> const & y, vecType<U, P> const & b
-)
-{
- vecType<U, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- Result[i] = x[i] > y[i] ? a[i] : b[i];
- return Result;
-}
-
-// Max comparison between 2 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<T, P> associatedMax
-(
- T x, vecType<U, P> const & a,
- T y, vecType<U, P> const & b
-)
-{
- vecType<U, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- Result[i] = x > y ? a[i] : b[i];
- return Result;
-}
-
-// Max comparison between 2 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMax
-(
- vecType<T, P> const & x, U a,
- vecType<T, P> const & y, U b
-)
-{
- vecType<T, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- Result[i] = x[i] > y[i] ? a : b;
- return Result;
-}
-
-// Max comparison between 3 variables
-template<typename T, typename U>
-GLM_FUNC_QUALIFIER U associatedMax
-(
- T x, U a,
- T y, U b,
- T z, U c
-)
-{
- U Result = x > y ? (x > z ? a : c) : (y > z ? b : c);
- return Result;
-}
-
-// Max comparison between 3 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMax
-(
- vecType<T, P> const & x, vecType<U, P> const & a,
- vecType<T, P> const & y, vecType<U, P> const & b,
- vecType<T, P> const & z, vecType<U, P> const & c
-)
-{
- vecType<U, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- Result[i] = x[i] > y[i] ? (x[i] > z[i] ? a[i] : c[i]) : (y[i] > z[i] ? b[i] : c[i]);
- return Result;
-}
-
-// Max comparison between 3 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<T, P> associatedMax
-(
- T x, vecType<U, P> const & a,
- T y, vecType<U, P> const & b,
- T z, vecType<U, P> const & c
-)
-{
- vecType<U, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- Result[i] = x > y ? (x > z ? a[i] : c[i]) : (y > z ? b[i] : c[i]);
- return Result;
-}
-
-// Max comparison between 3 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMax
-(
- vecType<T, P> const & x, U a,
- vecType<T, P> const & y, U b,
- vecType<T, P> const & z, U c
-)
-{
- vecType<T, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- Result[i] = x[i] > y[i] ? (x[i] > z[i] ? a : c) : (y[i] > z[i] ? b : c);
- return Result;
-}
-
-// Max comparison between 4 variables
-template<typename T, typename U>
-GLM_FUNC_QUALIFIER U associatedMax
-(
- T x, U a,
- T y, U b,
- T z, U c,
- T w, U d
-)
-{
- T Test1 = max(x, y);
- T Test2 = max(z, w);;
- U Result1 = x > y ? a : b;
- U Result2 = z > w ? c : d;
- U Result = Test1 > Test2 ? Result1 : Result2;
- return Result;
-}
-
-// Max comparison between 4 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMax
-(
- vecType<T, P> const & x, vecType<U, P> const & a,
- vecType<T, P> const & y, vecType<U, P> const & b,
- vecType<T, P> const & z, vecType<U, P> const & c,
- vecType<T, P> const & w, vecType<U, P> const & d
-)
-{
- vecType<U, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- {
- T Test1 = max(x[i], y[i]);
- T Test2 = max(z[i], w[i]);
- U Result1 = x[i] > y[i] ? a[i] : b[i];
- U Result2 = z[i] > w[i] ? c[i] : d[i];
- Result[i] = Test1 > Test2 ? Result1 : Result2;
- }
- return Result;
-}
-
-// Max comparison between 4 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMax
-(
- T x, vecType<U, P> const & a,
- T y, vecType<U, P> const & b,
- T z, vecType<U, P> const & c,
- T w, vecType<U, P> const & d
-)
-{
- T Test1 = max(x, y);
- T Test2 = max(z, w);
-
- vecType<U, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- {
- U Result1 = x > y ? a[i] : b[i];
- U Result2 = z > w ? c[i] : d[i];
- Result[i] = Test1 > Test2 ? Result1 : Result2;
- }
- return Result;
-}
-
-// Max comparison between 4 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMax
-(
- vecType<T, P> const & x, U a,
- vecType<T, P> const & y, U b,
- vecType<T, P> const & z, U c,
- vecType<T, P> const & w, U d
-)
-{
- vecType<U, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(Result); ++i)
- {
- T Test1 = max(x[i], y[i]);
- T Test2 = max(z[i], w[i]);;
- U Result1 = x[i] > y[i] ? a : b;
- U Result2 = z[i] > w[i] ? c : d;
- Result[i] = Test1 > Test2 ? Result1 : Result2;
- }
- return Result;
-}
-}//namespace glm
diff --git a/inc/glm/gtx/bit.hpp b/inc/glm/gtx/bit.hpp deleted file mode 100644 index fa77cb8..0000000 --- a/inc/glm/gtx/bit.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 gtx_bit
-/// @file glm/gtx/bit.hpp
-/// @date 2007-03-14 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtc_half_float (dependence)
-///
-/// @defgroup gtx_bit GLM_GTX_bit
-/// @ingroup gtx
-///
-/// @brief Allow to perform bit operations on integer values
-///
-/// <glm/gtx/bit.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependencies
-#include "../gtc/bitfield.hpp"
-
-#if(defined(GLM_MESSAGES))
-# pragma message("GLM: GLM_GTX_bit extension is deprecated, include GLM_GTC_bitfield and GLM_GTC_integer instead")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_bit
- /// @{
-
- /// @see gtx_bit
- template <typename genIUType>
- GLM_FUNC_DECL genIUType highestBitValue(genIUType Value);
-
- /// Find the highest bit set to 1 in a integer variable and return its value.
- ///
- /// @see gtx_bit
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> highestBitValue(vecType<T, P> const & value);
-
- /// Return the power of two number which value is just higher the input value.
- /// Deprecated, use ceilPowerOfTwo from GTC_round instead
- ///
- /// @see gtc_round
- /// @see gtx_bit
- template <typename genIUType>
- GLM_DEPRECATED GLM_FUNC_DECL genIUType powerOfTwoAbove(genIUType Value);
-
- /// Return the power of two number which value is just higher the input value.
- /// Deprecated, use ceilPowerOfTwo from GTC_round instead
- ///
- /// @see gtc_round
- /// @see gtx_bit
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_DEPRECATED GLM_FUNC_DECL vecType<T, P> powerOfTwoAbove(vecType<T, P> const & value);
-
- /// Return the power of two number which value is just lower the input value.
- /// Deprecated, use floorPowerOfTwo from GTC_round instead
- ///
- /// @see gtc_round
- /// @see gtx_bit
- template <typename genIUType>
- GLM_DEPRECATED GLM_FUNC_DECL genIUType powerOfTwoBelow(genIUType Value);
-
- /// Return the power of two number which value is just lower the input value.
- /// Deprecated, use floorPowerOfTwo from GTC_round instead
- ///
- /// @see gtc_round
- /// @see gtx_bit
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_DEPRECATED GLM_FUNC_DECL vecType<T, P> powerOfTwoBelow(vecType<T, P> const & value);
-
- /// Return the power of two number which value is the closet to the input value.
- /// Deprecated, use roundPowerOfTwo from GTC_round instead
- ///
- /// @see gtc_round
- /// @see gtx_bit
- template <typename genIUType>
- GLM_DEPRECATED GLM_FUNC_DECL genIUType powerOfTwoNearest(genIUType Value);
-
- /// Return the power of two number which value is the closet to the input value.
- /// Deprecated, use roundPowerOfTwo from GTC_round instead
- ///
- /// @see gtc_round
- /// @see gtx_bit
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_DEPRECATED GLM_FUNC_DECL vecType<T, P> powerOfTwoNearest(vecType<T, P> const & value);
-
- /// @}
-} //namespace glm
-
-
-#include "bit.inl"
-
diff --git a/inc/glm/gtx/bit.inl b/inc/glm/gtx/bit.inl deleted file mode 100644 index 1bfc96d..0000000 --- a/inc/glm/gtx/bit.inl +++ /dev/null @@ -1,107 +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 gtx_bit
-/// @file glm/gtx/bit.inl
-/// @date 2014-11-25 / 2014-11-25
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- ///////////////////
- // highestBitValue
-
- template <typename genIUType>
- GLM_FUNC_QUALIFIER genIUType highestBitValue(genIUType Value)
- {
- genIUType tmp = Value;
- genIUType result = genIUType(0);
- while(tmp)
- {
- result = (tmp & (~tmp + 1)); // grab lowest bit
- tmp &= ~result; // clear lowest bit
- }
- return result;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> highestBitValue(vecType<T, P> const & v)
- {
- return detail::functor1<T, T, P, vecType>::call(highestBitValue, v);
- }
-
- ///////////////////
- // powerOfTwoAbove
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType powerOfTwoAbove(genType value)
- {
- return isPowerOfTwo(value) ? value : highestBitValue(value) << 1;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> powerOfTwoAbove(vecType<T, P> const & v)
- {
- return detail::functor1<T, T, P, vecType>::call(powerOfTwoAbove, v);
- }
-
- ///////////////////
- // powerOfTwoBelow
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType powerOfTwoBelow(genType value)
- {
- return isPowerOfTwo(value) ? value : highestBitValue(value);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> powerOfTwoBelow(vecType<T, P> const & v)
- {
- return detail::functor1<T, T, P, vecType>::call(powerOfTwoBelow, v);
- }
-
- /////////////////////
- // powerOfTwoNearest
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType powerOfTwoNearest(genType value)
- {
- if(isPowerOfTwo(value))
- return value;
-
- genType const prev = highestBitValue(value);
- genType const next = prev << 1;
- return (next - value) < (value - prev) ? next : prev;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> powerOfTwoNearest(vecType<T, P> const & v)
- {
- return detail::functor1<T, T, P, vecType>::call(powerOfTwoNearest, v);
- }
-
-}//namespace glm
diff --git a/inc/glm/gtx/closest_point.hpp b/inc/glm/gtx/closest_point.hpp deleted file mode 100644 index 6cb0fdd..0000000 --- a/inc/glm/gtx/closest_point.hpp +++ /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 gtx_closest_point
-/// @file glm/gtx/closest_point.hpp
-/// @date 2005-12-30 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_closest_point GLM_GTX_closest_point
-/// @ingroup gtx
-///
-/// @brief Find the point on a straight line which is the closet of a point.
-///
-/// <glm/gtx/closest_point.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_closest_point extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_closest_point
- /// @{
-
- /// Find the point on a straight line which is the closet of a point.
- /// @see gtx_closest_point
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> closestPointOnLine(
- tvec3<T, P> const & point,
- tvec3<T, P> const & a,
- tvec3<T, P> const & b);
-
- /// 2d lines work as well
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> closestPointOnLine(
- tvec2<T, P> const & point,
- tvec2<T, P> const & a,
- tvec2<T, P> const & b);
-
- /// @}
-}// namespace glm
-
-#include "closest_point.inl"
diff --git a/inc/glm/gtx/closest_point.inl b/inc/glm/gtx/closest_point.inl deleted file mode 100644 index 358b202..0000000 --- a/inc/glm/gtx/closest_point.inl +++ /dev/null @@ -1,75 +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 gtx_closest_point
-/// @file glm/gtx/closest_point.inl
-/// @date 2005-12-30 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> closestPointOnLine
- (
- tvec3<T, P> const & point,
- tvec3<T, P> const & a,
- tvec3<T, P> const & b
- )
- {
- T LineLength = distance(a, b);
- tvec3<T, P> Vector = point - a;
- tvec3<T, P> LineDirection = (b - a) / LineLength;
-
- // Project Vector to LineDirection to get the distance of point from a
- T Distance = dot(Vector, LineDirection);
-
- if(Distance <= T(0)) return a;
- if(Distance >= LineLength) return b;
- return a + LineDirection * Distance;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> closestPointOnLine
- (
- tvec2<T, P> const & point,
- tvec2<T, P> const & a,
- tvec2<T, P> const & b
- )
- {
- T LineLength = distance(a, b);
- tvec2<T, P> Vector = point - a;
- tvec2<T, P> LineDirection = (b - a) / LineLength;
-
- // Project Vector to LineDirection to get the distance of point from a
- T Distance = dot(Vector, LineDirection);
-
- if(Distance <= T(0)) return a;
- if(Distance >= LineLength) return b;
- return a + LineDirection * Distance;
- }
-
-}//namespace glm
diff --git a/inc/glm/gtx/color_space.hpp b/inc/glm/gtx/color_space.hpp deleted file mode 100644 index 4ad610e..0000000 --- a/inc/glm/gtx/color_space.hpp +++ /dev/null @@ -1,97 +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 gtx_color_space
-/// @file glm/gtx/color_space.hpp
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_color_space GLM_GTX_color_space
-/// @ingroup gtx
-///
-/// @brief Related to RGB to HSV conversions and operations.
-///
-/// <glm/gtx/color_space.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_color_space extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_color_space
- /// @{
-
- /// Converts a color from HSV color space to its color in RGB color space.
- /// @see gtx_color_space
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> rgbColor(
- tvec3<T, P> const & hsvValue);
-
- /// Converts a color from RGB color space to its color in HSV color space.
- /// @see gtx_color_space
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> hsvColor(
- tvec3<T, P> const & rgbValue);
-
- /// Build a saturation matrix.
- /// @see gtx_color_space
- template <typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> saturation(
- T const s);
-
- /// Modify the saturation of a color.
- /// @see gtx_color_space
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> saturation(
- T const s,
- tvec3<T, P> const & color);
-
- /// Modify the saturation of a color.
- /// @see gtx_color_space
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> saturation(
- T const s,
- tvec4<T, P> const & color);
-
- /// Compute color luminosity associating ratios (0.33, 0.59, 0.11) to RGB canals.
- /// @see gtx_color_space
- template <typename T, precision P>
- GLM_FUNC_DECL T luminosity(
- tvec3<T, P> const & color);
-
- /// @}
-}//namespace glm
-
-#include "color_space.inl"
diff --git a/inc/glm/gtx/color_space.inl b/inc/glm/gtx/color_space.inl deleted file mode 100644 index 0dd2a14..0000000 --- a/inc/glm/gtx/color_space.inl +++ /dev/null @@ -1,172 +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 gtx_color_space
-/// @file glm/gtx/color_space.inl
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> rgbColor(const tvec3<T, P>& hsvColor)
- {
- tvec3<T, P> hsv = hsvColor;
- tvec3<T, P> rgbColor;
-
- if(hsv.y == static_cast<T>(0))
- // achromatic (grey)
- rgbColor = tvec3<T, P>(hsv.z);
- else
- {
- T sector = floor(hsv.x / T(60));
- T frac = (hsv.x / T(60)) - sector;
- // factorial part of h
- T o = hsv.z * (T(1) - hsv.y);
- T p = hsv.z * (T(1) - hsv.y * frac);
- T q = hsv.z * (T(1) - hsv.y * (T(1) - frac));
-
- switch(int(sector))
- {
- default:
- case 0:
- rgbColor.r = hsv.z;
- rgbColor.g = q;
- rgbColor.b = o;
- break;
- case 1:
- rgbColor.r = p;
- rgbColor.g = hsv.z;
- rgbColor.b = o;
- break;
- case 2:
- rgbColor.r = o;
- rgbColor.g = hsv.z;
- rgbColor.b = q;
- break;
- case 3:
- rgbColor.r = o;
- rgbColor.g = p;
- rgbColor.b = hsv.z;
- break;
- case 4:
- rgbColor.r = q;
- rgbColor.g = o;
- rgbColor.b = hsv.z;
- break;
- case 5:
- rgbColor.r = hsv.z;
- rgbColor.g = o;
- rgbColor.b = p;
- break;
- }
- }
-
- return rgbColor;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> hsvColor(const tvec3<T, P>& rgbColor)
- {
- tvec3<T, P> hsv = rgbColor;
- float Min = min(min(rgbColor.r, rgbColor.g), rgbColor.b);
- float Max = max(max(rgbColor.r, rgbColor.g), rgbColor.b);
- float Delta = Max - Min;
-
- hsv.z = Max;
-
- if(Max != static_cast<T>(0))
- {
- hsv.y = Delta / hsv.z;
- T h = static_cast<T>(0);
-
- if(rgbColor.r == Max)
- // between yellow & magenta
- h = static_cast<T>(0) + T(60) * (rgbColor.g - rgbColor.b) / Delta;
- else if(rgbColor.g == Max)
- // between cyan & yellow
- h = static_cast<T>(120) + T(60) * (rgbColor.b - rgbColor.r) / Delta;
- else
- // between magenta & cyan
- h = static_cast<T>(240) + T(60) * (rgbColor.r - rgbColor.g) / Delta;
-
- if(h < T(0))
- hsv.x = h + T(360);
- else
- hsv.x = h;
- }
- else
- {
- // If r = g = b = 0 then s = 0, h is undefined
- hsv.y = static_cast<T>(0);
- hsv.x = static_cast<T>(0);
- }
-
- return hsv;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> saturation(T const s)
- {
- tvec3<T, defaultp> rgbw = tvec3<T, defaultp>(T(0.2126), T(0.7152), T(0.0722));
-
- T col0 = (T(1) - s) * rgbw.r;
- T col1 = (T(1) - s) * rgbw.g;
- T col2 = (T(1) - s) * rgbw.b;
-
- tmat4x4<T, defaultp> result(T(1));
- result[0][0] = col0 + s;
- result[0][1] = col0;
- result[0][2] = col0;
- result[1][0] = col1;
- result[1][1] = col1 + s;
- result[1][2] = col1;
- result[2][0] = col2;
- result[2][1] = col2;
- result[2][2] = col2 + s;
- return result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> saturation(const T s, const tvec3<T, P>& color)
- {
- return tvec3<T, P>(saturation(s) * tvec4<T, P>(color, T(0)));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> saturation(const T s, const tvec4<T, P>& color)
- {
- return saturation(s) * color;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T luminosity(const tvec3<T, P>& color)
- {
- const tvec3<T, P> tmp = tvec3<T, P>(0.33, 0.59, 0.11);
- return dot(color, tmp);
- }
-}//namespace glm
diff --git a/inc/glm/gtx/color_space_YCoCg.hpp b/inc/glm/gtx/color_space_YCoCg.hpp deleted file mode 100644 index 4e33bcf..0000000 --- a/inc/glm/gtx/color_space_YCoCg.hpp +++ /dev/null @@ -1,85 +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 gtx_color_space_YCoCg
-/// @file glm/gtx/color_space_YCoCg.hpp
-/// @date 2008-10-28 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_color_space_YCoCg GLM_GTX_color_space_YCoCg
-/// @ingroup gtx
-///
-/// @brief RGB to YCoCg conversions and operations
-///
-/// <glm/gtx/color_space_YCoCg.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_color_space_YCoCg extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_color_space_YCoCg
- /// @{
-
- /// Convert a color from RGB color space to YCoCg color space.
- /// @see gtx_color_space_YCoCg
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> rgb2YCoCg(
- tvec3<T, P> const & rgbColor);
-
- /// Convert a color from YCoCg color space to RGB color space.
- /// @see gtx_color_space_YCoCg
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> YCoCg2rgb(
- tvec3<T, P> const & YCoCgColor);
-
- /// Convert a color from RGB color space to YCoCgR color space.
- /// @see "YCoCg-R: A Color Space with RGB Reversibility and Low Dynamic Range"
- /// @see gtx_color_space_YCoCg
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> rgb2YCoCgR(
- tvec3<T, P> const & rgbColor);
-
- /// Convert a color from YCoCgR color space to RGB color space.
- /// @see "YCoCg-R: A Color Space with RGB Reversibility and Low Dynamic Range"
- /// @see gtx_color_space_YCoCg
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> YCoCgR2rgb(
- tvec3<T, P> const & YCoCgColor);
-
- /// @}
-}//namespace glm
-
-#include "color_space_YCoCg.inl"
diff --git a/inc/glm/gtx/color_space_YCoCg.inl b/inc/glm/gtx/color_space_YCoCg.inl deleted file mode 100644 index 3688520..0000000 --- a/inc/glm/gtx/color_space_YCoCg.inl +++ /dev/null @@ -1,87 +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 gtx_color_space_YCoCg
-/// @file glm/gtx/color_space_YCoCg.inl
-/// @date 2008-10-28 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> rgb2YCoCg
- (
- tvec3<T, P> const & rgbColor
- )
- {
- tvec3<T, P> result;
- result.x/*Y */ = rgbColor.r / T(4) + rgbColor.g / T(2) + rgbColor.b / T(4);
- result.y/*Co*/ = rgbColor.r / T(2) + rgbColor.g * T(0) - rgbColor.b / T(2);
- result.z/*Cg*/ = - rgbColor.r / T(4) + rgbColor.g / T(2) - rgbColor.b / T(4);
- return result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> rgb2YCoCgR
- (
- tvec3<T, P> const & rgbColor
- )
- {
- tvec3<T, P> result;
- result.x/*Y */ = rgbColor.g / T(2) + (rgbColor.r + rgbColor.b) / T(4);
- result.y/*Co*/ = rgbColor.r - rgbColor.b;
- result.z/*Cg*/ = rgbColor.g - (rgbColor.r + rgbColor.b) / T(2);
- return result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> YCoCg2rgb
- (
- tvec3<T, P> const & YCoCgColor
- )
- {
- tvec3<T, P> result;
- result.r = YCoCgColor.x + YCoCgColor.y - YCoCgColor.z;
- result.g = YCoCgColor.x + YCoCgColor.z;
- result.b = YCoCgColor.x - YCoCgColor.y - YCoCgColor.z;
- return result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> YCoCgR2rgb
- (
- tvec3<T, P> const & YCoCgRColor
- )
- {
- tvec3<T, P> result;
- T tmp = YCoCgRColor.x - (YCoCgRColor.z / T(2));
- result.g = YCoCgRColor.z + tmp;
- result.b = tmp - (YCoCgRColor.y / T(2));
- result.r = result.b + YCoCgRColor.y;
- return result;
- }
-}//namespace glm
diff --git a/inc/glm/gtx/common.hpp b/inc/glm/gtx/common.hpp deleted file mode 100644 index 5b5f18d..0000000 --- a/inc/glm/gtx/common.hpp +++ /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 gtx_common
-/// @file glm/gtx/common.hpp
-/// @date 2014-09-08 / 2014-09-08
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtc_half_float (dependence)
-///
-/// @defgroup gtx_common GLM_GTX_common
-/// @ingroup gtx
-///
-/// @brief Provide functions to increase the compatibility with Cg and HLSL languages
-///
-/// <glm/gtx/common.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependencies:
-#include "../vec2.hpp"
-#include "../vec3.hpp"
-#include "../vec4.hpp"
-#include "../gtc/vec1.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_common extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_common
- /// @{
-
- /// Returns true if x is a denormalized number
- /// Numbers whose absolute value is too small to be represented in the normal format are represented in an alternate, denormalized format.
- /// This format is less precise but can represent values closer to zero.
- ///
- /// @tparam genType Floating-point scalar or vector types.
- ///
- /// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/isnan.xml">GLSL isnan man page</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename genType>
- GLM_FUNC_DECL typename genType::bool_type isdenormal(genType const & x);
-
- /// @}
-}//namespace glm
-
-#include "common.inl"
diff --git a/inc/glm/gtx/common.inl b/inc/glm/gtx/common.inl deleted file mode 100644 index 61a351c..0000000 --- a/inc/glm/gtx/common.inl +++ /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 gtx_common
-/// @file glm/gtx/common.inl
-/// @date 2014-09-08 / 2014-09-08
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#include <cmath>
-
-namespace glm
-{
- template <typename T>
- GLM_FUNC_QUALIFIER bool isdenormal(T const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isdenormal' only accept floating-point inputs");
-
-# if GLM_HAS_CXX11_STL
- return std::fpclassify(x) == FP_SUBNORMAL;
-# else
- return x != static_cast<T>(0) && std::fabs(x) < std::numeric_limits<T>::min();
-# endif
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tvec1<T, P>::bool_type isdenormal
- (
- tvec1<T, P> const & x
- )
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isdenormal' only accept floating-point inputs");
-
- return typename tvec1<T, P>::bool_type(
- isdenormal(x.x));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tvec2<T, P>::bool_type isdenormal
- (
- tvec2<T, P> const & x
- )
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isdenormal' only accept floating-point inputs");
-
- return typename tvec2<T, P>::bool_type(
- isdenormal(x.x),
- isdenormal(x.y));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tvec3<T, P>::bool_type isdenormal
- (
- tvec3<T, P> const & x
- )
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isdenormal' only accept floating-point inputs");
-
- return typename tvec3<T, P>::bool_type(
- isdenormal(x.x),
- isdenormal(x.y),
- isdenormal(x.z));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tvec4<T, P>::bool_type isdenormal
- (
- tvec4<T, P> const & x
- )
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isdenormal' only accept floating-point inputs");
-
- return typename tvec4<T, P>::bool_type(
- isdenormal(x.x),
- isdenormal(x.y),
- isdenormal(x.z),
- isdenormal(x.w));
- }
-}//namespace glm
diff --git a/inc/glm/gtx/compatibility.hpp b/inc/glm/gtx/compatibility.hpp deleted file mode 100644 index d03a08b..0000000 --- a/inc/glm/gtx/compatibility.hpp +++ /dev/null @@ -1,158 +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 gtx_compatibility
-/// @file glm/gtx/compatibility.hpp
-/// @date 2007-01-24 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtc_half_float (dependence)
-///
-/// @defgroup gtx_compatibility GLM_GTX_compatibility
-/// @ingroup gtx
-///
-/// @brief Provide functions to increase the compatibility with Cg and HLSL languages
-///
-/// <glm/gtx/compatibility.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../gtc/quaternion.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_compatibility extension included")
-#endif
-
-#if(GLM_COMPILER & GLM_COMPILER_VC)
-# include <cfloat>
-#elif(GLM_COMPILER & GLM_COMPILER_GCC)
-# include <cmath>
-# if(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
-# undef isfinite
-# endif
-#endif//GLM_COMPILER
-
-namespace glm
-{
- /// @addtogroup gtx_compatibility
- /// @{
-
- template <typename T> GLM_FUNC_QUALIFIER T lerp(T x, T y, T a){return mix(x, y, a);} //!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
- template <typename T, precision P> GLM_FUNC_QUALIFIER tvec2<T, P> lerp(const tvec2<T, P>& x, const tvec2<T, P>& y, T a){return mix(x, y, a);} //!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
-
- template <typename T, precision P> GLM_FUNC_QUALIFIER tvec3<T, P> lerp(const tvec3<T, P>& x, const tvec3<T, P>& y, T a){return mix(x, y, a);} //!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
- template <typename T, precision P> GLM_FUNC_QUALIFIER tvec4<T, P> lerp(const tvec4<T, P>& x, const tvec4<T, P>& y, T a){return mix(x, y, a);} //!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
- template <typename T, precision P> GLM_FUNC_QUALIFIER tvec2<T, P> lerp(const tvec2<T, P>& x, const tvec2<T, P>& y, const tvec2<T, P>& a){return mix(x, y, a);} //!< \brief Returns the component-wise result of x * (1.0 - a) + y * a, i.e., the linear blend of x and y using vector a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
- template <typename T, precision P> GLM_FUNC_QUALIFIER tvec3<T, P> lerp(const tvec3<T, P>& x, const tvec3<T, P>& y, const tvec3<T, P>& a){return mix(x, y, a);} //!< \brief Returns the component-wise result of x * (1.0 - a) + y * a, i.e., the linear blend of x and y using vector a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
- template <typename T, precision P> GLM_FUNC_QUALIFIER tvec4<T, P> lerp(const tvec4<T, P>& x, const tvec4<T, P>& y, const tvec4<T, P>& a){return mix(x, y, a);} //!< \brief Returns the component-wise result of x * (1.0 - a) + y * a, i.e., the linear blend of x and y using vector a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
-
- template <typename T, precision P> GLM_FUNC_QUALIFIER T saturate(T x){return clamp(x, T(0), T(1));} //!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility)
- template <typename T, precision P> GLM_FUNC_QUALIFIER tvec2<T, P> saturate(const tvec2<T, P>& x){return clamp(x, T(0), T(1));} //!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility)
- template <typename T, precision P> GLM_FUNC_QUALIFIER tvec3<T, P> saturate(const tvec3<T, P>& x){return clamp(x, T(0), T(1));} //!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility)
- template <typename T, precision P> GLM_FUNC_QUALIFIER tvec4<T, P> saturate(const tvec4<T, P>& x){return clamp(x, T(0), T(1));} //!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility)
-
- template <typename T, precision P> GLM_FUNC_QUALIFIER T atan2(T x, T y){return atan(x, y);} //!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility)
- template <typename T, precision P> GLM_FUNC_QUALIFIER tvec2<T, P> atan2(const tvec2<T, P>& x, const tvec2<T, P>& y){return atan(x, y);} //!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility)
- template <typename T, precision P> GLM_FUNC_QUALIFIER tvec3<T, P> atan2(const tvec3<T, P>& x, const tvec3<T, P>& y){return atan(x, y);} //!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility)
- template <typename T, precision P> GLM_FUNC_QUALIFIER tvec4<T, P> atan2(const tvec4<T, P>& x, const tvec4<T, P>& y){return atan(x, y);} //!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility)
-
- template <typename genType> GLM_FUNC_DECL bool isfinite(genType const & x); //!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
- template <typename T, precision P> GLM_FUNC_DECL tvec2<bool, P> isfinite(const tvec2<T, P>& x); //!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
- template <typename T, precision P> GLM_FUNC_DECL tvec3<bool, P> isfinite(const tvec3<T, P>& x); //!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
- template <typename T, precision P> GLM_FUNC_DECL tvec4<bool, P> isfinite(const tvec4<T, P>& x); //!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
-
- typedef bool bool1; //!< \brief boolean type with 1 component. (From GLM_GTX_compatibility extension)
- typedef tvec2<bool, highp> bool2; //!< \brief boolean type with 2 components. (From GLM_GTX_compatibility extension)
- typedef tvec3<bool, highp> bool3; //!< \brief boolean type with 3 components. (From GLM_GTX_compatibility extension)
- typedef tvec4<bool, highp> bool4; //!< \brief boolean type with 4 components. (From GLM_GTX_compatibility extension)
-
- typedef bool bool1x1; //!< \brief boolean matrix with 1 x 1 component. (From GLM_GTX_compatibility extension)
- typedef tmat2x2<bool, highp> bool2x2; //!< \brief boolean matrix with 2 x 2 components. (From GLM_GTX_compatibility extension)
- typedef tmat2x3<bool, highp> bool2x3; //!< \brief boolean matrix with 2 x 3 components. (From GLM_GTX_compatibility extension)
- typedef tmat2x4<bool, highp> bool2x4; //!< \brief boolean matrix with 2 x 4 components. (From GLM_GTX_compatibility extension)
- typedef tmat3x2<bool, highp> bool3x2; //!< \brief boolean matrix with 3 x 2 components. (From GLM_GTX_compatibility extension)
- typedef tmat3x3<bool, highp> bool3x3; //!< \brief boolean matrix with 3 x 3 components. (From GLM_GTX_compatibility extension)
- typedef tmat3x4<bool, highp> bool3x4; //!< \brief boolean matrix with 3 x 4 components. (From GLM_GTX_compatibility extension)
- typedef tmat4x2<bool, highp> bool4x2; //!< \brief boolean matrix with 4 x 2 components. (From GLM_GTX_compatibility extension)
- typedef tmat4x3<bool, highp> bool4x3; //!< \brief boolean matrix with 4 x 3 components. (From GLM_GTX_compatibility extension)
- typedef tmat4x4<bool, highp> bool4x4; //!< \brief boolean matrix with 4 x 4 components. (From GLM_GTX_compatibility extension)
-
- typedef int int1; //!< \brief integer vector with 1 component. (From GLM_GTX_compatibility extension)
- typedef tvec2<int, highp> int2; //!< \brief integer vector with 2 components. (From GLM_GTX_compatibility extension)
- typedef tvec3<int, highp> int3; //!< \brief integer vector with 3 components. (From GLM_GTX_compatibility extension)
- typedef tvec4<int, highp> int4; //!< \brief integer vector with 4 components. (From GLM_GTX_compatibility extension)
-
- typedef int int1x1; //!< \brief integer matrix with 1 component. (From GLM_GTX_compatibility extension)
- typedef tmat2x2<int, highp> int2x2; //!< \brief integer matrix with 2 x 2 components. (From GLM_GTX_compatibility extension)
- typedef tmat2x3<int, highp> int2x3; //!< \brief integer matrix with 2 x 3 components. (From GLM_GTX_compatibility extension)
- typedef tmat2x4<int, highp> int2x4; //!< \brief integer matrix with 2 x 4 components. (From GLM_GTX_compatibility extension)
- typedef tmat3x2<int, highp> int3x2; //!< \brief integer matrix with 3 x 2 components. (From GLM_GTX_compatibility extension)
- typedef tmat3x3<int, highp> int3x3; //!< \brief integer matrix with 3 x 3 components. (From GLM_GTX_compatibility extension)
- typedef tmat3x4<int, highp> int3x4; //!< \brief integer matrix with 3 x 4 components. (From GLM_GTX_compatibility extension)
- typedef tmat4x2<int, highp> int4x2; //!< \brief integer matrix with 4 x 2 components. (From GLM_GTX_compatibility extension)
- typedef tmat4x3<int, highp> int4x3; //!< \brief integer matrix with 4 x 3 components. (From GLM_GTX_compatibility extension)
- typedef tmat4x4<int, highp> int4x4; //!< \brief integer matrix with 4 x 4 components. (From GLM_GTX_compatibility extension)
-
- typedef float float1; //!< \brief single-precision floating-point vector with 1 component. (From GLM_GTX_compatibility extension)
- typedef tvec2<float, highp> float2; //!< \brief single-precision floating-point vector with 2 components. (From GLM_GTX_compatibility extension)
- typedef tvec3<float, highp> float3; //!< \brief single-precision floating-point vector with 3 components. (From GLM_GTX_compatibility extension)
- typedef tvec4<float, highp> float4; //!< \brief single-precision floating-point vector with 4 components. (From GLM_GTX_compatibility extension)
-
- typedef float float1x1; //!< \brief single-precision floating-point matrix with 1 component. (From GLM_GTX_compatibility extension)
- typedef tmat2x2<float, highp> float2x2; //!< \brief single-precision floating-point matrix with 2 x 2 components. (From GLM_GTX_compatibility extension)
- typedef tmat2x3<float, highp> float2x3; //!< \brief single-precision floating-point matrix with 2 x 3 components. (From GLM_GTX_compatibility extension)
- typedef tmat2x4<float, highp> float2x4; //!< \brief single-precision floating-point matrix with 2 x 4 components. (From GLM_GTX_compatibility extension)
- typedef tmat3x2<float, highp> float3x2; //!< \brief single-precision floating-point matrix with 3 x 2 components. (From GLM_GTX_compatibility extension)
- typedef tmat3x3<float, highp> float3x3; //!< \brief single-precision floating-point matrix with 3 x 3 components. (From GLM_GTX_compatibility extension)
- typedef tmat3x4<float, highp> float3x4; //!< \brief single-precision floating-point matrix with 3 x 4 components. (From GLM_GTX_compatibility extension)
- typedef tmat4x2<float, highp> float4x2; //!< \brief single-precision floating-point matrix with 4 x 2 components. (From GLM_GTX_compatibility extension)
- typedef tmat4x3<float, highp> float4x3; //!< \brief single-precision floating-point matrix with 4 x 3 components. (From GLM_GTX_compatibility extension)
- typedef tmat4x4<float, highp> float4x4; //!< \brief single-precision floating-point matrix with 4 x 4 components. (From GLM_GTX_compatibility extension)
-
- typedef double double1; //!< \brief double-precision floating-point vector with 1 component. (From GLM_GTX_compatibility extension)
- typedef tvec2<double, highp> double2; //!< \brief double-precision floating-point vector with 2 components. (From GLM_GTX_compatibility extension)
- typedef tvec3<double, highp> double3; //!< \brief double-precision floating-point vector with 3 components. (From GLM_GTX_compatibility extension)
- typedef tvec4<double, highp> double4; //!< \brief double-precision floating-point vector with 4 components. (From GLM_GTX_compatibility extension)
-
- typedef double double1x1; //!< \brief double-precision floating-point matrix with 1 component. (From GLM_GTX_compatibility extension)
- typedef tmat2x2<double, highp> double2x2; //!< \brief double-precision floating-point matrix with 2 x 2 components. (From GLM_GTX_compatibility extension)
- typedef tmat2x3<double, highp> double2x3; //!< \brief double-precision floating-point matrix with 2 x 3 components. (From GLM_GTX_compatibility extension)
- typedef tmat2x4<double, highp> double2x4; //!< \brief double-precision floating-point matrix with 2 x 4 components. (From GLM_GTX_compatibility extension)
- typedef tmat3x2<double, highp> double3x2; //!< \brief double-precision floating-point matrix with 3 x 2 components. (From GLM_GTX_compatibility extension)
- typedef tmat3x3<double, highp> double3x3; //!< \brief double-precision floating-point matrix with 3 x 3 components. (From GLM_GTX_compatibility extension)
- typedef tmat3x4<double, highp> double3x4; //!< \brief double-precision floating-point matrix with 3 x 4 components. (From GLM_GTX_compatibility extension)
- typedef tmat4x2<double, highp> double4x2; //!< \brief double-precision floating-point matrix with 4 x 2 components. (From GLM_GTX_compatibility extension)
- typedef tmat4x3<double, highp> double4x3; //!< \brief double-precision floating-point matrix with 4 x 3 components. (From GLM_GTX_compatibility extension)
- typedef tmat4x4<double, highp> double4x4; //!< \brief double-precision floating-point matrix with 4 x 4 components. (From GLM_GTX_compatibility extension)
-
- /// @}
-}//namespace glm
-
-#include "compatibility.inl"
diff --git a/inc/glm/gtx/compatibility.inl b/inc/glm/gtx/compatibility.inl deleted file mode 100644 index a125cbc..0000000 --- a/inc/glm/gtx/compatibility.inl +++ /dev/null @@ -1,83 +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 gtx_compatibility
-/// @file glm/gtx/compatibility.inl
-/// @date 2007-01-24 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#include <limits>
-
-namespace glm
-{
- // isfinite
- template <typename genType>
- GLM_FUNC_QUALIFIER bool isfinite(
- genType const & x)
- {
-# if GLM_HAS_CXX11_STL
- return std::isfinite(x) != 0;
-# elif GLM_COMPILER & GLM_COMPILER_VC
- return _finite(x);
-# elif GLM_COMPILER & GLM_COMPILER_GCC && GLM_PLATFORM & GLM_PLATFORM_ANDROID
- return _isfinite(x) != 0;
-# else
- return x >= std::numeric_limits<genType>::min() && x <= std::numeric_limits<genType>::max();
-# endif
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<bool, P> isfinite(
- tvec2<T, P> const & x)
- {
- return tvec2<bool, P>(
- isfinite(x.x),
- isfinite(x.y));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<bool, P> isfinite(
- tvec3<T, P> const & x)
- {
- return tvec3<bool, P>(
- isfinite(x.x),
- isfinite(x.y),
- isfinite(x.z));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<bool, P> isfinite(
- tvec4<T, P> const & x)
- {
- return tvec4<bool, P>(
- isfinite(x.x),
- isfinite(x.y),
- isfinite(x.z),
- isfinite(x.w));
- }
-
-}//namespace glm
diff --git a/inc/glm/gtx/component_wise.hpp b/inc/glm/gtx/component_wise.hpp deleted file mode 100644 index 760a304..0000000 --- a/inc/glm/gtx/component_wise.hpp +++ /dev/null @@ -1,84 +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 gtx_component_wise
-/// @file glm/gtx/component_wise.hpp
-/// @date 2007-05-21 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_component_wise GLM_GTX_component_wise
-/// @ingroup gtx
-///
-/// @brief Operations between components of a type
-///
-/// <glm/gtx/component_wise.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependencies
-#include "../detail/setup.hpp"
-#include "../detail/precision.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_component_wise extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_component_wise
- /// @{
-
- /// Add all vector components together.
- /// @see gtx_component_wise
- template <typename genType>
- GLM_FUNC_DECL typename genType::value_type compAdd(
- genType const & v);
-
- /// Multiply all vector components together.
- /// @see gtx_component_wise
- template <typename genType>
- GLM_FUNC_DECL typename genType::value_type compMul(
- genType const & v);
-
- /// Find the minimum value between single vector components.
- /// @see gtx_component_wise
- template <typename genType>
- GLM_FUNC_DECL typename genType::value_type compMin(
- genType const & v);
-
- /// Find the maximum value between single vector components.
- /// @see gtx_component_wise
- template <typename genType>
- GLM_FUNC_DECL typename genType::value_type compMax(
- genType const & v);
-
- /// @}
-}//namespace glm
-
-#include "component_wise.inl"
diff --git a/inc/glm/gtx/component_wise.inl b/inc/glm/gtx/component_wise.inl deleted file mode 100644 index 32569d4..0000000 --- a/inc/glm/gtx/component_wise.inl +++ /dev/null @@ -1,70 +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 gtx_component_wise
-/// @file glm/gtx/component_wise.inl
-/// @date 2007-05-21 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER T compAdd(vecType<T, P> const & v)
- {
- T result(0);
- for(detail::component_count_t i = 0; i < detail::component_count(v); ++i)
- result += v[i];
- return result;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER T compMul(vecType<T, P> const & v)
- {
- T result(1);
- for(detail::component_count_t i = 0; i < detail::component_count(v); ++i)
- result *= v[i];
- return result;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER T compMin(vecType<T, P> const & v)
- {
- T result(v[0]);
- for(detail::component_count_t i = 1; i < detail::component_count(v); ++i)
- result = min(result, v[i]);
- return result;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER T compMax(vecType<T, P> const & v)
- {
- T result(v[0]);
- for(detail::component_count_t i = 1; i < detail::component_count(v); ++i)
- result = max(result, v[i]);
- return result;
- }
-}//namespace glm
diff --git a/inc/glm/gtx/dual_quaternion.hpp b/inc/glm/gtx/dual_quaternion.hpp deleted file mode 100644 index ffd7c68..0000000 --- a/inc/glm/gtx/dual_quaternion.hpp +++ /dev/null @@ -1,321 +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 gtx_dual_quaternion
-/// @file glm/gtx/dual_quaternion.hpp
-/// @date 2013-02-10 / 2013-02-20
-/// @author Maksim Vorobiev (msomeone@gmail.com)
-///
-/// @see core (dependence)
-/// @see gtc_half_float (dependence)
-/// @see gtc_constants (dependence)
-/// @see gtc_quaternion (dependence)
-///
-/// @defgroup gtx_dual_quaternion GLM_GTX_dual_quaternion
-/// @ingroup gtx
-///
-/// @brief Defines a templated dual-quaternion type and several dual-quaternion operations.
-///
-/// <glm/gtx/dual_quaternion.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../gtc/constants.hpp"
-#include "../gtc/quaternion.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_dual_quaternion extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_dual_quaternion
- /// @{
-
- template <typename T, precision P>
- struct tdualquat
- {
- typedef T value_type;
- typedef glm::tquat<T, P> part_type;
-
- public:
- glm::tquat<T, P> real, dual;
-
- //////////////////////////////////////
- // Component accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- typedef size_t size_type;
- /// Return the count of components of a dual quaternion
- GLM_FUNC_DECL GLM_CONSTEXPR size_type size() const;
-
- GLM_FUNC_DECL part_type & operator[](size_type i);
- GLM_FUNC_DECL part_type const & operator[](size_type i) const;
-# else
- typedef length_t length_type;
- /// Return the count of components of a dual quaternion
- GLM_FUNC_DECL GLM_CONSTEXPR length_type length() const;
-
- GLM_FUNC_DECL part_type & operator[](length_type i);
- GLM_FUNC_DECL part_type const & operator[](length_type i) const;
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////
- // Implicit basic constructors
-
- GLM_FUNC_DECL tdualquat();
- GLM_FUNC_DECL tdualquat(tdualquat<T, P> const & d);
- template <precision Q>
- GLM_FUNC_DECL tdualquat(tdualquat<T, Q> const & d);
-
- //////////////////////////////////////
- // Explicit basic constructors
-
- GLM_FUNC_DECL explicit tdualquat(ctor);
- GLM_FUNC_DECL explicit tdualquat(tquat<T, P> const & real);
- GLM_FUNC_DECL tdualquat(tquat<T, P> const & orientation, tvec3<T, P> const & translation);
- GLM_FUNC_DECL tdualquat(tquat<T, P> const & real, tquat<T, P> const & dual);
-
- //////////////////////////////////////////////////////////////
- // tdualquat conversions
-
-# ifdef GLM_FORCE_EXPLICIT_CTOR
- template <typename U, precision Q>
- GLM_FUNC_DECL explicit tdualquat(tdualquat<U, Q> const & q);
-# else
- template <typename U, precision Q>
- GLM_FUNC_DECL tdualquat(tdualquat<U, Q> const & q);
-# endif
-
- GLM_FUNC_DECL explicit tdualquat(tmat2x4<T, P> const & holder_mat);
- GLM_FUNC_DECL explicit tdualquat(tmat3x4<T, P> const & aug_mat);
-
- // Operators
- GLM_FUNC_DECL tdualquat<T, P> & operator=(tdualquat<T, P> const & m);
-
- template <typename U>
- GLM_FUNC_DECL tdualquat<T, P> & operator=(tdualquat<U, P> const & m);
- template <typename U>
- GLM_FUNC_DECL tdualquat<T, P> & operator*=(U s);
- template <typename U>
- GLM_FUNC_DECL tdualquat<T, P> & operator/=(U s);
- };
-
- template <typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> operator- (
- tquat<T, P> const & q);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tdualquat<T, P> operator+ (
- tdualquat<T, P> const & q,
- tdualquat<T, P> const & p);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tdualquat<T, P> operator* (
- tdualquat<T, P> const & q,
- tdualquat<T, P> const & p);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator* (
- tquat<T, P> const & q,
- tvec3<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> operator* (
- tvec3<T, P> const & v,
- tquat<T, P> const & q);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator* (
- tquat<T, P> const & q,
- tvec4<T, P> const & v);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> operator* (
- tvec4<T, P> const & v,
- tquat<T, P> const & q);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tdualquat<T, P> operator* (
- tdualquat<T, P> const & q,
- T const & s);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tdualquat<T, P> operator* (
- T const & s,
- tdualquat<T, P> const & q);
-
- template <typename T, precision P>
- GLM_FUNC_DECL tdualquat<T, P> operator/ (
- tdualquat<T, P> const & q,
- T const & s);
-
- /// Returns the normalized quaternion.
- ///
- /// @see gtx_dual_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tdualquat<T, P> normalize(
- tdualquat<T, P> const & q);
-
- /// Returns the linear interpolation of two dual quaternion.
- ///
- /// @see gtc_dual_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tdualquat<T, P> lerp(
- tdualquat<T, P> const & x,
- tdualquat<T, P> const & y,
- T const & a);
-
- /// Returns the q inverse.
- ///
- /// @see gtx_dual_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tdualquat<T, P> inverse(
- tdualquat<T, P> const & q);
-
- /// Converts a quaternion to a 2 * 4 matrix.
- ///
- /// @see gtx_dual_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x4<T, P> mat2x4_cast(
- tdualquat<T, P> const & x);
-
- /// Converts a quaternion to a 3 * 4 matrix.
- ///
- /// @see gtx_dual_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x4<T, P> mat3x4_cast(
- tdualquat<T, P> const & x);
-
- /// Converts a 2 * 4 matrix (matrix which holds real and dual parts) to a quaternion.
- ///
- /// @see gtx_dual_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tdualquat<T, P> dualquat_cast(
- tmat2x4<T, P> const & x);
-
- /// Converts a 3 * 4 matrix (augmented matrix rotation + translation) to a quaternion.
- ///
- /// @see gtx_dual_quaternion
- template <typename T, precision P>
- GLM_FUNC_DECL tdualquat<T, P> dualquat_cast(
- tmat3x4<T, P> const & x);
-
-
- /// Dual-quaternion of low single-precision floating-point numbers.
- ///
- /// @see gtx_dual_quaternion
- typedef tdualquat<float, lowp> lowp_dualquat;
-
- /// Dual-quaternion of medium single-precision floating-point numbers.
- ///
- /// @see gtx_dual_quaternion
- typedef tdualquat<float, mediump> mediump_dualquat;
-
- /// Dual-quaternion of high single-precision floating-point numbers.
- ///
- /// @see gtx_dual_quaternion
- typedef tdualquat<float, highp> highp_dualquat;
-
-
- /// Dual-quaternion of low single-precision floating-point numbers.
- ///
- /// @see gtx_dual_quaternion
- typedef tdualquat<float, lowp> lowp_fdualquat;
-
- /// Dual-quaternion of medium single-precision floating-point numbers.
- ///
- /// @see gtx_dual_quaternion
- typedef tdualquat<float, mediump> mediump_fdualquat;
-
- /// Dual-quaternion of high single-precision floating-point numbers.
- ///
- /// @see gtx_dual_quaternion
- typedef tdualquat<float, highp> highp_fdualquat;
-
-
- /// Dual-quaternion of low double-precision floating-point numbers.
- ///
- /// @see gtx_dual_quaternion
- typedef tdualquat<double, lowp> lowp_ddualquat;
-
- /// Dual-quaternion of medium double-precision floating-point numbers.
- ///
- /// @see gtx_dual_quaternion
- typedef tdualquat<double, mediump> mediump_ddualquat;
-
- /// Dual-quaternion of high double-precision floating-point numbers.
- ///
- /// @see gtx_dual_quaternion
- typedef tdualquat<double, highp> highp_ddualquat;
-
-
-#if(!defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT))
- /// Dual-quaternion of floating-point numbers.
- ///
- /// @see gtx_dual_quaternion
- typedef highp_fdualquat dualquat;
-
- /// Dual-quaternion of single-precision floating-point numbers.
- ///
- /// @see gtx_dual_quaternion
- typedef highp_fdualquat fdualquat;
-#elif(defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT))
- typedef highp_fdualquat dualquat;
- typedef highp_fdualquat fdualquat;
-#elif(!defined(GLM_PRECISION_HIGHP_FLOAT) && defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT))
- typedef mediump_fdualquat dualquat;
- typedef mediump_fdualquat fdualquat;
-#elif(!defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && defined(GLM_PRECISION_LOWP_FLOAT))
- typedef lowp_fdualquat dualquat;
- typedef lowp_fdualquat fdualquat;
-#else
-# error "GLM error: multiple default precision requested for single-precision floating-point types"
-#endif
-
-
-#if(!defined(GLM_PRECISION_HIGHP_DOUBLE) && !defined(GLM_PRECISION_MEDIUMP_DOUBLE) && !defined(GLM_PRECISION_LOWP_DOUBLE))
- /// Dual-quaternion of default double-precision floating-point numbers.
- ///
- /// @see gtx_dual_quaternion
- typedef highp_ddualquat ddualquat;
-#elif(defined(GLM_PRECISION_HIGHP_DOUBLE) && !defined(GLM_PRECISION_MEDIUMP_DOUBLE) && !defined(GLM_PRECISION_LOWP_DOUBLE))
- typedef highp_ddualquat ddualquat;
-#elif(!defined(GLM_PRECISION_HIGHP_DOUBLE) && defined(GLM_PRECISION_MEDIUMP_DOUBLE) && !defined(GLM_PRECISION_LOWP_DOUBLE))
- typedef mediump_ddualquat ddualquat;
-#elif(!defined(GLM_PRECISION_HIGHP_DOUBLE) && !defined(GLM_PRECISION_MEDIUMP_DOUBLE) && defined(GLM_PRECISION_LOWP_DOUBLE))
- typedef lowp_ddualquat ddualquat;
-#else
-# error "GLM error: Multiple default precision requested for double-precision floating-point types"
-#endif
-
- /// @}
-} //namespace glm
-
-#include "dual_quaternion.inl"
diff --git a/inc/glm/gtx/dual_quaternion.inl b/inc/glm/gtx/dual_quaternion.inl deleted file mode 100644 index 49e364d..0000000 --- a/inc/glm/gtx/dual_quaternion.inl +++ /dev/null @@ -1,400 +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 gtx_dual_quaternion
-/// @file glm/gtx/dual_quaternion.inl
-/// @date 2013-02-10 / 2013-02-13
-/// @author Maksim Vorobiev (msomeone@gmail.com)
-///////////////////////////////////////////////////////////////////////////////////
-
-#include "../geometric.hpp"
-#include <limits>
-
-namespace glm
-{
- //////////////////////////////////////
- // Component accesses
-
-# ifdef GLM_FORCE_SIZE_FUNC
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tdualquat<T, P>::size_type tdualquat<T, P>::size() const
- {
- return 2;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tdualquat<T, P>::part_type & tdualquat<T, P>::operator[](typename tdualquat<T, P>::size_type i)
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&real)[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tdualquat<T, P>::part_type const & tdualquat<T, P>::operator[](typename tdualquat<T, P>::size_type i) const
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&real)[i];
- }
-# else
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tdualquat<T, P>::length_type tdualquat<T, P>::length() const
- {
- return 2;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tdualquat<T, P>::part_type & tdualquat<T, P>::operator[](typename tdualquat<T, P>::length_type i)
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&real)[i];
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tdualquat<T, P>::part_type const & tdualquat<T, P>::operator[](typename tdualquat<T, P>::length_type i) const
- {
- assert(i >= 0 && static_cast<detail::component_count_t>(i) < detail::component_count(*this));
- return (&real)[i];
- }
-# endif//GLM_FORCE_SIZE_FUNC
-
- //////////////////////////////////////
- // Implicit basic constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tdualquat<T, P>::tdualquat()
-# ifndef GLM_FORCE_NO_CTOR_INIT
- : real(tquat<T, P>())
- , dual(tquat<T, P>(0, 0, 0, 0))
-# endif
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tdualquat<T, P>::tdualquat(tdualquat<T, P> const & d)
- : real(d.real)
- , dual(d.dual)
- {}
-
- template <typename T, precision P>
- template <precision Q>
- GLM_FUNC_QUALIFIER tdualquat<T, P>::tdualquat(tdualquat<T, Q> const & d)
- : real(d.real)
- , dual(d.dual)
- {}
-
- //////////////////////////////////////
- // Explicit basic constructors
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tdualquat<T, P>::tdualquat(ctor)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tdualquat<T, P>::tdualquat(tquat<T, P> const & r)
- : real(r), dual(tquat<T, P>(0, 0, 0, 0))
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tdualquat<T, P>::tdualquat(tquat<T, P> const & q, tvec3<T, P> const& p)
- : real(q), dual(
- T(-0.5) * ( p.x*q.x + p.y*q.y + p.z*q.z),
- T(+0.5) * ( p.x*q.w + p.y*q.z - p.z*q.y),
- T(+0.5) * (-p.x*q.z + p.y*q.w + p.z*q.x),
- T(+0.5) * ( p.x*q.y - p.y*q.x + p.z*q.w))
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tdualquat<T, P>::tdualquat(tquat<T, P> const & r, tquat<T, P> const & d)
- : real(r), dual(d)
- {}
-
- //////////////////////////////////////////////////////////////
- // tdualquat conversions
-
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tdualquat<T, P>::tdualquat(tdualquat<U, Q> const & q)
- : real(q.real)
- , dual(q.dual)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tdualquat<T, P>::tdualquat(tmat2x4<T, P> const & m)
- {
- *this = dualquat_cast(m);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tdualquat<T, P>::tdualquat(tmat3x4<T, P> const & m)
- {
- *this = dualquat_cast(m);
- }
-
- //////////////////////////////////////////////////////////////
- // tdualquat operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tdualquat<T, P> & tdualquat<T, P>::operator=(tdualquat<T, P> const & q)
- {
- this->real = q.real;
- this->dual = q.dual;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tdualquat<T, P> & tdualquat<T, P>::operator=(tdualquat<U, P> const & q)
- {
- this->real = q.real;
- this->dual = q.dual;
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tdualquat<T, P> & tdualquat<T, P>::operator*=(U s)
- {
- this->real *= static_cast<T>(s);
- this->dual *= static_cast<T>(s);
- return *this;
- }
-
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tdualquat<T, P> & tdualquat<T, P>::operator/=(U s)
- {
- this->real /= static_cast<T>(s);
- this->dual /= static_cast<T>(s);
- return *this;
- }
-
- //////////////////////////////////////////////////////////////
- // tquat<valType> external operators
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tdualquat<T, P> operator-(tdualquat<T, P> const & q)
- {
- return tdualquat<T, P>(-q.real,-q.dual);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tdualquat<T, P> operator+(tdualquat<T, P> const & q, tdualquat<T, P> const & p)
- {
- return tdualquat<T, P>(q.real + p.real,q.dual + p.dual);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tdualquat<T, P> operator*(tdualquat<T, P> const & p, tdualquat<T, P> const & o)
- {
- return tdualquat<T, P>(p.real * o.real,p.real * o.dual + p.dual * o.real);
- }
-
- // Transformation
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator*(tdualquat<T, P> const & q, tvec3<T, P> const & v)
- {
- tvec3<T, P> const real_v3(q.real.x,q.real.y,q.real.z);
- tvec3<T, P> const dual_v3(q.dual.x,q.dual.y,q.dual.z);
- return (cross(real_v3, cross(real_v3,v) + v * q.real.w + dual_v3) + dual_v3 * q.real.w - real_v3 * q.dual.w) * T(2) + v;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> operator*(tvec3<T, P> const & v, tdualquat<T, P> const & q)
- {
- return glm::inverse(q) * v;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator*(tdualquat<T, P> const & q, tvec4<T, P> const & v)
- {
- return tvec4<T, P>(q * tvec3<T, P>(v), v.w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> operator*(tvec4<T, P> const & v, tdualquat<T, P> const & q)
- {
- return glm::inverse(q) * v;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tdualquat<T, P> operator*(tdualquat<T, P> const & q, T const & s)
- {
- return tdualquat<T, P>(q.real * s, q.dual * s);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tdualquat<T, P> operator*(T const & s, tdualquat<T, P> const & q)
- {
- return q * s;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tdualquat<T, P> operator/(tdualquat<T, P> const & q, T const & s)
- {
- return tdualquat<T, P>(q.real / s, q.dual / s);
- }
-
- //////////////////////////////////////
- // Boolean operators
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator==(tdualquat<T, P> const & q1, tdualquat<T, P> const & q2)
- {
- return (q1.real == q2.real) && (q1.dual == q2.dual);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator!=(tdualquat<T, P> const & q1, tdualquat<T, P> const & q2)
- {
- return (q1.real != q2.dual) || (q1.real != q2.dual);
- }
-
- ////////////////////////////////////////////////////////
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tdualquat<T, P> normalize(tdualquat<T, P> const & q)
- {
- return q / length(q.real);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tdualquat<T, P> lerp(tdualquat<T, P> const & x, tdualquat<T, P> const & y, T const & a)
- {
- // Dual Quaternion Linear blend aka DLB:
- // Lerp is only defined in [0, 1]
- assert(a >= static_cast<T>(0));
- assert(a <= static_cast<T>(1));
- T const k = dot(x.real,y.real) < static_cast<T>(0) ? -a : a;
- T const one(1);
- return tdualquat<T, P>(x * (one - a) + y * k);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tdualquat<T, P> inverse(tdualquat<T, P> const & q)
- {
- const glm::tquat<T, P> real = conjugate(q.real);
- const glm::tquat<T, P> dual = conjugate(q.dual);
- return tdualquat<T, P>(real, dual + (real * (-2.0f * dot(real,dual))));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P> mat2x4_cast(tdualquat<T, P> const & x)
- {
- return tmat2x4<T, P>( x[0].x, x[0].y, x[0].z, x[0].w, x[1].x, x[1].y, x[1].z, x[1].w );
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P> mat3x4_cast(tdualquat<T, P> const & x)
- {
- tquat<T, P> r = x.real / length2(x.real);
-
- tquat<T, P> const rr(r.w * x.real.w, r.x * x.real.x, r.y * x.real.y, r.z * x.real.z);
- r *= static_cast<T>(2);
-
- T const xy = r.x * x.real.y;
- T const xz = r.x * x.real.z;
- T const yz = r.y * x.real.z;
- T const wx = r.w * x.real.x;
- T const wy = r.w * x.real.y;
- T const wz = r.w * x.real.z;
-
- tvec4<T, P> const a(
- rr.w + rr.x - rr.y - rr.z,
- xy - wz,
- xz + wy,
- -(x.dual.w * r.x - x.dual.x * r.w + x.dual.y * r.z - x.dual.z * r.y));
-
- tvec4<T, P> const b(
- xy + wz,
- rr.w + rr.y - rr.x - rr.z,
- yz - wx,
- -(x.dual.w * r.y - x.dual.x * r.z - x.dual.y * r.w + x.dual.z * r.x));
-
- tvec4<T, P> const c(
- xz - wy,
- yz + wx,
- rr.w + rr.z - rr.x - rr.y,
- -(x.dual.w * r.z + x.dual.x * r.y - x.dual.y * r.x - x.dual.z * r.w));
-
- return tmat3x4<T, P>(a, b, c);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tdualquat<T, P> dualquat_cast(tmat2x4<T, P> const & x)
- {
- return tdualquat<T, P>(
- tquat<T, P>( x[0].w, x[0].x, x[0].y, x[0].z ),
- tquat<T, P>( x[1].w, x[1].x, x[1].y, x[1].z ));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tdualquat<T, P> dualquat_cast(tmat3x4<T, P> const & x)
- {
- tquat<T, P> real(uninitialize);
-
- T const trace = x[0].x + x[1].y + x[2].z;
- if(trace > static_cast<T>(0))
- {
- T const r = sqrt(T(1) + trace);
- T const invr = static_cast<T>(0.5) / r;
- real.w = static_cast<T>(0.5) * r;
- real.x = (x[2].y - x[1].z) * invr;
- real.y = (x[0].z - x[2].x) * invr;
- real.z = (x[1].x - x[0].y) * invr;
- }
- else if(x[0].x > x[1].y && x[0].x > x[2].z)
- {
- T const r = sqrt(T(1) + x[0].x - x[1].y - x[2].z);
- T const invr = static_cast<T>(0.5) / r;
- real.x = static_cast<T>(0.5)*r;
- real.y = (x[1].x + x[0].y) * invr;
- real.z = (x[0].z + x[2].x) * invr;
- real.w = (x[2].y - x[1].z) * invr;
- }
- else if(x[1].y > x[2].z)
- {
- T const r = sqrt(T(1) + x[1].y - x[0].x - x[2].z);
- T const invr = static_cast<T>(0.5) / r;
- real.x = (x[1].x + x[0].y) * invr;
- real.y = static_cast<T>(0.5) * r;
- real.z = (x[2].y + x[1].z) * invr;
- real.w = (x[0].z - x[2].x) * invr;
- }
- else
- {
- T const r = sqrt(T(1) + x[2].z - x[0].x - x[1].y);
- T const invr = static_cast<T>(0.5) / r;
- real.x = (x[0].z + x[2].x) * invr;
- real.y = (x[2].y + x[1].z) * invr;
- real.z = static_cast<T>(0.5) * r;
- real.w = (x[1].x - x[0].y) * invr;
- }
-
- tquat<T, P> dual(uninitialize);
- dual.x = static_cast<T>(0.5) * ( x[0].w * real.w + x[1].w * real.z - x[2].w * real.y);
- dual.y = static_cast<T>(0.5) * (-x[0].w * real.z + x[1].w * real.w + x[2].w * real.x);
- dual.z = static_cast<T>(0.5) * ( x[0].w * real.y - x[1].w * real.x + x[2].w * real.w);
- dual.w = -static_cast<T>(0.5) * ( x[0].w * real.x + x[1].w * real.y + x[2].w * real.z);
- return tdualquat<T, P>(real, dual);
- }
-}//namespace glm
diff --git a/inc/glm/gtx/euler_angles.hpp b/inc/glm/gtx/euler_angles.hpp deleted file mode 100644 index 4d4353b..0000000 --- a/inc/glm/gtx/euler_angles.hpp +++ /dev/null @@ -1,156 +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 gtx_euler_angles
-/// @file glm/gtx/euler_angles.hpp
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtc_half_float (dependence)
-///
-/// @defgroup gtx_euler_angles GLM_GTX_euler_angles
-/// @ingroup gtx
-///
-/// @brief Build matrices from Euler angles.
-///
-/// <glm/gtx/euler_angles.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_euler_angles extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_euler_angles
- /// @{
-
- /// Creates a 3D 4 * 4 homogeneous rotation matrix from an euler angle X.
- /// @see gtx_euler_angles
- template <typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleX(
- T const & angleX);
-
- /// Creates a 3D 4 * 4 homogeneous rotation matrix from an euler angle Y.
- /// @see gtx_euler_angles
- template <typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleY(
- T const & angleY);
-
- /// Creates a 3D 4 * 4 homogeneous rotation matrix from an euler angle Z.
- /// @see gtx_euler_angles
- template <typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleZ(
- T const & angleZ);
-
- /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (X * Y).
- /// @see gtx_euler_angles
- template <typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleXY(
- T const & angleX,
- T const & angleY);
-
- /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * X).
- /// @see gtx_euler_angles
- template <typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleYX(
- T const & angleY,
- T const & angleX);
-
- /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (X * Z).
- /// @see gtx_euler_angles
- template <typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleXZ(
- T const & angleX,
- T const & angleZ);
-
- /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Z * X).
- /// @see gtx_euler_angles
- template <typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleZX(
- T const & angle,
- T const & angleX);
-
- /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * Z).
- /// @see gtx_euler_angles
- template <typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleYZ(
- T const & angleY,
- T const & angleZ);
-
- /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Z * Y).
- /// @see gtx_euler_angles
- template <typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleZY(
- T const & angleZ,
- T const & angleY);
-
- /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * X * Z).
- /// @see gtx_euler_angles
- template <typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleYXZ(
- T const & yaw,
- T const & pitch,
- T const & roll);
-
- /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * X * Z).
- /// @see gtx_euler_angles
- template <typename T>
- GLM_FUNC_DECL tmat4x4<T, defaultp> yawPitchRoll(
- T const & yaw,
- T const & pitch,
- T const & roll);
-
- /// Creates a 2D 2 * 2 rotation matrix from an euler angle.
- /// @see gtx_euler_angles
- template <typename T>
- GLM_FUNC_DECL tmat2x2<T, defaultp> orientate2(T const & angle);
-
- /// Creates a 2D 4 * 4 homogeneous rotation matrix from an euler angle.
- /// @see gtx_euler_angles
- template <typename T>
- GLM_FUNC_DECL tmat3x3<T, defaultp> orientate3(T const & angle);
-
- /// Creates a 3D 3 * 3 rotation matrix from euler angles (Y * X * Z).
- /// @see gtx_euler_angles
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> orientate3(tvec3<T, P> const & angles);
-
- /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * X * Z).
- /// @see gtx_euler_angles
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> orientate4(tvec3<T, P> const & angles);
-
- /// @}
-}//namespace glm
-
-#include "euler_angles.inl"
diff --git a/inc/glm/gtx/euler_angles.inl b/inc/glm/gtx/euler_angles.inl deleted file mode 100644 index 41f44ad..0000000 --- a/inc/glm/gtx/euler_angles.inl +++ /dev/null @@ -1,287 +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 gtx_euler_angles
-/// @file glm/gtx/euler_angles.inl
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleX
- (
- T const & angleX
- )
- {
- T cosX = glm::cos(angleX);
- T sinX = glm::sin(angleX);
-
- return tmat4x4<T, defaultp>(
- T(1), T(0), T(0), T(0),
- T(0), cosX, sinX, T(0),
- T(0),-sinX, cosX, T(0),
- T(0), T(0), T(0), T(1));
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleY
- (
- T const & angleY
- )
- {
- T cosY = glm::cos(angleY);
- T sinY = glm::sin(angleY);
-
- return tmat4x4<T, defaultp>(
- cosY, T(0), -sinY, T(0),
- T(0), T(1), T(0), T(0),
- sinY, T(0), cosY, T(0),
- T(0), T(0), T(0), T(1));
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleZ
- (
- T const & angleZ
- )
- {
- T cosZ = glm::cos(angleZ);
- T sinZ = glm::sin(angleZ);
-
- return tmat4x4<T, defaultp>(
- cosZ, sinZ, T(0), T(0),
- -sinZ, cosZ, T(0), T(0),
- T(0), T(0), T(1), T(0),
- T(0), T(0), T(0), T(1));
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleXY
- (
- T const & angleX,
- T const & angleY
- )
- {
- T cosX = glm::cos(angleX);
- T sinX = glm::sin(angleX);
- T cosY = glm::cos(angleY);
- T sinY = glm::sin(angleY);
-
- return tmat4x4<T, defaultp>(
- cosY, -sinX * -sinY, cosX * -sinY, T(0),
- T(0), cosX, sinX, T(0),
- sinY, -sinX * cosY, cosX * cosY, T(0),
- T(0), T(0), T(0), T(1));
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleYX
- (
- T const & angleY,
- T const & angleX
- )
- {
- T cosX = glm::cos(angleX);
- T sinX = glm::sin(angleX);
- T cosY = glm::cos(angleY);
- T sinY = glm::sin(angleY);
-
- return tmat4x4<T, defaultp>(
- cosY, 0, -sinY, T(0),
- sinY * sinX, cosX, cosY * sinX, T(0),
- sinY * cosX, -sinX, cosY * cosX, T(0),
- T(0), T(0), T(0), T(1));
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleXZ
- (
- T const & angleX,
- T const & angleZ
- )
- {
- return eulerAngleX(angleX) * eulerAngleZ(angleZ);
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleZX
- (
- T const & angleZ,
- T const & angleX
- )
- {
- return eulerAngleZ(angleZ) * eulerAngleX(angleX);
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleYZ
- (
- T const & angleY,
- T const & angleZ
- )
- {
- return eulerAngleY(angleY) * eulerAngleZ(angleZ);
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleZY
- (
- T const & angleZ,
- T const & angleY
- )
- {
- return eulerAngleZ(angleZ) * eulerAngleY(angleY);
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleYXZ
- (
- T const & yaw,
- T const & pitch,
- T const & roll
- )
- {
- T tmp_ch = glm::cos(yaw);
- T tmp_sh = glm::sin(yaw);
- T tmp_cp = glm::cos(pitch);
- T tmp_sp = glm::sin(pitch);
- T tmp_cb = glm::cos(roll);
- T tmp_sb = glm::sin(roll);
-
- tmat4x4<T, defaultp> Result;
- Result[0][0] = tmp_ch * tmp_cb + tmp_sh * tmp_sp * tmp_sb;
- Result[0][1] = tmp_sb * tmp_cp;
- Result[0][2] = -tmp_sh * tmp_cb + tmp_ch * tmp_sp * tmp_sb;
- Result[0][3] = static_cast<T>(0);
- Result[1][0] = -tmp_ch * tmp_sb + tmp_sh * tmp_sp * tmp_cb;
- Result[1][1] = tmp_cb * tmp_cp;
- Result[1][2] = tmp_sb * tmp_sh + tmp_ch * tmp_sp * tmp_cb;
- Result[1][3] = static_cast<T>(0);
- Result[2][0] = tmp_sh * tmp_cp;
- Result[2][1] = -tmp_sp;
- Result[2][2] = tmp_ch * tmp_cp;
- Result[2][3] = static_cast<T>(0);
- Result[3][0] = static_cast<T>(0);
- Result[3][1] = static_cast<T>(0);
- Result[3][2] = static_cast<T>(0);
- Result[3][3] = static_cast<T>(1);
- return Result;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> yawPitchRoll
- (
- T const & yaw,
- T const & pitch,
- T const & roll
- )
- {
- T tmp_ch = glm::cos(yaw);
- T tmp_sh = glm::sin(yaw);
- T tmp_cp = glm::cos(pitch);
- T tmp_sp = glm::sin(pitch);
- T tmp_cb = glm::cos(roll);
- T tmp_sb = glm::sin(roll);
-
- tmat4x4<T, defaultp> Result;
- Result[0][0] = tmp_ch * tmp_cb + tmp_sh * tmp_sp * tmp_sb;
- Result[0][1] = tmp_sb * tmp_cp;
- Result[0][2] = -tmp_sh * tmp_cb + tmp_ch * tmp_sp * tmp_sb;
- Result[0][3] = static_cast<T>(0);
- Result[1][0] = -tmp_ch * tmp_sb + tmp_sh * tmp_sp * tmp_cb;
- Result[1][1] = tmp_cb * tmp_cp;
- Result[1][2] = tmp_sb * tmp_sh + tmp_ch * tmp_sp * tmp_cb;
- Result[1][3] = static_cast<T>(0);
- Result[2][0] = tmp_sh * tmp_cp;
- Result[2][1] = -tmp_sp;
- Result[2][2] = tmp_ch * tmp_cp;
- Result[2][3] = static_cast<T>(0);
- Result[3][0] = static_cast<T>(0);
- Result[3][1] = static_cast<T>(0);
- Result[3][2] = static_cast<T>(0);
- Result[3][3] = static_cast<T>(1);
- return Result;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tmat2x2<T, defaultp> orientate2
- (
- T const & angle
- )
- {
- T c = glm::cos(angle);
- T s = glm::sin(angle);
-
- tmat2x2<T, defaultp> Result;
- Result[0][0] = c;
- Result[0][1] = s;
- Result[1][0] = -s;
- Result[1][1] = c;
- return Result;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER tmat3x3<T, defaultp> orientate3
- (
- T const & angle
- )
- {
- T c = glm::cos(angle);
- T s = glm::sin(angle);
-
- tmat3x3<T, defaultp> Result;
- Result[0][0] = c;
- Result[0][1] = s;
- Result[0][2] = 0.0f;
- Result[1][0] = -s;
- Result[1][1] = c;
- Result[1][2] = 0.0f;
- Result[2][0] = 0.0f;
- Result[2][1] = 0.0f;
- Result[2][2] = 1.0f;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> orientate3
- (
- tvec3<T, P> const & angles
- )
- {
- return tmat3x3<T, P>(yawPitchRoll(angles.z, angles.x, angles.y));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> orientate4
- (
- tvec3<T, P> const & angles
- )
- {
- return yawPitchRoll(angles.z, angles.x, angles.y);
- }
-}//namespace glm
diff --git a/inc/glm/gtx/extend.hpp b/inc/glm/gtx/extend.hpp deleted file mode 100644 index f365a55..0000000 --- a/inc/glm/gtx/extend.hpp +++ /dev/null @@ -1,67 +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 gtx_extend
-/// @file glm/gtx/extend.hpp
-/// @date 2006-01-07 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_extend GLM_GTX_extend
-/// @ingroup gtx
-///
-/// @brief Extend a position from a source to a position at a defined length.
-///
-/// <glm/gtx/extend.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_extend extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_extend
- /// @{
-
- /// Extends of Length the Origin position using the (Source - Origin) direction.
- /// @see gtx_extend
- template <typename genType>
- GLM_FUNC_DECL genType extend(
- genType const & Origin,
- genType const & Source,
- typename genType::value_type const Length);
-
- /// @}
-}//namespace glm
-
-#include "extend.inl"
diff --git a/inc/glm/gtx/extend.inl b/inc/glm/gtx/extend.inl deleted file mode 100644 index e127212..0000000 --- a/inc/glm/gtx/extend.inl +++ /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 gtx_extend
-/// @file glm/gtx/extend.inl
-/// @date 2006-01-07 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename genType>
- GLM_FUNC_QUALIFIER genType extend
- (
- genType const & Origin,
- genType const & Source,
- genType const & Distance
- )
- {
- return Origin + (Source - Origin) * Distance;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> extend
- (
- tvec2<T, P> const & Origin,
- tvec2<T, P> const & Source,
- T const & Distance
- )
- {
- return Origin + (Source - Origin) * Distance;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> extend
- (
- tvec3<T, P> const & Origin,
- tvec3<T, P> const & Source,
- T const & Distance
- )
- {
- return Origin + (Source - Origin) * Distance;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> extend
- (
- tvec4<T, P> const & Origin,
- tvec4<T, P> const & Source,
- T const & Distance
- )
- {
- return Origin + (Source - Origin) * Distance;
- }
-}//namespace glm
diff --git a/inc/glm/gtx/extented_min_max.hpp b/inc/glm/gtx/extented_min_max.hpp deleted file mode 100644 index 0990ee8..0000000 --- a/inc/glm/gtx/extented_min_max.hpp +++ /dev/null @@ -1,162 +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 gtx_extented_min_max
-/// @file glm/gtx/extented_min_max.hpp
-/// @date 2007-03-14 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtx_half_float (dependence)
-///
-/// @defgroup gtx_extented_min_max GLM_GTX_extented_min_max
-/// @ingroup gtx
-///
-/// Min and max functions for 3 to 4 parameters.
-///
-/// <glm/gtx/extented_min_max.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_extented_min_max extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_extented_min_max
- /// @{
-
- /// Return the minimum component-wise values of 3 inputs
- /// @see gtx_extented_min_max
- template <typename T>
- GLM_FUNC_DECL T min(
- T const & x,
- T const & y,
- T const & z);
-
- /// Return the minimum component-wise values of 3 inputs
- /// @see gtx_extented_min_max
- template <typename T, template <typename> class C>
- GLM_FUNC_DECL C<T> min(
- C<T> const & x,
- typename C<T>::T const & y,
- typename C<T>::T const & z);
-
- /// Return the minimum component-wise values of 3 inputs
- /// @see gtx_extented_min_max
- template <typename T, template <typename> class C>
- GLM_FUNC_DECL C<T> min(
- C<T> const & x,
- C<T> const & y,
- C<T> const & z);
-
- /// Return the minimum component-wise values of 4 inputs
- /// @see gtx_extented_min_max
- template <typename T>
- GLM_FUNC_DECL T min(
- T const & x,
- T const & y,
- T const & z,
- T const & w);
-
- /// Return the minimum component-wise values of 4 inputs
- /// @see gtx_extented_min_max
- template <typename T, template <typename> class C>
- GLM_FUNC_DECL C<T> min(
- C<T> const & x,
- typename C<T>::T const & y,
- typename C<T>::T const & z,
- typename C<T>::T const & w);
-
- /// Return the minimum component-wise values of 4 inputs
- /// @see gtx_extented_min_max
- template <typename T, template <typename> class C>
- GLM_FUNC_DECL C<T> min(
- C<T> const & x,
- C<T> const & y,
- C<T> const & z,
- C<T> const & w);
-
- /// Return the maximum component-wise values of 3 inputs
- /// @see gtx_extented_min_max
- template <typename T>
- GLM_FUNC_DECL T max(
- T const & x,
- T const & y,
- T const & z);
-
- /// Return the maximum component-wise values of 3 inputs
- /// @see gtx_extented_min_max
- template <typename T, template <typename> class C>
- GLM_FUNC_DECL C<T> max(
- C<T> const & x,
- typename C<T>::T const & y,
- typename C<T>::T const & z);
-
- /// Return the maximum component-wise values of 3 inputs
- /// @see gtx_extented_min_max
- template <typename T, template <typename> class C>
- GLM_FUNC_DECL C<T> max(
- C<T> const & x,
- C<T> const & y,
- C<T> const & z);
-
- /// Return the maximum component-wise values of 4 inputs
- /// @see gtx_extented_min_max
- template <typename T>
- GLM_FUNC_DECL T max(
- T const & x,
- T const & y,
- T const & z,
- T const & w);
-
- /// Return the maximum component-wise values of 4 inputs
- /// @see gtx_extented_min_max
- template <typename T, template <typename> class C>
- GLM_FUNC_DECL C<T> max(
- C<T> const & x,
- typename C<T>::T const & y,
- typename C<T>::T const & z,
- typename C<T>::T const & w);
-
- /// Return the maximum component-wise values of 4 inputs
- /// @see gtx_extented_min_max
- template <typename T, template <typename> class C>
- GLM_FUNC_DECL C<T> max(
- C<T> const & x,
- C<T> const & y,
- C<T> const & z,
- C<T> const & w);
-
- /// @}
-}//namespace glm
-
-#include "extented_min_max.inl"
diff --git a/inc/glm/gtx/extented_min_max.inl b/inc/glm/gtx/extented_min_max.inl deleted file mode 100644 index 1781d4b..0000000 --- a/inc/glm/gtx/extented_min_max.inl +++ /dev/null @@ -1,169 +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 gtx_extented_min_max
-/// @file glm/gtx/extented_min_max.inl
-/// @date 2007-03-14 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T>
- GLM_FUNC_QUALIFIER T min(
- T const & x,
- T const & y,
- T const & z)
- {
- return glm::min(glm::min(x, y), z);
- }
-
- template <typename T, template <typename> class C>
- GLM_FUNC_QUALIFIER C<T> min
- (
- C<T> const & x,
- typename C<T>::T const & y,
- typename C<T>::T const & z
- )
- {
- return glm::min(glm::min(x, y), z);
- }
-
- template <typename T, template <typename> class C>
- GLM_FUNC_QUALIFIER C<T> min
- (
- C<T> const & x,
- C<T> const & y,
- C<T> const & z
- )
- {
- return glm::min(glm::min(x, y), z);
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER T min
- (
- T const & x,
- T const & y,
- T const & z,
- T const & w
- )
- {
- return glm::min(glm::min(x, y), glm::min(z, w));
- }
-
- template <typename T, template <typename> class C>
- GLM_FUNC_QUALIFIER C<T> min
- (
- C<T> const & x,
- typename C<T>::T const & y,
- typename C<T>::T const & z,
- typename C<T>::T const & w
- )
- {
- return glm::min(glm::min(x, y), glm::min(z, w));
- }
-
- template <typename T, template <typename> class C>
- GLM_FUNC_QUALIFIER C<T> min
- (
- C<T> const & x,
- C<T> const & y,
- C<T> const & z,
- C<T> const & w
- )
- {
- return glm::min(glm::min(x, y), glm::min(z, w));
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER T max(
- T const & x,
- T const & y,
- T const & z)
- {
- return glm::max(glm::max(x, y), z);
- }
-
- template <typename T, template <typename> class C>
- GLM_FUNC_QUALIFIER C<T> max
- (
- C<T> const & x,
- typename C<T>::T const & y,
- typename C<T>::T const & z
- )
- {
- return glm::max(glm::max(x, y), z);
- }
-
- template <typename T, template <typename> class C>
- GLM_FUNC_QUALIFIER C<T> max
- (
- C<T> const & x,
- C<T> const & y,
- C<T> const & z
- )
- {
- return glm::max(glm::max(x, y), z);
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER T max
- (
- T const & x,
- T const & y,
- T const & z,
- T const & w
- )
- {
- return glm::max(glm::max(x, y), glm::max(z, w));
- }
-
- template <typename T, template <typename> class C>
- GLM_FUNC_QUALIFIER C<T> max
- (
- C<T> const & x,
- typename C<T>::T const & y,
- typename C<T>::T const & z,
- typename C<T>::T const & w
- )
- {
- return glm::max(glm::max(x, y), glm::max(z, w));
- }
-
- template <typename T, template <typename> class C>
- GLM_FUNC_QUALIFIER C<T> max
- (
- C<T> const & x,
- C<T> const & y,
- C<T> const & z,
- C<T> const & w
- )
- {
- return glm::max(glm::max(x, y), glm::max(z, w));
- }
-
-}//namespace glm
diff --git a/inc/glm/gtx/fast_exponential.hpp b/inc/glm/gtx/fast_exponential.hpp deleted file mode 100644 index e3db9c5..0000000 --- a/inc/glm/gtx/fast_exponential.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 gtx_fast_exponential
-/// @file glm/gtx/fast_exponential.hpp
-/// @date 2006-01-09 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtx_half_float (dependence)
-///
-/// @defgroup gtx_fast_exponential GLM_GTX_fast_exponential
-/// @ingroup gtx
-///
-/// @brief Fast but less accurate implementations of exponential based functions.
-///
-/// <glm/gtx/fast_exponential.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_fast_exponential extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_fast_exponential
- /// @{
-
- /// Faster than the common pow function but less accurate.
- /// @see gtx_fast_exponential
- template <typename genType>
- GLM_FUNC_DECL genType fastPow(genType x, genType y);
-
- /// Faster than the common pow function but less accurate.
- /// @see gtx_fast_exponential
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> fastPow(vecType<T, P> const & x, vecType<T, P> const & y);
-
- /// Faster than the common pow function but less accurate.
- /// @see gtx_fast_exponential
- template <typename genTypeT, typename genTypeU>
- GLM_FUNC_DECL genTypeT fastPow(genTypeT x, genTypeU y);
-
- /// Faster than the common pow function but less accurate.
- /// @see gtx_fast_exponential
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> fastPow(vecType<T, P> const & x);
-
- /// Faster than the common exp function but less accurate.
- /// @see gtx_fast_exponential
- template <typename T>
- GLM_FUNC_DECL T fastExp(T x);
-
- /// Faster than the common exp function but less accurate.
- /// @see gtx_fast_exponential
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> fastExp(vecType<T, P> const & x);
-
- /// Faster than the common log function but less accurate.
- /// @see gtx_fast_exponential
- template <typename T>
- GLM_FUNC_DECL T fastLog(T x);
-
- /// Faster than the common exp2 function but less accurate.
- /// @see gtx_fast_exponential
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> fastLog(vecType<T, P> const & x);
-
- /// Faster than the common exp2 function but less accurate.
- /// @see gtx_fast_exponential
- template <typename T>
- GLM_FUNC_DECL T fastExp2(T x);
-
- /// Faster than the common exp2 function but less accurate.
- /// @see gtx_fast_exponential
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> fastExp2(vecType<T, P> const & x);
-
- /// Faster than the common log2 function but less accurate.
- /// @see gtx_fast_exponential
- template <typename T>
- GLM_FUNC_DECL T fastLog2(T x);
-
- /// Faster than the common log2 function but less accurate.
- /// @see gtx_fast_exponential
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> fastLog2(vecType<T, P> const & x);
-
- /// @}
-}//namespace glm
-
-#include "fast_exponential.inl"
diff --git a/inc/glm/gtx/fast_exponential.inl b/inc/glm/gtx/fast_exponential.inl deleted file mode 100644 index 54e1d00..0000000 --- a/inc/glm/gtx/fast_exponential.inl +++ /dev/null @@ -1,166 +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 gtx_fast_exponential
-/// @file glm/gtx/fast_exponential.inl
-/// @date 2006-01-09 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- // fastPow:
- template <typename genType>
- GLM_FUNC_QUALIFIER genType fastPow(genType x, genType y)
- {
- return exp(y * log(x));
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> fastPow(vecType<T, P> const & x, vecType<T, P> const & y)
- {
- return exp(y * log(x));
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER T fastPow(T x, int y)
- {
- T f = static_cast<T>(1);
- for(int i = 0; i < y; ++i)
- f *= x;
- return f;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> fastPow(vecType<T, P> const & x, vecType<int, P> const & y)
- {
- vecType<T, P> Result(uninitialize);
- for(detail::component_count_t i = 0; i < detail::component_count(x); ++i)
- Result[i] = fastPow(x[i], y[i]);
- return Result;
- }
-
- // fastExp
- // Note: This function provides accurate results only for value between -1 and 1, else avoid it.
- template <typename T>
- GLM_FUNC_QUALIFIER T fastExp(T x)
- {
- // This has a better looking and same performance in release mode than the following code. However, in debug mode it's slower.
- // return 1.0f + x * (1.0f + x * 0.5f * (1.0f + x * 0.3333333333f * (1.0f + x * 0.25 * (1.0f + x * 0.2f))));
- T x2 = x * x;
- T x3 = x2 * x;
- T x4 = x3 * x;
- T x5 = x4 * x;
- return T(1) + x + (x2 * T(0.5)) + (x3 * T(0.1666666667)) + (x4 * T(0.041666667)) + (x5 * T(0.008333333333));
- }
- /* // Try to handle all values of float... but often shower than std::exp, glm::floor and the loop kill the performance
- GLM_FUNC_QUALIFIER float fastExp(float x)
- {
- const float e = 2.718281828f;
- const float IntegerPart = floor(x);
- const float FloatPart = x - IntegerPart;
- float z = 1.f;
-
- for(int i = 0; i < int(IntegerPart); ++i)
- z *= e;
-
- const float x2 = FloatPart * FloatPart;
- const float x3 = x2 * FloatPart;
- const float x4 = x3 * FloatPart;
- const float x5 = x4 * FloatPart;
- return z * (1.0f + FloatPart + (x2 * 0.5f) + (x3 * 0.1666666667f) + (x4 * 0.041666667f) + (x5 * 0.008333333333f));
- }
-
- // Increase accuracy on number bigger that 1 and smaller than -1 but it's not enough for high and negative numbers
- GLM_FUNC_QUALIFIER float fastExp(float x)
- {
- // This has a better looking and same performance in release mode than the following code. However, in debug mode it's slower.
- // return 1.0f + x * (1.0f + x * 0.5f * (1.0f + x * 0.3333333333f * (1.0f + x * 0.25 * (1.0f + x * 0.2f))));
- float x2 = x * x;
- float x3 = x2 * x;
- float x4 = x3 * x;
- float x5 = x4 * x;
- float x6 = x5 * x;
- float x7 = x6 * x;
- float x8 = x7 * x;
- return 1.0f + x + (x2 * 0.5f) + (x3 * 0.1666666667f) + (x4 * 0.041666667f) + (x5 * 0.008333333333f)+ (x6 * 0.00138888888888f) + (x7 * 0.000198412698f) + (x8 * 0.0000248015873f);;
- }
- */
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> fastExp(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(fastExp, x);
- }
-
- // fastLog
- template <typename genType>
- GLM_FUNC_QUALIFIER genType fastLog(genType x)
- {
- return std::log(x);
- }
-
- /* Slower than the VC7.1 function...
- GLM_FUNC_QUALIFIER float fastLog(float x)
- {
- float y1 = (x - 1.0f) / (x + 1.0f);
- float y2 = y1 * y1;
- return 2.0f * y1 * (1.0f + y2 * (0.3333333333f + y2 * (0.2f + y2 * 0.1428571429f)));
- }
- */
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> fastLog(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(fastLog, x);
- }
-
- //fastExp2, ln2 = 0.69314718055994530941723212145818f
- template <typename genType>
- GLM_FUNC_QUALIFIER genType fastExp2(genType x)
- {
- return fastExp(0.69314718055994530941723212145818f * x);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> fastExp2(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(fastExp2, x);
- }
-
- // fastLog2, ln2 = 0.69314718055994530941723212145818f
- template <typename genType>
- GLM_FUNC_QUALIFIER genType fastLog2(genType x)
- {
- return fastLog(x) / 0.69314718055994530941723212145818f;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> fastLog2(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(fastLog2, x);
- }
-}//namespace glm
diff --git a/inc/glm/gtx/fast_square_root.hpp b/inc/glm/gtx/fast_square_root.hpp deleted file mode 100644 index 269f07d..0000000 --- a/inc/glm/gtx/fast_square_root.hpp +++ /dev/null @@ -1,117 +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 gtx_fast_square_root
-/// @file glm/gtx/fast_square_root.hpp
-/// @date 2006-01-04 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_fast_square_root GLM_GTX_fast_square_root
-/// @ingroup gtx
-///
-/// @brief Fast but less accurate implementations of square root based functions.
-/// - Sqrt optimisation based on Newton's method,
-/// www.gamedev.net/community/forums/topic.asp?topic id=139956
-///
-/// <glm/gtx/fast_square_root.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../common.hpp"
-#include "../exponential.hpp"
-#include "../geometric.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_fast_square_root extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_fast_square_root
- /// @{
-
- /// Faster than the common sqrt function but less accurate.
- ///
- /// @see gtx_fast_square_root extension.
- template <typename genType>
- GLM_FUNC_DECL genType fastSqrt(genType x);
-
- /// Faster than the common sqrt function but less accurate.
- ///
- /// @see gtx_fast_square_root extension.
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> fastSqrt(vecType<T, P> const & x);
-
- /// Faster than the common inversesqrt function but less accurate.
- ///
- /// @see gtx_fast_square_root extension.
- template <typename genType>
- GLM_FUNC_DECL genType fastInverseSqrt(genType x);
-
- /// Faster than the common inversesqrt function but less accurate.
- ///
- /// @see gtx_fast_square_root extension.
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> fastInverseSqrt(vecType<T, P> const & x);
-
- /// Faster than the common length function but less accurate.
- ///
- /// @see gtx_fast_square_root extension.
- template <typename genType>
- GLM_FUNC_DECL genType fastLength(genType x);
-
- /// Faster than the common length function but less accurate.
- ///
- /// @see gtx_fast_square_root extension.
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL T fastLength(vecType<T, P> const & x);
-
- /// Faster than the common distance function but less accurate.
- ///
- /// @see gtx_fast_square_root extension.
- template <typename genType>
- GLM_FUNC_DECL genType fastDistance(genType x, genType y);
-
- /// Faster than the common distance function but less accurate.
- ///
- /// @see gtx_fast_square_root extension.
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL T fastDistance(vecType<T, P> const & x, vecType<T, P> const & y);
-
- /// Faster than the common normalize function but less accurate.
- ///
- /// @see gtx_fast_square_root extension.
- template <typename genType>
- GLM_FUNC_DECL genType fastNormalize(genType const & x);
-
- /// @}
-}// namespace glm
-
-#include "fast_square_root.inl"
diff --git a/inc/glm/gtx/fast_square_root.inl b/inc/glm/gtx/fast_square_root.inl deleted file mode 100644 index e99ca70..0000000 --- a/inc/glm/gtx/fast_square_root.inl +++ /dev/null @@ -1,110 +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 gtx_fast_square_root
-/// @file glm/gtx/fast_square_root.inl
-/// @date 2006-01-04 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- // fastSqrt
- template <typename genType>
- GLM_FUNC_QUALIFIER genType fastSqrt(genType x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'fastSqrt' only accept floating-point input");
-
- return genType(1) / fastInverseSqrt(x);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> fastSqrt(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(fastSqrt, x);
- }
-
- // fastInversesqrt
- template <typename genType>
- GLM_FUNC_QUALIFIER genType fastInverseSqrt(genType x)
- {
-# ifdef __CUDACC__ // Wordaround for a CUDA compiler bug up to CUDA6
- tvec1<T, P> tmp(detail::compute_inversesqrt<tvec1, genType, lowp>::call(tvec1<genType, lowp>(x)));
- return tmp.x;
-# else
- return detail::compute_inversesqrt<tvec1, genType, lowp>::call(tvec1<genType, lowp>(x)).x;
-# endif
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> fastInverseSqrt(vecType<T, P> const & x)
- {
- return detail::compute_inversesqrt<vecType, T, P>::call(x);
- }
-
- // fastLength
- template <typename genType>
- GLM_FUNC_QUALIFIER genType fastLength(genType x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'fastLength' only accept floating-point inputs");
-
- return abs(x);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER T fastLength(vecType<T, P> const & x)
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'fastLength' only accept floating-point inputs");
-
- return fastSqrt(dot(x, x));
- }
-
- // fastDistance
- template <typename genType>
- GLM_FUNC_QUALIFIER genType fastDistance(genType x, genType y)
- {
- return fastLength(y - x);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER T fastDistance(vecType<T, P> const & x, vecType<T, P> const & y)
- {
- return fastLength(y - x);
- }
-
- // fastNormalize
- template <typename genType>
- GLM_FUNC_QUALIFIER genType fastNormalize(genType x)
- {
- return x > genType(0) ? genType(1) : -genType(1);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> fastNormalize(vecType<T, P> const & x)
- {
- return x * fastInverseSqrt(dot(x, x));
- }
-}//namespace glm
diff --git a/inc/glm/gtx/fast_trigonometry.hpp b/inc/glm/gtx/fast_trigonometry.hpp deleted file mode 100644 index a1ce207..0000000 --- a/inc/glm/gtx/fast_trigonometry.hpp +++ /dev/null @@ -1,104 +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 gtx_fast_trigonometry
-/// @file glm/gtx/fast_trigonometry.hpp
-/// @date 2006-01-08 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_fast_trigonometry GLM_GTX_fast_trigonometry
-/// @ingroup gtx
-///
-/// @brief Fast but less accurate implementations of trigonometric functions.
-///
-/// <glm/gtx/fast_trigonometry.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../gtc/constants.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_fast_trigonometry extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_fast_trigonometry
- /// @{
-
- /// Wrap an angle to [0 2pi[
- /// From GLM_GTX_fast_trigonometry extension.
- template <typename T>
- GLM_FUNC_DECL T wrapAngle(T angle);
-
- /// Faster than the common sin function but less accurate.
- /// From GLM_GTX_fast_trigonometry extension.
- template <typename T>
- GLM_FUNC_DECL T fastSin(T angle);
-
- /// Faster than the common cos function but less accurate.
- /// From GLM_GTX_fast_trigonometry extension.
- template <typename T>
- GLM_FUNC_DECL T fastCos(T angle);
-
- /// Faster than the common tan function but less accurate.
- /// Defined between -2pi and 2pi.
- /// From GLM_GTX_fast_trigonometry extension.
- template <typename T>
- GLM_FUNC_DECL T fastTan(T angle);
-
- /// Faster than the common asin function but less accurate.
- /// Defined between -2pi and 2pi.
- /// From GLM_GTX_fast_trigonometry extension.
- template <typename T>
- GLM_FUNC_DECL T fastAsin(T angle);
-
- /// Faster than the common acos function but less accurate.
- /// Defined between -2pi and 2pi.
- /// From GLM_GTX_fast_trigonometry extension.
- template <typename T>
- GLM_FUNC_DECL T fastAcos(T angle);
-
- /// Faster than the common atan function but less accurate.
- /// Defined between -2pi and 2pi.
- /// From GLM_GTX_fast_trigonometry extension.
- template <typename T>
- GLM_FUNC_DECL T fastAtan(T y, T x);
-
- /// Faster than the common atan function but less accurate.
- /// Defined between -2pi and 2pi.
- /// From GLM_GTX_fast_trigonometry extension.
- template <typename T>
- GLM_FUNC_DECL T fastAtan(T angle);
-
- /// @}
-}//namespace glm
-
-#include "fast_trigonometry.inl"
diff --git a/inc/glm/gtx/fast_trigonometry.inl b/inc/glm/gtx/fast_trigonometry.inl deleted file mode 100644 index 83827b9..0000000 --- a/inc/glm/gtx/fast_trigonometry.inl +++ /dev/null @@ -1,162 +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 gtx_fast_trigonometry
-/// @file glm/gtx/fast_trigonometry.inl
-/// @date 2006-01-08 / 2014-11-25
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace glm{
-namespace detail
-{
- template <typename T>
- GLM_FUNC_QUALIFIER T cos_52s(T x)
- {
- T const xx(x * x);
- return (T(0.9999932946) + xx * (T(-0.4999124376) + xx * (T(0.0414877472) + xx * T(-0.0012712095))));
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> cos_52s(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(cos_52s, x);
- }
-}//namespace detail
-
- // wrapAngle
- template <typename T>
- GLM_FUNC_QUALIFIER T wrapAngle(T angle)
- {
- return abs<T>(mod<T>(angle, two_pi<T>()));
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> wrapAngle(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(wrapAngle, x);
- }
-
- // cos
- template <typename T>
- GLM_FUNC_QUALIFIER T fastCos(T x)
- {
- T const angle(wrapAngle<T>(x));
-
- if(angle<half_pi<T>())
- return detail::cos_52s(angle);
- if(angle<pi<T>())
- return -detail::cos_52s(pi<T>() - angle);
- if(angle<(T(3) * half_pi<T>()))
- return -detail::cos_52s(angle - pi<T>());
-
- return detail::cos_52s(two_pi<T>() - angle);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> fastCos(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(fastCos, x);
- }
-
- // sin
- template <typename T>
- GLM_FUNC_QUALIFIER T fastSin(T x)
- {
- return fastCos<T>(half_pi<T>() - x);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> fastSin(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(fastSin, x);
- }
-
- // tan
- template <typename T>
- GLM_FUNC_QUALIFIER T fastTan(T x)
- {
- return x + (x * x * x * T(0.3333333333)) + (x * x * x * x * x * T(0.1333333333333)) + (x * x * x * x * x * x * x * T(0.0539682539));
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> fastTan(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(fastTan, x);
- }
-
- // asin
- template <typename T>
- GLM_FUNC_QUALIFIER T fastAsin(T x)
- {
- return x + (x * x * x * T(0.166666667)) + (x * x * x * x * x * T(0.075)) + (x * x * x * x * x * x * x * T(0.0446428571)) + (x * x * x * x * x * x * x * x * x * T(0.0303819444));// + (x * x * x * x * x * x * x * x * x * x * x * T(0.022372159));
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> fastAsin(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(fastAsin, x);
- }
-
- // acos
- template <typename T>
- GLM_FUNC_QUALIFIER T fastAcos(T x)
- {
- return T(1.5707963267948966192313216916398) - fastAsin(x); //(PI / 2)
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> fastAcos(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(fastAcos, x);
- }
-
- // atan
- template <typename T>
- GLM_FUNC_QUALIFIER T fastAtan(T y, T x)
- {
- T sgn = sign(y) * sign(x);
- return abs(fastAtan(y / x)) * sgn;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> fastAtan(vecType<T, P> const & y, vecType<T, P> const & x)
- {
- return detail::functor2<T, P, vecType>::call(fastAtan, y, x);
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER T fastAtan(T x)
- {
- return x - (x * x * x * T(0.333333333333)) + (x * x * x * x * x * T(0.2)) - (x * x * x * x * x * x * x * T(0.1428571429)) + (x * x * x * x * x * x * x * x * x * T(0.111111111111)) - (x * x * x * x * x * x * x * x * x * x * x * T(0.0909090909));
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> fastAtan(vecType<T, P> const & x)
- {
- return detail::functor1<T, T, P, vecType>::call(fastAtan, x);
- }
-}//namespace glm
diff --git a/inc/glm/gtx/gradient_paint.hpp b/inc/glm/gtx/gradient_paint.hpp deleted file mode 100644 index 28da113..0000000 --- a/inc/glm/gtx/gradient_paint.hpp +++ /dev/null @@ -1,77 +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 gtx_gradient_paint
-/// @file glm/gtx/gradient_paint.hpp
-/// @date 2009-03-06 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtx_optimum_pow (dependence)
-///
-/// @defgroup gtx_gradient_paint GLM_GTX_gradient_paint
-/// @ingroup gtx
-///
-/// @brief Functions that return the color of procedural gradient for specific coordinates.
-/// <glm/gtx/gradient_paint.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../gtx/optimum_pow.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_gradient_paint extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_gradient_paint
- /// @{
-
- /// Return a color from a radial gradient.
- /// @see - gtx_gradient_paint
- template <typename T, precision P>
- GLM_FUNC_DECL T radialGradient(
- tvec2<T, P> const & Center,
- T const & Radius,
- tvec2<T, P> const & Focal,
- tvec2<T, P> const & Position);
-
- /// Return a color from a linear gradient.
- /// @see - gtx_gradient_paint
- template <typename T, precision P>
- GLM_FUNC_DECL T linearGradient(
- tvec2<T, P> const & Point0,
- tvec2<T, P> const & Point1,
- tvec2<T, P> const & Position);
-
- /// @}
-}// namespace glm
-
-#include "gradient_paint.inl"
diff --git a/inc/glm/gtx/gradient_paint.inl b/inc/glm/gtx/gradient_paint.inl deleted file mode 100644 index 6c79029..0000000 --- a/inc/glm/gtx/gradient_paint.inl +++ /dev/null @@ -1,66 +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 gtx_gradient_paint
-/// @file glm/gtx/gradient_paint.inl
-/// @date 2009-03-06 / 2013-04-09
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T radialGradient
- (
- tvec2<T, P> const & Center,
- T const & Radius,
- tvec2<T, P> const & Focal,
- tvec2<T, P> const & Position
- )
- {
- tvec2<T, P> F = Focal - Center;
- tvec2<T, P> D = Position - Focal;
- T Radius2 = pow2(Radius);
- T Fx2 = pow2(F.x);
- T Fy2 = pow2(F.y);
-
- T Numerator = (D.x * F.x + D.y * F.y) + sqrt(Radius2 * (pow2(D.x) + pow2(D.y)) - pow2(D.x * F.y - D.y * F.x));
- T Denominator = Radius2 - (Fx2 + Fy2);
- return Numerator / Denominator;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T linearGradient
- (
- tvec2<T, P> const & Point0,
- tvec2<T, P> const & Point1,
- tvec2<T, P> const & Position
- )
- {
- tvec2<T, P> Dist = Point1 - Point0;
- return (Dist.x * (Position.x - Point0.x) + Dist.y * (Position.y - Point0.y)) / glm::dot(Dist, Dist);
- }
-}//namespace glm
diff --git a/inc/glm/gtx/handed_coordinate_space.hpp b/inc/glm/gtx/handed_coordinate_space.hpp deleted file mode 100644 index c71f81e..0000000 --- a/inc/glm/gtx/handed_coordinate_space.hpp +++ /dev/null @@ -1,75 +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 gtx_handed_coordinate_space
-/// @file glm/gtx/handed_coordinate_space.hpp
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_handed_coordinate_space GLM_GTX_handed_coordinate_space
-/// @ingroup gtx
-///
-/// @brief To know if a set of three basis vectors defines a right or left-handed coordinate system.
-///
-/// <glm/gtx/handed_coordinate_system.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_handed_coordinate_space extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_handed_coordinate_space
- /// @{
-
- //! Return if a trihedron right handed or not.
- //! From GLM_GTX_handed_coordinate_space extension.
- template <typename T, precision P>
- GLM_FUNC_DECL bool rightHanded(
- tvec3<T, P> const & tangent,
- tvec3<T, P> const & binormal,
- tvec3<T, P> const & normal);
-
- //! Return if a trihedron left handed or not.
- //! From GLM_GTX_handed_coordinate_space extension.
- template <typename T, precision P>
- GLM_FUNC_DECL bool leftHanded(
- tvec3<T, P> const & tangent,
- tvec3<T, P> const & binormal,
- tvec3<T, P> const & normal);
-
- /// @}
-}// namespace glm
-
-#include "handed_coordinate_space.inl"
diff --git a/inc/glm/gtx/handed_coordinate_space.inl b/inc/glm/gtx/handed_coordinate_space.inl deleted file mode 100644 index f634f8d..0000000 --- a/inc/glm/gtx/handed_coordinate_space.inl +++ /dev/null @@ -1,56 +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 gtx_handed_coordinate_space
-/// @file glm/gtx/handed_coordinate_space.inl
-/// @date 2005-12-21 / 2009-02-19
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool rightHanded
- (
- tvec3<T, P> const & tangent,
- tvec3<T, P> const & binormal,
- tvec3<T, P> const & normal
- )
- {
- return dot(cross(normal, tangent), binormal) > T(0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool leftHanded
- (
- tvec3<T, P> const & tangent,
- tvec3<T, P> const & binormal,
- tvec3<T, P> const & normal
- )
- {
- return dot(cross(normal, tangent), binormal) < T(0);
- }
-}//namespace glm
diff --git a/inc/glm/gtx/integer.hpp b/inc/glm/gtx/integer.hpp deleted file mode 100644 index 927fda8..0000000 --- a/inc/glm/gtx/integer.hpp +++ /dev/null @@ -1,101 +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 gtx_integer
-/// @file glm/gtx/integer.hpp
-/// @date 2005-12-24 / 2011-10-13
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_integer GLM_GTX_integer
-/// @ingroup gtx
-///
-/// @brief Add support for integer for core functions
-///
-/// <glm/gtx/integer.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../gtc/integer.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_integer extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_integer
- /// @{
-
- //! Returns x raised to the y power.
- //! From GLM_GTX_integer extension.
- GLM_FUNC_DECL int pow(int x, int y);
-
- //! Returns the positive square root of x.
- //! From GLM_GTX_integer extension.
- GLM_FUNC_DECL int sqrt(int x);
-
- //! Returns the floor log2 of x.
- //! From GLM_GTX_integer extension.
- GLM_FUNC_DECL unsigned int floor_log2(unsigned int x);
-
- //! Modulus. Returns x - y * floor(x / y) for each component in x using the floating point value y.
- //! From GLM_GTX_integer extension.
- GLM_FUNC_DECL int mod(int x, int y);
-
- //! Return the factorial value of a number (!12 max, integer only)
- //! From GLM_GTX_integer extension.
- template <typename genType>
- GLM_FUNC_DECL genType factorial(genType const & x);
-
- //! 32bit signed integer.
- //! From GLM_GTX_integer extension.
- typedef signed int sint;
-
- //! Returns x raised to the y power.
- //! From GLM_GTX_integer extension.
- GLM_FUNC_DECL uint pow(uint x, uint y);
-
- //! Returns the positive square root of x.
- //! From GLM_GTX_integer extension.
- GLM_FUNC_DECL uint sqrt(uint x);
-
- //! Modulus. Returns x - y * floor(x / y) for each component in x using the floating point value y.
- //! From GLM_GTX_integer extension.
- GLM_FUNC_DECL uint mod(uint x, uint y);
-
- //! Returns the number of leading zeros.
- //! From GLM_GTX_integer extension.
- GLM_FUNC_DECL uint nlz(uint x);
-
- /// @}
-}//namespace glm
-
-#include "integer.inl"
diff --git a/inc/glm/gtx/integer.inl b/inc/glm/gtx/integer.inl deleted file mode 100644 index 55d8f1a..0000000 --- a/inc/glm/gtx/integer.inl +++ /dev/null @@ -1,211 +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 gtx_integer
-/// @file glm/gtx/integer.inl
-/// @date 2005-12-24 / 2011-10-13
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- // pow
- GLM_FUNC_QUALIFIER int pow(int x, int y)
- {
- if(y == 0)
- return 1;
- int result = x;
- for(int i = 1; i < y; ++i)
- result *= x;
- return result;
- }
-
- // sqrt: From Christopher J. Musial, An integer square root, Graphics Gems, 1990, page 387
- GLM_FUNC_QUALIFIER int sqrt(int x)
- {
- if(x <= 1) return x;
-
- int NextTrial = x >> 1;
- int CurrentAnswer;
-
- do
- {
- CurrentAnswer = NextTrial;
- NextTrial = (NextTrial + x / NextTrial) >> 1;
- } while(NextTrial < CurrentAnswer);
-
- return CurrentAnswer;
- }
-
-// Henry Gordon Dietz: http://aggregate.org/MAGIC/
-namespace detail
-{
- GLM_FUNC_QUALIFIER unsigned int ones32(unsigned int x)
- {
- /* 32-bit recursive reduction using SWAR...
- but first step is mapping 2-bit values
- into sum of 2 1-bit values in sneaky way
- */
- x -= ((x >> 1) & 0x55555555);
- x = (((x >> 2) & 0x33333333) + (x & 0x33333333));
- x = (((x >> 4) + x) & 0x0f0f0f0f);
- x += (x >> 8);
- x += (x >> 16);
- return(x & 0x0000003f);
- }
-}//namespace detail
-
- // Henry Gordon Dietz: http://aggregate.org/MAGIC/
-/*
- GLM_FUNC_QUALIFIER unsigned int floor_log2(unsigned int x)
- {
- x |= (x >> 1);
- x |= (x >> 2);
- x |= (x >> 4);
- x |= (x >> 8);
- x |= (x >> 16);
-
- return _detail::ones32(x) >> 1;
- }
-*/
- // mod
- GLM_FUNC_QUALIFIER int mod(int x, int y)
- {
- return x - y * (x / y);
- }
-
- // factorial (!12 max, integer only)
- template <typename genType>
- GLM_FUNC_QUALIFIER genType factorial(genType const & x)
- {
- genType Temp = x;
- genType Result;
- for(Result = 1; Temp > 1; --Temp)
- Result *= Temp;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> factorial(
- tvec2<T, P> const & x)
- {
- return tvec2<T, P>(
- factorial(x.x),
- factorial(x.y));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> factorial(
- tvec3<T, P> const & x)
- {
- return tvec3<T, P>(
- factorial(x.x),
- factorial(x.y),
- factorial(x.z));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> factorial(
- tvec4<T, P> const & x)
- {
- return tvec4<T, P>(
- factorial(x.x),
- factorial(x.y),
- factorial(x.z),
- factorial(x.w));
- }
-
- GLM_FUNC_QUALIFIER uint pow(uint x, uint y)
- {
- uint result = x;
- for(uint i = 1; i < y; ++i)
- result *= x;
- return result;
- }
-
- GLM_FUNC_QUALIFIER uint sqrt(uint x)
- {
- if(x <= 1) return x;
-
- uint NextTrial = x >> 1;
- uint CurrentAnswer;
-
- do
- {
- CurrentAnswer = NextTrial;
- NextTrial = (NextTrial + x / NextTrial) >> 1;
- } while(NextTrial < CurrentAnswer);
-
- return CurrentAnswer;
- }
-
- GLM_FUNC_QUALIFIER uint mod(uint x, uint y)
- {
- return x - y * (x / y);
- }
-
-#if(GLM_COMPILER & (GLM_COMPILER_VC | GLM_COMPILER_GCC))
-
- GLM_FUNC_QUALIFIER unsigned int nlz(unsigned int x)
- {
- return 31u - findMSB(x);
- }
-
-#else
-
- // Hackers Delight: http://www.hackersdelight.org/HDcode/nlz.c.txt
- GLM_FUNC_QUALIFIER unsigned int nlz(unsigned int x)
- {
- int y, m, n;
-
- y = -int(x >> 16); // If left half of x is 0,
- m = (y >> 16) & 16; // set n = 16. If left half
- n = 16 - m; // is nonzero, set n = 0 and
- x = x >> m; // shift x right 16.
- // Now x is of the form 0000xxxx.
- y = x - 0x100; // If positions 8-15 are 0,
- m = (y >> 16) & 8; // add 8 to n and shift x left 8.
- n = n + m;
- x = x << m;
-
- y = x - 0x1000; // If positions 12-15 are 0,
- m = (y >> 16) & 4; // add 4 to n and shift x left 4.
- n = n + m;
- x = x << m;
-
- y = x - 0x4000; // If positions 14-15 are 0,
- m = (y >> 16) & 2; // add 2 to n and shift x left 2.
- n = n + m;
- x = x << m;
-
- y = x >> 14; // Set y = 0, 1, 2, or 3.
- m = y & ~(y >> 1); // Set m = 0, 1, 2, or 2 resp.
- return unsigned(n + 2 - m);
- }
-
-#endif//(GLM_COMPILER)
-
-}//namespace glm
diff --git a/inc/glm/gtx/intersect.hpp b/inc/glm/gtx/intersect.hpp deleted file mode 100644 index 7f12b39..0000000 --- a/inc/glm/gtx/intersect.hpp +++ /dev/null @@ -1,112 +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 gtx_intersect
-/// @file glm/gtx/intersect.hpp
-/// @date 2007-04-03 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtx_closest_point (dependence)
-///
-/// @defgroup gtx_intersect GLM_GTX_intersect
-/// @ingroup gtx
-///
-/// @brief Add intersection functions
-///
-/// <glm/gtx/intersect.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../gtx/closest_point.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_closest_point extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_intersect
- /// @{
-
- //! Compute the intersection of a ray and a triangle.
- //! Ray direction and plane normal must be unit length.
- //! From GLM_GTX_intersect extension.
- template <typename genType>
- GLM_FUNC_DECL bool intersectRayPlane(
- genType const & orig, genType const & dir,
- genType const & planeOrig, genType const & planeNormal,
- typename genType::value_type & intersectionDistance);
-
- //! Compute the intersection of a ray and a triangle.
- //! From GLM_GTX_intersect extension.
- template <typename genType>
- GLM_FUNC_DECL bool intersectRayTriangle(
- genType const & orig, genType const & dir,
- genType const & vert0, genType const & vert1, genType const & vert2,
- genType & baryPosition);
-
- //! Compute the intersection of a line and a triangle.
- //! From GLM_GTX_intersect extension.
- template <typename genType>
- GLM_FUNC_DECL bool intersectLineTriangle(
- genType const & orig, genType const & dir,
- genType const & vert0, genType const & vert1, genType const & vert2,
- genType & position);
-
- //! Compute the intersection distance of a ray and a sphere.
- //! The ray direction vector is unit length.
- //! From GLM_GTX_intersect extension.
- template <typename genType>
- GLM_FUNC_DECL bool intersectRaySphere(
- genType const & rayStarting, genType const & rayNormalizedDirection,
- genType const & sphereCenter, typename genType::value_type const sphereRadiusSquered,
- typename genType::value_type & intersectionDistance);
-
- //! Compute the intersection of a ray and a sphere.
- //! From GLM_GTX_intersect extension.
- template <typename genType>
- GLM_FUNC_DECL bool intersectRaySphere(
- genType const & rayStarting, genType const & rayNormalizedDirection,
- genType const & sphereCenter, const typename genType::value_type sphereRadius,
- genType & intersectionPosition, genType & intersectionNormal);
-
- //! Compute the intersection of a line and a sphere.
- //! From GLM_GTX_intersect extension
- template <typename genType>
- GLM_FUNC_DECL bool intersectLineSphere(
- genType const & point0, genType const & point1,
- genType const & sphereCenter, typename genType::value_type sphereRadius,
- genType & intersectionPosition1, genType & intersectionNormal1,
- genType & intersectionPosition2 = genType(), genType & intersectionNormal2 = genType());
-
- /// @}
-}//namespace glm
-
-#include "intersect.inl"
diff --git a/inc/glm/gtx/intersect.inl b/inc/glm/gtx/intersect.inl deleted file mode 100644 index 60ddd30..0000000 --- a/inc/glm/gtx/intersect.inl +++ /dev/null @@ -1,217 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////////////////////////
-// OpenGL Mathematics Copyright (c) 2005 - 2014 G-Truc Creation (www.g-truc.net)
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Created : 2007-04-03
-// Updated : 2009-01-20
-// Licence : This source is under MIT licence
-// File : glm/gtx/intersect.inl
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#include "../geometric.hpp"
-#include <cfloat>
-#include <limits>
-
-namespace glm
-{
- template <typename genType>
- GLM_FUNC_QUALIFIER bool intersectRayPlane
- (
- genType const & orig, genType const & dir,
- genType const & planeOrig, genType const & planeNormal,
- typename genType::value_type & intersectionDistance
- )
- {
- typename genType::value_type d = glm::dot(dir, planeNormal);
- typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon();
-
- if(d < Epsilon)
- {
- intersectionDistance = glm::dot(planeOrig - orig, planeNormal) / d;
- return true;
- }
-
- return false;
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER bool intersectRayTriangle
- (
- genType const & orig, genType const & dir,
- genType const & v0, genType const & v1, genType const & v2,
- genType & baryPosition
- )
- {
- genType e1 = v1 - v0;
- genType e2 = v2 - v0;
-
- genType p = glm::cross(dir, e2);
-
- typename genType::value_type a = glm::dot(e1, p);
-
- typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon();
- if(a < Epsilon)
- return false;
-
- typename genType::value_type f = typename genType::value_type(1.0f) / a;
-
- genType s = orig - v0;
- baryPosition.x = f * glm::dot(s, p);
- if(baryPosition.x < typename genType::value_type(0.0f))
- return false;
- if(baryPosition.x > typename genType::value_type(1.0f))
- return false;
-
- genType q = glm::cross(s, e1);
- baryPosition.y = f * glm::dot(dir, q);
- if(baryPosition.y < typename genType::value_type(0.0f))
- return false;
- if(baryPosition.y + baryPosition.x > typename genType::value_type(1.0f))
- return false;
-
- baryPosition.z = f * glm::dot(e2, q);
-
- return baryPosition.z >= typename genType::value_type(0.0f);
- }
-
- //template <typename genType>
- //GLM_FUNC_QUALIFIER bool intersectRayTriangle
- //(
- // genType const & orig, genType const & dir,
- // genType const & vert0, genType const & vert1, genType const & vert2,
- // genType & position
- //)
- //{
- // typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon();
- //
- // genType edge1 = vert1 - vert0;
- // genType edge2 = vert2 - vert0;
- //
- // genType pvec = cross(dir, edge2);
- //
- // float det = dot(edge1, pvec);
- // if(det < Epsilon)
- // return false;
- //
- // genType tvec = orig - vert0;
- //
- // position.y = dot(tvec, pvec);
- // if (position.y < typename genType::value_type(0) || position.y > det)
- // return typename genType::value_type(0);
- //
- // genType qvec = cross(tvec, edge1);
- //
- // position.z = dot(dir, qvec);
- // if (position.z < typename genType::value_type(0) || position.y + position.z > det)
- // return typename genType::value_type(0);
- //
- // position.x = dot(edge2, qvec);
- // position *= typename genType::value_type(1) / det;
- //
- // return typename genType::value_type(1);
- //}
-
- template <typename genType>
- GLM_FUNC_QUALIFIER bool intersectLineTriangle
- (
- genType const & orig, genType const & dir,
- genType const & vert0, genType const & vert1, genType const & vert2,
- genType & position
- )
- {
- typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon();
-
- genType edge1 = vert1 - vert0;
- genType edge2 = vert2 - vert0;
-
- genType pvec = cross(dir, edge2);
-
- float det = dot(edge1, pvec);
-
- if (det > -Epsilon && det < Epsilon)
- return false;
- float inv_det = typename genType::value_type(1) / det;
-
- genType tvec = orig - vert0;
-
- position.y = dot(tvec, pvec) * inv_det;
- if (position.y < typename genType::value_type(0) || position.y > typename genType::value_type(1))
- return false;
-
- genType qvec = cross(tvec, edge1);
-
- position.z = dot(dir, qvec) * inv_det;
- if (position.z < typename genType::value_type(0) || position.y + position.z > typename genType::value_type(1))
- return false;
-
- position.x = dot(edge2, qvec) * inv_det;
-
- return true;
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER bool intersectRaySphere
- (
- genType const & rayStarting, genType const & rayNormalizedDirection,
- genType const & sphereCenter, const typename genType::value_type sphereRadiusSquered,
- typename genType::value_type & intersectionDistance
- )
- {
- typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon();
- genType diff = sphereCenter - rayStarting;
- typename genType::value_type t0 = dot(diff, rayNormalizedDirection);
- typename genType::value_type dSquared = dot(diff, diff) - t0 * t0;
- if( dSquared > sphereRadiusSquered )
- {
- return false;
- }
- typename genType::value_type t1 = sqrt( sphereRadiusSquered - dSquared );
- intersectionDistance = t0 > t1 + Epsilon ? t0 - t1 : t0 + t1;
- return intersectionDistance > Epsilon;
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER bool intersectRaySphere
- (
- genType const & rayStarting, genType const & rayNormalizedDirection,
- genType const & sphereCenter, const typename genType::value_type sphereRadius,
- genType & intersectionPosition, genType & intersectionNormal
- )
- {
- typename genType::value_type distance;
- if( intersectRaySphere( rayStarting, rayNormalizedDirection, sphereCenter, sphereRadius * sphereRadius, distance ) )
- {
- intersectionPosition = rayStarting + rayNormalizedDirection * distance;
- intersectionNormal = (intersectionPosition - sphereCenter) / sphereRadius;
- return true;
- }
- return false;
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER bool intersectLineSphere
- (
- genType const & point0, genType const & point1,
- genType const & sphereCenter, typename genType::value_type sphereRadius,
- genType & intersectionPoint1, genType & intersectionNormal1,
- genType & intersectionPoint2, genType & intersectionNormal2
- )
- {
- typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon();
- genType dir = normalize(point1 - point0);
- genType diff = sphereCenter - point0;
- typename genType::value_type t0 = dot(diff, dir);
- typename genType::value_type dSquared = dot(diff, diff) - t0 * t0;
- if( dSquared > sphereRadius * sphereRadius )
- {
- return false;
- }
- typename genType::value_type t1 = sqrt( sphereRadius * sphereRadius - dSquared );
- if( t0 < t1 + Epsilon )
- t1 = -t1;
- intersectionPoint1 = point0 + dir * (t0 - t1);
- intersectionNormal1 = (intersectionPoint1 - sphereCenter) / sphereRadius;
- intersectionPoint2 = point0 + dir * (t0 + t1);
- intersectionNormal2 = (intersectionPoint2 - sphereCenter) / sphereRadius;
- return true;
- }
-}//namespace glm
diff --git a/inc/glm/gtx/io.hpp b/inc/glm/gtx/io.hpp deleted file mode 100644 index 893a255..0000000 --- a/inc/glm/gtx/io.hpp +++ /dev/null @@ -1,224 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////////
-/// OpenGL Mathematics (glm.g-truc.net)
-///
-/// Copyright (c) 2005 - 2013 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 gtx_io
-/// @file glm/gtx/io.hpp
-/// @date 2013-11-22 / 2014-11-25
-/// @author Jan P Springer (regnirpsj@gmail.com)
-///
-/// @see core (dependence)
-/// @see gtc_quaternion (dependence)
-///
-/// @defgroup gtx_io GLM_GTX_io
-/// @ingroup gtx
-///
-/// @brief std::[w]ostream support for glm types
-///
-/// std::[w]ostream support for glm types + precision/width/etc. manipulators
-/// based on howard hinnant's std::chrono io proposal
-/// [http://home.roadrunner.com/~hinnant/bloomington/chrono_io.html]
-///
-/// <glm/gtx/io.hpp> needs to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../gtx/quaternion.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(glm_ext))
-# pragma message("GLM: GLM_GTX_io extension included")
-#endif
-
-#include <iosfwd> // std::basic_ostream<> (fwd)
-#include <locale> // std::locale, std::locale::facet, std::locale::id
-#include <utility> // std::pair<>
-
-namespace glm
-{
- /// @addtogroup gtx_io
- /// @{
-
- namespace io
- {
- enum order_type { column_major, row_major};
-
- template <typename CTy>
- class format_punct : public std::locale::facet
- {
- typedef CTy char_type;
-
- public:
-
- static std::locale::id id;
-
- bool formatted;
- unsigned precision;
- unsigned width;
- char_type separator;
- char_type delim_left;
- char_type delim_right;
- char_type space;
- char_type newline;
- order_type order;
-
- explicit format_punct(size_t a = 0);
- explicit format_punct(format_punct const&);
- };
-
- template <typename CTy, typename CTr = std::char_traits<CTy> >
- class basic_state_saver {
-
- public:
-
- explicit basic_state_saver(std::basic_ios<CTy,CTr>&);
- ~basic_state_saver();
-
- private:
-
- typedef ::std::basic_ios<CTy,CTr> state_type;
- typedef typename state_type::char_type char_type;
- typedef ::std::ios_base::fmtflags flags_type;
- typedef ::std::streamsize streamsize_type;
- typedef ::std::locale const locale_type;
-
- state_type& state_;
- flags_type flags_;
- streamsize_type precision_;
- streamsize_type width_;
- char_type fill_;
- locale_type locale_;
-
- basic_state_saver& operator=(basic_state_saver const&);
- };
-
- typedef basic_state_saver<char> state_saver;
- typedef basic_state_saver<wchar_t> wstate_saver;
-
- template <typename CTy, typename CTr = std::char_traits<CTy> >
- class basic_format_saver
- {
- public:
-
- explicit basic_format_saver(std::basic_ios<CTy,CTr>&);
- ~basic_format_saver();
-
- private:
-
- basic_state_saver<CTy> const bss_;
-
- basic_format_saver& operator=(basic_format_saver const&);
- };
-
- typedef basic_format_saver<char> format_saver;
- typedef basic_format_saver<wchar_t> wformat_saver;
-
- struct precision
- {
- unsigned value;
-
- explicit precision(unsigned);
- };
-
- struct width
- {
- unsigned value;
-
- explicit width(unsigned);
- };
-
- template <typename CTy>
- struct delimeter
- {
- CTy value[3];
-
- explicit delimeter(CTy /* left */, CTy /* right */, CTy /* separator */ = ',');
- };
-
- struct order
- {
- order_type value;
-
- explicit order(order_type);
- };
-
- // functions, inlined (inline)
-
- template <typename FTy, typename CTy, typename CTr>
- FTy const& get_facet(std::basic_ios<CTy,CTr>&);
- template <typename FTy, typename CTy, typename CTr>
- std::basic_ios<CTy,CTr>& formatted(std::basic_ios<CTy,CTr>&);
- template <typename FTy, typename CTy, typename CTr>
- std::basic_ios<CTy,CTr>& unformattet(std::basic_ios<CTy,CTr>&);
-
- template <typename CTy, typename CTr>
- std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, precision const&);
- template <typename CTy, typename CTr>
- std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, width const&);
- template <typename CTy, typename CTr>
- std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, delimeter<CTy> const&);
- template <typename CTy, typename CTr>
- std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, order const&);
- }//namespace io
-
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tquat<T,P> const&);
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tvec2<T,P> const&);
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tvec3<T,P> const&);
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tvec4<T,P> const&);
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat2x2<T,P> const&);
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat2x3<T,P> const&);
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat2x4<T,P> const&);
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat3x2<T,P> const&);
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat3x3<T,P> const&);
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat3x4<T,P> const&);
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat4x2<T,P> const&);
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat4x3<T,P> const&);
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat4x4<T,P> const&);
-
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_DECL std::basic_ostream<CTy,CTr> & operator<<(
- std::basic_ostream<CTy,CTr> &,
- std::pair<tmat4x4<T,P> const,
- tmat4x4<T,P> const> const &);
-
- /// @}
-}//namespace glm
-
-#include "io.inl"
diff --git a/inc/glm/gtx/io.inl b/inc/glm/gtx/io.inl deleted file mode 100644 index 63e2735..0000000 --- a/inc/glm/gtx/io.inl +++ /dev/null @@ -1,618 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////////
-/// OpenGL Mathematics (glm.g-truc.net)
-///
-/// Copyright (c) 2005 - 2013 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 gtx_io
-/// @file glm/gtx/io.inl
-/// @date 2013-11-22 / 2014-11-25
-/// @author Jan P Springer (regnirpsj@gmail.com)
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#include <iomanip> // std::setfill<>, std::fixed, std::setprecision, std::right, std::setw
-#include <ostream> // std::basic_ostream<>
-
-namespace glm{
-namespace io
-{
- template <typename CTy>
- /* explicit */ GLM_FUNC_QUALIFIER
- format_punct<CTy>::format_punct(size_t a)
- : std::locale::facet(a),
- formatted (true),
- precision (3),
- width (1 + 4 + 1 + precision),
- separator (','),
- delim_left ('['),
- delim_right (']'),
- space (' '),
- newline ('\n'),
- order (row_major)
- {}
-
- template <typename CTy>
- /* explicit */ GLM_FUNC_QUALIFIER
- format_punct<CTy>::format_punct(format_punct const& a)
- : std::locale::facet(0),
- formatted (a.formatted),
- precision (a.precision),
- width (a.width),
- separator (a.separator),
- delim_left (a.delim_left),
- delim_right (a.delim_right),
- space (a.space),
- newline (a.newline),
- order (a.order)
- {}
-
- template <typename CTy> std::locale::id format_punct<CTy>::id;
-
- template <typename CTy, typename CTr>
- /* explicit */ GLM_FUNC_QUALIFIER basic_state_saver<CTy,CTr>::basic_state_saver(std::basic_ios<CTy,CTr>& a)
- : state_ (a),
- flags_ (a.flags()),
- precision_(a.precision()),
- width_ (a.width()),
- fill_ (a.fill()),
- locale_ (a.getloc())
- {}
-
- template <typename CTy, typename CTr>
- GLM_FUNC_QUALIFIER basic_state_saver<CTy,CTr>::~basic_state_saver()
- {
- state_.imbue(locale_);
- state_.fill(fill_);
- state_.width(width_);
- state_.precision(precision_);
- state_.flags(flags_);
- }
-
- template <typename CTy, typename CTr>
- /* explicit */ GLM_FUNC_QUALIFIER basic_format_saver<CTy,CTr>::basic_format_saver(std::basic_ios<CTy,CTr>& a)
- : bss_(a)
- {
- a.imbue(std::locale(a.getloc(), new format_punct<CTy>(get_facet<format_punct<CTy> >(a))));
- }
-
- template <typename CTy, typename CTr>
- GLM_FUNC_QUALIFIER
- basic_format_saver<CTy,CTr>::~basic_format_saver()
- {}
-
- /* explicit */ GLM_FUNC_QUALIFIER precision::precision(unsigned a)
- : value(a)
- {}
-
- /* explicit */ GLM_FUNC_QUALIFIER width::width(unsigned a)
- : value(a)
- {}
-
- template <typename CTy>
- /* explicit */ GLM_FUNC_QUALIFIER delimeter<CTy>::delimeter(CTy a, CTy b, CTy c)
- : value()
- {
- value[0] = a;
- value[1] = b;
- value[2] = c;
- }
-
- /* explicit */ GLM_FUNC_QUALIFIER
- order::order(order_type a)
- : value(a)
- {}
-
- template <typename FTy, typename CTy, typename CTr>
- GLM_FUNC_QUALIFIER FTy const& get_facet(std::basic_ios<CTy,CTr>& ios)
- {
- if (!std::has_facet<FTy>(ios.getloc())) {
- ios.imbue(std::locale(ios.getloc(), new FTy));
- }
-
- return std::use_facet<FTy>(ios.getloc());
- }
-
- template <typename CTy, typename CTr>
- GLM_FUNC_QUALIFIER std::basic_ios<CTy,CTr>& formatted(std::basic_ios<CTy,CTr>& ios)
- {
- const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(ios)).formatted = true;
-
- return ios;
- }
-
- template <typename CTy, typename CTr>
- GLM_FUNC_QUALIFIER std::basic_ios<CTy,CTr>& unformatted(std::basic_ios<CTy,CTr>& ios)
- {
- const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(ios)).formatted = false;
-
- return ios;
- }
-
- template <typename CTy, typename CTr>
- GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, precision const& a)
- {
- const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)).precision = a.value;
-
- return os;
- }
-
- template <typename CTy, typename CTr>
- GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, width const& a)
- {
- const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)).width = a.value;
-
- return os;
- }
-
- template <typename CTy, typename CTr>
- std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, delimeter<CTy> const& a)
- {
- format_punct<CTy> & fmt(const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)));
-
- fmt.delim_left = a.value[0];
- fmt.delim_right = a.value[1];
- fmt.separator = a.value[2];
-
- return os;
- }
-
- template <typename CTy, typename CTr>
- GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, order const& a)
- {
- const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)).order = a.value;
-
- return os;
- }
-} // namespace io
-
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tquat<T,P> const& a)
- {
- typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
-
- if(cerberus)
- {
- io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
-
- if(fmt.formatted)
- {
- io::basic_state_saver<CTy> const bss(os);
-
- os << std::fixed
- << std::right
- << std::setprecision(fmt.precision)
- << std::setfill(fmt.space)
- << fmt.delim_left
- << std::setw(fmt.width) << a.w << fmt.separator
- << std::setw(fmt.width) << a.x << fmt.separator
- << std::setw(fmt.width) << a.y << fmt.separator
- << std::setw(fmt.width) << a.z
- << fmt.delim_right;
- }
- else
- {
- os << a.w << fmt.space << a.x << fmt.space << a.y << fmt.space << a.z;
- }
- }
-
- return os;
- }
-
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tvec2<T,P> const& a)
- {
- typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
-
- if(cerberus)
- {
- io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
-
- if(fmt.formatted)
- {
- io::basic_state_saver<CTy> const bss(os);
-
- os << std::fixed
- << std::right
- << std::setprecision(fmt.precision)
- << std::setfill(fmt.space)
- << fmt.delim_left
- << std::setw(fmt.width) << a.x << fmt.separator
- << std::setw(fmt.width) << a.y
- << fmt.delim_right;
- }
- else
- {
- os << a.x << fmt.space << a.y;
- }
- }
-
- return os;
- }
-
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tvec3<T,P> const& a)
- {
- typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
-
- if(cerberus)
- {
- io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
-
- if(fmt.formatted)
- {
- io::basic_state_saver<CTy> const bss(os);
-
- os << std::fixed
- << std::right
- << std::setprecision(fmt.precision)
- << std::setfill(fmt.space)
- << fmt.delim_left
- << std::setw(fmt.width) << a.x << fmt.separator
- << std::setw(fmt.width) << a.y << fmt.separator
- << std::setw(fmt.width) << a.z
- << fmt.delim_right;
- }
- else
- {
- os << a.x << fmt.space << a.y << fmt.space << a.z;
- }
- }
-
- return os;
- }
-
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tvec4<T,P> const& a)
- {
- typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
-
- if(cerberus)
- {
- io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
-
- if(fmt.formatted)
- {
- io::basic_state_saver<CTy> const bss(os);
-
- os << std::fixed
- << std::right
- << std::setprecision(fmt.precision)
- << std::setfill(fmt.space)
- << fmt.delim_left
- << std::setw(fmt.width) << a.x << fmt.separator
- << std::setw(fmt.width) << a.y << fmt.separator
- << std::setw(fmt.width) << a.z << fmt.separator
- << std::setw(fmt.width) << a.w
- << fmt.delim_right;
- }
- else
- {
- os << a.x << fmt.space << a.y << fmt.space << a.z << fmt.space << a.w;
- }
- }
-
- return os;
- }
-
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat2x2<T,P> const& a)
- {
- typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
-
- if(cerberus)
- {
- io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
- tmat2x2<T,P> m(a);
-
- if(io::row_major == fmt.order)
- m = transpose(a);
-
- if(fmt.formatted)
- {
- os << fmt.newline
- << fmt.delim_left << m[0] << fmt.newline
- << fmt.space << m[1] << fmt.delim_right;
- }
- else
- {
- os << m[0] << fmt.space << m[1];
- }
- }
-
- return os;
- }
-
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat2x3<T,P> const& a)
- {
- typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
-
- if(cerberus)
- {
- io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
- tmat3x2<T,P> m(a);
-
- if(io::row_major == fmt.order)
- m = transpose(a);
-
- if(fmt.formatted)
- {
- os << fmt.newline
- << fmt.delim_left << m[0] << fmt.newline
- << fmt.space << m[1] << fmt.newline
- << fmt.space << m[2] << fmt.delim_right;
- }
- else
- {
- os << m[0] << fmt.space << m[1] << fmt.space << m[2];
- }
- }
-
- return os;
- }
-
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat2x4<T,P> const& a)
- {
- typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
-
- if(cerberus)
- {
- io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
- tmat4x2<T,P> m(a);
-
- if(io::row_major == fmt.order)
- m = transpose(a);
-
-
- if(fmt.formatted)
- {
- os << fmt.newline
- << fmt.delim_left << m[0] << fmt.newline
- << fmt.space << m[1] << fmt.newline
- << fmt.space << m[2] << fmt.newline
- << fmt.space << m[3] << fmt.delim_right;
- }
- else
- {
- os << m[0] << fmt.space << m[1] << fmt.space << m[2] << fmt.space << m[3];
- }
- }
-
- return os;
- }
-
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat3x2<T,P> const& a)
- {
- typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
-
- if(cerberus)
- {
- io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
- tmat2x3<T,P> m(a);
-
- if(io::row_major == fmt.order)
- m = transpose(a);
-
- if(fmt.formatted)
- {
- os << fmt.newline
- << fmt.delim_left << m[0] << fmt.newline
- << fmt.space << m[1] << fmt.delim_right;
- }
- else
- {
- os << m[0] << fmt.space << m[1];
- }
- }
-
- return os;
- }
-
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat3x3<T,P> const& a)
- {
- typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
-
- if(cerberus)
- {
- io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
- tmat3x3<T,P> m(a);
-
- if(io::row_major == fmt.order)
- m = transpose(a);
-
- if(fmt.formatted)
- {
- os << fmt.newline
- << fmt.delim_left << m[0] << fmt.newline
- << fmt.space << m[1] << fmt.newline
- << fmt.space << m[2] << fmt.delim_right;
- }
- else
- {
- os << m[0] << fmt.space << m[1] << fmt.space << m[2];
- }
- }
-
- return os;
- }
-
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, tmat3x4<T,P> const& a)
- {
- typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
-
- if(cerberus)
- {
- io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
- tmat4x3<T,P> m(a);
-
- if(io::row_major == fmt.order)
- m = transpose(a);
-
- if (fmt.formatted)
- {
- os << fmt.newline
- << fmt.delim_left << m[0] << fmt.newline
- << fmt.space << m[1] << fmt.newline
- << fmt.space << m[2] << fmt.newline
- << fmt.space << m[3] << fmt.delim_right;
- }
- else
- {
- os << m[0] << fmt.space << m[1] << fmt.space << m[2] << fmt.space << m[3];
- }
- }
-
- return os;
- }
-
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, tmat4x2<T,P> const& a)
- {
- typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
-
- if(cerberus)
- {
- io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
- tmat2x4<T,P> m(a);
-
- if(io::row_major == fmt.order)
- m = transpose(a);
-
- if (fmt.formatted)
- {
- os << fmt.newline
- << fmt.delim_left << m[0] << fmt.newline
- << fmt.space << m[1] << fmt.delim_right;
- }
- else
- {
- os << m[0] << fmt.space << m[1];
- }
- }
-
- return os;
- }
-
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, tmat4x3<T,P> const& a)
- {
- typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
-
- if(cerberus)
- {
- io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
- tmat3x4<T,P> m(a);
-
- if(io::row_major == fmt.order)
- m = transpose(a);
-
- if(fmt.formatted)
- {
- os << fmt.newline
- << fmt.delim_left << m[0] << fmt.newline
- << fmt.space << m[1] << fmt.newline
- << fmt.space << m[2] << fmt.delim_right;
- }
- else
- {
- os << m[0] << fmt.space << m[1] << fmt.space << m[2];
- }
- }
-
- return os;
- }
-
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, tmat4x4<T,P> const& a)
- {
- typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
-
- if(cerberus)
- {
- io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
- tmat4x4<T,P> m(a);
-
- if (io::row_major == fmt.order)
- m = transpose(a);
-
- if(fmt.formatted)
- {
- os << fmt.newline
- << fmt.delim_left << m[0] << fmt.newline
- << fmt.space << m[1] << fmt.newline
- << fmt.space << m[2] << fmt.newline
- << fmt.space << m[3] << fmt.delim_right;
- }
- else
- {
- os << m[0] << fmt.space << m[1] << fmt.space << m[2] << fmt.space << m[3];
- }
- }
-
- return os;
- }
-
- template <typename CTy, typename CTr, typename T, precision P>
- GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(
- std::basic_ostream<CTy,CTr> & os,
- std::pair<tmat4x4<T,P> const, tmat4x4<T,P> const> const& a)
- {
- typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
-
- if(cerberus)
- {
- io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
- tmat4x4<T,P> ml(a.first);
- tmat4x4<T,P> mr(a.second);
-
- if(io::row_major == fmt.order)
- {
- ml = transpose(a.first);
- mr = transpose(a.second);
- }
-
- if(fmt.formatted)
- {
- CTy const & l(fmt.delim_left);
- CTy const & r(fmt.delim_right);
- CTy const & s(fmt.space);
-
- os << fmt.newline
- << l << ml[0] << s << s << l << mr[0] << fmt.newline
- << s << ml[1] << s << s << s << mr[1] << fmt.newline
- << s << ml[2] << s << s << s << mr[2] << fmt.newline
- << s << ml[3] << r << s << s << mr[3] << r;
- }
- else
- {
- os << ml << fmt.space << mr;
- }
- }
-
- return os;
- }
-}//namespace glm
diff --git a/inc/glm/gtx/log_base.hpp b/inc/glm/gtx/log_base.hpp deleted file mode 100644 index 51e9975..0000000 --- a/inc/glm/gtx/log_base.hpp +++ /dev/null @@ -1,73 +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 gtx_log_base
-/// @file glm/gtx/log_base.hpp
-/// @date 2008-10-24 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_log_base GLM_GTX_log_base
-/// @ingroup gtx
-///
-/// @brief Logarithm for any base. base can be a vector or a scalar.
-///
-/// <glm/gtx/log_base.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_log_base extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_log_base
- /// @{
-
- //! Logarithm for any base.
- //! From GLM_GTX_log_base.
- template <typename genType>
- GLM_FUNC_DECL genType log(
- genType x,
- genType base);
-
- //! Logarithm for any base.
- //! From GLM_GTX_log_base.
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> sign(
- vecType<T, P> const & x,
- vecType<T, P> const & base);
-
- /// @}
-}//namespace glm
-
-#include "log_base.inl"
diff --git a/inc/glm/gtx/log_base.inl b/inc/glm/gtx/log_base.inl deleted file mode 100644 index 1932216..0000000 --- a/inc/glm/gtx/log_base.inl +++ /dev/null @@ -1,47 +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 gtx_log_base
-/// @file glm/gtx/log_base.inl
-/// @date 2008-10-24 / 2014-11-25
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename genType>
- GLM_FUNC_QUALIFIER genType log(genType const & x, genType const & base)
- {
- assert(x != genType(0));
- return glm::log(x) / glm::log(base);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> log(vecType<T, P> const & x, vecType<T, P> const & base)
- {
- return glm::log(x) / glm::log(base);
- }
-}//namespace glm
diff --git a/inc/glm/gtx/matrix_cross_product.hpp b/inc/glm/gtx/matrix_cross_product.hpp deleted file mode 100644 index 77699c4..0000000 --- a/inc/glm/gtx/matrix_cross_product.hpp +++ /dev/null @@ -1,72 +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 gtx_matrix_cross_product
-/// @file glm/gtx/matrix_cross_product.hpp
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtx_extented_min_max (dependence)
-///
-/// @defgroup gtx_matrix_cross_product GLM_GTX_matrix_cross_product
-/// @ingroup gtx
-///
-/// @brief Build cross product matrices
-///
-/// <glm/gtx/matrix_cross_product.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_matrix_cross_product extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_matrix_cross_product
- /// @{
-
- //! Build a cross product matrix.
- //! From GLM_GTX_matrix_cross_product extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> matrixCross3(
- tvec3<T, P> const & x);
-
- //! Build a cross product matrix.
- //! From GLM_GTX_matrix_cross_product extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> matrixCross4(
- tvec3<T, P> const & x);
-
- /// @}
-}//namespace glm
-
-#include "matrix_cross_product.inl"
diff --git a/inc/glm/gtx/matrix_cross_product.inl b/inc/glm/gtx/matrix_cross_product.inl deleted file mode 100644 index 89ba590..0000000 --- a/inc/glm/gtx/matrix_cross_product.inl +++ /dev/null @@ -1,67 +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 gtx_matrix_cross_product
-/// @file glm/gtx/matrix_cross_product.inl
-/// @date 2005-12-21 / 2005-12-21
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> matrixCross3
- (
- tvec3<T, P> const & x
- )
- {
- tmat3x3<T, P> Result(T(0));
- Result[0][1] = x.z;
- Result[1][0] = -x.z;
- Result[0][2] = -x.y;
- Result[2][0] = x.y;
- Result[1][2] = x.x;
- Result[2][1] = -x.x;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> matrixCross4
- (
- tvec3<T, P> const & x
- )
- {
- tmat4x4<T, P> Result(T(0));
- Result[0][1] = x.z;
- Result[1][0] = -x.z;
- Result[0][2] = -x.y;
- Result[2][0] = x.y;
- Result[1][2] = x.x;
- Result[2][1] = -x.x;
- return Result;
- }
-
-}//namespace glm
diff --git a/inc/glm/gtx/matrix_decompose.hpp b/inc/glm/gtx/matrix_decompose.hpp deleted file mode 100644 index 55499e5..0000000 --- a/inc/glm/gtx/matrix_decompose.hpp +++ /dev/null @@ -1,70 +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 gtx_matrix_decompose
-/// @file glm/gtx/matrix_decompose.hpp
-/// @date 2014-08-29 / 2014-08-29
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_matrix_decompose GLM_GTX_matrix_decompose
-/// @ingroup gtx
-///
-/// @brief Decomposes a model matrix to translations, rotation and scale components
-///
-/// <glm/gtx/decomposition.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependencies
-#include "../mat4x4.hpp"
-#include "../vec3.hpp"
-#include "../vec4.hpp"
-#include "../gtc/quaternion.hpp"
-#include "../gtc/matrix_transform.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_matrix_decompose extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_matrix_decompose
- /// @{
-
- /// Decomposes a model matrix to translations, rotation and scale components
- /// @see gtx_matrix_decompose
- template <typename T, precision P>
- GLM_FUNC_DECL bool decompose(
- tmat4x4<T, P> const & modelMatrix,
- tvec3<T, P> & scale, tquat<T, P> & orientation, tvec3<T, P> & translation, tvec3<T, P> & skew, tvec4<T, P> & perspective);
-
- /// @}
-}//namespace glm
-
-#include "matrix_decompose.inl"
diff --git a/inc/glm/gtx/matrix_decompose.inl b/inc/glm/gtx/matrix_decompose.inl deleted file mode 100644 index 9bd1286..0000000 --- a/inc/glm/gtx/matrix_decompose.inl +++ /dev/null @@ -1,231 +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 gtx_matrix_decompose
-/// @file glm/gtx/matrix_decompose.inl
-/// @date 2014-08-29 / 2014-08-29
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- /// Make a linear combination of two vectors and return the result.
- // result = (a * ascl) + (b * bscl)
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> combine(
- tvec3<T, P> const & a,
- tvec3<T, P> const & b,
- T ascl, T bscl)
- {
- return (a * ascl) + (b * bscl);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER void v3Scale(tvec3<T, P> & v, T desiredLength)
- {
- T len = glm::length(v);
- if(len != 0)
- {
- T l = desiredLength / len;
- v[0] *= l;
- v[1] *= l;
- v[2] *= l;
- }
- }
-
- /**
- * Matrix decompose
- * http://www.opensource.apple.com/source/WebCore/WebCore-514/platform/graphics/transforms/TransformationMatrix.cpp
- * Decomposes the mode matrix to translations,rotation scale components
- *
- */
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool decompose(tmat4x4<T, P> const & ModelMatrix, tvec3<T, P> & Scale, tquat<T, P> & Orientation, tvec3<T, P> & Translation, tvec3<T, P> & Skew, tvec4<T, P> & Perspective)
- {
- tmat4x4<T, P> LocalMatrix(ModelMatrix);
-
- // Normalize the matrix.
- if(LocalMatrix[3][3] == static_cast<T>(0))
- return false;
-
- for(length_t i = 0; i < 4; ++i)
- for(length_t j = 0; j < 4; ++j)
- LocalMatrix[i][j] /= LocalMatrix[3][3];
-
- // perspectiveMatrix is used to solve for perspective, but it also provides
- // an easy way to test for singularity of the upper 3x3 component.
- tmat4x4<T, P> PerspectiveMatrix(LocalMatrix);
-
- for(length_t i = 0; i < 3; i++)
- PerspectiveMatrix[i][3] = 0;
- PerspectiveMatrix[3][3] = 1;
-
- /// TODO: Fixme!
- if(determinant(PerspectiveMatrix) == static_cast<T>(0))
- return false;
-
- // First, isolate perspective. This is the messiest.
- if(LocalMatrix[0][3] != 0 || LocalMatrix[1][3] != 0 || LocalMatrix[2][3] != 0)
- {
- // rightHandSide is the right hand side of the equation.
- tvec4<T, P> RightHandSide;
- RightHandSide[0] = LocalMatrix[0][3];
- RightHandSide[1] = LocalMatrix[1][3];
- RightHandSide[2] = LocalMatrix[2][3];
- RightHandSide[3] = LocalMatrix[3][3];
-
- // Solve the equation by inverting PerspectiveMatrix and multiplying
- // rightHandSide by the inverse. (This is the easiest way, not
- // necessarily the best.)
- tmat4x4<T, P> InversePerspectiveMatrix = glm::inverse(PerspectiveMatrix);// inverse(PerspectiveMatrix, inversePerspectiveMatrix);
- tmat4x4<T, P> TransposedInversePerspectiveMatrix = glm::transpose(InversePerspectiveMatrix);// transposeMatrix4(inversePerspectiveMatrix, transposedInversePerspectiveMatrix);
-
- Perspective = TransposedInversePerspectiveMatrix * RightHandSide;
- // v4MulPointByMatrix(rightHandSide, transposedInversePerspectiveMatrix, perspectivePoint);
-
- // Clear the perspective partition
- LocalMatrix[0][3] = LocalMatrix[1][3] = LocalMatrix[2][3] = 0;
- LocalMatrix[3][3] = 1;
- }
- else
- {
- // No perspective.
- Perspective = tvec4<T, P>(0, 0, 0, 1);
- }
-
- // Next take care of translation (easy).
- Translation = tvec3<T, P>(LocalMatrix[3]);
- LocalMatrix[3] = tvec4<T, P>(0, 0, 0, LocalMatrix[3].w);
-
- tvec3<T, P> Row[3], Pdum3;
-
- // Now get scale and shear.
- for(length_t i = 0; i < 3; ++i)
- for(int j = 0; j < 3; ++j)
- Row[i][j] = LocalMatrix[i][j];
-
- // Compute X scale factor and normalize first row.
- Scale.x = length(Row[0]);// v3Length(Row[0]);
-
- v3Scale(Row[0], static_cast<T>(1));
-
- // Compute XY shear factor and make 2nd row orthogonal to 1st.
- Skew.z = dot(Row[0], Row[1]);
- Row[1] = combine(Row[1], Row[0], static_cast<T>(1), -Skew.z);
-
- // Now, compute Y scale and normalize 2nd row.
- Scale.y = length(Row[1]);
- v3Scale(Row[1], static_cast<T>(1));
- Skew.z /= Scale.y;
-
- // Compute XZ and YZ shears, orthogonalize 3rd row.
- Skew.y = glm::dot(Row[0], Row[2]);
- Row[2] = combine(Row[2], Row[0], static_cast<T>(1), -Skew.y);
- Skew.x = glm::dot(Row[1], Row[2]);
- Row[2] = combine(Row[2], Row[1], static_cast<T>(1), -Skew.x);
-
- // Next, get Z scale and normalize 3rd row.
- Scale.z = length(Row[2]);
- v3Scale(Row[2], static_cast<T>(1));
- Skew.y /= Scale.z;
- Skew.x /= Scale.z;
-
- // At this point, the matrix (in rows[]) is orthonormal.
- // Check for a coordinate system flip. If the determinant
- // is -1, then negate the matrix and the scaling factors.
- Pdum3 = cross(Row[1], Row[2]); // v3Cross(row[1], row[2], Pdum3);
- if(dot(Row[0], Pdum3) < 0)
- {
- for(length_t i = 0; i < 3; i++)
- {
- Scale.x *= static_cast<T>(-1);
- Row[i] *= static_cast<T>(-1);
- }
- }
-
- // Now, get the rotations out, as described in the gem.
-
- // FIXME - Add the ability to return either quaternions (which are
- // easier to recompose with) or Euler angles (rx, ry, rz), which
- // are easier for authors to deal with. The latter will only be useful
- // when we fix https://bugs.webkit.org/show_bug.cgi?id=23799, so I
- // will leave the Euler angle code here for now.
-
- // ret.rotateY = asin(-Row[0][2]);
- // if (cos(ret.rotateY) != 0) {
- // ret.rotateX = atan2(Row[1][2], Row[2][2]);
- // ret.rotateZ = atan2(Row[0][1], Row[0][0]);
- // } else {
- // ret.rotateX = atan2(-Row[2][0], Row[1][1]);
- // ret.rotateZ = 0;
- // }
-
- T s, t, x, y, z, w;
-
- t = Row[0][0] + Row[1][1] + Row[2][2] + 1.0;
-
- if(t > 1e-4)
- {
- s = 0.5 / sqrt(t);
- w = 0.25 / s;
- x = (Row[2][1] - Row[1][2]) * s;
- y = (Row[0][2] - Row[2][0]) * s;
- z = (Row[1][0] - Row[0][1]) * s;
- }
- else if(Row[0][0] > Row[1][1] && Row[0][0] > Row[2][2])
- {
- s = sqrt (1.0 + Row[0][0] - Row[1][1] - Row[2][2]) * 2.0; // S=4*qx
- x = 0.25 * s;
- y = (Row[0][1] + Row[1][0]) / s;
- z = (Row[0][2] + Row[2][0]) / s;
- w = (Row[2][1] - Row[1][2]) / s;
- }
- else if(Row[1][1] > Row[2][2])
- {
- s = sqrt (1.0 + Row[1][1] - Row[0][0] - Row[2][2]) * 2.0; // S=4*qy
- x = (Row[0][1] + Row[1][0]) / s;
- y = 0.25 * s;
- z = (Row[1][2] + Row[2][1]) / s;
- w = (Row[0][2] - Row[2][0]) / s;
- }
- else
- {
- s = sqrt(1.0 + Row[2][2] - Row[0][0] - Row[1][1]) * 2.0; // S=4*qz
- x = (Row[0][2] + Row[2][0]) / s;
- y = (Row[1][2] + Row[2][1]) / s;
- z = 0.25 * s;
- w = (Row[1][0] - Row[0][1]) / s;
- }
-
- Orientation.x = x;
- Orientation.y = y;
- Orientation.z = z;
- Orientation.w = w;
-
- return true;
- }
-}//namespace glm
diff --git a/inc/glm/gtx/matrix_interpolation.hpp b/inc/glm/gtx/matrix_interpolation.hpp deleted file mode 100644 index 137451d..0000000 --- a/inc/glm/gtx/matrix_interpolation.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 gtx_matrix_interpolation
-/// @file glm/gtx/matrix_interpolation.hpp
-/// @date 2011-03-05 / 2011-06-07
-/// @author Ghenadii Ursachi (the.asteroth@gmail.com)
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_matrix_interpolation GLM_GTX_matrix_interpolation
-/// @ingroup gtx
-///
-/// @brief Allows to directly interpolate two exiciting matrices.
-///
-/// <glm/gtx/matrix_interpolation.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_matrix_interpolation extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_matrix_interpolation
- /// @{
-
- /// Get the axis and angle of the rotation from a matrix.
- /// From GLM_GTX_matrix_interpolation extension.
- template <typename T, precision P>
- GLM_FUNC_DECL void axisAngle(
- tmat4x4<T, P> const & mat,
- tvec3<T, P> & axis,
- T & angle);
-
- /// Build a matrix from axis and angle.
- /// From GLM_GTX_matrix_interpolation extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> axisAngleMatrix(
- tvec3<T, P> const & axis,
- T const angle);
-
- /// Extracts the rotation part of a matrix.
- /// From GLM_GTX_matrix_interpolation extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> extractMatrixRotation(
- tmat4x4<T, P> const & mat);
-
- /// Build a interpolation of 4 * 4 matrixes.
- /// From GLM_GTX_matrix_interpolation extension.
- /// Warning! works only with rotation and/or translation matrixes, scale will generate unexpected results.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> interpolate(
- tmat4x4<T, P> const & m1,
- tmat4x4<T, P> const & m2,
- T const delta);
-
- /// @}
-}//namespace glm
-
-#include "matrix_interpolation.inl"
diff --git a/inc/glm/gtx/matrix_interpolation.inl b/inc/glm/gtx/matrix_interpolation.inl deleted file mode 100644 index 5768002..0000000 --- a/inc/glm/gtx/matrix_interpolation.inl +++ /dev/null @@ -1,163 +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 gtx_matrix_interpolation
-/// @file glm/gtx/matrix_interpolation.hpp
-/// @date 2011-03-05 / 2011-03-05
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER void axisAngle
- (
- tmat4x4<T, P> const & mat,
- tvec3<T, P> & axis,
- T & angle
- )
- {
- T epsilon = (T)0.01;
- T epsilon2 = (T)0.1;
-
- if((abs(mat[1][0] - mat[0][1]) < epsilon) && (abs(mat[2][0] - mat[0][2]) < epsilon) && (abs(mat[2][1] - mat[1][2]) < epsilon))
- {
- if ((abs(mat[1][0] + mat[0][1]) < epsilon2) && (abs(mat[2][0] + mat[0][2]) < epsilon2) && (abs(mat[2][1] + mat[1][2]) < epsilon2) && (abs(mat[0][0] + mat[1][1] + mat[2][2] - (T)3.0) < epsilon2))
- {
- angle = (T)0.0;
- axis.x = (T)1.0;
- axis.y = (T)0.0;
- axis.z = (T)0.0;
- return;
- }
- angle = static_cast<T>(3.1415926535897932384626433832795);
- T xx = (mat[0][0] + (T)1.0) / (T)2.0;
- T yy = (mat[1][1] + (T)1.0) / (T)2.0;
- T zz = (mat[2][2] + (T)1.0) / (T)2.0;
- T xy = (mat[1][0] + mat[0][1]) / (T)4.0;
- T xz = (mat[2][0] + mat[0][2]) / (T)4.0;
- T yz = (mat[2][1] + mat[1][2]) / (T)4.0;
- if((xx > yy) && (xx > zz))
- {
- if (xx < epsilon) {
- axis.x = (T)0.0;
- axis.y = (T)0.7071;
- axis.z = (T)0.7071;
- } else {
- axis.x = sqrt(xx);
- axis.y = xy / axis.x;
- axis.z = xz / axis.x;
- }
- }
- else if (yy > zz)
- {
- if (yy < epsilon) {
- axis.x = (T)0.7071;
- axis.y = (T)0.0;
- axis.z = (T)0.7071;
- } else {
- axis.y = sqrt(yy);
- axis.x = xy / axis.y;
- axis.z = yz / axis.y;
- }
- }
- else
- {
- if (zz < epsilon) {
- axis.x = (T)0.7071;
- axis.y = (T)0.7071;
- axis.z = (T)0.0;
- } else {
- axis.z = sqrt(zz);
- axis.x = xz / axis.z;
- axis.y = yz / axis.z;
- }
- }
- return;
- }
- T s = sqrt((mat[2][1] - mat[1][2]) * (mat[2][1] - mat[1][2]) + (mat[2][0] - mat[0][2]) * (mat[2][0] - mat[0][2]) + (mat[1][0] - mat[0][1]) * (mat[1][0] - mat[0][1]));
- if (glm::abs(s) < T(0.001))
- s = (T)1.0;
- angle = acos((mat[0][0] + mat[1][1] + mat[2][2] - (T)1.0) / (T)2.0);
- axis.x = (mat[1][2] - mat[2][1]) / s;
- axis.y = (mat[2][0] - mat[0][2]) / s;
- axis.z = (mat[0][1] - mat[1][0]) / s;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> axisAngleMatrix
- (
- tvec3<T, P> const & axis,
- T const angle
- )
- {
- T c = cos(angle);
- T s = sin(angle);
- T t = static_cast<T>(1) - c;
- tvec3<T, P> n = normalize(axis);
-
- return tmat4x4<T, P>(
- t * n.x * n.x + c, t * n.x * n.y + n.z * s, t * n.x * n.z - n.y * s, T(0),
- t * n.x * n.y - n.z * s, t * n.y * n.y + c, t * n.y * n.z + n.x * s, T(0),
- t * n.x * n.z + n.y * s, t * n.y * n.z - n.x * s, t * n.z * n.z + c, T(0),
- T(0), T(0), T(0), T(1)
- );
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> extractMatrixRotation
- (
- tmat4x4<T, P> const & mat
- )
- {
- return tmat4x4<T, P>(
- mat[0][0], mat[0][1], mat[0][2], 0.0,
- mat[1][0], mat[1][1], mat[1][2], 0.0,
- mat[2][0], mat[2][1], mat[2][2], 0.0,
- 0.0, 0.0, 0.0, 1.0
- );
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> interpolate
- (
- tmat4x4<T, P> const & m1,
- tmat4x4<T, P> const & m2,
- T const delta
- )
- {
- tmat4x4<T, P> m1rot = extractMatrixRotation(m1);
- tmat4x4<T, P> dltRotation = m2 * transpose(m1rot);
- tvec3<T, P> dltAxis;
- T dltAngle;
- axisAngle(dltRotation, dltAxis, dltAngle);
- tmat4x4<T, P> out = axisAngleMatrix(dltAxis, dltAngle * delta) * m1rot;
- out[3][0] = m1[3][0] + delta * (m2[3][0] - m1[3][0]);
- out[3][1] = m1[3][1] + delta * (m2[3][1] - m1[3][1]);
- out[3][2] = m1[3][2] + delta * (m2[3][2] - m1[3][2]);
- return out;
- }
-}//namespace glm
diff --git a/inc/glm/gtx/matrix_major_storage.hpp b/inc/glm/gtx/matrix_major_storage.hpp deleted file mode 100644 index feb74cd..0000000 --- a/inc/glm/gtx/matrix_major_storage.hpp +++ /dev/null @@ -1,144 +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 gtx_matrix_major_storage
-/// @file glm/gtx/matrix_major_storage.hpp
-/// @date 2006-04-19 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtx_extented_min_max (dependence)
-///
-/// @defgroup gtx_matrix_major_storage GLM_GTX_matrix_major_storage
-/// @ingroup gtx
-///
-/// @brief Build matrices with specific matrix order, row or column
-///
-/// <glm/gtx/matrix_major_storage.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_matrix_major_storage extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_matrix_major_storage
- /// @{
-
- //! Build a row major matrix from row vectors.
- //! From GLM_GTX_matrix_major_storage extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x2<T, P> rowMajor2(
- tvec2<T, P> const & v1,
- tvec2<T, P> const & v2);
-
- //! Build a row major matrix from other matrix.
- //! From GLM_GTX_matrix_major_storage extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x2<T, P> rowMajor2(
- tmat2x2<T, P> const & m);
-
- //! Build a row major matrix from row vectors.
- //! From GLM_GTX_matrix_major_storage extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> rowMajor3(
- tvec3<T, P> const & v1,
- tvec3<T, P> const & v2,
- tvec3<T, P> const & v3);
-
- //! Build a row major matrix from other matrix.
- //! From GLM_GTX_matrix_major_storage extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> rowMajor3(
- tmat3x3<T, P> const & m);
-
- //! Build a row major matrix from row vectors.
- //! From GLM_GTX_matrix_major_storage extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> rowMajor4(
- tvec4<T, P> const & v1,
- tvec4<T, P> const & v2,
- tvec4<T, P> const & v3,
- tvec4<T, P> const & v4);
-
- //! Build a row major matrix from other matrix.
- //! From GLM_GTX_matrix_major_storage extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> rowMajor4(
- tmat4x4<T, P> const & m);
-
- //! Build a column major matrix from column vectors.
- //! From GLM_GTX_matrix_major_storage extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x2<T, P> colMajor2(
- tvec2<T, P> const & v1,
- tvec2<T, P> const & v2);
-
- //! Build a column major matrix from other matrix.
- //! From GLM_GTX_matrix_major_storage extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x2<T, P> colMajor2(
- tmat2x2<T, P> const & m);
-
- //! Build a column major matrix from column vectors.
- //! From GLM_GTX_matrix_major_storage extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> colMajor3(
- tvec3<T, P> const & v1,
- tvec3<T, P> const & v2,
- tvec3<T, P> const & v3);
-
- //! Build a column major matrix from other matrix.
- //! From GLM_GTX_matrix_major_storage extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> colMajor3(
- tmat3x3<T, P> const & m);
-
- //! Build a column major matrix from column vectors.
- //! From GLM_GTX_matrix_major_storage extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> colMajor4(
- tvec4<T, P> const & v1,
- tvec4<T, P> const & v2,
- tvec4<T, P> const & v3,
- tvec4<T, P> const & v4);
-
- //! Build a column major matrix from other matrix.
- //! From GLM_GTX_matrix_major_storage extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> colMajor4(
- tmat4x4<T, P> const & m);
-
- /// @}
-}//namespace glm
-
-#include "matrix_major_storage.inl"
diff --git a/inc/glm/gtx/matrix_major_storage.inl b/inc/glm/gtx/matrix_major_storage.inl deleted file mode 100644 index 354dc1d..0000000 --- a/inc/glm/gtx/matrix_major_storage.inl +++ /dev/null @@ -1,196 +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 gtx_matrix_major_storage
-/// @file glm/gtx/matrix_major_storage.hpp
-/// @date 2006-04-19 / 2014-11-25
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> rowMajor2
- (
- tvec2<T, P> const & v1,
- tvec2<T, P> const & v2
- )
- {
- tmat2x2<T, P> Result;
- Result[0][0] = v1.x;
- Result[1][0] = v1.y;
- Result[0][1] = v2.x;
- Result[1][1] = v2.y;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> rowMajor2(
- const tmat2x2<T, P>& m)
- {
- tmat2x2<T, P> Result;
- Result[0][0] = m[0][0];
- Result[0][1] = m[1][0];
- Result[1][0] = m[0][1];
- Result[1][1] = m[1][1];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> rowMajor3(
- const tvec3<T, P>& v1,
- const tvec3<T, P>& v2,
- const tvec3<T, P>& v3)
- {
- tmat3x3<T, P> Result;
- Result[0][0] = v1.x;
- Result[1][0] = v1.y;
- Result[2][0] = v1.z;
- Result[0][1] = v2.x;
- Result[1][1] = v2.y;
- Result[2][1] = v2.z;
- Result[0][2] = v3.x;
- Result[1][2] = v3.y;
- Result[2][2] = v3.z;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> rowMajor3(
- const tmat3x3<T, P>& m)
- {
- tmat3x3<T, P> Result;
- Result[0][0] = m[0][0];
- Result[0][1] = m[1][0];
- Result[0][2] = m[2][0];
- Result[1][0] = m[0][1];
- Result[1][1] = m[1][1];
- Result[1][2] = m[2][1];
- Result[2][0] = m[0][2];
- Result[2][1] = m[1][2];
- Result[2][2] = m[2][2];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> rowMajor4(
- const tvec4<T, P>& v1,
- const tvec4<T, P>& v2,
- const tvec4<T, P>& v3,
- const tvec4<T, P>& v4)
- {
- tmat4x4<T, P> Result;
- Result[0][0] = v1.x;
- Result[1][0] = v1.y;
- Result[2][0] = v1.z;
- Result[3][0] = v1.w;
- Result[0][1] = v2.x;
- Result[1][1] = v2.y;
- Result[2][1] = v2.z;
- Result[3][1] = v2.w;
- Result[0][2] = v3.x;
- Result[1][2] = v3.y;
- Result[2][2] = v3.z;
- Result[3][2] = v3.w;
- Result[0][3] = v4.x;
- Result[1][3] = v4.y;
- Result[2][3] = v4.z;
- Result[3][3] = v4.w;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> rowMajor4(
- const tmat4x4<T, P>& m)
- {
- tmat4x4<T, P> Result;
- Result[0][0] = m[0][0];
- Result[0][1] = m[1][0];
- Result[0][2] = m[2][0];
- Result[0][3] = m[3][0];
- Result[1][0] = m[0][1];
- Result[1][1] = m[1][1];
- Result[1][2] = m[2][1];
- Result[1][3] = m[3][1];
- Result[2][0] = m[0][2];
- Result[2][1] = m[1][2];
- Result[2][2] = m[2][2];
- Result[2][3] = m[3][2];
- Result[3][0] = m[0][3];
- Result[3][1] = m[1][3];
- Result[3][2] = m[2][3];
- Result[3][3] = m[3][3];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> colMajor2(
- const tvec2<T, P>& v1,
- const tvec2<T, P>& v2)
- {
- return tmat2x2<T, P>(v1, v2);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> colMajor2(
- const tmat2x2<T, P>& m)
- {
- return tmat2x2<T, P>(m);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> colMajor3(
- const tvec3<T, P>& v1,
- const tvec3<T, P>& v2,
- const tvec3<T, P>& v3)
- {
- return tmat3x3<T, P>(v1, v2, v3);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> colMajor3(
- const tmat3x3<T, P>& m)
- {
- return tmat3x3<T, P>(m);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> colMajor4(
- const tvec4<T, P>& v1,
- const tvec4<T, P>& v2,
- const tvec4<T, P>& v3,
- const tvec4<T, P>& v4)
- {
- return tmat4x4<T, P>(v1, v2, v3, v4);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> colMajor4(
- const tmat4x4<T, P>& m)
- {
- return tmat4x4<T, P>(m);
- }
-}//namespace glm
diff --git a/inc/glm/gtx/matrix_operation.hpp b/inc/glm/gtx/matrix_operation.hpp deleted file mode 100644 index 252220a..0000000 --- a/inc/glm/gtx/matrix_operation.hpp +++ /dev/null @@ -1,113 +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 gtx_matrix_operation
-/// @file glm/gtx/matrix_operation.hpp
-/// @date 2009-08-29 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_matrix_operation GLM_GTX_matrix_operation
-/// @ingroup gtx
-///
-/// @brief Build diagonal matrices from vectors.
-///
-/// <glm/gtx/matrix_operation.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_matrix_operation extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_matrix_operation
- /// @{
-
- //! Build a diagonal matrix.
- //! From GLM_GTX_matrix_operation extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x2<T, P> diagonal2x2(
- tvec2<T, P> const & v);
-
- //! Build a diagonal matrix.
- //! From GLM_GTX_matrix_operation extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x3<T, P> diagonal2x3(
- tvec2<T, P> const & v);
-
- //! Build a diagonal matrix.
- //! From GLM_GTX_matrix_operation extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat2x4<T, P> diagonal2x4(
- tvec2<T, P> const & v);
-
- //! Build a diagonal matrix.
- //! From GLM_GTX_matrix_operation extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x2<T, P> diagonal3x2(
- tvec2<T, P> const & v);
-
- //! Build a diagonal matrix.
- //! From GLM_GTX_matrix_operation extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> diagonal3x3(
- tvec3<T, P> const & v);
-
- //! Build a diagonal matrix.
- //! From GLM_GTX_matrix_operation extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x4<T, P> diagonal3x4(
- tvec3<T, P> const & v);
-
- //! Build a diagonal matrix.
- //! From GLM_GTX_matrix_operation extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x2<T, P> diagonal4x2(
- tvec2<T, P> const & v);
-
- //! Build a diagonal matrix.
- //! From GLM_GTX_matrix_operation extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x3<T, P> diagonal4x3(
- tvec3<T, P> const & v);
-
- //! Build a diagonal matrix.
- //! From GLM_GTX_matrix_operation extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> diagonal4x4(
- tvec4<T, P> const & v);
-
- /// @}
-}//namespace glm
-
-#include "matrix_operation.inl"
diff --git a/inc/glm/gtx/matrix_operation.inl b/inc/glm/gtx/matrix_operation.inl deleted file mode 100644 index 591aac7..0000000 --- a/inc/glm/gtx/matrix_operation.inl +++ /dev/null @@ -1,147 +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 gtx_matrix_operation
-/// @file glm/gtx/matrix_operation.inl
-/// @date 2009-08-29 / 2009-08-29
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x2<T, P> diagonal2x2
- (
- tvec2<T, P> const & v
- )
- {
- tmat2x2<T, P> Result(static_cast<T>(1));
- Result[0][0] = v[0];
- Result[1][1] = v[1];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x3<T, P> diagonal2x3
- (
- tvec2<T, P> const & v
- )
- {
- tmat2x3<T, P> Result(static_cast<T>(1));
- Result[0][0] = v[0];
- Result[1][1] = v[1];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P> diagonal2x4
- (
- tvec2<T, P> const & v
- )
- {
- tmat2x4<T, P> Result(static_cast<T>(1));
- Result[0][0] = v[0];
- Result[1][1] = v[1];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x2<T, P> diagonal3x2
- (
- tvec2<T, P> const & v
- )
- {
- tmat3x2<T, P> Result(static_cast<T>(1));
- Result[0][0] = v[0];
- Result[1][1] = v[1];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> diagonal3x3
- (
- tvec3<T, P> const & v
- )
- {
- tmat3x3<T, P> Result(static_cast<T>(1));
- Result[0][0] = v[0];
- Result[1][1] = v[1];
- Result[2][2] = v[2];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P> diagonal3x4
- (
- tvec3<T, P> const & v
- )
- {
- tmat3x4<T, P> Result(static_cast<T>(1));
- Result[0][0] = v[0];
- Result[1][1] = v[1];
- Result[2][2] = v[2];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> diagonal4x4
- (
- tvec4<T, P> const & v
- )
- {
- tmat4x4<T, P> Result(static_cast<T>(1));
- Result[0][0] = v[0];
- Result[1][1] = v[1];
- Result[2][2] = v[2];
- Result[3][3] = v[3];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x3<T, P> diagonal4x3
- (
- tvec3<T, P> const & v
- )
- {
- tmat4x3<T, P> Result(static_cast<T>(1));
- Result[0][0] = v[0];
- Result[1][1] = v[1];
- Result[2][2] = v[2];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x2<T, P> diagonal4x2
- (
- tvec2<T, P> const & v
- )
- {
- tmat4x2<T, P> Result(static_cast<T>(1));
- Result[0][0] = v[0];
- Result[1][1] = v[1];
- return Result;
- }
-}//namespace glm
diff --git a/inc/glm/gtx/matrix_query.hpp b/inc/glm/gtx/matrix_query.hpp deleted file mode 100644 index 6c58544..0000000 --- a/inc/glm/gtx/matrix_query.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 gtx_matrix_query
-/// @file glm/gtx/matrix_query.hpp
-/// @date 2007-03-05 / 2011-08-28
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtx_vector_query (dependence)
-///
-/// @defgroup gtx_matrix_query GLM_GTX_matrix_query
-/// @ingroup gtx
-///
-/// @brief Query to evaluate matrix properties
-///
-/// <glm/gtx/matrix_query.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../gtx/vector_query.hpp"
-#include <limits>
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_matrix_query extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_matrix_query
- /// @{
-
- /// Return whether a matrix a null matrix.
- /// From GLM_GTX_matrix_query extension.
- template<typename T, precision P>
- GLM_FUNC_DECL bool isNull(tmat2x2<T, P> const & m, T const & epsilon);
-
- /// Return whether a matrix a null matrix.
- /// From GLM_GTX_matrix_query extension.
- template<typename T, precision P>
- GLM_FUNC_DECL bool isNull(tmat3x3<T, P> const & m, T const & epsilon);
-
- /// Return whether a matrix is a null matrix.
- /// From GLM_GTX_matrix_query extension.
- template<typename T, precision P>
- GLM_FUNC_DECL bool isNull(tmat4x4<T, P> const & m, T const & epsilon);
-
- /// Return whether a matrix is an identity matrix.
- /// From GLM_GTX_matrix_query extension.
- template<typename T, precision P, template <typename, precision> class matType>
- GLM_FUNC_DECL bool isIdentity(matType<T, P> const & m, T const & epsilon);
-
- /// Return whether a matrix is a normalized matrix.
- /// From GLM_GTX_matrix_query extension.
- template<typename T, precision P>
- GLM_FUNC_DECL bool isNormalized(tmat2x2<T, P> const & m, T const & epsilon);
-
- /// Return whether a matrix is a normalized matrix.
- /// From GLM_GTX_matrix_query extension.
- template<typename T, precision P>
- GLM_FUNC_DECL bool isNormalized(tmat3x3<T, P> const & m, T const & epsilon);
-
- /// Return whether a matrix is a normalized matrix.
- /// From GLM_GTX_matrix_query extension.
- template<typename T, precision P>
- GLM_FUNC_DECL bool isNormalized(tmat4x4<T, P> const & m, T const & epsilon);
-
- /// Return whether a matrix is an orthonormalized matrix.
- /// From GLM_GTX_matrix_query extension.
- template<typename T, precision P, template <typename, precision> class matType>
- GLM_FUNC_DECL bool isOrthogonal(matType<T, P> const & m, T const & epsilon);
-
- /// @}
-}//namespace glm
-
-#include "matrix_query.inl"
diff --git a/inc/glm/gtx/matrix_query.inl b/inc/glm/gtx/matrix_query.inl deleted file mode 100644 index 621a9b9..0000000 --- a/inc/glm/gtx/matrix_query.inl +++ /dev/null @@ -1,143 +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 gtx_matrix_query
-/// @file glm/gtx/matrix_query.inl
-/// @date 2007-03-05 / 2007-03-05
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER bool isNull(tmat2x2<T, P> const & m, T const & epsilon)
- {
- bool result = true;
- for(detail::component_count_t i = 0; result && i < 2 ; ++i)
- result = isNull(m[i], epsilon);
- return result;
- }
-
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER bool isNull(tmat3x3<T, P> const & m, T const & epsilon)
- {
- bool result = true;
- for(detail::component_count_t i = 0; result && i < 3 ; ++i)
- result = isNull(m[i], epsilon);
- return result;
- }
-
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER bool isNull(tmat4x4<T, P> const & m, T const & epsilon)
- {
- bool result = true;
- for(detail::component_count_t i = 0; result && i < 4 ; ++i)
- result = isNull(m[i], epsilon);
- return result;
- }
-
- template<typename T, precision P, template <typename, precision> class matType>
- GLM_FUNC_QUALIFIER bool isIdentity(matType<T, P> const & m, T const & epsilon)
- {
- bool result = true;
- for(detail::component_count_t i(0); result && i < detail::component_count(m[0]); ++i)
- {
- for(detail::component_count_t j(0); result && j < i ; ++j)
- result = abs(m[i][j]) <= epsilon;
- if(result)
- result = abs(m[i][i] - 1) <= epsilon;
- for(detail::component_count_t j(i + 1); result && j < detail::component_count(m); ++j)
- result = abs(m[i][j]) <= epsilon;
- }
- return result;
- }
-
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER bool isNormalized(tmat2x2<T, P> const & m, T const & epsilon)
- {
- bool result(true);
- for(detail::component_count_t i(0); result && i < detail::component_count(m); ++i)
- result = isNormalized(m[i], epsilon);
- for(detail::component_count_t i(0); result && i < detail::component_count(m); ++i)
- {
- typename tmat2x2<T, P>::col_type v;
- for(detail::component_count_t j(0); j < detail::component_count(m); ++j)
- v[j] = m[j][i];
- result = isNormalized(v, epsilon);
- }
- return result;
- }
-
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER bool isNormalized(tmat3x3<T, P> const & m, T const & epsilon)
- {
- bool result(true);
- for(detail::component_count_t i(0); result && i < detail::component_count(m); ++i)
- result = isNormalized(m[i], epsilon);
- for(detail::component_count_t i(0); result && i < detail::component_count(m); ++i)
- {
- typename tmat3x3<T, P>::col_type v;
- for(detail::component_count_t j(0); j < detail::component_count(m); ++j)
- v[j] = m[j][i];
- result = isNormalized(v, epsilon);
- }
- return result;
- }
-
- template<typename T, precision P>
- GLM_FUNC_QUALIFIER bool isNormalized(tmat4x4<T, P> const & m, T const & epsilon)
- {
- bool result(true);
- for(detail::component_count_t i(0); result && i < detail::component_count(m); ++i)
- result = isNormalized(m[i], epsilon);
- for(detail::component_count_t i(0); result && i < detail::component_count(m); ++i)
- {
- typename tmat4x4<T, P>::col_type v;
- for(detail::component_count_t j(0); j < detail::component_count(m); ++j)
- v[j] = m[j][i];
- result = isNormalized(v, epsilon);
- }
- return result;
- }
-
- template<typename T, precision P, template <typename, precision> class matType>
- GLM_FUNC_QUALIFIER bool isOrthogonal(matType<T, P> const & m, T const & epsilon)
- {
- bool result(true);
- for(detail::component_count_t i(0); result && i < detail::component_count(m) - 1; ++i)
- for(detail::component_count_t j(i + 1); result && j < detail::component_count(m); ++j)
- result = areOrthogonal(m[i], m[j], epsilon);
-
- if(result)
- {
- matType<T, P> tmp = transpose(m);
- for(detail::component_count_t i(0); result && i < detail::component_count(m) - 1 ; ++i)
- for(detail::component_count_t j(i + 1); result && j < detail::component_count(m); ++j)
- result = areOrthogonal(tmp[i], tmp[j], epsilon);
- }
- return result;
- }
-}//namespace glm
diff --git a/inc/glm/gtx/matrix_transform_2d.hpp b/inc/glm/gtx/matrix_transform_2d.hpp deleted file mode 100644 index ea3e55e..0000000 --- a/inc/glm/gtx/matrix_transform_2d.hpp +++ /dev/null @@ -1,106 +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 gtx_matrix_transform_2d
-/// @file glm/gtx/matrix_transform_2d.hpp
-/// @date 2014-02-20
-/// @author Miguel Ángel Pérez Martínez
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_matrix_transform_2d GLM_GTX_matrix_transform_2d
-/// @ingroup gtx
-///
-/// @brief Defines functions that generate common 2d transformation matrices.
-///
-/// <glm/gtx/matrix_transform_2d.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../mat3x3.hpp"
-#include "../vec2.hpp"
-
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_matrix_transform_2d extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_matrix_transform_2d
- /// @{
-
- /// Builds a translation 3 * 3 matrix created from a vector of 2 components.
- ///
- /// @param m Input matrix multiplied by this translation matrix.
- /// @param v Coordinates of a translation vector.
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> translate(
- tmat3x3<T, P> const & m,
- tvec2<T, P> const & v);
-
- /// Builds a rotation 3 * 3 matrix created from an angle.
- ///
- /// @param m Input matrix multiplied by this translation matrix.
- /// @param angle Rotation angle expressed in radians if GLM_FORCE_RADIANS is defined or degrees otherwise.
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> rotate(
- tmat3x3<T, P> const & m,
- T angle);
-
- /// Builds a scale 3 * 3 matrix created from a vector of 2 components.
- ///
- /// @param m Input matrix multiplied by this translation matrix.
- /// @param v Coordinates of a scale vector.
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> scale(
- tmat3x3<T, P> const & m,
- tvec2<T, P> const & v);
-
- /// Builds an horizontal (parallel to the x axis) shear 3 * 3 matrix.
- ///
- /// @param m Input matrix multiplied by this translation matrix.
- /// @param y Shear factor.
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> shearX(
- tmat3x3<T, P> const & m,
- T y);
-
- /// Builds a vertical (parallel to the y axis) shear 3 * 3 matrix.
- ///
- /// @param m Input matrix multiplied by this translation matrix.
- /// @param x Shear factor.
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> shearY(
- tmat3x3<T, P> const & m,
- T x);
-
- /// @}
-}//namespace glm
-
-#include "matrix_transform_2d.inl"
diff --git a/inc/glm/gtx/matrix_transform_2d.inl b/inc/glm/gtx/matrix_transform_2d.inl deleted file mode 100644 index 976c42a..0000000 --- a/inc/glm/gtx/matrix_transform_2d.inl +++ /dev/null @@ -1,97 +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 gtx_matrix_transform_2d
-/// @file glm/gtc/matrix_transform_2d.inl
-/// @date 2014-02-20
-/// @author Miguel Ángel Pérez Martínez
-///////////////////////////////////////////////////////////////////////////////////
-
-#include "../trigonometric.hpp"
-
-namespace glm
-{
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> translate(
- tmat3x3<T, P> const & m,
- tvec2<T, P> const & v)
- {
- tmat3x3<T, P> Result(m);
- Result[2] = m[0] * v[0] + m[1] * v[1] + m[2];
- return Result;
- }
-
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> rotate(
- tmat3x3<T, P> const & m,
- T angle)
- {
- T const a = angle;
- T const c = cos(a);
- T const s = sin(a);
-
- tmat3x3<T, P> Result(uninitialize);
- Result[0] = m[0] * c + m[1] * s;
- Result[1] = m[0] * -s + m[1] * c;
- Result[2] = m[2];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> scale(
- tmat3x3<T, P> const & m,
- tvec2<T, P> const & v)
- {
- tmat3x3<T, P> Result(uninitialize);
- Result[0] = m[0] * v[0];
- Result[1] = m[1] * v[1];
- Result[2] = m[2];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> shearX(
- tmat3x3<T, P> const & m,
- T y)
- {
- tmat3x3<T, P> Result(1);
- Result[0][1] = y;
- return m * Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> shearY(
- tmat3x3<T, P> const & m,
- T x)
- {
- tmat3x3<T, P> Result(1);
- Result[1][0] = x;
- return m * Result;
- }
-
-}//namespace glm
diff --git a/inc/glm/gtx/mixed_product.hpp b/inc/glm/gtx/mixed_product.hpp deleted file mode 100644 index 21bdeba..0000000 --- a/inc/glm/gtx/mixed_product.hpp +++ /dev/null @@ -1,66 +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 gtx_mixed_product
-/// @file glm/gtx/mixed_product.hpp
-/// @date 2007-04-03 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_mixed_product GLM_GTX_mixed_producte
-/// @ingroup gtx
-///
-/// @brief Mixed product of 3 vectors.
-///
-/// <glm/gtx/mixed_product.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_mixed_product extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_mixed_product
- /// @{
-
- /// @brief Mixed product of 3 vectors (from GLM_GTX_mixed_product extension)
- template <typename T, precision P>
- GLM_FUNC_DECL T mixedProduct(
- tvec3<T, P> const & v1,
- tvec3<T, P> const & v2,
- tvec3<T, P> const & v3);
-
- /// @}
-}// namespace glm
-
-#include "mixed_product.inl"
diff --git a/inc/glm/gtx/mixed_product.inl b/inc/glm/gtx/mixed_product.inl deleted file mode 100644 index 6305793..0000000 --- a/inc/glm/gtx/mixed_product.inl +++ /dev/null @@ -1,45 +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 gtx_mixed_product
-/// @file glm/gtx/mixed_product.inl
-/// @date 2007-04-03 / 2008-09-17
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T mixedProduct
- (
- tvec3<T, P> const & v1,
- tvec3<T, P> const & v2,
- tvec3<T, P> const & v3
- )
- {
- return dot(cross(v1, v2), v3);
- }
-}//namespace glm
diff --git a/inc/glm/gtx/multiple.hpp b/inc/glm/gtx/multiple.hpp deleted file mode 100644 index a45aeef..0000000 --- a/inc/glm/gtx/multiple.hpp +++ /dev/null @@ -1,106 +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 gtx_multiple
-/// @file glm/gtx/multiple.hpp
-/// @date 2009-10-26 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtx_extented_min_max (dependence)
-///
-/// @defgroup gtx_multiple GLM_GTX_multiple
-/// @ingroup gtx
-///
-/// @brief Find the closest number of a number multiple of other number.
-///
-/// <glm/gtx/multiple.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../gtc/round.hpp"
-
-#pragma message("GLM: GLM_GTX_multiple extension is deprecated, use GLM_GTC_round instead.")
-
-namespace glm
-{
- /// @addtogroup gtx_multiple
- /// @{
-
- /// Higher multiple number of Source.
- ///
- /// @tparam genType Floating-point or integer scalar or vector types.
- /// @param Source
- /// @param Multiple Must be a null or positive value
- ///
- /// @see gtx_multiple
- template <typename genType>
- GLM_DEPRECATED GLM_FUNC_DECL genType higherMultiple(
- genType Source,
- genType Multiple);
-
- /// Higher multiple number of Source.
- ///
- /// @tparam genType Floating-point or integer scalar or vector types.
- /// @param Source
- /// @param Multiple Must be a null or positive value
- ///
- /// @see gtx_multiple
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_DEPRECATED GLM_FUNC_DECL vecType<T, P> higherMultiple(
- vecType<T, P> const & Source,
- vecType<T, P> const & Multiple);
-
- /// Lower multiple number of Source.
- ///
- /// @tparam genType Floating-point or integer scalar or vector types.
- /// @param Source
- /// @param Multiple Must be a null or positive value
- ///
- /// @see gtx_multiple
- template <typename genType>
- GLM_DEPRECATED GLM_FUNC_DECL genType lowerMultiple(
- genType Source,
- genType Multiple);
-
- /// Lower multiple number of Source.
- ///
- /// @tparam genType Floating-point or integer scalar or vector types.
- /// @param Source
- /// @param Multiple Must be a null or positive value
- ///
- /// @see gtx_multiple
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_DEPRECATED GLM_FUNC_DECL vecType<T, P> lowerMultiple(
- vecType<T, P> const & Source,
- vecType<T, P> const & Multiple);
-
- /// @}
-}//namespace glm
-
-#include "multiple.inl"
diff --git a/inc/glm/gtx/multiple.inl b/inc/glm/gtx/multiple.inl deleted file mode 100644 index dff7aa5..0000000 --- a/inc/glm/gtx/multiple.inl +++ /dev/null @@ -1,64 +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 gtx_multiple
-/// @file glm/gtx/multiple.inl
-/// @date 2009-10-26 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- //////////////////////
- // higherMultiple
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType higherMultiple(genType Source, genType Multiple)
- {
- return detail::compute_ceilMultiple<std::numeric_limits<genType>::is_iec559, std::numeric_limits<genType>::is_signed>::call(Source, Multiple);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> higherMultiple(vecType<T, P> const & Source, vecType<T, P> const & Multiple)
- {
- return detail::functor2<T, P, vecType>::call(higherMultiple, Source, Multiple);
- }
-
- //////////////////////
- // lowerMultiple
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType lowerMultiple(genType Source, genType Multiple)
- {
- return detail::compute_floorMultiple<std::numeric_limits<genType>::is_iec559, std::numeric_limits<genType>::is_signed>::call(Source, Multiple);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<T, P> lowerMultiple(vecType<T, P> const & Source, vecType<T, P> const & Multiple)
- {
- return detail::functor2<T, P, vecType>::call(lowerMultiple, Source, Multiple);
- }
-}//namespace glm
diff --git a/inc/glm/gtx/norm.hpp b/inc/glm/gtx/norm.hpp deleted file mode 100644 index ea1ec93..0000000 --- a/inc/glm/gtx/norm.hpp +++ /dev/null @@ -1,128 +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 gtx_norm
-/// @file glm/gtx/norm.hpp
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtx_quaternion (dependence)
-///
-/// @defgroup gtx_norm GLM_GTX_norm
-/// @ingroup gtx
-///
-/// @brief Various ways to compute vector norms.
-///
-/// <glm/gtx/norm.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../gtx/quaternion.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_norm extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_norm
- /// @{
-
- //! Returns the squared length of x.
- //! From GLM_GTX_norm extension.
- template <typename T>
- GLM_FUNC_DECL T length2(
- T const & x);
-
- //! Returns the squared length of x.
- //! From GLM_GTX_norm extension.
- template <typename genType>
- GLM_FUNC_DECL typename genType::value_type length2(
- genType const & x);
-
- //! Returns the squared distance between p0 and p1, i.e., length(p0 - p1).
- //! From GLM_GTX_norm extension.
- template <typename T>
- GLM_FUNC_DECL T distance2(
- T const & p0,
- T const & p1);
-
- //! Returns the squared distance between p0 and p1, i.e., length(p0 - p1).
- //! From GLM_GTX_norm extension.
- template <typename genType>
- GLM_FUNC_DECL typename genType::value_type distance2(
- genType const & p0,
- genType const & p1);
-
- //! Returns the L1 norm between x and y.
- //! From GLM_GTX_norm extension.
- template <typename T, precision P>
- GLM_FUNC_DECL T l1Norm(
- tvec3<T, P> const & x,
- tvec3<T, P> const & y);
-
- //! Returns the L1 norm of v.
- //! From GLM_GTX_norm extension.
- template <typename T, precision P>
- GLM_FUNC_DECL T l1Norm(
- tvec3<T, P> const & v);
-
- //! Returns the L2 norm between x and y.
- //! From GLM_GTX_norm extension.
- template <typename T, precision P>
- GLM_FUNC_DECL T l2Norm(
- tvec3<T, P> const & x,
- tvec3<T, P> const & y);
-
- //! Returns the L2 norm of v.
- //! From GLM_GTX_norm extension.
- template <typename T, precision P>
- GLM_FUNC_DECL T l2Norm(
- tvec3<T, P> const & x);
-
- //! Returns the L norm between x and y.
- //! From GLM_GTX_norm extension.
- template <typename T, precision P>
- GLM_FUNC_DECL T lxNorm(
- tvec3<T, P> const & x,
- tvec3<T, P> const & y,
- unsigned int Depth);
-
- //! Returns the L norm of v.
- //! From GLM_GTX_norm extension.
- template <typename T, precision P>
- GLM_FUNC_DECL T lxNorm(
- tvec3<T, P> const & x,
- unsigned int Depth);
-
- /// @}
-}//namespace glm
-
-#include "norm.inl"
diff --git a/inc/glm/gtx/norm.inl b/inc/glm/gtx/norm.inl deleted file mode 100644 index d5e0ff8..0000000 --- a/inc/glm/gtx/norm.inl +++ /dev/null @@ -1,170 +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 gtx_norm
-/// @file glm/gtx/norm.inl
-/// @date 2005-12-21 / 2008-07-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T>
- GLM_FUNC_QUALIFIER T length2
- (
- T const & x
- )
- {
- return x * x;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T length2
- (
- tvec2<T, P> const & x
- )
- {
- return dot(x, x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T length2
- (
- tvec3<T, P> const & x
- )
- {
- return dot(x, x);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T length2
- (
- tvec4<T, P> const & x
- )
- {
- return dot(x, x);
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER T distance2
- (
- T const & p0,
- T const & p1
- )
- {
- return length2(p1 - p0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T distance2
- (
- tvec2<T, P> const & p0,
- tvec2<T, P> const & p1
- )
- {
- return length2(p1 - p0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T distance2
- (
- tvec3<T, P> const & p0,
- tvec3<T, P> const & p1
- )
- {
- return length2(p1 - p0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T distance2
- (
- tvec4<T, P> const & p0,
- tvec4<T, P> const & p1
- )
- {
- return length2(p1 - p0);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T l1Norm
- (
- tvec3<T, P> const & a,
- tvec3<T, P> const & b
- )
- {
- return abs(b.x - a.x) + abs(b.y - a.y) + abs(b.z - a.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T l1Norm
- (
- tvec3<T, P> const & v
- )
- {
- return abs(v.x) + abs(v.y) + abs(v.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T l2Norm
- (
- tvec3<T, P> const & a,
- tvec3<T, P> const & b
- )
- {
- return length(b - a);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T l2Norm
- (
- tvec3<T, P> const & v
- )
- {
- return length(v);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T lxNorm
- (
- tvec3<T, P> const & x,
- tvec3<T, P> const & y,
- unsigned int Depth
- )
- {
- return pow(pow(y.x - x.x, T(Depth)) + pow(y.y - x.y, T(Depth)) + pow(y.z - x.z, T(Depth)), T(1) / T(Depth));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T lxNorm
- (
- tvec3<T, P> const & v,
- unsigned int Depth
- )
- {
- return pow(pow(v.x, T(Depth)) + pow(v.y, T(Depth)) + pow(v.z, T(Depth)), T(1) / T(Depth));
- }
-
-}//namespace glm
diff --git a/inc/glm/gtx/normal.hpp b/inc/glm/gtx/normal.hpp deleted file mode 100644 index cdaf126..0000000 --- a/inc/glm/gtx/normal.hpp +++ /dev/null @@ -1,68 +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 gtx_normal
-/// @file glm/gtx/normal.hpp
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtx_extented_min_max (dependence)
-///
-/// @defgroup gtx_normal GLM_GTX_normal
-/// @ingroup gtx
-///
-/// @brief Compute the normal of a triangle.
-///
-/// <glm/gtx/normal.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_normal extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_normal
- /// @{
-
- //! Computes triangle normal from triangle points.
- //! From GLM_GTX_normal extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> triangleNormal(
- tvec3<T, P> const & p1,
- tvec3<T, P> const & p2,
- tvec3<T, P> const & p3);
-
- /// @}
-}//namespace glm
-
-#include "normal.inl"
diff --git a/inc/glm/gtx/normal.inl b/inc/glm/gtx/normal.inl deleted file mode 100644 index e20a1c8..0000000 --- a/inc/glm/gtx/normal.inl +++ /dev/null @@ -1,45 +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 gtx_normal
-/// @file glm/gtx/normal.inl
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> triangleNormal
- (
- tvec3<T, P> const & p1,
- tvec3<T, P> const & p2,
- tvec3<T, P> const & p3
- )
- {
- return normalize(cross(p1 - p2, p1 - p3));
- }
-}//namespace glm
diff --git a/inc/glm/gtx/normalize_dot.hpp b/inc/glm/gtx/normalize_dot.hpp deleted file mode 100644 index 7d8aa2a..0000000 --- a/inc/glm/gtx/normalize_dot.hpp +++ /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 gtx_normalize_dot
-/// @file glm/gtx/normalize_dot.hpp
-/// @date 2007-09-28 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtx_fast_square_root (dependence)
-///
-/// @defgroup gtx_normalize_dot GLM_GTX_normalize_dot
-/// @ingroup gtx
-///
-/// @brief Dot product of vectors that need to be normalize with a single square root.
-///
-/// <glm/gtx/normalized_dot.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../gtx/fast_square_root.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_normalize_dot extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_normalize_dot
- /// @{
-
- /// Normalize parameters and returns the dot product of x and y.
- /// It's faster that dot(normalize(x), normalize(y)).
- ///
- /// @see gtx_normalize_dot extension.
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL T normalizeDot(vecType<T, P> const & x, vecType<T, P> const & y);
-
- /// Normalize parameters and returns the dot product of x and y.
- /// Faster that dot(fastNormalize(x), fastNormalize(y)).
- ///
- /// @see gtx_normalize_dot extension.
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL T fastNormalizeDot(vecType<T, P> const & x, vecType<T, P> const & y);
-
- /// @}
-}//namespace glm
-
-#include "normalize_dot.inl"
diff --git a/inc/glm/gtx/normalize_dot.inl b/inc/glm/gtx/normalize_dot.inl deleted file mode 100644 index 6db462a..0000000 --- a/inc/glm/gtx/normalize_dot.inl +++ /dev/null @@ -1,46 +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 gtx_normalize_dot
-/// @file glm/gtx/normalize_dot.inl
-/// @date 2007-09-28 / 2008-10-07
-/// @author Christophe Riccio
-//////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER T normalizeDot(vecType<T, P> const & x, vecType<T, P> const & y)
- {
- return glm::dot(x, y) * glm::inversesqrt(glm::dot(x, x) * glm::dot(y, y));
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER T fastNormalizeDot(vecType<T, P> const & x, vecType<T, P> const & y)
- {
- return glm::dot(x, y) * glm::fastInverseSqrt(glm::dot(x, x) * glm::dot(y, y));
- }
-}//namespace glm
diff --git a/inc/glm/gtx/number_precision.hpp b/inc/glm/gtx/number_precision.hpp deleted file mode 100644 index a438e9f..0000000 --- a/inc/glm/gtx/number_precision.hpp +++ /dev/null @@ -1,86 +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 gtx_number_precision
-/// @file glm/gtx/number_precision.hpp
-/// @date 2007-05-10 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtc_type_precision (dependence)
-/// @see gtc_quaternion (dependence)
-///
-/// @defgroup gtx_number_precision GLM_GTX_number_precision
-/// @ingroup gtx
-///
-/// @brief Defined size types.
-///
-/// <glm/gtx/number_precision.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../gtc/type_precision.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_number_precision extension included")
-#endif
-
-namespace glm{
-namespace gtx
-{
- /////////////////////////////
- // Unsigned int vector types
-
- /// @addtogroup gtx_number_precision
- /// @{
-
- typedef u8 u8vec1; //!< \brief 8bit unsigned integer scalar. (from GLM_GTX_number_precision extension)
- typedef u16 u16vec1; //!< \brief 16bit unsigned integer scalar. (from GLM_GTX_number_precision extension)
- typedef u32 u32vec1; //!< \brief 32bit unsigned integer scalar. (from GLM_GTX_number_precision extension)
- typedef u64 u64vec1; //!< \brief 64bit unsigned integer scalar. (from GLM_GTX_number_precision extension)
-
- //////////////////////
- // Float vector types
-
- typedef f32 f32vec1; //!< \brief Single-precision floating-point scalar. (from GLM_GTX_number_precision extension)
- typedef f64 f64vec1; //!< \brief Single-precision floating-point scalar. (from GLM_GTX_number_precision extension)
-
- //////////////////////
- // Float matrix types
-
- typedef f32 f32mat1; //!< \brief Single-precision floating-point scalar. (from GLM_GTX_number_precision extension)
- typedef f32 f32mat1x1; //!< \brief Single-precision floating-point scalar. (from GLM_GTX_number_precision extension)
- typedef f64 f64mat1; //!< \brief Double-precision floating-point scalar. (from GLM_GTX_number_precision extension)
- typedef f64 f64mat1x1; //!< \brief Double-precision floating-point scalar. (from GLM_GTX_number_precision extension)
-
- /// @}
-}//namespace gtx
-}//namespace glm
-
-#include "number_precision.inl"
diff --git a/inc/glm/gtx/number_precision.inl b/inc/glm/gtx/number_precision.inl deleted file mode 100644 index 7cc8914..0000000 --- a/inc/glm/gtx/number_precision.inl +++ /dev/null @@ -1,36 +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 gtx_number_precision
-/// @file glm/gtx/number_precision.inl
-/// @date 2007-05-10 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
-
-}
diff --git a/inc/glm/gtx/optimum_pow.hpp b/inc/glm/gtx/optimum_pow.hpp deleted file mode 100644 index 9a24f89..0000000 --- a/inc/glm/gtx/optimum_pow.hpp +++ /dev/null @@ -1,79 +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 gtx_optimum_pow
-/// @file glm/gtx/optimum_pow.hpp
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_optimum_pow GLM_GTX_optimum_pow
-/// @ingroup gtx
-///
-/// @brief Integer exponentiation of power functions.
-///
-/// <glm/gtx/optimum_pow.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_optimum_pow extension included")
-#endif
-
-namespace glm{
-namespace gtx
-{
- /// @addtogroup gtx_optimum_pow
- /// @{
-
- /// Returns x raised to the power of 2.
- ///
- /// @see gtx_optimum_pow
- template <typename genType>
- GLM_FUNC_DECL genType pow2(genType const & x);
-
- /// Returns x raised to the power of 3.
- ///
- /// @see gtx_optimum_pow
- template <typename genType>
- GLM_FUNC_DECL genType pow3(genType const & x);
-
- /// Returns x raised to the power of 4.
- ///
- /// @see gtx_optimum_pow
- template <typename genType>
- GLM_FUNC_DECL genType pow4(genType const & x);
-
- /// @}
-}//namespace gtx
-}//namespace glm
-
-#include "optimum_pow.inl"
diff --git a/inc/glm/gtx/optimum_pow.inl b/inc/glm/gtx/optimum_pow.inl deleted file mode 100644 index 3c0d2e4..0000000 --- a/inc/glm/gtx/optimum_pow.inl +++ /dev/null @@ -1,52 +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 gtx_optimum_pow
-/// @file glm/gtx/optimum_pow.inl
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename genType>
- GLM_FUNC_QUALIFIER genType pow2(genType const & x)
- {
- return x * x;
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType pow3(genType const & x)
- {
- return x * x * x;
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType pow4(genType const & x)
- {
- return (x * x) * (x * x);
- }
-}//namespace glm
diff --git a/inc/glm/gtx/orthonormalize.hpp b/inc/glm/gtx/orthonormalize.hpp deleted file mode 100644 index ce80c96..0000000 --- a/inc/glm/gtx/orthonormalize.hpp +++ /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 gtx_orthonormalize
-/// @file glm/gtx/orthonormalize.hpp
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtx_extented_min_max (dependence)
-///
-/// @defgroup gtx_orthonormalize GLM_GTX_orthonormalize
-/// @ingroup gtx
-///
-/// @brief Orthonormalize matrices.
-///
-/// <glm/gtx/orthonormalize.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../vec3.hpp"
-#include "../mat3x3.hpp"
-#include "../geometric.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_orthonormalize extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_orthonormalize
- /// @{
-
- /// Returns the orthonormalized matrix of m.
- ///
- /// @see gtx_orthonormalize
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> orthonormalize(tmat3x3<T, P> const & m);
-
- /// Orthonormalizes x according y.
- ///
- /// @see gtx_orthonormalize
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> orthonormalize(tvec3<T, P> const & x, tvec3<T, P> const & y);
-
- /// @}
-}//namespace glm
-
-#include "orthonormalize.inl"
diff --git a/inc/glm/gtx/orthonormalize.inl b/inc/glm/gtx/orthonormalize.inl deleted file mode 100644 index 461f84b..0000000 --- a/inc/glm/gtx/orthonormalize.inl +++ /dev/null @@ -1,59 +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 gtx_orthonormalize
-/// @file glm/gtx/orthonormalize.inl
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> orthonormalize(tmat3x3<T, P> const & m)
- {
- tmat3x3<T, P> r = m;
-
- r[0] = normalize(r[0]);
-
- T d0 = dot(r[0], r[1]);
- r[1] -= r[0] * d0;
- r[1] = normalize(r[1]);
-
- T d1 = dot(r[1], r[2]);
- d0 = dot(r[0], r[2]);
- r[2] -= r[0] * d0 + r[1] * d1;
- r[2] = normalize(r[2]);
-
- return r;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> orthonormalize(tvec3<T, P> const & x, tvec3<T, P> const & y)
- {
- return normalize(x - y * dot(y, x));
- }
-}//namespace glm
diff --git a/inc/glm/gtx/perpendicular.hpp b/inc/glm/gtx/perpendicular.hpp deleted file mode 100644 index d65f194..0000000 --- a/inc/glm/gtx/perpendicular.hpp +++ /dev/null @@ -1,68 +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 gtx_perpendicular
-/// @file glm/gtx/perpendicular.hpp
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtx_projection (dependence)
-///
-/// @defgroup gtx_perpendicular GLM_GTX_perpendicular
-/// @ingroup gtx
-///
-/// @brief Perpendicular of a vector from other one
-///
-/// <glm/gtx/perpendicular.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../gtx/projection.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_perpendicular extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_perpendicular
- /// @{
-
- //! Projects x a perpendicular axis of Normal.
- //! From GLM_GTX_perpendicular extension.
- template <typename vecType>
- GLM_FUNC_DECL vecType perp(
- vecType const & x,
- vecType const & Normal);
-
- /// @}
-}//namespace glm
-
-#include "perpendicular.inl"
diff --git a/inc/glm/gtx/perpendicular.inl b/inc/glm/gtx/perpendicular.inl deleted file mode 100644 index 22bbb23..0000000 --- a/inc/glm/gtx/perpendicular.inl +++ /dev/null @@ -1,44 +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 gtx_perpendicular
-/// @file glm/gtx/perpendicular.inl
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename vecType>
- GLM_FUNC_QUALIFIER vecType perp
- (
- vecType const & x,
- vecType const & Normal
- )
- {
- return x - proj(x, Normal);
- }
-}//namespace glm
diff --git a/inc/glm/gtx/polar_coordinates.hpp b/inc/glm/gtx/polar_coordinates.hpp deleted file mode 100644 index 9076b21..0000000 --- a/inc/glm/gtx/polar_coordinates.hpp +++ /dev/null @@ -1,73 +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 gtx_polar_coordinates
-/// @file glm/gtx/polar_coordinates.hpp
-/// @date 2007-03-06 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_polar_coordinates GLM_GTX_polar_coordinates
-/// @ingroup gtx
-///
-/// @brief Conversion from Euclidean space to polar space and revert.
-///
-/// <glm/gtx/polar_coordinates.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_polar_coordinates extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_polar_coordinates
- /// @{
-
- /// Convert Euclidean to Polar coordinates, x is the xz distance, y, the latitude and z the longitude.
- ///
- /// @see gtx_polar_coordinates
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> polar(
- tvec3<T, P> const & euclidean);
-
- /// Convert Polar to Euclidean coordinates.
- ///
- /// @see gtx_polar_coordinates
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> euclidean(
- tvec2<T, P> const & polar);
-
- /// @}
-}//namespace glm
-
-#include "polar_coordinates.inl"
diff --git a/inc/glm/gtx/polar_coordinates.inl b/inc/glm/gtx/polar_coordinates.inl deleted file mode 100644 index 4de58e3..0000000 --- a/inc/glm/gtx/polar_coordinates.inl +++ /dev/null @@ -1,66 +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 gtx_polar_coordinates
-/// @file glm/gtx/polar_coordinates.inl
-/// @date 2007-03-06 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> polar
- (
- tvec3<T, P> const & euclidean
- )
- {
- T const Length(length(euclidean));
- tvec3<T, P> const tmp(euclidean / Length);
- T const xz_dist(sqrt(tmp.x * tmp.x + tmp.z * tmp.z));
-
- return tvec3<T, P>(
- atan(xz_dist, tmp.y), // latitude
- atan(tmp.x, tmp.z), // longitude
- xz_dist); // xz distance
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> euclidean
- (
- tvec2<T, P> const & polar
- )
- {
- T const latitude(polar.x);
- T const longitude(polar.y);
-
- return tvec3<T, P>(
- cos(latitude) * sin(longitude),
- sin(latitude),
- cos(latitude) * cos(longitude));
- }
-
-}//namespace glm
diff --git a/inc/glm/gtx/projection.hpp b/inc/glm/gtx/projection.hpp deleted file mode 100644 index 4e8fc75..0000000 --- a/inc/glm/gtx/projection.hpp +++ /dev/null @@ -1,65 +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 gtx_projection
-/// @file glm/gtx/projection.hpp
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_projection GLM_GTX_projection
-/// @ingroup gtx
-///
-/// @brief Projection of a vector to other one
-///
-/// <glm/gtx/projection.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../geometric.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_projection extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_projection
- /// @{
-
- /// Projects x on Normal.
- ///
- /// @see gtx_projection
- template <typename vecType>
- GLM_FUNC_DECL vecType proj(vecType const & x, vecType const & Normal);
-
- /// @}
-}//namespace glm
-
-#include "projection.inl"
diff --git a/inc/glm/gtx/projection.inl b/inc/glm/gtx/projection.inl deleted file mode 100644 index ce742a8..0000000 --- a/inc/glm/gtx/projection.inl +++ /dev/null @@ -1,40 +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 gtx_projection
-/// @file glm/gtx/projection.inl
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename vecType>
- GLM_FUNC_QUALIFIER vecType proj(vecType const & x, vecType const & Normal)
- {
- return glm::dot(x, Normal) / glm::dot(Normal, Normal) * Normal;
- }
-}//namespace glm
diff --git a/inc/glm/gtx/quaternion.hpp b/inc/glm/gtx/quaternion.hpp deleted file mode 100644 index 96495d1..0000000 --- a/inc/glm/gtx/quaternion.hpp +++ /dev/null @@ -1,214 +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 gtx_quaternion
-/// @file glm/gtx/quaternion.hpp
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtx_extented_min_max (dependence)
-///
-/// @defgroup gtx_quaternion GLM_GTX_quaternion
-/// @ingroup gtx
-///
-/// @brief Extented quaternion types and functions
-///
-/// <glm/gtx/quaternion.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../gtc/constants.hpp"
-#include "../gtc/quaternion.hpp"
-#include "../gtx/norm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_quaternion extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_quaternion
- /// @{
-
- //! Compute a cross product between a quaternion and a vector.
- ///
- /// @see gtx_quaternion
- template<typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> cross(
- tquat<T, P> const & q,
- tvec3<T, P> const & v);
-
- //! Compute a cross product between a vector and a quaternion.
- ///
- /// @see gtx_quaternion
- template<typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> cross(
- tvec3<T, P> const & v,
- tquat<T, P> const & q);
-
- //! Compute a point on a path according squad equation.
- //! q1 and q2 are control points; s1 and s2 are intermediate control points.
- ///
- /// @see gtx_quaternion
- template<typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> squad(
- tquat<T, P> const & q1,
- tquat<T, P> const & q2,
- tquat<T, P> const & s1,
- tquat<T, P> const & s2,
- T const & h);
-
- //! Returns an intermediate control point for squad interpolation.
- ///
- /// @see gtx_quaternion
- template<typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> intermediate(
- tquat<T, P> const & prev,
- tquat<T, P> const & curr,
- tquat<T, P> const & next);
-
- //! Returns a exp of a quaternion.
- ///
- /// @see gtx_quaternion
- template<typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> exp(
- tquat<T, P> const & q);
-
- //! Returns a log of a quaternion.
- ///
- /// @see gtx_quaternion
- template<typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> log(
- tquat<T, P> const & q);
-
- /// Returns x raised to the y power.
- ///
- /// @see gtx_quaternion
- template<typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> pow(
- tquat<T, P> const & x,
- T const & y);
-
- //! Returns quarternion square root.
- ///
- /// @see gtx_quaternion
- //template<typename T, precision P>
- //tquat<T, P> sqrt(
- // tquat<T, P> const & q);
-
- //! Rotates a 3 components vector by a quaternion.
- ///
- /// @see gtx_quaternion
- template<typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> rotate(
- tquat<T, P> const & q,
- tvec3<T, P> const & v);
-
- /// Rotates a 4 components vector by a quaternion.
- ///
- /// @see gtx_quaternion
- template<typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> rotate(
- tquat<T, P> const & q,
- tvec4<T, P> const & v);
-
- /// Extract the real component of a quaternion.
- ///
- /// @see gtx_quaternion
- template<typename T, precision P>
- GLM_FUNC_DECL T extractRealComponent(
- tquat<T, P> const & q);
-
- /// Converts a quaternion to a 3 * 3 matrix.
- ///
- /// @see gtx_quaternion
- template<typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> toMat3(
- tquat<T, P> const & x){return mat3_cast(x);}
-
- /// Converts a quaternion to a 4 * 4 matrix.
- ///
- /// @see gtx_quaternion
- template<typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> toMat4(
- tquat<T, P> const & x){return mat4_cast(x);}
-
- /// Converts a 3 * 3 matrix to a quaternion.
- ///
- /// @see gtx_quaternion
- template<typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> toQuat(
- tmat3x3<T, P> const & x){return quat_cast(x);}
-
- /// Converts a 4 * 4 matrix to a quaternion.
- ///
- /// @see gtx_quaternion
- template<typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> toQuat(
- tmat4x4<T, P> const & x){return quat_cast(x);}
-
- /// Quaternion interpolation using the rotation short path.
- ///
- /// @see gtx_quaternion
- template<typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> shortMix(
- tquat<T, P> const & x,
- tquat<T, P> const & y,
- T const & a);
-
- /// Quaternion normalized linear interpolation.
- ///
- /// @see gtx_quaternion
- template<typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> fastMix(
- tquat<T, P> const & x,
- tquat<T, P> const & y,
- T const & a);
-
- /// Compute the rotation between two vectors.
- /// param orig vector, needs to be normalized
- /// param dest vector, needs to be normalized
- ///
- /// @see gtx_quaternion
- template<typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> rotation(
- tvec3<T, P> const & orig,
- tvec3<T, P> const & dest);
-
- /// Returns the squared length of x.
- ///
- /// @see gtx_quaternion
- template<typename T, precision P>
- GLM_FUNC_DECL T length2(tquat<T, P> const & q);
-
- /// @}
-}//namespace glm
-
-#include "quaternion.inl"
diff --git a/inc/glm/gtx/quaternion.inl b/inc/glm/gtx/quaternion.inl deleted file mode 100644 index 9db6a1c..0000000 --- a/inc/glm/gtx/quaternion.inl +++ /dev/null @@ -1,285 +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 gtx_quaternion
-/// @file glm/gtx/quaternion.inl
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#include <limits>
-#include "../gtc/constants.hpp"
-
-namespace glm
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> cross
- (
- tvec3<T, P> const & v,
- tquat<T, P> const & q
- )
- {
- return inverse(q) * v;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> cross
- (
- tquat<T, P> const & q,
- tvec3<T, P> const & v
- )
- {
- return q * v;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> squad
- (
- tquat<T, P> const & q1,
- tquat<T, P> const & q2,
- tquat<T, P> const & s1,
- tquat<T, P> const & s2,
- T const & h)
- {
- return mix(mix(q1, q2, h), mix(s1, s2, h), static_cast<T>(2) * (static_cast<T>(1) - h) * h);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> intermediate
- (
- tquat<T, P> const & prev,
- tquat<T, P> const & curr,
- tquat<T, P> const & next
- )
- {
- tquat<T, P> invQuat = inverse(curr);
- return exp((log(next + invQuat) + log(prev + invQuat)) / static_cast<T>(-4)) * curr;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> exp
- (
- tquat<T, P> const & q
- )
- {
- tvec3<T, P> u(q.x, q.y, q.z);
- T Angle = glm::length(u);
- if (Angle < epsilon<T>())
- return tquat<T, P>();
-
- tvec3<T, P> v(u / Angle);
- return tquat<T, P>(cos(Angle), sin(Angle) * v);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> log
- (
- tquat<T, P> const & q
- )
- {
- tvec3<T, P> u(q.x, q.y, q.z);
- T Vec3Len = length(u);
-
- if (Vec3Len < epsilon<T>())
- {
- if(q.w > static_cast<T>(0))
- return tquat<T, P>(log(q.w), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
- else if(q.w < static_cast<T>(0))
- return tquat<T, P>(log(-q.w), pi<T>(), static_cast<T>(0), static_cast<T>(0));
- else
- return tquat<T, P>(std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity());
- }
- else
- {
- T QuatLen = sqrt(Vec3Len * Vec3Len + q.w * q.w);
- T t = atan(Vec3Len, T(q.w)) / Vec3Len;
- return tquat<T, P>(log(QuatLen), t * q.x, t * q.y, t * q.z);
- }
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> pow
- (
- tquat<T, P> const & x,
- T const & y
- )
- {
- if(abs(x.w) > (static_cast<T>(1) - epsilon<T>()))
- return x;
- T Angle = acos(y);
- T NewAngle = Angle * y;
- T Div = sin(NewAngle) / sin(Angle);
- return tquat<T, P>(
- cos(NewAngle),
- x.x * Div,
- x.y * Div,
- x.z * Div);
- }
-
- //template <typename T, precision P>
- //GLM_FUNC_QUALIFIER tquat<T, P> sqrt
- //(
- // tquat<T, P> const & q
- //)
- //{
- // T q0 = static_cast<T>(1) - dot(q, q);
- // return T(2) * (T(1) + q0) * q;
- //}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> rotate
- (
- tquat<T, P> const & q,
- tvec3<T, P> const & v
- )
- {
- return q * v;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> rotate
- (
- tquat<T, P> const & q,
- tvec4<T, P> const & v
- )
- {
- return q * v;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T extractRealComponent
- (
- tquat<T, P> const & q
- )
- {
- T w = static_cast<T>(1) - q.x * q.x - q.y * q.y - q.z * q.z;
- if(w < T(0))
- return T(0);
- else
- return -sqrt(w);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T length2
- (
- tquat<T, P> const & q
- )
- {
- return q.x * q.x + q.y * q.y + q.z * q.z + q.w * q.w;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> shortMix
- (
- tquat<T, P> const & x,
- tquat<T, P> const & y,
- T const & a
- )
- {
- if(a <= static_cast<T>(0)) return x;
- if(a >= static_cast<T>(1)) return y;
-
- T fCos = dot(x, y);
- tquat<T, P> y2(y); //BUG!!! tquat<T> y2;
- if(fCos < static_cast<T>(0))
- {
- y2 = -y;
- fCos = -fCos;
- }
-
- //if(fCos > 1.0f) // problem
- T k0, k1;
- if(fCos > (static_cast<T>(1) - epsilon<T>()))
- {
- k0 = static_cast<T>(1) - a;
- k1 = static_cast<T>(0) + a; //BUG!!! 1.0f + a;
- }
- else
- {
- T fSin = sqrt(T(1) - fCos * fCos);
- T fAngle = atan(fSin, fCos);
- T fOneOverSin = static_cast<T>(1) / fSin;
- k0 = sin((static_cast<T>(1) - a) * fAngle) * fOneOverSin;
- k1 = sin((static_cast<T>(0) + a) * fAngle) * fOneOverSin;
- }
-
- return tquat<T, P>(
- k0 * x.w + k1 * y2.w,
- k0 * x.x + k1 * y2.x,
- k0 * x.y + k1 * y2.y,
- k0 * x.z + k1 * y2.z);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> fastMix
- (
- tquat<T, P> const & x,
- tquat<T, P> const & y,
- T const & a
- )
- {
- return glm::normalize(x * (static_cast<T>(1) - a) + (y * a));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> rotation
- (
- tvec3<T, P> const & orig,
- tvec3<T, P> const & dest
- )
- {
- T cosTheta = dot(orig, dest);
- tvec3<T, P> rotationAxis;
-
- if(cosTheta < static_cast<T>(-1) + epsilon<T>())
- {
- // special case when vectors in opposite directions :
- // there is no "ideal" rotation axis
- // So guess one; any will do as long as it's perpendicular to start
- // This implementation favors a rotation around the Up axis (Y),
- // since it's often what you want to do.
- rotationAxis = cross(tvec3<T, P>(0, 0, 1), orig);
- if(length2(rotationAxis) < epsilon<T>()) // bad luck, they were parallel, try again!
- rotationAxis = cross(tvec3<T, P>(1, 0, 0), orig);
-
- rotationAxis = normalize(rotationAxis);
- return angleAxis(pi<T>(), rotationAxis);
- }
-
- // Implementation from Stan Melax's Game Programming Gems 1 article
- rotationAxis = cross(orig, dest);
-
- T s = sqrt((T(1) + cosTheta) * static_cast<T>(2));
- T invs = static_cast<T>(1) / s;
-
- return tquat<T, P>(
- s * static_cast<T>(0.5f),
- rotationAxis.x * invs,
- rotationAxis.y * invs,
- rotationAxis.z * invs);
- }
-
-}//namespace glm
diff --git a/inc/glm/gtx/range.hpp b/inc/glm/gtx/range.hpp deleted file mode 100644 index 9cf82ad..0000000 --- a/inc/glm/gtx/range.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 gtx_range
-/// @file glm/gtx/range.hpp
-/// @date 2014-09-19 / 2014-09-19
-/// @author Joshua Moerman
-///
-/// @defgroup gtx_range GLM_GTX_range
-/// @ingroup gtx
-///
-/// @brief Defines begin and end for vectors and matrices. Useful for range-based for loop.
-/// The range is defined over the elements, not over columns or rows (e.g. mat4 has 16 elements).
-///
-/// <glm/gtx/range.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependencies
-#include "../detail/setup.hpp"
-
-#if !GLM_HAS_RANGE_FOR
-# error "GLM_GTX_range requires C++11 suppport or 'range for'"
-#endif
-
-#include "../gtc/type_ptr.hpp"
-
-namespace glm{
-namespace detail
-{
- /* The glm types provide a .length() member, but for matrices
- this only defines the number of columns, so we need to work around this */
- template <typename T, precision P>
- detail::component_count_t number_of_elements_(tvec2<T, P> const & v){
- return detail::component_count(v);
- }
-
- template <typename T, precision P>
- detail::component_count_t number_of_elements_(tvec3<T, P> const & v){
- return detail::component_count(v);
- }
-
- template <typename T, precision P>
- detail::component_count_t number_of_elements_(tvec4<T, P> const & v){
- return detail::component_count(v);
- }
-
- template <typename genType>
- detail::component_count_t number_of_elements_(genType const & m){
- return detail::component_count(m) * detail::component_count(m[0]);
- }
-}//namespace
-
- /// @addtogroup gtx_range
- /// @{
-
- template <typename genType>
- const typename genType::value_type * begin(genType const & v){
- return value_ptr(v);
- }
-
- template <typename genType>
- const typename genType::value_type * end(genType const & v){
- return begin(v) + detail::number_of_elements_(v);
- }
-
- template <typename genType>
- typename genType::value_type * begin(genType& v){
- return value_ptr(v);
- }
-
- template <typename genType>
- typename genType::value_type * end(genType& v){
- return begin(v) + detail::number_of_elements_(v);
- }
-
- /// @}
-}//namespace glm
diff --git a/inc/glm/gtx/raw_data.hpp b/inc/glm/gtx/raw_data.hpp deleted file mode 100644 index 7a38b05..0000000 --- a/inc/glm/gtx/raw_data.hpp +++ /dev/null @@ -1,76 +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 gtx_raw_data
-/// @file glm/gtx/raw_data.hpp
-/// @date 2008-11-19 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_raw_data GLM_GTX_raw_data
-/// @ingroup gtx
-///
-/// @brief Projection of a vector to other one
-///
-/// <glm/gtx/raw_data.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependencies
-#include "../detail/setup.hpp"
-#include "../detail/type_int.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_raw_data extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_raw_data
- /// @{
-
- //! Type for byte numbers.
- //! From GLM_GTX_raw_data extension.
- typedef detail::uint8 byte;
-
- //! Type for word numbers.
- //! From GLM_GTX_raw_data extension.
- typedef detail::uint16 word;
-
- //! Type for dword numbers.
- //! From GLM_GTX_raw_data extension.
- typedef detail::uint32 dword;
-
- //! Type for qword numbers.
- //! From GLM_GTX_raw_data extension.
- typedef detail::uint64 qword;
-
- /// @}
-}// namespace glm
-
-#include "raw_data.inl"
diff --git a/inc/glm/gtx/raw_data.inl b/inc/glm/gtx/raw_data.inl deleted file mode 100644 index 5e7e9e3..0000000 --- a/inc/glm/gtx/raw_data.inl +++ /dev/null @@ -1,31 +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 gtx_raw_data
-/// @file glm/gtx/raw_data.inl
-/// @date 2008-11-19 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
diff --git a/inc/glm/gtx/rotate_normalized_axis.hpp b/inc/glm/gtx/rotate_normalized_axis.hpp deleted file mode 100644 index 9d2a3df..0000000 --- a/inc/glm/gtx/rotate_normalized_axis.hpp +++ /dev/null @@ -1,93 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////////
-/// OpenGL Mathematics (glm.g-truc.net)
-///
-/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net)
-/// Permission is hereby granted, free of charge, to any person obtaining a copy
-/// of this software and associated documentation files (the "Software"), to deal
-/// in the Software without restriction, including without limitation the rights
-/// 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 gtx_rotate_normalized_axis
-/// @file glm/gtx/rotate_normalized_axis.hpp
-/// @date 2012-12-13 / 2012-12-13
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtc_matrix_transform
-/// @see gtc_quaternion
-///
-/// @defgroup gtx_rotate_normalized_axis GLM_GTX_rotate_normalized_axis
-/// @ingroup gtx
-///
-/// @brief Quaternions and matrices rotations around normalized axis.
-///
-/// <glm/gtx/rotate_normalized_axis.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../gtc/epsilon.hpp"
-#include "../gtc/quaternion.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_rotate_normalized_axis extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_rotate_normalized_axis
- /// @{
-
- /// Builds a rotation 4 * 4 matrix created from a normalized axis and an angle.
- ///
- /// @param m Input matrix multiplied by this rotation matrix.
- /// @param angle Rotation angle expressed in radians if GLM_FORCE_RADIANS is define or degrees otherwise.
- /// @param axis Rotation axis, must be normalized.
- /// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
- ///
- /// @see gtx_rotate_normalized_axis
- /// @see - rotate(T angle, T x, T y, T z)
- /// @see - rotate(tmat4x4<T, P> const & m, T angle, T x, T y, T z)
- /// @see - rotate(T angle, tvec3<T, P> const & v)
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> rotateNormalizedAxis(
- tmat4x4<T, P> const & m,
- T const & angle,
- tvec3<T, P> const & axis);
-
- /// Rotates a quaternion from a vector of 3 components normalized axis and an angle.
- ///
- /// @param q Source orientation
- /// @param angle Angle expressed in radians if GLM_FORCE_RADIANS is define or degrees otherwise.
- /// @param axis Normalized axis of the rotation, must be normalized.
- ///
- /// @see gtx_rotate_normalized_axis
- template <typename T, precision P>
- GLM_FUNC_DECL tquat<T, P> rotateNormalizedAxis(
- tquat<T, P> const & q,
- T const & angle,
- tvec3<T, P> const & axis);
-
- /// @}
-}//namespace glm
-
-#include "rotate_normalized_axis.inl"
diff --git a/inc/glm/gtx/rotate_normalized_axis.inl b/inc/glm/gtx/rotate_normalized_axis.inl deleted file mode 100644 index 54f95a4..0000000 --- a/inc/glm/gtx/rotate_normalized_axis.inl +++ /dev/null @@ -1,88 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////////
-/// OpenGL Mathematics (glm.g-truc.net)
-///
-/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net)
-/// Permission is hereby granted, free of charge, to any person obtaining a copy
-/// of this software and associated documentation files (the "Software"), to deal
-/// in the Software without restriction, including without limitation the rights
-/// 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 gtx_rotate_normalized_axis
-/// @file glm/gtx/rotate_normalized_axis.inl
-/// @date 2012-12-13 / 2012-12-13
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> rotateNormalizedAxis
- (
- tmat4x4<T, P> const & m,
- T const & angle,
- tvec3<T, P> const & v
- )
- {
- T const a = angle;
- T const c = cos(a);
- T const s = sin(a);
-
- tvec3<T, P> const axis(v);
-
- tvec3<T, P> const temp((static_cast<T>(1) - c) * axis);
-
- tmat4x4<T, P> Rotate(uninitialize);
- Rotate[0][0] = c + temp[0] * axis[0];
- Rotate[0][1] = 0 + temp[0] * axis[1] + s * axis[2];
- Rotate[0][2] = 0 + temp[0] * axis[2] - s * axis[1];
-
- Rotate[1][0] = 0 + temp[1] * axis[0] - s * axis[2];
- Rotate[1][1] = c + temp[1] * axis[1];
- Rotate[1][2] = 0 + temp[1] * axis[2] + s * axis[0];
-
- Rotate[2][0] = 0 + temp[2] * axis[0] + s * axis[1];
- Rotate[2][1] = 0 + temp[2] * axis[1] - s * axis[0];
- Rotate[2][2] = c + temp[2] * axis[2];
-
- tmat4x4<T, P> Result(uninitialize);
- Result[0] = m[0] * Rotate[0][0] + m[1] * Rotate[0][1] + m[2] * Rotate[0][2];
- Result[1] = m[0] * Rotate[1][0] + m[1] * Rotate[1][1] + m[2] * Rotate[1][2];
- Result[2] = m[0] * Rotate[2][0] + m[1] * Rotate[2][1] + m[2] * Rotate[2][2];
- Result[3] = m[3];
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> rotateNormalizedAxis
- (
- tquat<T, P> const & q,
- T const & angle,
- tvec3<T, P> const & v
- )
- {
- tvec3<T, P> const Tmp(v);
-
- T const AngleRad(angle);
- T const Sin = sin(AngleRad * T(0.5));
-
- return q * tquat<T, P>(cos(AngleRad * static_cast<T>(0.5)), Tmp.x * Sin, Tmp.y * Sin, Tmp.z * Sin);
- //return gtc::quaternion::cross(q, tquat<T, P>(cos(AngleRad * T(0.5)), Tmp.x * fSin, Tmp.y * fSin, Tmp.z * fSin));
- }
-}//namespace glm
diff --git a/inc/glm/gtx/rotate_vector.hpp b/inc/glm/gtx/rotate_vector.hpp deleted file mode 100644 index 8f44c45..0000000 --- a/inc/glm/gtx/rotate_vector.hpp +++ /dev/null @@ -1,146 +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 gtx_rotate_vector
-/// @file glm/gtx/rotate_vector.hpp
-/// @date 2006-11-02 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtx_transform (dependence)
-///
-/// @defgroup gtx_rotate_vector GLM_GTX_rotate_vector
-/// @ingroup gtx
-///
-/// @brief Function to directly rotate a vector
-///
-/// <glm/gtx/rotate_vector.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../gtx/transform.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_rotate_vector extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_rotate_vector
- /// @{
-
- /// Returns Spherical interpolation between two vectors
- ///
- /// @param x A first vector
- /// @param y A second vector
- /// @param a Interpolation factor. The interpolation is defined beyond the range [0, 1].
- ///
- /// @see gtx_rotate_vector
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> slerp(
- tvec3<T, P> const & x,
- tvec3<T, P> const & y,
- T const & a);
-
- //! Rotate a two dimensional vector.
- //! From GLM_GTX_rotate_vector extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tvec2<T, P> rotate(
- tvec2<T, P> const & v,
- T const & angle);
-
- //! Rotate a three dimensional vector around an axis.
- //! From GLM_GTX_rotate_vector extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> rotate(
- tvec3<T, P> const & v,
- T const & angle,
- tvec3<T, P> const & normal);
-
- //! Rotate a four dimensional vector around an axis.
- //! From GLM_GTX_rotate_vector extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> rotate(
- tvec4<T, P> const & v,
- T const & angle,
- tvec3<T, P> const & normal);
-
- //! Rotate a three dimensional vector around the X axis.
- //! From GLM_GTX_rotate_vector extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> rotateX(
- tvec3<T, P> const & v,
- T const & angle);
-
- //! Rotate a three dimensional vector around the Y axis.
- //! From GLM_GTX_rotate_vector extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> rotateY(
- tvec3<T, P> const & v,
- T const & angle);
-
- //! Rotate a three dimensional vector around the Z axis.
- //! From GLM_GTX_rotate_vector extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tvec3<T, P> rotateZ(
- tvec3<T, P> const & v,
- T const & angle);
-
- //! Rotate a four dimentionnals vector around the X axis.
- //! From GLM_GTX_rotate_vector extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> rotateX(
- tvec4<T, P> const & v,
- T const & angle);
-
- //! Rotate a four dimensional vector around the X axis.
- //! From GLM_GTX_rotate_vector extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> rotateY(
- tvec4<T, P> const & v,
- T const & angle);
-
- //! Rotate a four dimensional vector around the X axis.
- //! From GLM_GTX_rotate_vector extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tvec4<T, P> rotateZ(
- tvec4<T, P> const & v,
- T const & angle);
-
- //! Build a rotation matrix from a normal and a up vector.
- //! From GLM_GTX_rotate_vector extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> orientation(
- tvec3<T, P> const & Normal,
- tvec3<T, P> const & Up);
-
- /// @}
-}//namespace glm
-
-#include "rotate_vector.inl"
diff --git a/inc/glm/gtx/rotate_vector.inl b/inc/glm/gtx/rotate_vector.inl deleted file mode 100644 index dc1d07c..0000000 --- a/inc/glm/gtx/rotate_vector.inl +++ /dev/null @@ -1,217 +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 gtx_rotate_vector
-/// @file glm/gtx/rotate_vector.inl
-/// @date 2006-11-02 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> slerp
- (
- tvec3<T, P> const & x,
- tvec3<T, P> const & y,
- T const & a
- )
- {
- // get cosine of angle between vectors (-1 -> 1)
- T CosAlpha = dot(x, y);
- // get angle (0 -> pi)
- T Alpha = acos(CosAlpha);
- // get sine of angle between vectors (0 -> 1)
- T SinAlpha = sin(Alpha);
- // this breaks down when SinAlpha = 0, i.e. Alpha = 0 or pi
- T t1 = sin((static_cast<T>(1) - a) * Alpha) / SinAlpha;
- T t2 = sin(a * Alpha) / SinAlpha;
-
- // interpolate src vectors
- return x * t1 + y * t2;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> rotate
- (
- tvec2<T, P> const & v,
- T const & angle
- )
- {
- tvec2<T, P> Result;
- T const Cos(cos(angle));
- T const Sin(sin(angle));
-
- Result.x = v.x * Cos - v.y * Sin;
- Result.y = v.x * Sin + v.y * Cos;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> rotate
- (
- tvec3<T, P> const & v,
- T const & angle,
- tvec3<T, P> const & normal
- )
- {
- return tmat3x3<T, P>(glm::rotate(angle, normal)) * v;
- }
- /*
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> rotateGTX(
- const tvec3<T, P>& x,
- T angle,
- const tvec3<T, P>& normal)
- {
- const T Cos = cos(radians(angle));
- const T Sin = sin(radians(angle));
- return x * Cos + ((x * normal) * (T(1) - Cos)) * normal + cross(x, normal) * Sin;
- }
- */
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> rotate
- (
- tvec4<T, P> const & v,
- T const & angle,
- tvec3<T, P> const & normal
- )
- {
- return rotate(angle, normal) * v;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> rotateX
- (
- tvec3<T, P> const & v,
- T const & angle
- )
- {
- tvec3<T, P> Result(v);
- T const Cos(cos(angle));
- T const Sin(sin(angle));
-
- Result.y = v.y * Cos - v.z * Sin;
- Result.z = v.y * Sin + v.z * Cos;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> rotateY
- (
- tvec3<T, P> const & v,
- T const & angle
- )
- {
- tvec3<T, P> Result = v;
- T const Cos(cos(angle));
- T const Sin(sin(angle));
-
- Result.x = v.x * Cos + v.z * Sin;
- Result.z = -v.x * Sin + v.z * Cos;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> rotateZ
- (
- tvec3<T, P> const & v,
- T const & angle
- )
- {
- tvec3<T, P> Result = v;
- T const Cos(cos(angle));
- T const Sin(sin(angle));
-
- Result.x = v.x * Cos - v.y * Sin;
- Result.y = v.x * Sin + v.y * Cos;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> rotateX
- (
- tvec4<T, P> const & v,
- T const & angle
- )
- {
- tvec4<T, P> Result = v;
- T const Cos(cos(angle));
- T const Sin(sin(angle));
-
- Result.y = v.y * Cos - v.z * Sin;
- Result.z = v.y * Sin + v.z * Cos;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> rotateY
- (
- tvec4<T, P> const & v,
- T const & angle
- )
- {
- tvec4<T, P> Result = v;
- T const Cos(cos(angle));
- T const Sin(sin(angle));
-
- Result.x = v.x * Cos + v.z * Sin;
- Result.z = -v.x * Sin + v.z * Cos;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> rotateZ
- (
- tvec4<T, P> const & v,
- T const & angle
- )
- {
- tvec4<T, P> Result = v;
- T const Cos(cos(angle));
- T const Sin(sin(angle));
-
- Result.x = v.x * Cos - v.y * Sin;
- Result.y = v.x * Sin + v.y * Cos;
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> orientation
- (
- tvec3<T, P> const & Normal,
- tvec3<T, P> const & Up
- )
- {
- if(all(equal(Normal, Up)))
- return tmat4x4<T, P>(T(1));
-
- tvec3<T, P> RotationAxis = cross(Up, Normal);
- T Angle = acos(dot(Normal, Up));
-
- return rotate(Angle, RotationAxis);
- }
-}//namespace glm
diff --git a/inc/glm/gtx/scalar_multiplication.hpp b/inc/glm/gtx/scalar_multiplication.hpp deleted file mode 100644 index d5f176a..0000000 --- a/inc/glm/gtx/scalar_multiplication.hpp +++ /dev/null @@ -1,98 +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 gtx
-/// @file glm/gtx/scalar_multiplication.hpp
-/// @date 2014-09-22 / 2014-09-22
-/// @author Joshua Moerman
-///
-/// @brief Enables scalar multiplication for all types
-///
-/// Since GLSL is very strict about types, the following (often used) combinations do not work:
-/// double * vec4
-/// int * vec4
-/// vec4 / int
-/// So we'll fix that! Of course "float * vec4" should remain the same (hence the enable_if magic)
-///
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "../detail/setup.hpp"
-
-#if !GLM_HAS_TEMPLATE_ALIASES && !(GLM_COMPILER & GLM_COMPILER_GCC)
-# error "GLM_GTX_scalar_multiplication requires C++11 suppport or alias templates and if not support for GCC"
-#endif
-
-#include "../vec2.hpp"
-#include "../vec3.hpp"
-#include "../vec4.hpp"
-#include "../mat2x2.hpp"
-#include <type_traits>
-
-namespace glm
-{
- template <typename T, typename Vec>
- using return_type_scalar_multiplication = typename std::enable_if<
- !std::is_same<T, float>::value // T may not be a float
- && std::is_arithmetic<T>::value, Vec // But it may be an int or double (no vec3 or mat3, ...)
- >::type;
-
-#define GLM_IMPLEMENT_SCAL_MULT(Vec) \
- template <typename T> \
- return_type_scalar_multiplication<T, Vec> \
- operator*(T const & s, Vec rh){ \
- return rh *= static_cast<float>(s); \
- } \
- \
- template <typename T> \
- return_type_scalar_multiplication<T, Vec> \
- operator*(Vec lh, T const & s){ \
- return lh *= static_cast<float>(s); \
- } \
- \
- template <typename T> \
- return_type_scalar_multiplication<T, Vec> \
- operator/(Vec lh, T const & s){ \
- return lh *= 1.0f / s; \
- }
-
-GLM_IMPLEMENT_SCAL_MULT(vec2)
-GLM_IMPLEMENT_SCAL_MULT(vec3)
-GLM_IMPLEMENT_SCAL_MULT(vec4)
-
-GLM_IMPLEMENT_SCAL_MULT(mat2)
-GLM_IMPLEMENT_SCAL_MULT(mat2x3)
-GLM_IMPLEMENT_SCAL_MULT(mat2x4)
-GLM_IMPLEMENT_SCAL_MULT(mat3x2)
-GLM_IMPLEMENT_SCAL_MULT(mat3)
-GLM_IMPLEMENT_SCAL_MULT(mat3x4)
-GLM_IMPLEMENT_SCAL_MULT(mat4x2)
-GLM_IMPLEMENT_SCAL_MULT(mat4x3)
-GLM_IMPLEMENT_SCAL_MULT(mat4)
-
-#undef GLM_IMPLEMENT_SCAL_MULT
-} // namespace glm
diff --git a/inc/glm/gtx/scalar_relational.hpp b/inc/glm/gtx/scalar_relational.hpp deleted file mode 100644 index e131aaa..0000000 --- a/inc/glm/gtx/scalar_relational.hpp +++ /dev/null @@ -1,61 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////////
-/// OpenGL Mathematics (glm.g-truc.net)
-///
-/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net)
-/// Permission is hereby granted, free of charge, to any person obtaining a copy
-/// of this software and associated documentation files (the "Software"), to deal
-/// in the Software without restriction, including without limitation the rights
-/// 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 gtx_scalar_relational
-/// @file glm/gtx/scalar_relational.hpp
-/// @date 2013-02-04 / 2013-02-04
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_scalar_relational GLM_GTX_scalar_relational
-/// @ingroup gtx
-///
-/// @brief Extend a position from a source to a position at a defined length.
-///
-/// <glm/gtx/scalar_relational.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_extend extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_scalar_relational
- /// @{
-
-
-
- /// @}
-}//namespace glm
-
-#include "scalar_relational.inl"
diff --git a/inc/glm/gtx/scalar_relational.inl b/inc/glm/gtx/scalar_relational.inl deleted file mode 100644 index 137edd2..0000000 --- a/inc/glm/gtx/scalar_relational.inl +++ /dev/null @@ -1,118 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////////
-/// OpenGL Mathematics (glm.g-truc.net)
-///
-/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net)
-/// Permission is hereby granted, free of charge, to any person obtaining a copy
-/// of this software and associated documentation files (the "Software"), to deal
-/// in the Software without restriction, including without limitation the rights
-/// 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 gtx_scalar_relational
-/// @file glm/gtx/scalar_relational.inl
-/// @date 2013-02-04 / 2013-02-04
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T>
- GLM_FUNC_QUALIFIER bool lessThan
- (
- T const & x,
- T const & y
- )
- {
- return x < y;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER bool lessThanEqual
- (
- T const & x,
- T const & y
- )
- {
- return x <= y;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER bool greaterThan
- (
- T const & x,
- T const & y
- )
- {
- return x > y;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER bool greaterThanEqual
- (
- T const & x,
- T const & y
- )
- {
- return x >= y;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER bool equal
- (
- T const & x,
- T const & y
- )
- {
- return x == y;
- }
-
- template <typename T>
- GLM_FUNC_QUALIFIER bool notEqual
- (
- T const & x,
- T const & y
- )
- {
- return x != y;
- }
-
- GLM_FUNC_QUALIFIER bool any
- (
- bool const & x
- )
- {
- return x;
- }
-
- GLM_FUNC_QUALIFIER bool all
- (
- bool const & x
- )
- {
- return x;
- }
-
- GLM_FUNC_QUALIFIER bool not_
- (
- bool const & x
- )
- {
- return !x;
- }
-}//namespace glm
diff --git a/inc/glm/gtx/simd_mat4.hpp b/inc/glm/gtx/simd_mat4.hpp deleted file mode 100644 index e6f5f49..0000000 --- a/inc/glm/gtx/simd_mat4.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 gtx_simd_mat4
-/// @file glm/gtx/simd_mat4.hpp
-/// @date 2009-05-07 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_simd_mat4 GLM_GTX_simd_mat4
-/// @ingroup gtx
-///
-/// @brief SIMD implementation of mat4 type.
-///
-/// <glm/gtx/simd_mat4.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependencies
-#include "../detail/setup.hpp"
-
-#if(GLM_ARCH != GLM_ARCH_PURE)
-
-#if(GLM_ARCH & GLM_ARCH_SSE2)
-# include "../detail/intrinsic_matrix.hpp"
-# include "../gtx/simd_vec4.hpp"
-#else
-# error "GLM: GLM_GTX_simd_mat4 requires compiler support of SSE2 through intrinsics"
-#endif
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_simd_mat4 extension included")
-#endif
-
-namespace glm{
-namespace detail
-{
- /// 4x4 Matrix implemented using SIMD SEE intrinsics.
- /// \ingroup gtx_simd_mat4
- GLM_ALIGNED_STRUCT(16) fmat4x4SIMD
- {
- typedef float value_type;
- typedef fvec4SIMD col_type;
- typedef fvec4SIMD row_type;
- typedef std::size_t size_type;
- typedef fmat4x4SIMD type;
- typedef fmat4x4SIMD transpose_type;
-
- GLM_FUNC_DECL length_t length() const;
-
- fvec4SIMD Data[4];
-
- //////////////////////////////////////
- // Constructors
-
- fmat4x4SIMD();
- explicit fmat4x4SIMD(float const & s);
- explicit fmat4x4SIMD(
- float const & x0, float const & y0, float const & z0, float const & w0,
- float const & x1, float const & y1, float const & z1, float const & w1,
- float const & x2, float const & y2, float const & z2, float const & w2,
- float const & x3, float const & y3, float const & z3, float const & w3);
- explicit fmat4x4SIMD(
- fvec4SIMD const & v0,
- fvec4SIMD const & v1,
- fvec4SIMD const & v2,
- fvec4SIMD const & v3);
- explicit fmat4x4SIMD(
- mat4x4 const & m);
- explicit fmat4x4SIMD(
- __m128 const in[4]);
-
- // Conversions
- //template <typename U>
- //explicit tmat4x4(tmat4x4<U> const & m);
-
- //explicit tmat4x4(tmat2x2<T> const & x);
- //explicit tmat4x4(tmat3x3<T> const & x);
- //explicit tmat4x4(tmat2x3<T> const & x);
- //explicit tmat4x4(tmat3x2<T> const & x);
- //explicit tmat4x4(tmat2x4<T> const & x);
- //explicit tmat4x4(tmat4x2<T> const & x);
- //explicit tmat4x4(tmat3x4<T> const & x);
- //explicit tmat4x4(tmat4x3<T> const & x);
-
- // Accesses
- fvec4SIMD & operator[](length_t i);
- fvec4SIMD const & operator[](length_t i) const;
-
- // Unary updatable operators
- fmat4x4SIMD & operator= (fmat4x4SIMD const & m);
- fmat4x4SIMD & operator+= (float const & s);
- fmat4x4SIMD & operator+= (fmat4x4SIMD const & m);
- fmat4x4SIMD & operator-= (float const & s);
- fmat4x4SIMD & operator-= (fmat4x4SIMD const & m);
- fmat4x4SIMD & operator*= (float const & s);
- fmat4x4SIMD & operator*= (fmat4x4SIMD const & m);
- fmat4x4SIMD & operator/= (float const & s);
- fmat4x4SIMD & operator/= (fmat4x4SIMD const & m);
- fmat4x4SIMD & operator++ ();
- fmat4x4SIMD & operator-- ();
- };
-
- // Binary operators
- fmat4x4SIMD operator+ (fmat4x4SIMD const & m, float const & s);
- fmat4x4SIMD operator+ (float const & s, fmat4x4SIMD const & m);
- fmat4x4SIMD operator+ (fmat4x4SIMD const & m1, fmat4x4SIMD const & m2);
-
- fmat4x4SIMD operator- (fmat4x4SIMD const & m, float const & s);
- fmat4x4SIMD operator- (float const & s, fmat4x4SIMD const & m);
- fmat4x4SIMD operator- (fmat4x4SIMD const & m1, fmat4x4SIMD const & m2);
-
- fmat4x4SIMD operator* (fmat4x4SIMD const & m, float const & s);
- fmat4x4SIMD operator* (float const & s, fmat4x4SIMD const & m);
-
- fvec4SIMD operator* (fmat4x4SIMD const & m, fvec4SIMD const & v);
- fvec4SIMD operator* (fvec4SIMD const & v, fmat4x4SIMD const & m);
-
- fmat4x4SIMD operator* (fmat4x4SIMD const & m1, fmat4x4SIMD const & m2);
-
- fmat4x4SIMD operator/ (fmat4x4SIMD const & m, float const & s);
- fmat4x4SIMD operator/ (float const & s, fmat4x4SIMD const & m);
-
- fvec4SIMD operator/ (fmat4x4SIMD const & m, fvec4SIMD const & v);
- fvec4SIMD operator/ (fvec4SIMD const & v, fmat4x4SIMD const & m);
-
- fmat4x4SIMD operator/ (fmat4x4SIMD const & m1, fmat4x4SIMD const & m2);
-
- // Unary constant operators
- fmat4x4SIMD const operator- (fmat4x4SIMD const & m);
- fmat4x4SIMD const operator-- (fmat4x4SIMD const & m, int);
- fmat4x4SIMD const operator++ (fmat4x4SIMD const & m, int);
-}//namespace detail
-
- typedef detail::fmat4x4SIMD simdMat4;
-
- /// @addtogroup gtx_simd_mat4
- /// @{
-
- //! Convert a simdMat4 to a mat4.
- //! (From GLM_GTX_simd_mat4 extension)
- mat4 mat4_cast(
- detail::fmat4x4SIMD const & x);
-
- //! Multiply matrix x by matrix y component-wise, i.e.,
- //! result[i][j] is the scalar product of x[i][j] and y[i][j].
- //! (From GLM_GTX_simd_mat4 extension).
- detail::fmat4x4SIMD matrixCompMult(
- detail::fmat4x4SIMD const & x,
- detail::fmat4x4SIMD const & y);
-
- //! Treats the first parameter c as a column vector
- //! and the second parameter r as a row vector
- //! and does a linear algebraic matrix multiply c * r.
- //! (From GLM_GTX_simd_mat4 extension).
- detail::fmat4x4SIMD outerProduct(
- detail::fvec4SIMD const & c,
- detail::fvec4SIMD const & r);
-
- //! Returns the transposed matrix of x
- //! (From GLM_GTX_simd_mat4 extension).
- detail::fmat4x4SIMD transpose(
- detail::fmat4x4SIMD const & x);
-
- //! Return the determinant of a mat4 matrix.
- //! (From GLM_GTX_simd_mat4 extension).
- float determinant(
- detail::fmat4x4SIMD const & m);
-
- //! Return the inverse of a mat4 matrix.
- //! (From GLM_GTX_simd_mat4 extension).
- detail::fmat4x4SIMD inverse(
- detail::fmat4x4SIMD const & m);
-
- /// @}
-}// namespace glm
-
-#include "simd_mat4.inl"
-
-#endif//(GLM_ARCH != GLM_ARCH_PURE)
diff --git a/inc/glm/gtx/simd_mat4.inl b/inc/glm/gtx/simd_mat4.inl deleted file mode 100644 index b27ef4f..0000000 --- a/inc/glm/gtx/simd_mat4.inl +++ /dev/null @@ -1,602 +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 gtx_simd_mat4
-/// @file glm/gtx/simd_mat4.inl
-/// @date 2009-05-07 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace glm{
-namespace detail{
-
-GLM_FUNC_QUALIFIER length_t fmat4x4SIMD::length() const
-{
- return 4;
-}
-
-//////////////////////////////////////
-// Accesses
-
-GLM_FUNC_QUALIFIER fvec4SIMD & fmat4x4SIMD::operator[]
-(
- length_t i
-)
-{
- assert(i < this->length());
-
- return this->Data[i];
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD const & fmat4x4SIMD::operator[]
-(
- length_t i
-) const
-{
- assert(i < this->length());
-
- return this->Data[i];
-}
-
-//////////////////////////////////////////////////////////////
-// Constructors
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD()
-{
-# ifndef GLM_FORCE_NO_CTOR_INIT
- this->Data[0] = fvec4SIMD(1, 0, 0, 0);
- this->Data[1] = fvec4SIMD(0, 1, 0, 0);
- this->Data[2] = fvec4SIMD(0, 0, 1, 0);
- this->Data[3] = fvec4SIMD(0, 0, 0, 1);
-# endif
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD(float const & s)
-{
- this->Data[0] = fvec4SIMD(s, 0, 0, 0);
- this->Data[1] = fvec4SIMD(0, s, 0, 0);
- this->Data[2] = fvec4SIMD(0, 0, s, 0);
- this->Data[3] = fvec4SIMD(0, 0, 0, s);
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD
-(
- float const & x0, float const & y0, float const & z0, float const & w0,
- float const & x1, float const & y1, float const & z1, float const & w1,
- float const & x2, float const & y2, float const & z2, float const & w2,
- float const & x3, float const & y3, float const & z3, float const & w3
-)
-{
- this->Data[0] = fvec4SIMD(x0, y0, z0, w0);
- this->Data[1] = fvec4SIMD(x1, y1, z1, w1);
- this->Data[2] = fvec4SIMD(x2, y2, z2, w2);
- this->Data[3] = fvec4SIMD(x3, y3, z3, w3);
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD
-(
- fvec4SIMD const & v0,
- fvec4SIMD const & v1,
- fvec4SIMD const & v2,
- fvec4SIMD const & v3
-)
-{
- this->Data[0] = v0;
- this->Data[1] = v1;
- this->Data[2] = v2;
- this->Data[3] = v3;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD
-(
- mat4 const & m
-)
-{
- this->Data[0] = fvec4SIMD(m[0]);
- this->Data[1] = fvec4SIMD(m[1]);
- this->Data[2] = fvec4SIMD(m[2]);
- this->Data[3] = fvec4SIMD(m[3]);
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD
-(
- __m128 const in[4]
-)
-{
- this->Data[0] = in[0];
- this->Data[1] = in[1];
- this->Data[2] = in[2];
- this->Data[3] = in[3];
-}
-
-//////////////////////////////////////////////////////////////
-// mat4 operators
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD& fmat4x4SIMD::operator=
-(
- fmat4x4SIMD const & m
-)
-{
- this->Data[0] = m[0];
- this->Data[1] = m[1];
- this->Data[2] = m[2];
- this->Data[3] = m[3];
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator+=
-(
- fmat4x4SIMD const & m
-)
-{
- this->Data[0].Data = _mm_add_ps(this->Data[0].Data, m[0].Data);
- this->Data[1].Data = _mm_add_ps(this->Data[1].Data, m[1].Data);
- this->Data[2].Data = _mm_add_ps(this->Data[2].Data, m[2].Data);
- this->Data[3].Data = _mm_add_ps(this->Data[3].Data, m[3].Data);
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator-=
-(
- fmat4x4SIMD const & m
-)
-{
- this->Data[0].Data = _mm_sub_ps(this->Data[0].Data, m[0].Data);
- this->Data[1].Data = _mm_sub_ps(this->Data[1].Data, m[1].Data);
- this->Data[2].Data = _mm_sub_ps(this->Data[2].Data, m[2].Data);
- this->Data[3].Data = _mm_sub_ps(this->Data[3].Data, m[3].Data);
-
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator*=
-(
- fmat4x4SIMD const & m
-)
-{
- sse_mul_ps(&this->Data[0].Data, &m.Data[0].Data, &this->Data[0].Data);
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator/=
-(
- fmat4x4SIMD const & m
-)
-{
- __m128 Inv[4];
- sse_inverse_ps(&m.Data[0].Data, Inv);
- sse_mul_ps(&this->Data[0].Data, Inv, &this->Data[0].Data);
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator+=
-(
- float const & s
-)
-{
- __m128 Operand = _mm_set_ps1(s);
- this->Data[0].Data = _mm_add_ps(this->Data[0].Data, Operand);
- this->Data[1].Data = _mm_add_ps(this->Data[1].Data, Operand);
- this->Data[2].Data = _mm_add_ps(this->Data[2].Data, Operand);
- this->Data[3].Data = _mm_add_ps(this->Data[3].Data, Operand);
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator-=
-(
- float const & s
-)
-{
- __m128 Operand = _mm_set_ps1(s);
- this->Data[0].Data = _mm_sub_ps(this->Data[0].Data, Operand);
- this->Data[1].Data = _mm_sub_ps(this->Data[1].Data, Operand);
- this->Data[2].Data = _mm_sub_ps(this->Data[2].Data, Operand);
- this->Data[3].Data = _mm_sub_ps(this->Data[3].Data, Operand);
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator*=
-(
- float const & s
-)
-{
- __m128 Operand = _mm_set_ps1(s);
- this->Data[0].Data = _mm_mul_ps(this->Data[0].Data, Operand);
- this->Data[1].Data = _mm_mul_ps(this->Data[1].Data, Operand);
- this->Data[2].Data = _mm_mul_ps(this->Data[2].Data, Operand);
- this->Data[3].Data = _mm_mul_ps(this->Data[3].Data, Operand);
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator/=
-(
- float const & s
-)
-{
- __m128 Operand = _mm_div_ps(one, _mm_set_ps1(s));
- this->Data[0].Data = _mm_mul_ps(this->Data[0].Data, Operand);
- this->Data[1].Data = _mm_mul_ps(this->Data[1].Data, Operand);
- this->Data[2].Data = _mm_mul_ps(this->Data[2].Data, Operand);
- this->Data[3].Data = _mm_mul_ps(this->Data[3].Data, Operand);
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator++ ()
-{
- this->Data[0].Data = _mm_add_ps(this->Data[0].Data, one);
- this->Data[1].Data = _mm_add_ps(this->Data[1].Data, one);
- this->Data[2].Data = _mm_add_ps(this->Data[2].Data, one);
- this->Data[3].Data = _mm_add_ps(this->Data[3].Data, one);
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator-- ()
-{
- this->Data[0].Data = _mm_sub_ps(this->Data[0].Data, one);
- this->Data[1].Data = _mm_sub_ps(this->Data[1].Data, one);
- this->Data[2].Data = _mm_sub_ps(this->Data[2].Data, one);
- this->Data[3].Data = _mm_sub_ps(this->Data[3].Data, one);
- return *this;
-}
-
-
-//////////////////////////////////////////////////////////////
-// Binary operators
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator+
-(
- const fmat4x4SIMD &m,
- float const & s
-)
-{
- return detail::fmat4x4SIMD
- (
- m[0] + s,
- m[1] + s,
- m[2] + s,
- m[3] + s
- );
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator+
-(
- float const & s,
- const fmat4x4SIMD &m
-)
-{
- return detail::fmat4x4SIMD
- (
- m[0] + s,
- m[1] + s,
- m[2] + s,
- m[3] + s
- );
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator+
-(
- const fmat4x4SIMD &m1,
- const fmat4x4SIMD &m2
-)
-{
- return detail::fmat4x4SIMD
- (
- m1[0] + m2[0],
- m1[1] + m2[1],
- m1[2] + m2[2],
- m1[3] + m2[3]
- );
-}
-
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator-
-(
- const fmat4x4SIMD &m,
- float const & s
-)
-{
- return detail::fmat4x4SIMD
- (
- m[0] - s,
- m[1] - s,
- m[2] - s,
- m[3] - s
- );
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator-
-(
- float const & s,
- const fmat4x4SIMD &m
-)
-{
- return detail::fmat4x4SIMD
- (
- s - m[0],
- s - m[1],
- s - m[2],
- s - m[3]
- );
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator-
-(
- const fmat4x4SIMD &m1,
- const fmat4x4SIMD &m2
-)
-{
- return detail::fmat4x4SIMD
- (
- m1[0] - m2[0],
- m1[1] - m2[1],
- m1[2] - m2[2],
- m1[3] - m2[3]
- );
-}
-
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator*
-(
- const fmat4x4SIMD &m,
- float const & s
-)
-{
- return detail::fmat4x4SIMD
- (
- m[0] * s,
- m[1] * s,
- m[2] * s,
- m[3] * s
- );
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator*
-(
- float const & s,
- const fmat4x4SIMD &m
-)
-{
- return detail::fmat4x4SIMD
- (
- m[0] * s,
- m[1] * s,
- m[2] * s,
- m[3] * s
- );
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator*
-(
- const fmat4x4SIMD &m,
- fvec4SIMD const & v
-)
-{
- return sse_mul_ps(&m.Data[0].Data, v.Data);
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator*
-(
- fvec4SIMD const & v,
- const fmat4x4SIMD &m
-)
-{
- return sse_mul_ps(v.Data, &m.Data[0].Data);
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator*
-(
- const fmat4x4SIMD &m1,
- const fmat4x4SIMD &m2
-)
-{
- fmat4x4SIMD result;
- sse_mul_ps(&m1.Data[0].Data, &m2.Data[0].Data, &result.Data[0].Data);
-
- return result;
-}
-
-
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator/
-(
- const fmat4x4SIMD &m,
- float const & s
-)
-{
- return detail::fmat4x4SIMD
- (
- m[0] / s,
- m[1] / s,
- m[2] / s,
- m[3] / s
- );
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator/
-(
- float const & s,
- const fmat4x4SIMD &m
-)
-{
- return detail::fmat4x4SIMD
- (
- s / m[0],
- s / m[1],
- s / m[2],
- s / m[3]
- );
-}
-
-GLM_FUNC_QUALIFIER detail::fmat4x4SIMD inverse(detail::fmat4x4SIMD const & m)
-{
- detail::fmat4x4SIMD result;
- detail::sse_inverse_ps(&m[0].Data, &result[0].Data);
- return result;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator/
-(
- const fmat4x4SIMD & m,
- fvec4SIMD const & v
-)
-{
- return inverse(m) * v;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator/
-(
- fvec4SIMD const & v,
- const fmat4x4SIMD &m
-)
-{
- return v * inverse(m);
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator/
-(
- const fmat4x4SIMD &m1,
- const fmat4x4SIMD &m2
-)
-{
- __m128 result[4];
- __m128 inv[4];
-
- sse_inverse_ps(&m2.Data[0].Data, inv);
- sse_mul_ps(&m1.Data[0].Data, inv, result);
-
- return fmat4x4SIMD(result);
-}
-
-
-//////////////////////////////////////////////////////////////
-// Unary constant operators
-GLM_FUNC_QUALIFIER fmat4x4SIMD const operator-
-(
- fmat4x4SIMD const & m
-)
-{
- return detail::fmat4x4SIMD
- (
- -m[0],
- -m[1],
- -m[2],
- -m[3]
- );
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD const operator--
-(
- fmat4x4SIMD const & m,
- int
-)
-{
- return detail::fmat4x4SIMD
- (
- m[0] - 1.0f,
- m[1] - 1.0f,
- m[2] - 1.0f,
- m[3] - 1.0f
- );
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD const operator++
-(
- fmat4x4SIMD const & m,
- int
-)
-{
- return detail::fmat4x4SIMD
- (
- m[0] + 1.0f,
- m[1] + 1.0f,
- m[2] + 1.0f,
- m[3] + 1.0f
- );
-}
-
-}//namespace detail
-
-GLM_FUNC_QUALIFIER mat4 mat4_cast
-(
- detail::fmat4x4SIMD const & x
-)
-{
- GLM_ALIGN(16) mat4 Result;
- _mm_store_ps(&Result[0][0], x.Data[0].Data);
- _mm_store_ps(&Result[1][0], x.Data[1].Data);
- _mm_store_ps(&Result[2][0], x.Data[2].Data);
- _mm_store_ps(&Result[3][0], x.Data[3].Data);
- return Result;
-}
-
-GLM_FUNC_QUALIFIER detail::fmat4x4SIMD matrixCompMult
-(
- detail::fmat4x4SIMD const & x,
- detail::fmat4x4SIMD const & y
-)
-{
- detail::fmat4x4SIMD result;
- result[0] = x[0] * y[0];
- result[1] = x[1] * y[1];
- result[2] = x[2] * y[2];
- result[3] = x[3] * y[3];
- return result;
-}
-
-GLM_FUNC_QUALIFIER detail::fmat4x4SIMD outerProduct
-(
- detail::fvec4SIMD const & c,
- detail::fvec4SIMD const & r
-)
-{
- __m128 Shu0 = _mm_shuffle_ps(r.Data, r.Data, _MM_SHUFFLE(0, 0, 0, 0));
- __m128 Shu1 = _mm_shuffle_ps(r.Data, r.Data, _MM_SHUFFLE(1, 1, 1, 1));
- __m128 Shu2 = _mm_shuffle_ps(r.Data, r.Data, _MM_SHUFFLE(2, 2, 2, 2));
- __m128 Shu3 = _mm_shuffle_ps(r.Data, r.Data, _MM_SHUFFLE(3, 3, 3, 3));
-
- detail::fmat4x4SIMD result(uninitialize);
- result[0].Data = _mm_mul_ps(c.Data, Shu0);
- result[1].Data = _mm_mul_ps(c.Data, Shu1);
- result[2].Data = _mm_mul_ps(c.Data, Shu2);
- result[3].Data = _mm_mul_ps(c.Data, Shu3);
- return result;
-}
-
-GLM_FUNC_QUALIFIER detail::fmat4x4SIMD transpose(detail::fmat4x4SIMD const & m)
-{
- detail::fmat4x4SIMD result;
- detail::sse_transpose_ps(&m[0].Data, &result[0].Data);
- return result;
-}
-
-GLM_FUNC_QUALIFIER float determinant(detail::fmat4x4SIMD const & m)
-{
- float Result;
- _mm_store_ss(&Result, detail::sse_det_ps(&m[0].Data));
- return Result;
-}
-
-}//namespace glm
diff --git a/inc/glm/gtx/simd_quat.hpp b/inc/glm/gtx/simd_quat.hpp deleted file mode 100644 index b70e536..0000000 --- a/inc/glm/gtx/simd_quat.hpp +++ /dev/null @@ -1,335 +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 gtx_simd_quat
-/// @file glm/gtx/simd_quat.hpp
-/// @date 2013-04-22 / 2014-11-25
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_simd_quat GLM_GTX_simd_quat
-/// @ingroup gtx
-///
-/// @brief SIMD implementation of quat type.
-///
-/// <glm/gtx/simd_quat.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../gtc/quaternion.hpp"
-#include "../gtx/fast_trigonometry.hpp"
-
-#if(GLM_ARCH != GLM_ARCH_PURE)
-
-#if(GLM_ARCH & GLM_ARCH_SSE2)
-# include "../gtx/simd_mat4.hpp"
-#else
-# error "GLM: GLM_GTX_simd_quat requires compiler support of SSE2 through intrinsics"
-#endif
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_simd_quat extension included")
-#endif
-
-// Warning silencer for nameless struct/union.
-#if (GLM_COMPILER & GLM_COMPILER_VC)
-# pragma warning(push)
-# pragma warning(disable:4201) // warning C4201: nonstandard extension used : nameless struct/union
-#endif
-
-namespace glm{
-namespace detail
-{
- GLM_ALIGNED_STRUCT(16) fquatSIMD
- {
- typedef __m128 value_type;
- typedef std::size_t size_type;
- static size_type value_size();
-
- typedef fquatSIMD type;
- typedef tquat<bool, defaultp> bool_type;
-
-#ifdef GLM_SIMD_ENABLE_XYZW_UNION
- union
- {
- __m128 Data;
- struct {float x, y, z, w;};
- };
-#else
- __m128 Data;
-#endif
-
- //////////////////////////////////////
- // Implicit basic constructors
-
- fquatSIMD();
- fquatSIMD(__m128 const & Data);
- fquatSIMD(fquatSIMD const & q);
-
- //////////////////////////////////////
- // Explicit basic constructors
-
- explicit fquatSIMD(
- ctor);
- explicit fquatSIMD(
- float const & w,
- float const & x,
- float const & y,
- float const & z);
- explicit fquatSIMD(
- quat const & v);
- explicit fquatSIMD(
- vec3 const & eulerAngles);
-
-
- //////////////////////////////////////
- // Unary arithmetic operators
-
- fquatSIMD& operator =(fquatSIMD const & q);
- fquatSIMD& operator*=(float const & s);
- fquatSIMD& operator/=(float const & s);
- };
-
-
- //////////////////////////////////////
- // Arithmetic operators
-
- detail::fquatSIMD operator- (
- detail::fquatSIMD const & q);
-
- detail::fquatSIMD operator+ (
- detail::fquatSIMD const & q,
- detail::fquatSIMD const & p);
-
- detail::fquatSIMD operator* (
- detail::fquatSIMD const & q,
- detail::fquatSIMD const & p);
-
- detail::fvec4SIMD operator* (
- detail::fquatSIMD const & q,
- detail::fvec4SIMD const & v);
-
- detail::fvec4SIMD operator* (
- detail::fvec4SIMD const & v,
- detail::fquatSIMD const & q);
-
- detail::fquatSIMD operator* (
- detail::fquatSIMD const & q,
- float s);
-
- detail::fquatSIMD operator* (
- float s,
- detail::fquatSIMD const & q);
-
- detail::fquatSIMD operator/ (
- detail::fquatSIMD const & q,
- float s);
-
-}//namespace detail
-
- /// @addtogroup gtx_simd_quat
- /// @{
-
- typedef glm::detail::fquatSIMD simdQuat;
-
- //! Convert a simdQuat to a quat.
- /// @see gtx_simd_quat
- quat quat_cast(
- detail::fquatSIMD const & x);
-
- //! Convert a simdMat4 to a simdQuat.
- /// @see gtx_simd_quat
- detail::fquatSIMD quatSIMD_cast(
- detail::fmat4x4SIMD const & m);
-
- //! Converts a mat4 to a simdQuat.
- /// @see gtx_simd_quat
- template <typename T, precision P>
- detail::fquatSIMD quatSIMD_cast(
- tmat4x4<T, P> const & m);
-
- //! Converts a mat3 to a simdQuat.
- /// @see gtx_simd_quat
- template <typename T, precision P>
- detail::fquatSIMD quatSIMD_cast(
- tmat3x3<T, P> const & m);
-
- //! Convert a simdQuat to a simdMat4
- /// @see gtx_simd_quat
- detail::fmat4x4SIMD mat4SIMD_cast(
- detail::fquatSIMD const & q);
-
- //! Converts a simdQuat to a standard mat4.
- /// @see gtx_simd_quat
- mat4 mat4_cast(
- detail::fquatSIMD const & q);
-
-
- /// Returns the length of the quaternion.
- ///
- /// @see gtx_simd_quat
- float length(
- detail::fquatSIMD const & x);
-
- /// Returns the normalized quaternion.
- ///
- /// @see gtx_simd_quat
- detail::fquatSIMD normalize(
- detail::fquatSIMD const & x);
-
- /// Returns dot product of q1 and q2, i.e., q1[0] * q2[0] + q1[1] * q2[1] + ...
- ///
- /// @see gtx_simd_quat
- float dot(
- detail::fquatSIMD const & q1,
- detail::fquatSIMD const & q2);
-
- /// Spherical linear interpolation of two quaternions.
- /// The interpolation is oriented and the rotation is performed at constant speed.
- /// For short path spherical linear interpolation, use the slerp function.
- ///
- /// @param x A quaternion
- /// @param y A quaternion
- /// @param a Interpolation factor. The interpolation is defined beyond the range [0, 1].
- /// @tparam T Value type used to build the quaternion. Supported: half, float or double.
- /// @see gtx_simd_quat
- /// @see - slerp(detail::fquatSIMD const & x, detail::fquatSIMD const & y, T const & a)
- detail::fquatSIMD mix(
- detail::fquatSIMD const & x,
- detail::fquatSIMD const & y,
- float const & a);
-
- /// Linear interpolation of two quaternions.
- /// The interpolation is oriented.
- ///
- /// @param x A quaternion
- /// @param y A quaternion
- /// @param a Interpolation factor. The interpolation is defined in the range [0, 1].
- /// @tparam T Value type used to build the quaternion. Supported: half, float or double.
- /// @see gtx_simd_quat
- detail::fquatSIMD lerp(
- detail::fquatSIMD const & x,
- detail::fquatSIMD const & y,
- float const & a);
-
- /// Spherical linear interpolation of two quaternions.
- /// The interpolation always take the short path and the rotation is performed at constant speed.
- ///
- /// @param x A quaternion
- /// @param y A quaternion
- /// @param a Interpolation factor. The interpolation is defined beyond the range [0, 1].
- /// @tparam T Value type used to build the quaternion. Supported: half, float or double.
- /// @see gtx_simd_quat
- detail::fquatSIMD slerp(
- detail::fquatSIMD const & x,
- detail::fquatSIMD const & y,
- float const & a);
-
-
- /// Faster spherical linear interpolation of two unit length quaternions.
- ///
- /// This is the same as mix(), except for two rules:
- /// 1) The two quaternions must be unit length.
- /// 2) The interpolation factor (a) must be in the range [0, 1].
- ///
- /// This will use the equivalent to fastAcos() and fastSin().
- ///
- /// @see gtx_simd_quat
- /// @see - mix(detail::fquatSIMD const & x, detail::fquatSIMD const & y, T const & a)
- detail::fquatSIMD fastMix(
- detail::fquatSIMD const & x,
- detail::fquatSIMD const & y,
- float const & a);
-
- /// Identical to fastMix() except takes the shortest path.
- ///
- /// The same rules apply here as those in fastMix(). Both quaternions must be unit length and 'a' must be
- /// in the range [0, 1].
- ///
- /// @see - fastMix(detail::fquatSIMD const & x, detail::fquatSIMD const & y, T const & a)
- /// @see - slerp(detail::fquatSIMD const & x, detail::fquatSIMD const & y, T const & a)
- detail::fquatSIMD fastSlerp(
- detail::fquatSIMD const & x,
- detail::fquatSIMD const & y,
- float const & a);
-
-
- /// Returns the q conjugate.
- ///
- /// @see gtx_simd_quat
- detail::fquatSIMD conjugate(
- detail::fquatSIMD const & q);
-
- /// Returns the q inverse.
- ///
- /// @see gtx_simd_quat
- detail::fquatSIMD inverse(
- detail::fquatSIMD const & q);
-
- /// Build a quaternion from an angle and a normalized axis.
- ///
- /// @param angle Angle expressed in radians.
- /// @param axis Axis of the quaternion, must be normalized.
- ///
- /// @see gtx_simd_quat
- detail::fquatSIMD angleAxisSIMD(
- float const & angle,
- vec3 const & axis);
-
- /// Build a quaternion from an angle and a normalized axis.
- ///
- /// @param angle Angle expressed in radians.
- /// @param x x component of the x-axis, x, y, z must be a normalized axis
- /// @param y y component of the y-axis, x, y, z must be a normalized axis
- /// @param z z component of the z-axis, x, y, z must be a normalized axis
- ///
- /// @see gtx_simd_quat
- detail::fquatSIMD angleAxisSIMD(
- float const & angle,
- float const & x,
- float const & y,
- float const & z);
-
- // TODO: Move this to somewhere more appropriate. Used with fastMix() and fastSlerp().
- /// Performs the equivalent of glm::fastSin() on each component of the given __m128.
- __m128 fastSin(__m128 x);
-
- /// @}
-}//namespace glm
-
-#include "simd_quat.inl"
-
-
-#if (GLM_COMPILER & GLM_COMPILER_VC)
-# pragma warning(pop)
-#endif
-
-
-#endif//(GLM_ARCH != GLM_ARCH_PURE)
diff --git a/inc/glm/gtx/simd_quat.inl b/inc/glm/gtx/simd_quat.inl deleted file mode 100644 index 58bbddf..0000000 --- a/inc/glm/gtx/simd_quat.inl +++ /dev/null @@ -1,645 +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 gtx_simd_quat
-/// @file glm/gtx/simd_quat.inl
-/// @date 2013-04-22 / 2014-11-25
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm{
-namespace detail{
-
-
-//////////////////////////////////////
-// Debugging
-#if 0
-void print(__m128 v)
-{
- GLM_ALIGN(16) float result[4];
- _mm_store_ps(result, v);
-
- printf("__m128: %f %f %f %f\n", result[0], result[1], result[2], result[3]);
-}
-
-void print(const fvec4SIMD &v)
-{
- printf("fvec4SIMD: %f %f %f %f\n", v.x, v.y, v.z, v.w);
-}
-#endif
-
-
-//////////////////////////////////////
-// Implicit basic constructors
-
-GLM_FUNC_QUALIFIER fquatSIMD::fquatSIMD()
-# ifdef GLM_FORCE_NO_CTOR_INIT
- : Data(_mm_set_ps(1.0f, 0.0f, 0.0f, 0.0f))
-# endif
-{}
-
-GLM_FUNC_QUALIFIER fquatSIMD::fquatSIMD(__m128 const & Data) :
- Data(Data)
-{}
-
-GLM_FUNC_QUALIFIER fquatSIMD::fquatSIMD(fquatSIMD const & q) :
- Data(q.Data)
-{}
-
-
-//////////////////////////////////////
-// Explicit basic constructors
-
-GLM_FUNC_QUALIFIER fquatSIMD::fquatSIMD(float const & w, float const & x, float const & y, float const & z) :
- Data(_mm_set_ps(w, z, y, x))
-{}
-
-GLM_FUNC_QUALIFIER fquatSIMD::fquatSIMD(quat const & q) :
- Data(_mm_set_ps(q.w, q.z, q.y, q.x))
-{}
-
-GLM_FUNC_QUALIFIER fquatSIMD::fquatSIMD(vec3 const & eulerAngles)
-{
- vec3 c = glm::cos(eulerAngles * 0.5f);
- vec3 s = glm::sin(eulerAngles * 0.5f);
-
- Data = _mm_set_ps(
- (c.x * c.y * c.z) + (s.x * s.y * s.z),
- (c.x * c.y * s.z) - (s.x * s.y * c.z),
- (c.x * s.y * c.z) + (s.x * c.y * s.z),
- (s.x * c.y * c.z) - (c.x * s.y * s.z));
-}
-
-
-//////////////////////////////////////
-// Unary arithmetic operators
-
-GLM_FUNC_QUALIFIER fquatSIMD& fquatSIMD::operator=(fquatSIMD const & q)
-{
- this->Data = q.Data;
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fquatSIMD& fquatSIMD::operator*=(float const & s)
-{
- this->Data = _mm_mul_ps(this->Data, _mm_set_ps1(s));
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fquatSIMD& fquatSIMD::operator/=(float const & s)
-{
- this->Data = _mm_div_ps(Data, _mm_set1_ps(s));
- return *this;
-}
-
-
-
-// negate operator
-GLM_FUNC_QUALIFIER fquatSIMD operator- (fquatSIMD const & q)
-{
- return fquatSIMD(_mm_mul_ps(q.Data, _mm_set_ps(-1.0f, -1.0f, -1.0f, -1.0f)));
-}
-
-// operator+
-GLM_FUNC_QUALIFIER fquatSIMD operator+ (fquatSIMD const & q1, fquatSIMD const & q2)
-{
- return fquatSIMD(_mm_add_ps(q1.Data, q2.Data));
-}
-
-//operator*
-GLM_FUNC_QUALIFIER fquatSIMD operator* (fquatSIMD const & q1, fquatSIMD const & q2)
-{
- // SSE2 STATS:
- // 11 shuffle
- // 8 mul
- // 8 add
-
- // SSE4 STATS:
- // 3 shuffle
- // 4 mul
- // 4 dpps
-
- __m128 mul0 = _mm_mul_ps(q1.Data, _mm_shuffle_ps(q2.Data, q2.Data, _MM_SHUFFLE(0, 1, 2, 3)));
- __m128 mul1 = _mm_mul_ps(q1.Data, _mm_shuffle_ps(q2.Data, q2.Data, _MM_SHUFFLE(1, 0, 3, 2)));
- __m128 mul2 = _mm_mul_ps(q1.Data, _mm_shuffle_ps(q2.Data, q2.Data, _MM_SHUFFLE(2, 3, 0, 1)));
- __m128 mul3 = _mm_mul_ps(q1.Data, q2.Data);
-
-# if((GLM_ARCH & GLM_ARCH_SSE4))
- __m128 add0 = _mm_dp_ps(mul0, _mm_set_ps(1.0f, -1.0f, 1.0f, 1.0f), 0xff);
- __m128 add1 = _mm_dp_ps(mul1, _mm_set_ps(1.0f, 1.0f, 1.0f, -1.0f), 0xff);
- __m128 add2 = _mm_dp_ps(mul2, _mm_set_ps(1.0f, 1.0f, -1.0f, 1.0f), 0xff);
- __m128 add3 = _mm_dp_ps(mul3, _mm_set_ps(1.0f, -1.0f, -1.0f, -1.0f), 0xff);
-# else
- mul0 = _mm_mul_ps(mul0, _mm_set_ps(1.0f, -1.0f, 1.0f, 1.0f));
- __m128 add0 = _mm_add_ps(mul0, _mm_movehl_ps(mul0, mul0));
- add0 = _mm_add_ss(add0, _mm_shuffle_ps(add0, add0, 1));
-
- mul1 = _mm_mul_ps(mul1, _mm_set_ps(1.0f, 1.0f, 1.0f, -1.0f));
- __m128 add1 = _mm_add_ps(mul1, _mm_movehl_ps(mul1, mul1));
- add1 = _mm_add_ss(add1, _mm_shuffle_ps(add1, add1, 1));
-
- mul2 = _mm_mul_ps(mul2, _mm_set_ps(1.0f, 1.0f, -1.0f, 1.0f));
- __m128 add2 = _mm_add_ps(mul2, _mm_movehl_ps(mul2, mul2));
- add2 = _mm_add_ss(add2, _mm_shuffle_ps(add2, add2, 1));
-
- mul3 = _mm_mul_ps(mul3, _mm_set_ps(1.0f, -1.0f, -1.0f, -1.0f));
- __m128 add3 = _mm_add_ps(mul3, _mm_movehl_ps(mul3, mul3));
- add3 = _mm_add_ss(add3, _mm_shuffle_ps(add3, add3, 1));
-#endif
-
-
- // This SIMD code is a politically correct way of doing this, but in every test I've tried it has been slower than
- // the final code below. I'll keep this here for reference - maybe somebody else can do something better...
- //
- //__m128 xxyy = _mm_shuffle_ps(add0, add1, _MM_SHUFFLE(0, 0, 0, 0));
- //__m128 zzww = _mm_shuffle_ps(add2, add3, _MM_SHUFFLE(0, 0, 0, 0));
- //
- //return _mm_shuffle_ps(xxyy, zzww, _MM_SHUFFLE(2, 0, 2, 0));
-
- float x;
- float y;
- float z;
- float w;
-
- _mm_store_ss(&x, add0);
- _mm_store_ss(&y, add1);
- _mm_store_ss(&z, add2);
- _mm_store_ss(&w, add3);
-
- return detail::fquatSIMD(w, x, y, z);
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator* (fquatSIMD const & q, fvec4SIMD const & v)
-{
- static const __m128 two = _mm_set1_ps(2.0f);
-
- __m128 q_wwww = _mm_shuffle_ps(q.Data, q.Data, _MM_SHUFFLE(3, 3, 3, 3));
- __m128 q_swp0 = _mm_shuffle_ps(q.Data, q.Data, _MM_SHUFFLE(3, 0, 2, 1));
- __m128 q_swp1 = _mm_shuffle_ps(q.Data, q.Data, _MM_SHUFFLE(3, 1, 0, 2));
- __m128 v_swp0 = _mm_shuffle_ps(v.Data, v.Data, _MM_SHUFFLE(3, 0, 2, 1));
- __m128 v_swp1 = _mm_shuffle_ps(v.Data, v.Data, _MM_SHUFFLE(3, 1, 0, 2));
-
- __m128 uv = _mm_sub_ps(_mm_mul_ps(q_swp0, v_swp1), _mm_mul_ps(q_swp1, v_swp0));
- __m128 uv_swp0 = _mm_shuffle_ps(uv, uv, _MM_SHUFFLE(3, 0, 2, 1));
- __m128 uv_swp1 = _mm_shuffle_ps(uv, uv, _MM_SHUFFLE(3, 1, 0, 2));
- __m128 uuv = _mm_sub_ps(_mm_mul_ps(q_swp0, uv_swp1), _mm_mul_ps(q_swp1, uv_swp0));
-
-
- uv = _mm_mul_ps(uv, _mm_mul_ps(q_wwww, two));
- uuv = _mm_mul_ps(uuv, two);
-
- return _mm_add_ps(v.Data, _mm_add_ps(uv, uuv));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator* (fvec4SIMD const & v, fquatSIMD const & q)
-{
- return glm::inverse(q) * v;
-}
-
-GLM_FUNC_QUALIFIER fquatSIMD operator* (fquatSIMD const & q, float s)
-{
- return fquatSIMD(_mm_mul_ps(q.Data, _mm_set1_ps(s)));
-}
-
-GLM_FUNC_QUALIFIER fquatSIMD operator* (float s, fquatSIMD const & q)
-{
- return fquatSIMD(_mm_mul_ps(_mm_set1_ps(s), q.Data));
-}
-
-
-//operator/
-GLM_FUNC_QUALIFIER fquatSIMD operator/ (fquatSIMD const & q, float s)
-{
- return fquatSIMD(_mm_div_ps(q.Data, _mm_set1_ps(s)));
-}
-
-
-}//namespace detail
-
-
-GLM_FUNC_QUALIFIER quat quat_cast
-(
- detail::fquatSIMD const & x
-)
-{
- GLM_ALIGN(16) quat Result;
- _mm_store_ps(&Result[0], x.Data);
-
- return Result;
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::fquatSIMD quatSIMD_cast_impl(const T m0[], const T m1[], const T m2[])
-{
- T trace = m0[0] + m1[1] + m2[2] + T(1.0);
- if (trace > T(0))
- {
- T s = static_cast<T>(0.5) / sqrt(trace);
-
- return _mm_set_ps(
- static_cast<float>(T(0.25) / s),
- static_cast<float>((m0[1] - m1[0]) * s),
- static_cast<float>((m2[0] - m0[2]) * s),
- static_cast<float>((m1[2] - m2[1]) * s));
- }
- else
- {
- if (m0[0] > m1[1])
- {
- if (m0[0] > m2[2])
- {
- // X is biggest.
- T s = sqrt(m0[0] - m1[1] - m2[2] + T(1.0)) * T(0.5);
-
- return _mm_set_ps(
- static_cast<float>((m1[2] - m2[1]) * s),
- static_cast<float>((m2[0] + m0[2]) * s),
- static_cast<float>((m0[1] + m1[0]) * s),
- static_cast<float>(T(0.5) * s));
- }
- }
- else
- {
- if (m1[1] > m2[2])
- {
- // Y is biggest.
- T s = sqrt(m1[1] - m0[0] - m2[2] + T(1.0)) * T(0.5);
-
- return _mm_set_ps(
- static_cast<float>((m2[0] - m0[2]) * s),
- static_cast<float>((m1[2] + m2[1]) * s),
- static_cast<float>(T(0.5) * s),
- static_cast<float>((m0[1] + m1[0]) * s));
- }
- }
-
- // Z is biggest.
- T s = sqrt(m2[2] - m0[0] - m1[1] + T(1.0)) * T(0.5);
-
- return _mm_set_ps(
- static_cast<float>((m0[1] - m1[0]) * s),
- static_cast<float>(T(0.5) * s),
- static_cast<float>((m1[2] + m2[1]) * s),
- static_cast<float>((m2[0] + m0[2]) * s));
- }
-}
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD quatSIMD_cast
-(
- detail::fmat4x4SIMD const & m
-)
-{
- // Scalar implementation for now.
- GLM_ALIGN(16) float m0[4];
- GLM_ALIGN(16) float m1[4];
- GLM_ALIGN(16) float m2[4];
-
- _mm_store_ps(m0, m[0].Data);
- _mm_store_ps(m1, m[1].Data);
- _mm_store_ps(m2, m[2].Data);
-
- return quatSIMD_cast_impl(m0, m1, m2);
-}
-
-template <typename T, precision P>
-GLM_FUNC_QUALIFIER detail::fquatSIMD quatSIMD_cast
-(
- tmat4x4<T, P> const & m
-)
-{
- return quatSIMD_cast_impl(&m[0][0], &m[1][0], &m[2][0]);
-}
-
-template <typename T, precision P>
-GLM_FUNC_QUALIFIER detail::fquatSIMD quatSIMD_cast
-(
- tmat3x3<T, P> const & m
-)
-{
- return quatSIMD_cast_impl(&m[0][0], &m[1][0], &m[2][0]);
-}
-
-
-GLM_FUNC_QUALIFIER detail::fmat4x4SIMD mat4SIMD_cast
-(
- detail::fquatSIMD const & q
-)
-{
- detail::fmat4x4SIMD result;
-
- __m128 _wwww = _mm_shuffle_ps(q.Data, q.Data, _MM_SHUFFLE(3, 3, 3, 3));
- __m128 _xyzw = q.Data;
- __m128 _zxyw = _mm_shuffle_ps(q.Data, q.Data, _MM_SHUFFLE(3, 1, 0, 2));
- __m128 _yzxw = _mm_shuffle_ps(q.Data, q.Data, _MM_SHUFFLE(3, 0, 2, 1));
-
- __m128 _xyzw2 = _mm_add_ps(_xyzw, _xyzw);
- __m128 _zxyw2 = _mm_shuffle_ps(_xyzw2, _xyzw2, _MM_SHUFFLE(3, 1, 0, 2));
- __m128 _yzxw2 = _mm_shuffle_ps(_xyzw2, _xyzw2, _MM_SHUFFLE(3, 0, 2, 1));
-
- __m128 _tmp0 = _mm_sub_ps(_mm_set1_ps(1.0f), _mm_mul_ps(_yzxw2, _yzxw));
- _tmp0 = _mm_sub_ps(_tmp0, _mm_mul_ps(_zxyw2, _zxyw));
-
- __m128 _tmp1 = _mm_mul_ps(_yzxw2, _xyzw);
- _tmp1 = _mm_add_ps(_tmp1, _mm_mul_ps(_zxyw2, _wwww));
-
- __m128 _tmp2 = _mm_mul_ps(_zxyw2, _xyzw);
- _tmp2 = _mm_sub_ps(_tmp2, _mm_mul_ps(_yzxw2, _wwww));
-
-
- // There's probably a better, more politically correct way of doing this...
- result[0].Data = _mm_set_ps(
- 0.0f,
- reinterpret_cast<float*>(&_tmp2)[0],
- reinterpret_cast<float*>(&_tmp1)[0],
- reinterpret_cast<float*>(&_tmp0)[0]);
-
- result[1].Data = _mm_set_ps(
- 0.0f,
- reinterpret_cast<float*>(&_tmp1)[1],
- reinterpret_cast<float*>(&_tmp0)[1],
- reinterpret_cast<float*>(&_tmp2)[1]);
-
- result[2].Data = _mm_set_ps(
- 0.0f,
- reinterpret_cast<float*>(&_tmp0)[2],
- reinterpret_cast<float*>(&_tmp2)[2],
- reinterpret_cast<float*>(&_tmp1)[2]);
-
- result[3].Data = _mm_set_ps(
- 1.0f,
- 0.0f,
- 0.0f,
- 0.0f);
-
-
- return result;
-}
-
-GLM_FUNC_QUALIFIER mat4 mat4_cast
-(
- detail::fquatSIMD const & q
-)
-{
- return mat4_cast(mat4SIMD_cast(q));
-}
-
-
-
-GLM_FUNC_QUALIFIER float length
-(
- detail::fquatSIMD const & q
-)
-{
- return glm::sqrt(dot(q, q));
-}
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD normalize
-(
- detail::fquatSIMD const & q
-)
-{
- return _mm_mul_ps(q.Data, _mm_set1_ps(1.0f / length(q)));
-}
-
-GLM_FUNC_QUALIFIER float dot
-(
- detail::fquatSIMD const & q1,
- detail::fquatSIMD const & q2
-)
-{
- float result;
- _mm_store_ss(&result, detail::sse_dot_ps(q1.Data, q2.Data));
-
- return result;
-}
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD mix
-(
- detail::fquatSIMD const & x,
- detail::fquatSIMD const & y,
- float const & a
-)
-{
- float cosTheta = dot(x, y);
-
- if (cosTheta > 1.0f - glm::epsilon<float>())
- {
- return _mm_add_ps(x.Data, _mm_mul_ps(_mm_set1_ps(a), _mm_sub_ps(y.Data, x.Data)));
- }
- else
- {
- float angle = glm::acos(cosTheta);
-
-
- float s0 = glm::sin((1.0f - a) * angle);
- float s1 = glm::sin(a * angle);
- float d = 1.0f / glm::sin(angle);
-
- return (s0 * x + s1 * y) * d;
- }
-}
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD lerp
-(
- detail::fquatSIMD const & x,
- detail::fquatSIMD const & y,
- float const & a
-)
-{
- // Lerp is only defined in [0, 1]
- assert(a >= 0.0f);
- assert(a <= 1.0f);
-
- return _mm_add_ps(x.Data, _mm_mul_ps(_mm_set1_ps(a), _mm_sub_ps(y.Data, x.Data)));
-}
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD slerp
-(
- detail::fquatSIMD const & x,
- detail::fquatSIMD const & y,
- float const & a
-)
-{
- detail::fquatSIMD z = y;
-
- float cosTheta = dot(x, y);
-
- // If cosTheta < 0, the interpolation will take the long way around the sphere.
- // To fix this, one quat must be negated.
- if (cosTheta < 0.0f)
- {
- z = -y;
- cosTheta = -cosTheta;
- }
-
- // Perform a linear interpolation when cosTheta is close to 1 to avoid side effect of sin(angle) becoming a zero denominator
- if(cosTheta > 1.0f - epsilon<float>())
- {
- return _mm_add_ps(x.Data, _mm_mul_ps(_mm_set1_ps(a), _mm_sub_ps(y.Data, x.Data)));
- }
- else
- {
- float angle = glm::acos(cosTheta);
-
-
- float s0 = glm::sin((1.0f - a) * angle);
- float s1 = glm::sin(a * angle);
- float d = 1.0f / glm::sin(angle);
-
- return (s0 * x + s1 * y) * d;
- }
-}
-
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD fastMix
-(
- detail::fquatSIMD const & x,
- detail::fquatSIMD const & y,
- float const & a
-)
-{
- float cosTheta = dot(x, y);
-
- if (cosTheta > 1.0f - glm::epsilon<float>())
- {
- return _mm_add_ps(x.Data, _mm_mul_ps(_mm_set1_ps(a), _mm_sub_ps(y.Data, x.Data)));
- }
- else
- {
- float angle = glm::fastAcos(cosTheta);
-
-
- __m128 s = glm::fastSin(_mm_set_ps((1.0f - a) * angle, a * angle, angle, 0.0f));
-
- __m128 s0 = _mm_shuffle_ps(s, s, _MM_SHUFFLE(3, 3, 3, 3));
- __m128 s1 = _mm_shuffle_ps(s, s, _MM_SHUFFLE(2, 2, 2, 2));
- __m128 d = _mm_div_ps(_mm_set1_ps(1.0f), _mm_shuffle_ps(s, s, _MM_SHUFFLE(1, 1, 1, 1)));
-
- return _mm_mul_ps(_mm_add_ps(_mm_mul_ps(s0, x.Data), _mm_mul_ps(s1, y.Data)), d);
- }
-}
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD fastSlerp
-(
- detail::fquatSIMD const & x,
- detail::fquatSIMD const & y,
- float const & a
-)
-{
- detail::fquatSIMD z = y;
-
- float cosTheta = dot(x, y);
- if (cosTheta < 0.0f)
- {
- z = -y;
- cosTheta = -cosTheta;
- }
-
-
- if(cosTheta > 1.0f - epsilon<float>())
- {
- return _mm_add_ps(x.Data, _mm_mul_ps(_mm_set1_ps(a), _mm_sub_ps(y.Data, x.Data)));
- }
- else
- {
- float angle = glm::fastAcos(cosTheta);
-
-
- __m128 s = glm::fastSin(_mm_set_ps((1.0f - a) * angle, a * angle, angle, 0.0f));
-
- __m128 s0 = _mm_shuffle_ps(s, s, _MM_SHUFFLE(3, 3, 3, 3));
- __m128 s1 = _mm_shuffle_ps(s, s, _MM_SHUFFLE(2, 2, 2, 2));
- __m128 d = _mm_div_ps(_mm_set1_ps(1.0f), _mm_shuffle_ps(s, s, _MM_SHUFFLE(1, 1, 1, 1)));
-
- return _mm_mul_ps(_mm_add_ps(_mm_mul_ps(s0, x.Data), _mm_mul_ps(s1, y.Data)), d);
- }
-}
-
-
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD conjugate
-(
- detail::fquatSIMD const & q
-)
-{
- return detail::fquatSIMD(_mm_mul_ps(q.Data, _mm_set_ps(1.0f, -1.0f, -1.0f, -1.0f)));
-}
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD inverse
-(
- detail::fquatSIMD const & q
-)
-{
- return conjugate(q) / dot(q, q);
-}
-
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD angleAxisSIMD
-(
- float const & angle,
- vec3 const & v
-)
-{
- float s = glm::sin(angle * 0.5f);
-
- return _mm_set_ps(
- glm::cos(angle * 0.5f),
- v.z * s,
- v.y * s,
- v.x * s);
-}
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD angleAxisSIMD
-(
- float const & angle,
- float const & x,
- float const & y,
- float const & z
-)
-{
- return angleAxisSIMD(angle, vec3(x, y, z));
-}
-
-
-GLM_FUNC_QUALIFIER __m128 fastSin(__m128 x)
-{
- static const __m128 c0 = _mm_set1_ps(0.16666666666666666666666666666667f);
- static const __m128 c1 = _mm_set1_ps(0.00833333333333333333333333333333f);
- static const __m128 c2 = _mm_set1_ps(0.00019841269841269841269841269841f);
-
- __m128 x3 = _mm_mul_ps(x, _mm_mul_ps(x, x));
- __m128 x5 = _mm_mul_ps(x3, _mm_mul_ps(x, x));
- __m128 x7 = _mm_mul_ps(x5, _mm_mul_ps(x, x));
-
- __m128 y0 = _mm_mul_ps(x3, c0);
- __m128 y1 = _mm_mul_ps(x5, c1);
- __m128 y2 = _mm_mul_ps(x7, c2);
-
- return _mm_sub_ps(_mm_add_ps(_mm_sub_ps(x, y0), y1), y2);
-}
-
-
-}//namespace glm
diff --git a/inc/glm/gtx/simd_vec4.hpp b/inc/glm/gtx/simd_vec4.hpp deleted file mode 100644 index 87b0448..0000000 --- a/inc/glm/gtx/simd_vec4.hpp +++ /dev/null @@ -1,574 +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 gtx_simd_vec4
-/// @file glm/gtx/simd_vec4.hpp
-/// @date 2009-05-07 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_simd_vec4 GLM_GTX_simd_vec4
-/// @ingroup gtx
-///
-/// @brief SIMD implementation of vec4 type.
-///
-/// <glm/gtx/simd_vec4.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(GLM_ARCH != GLM_ARCH_PURE)
-
-#if(GLM_ARCH & GLM_ARCH_SSE2)
-# include "../detail/intrinsic_common.hpp"
-# include "../detail/intrinsic_geometric.hpp"
-# include "../detail/intrinsic_integer.hpp"
-#else
-# error "GLM: GLM_GTX_simd_vec4 requires compiler support of SSE2 through intrinsics"
-#endif
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_simd_vec4 extension included")
-#endif
-
-
-// Warning silencer for nameless struct/union.
-#if (GLM_COMPILER & GLM_COMPILER_VC)
-# pragma warning(push)
-# pragma warning(disable:4201) // warning C4201: nonstandard extension used : nameless struct/union
-#endif
-
-namespace glm
-{
- enum comp
- {
- X = 0,
- R = 0,
- S = 0,
- Y = 1,
- G = 1,
- T = 1,
- Z = 2,
- B = 2,
- P = 2,
- W = 3,
- A = 3,
- Q = 3
- };
-
-}//namespace glm
-
-namespace glm{
-namespace detail
-{
- /// 4-dimensional vector implemented using SIMD SEE intrinsics.
- /// \ingroup gtx_simd_vec4
- GLM_ALIGNED_STRUCT(16) fvec4SIMD
- {
- typedef __m128 value_type;
- typedef std::size_t size_type;
- static size_type value_size();
-
- typedef fvec4SIMD type;
- typedef tvec4<bool, highp> bool_type;
-
-#ifdef GLM_SIMD_ENABLE_XYZW_UNION
- union
- {
- __m128 Data;
- struct {float x, y, z, w;};
- };
-#else
- __m128 Data;
-#endif
-
- //////////////////////////////////////
- // Implicit basic constructors
-
- fvec4SIMD();
- fvec4SIMD(__m128 const & Data);
- fvec4SIMD(fvec4SIMD const & v);
-
- //////////////////////////////////////
- // Explicit basic constructors
-
- explicit fvec4SIMD(
- ctor);
- explicit fvec4SIMD(
- float const & s);
- explicit fvec4SIMD(
- float const & x,
- float const & y,
- float const & z,
- float const & w);
- explicit fvec4SIMD(
- vec4 const & v);
-
- ////////////////////////////////////////
- //// Conversion vector constructors
-
- fvec4SIMD(vec2 const & v, float const & s1, float const & s2);
- fvec4SIMD(float const & s1, vec2 const & v, float const & s2);
- fvec4SIMD(float const & s1, float const & s2, vec2 const & v);
- fvec4SIMD(vec3 const & v, float const & s);
- fvec4SIMD(float const & s, vec3 const & v);
- fvec4SIMD(vec2 const & v1, vec2 const & v2);
- //fvec4SIMD(ivec4SIMD const & v);
-
- //////////////////////////////////////
- // Unary arithmetic operators
-
- fvec4SIMD& operator= (fvec4SIMD const & v);
- fvec4SIMD& operator+=(fvec4SIMD const & v);
- fvec4SIMD& operator-=(fvec4SIMD const & v);
- fvec4SIMD& operator*=(fvec4SIMD const & v);
- fvec4SIMD& operator/=(fvec4SIMD const & v);
-
- fvec4SIMD& operator+=(float const & s);
- fvec4SIMD& operator-=(float const & s);
- fvec4SIMD& operator*=(float const & s);
- fvec4SIMD& operator/=(float const & s);
-
- fvec4SIMD& operator++();
- fvec4SIMD& operator--();
-
- //////////////////////////////////////
- // Swizzle operators
-
- template <comp X, comp Y, comp Z, comp W>
- fvec4SIMD& swizzle();
- template <comp X, comp Y, comp Z, comp W>
- fvec4SIMD swizzle() const;
- template <comp X, comp Y, comp Z>
- fvec4SIMD swizzle() const;
- template <comp X, comp Y>
- fvec4SIMD swizzle() const;
- template <comp X>
- fvec4SIMD swizzle() const;
- };
-}//namespace detail
-
- typedef glm::detail::fvec4SIMD simdVec4;
-
- /// @addtogroup gtx_simd_vec4
- /// @{
-
- //! Convert a simdVec4 to a vec4.
- /// @see gtx_simd_vec4
- vec4 vec4_cast(
- detail::fvec4SIMD const & x);
-
- //! Returns x if x >= 0; otherwise, it returns -x.
- /// @see gtx_simd_vec4
- detail::fvec4SIMD abs(detail::fvec4SIMD const & x);
-
- //! Returns 1.0 if x > 0, 0.0 if x = 0, or -1.0 if x < 0.
- /// @see gtx_simd_vec4
- detail::fvec4SIMD sign(detail::fvec4SIMD const & x);
-
- //! Returns a value equal to the nearest integer that is less then or equal to x.
- /// @see gtx_simd_vec4
- detail::fvec4SIMD floor(detail::fvec4SIMD const & x);
-
- //! Returns a value equal to the nearest integer to x
- //! whose absolute value is not larger than the absolute value of x.
- /// @see gtx_simd_vec4
- detail::fvec4SIMD trunc(detail::fvec4SIMD const & x);
-
- //! Returns a value equal to the nearest integer to x.
- //! The fraction 0.5 will round in a direction chosen by the
- //! implementation, presumably the direction that is fastest.
- //! This includes the possibility that round(x) returns the
- //! same value as roundEven(x) for all values of x.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD round(detail::fvec4SIMD const & x);
-
- //! Returns a value equal to the nearest integer to x.
- //! A fractional part of 0.5 will round toward the nearest even
- //! integer. (Both 3.5 and 4.5 for x will return 4.0.)
- ///
- /// @see gtx_simd_vec4
- //detail::fvec4SIMD roundEven(detail::fvec4SIMD const & x);
-
- //! Returns a value equal to the nearest integer
- //! that is greater than or equal to x.
- /// @see gtx_simd_vec4
- detail::fvec4SIMD ceil(detail::fvec4SIMD const & x);
-
- //! Return x - floor(x).
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD fract(detail::fvec4SIMD const & x);
-
- //! Modulus. Returns x - y * floor(x / y)
- //! for each component in x using the floating point value y.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD mod(
- detail::fvec4SIMD const & x,
- detail::fvec4SIMD const & y);
-
- //! Modulus. Returns x - y * floor(x / y)
- //! for each component in x using the floating point value y.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD mod(
- detail::fvec4SIMD const & x,
- float const & y);
-
- //! Returns the fractional part of x and sets i to the integer
- //! part (as a whole number floating point value). Both the
- //! return value and the output parameter will have the same
- //! sign as x.
- //! (From GLM_GTX_simd_vec4 extension, common function)
- //detail::fvec4SIMD modf(
- // detail::fvec4SIMD const & x,
- // detail::fvec4SIMD & i);
-
- //! Returns y if y < x; otherwise, it returns x.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD min(
- detail::fvec4SIMD const & x,
- detail::fvec4SIMD const & y);
-
- detail::fvec4SIMD min(
- detail::fvec4SIMD const & x,
- float const & y);
-
- //! Returns y if x < y; otherwise, it returns x.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD max(
- detail::fvec4SIMD const & x,
- detail::fvec4SIMD const & y);
-
- detail::fvec4SIMD max(
- detail::fvec4SIMD const & x,
- float const & y);
-
- //! Returns min(max(x, minVal), maxVal) for each component in x
- //! using the floating-point values minVal and maxVal.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD clamp(
- detail::fvec4SIMD const & x,
- detail::fvec4SIMD const & minVal,
- detail::fvec4SIMD const & maxVal);
-
- detail::fvec4SIMD clamp(
- detail::fvec4SIMD const & x,
- float const & minVal,
- float const & maxVal);
-
- //! \return If genTypeU is a floating scalar or vector:
- //! Returns x * (1.0 - a) + y * a, i.e., the linear blend of
- //! x and y using the floating-point value a.
- //! The value for a is not restricted to the range [0, 1].
- //!
- //! \return If genTypeU is a boolean scalar or vector:
- //! Selects which vector each returned component comes
- //! from. For a component of a that is false, the
- //! corresponding component of x is returned. For a
- //! component of a that is true, the corresponding
- //! component of y is returned. Components of x and y that
- //! are not selected are allowed to be invalid floating point
- //! values and will have no effect on the results. Thus, this
- //! provides different functionality than
- //! genType mix(genType x, genType y, genType(a))
- //! where a is a Boolean vector.
- //!
- //! From GLSL 1.30.08 specification, section 8.3
- //!
- //! \param[in] x Floating point scalar or vector.
- //! \param[in] y Floating point scalar or vector.
- //! \param[in] a Floating point or boolean scalar or vector.
- //!
- /// \todo Test when 'a' is a boolean.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD mix(
- detail::fvec4SIMD const & x,
- detail::fvec4SIMD const & y,
- detail::fvec4SIMD const & a);
-
- //! Returns 0.0 if x < edge, otherwise it returns 1.0.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD step(
- detail::fvec4SIMD const & edge,
- detail::fvec4SIMD const & x);
-
- detail::fvec4SIMD step(
- float const & edge,
- detail::fvec4SIMD const & x);
-
- //! Returns 0.0 if x <= edge0 and 1.0 if x >= edge1 and
- //! performs smooth Hermite interpolation between 0 and 1
- //! when edge0 < x < edge1. This is useful in cases where
- //! you would want a threshold function with a smooth
- //! transition. This is equivalent to:
- //! genType t;
- //! t = clamp ((x - edge0) / (edge1 - edge0), 0, 1);
- //! return t * t * (3 - 2 * t);
- //! Results are undefined if edge0 >= edge1.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD smoothstep(
- detail::fvec4SIMD const & edge0,
- detail::fvec4SIMD const & edge1,
- detail::fvec4SIMD const & x);
-
- detail::fvec4SIMD smoothstep(
- float const & edge0,
- float const & edge1,
- detail::fvec4SIMD const & x);
-
- //! Returns true if x holds a NaN (not a number)
- //! representation in the underlying implementation's set of
- //! floating point representations. Returns false otherwise,
- //! including for implementations with no NaN
- //! representations.
- ///
- /// @see gtx_simd_vec4
- //bvec4 isnan(detail::fvec4SIMD const & x);
-
- //! Returns true if x holds a positive infinity or negative
- //! infinity representation in the underlying implementation's
- //! set of floating point representations. Returns false
- //! otherwise, including for implementations with no infinity
- //! representations.
- ///
- /// @see gtx_simd_vec4
- //bvec4 isinf(detail::fvec4SIMD const & x);
-
- //! Returns a signed or unsigned integer value representing
- //! the encoding of a floating-point value. The floatingpoint
- //! value's bit-level representation is preserved.
- ///
- /// @see gtx_simd_vec4
- //detail::ivec4SIMD floatBitsToInt(detail::fvec4SIMD const & value);
-
- //! Returns a floating-point value corresponding to a signed
- //! or unsigned integer encoding of a floating-point value.
- //! If an inf or NaN is passed in, it will not signal, and the
- //! resulting floating point value is unspecified. Otherwise,
- //! the bit-level representation is preserved.
- ///
- /// @see gtx_simd_vec4
- //detail::fvec4SIMD intBitsToFloat(detail::ivec4SIMD const & value);
-
- //! Computes and returns a * b + c.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD fma(
- detail::fvec4SIMD const & a,
- detail::fvec4SIMD const & b,
- detail::fvec4SIMD const & c);
-
- //! Splits x into a floating-point significand in the range
- //! [0.5, 1.0) and an integral exponent of two, such that:
- //! x = significand * exp(2, exponent)
- //! The significand is returned by the function and the
- //! exponent is returned in the parameter exp. For a
- //! floating-point value of zero, the significant and exponent
- //! are both zero. For a floating-point value that is an
- //! infinity or is not a number, the results are undefined.
- ///
- /// @see gtx_simd_vec4
- //detail::fvec4SIMD frexp(detail::fvec4SIMD const & x, detail::ivec4SIMD & exp);
-
- //! Builds a floating-point number from x and the
- //! corresponding integral exponent of two in exp, returning:
- //! significand * exp(2, exponent)
- //! If this product is too large to be represented in the
- //! floating-point type, the result is undefined.
- ///
- /// @see gtx_simd_vec4
- //detail::fvec4SIMD ldexp(detail::fvec4SIMD const & x, detail::ivec4SIMD const & exp);
-
- //! Returns the length of x, i.e., sqrt(x * x).
- ///
- /// @see gtx_simd_vec4
- float length(
- detail::fvec4SIMD const & x);
-
- //! Returns the length of x, i.e., sqrt(x * x).
- //! Less accurate but much faster than simdLength.
- ///
- /// @see gtx_simd_vec4
- float fastLength(
- detail::fvec4SIMD const & x);
-
- //! Returns the length of x, i.e., sqrt(x * x).
- //! Slightly more accurate but much slower than simdLength.
- ///
- /// @see gtx_simd_vec4
- float niceLength(
- detail::fvec4SIMD const & x);
-
- //! Returns the length of x, i.e., sqrt(x * x).
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD length4(
- detail::fvec4SIMD const & x);
-
- //! Returns the length of x, i.e., sqrt(x * x).
- //! Less accurate but much faster than simdLength4.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD fastLength4(
- detail::fvec4SIMD const & x);
-
- //! Returns the length of x, i.e., sqrt(x * x).
- //! Slightly more accurate but much slower than simdLength4.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD niceLength4(
- detail::fvec4SIMD const & x);
-
- //! Returns the distance betwwen p0 and p1, i.e., length(p0 - p1).
- ///
- /// @see gtx_simd_vec4
- float distance(
- detail::fvec4SIMD const & p0,
- detail::fvec4SIMD const & p1);
-
- //! Returns the distance betwwen p0 and p1, i.e., length(p0 - p1).
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD distance4(
- detail::fvec4SIMD const & p0,
- detail::fvec4SIMD const & p1);
-
- //! Returns the dot product of x and y, i.e., result = x * y.
- ///
- /// @see gtx_simd_vec4
- float simdDot(
- detail::fvec4SIMD const & x,
- detail::fvec4SIMD const & y);
-
- //! Returns the dot product of x and y, i.e., result = x * y.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD dot4(
- detail::fvec4SIMD const & x,
- detail::fvec4SIMD const & y);
-
- //! Returns the cross product of x and y.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD cross(
- detail::fvec4SIMD const & x,
- detail::fvec4SIMD const & y);
-
- //! Returns a vector in the same direction as x but with length of 1.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD normalize(
- detail::fvec4SIMD const & x);
-
- //! Returns a vector in the same direction as x but with length of 1.
- //! Less accurate but much faster than simdNormalize.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD fastNormalize(
- detail::fvec4SIMD const & x);
-
- //! If dot(Nref, I) < 0.0, return N, otherwise, return -N.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD simdFaceforward(
- detail::fvec4SIMD const & N,
- detail::fvec4SIMD const & I,
- detail::fvec4SIMD const & Nref);
-
- //! For the incident vector I and surface orientation N,
- //! returns the reflection direction : result = I - 2.0 * dot(N, I) * N.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD reflect(
- detail::fvec4SIMD const & I,
- detail::fvec4SIMD const & N);
-
- //! For the incident vector I and surface normal N,
- //! and the ratio of indices of refraction eta,
- //! return the refraction vector.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD refract(
- detail::fvec4SIMD const & I,
- detail::fvec4SIMD const & N,
- float const & eta);
-
- //! Returns the positive square root of x.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD sqrt(
- detail::fvec4SIMD const & x);
-
- //! Returns the positive square root of x with the nicest quality but very slow.
- //! Slightly more accurate but much slower than simdSqrt.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD niceSqrt(
- detail::fvec4SIMD const & x);
-
- //! Returns the positive square root of x
- //! Less accurate but much faster than sqrt.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD fastSqrt(
- detail::fvec4SIMD const & x);
-
- //! Returns the reciprocal of the positive square root of x.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD inversesqrt(
- detail::fvec4SIMD const & x);
-
- //! Returns the reciprocal of the positive square root of x.
- //! Faster than inversesqrt but less accurate.
- ///
- /// @see gtx_simd_vec4
- detail::fvec4SIMD fastInversesqrt(
- detail::fvec4SIMD const & x);
-
- /// @}
-}//namespace glm
-
-#include "simd_vec4.inl"
-
-#if (GLM_COMPILER & GLM_COMPILER_VC)
-# pragma warning(pop)
-#endif
-
-#endif//(GLM_ARCH != GLM_ARCH_PURE)
diff --git a/inc/glm/gtx/simd_vec4.inl b/inc/glm/gtx/simd_vec4.inl deleted file mode 100644 index 35b826c..0000000 --- a/inc/glm/gtx/simd_vec4.inl +++ /dev/null @@ -1,727 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////////////////////////
-// OpenGL Mathematics Copyright (c) 2005 - 2014 G-Truc Creation (www.g-truc.net)
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Created : 2009-05-07
-// Updated : 2009-05-07
-// Licence : This source is under MIT License
-// File : glm/gtx/simd_vec4.inl
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace glm{
-namespace detail{
-
-template <int Value>
-struct shuffle_mask
-{
- enum{value = Value};
-};
-
-//////////////////////////////////////
-// Implicit basic constructors
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD()
-# ifdef GLM_FORCE_NO_CTOR_INIT
- : Data(_mm_set_ps(0.0f, 0.0f, 0.0f, 0.0f))
-# endif
-{}
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(__m128 const & Data) :
- Data(Data)
-{}
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(fvec4SIMD const & v) :
- Data(v.Data)
-{}
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(vec4 const & v) :
- Data(_mm_set_ps(v.w, v.z, v.y, v.x))
-{}
-
-//////////////////////////////////////
-// Explicit basic constructors
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(float const & s) :
- Data(_mm_set1_ps(s))
-{}
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(float const & x, float const & y, float const & z, float const & w) :
-// Data(_mm_setr_ps(x, y, z, w))
- Data(_mm_set_ps(w, z, y, x))
-{}
-/*
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(float const v[4]) :
- Data(_mm_load_ps(v))
-{}
-*/
-//////////////////////////////////////
-// Swizzle constructors
-
-//fvec4SIMD(ref4<float> const & r);
-
-//////////////////////////////////////
-// Conversion vector constructors
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(vec2 const & v, float const & s1, float const & s2) :
- Data(_mm_set_ps(s2, s1, v.y, v.x))
-{}
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(float const & s1, vec2 const & v, float const & s2) :
- Data(_mm_set_ps(s2, v.y, v.x, s1))
-{}
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(float const & s1, float const & s2, vec2 const & v) :
- Data(_mm_set_ps(v.y, v.x, s2, s1))
-{}
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(vec3 const & v, float const & s) :
- Data(_mm_set_ps(s, v.z, v.y, v.x))
-{}
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(float const & s, vec3 const & v) :
- Data(_mm_set_ps(v.z, v.y, v.x, s))
-{}
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(vec2 const & v1, vec2 const & v2) :
- Data(_mm_set_ps(v2.y, v2.x, v1.y, v1.x))
-{}
-
-//GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(ivec4SIMD const & v) :
-// Data(_mm_cvtepi32_ps(v.Data))
-//{}
-
-//////////////////////////////////////
-// Unary arithmetic operators
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator=(fvec4SIMD const & v)
-{
- this->Data = v.Data;
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator+=(float const & s)
-{
- this->Data = _mm_add_ps(Data, _mm_set_ps1(s));
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator+=(fvec4SIMD const & v)
-{
- this->Data = _mm_add_ps(this->Data , v.Data);
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator-=(float const & s)
-{
- this->Data = _mm_sub_ps(Data, _mm_set_ps1(s));
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator-=(fvec4SIMD const & v)
-{
- this->Data = _mm_sub_ps(this->Data , v.Data);
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator*=(float const & s)
-{
- this->Data = _mm_mul_ps(this->Data, _mm_set_ps1(s));
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator*=(fvec4SIMD const & v)
-{
- this->Data = _mm_mul_ps(this->Data , v.Data);
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator/=(float const & s)
-{
- this->Data = _mm_div_ps(Data, _mm_set1_ps(s));
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator/=(fvec4SIMD const & v)
-{
- this->Data = _mm_div_ps(this->Data , v.Data);
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator++()
-{
- this->Data = _mm_add_ps(this->Data , glm::detail::one);
- return *this;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator--()
-{
- this->Data = _mm_sub_ps(this->Data, glm::detail::one);
- return *this;
-}
-
-//////////////////////////////////////
-// Swizzle operators
-
-template <comp X, comp Y, comp Z, comp W>
-GLM_FUNC_QUALIFIER fvec4SIMD fvec4SIMD::swizzle() const
-{
- __m128 Data = _mm_shuffle_ps(
- this->Data, this->Data,
- shuffle_mask<(W << 6) | (Z << 4) | (Y << 2) | (X << 0)>::value);
- return fvec4SIMD(Data);
-}
-
-template <comp X, comp Y, comp Z, comp W>
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::swizzle()
-{
- this->Data = _mm_shuffle_ps(
- this->Data, this->Data,
- shuffle_mask<(W << 6) | (Z << 4) | (Y << 2) | (X << 0)>::value);
- return *this;
-}
-
-// operator+
-GLM_FUNC_QUALIFIER fvec4SIMD operator+ (fvec4SIMD const & v, float s)
-{
- return fvec4SIMD(_mm_add_ps(v.Data, _mm_set1_ps(s)));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator+ (float s, fvec4SIMD const & v)
-{
- return fvec4SIMD(_mm_add_ps(_mm_set1_ps(s), v.Data));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator+ (fvec4SIMD const & v1, fvec4SIMD const & v2)
-{
- return fvec4SIMD(_mm_add_ps(v1.Data, v2.Data));
-}
-
-//operator-
-GLM_FUNC_QUALIFIER fvec4SIMD operator- (fvec4SIMD const & v, float s)
-{
- return fvec4SIMD(_mm_sub_ps(v.Data, _mm_set1_ps(s)));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator- (float s, fvec4SIMD const & v)
-{
- return fvec4SIMD(_mm_sub_ps(_mm_set1_ps(s), v.Data));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator- (fvec4SIMD const & v1, fvec4SIMD const & v2)
-{
- return fvec4SIMD(_mm_sub_ps(v1.Data, v2.Data));
-}
-
-//operator*
-GLM_FUNC_QUALIFIER fvec4SIMD operator* (fvec4SIMD const & v, float s)
-{
- __m128 par0 = v.Data;
- __m128 par1 = _mm_set1_ps(s);
- return fvec4SIMD(_mm_mul_ps(par0, par1));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator* (float s, fvec4SIMD const & v)
-{
- __m128 par0 = _mm_set1_ps(s);
- __m128 par1 = v.Data;
- return fvec4SIMD(_mm_mul_ps(par0, par1));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator* (fvec4SIMD const & v1, fvec4SIMD const & v2)
-{
- return fvec4SIMD(_mm_mul_ps(v1.Data, v2.Data));
-}
-
-//operator/
-GLM_FUNC_QUALIFIER fvec4SIMD operator/ (fvec4SIMD const & v, float s)
-{
- __m128 par0 = v.Data;
- __m128 par1 = _mm_set1_ps(s);
- return fvec4SIMD(_mm_div_ps(par0, par1));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator/ (float s, fvec4SIMD const & v)
-{
- __m128 par0 = _mm_set1_ps(s);
- __m128 par1 = v.Data;
- return fvec4SIMD(_mm_div_ps(par0, par1));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator/ (fvec4SIMD const & v1, fvec4SIMD const & v2)
-{
- return fvec4SIMD(_mm_div_ps(v1.Data, v2.Data));
-}
-
-// Unary constant operators
-GLM_FUNC_QUALIFIER fvec4SIMD operator- (fvec4SIMD const & v)
-{
- return fvec4SIMD(_mm_sub_ps(_mm_setzero_ps(), v.Data));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator++ (fvec4SIMD const & v, int)
-{
- return fvec4SIMD(_mm_add_ps(v.Data, glm::detail::one));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator-- (fvec4SIMD const & v, int)
-{
- return fvec4SIMD(_mm_sub_ps(v.Data, glm::detail::one));
-}
-
-}//namespace detail
-
-GLM_FUNC_QUALIFIER vec4 vec4_cast
-(
- detail::fvec4SIMD const & x
-)
-{
- GLM_ALIGN(16) vec4 Result;
- _mm_store_ps(&Result[0], x.Data);
- return Result;
-}
-
-// Other possible implementation
-//float abs(float a)
-//{
-// return max(-a, a);
-//}
-GLM_FUNC_QUALIFIER detail::fvec4SIMD abs
-(
- detail::fvec4SIMD const & x
-)
-{
- return detail::sse_abs_ps(x.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD sign
-(
- detail::fvec4SIMD const & x
-)
-{
- return detail::sse_sgn_ps(x.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD floor
-(
- detail::fvec4SIMD const & x
-)
-{
- return detail::sse_flr_ps(x.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD trunc
-(
- detail::fvec4SIMD const & x
-)
-{
- //return x < 0 ? -floor(-x) : floor(x);
-
- __m128 Flr0 = detail::sse_flr_ps(_mm_sub_ps(_mm_setzero_ps(), x.Data));
- __m128 Sub0 = _mm_sub_ps(Flr0, x.Data);
- __m128 Flr1 = detail::sse_flr_ps(x.Data);
-
- __m128 Cmp0 = _mm_cmplt_ps(x.Data, glm::detail::zero);
- __m128 Cmp1 = _mm_cmpnlt_ps(x.Data, glm::detail::zero);
-
- __m128 And0 = _mm_and_ps(Sub0, Cmp0);
- __m128 And1 = _mm_and_ps(Flr1, Cmp1);
-
- return _mm_or_ps(And0, And1);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD round
-(
- detail::fvec4SIMD const & x
-)
-{
- return detail::sse_rnd_ps(x.Data);
-}
-
-//GLM_FUNC_QUALIFIER detail::fvec4SIMD roundEven
-//(
-// detail::fvec4SIMD const & x
-//)
-//{
-
-//}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD ceil
-(
- detail::fvec4SIMD const & x
-)
-{
- return detail::sse_ceil_ps(x.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD fract
-(
- detail::fvec4SIMD const & x
-)
-{
- return detail::sse_frc_ps(x.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD mod
-(
- detail::fvec4SIMD const & x,
- detail::fvec4SIMD const & y
-)
-{
- return detail::sse_mod_ps(x.Data, y.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD mod
-(
- detail::fvec4SIMD const & x,
- float const & y
-)
-{
- return detail::sse_mod_ps(x.Data, _mm_set1_ps(y));
-}
-
-//GLM_FUNC_QUALIFIER detail::fvec4SIMD modf
-//(
-// detail::fvec4SIMD const & x,
-// detail::fvec4SIMD & i
-//)
-//{
-
-//}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD min
-(
- detail::fvec4SIMD const & x,
- detail::fvec4SIMD const & y
-)
-{
- return _mm_min_ps(x.Data, y.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD min
-(
- detail::fvec4SIMD const & x,
- float const & y
-)
-{
- return _mm_min_ps(x.Data, _mm_set1_ps(y));
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD max
-(
- detail::fvec4SIMD const & x,
- detail::fvec4SIMD const & y
-)
-{
- return _mm_max_ps(x.Data, y.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD max
-(
- detail::fvec4SIMD const & x,
- float const & y
-)
-{
- return _mm_max_ps(x.Data, _mm_set1_ps(y));
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD clamp
-(
- detail::fvec4SIMD const & x,
- detail::fvec4SIMD const & minVal,
- detail::fvec4SIMD const & maxVal
-)
-{
- return detail::sse_clp_ps(x.Data, minVal.Data, maxVal.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD clamp
-(
- detail::fvec4SIMD const & x,
- float const & minVal,
- float const & maxVal
-)
-{
- return detail::sse_clp_ps(x.Data, _mm_set1_ps(minVal), _mm_set1_ps(maxVal));
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD mix
-(
- detail::fvec4SIMD const & x,
- detail::fvec4SIMD const & y,
- detail::fvec4SIMD const & a
-)
-{
- __m128 Sub0 = _mm_sub_ps(y.Data, x.Data);
- __m128 Mul0 = _mm_mul_ps(a.Data, Sub0);
- return _mm_add_ps(x.Data, Mul0);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD step
-(
- detail::fvec4SIMD const & edge,
- detail::fvec4SIMD const & x
-)
-{
- __m128 cmp0 = _mm_cmpngt_ps(x.Data, edge.Data);
- return _mm_max_ps(_mm_min_ps(cmp0, _mm_setzero_ps()), detail::one);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD step
-(
- float const & edge,
- detail::fvec4SIMD const & x
-)
-{
- __m128 cmp0 = _mm_cmpngt_ps(x.Data, _mm_set1_ps(edge));
- return _mm_max_ps(_mm_min_ps(cmp0, _mm_setzero_ps()), detail::one);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD smoothstep
-(
- detail::fvec4SIMD const & edge0,
- detail::fvec4SIMD const & edge1,
- detail::fvec4SIMD const & x
-)
-{
- return detail::sse_ssp_ps(edge0.Data, edge1.Data, x.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD smoothstep
-(
- float const & edge0,
- float const & edge1,
- detail::fvec4SIMD const & x
-)
-{
- return detail::sse_ssp_ps(_mm_set1_ps(edge0), _mm_set1_ps(edge1), x.Data);
-}
-
-//GLM_FUNC_QUALIFIER bvec4 isnan(detail::fvec4SIMD const & x)
-//{
-
-//}
-
-//GLM_FUNC_QUALIFIER bvec4 isinf(detail::fvec4SIMD const & x)
-//{
-
-//}
-
-//GLM_FUNC_QUALIFIER detail::ivec4SIMD floatBitsToInt
-//(
-// detail::fvec4SIMD const & value
-//)
-//{
-
-//}
-
-//GLM_FUNC_QUALIFIER detail::fvec4SIMD intBitsToFloat
-//(
-// detail::ivec4SIMD const & value
-//)
-//{
-
-//}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD fma
-(
- detail::fvec4SIMD const & a,
- detail::fvec4SIMD const & b,
- detail::fvec4SIMD const & c
-)
-{
- return _mm_add_ps(_mm_mul_ps(a.Data, b.Data), c.Data);
-}
-
-GLM_FUNC_QUALIFIER float length
-(
- detail::fvec4SIMD const & x
-)
-{
- detail::fvec4SIMD dot0 = detail::sse_dot_ss(x.Data, x.Data);
- detail::fvec4SIMD sqt0 = sqrt(dot0);
- float Result = 0;
- _mm_store_ss(&Result, sqt0.Data);
- return Result;
-}
-
-GLM_FUNC_QUALIFIER float fastLength
-(
- detail::fvec4SIMD const & x
-)
-{
- detail::fvec4SIMD dot0 = detail::sse_dot_ss(x.Data, x.Data);
- detail::fvec4SIMD sqt0 = fastSqrt(dot0);
- float Result = 0;
- _mm_store_ss(&Result, sqt0.Data);
- return Result;
-}
-
-GLM_FUNC_QUALIFIER float niceLength
-(
- detail::fvec4SIMD const & x
-)
-{
- detail::fvec4SIMD dot0 = detail::sse_dot_ss(x.Data, x.Data);
- detail::fvec4SIMD sqt0 = niceSqrt(dot0);
- float Result = 0;
- _mm_store_ss(&Result, sqt0.Data);
- return Result;
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD length4
-(
- detail::fvec4SIMD const & x
-)
-{
- return sqrt(dot4(x, x));
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD fastLength4
-(
- detail::fvec4SIMD const & x
-)
-{
- return fastSqrt(dot4(x, x));
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD niceLength4
-(
- detail::fvec4SIMD const & x
-)
-{
- return niceSqrt(dot4(x, x));
-}
-
-GLM_FUNC_QUALIFIER float distance
-(
- detail::fvec4SIMD const & p0,
- detail::fvec4SIMD const & p1
-)
-{
- float Result = 0;
- _mm_store_ss(&Result, detail::sse_dst_ps(p0.Data, p1.Data));
- return Result;
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD distance4
-(
- detail::fvec4SIMD const & p0,
- detail::fvec4SIMD const & p1
-)
-{
- return detail::sse_dst_ps(p0.Data, p1.Data);
-}
-
-GLM_FUNC_QUALIFIER float dot
-(
- detail::fvec4SIMD const & x,
- detail::fvec4SIMD const & y
-)
-{
- float Result = 0;
- _mm_store_ss(&Result, detail::sse_dot_ss(x.Data, y.Data));
- return Result;
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD dot4
-(
- detail::fvec4SIMD const & x,
- detail::fvec4SIMD const & y
-)
-{
- return detail::sse_dot_ps(x.Data, y.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD cross
-(
- detail::fvec4SIMD const & x,
- detail::fvec4SIMD const & y
-)
-{
- return detail::sse_xpd_ps(x.Data, y.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD normalize
-(
- detail::fvec4SIMD const & x
-)
-{
- __m128 dot0 = detail::sse_dot_ps(x.Data, x.Data);
- __m128 isr0 = inversesqrt(detail::fvec4SIMD(dot0)).Data;
- __m128 mul0 = _mm_mul_ps(x.Data, isr0);
- return mul0;
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD fastNormalize
-(
- detail::fvec4SIMD const & x
-)
-{
- __m128 dot0 = detail::sse_dot_ps(x.Data, x.Data);
- __m128 isr0 = fastInversesqrt(dot0).Data;
- __m128 mul0 = _mm_mul_ps(x.Data, isr0);
- return mul0;
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD faceforward
-(
- detail::fvec4SIMD const & N,
- detail::fvec4SIMD const & I,
- detail::fvec4SIMD const & Nref
-)
-{
- return detail::sse_ffd_ps(N.Data, I.Data, Nref.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD reflect
-(
- detail::fvec4SIMD const & I,
- detail::fvec4SIMD const & N
-)
-{
- return detail::sse_rfe_ps(I.Data, N.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD refract
-(
- detail::fvec4SIMD const & I,
- detail::fvec4SIMD const & N,
- float const & eta
-)
-{
- return detail::sse_rfa_ps(I.Data, N.Data, _mm_set1_ps(eta));
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD sqrt(detail::fvec4SIMD const & x)
-{
- return _mm_mul_ps(inversesqrt(x).Data, x.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD niceSqrt(detail::fvec4SIMD const & x)
-{
- return _mm_sqrt_ps(x.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD fastSqrt(detail::fvec4SIMD const & x)
-{
- return _mm_mul_ps(fastInversesqrt(x.Data).Data, x.Data);
-}
-
-// SSE scalar reciprocal sqrt using rsqrt op, plus one Newton-Rhaphson iteration
-// By Elan Ruskin, http://assemblyrequired.crashworks.org/
-GLM_FUNC_QUALIFIER detail::fvec4SIMD inversesqrt(detail::fvec4SIMD const & x)
-{
- GLM_ALIGN(4) static const __m128 three = {3, 3, 3, 3}; // aligned consts for fast load
- GLM_ALIGN(4) static const __m128 half = {0.5,0.5,0.5,0.5};
-
- __m128 recip = _mm_rsqrt_ps(x.Data); // "estimate" opcode
- __m128 halfrecip = _mm_mul_ps(half, recip);
- __m128 threeminus_xrr = _mm_sub_ps(three, _mm_mul_ps(x.Data, _mm_mul_ps(recip, recip)));
- return _mm_mul_ps(halfrecip, threeminus_xrr);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD fastInversesqrt(detail::fvec4SIMD const & x)
-{
- return _mm_rsqrt_ps(x.Data);
-}
-
-}//namespace glm
diff --git a/inc/glm/gtx/spline.hpp b/inc/glm/gtx/spline.hpp deleted file mode 100644 index 1abbef4..0000000 --- a/inc/glm/gtx/spline.hpp +++ /dev/null @@ -1,90 +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 gtx_spline
-/// @file glm/gtx/spline.hpp
-/// @date 2007-01-25 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_spline GLM_GTX_spline
-/// @ingroup gtx
-///
-/// @brief Spline functions
-///
-/// <glm/gtx/spline.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../gtx/optimum_pow.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_spline extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_spline
- /// @{
-
- /// Return a point from a catmull rom curve.
- /// @see gtx_spline extension.
- template <typename genType>
- GLM_FUNC_DECL genType catmullRom(
- genType const & v1,
- genType const & v2,
- genType const & v3,
- genType const & v4,
- typename genType::value_type const & s);
-
- /// Return a point from a hermite curve.
- /// @see gtx_spline extension.
- template <typename genType>
- GLM_FUNC_DECL genType hermite(
- genType const & v1,
- genType const & t1,
- genType const & v2,
- genType const & t2,
- typename genType::value_type const & s);
-
- /// Return a point from a cubic curve.
- /// @see gtx_spline extension.
- template <typename genType>
- GLM_FUNC_DECL genType cubic(
- genType const & v1,
- genType const & v2,
- genType const & v3,
- genType const & v4,
- typename genType::value_type const & s);
-
- /// @}
-}//namespace glm
-
-#include "spline.inl"
diff --git a/inc/glm/gtx/spline.inl b/inc/glm/gtx/spline.inl deleted file mode 100644 index d368292..0000000 --- a/inc/glm/gtx/spline.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 gtx_spline
-/// @file glm/gtx/spline.inl
-/// @date 2007-01-25 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename genType>
- GLM_FUNC_QUALIFIER genType catmullRom
- (
- genType const & v1,
- genType const & v2,
- genType const & v3,
- genType const & v4,
- typename genType::value_type const & s
- )
- {
- typename genType::value_type s1 = s;
- typename genType::value_type s2 = pow2(s);
- typename genType::value_type s3 = pow3(s);
-
- typename genType::value_type f1 = -s3 + typename genType::value_type(2) * s2 - s;
- typename genType::value_type f2 = typename genType::value_type(3) * s3 - typename genType::value_type(5) * s2 + typename genType::value_type(2);
- typename genType::value_type f3 = typename genType::value_type(-3) * s3 + typename genType::value_type(4) * s2 + s;
- typename genType::value_type f4 = s3 - s2;
-
- return (f1 * v1 + f2 * v2 + f3 * v3 + f4 * v4) / typename genType::value_type(2);
-
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType hermite
- (
- genType const & v1,
- genType const & t1,
- genType const & v2,
- genType const & t2,
- typename genType::value_type const & s
- )
- {
- typename genType::value_type s1 = s;
- typename genType::value_type s2 = pow2(s);
- typename genType::value_type s3 = pow3(s);
-
- typename genType::value_type f1 = typename genType::value_type(2) * s3 - typename genType::value_type(3) * s2 + typename genType::value_type(1);
- typename genType::value_type f2 = typename genType::value_type(-2) * s3 + typename genType::value_type(3) * s2;
- typename genType::value_type f3 = s3 - typename genType::value_type(2) * s2 + s;
- typename genType::value_type f4 = s3 - s2;
-
- return f1 * v1 + f2 * v2 + f3 * t1 + f4 * t2;
- }
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType cubic
- (
- genType const & v1,
- genType const & v2,
- genType const & v3,
- genType const & v4,
- typename genType::value_type const & s
- )
- {
- return ((v1 * s + v2) * s + v3) * s + v4;
- }
-}//namespace glm
diff --git a/inc/glm/gtx/std_based_type.hpp b/inc/glm/gtx/std_based_type.hpp deleted file mode 100644 index 2dd0c50..0000000 --- a/inc/glm/gtx/std_based_type.hpp +++ /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 gtx_std_based_type
-/// @file glm/gtx/std_based_type.hpp
-/// @date 2008-06-08 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtx_extented_min_max (dependence)
-///
-/// @defgroup gtx_std_based_type GLM_GTX_std_based_type
-/// @ingroup gtx
-///
-/// @brief Adds vector types based on STL value types.
-/// <glm/gtx/std_based_type.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include <cstdlib>
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_std_based_type extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_std_based_type
- /// @{
-
- /// Vector type based of one std::size_t component.
- /// @see GLM_GTX_std_based_type
- typedef tvec1<std::size_t, defaultp> size1;
-
- /// Vector type based of two std::size_t components.
- /// @see GLM_GTX_std_based_type
- typedef tvec2<std::size_t, defaultp> size2;
-
- /// Vector type based of three std::size_t components.
- /// @see GLM_GTX_std_based_type
- typedef tvec3<std::size_t, defaultp> size3;
-
- /// Vector type based of four std::size_t components.
- /// @see GLM_GTX_std_based_type
- typedef tvec4<std::size_t, defaultp> size4;
-
- /// Vector type based of one std::size_t component.
- /// @see GLM_GTX_std_based_type
- typedef tvec1<std::size_t, defaultp> size1_t;
-
- /// Vector type based of two std::size_t components.
- /// @see GLM_GTX_std_based_type
- typedef tvec2<std::size_t, defaultp> size2_t;
-
- /// Vector type based of three std::size_t components.
- /// @see GLM_GTX_std_based_type
- typedef tvec3<std::size_t, defaultp> size3_t;
-
- /// Vector type based of four std::size_t components.
- /// @see GLM_GTX_std_based_type
- typedef tvec4<std::size_t, defaultp> size4_t;
-
- /// @}
-}//namespace glm
-
-#include "std_based_type.inl"
diff --git a/inc/glm/gtx/std_based_type.inl b/inc/glm/gtx/std_based_type.inl deleted file mode 100644 index 52817e8..0000000 --- a/inc/glm/gtx/std_based_type.inl +++ /dev/null @@ -1,36 +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 gtx_std_based_type
-/// @file glm/gtx/std_based_type.inl
-/// @date 2008-06-08 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
-
-}
diff --git a/inc/glm/gtx/string_cast.hpp b/inc/glm/gtx/string_cast.hpp deleted file mode 100644 index 164e28e..0000000 --- a/inc/glm/gtx/string_cast.hpp +++ /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 gtx_string_cast
-/// @file glm/gtx/string_cast.hpp
-/// @date 2008-04-26 / 2014-05-10
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtc_half_float (dependence)
-/// @see gtx_integer (dependence)
-/// @see gtx_quaternion (dependence)
-///
-/// @defgroup gtx_string_cast GLM_GTX_string_cast
-/// @ingroup gtx
-///
-/// @brief Setup strings for GLM type values
-///
-/// <glm/gtx/string_cast.hpp> need to be included to use these functionalities.
-/// This extension is not supported with CUDA
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../gtc/type_precision.hpp"
-#include <string>
-
-#if(GLM_COMPILER & GLM_COMPILER_CUDA)
-# error "GLM_GTX_string_cast is not supported on CUDA compiler"
-#endif
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_string_cast extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_string_cast
- /// @{
-
- /// Create a string from a GLM vector or matrix typed variable.
- /// @see gtx_string_cast extension.
- template <template <typename, precision> class matType, typename T, precision P>
- GLM_FUNC_DECL std::string to_string(matType<T, P> const & x);
-
- /// @}
-}//namespace glm
-
-#include "string_cast.inl"
diff --git a/inc/glm/gtx/string_cast.inl b/inc/glm/gtx/string_cast.inl deleted file mode 100644 index 48f4391..0000000 --- a/inc/glm/gtx/string_cast.inl +++ /dev/null @@ -1,455 +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 gtx_string_cast
-/// @file glm/gtx/string_cast.inl
-/// @date 2008-04-26 / 2014-05-10
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#include <cstdarg>
-#include <cstdio>
-
-namespace glm{
-namespace detail
-{
- GLM_FUNC_QUALIFIER std::string format(const char* msg, ...)
- {
- std::size_t const STRING_BUFFER(4096);
- char text[STRING_BUFFER];
- va_list list;
-
- if(msg == 0)
- return std::string();
-
- va_start(list, msg);
-# if(GLM_COMPILER & GLM_COMPILER_VC)
- vsprintf_s(text, STRING_BUFFER, msg, list);
-# else//
- vsprintf(text, msg, list);
-# endif//
- va_end(list);
-
- return std::string(text);
- }
-
- static const char* LabelTrue = "true";
- static const char* LabelFalse = "false";
-
- template <typename T, bool isFloat = false>
- struct literal
- {
- GLM_FUNC_QUALIFIER static char const * value() {return "%d";};
- };
-
- template <typename T>
- struct literal<T, true>
- {
- GLM_FUNC_QUALIFIER static char const * value() {return "%f";};
- };
-
-# if GLM_MODEL == GLM_MODEL_32 && GLM_COMPILER && GLM_COMPILER_VC
- template <>
- struct literal<uint64_t, false>
- {
- GLM_FUNC_QUALIFIER static char const * value() {return "%lld";};
- };
-
- template <>
- struct literal<int64_t, false>
- {
- GLM_FUNC_QUALIFIER static char const * value() {return "%lld";};
- };
-# endif//GLM_MODEL == GLM_MODEL_32 && GLM_COMPILER && GLM_COMPILER_VC
-
- template <typename T>
- struct prefix{};
-
- template <>
- struct prefix<float>
- {
- GLM_FUNC_QUALIFIER static char const * value() {return "";};
- };
-
- template <>
- struct prefix<double>
- {
- GLM_FUNC_QUALIFIER static char const * value() {return "d";};
- };
-
- template <>
- struct prefix<bool>
- {
- GLM_FUNC_QUALIFIER static char const * value() {return "b";};
- };
-
- template <>
- struct prefix<uint8_t>
- {
- GLM_FUNC_QUALIFIER static char const * value() {return "u8";};
- };
-
- template <>
- struct prefix<int8_t>
- {
- GLM_FUNC_QUALIFIER static char const * value() {return "i8";};
- };
-
- template <>
- struct prefix<uint16_t>
- {
- GLM_FUNC_QUALIFIER static char const * value() {return "u16";};
- };
-
- template <>
- struct prefix<int16_t>
- {
- GLM_FUNC_QUALIFIER static char const * value() {return "i16";};
- };
-
- template <>
- struct prefix<uint32_t>
- {
- GLM_FUNC_QUALIFIER static char const * value() {return "u";};
- };
-
- template <>
- struct prefix<int32_t>
- {
- GLM_FUNC_QUALIFIER static char const * value() {return "i";};
- };
-
- template <>
- struct prefix<uint64_t>
- {
- GLM_FUNC_QUALIFIER static char const * value() {return "u64";};
- };
-
- template <>
- struct prefix<int64_t>
- {
- GLM_FUNC_QUALIFIER static char const * value() {return "i64";};
- };
-
- template <template <typename, precision> class matType, typename T, precision P>
- struct compute_to_string
- {};
-
- template <precision P>
- struct compute_to_string<tvec1, bool, P>
- {
- GLM_FUNC_QUALIFIER static std::string call(tvec1<bool, P> const & x)
- {
- return detail::format("bvec1(%s)",
- x[0] ? detail::LabelTrue : detail::LabelFalse);
- }
- };
-
- template <precision P>
- struct compute_to_string<tvec2, bool, P>
- {
- GLM_FUNC_QUALIFIER static std::string call(tvec2<bool, P> const & x)
- {
- return detail::format("bvec2(%s, %s)",
- x[0] ? detail::LabelTrue : detail::LabelFalse,
- x[1] ? detail::LabelTrue : detail::LabelFalse);
- }
- };
-
- template <precision P>
- struct compute_to_string<tvec3, bool, P>
- {
- GLM_FUNC_QUALIFIER static std::string call(tvec3<bool, P> const & x)
- {
- return detail::format("bvec3(%s, %s, %s)",
- x[0] ? detail::LabelTrue : detail::LabelFalse,
- x[1] ? detail::LabelTrue : detail::LabelFalse,
- x[2] ? detail::LabelTrue : detail::LabelFalse);
- }
- };
-
- template <precision P>
- struct compute_to_string<tvec4, bool, P>
- {
- GLM_FUNC_QUALIFIER static std::string call(tvec4<bool, P> const & x)
- {
- return detail::format("bvec4(%s, %s, %s, %s)",
- x[0] ? detail::LabelTrue : detail::LabelFalse,
- x[1] ? detail::LabelTrue : detail::LabelFalse,
- x[2] ? detail::LabelTrue : detail::LabelFalse,
- x[3] ? detail::LabelTrue : detail::LabelFalse);
- }
- };
-
- template <typename T, precision P>
- struct compute_to_string<tvec1, T, P>
- {
- GLM_FUNC_QUALIFIER static std::string call(tvec1<T, P> const & x)
- {
- char const * PrefixStr = prefix<T>::value();
- char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
- std::string FormatStr(detail::format("%svec1(%s)",
- PrefixStr,
- LiteralStr));
-
- return detail::format(FormatStr.c_str(), x[0]);
- }
- };
-
- template <typename T, precision P>
- struct compute_to_string<tvec2, T, P>
- {
- GLM_FUNC_QUALIFIER static std::string call(tvec2<T, P> const & x)
- {
- char const * PrefixStr = prefix<T>::value();
- char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
- std::string FormatStr(detail::format("%svec2(%s, %s)",
- PrefixStr,
- LiteralStr, LiteralStr));
-
- return detail::format(FormatStr.c_str(), x[0], x[1]);
- }
- };
-
- template <typename T, precision P>
- struct compute_to_string<tvec3, T, P>
- {
- GLM_FUNC_QUALIFIER static std::string call(tvec3<T, P> const & x)
- {
- char const * PrefixStr = prefix<T>::value();
- char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
- std::string FormatStr(detail::format("%svec3(%s, %s, %s)",
- PrefixStr,
- LiteralStr, LiteralStr, LiteralStr));
-
- return detail::format(FormatStr.c_str(), x[0], x[1], x[2]);
- }
- };
-
- template <typename T, precision P>
- struct compute_to_string<tvec4, T, P>
- {
- GLM_FUNC_QUALIFIER static std::string call(tvec4<T, P> const & x)
- {
- char const * PrefixStr = prefix<T>::value();
- char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
- std::string FormatStr(detail::format("%svec4(%s, %s, %s, %s)",
- PrefixStr,
- LiteralStr, LiteralStr, LiteralStr, LiteralStr));
-
- return detail::format(FormatStr.c_str(), x[0], x[1], x[2], x[3]);
- }
- };
-
-
- template <typename T, precision P>
- struct compute_to_string<tmat2x2, T, P>
- {
- GLM_FUNC_QUALIFIER static std::string call(tmat2x2<T, P> const & x)
- {
- char const * PrefixStr = prefix<T>::value();
- char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
- std::string FormatStr(detail::format("%smat2x2((%s, %s), (%s, %s))",
- PrefixStr,
- LiteralStr, LiteralStr,
- LiteralStr, LiteralStr));
-
- return detail::format(FormatStr.c_str(),
- x[0][0], x[0][1],
- x[1][0], x[1][1]);
- }
- };
-
- template <typename T, precision P>
- struct compute_to_string<tmat2x3, T, P>
- {
- GLM_FUNC_QUALIFIER static std::string call(tmat2x3<T, P> const & x)
- {
- char const * PrefixStr = prefix<T>::value();
- char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
- std::string FormatStr(detail::format("%smat2x3((%s, %s, %s), (%s, %s, %s))",
- PrefixStr,
- LiteralStr, LiteralStr, LiteralStr,
- LiteralStr, LiteralStr, LiteralStr));
-
- return detail::format(FormatStr.c_str(),
- x[0][0], x[0][1], x[0][2],
- x[1][0], x[1][1], x[1][2]);
- }
- };
-
- template <typename T, precision P>
- struct compute_to_string<tmat2x4, T, P>
- {
- GLM_FUNC_QUALIFIER static std::string call(tmat2x4<T, P> const & x)
- {
- char const * PrefixStr = prefix<T>::value();
- char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
- std::string FormatStr(detail::format("%smat2x4((%s, %s, %s, %s), (%s, %s, %s, %s))",
- PrefixStr,
- LiteralStr, LiteralStr, LiteralStr, LiteralStr,
- LiteralStr, LiteralStr, LiteralStr, LiteralStr));
-
- return detail::format(FormatStr.c_str(),
- x[0][0], x[0][1], x[0][2], x[0][3],
- x[1][0], x[1][1], x[1][2], x[1][3]);
- }
- };
-
- template <typename T, precision P>
- struct compute_to_string<tmat3x2, T, P>
- {
- GLM_FUNC_QUALIFIER static std::string call(tmat3x2<T, P> const & x)
- {
- char const * PrefixStr = prefix<T>::value();
- char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
- std::string FormatStr(detail::format("%smat3x2((%s, %s), (%s, %s), (%s, %s))",
- PrefixStr,
- LiteralStr, LiteralStr,
- LiteralStr, LiteralStr,
- LiteralStr, LiteralStr));
-
- return detail::format(FormatStr.c_str(),
- x[0][0], x[0][1],
- x[1][0], x[1][1],
- x[2][0], x[2][1]);
- }
- };
-
- template <typename T, precision P>
- struct compute_to_string<tmat3x3, T, P>
- {
- GLM_FUNC_QUALIFIER static std::string call(tmat3x3<T, P> const & x)
- {
- char const * PrefixStr = prefix<T>::value();
- char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
- std::string FormatStr(detail::format("%smat3x3((%s, %s, %s), (%s, %s, %s), (%s, %s, %s))",
- PrefixStr,
- LiteralStr, LiteralStr, LiteralStr,
- LiteralStr, LiteralStr, LiteralStr,
- LiteralStr, LiteralStr, LiteralStr));
-
- return detail::format(FormatStr.c_str(),
- x[0][0], x[0][1], x[0][2],
- x[1][0], x[1][1], x[1][2],
- x[2][0], x[2][1], x[2][2]);
- }
- };
-
- template <typename T, precision P>
- struct compute_to_string<tmat3x4, T, P>
- {
- GLM_FUNC_QUALIFIER static std::string call(tmat3x4<T, P> const & x)
- {
- char const * PrefixStr = prefix<T>::value();
- char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
- std::string FormatStr(detail::format("%smat3x4((%s, %s, %s, %s), (%s, %s, %s, %s), (%s, %s, %s, %s))",
- PrefixStr,
- LiteralStr, LiteralStr, LiteralStr, LiteralStr,
- LiteralStr, LiteralStr, LiteralStr, LiteralStr,
- LiteralStr, LiteralStr, LiteralStr, LiteralStr));
-
- return detail::format(FormatStr.c_str(),
- x[0][0], x[0][1], x[0][2], x[0][3],
- x[1][0], x[1][1], x[1][2], x[1][3],
- x[2][0], x[2][1], x[2][2], x[2][3]);
- }
- };
-
- template <typename T, precision P>
- struct compute_to_string<tmat4x2, T, P>
- {
- GLM_FUNC_QUALIFIER static std::string call(tmat4x2<T, P> const & x)
- {
- char const * PrefixStr = prefix<T>::value();
- char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
- std::string FormatStr(detail::format("%smat4x2((%s, %s), (%s, %s), (%s, %s), (%s, %s))",
- PrefixStr,
- LiteralStr, LiteralStr,
- LiteralStr, LiteralStr,
- LiteralStr, LiteralStr,
- LiteralStr, LiteralStr));
-
- return detail::format(FormatStr.c_str(),
- x[0][0], x[0][1],
- x[1][0], x[1][1],
- x[2][0], x[2][1],
- x[3][0], x[3][1]);
- }
- };
-
- template <typename T, precision P>
- struct compute_to_string<tmat4x3, T, P>
- {
- GLM_FUNC_QUALIFIER static std::string call(tmat4x3<T, P> const & x)
- {
- char const * PrefixStr = prefix<T>::value();
- char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
- std::string FormatStr(detail::format("%smat4x3((%s, %s, %s), (%s, %s, %s), (%s, %s, %s), (%s, %s, %s))",
- PrefixStr,
- LiteralStr, LiteralStr, LiteralStr,
- LiteralStr, LiteralStr, LiteralStr,
- LiteralStr, LiteralStr, LiteralStr,
- LiteralStr, LiteralStr, LiteralStr));
-
- return detail::format(FormatStr.c_str(),
- x[0][0], x[0][1], x[0][2],
- x[1][0], x[1][1], x[1][2],
- x[2][0], x[2][1], x[2][2],
- x[3][0], x[3][1], x[3][2]);
- }
- };
-
- template <typename T, precision P>
- struct compute_to_string<tmat4x4, T, P>
- {
- GLM_FUNC_QUALIFIER static std::string call(tmat4x4<T, P> const & x)
- {
- char const * PrefixStr = prefix<T>::value();
- char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
- std::string FormatStr(detail::format("%smat4x4((%s, %s, %s, %s), (%s, %s, %s, %s), (%s, %s, %s, %s), (%s, %s, %s, %s))",
- PrefixStr,
- LiteralStr, LiteralStr, LiteralStr, LiteralStr,
- LiteralStr, LiteralStr, LiteralStr, LiteralStr,
- LiteralStr, LiteralStr, LiteralStr, LiteralStr,
- LiteralStr, LiteralStr, LiteralStr, LiteralStr));
-
- return detail::format(FormatStr.c_str(),
- x[0][0], x[0][1], x[0][2], x[0][3],
- x[1][0], x[1][1], x[1][2], x[1][3],
- x[2][0], x[2][1], x[2][2], x[2][3],
- x[3][0], x[3][1], x[3][2], x[3][3]);
- }
- };
-}//namespace detail
-
-template <template <typename, precision> class matType, typename T, precision P>
-GLM_FUNC_DECL std::string to_string(matType<T, P> const & x)
-{
- return detail::compute_to_string<matType, T, P>::call(x);
-}
-
-}//namespace glm
diff --git a/inc/glm/gtx/transform.hpp b/inc/glm/gtx/transform.hpp deleted file mode 100644 index e37ec1e..0000000 --- a/inc/glm/gtx/transform.hpp +++ /dev/null @@ -1,85 +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 gtx_transform
-/// @file glm/gtx/transform.hpp
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtc_matrix_transform (dependence)
-/// @see gtx_transform
-/// @see gtx_transform2
-///
-/// @defgroup gtx_transform GLM_GTX_transform
-/// @ingroup gtx
-///
-/// @brief Add transformation matrices
-///
-/// <glm/gtx/transform.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../gtc/matrix_transform.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_transform extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_transform
- /// @{
-
- /// Transforms a matrix with a translation 4 * 4 matrix created from 3 scalars.
- /// @see gtc_matrix_transform
- /// @see gtx_transform
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> translate(
- tvec3<T, P> const & v);
-
- /// Builds a rotation 4 * 4 matrix created from an axis of 3 scalars and an angle expressed in degrees.
- /// @see gtc_matrix_transform
- /// @see gtx_transform
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> rotate(
- T angle,
- tvec3<T, P> const & v);
-
- /// Transforms a matrix with a scale 4 * 4 matrix created from a vector of 3 components.
- /// @see gtc_matrix_transform
- /// @see gtx_transform
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> scale(
- tvec3<T, P> const & v);
-
- /// @}
-}// namespace glm
-
-#include "transform.inl"
diff --git a/inc/glm/gtx/transform.inl b/inc/glm/gtx/transform.inl deleted file mode 100644 index a4f5110..0000000 --- a/inc/glm/gtx/transform.inl +++ /dev/null @@ -1,60 +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 gtx_transform
-/// @file glm/gtx/transform.inl
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> translate(
- tvec3<T, P> const & v)
- {
- return translate(
- tmat4x4<T, P>(1.0f), v);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> rotate(
- T angle,
- tvec3<T, P> const & v)
- {
- return rotate(
- tmat4x4<T, P>(1), angle, v);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> scale(
- tvec3<T, P> const & v)
- {
- return scale(
- tmat4x4<T, P>(1.0f), v);
- }
-
-}//namespace glm
diff --git a/inc/glm/gtx/transform2.hpp b/inc/glm/gtx/transform2.hpp deleted file mode 100644 index 58d7ac2..0000000 --- a/inc/glm/gtx/transform2.hpp +++ /dev/null @@ -1,136 +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 gtx_transform2
-/// @file glm/gtx/transform2.hpp
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtx_transform (dependence)
-///
-/// @defgroup gtx_transform2 GLM_GTX_transform2
-/// @ingroup gtx
-///
-/// @brief Add extra transformation matrices
-///
-/// <glm/gtx/transform2.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../gtx/transform.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_transform2 extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_transform2
- /// @{
-
- //! Transforms a matrix with a shearing on X axis.
- //! From GLM_GTX_transform2 extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> shearX2D(
- tmat3x3<T, P> const & m,
- T y);
-
- //! Transforms a matrix with a shearing on Y axis.
- //! From GLM_GTX_transform2 extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> shearY2D(
- tmat3x3<T, P> const & m,
- T x);
-
- //! Transforms a matrix with a shearing on X axis
- //! From GLM_GTX_transform2 extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> shearX3D(
- const tmat4x4<T, P> & m,
- T y,
- T z);
-
- //! Transforms a matrix with a shearing on Y axis.
- //! From GLM_GTX_transform2 extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> shearY3D(
- const tmat4x4<T, P> & m,
- T x,
- T z);
-
- //! Transforms a matrix with a shearing on Z axis.
- //! From GLM_GTX_transform2 extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> shearZ3D(
- const tmat4x4<T, P> & m,
- T x,
- T y);
-
- //template <typename T> GLM_FUNC_QUALIFIER tmat4x4<T, P> shear(const tmat4x4<T, P> & m, shearPlane, planePoint, angle)
- // Identity + tan(angle) * cross(Normal, OnPlaneVector) 0
- // - dot(PointOnPlane, normal) * OnPlaneVector 1
-
- // Reflect functions seem to don't work
- //template <typename T> tmat3x3<T, P> reflect2D(const tmat3x3<T, P> & m, const tvec3<T, P>& normal){return reflect2DGTX(m, normal);} //!< \brief Build a reflection matrix (from GLM_GTX_transform2 extension)
- //template <typename T> tmat4x4<T, P> reflect3D(const tmat4x4<T, P> & m, const tvec3<T, P>& normal){return reflect3DGTX(m, normal);} //!< \brief Build a reflection matrix (from GLM_GTX_transform2 extension)
-
- //! Build planar projection matrix along normal axis.
- //! From GLM_GTX_transform2 extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat3x3<T, P> proj2D(
- const tmat3x3<T, P> & m,
- const tvec3<T, P>& normal);
-
- //! Build planar projection matrix along normal axis.
- //! From GLM_GTX_transform2 extension.
- template <typename T, precision P>
- GLM_FUNC_DECL tmat4x4<T, P> proj3D(
- const tmat4x4<T, P> & m,
- const tvec3<T, P>& normal);
-
- //! Build a scale bias matrix.
- //! From GLM_GTX_transform2 extension.
- template <typename valType, precision P>
- GLM_FUNC_DECL tmat4x4<valType, P> scaleBias(
- valType scale,
- valType bias);
-
- //! Build a scale bias matrix.
- //! From GLM_GTX_transform2 extension.
- template <typename valType, precision P>
- GLM_FUNC_DECL tmat4x4<valType, P> scaleBias(
- tmat4x4<valType, P> const & m,
- valType scale,
- valType bias);
-
- /// @}
-}// namespace glm
-
-#include "transform2.inl"
diff --git a/inc/glm/gtx/transform2.inl b/inc/glm/gtx/transform2.inl deleted file mode 100644 index 4213b13..0000000 --- a/inc/glm/gtx/transform2.inl +++ /dev/null @@ -1,177 +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 gtx_transform2
-/// @file glm/gtx/transform2.inl
-/// @date 2005-12-21 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> shearX2D(
- const tmat3x3<T, P>& m,
- T s)
- {
- tmat3x3<T, P> r(1);
- r[0][1] = s;
- return m * r;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> shearY2D(
- const tmat3x3<T, P>& m,
- T s)
- {
- tmat3x3<T, P> r(1);
- r[1][0] = s;
- return m * r;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> shearX3D(
- const tmat4x4<T, P>& m,
- T s,
- T t)
- {
- tmat4x4<T, P> r(1);
- r[1][0] = s;
- r[2][0] = t;
- return m * r;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> shearY3D(
- const tmat4x4<T, P>& m,
- T s,
- T t)
- {
- tmat4x4<T, P> r(1);
- r[0][1] = s;
- r[2][1] = t;
- return m * r;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> shearZ3D(
- const tmat4x4<T, P>& m,
- T s,
- T t)
- {
- tmat4x4<T, P> r(1);
- r[0][2] = s;
- r[1][2] = t;
- return m * r;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> reflect2D(
- const tmat3x3<T, P>& m,
- const tvec3<T, P>& normal)
- {
- tmat3x3<T, P> r(1);
- r[0][0] = 1 - 2 * normal.x * normal.x;
- r[0][1] = -2 * normal.x * normal.y;
- r[1][0] = -2 * normal.x * normal.y;
- r[1][1] = 1 - 2 * normal.y * normal.y;
- return m * r;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> reflect3D(
- const tmat4x4<T, P>& m,
- const tvec3<T, P>& normal)
- {
- tmat4x4<T, P> r(1);
- r[0][0] = 1 - 2 * normal.x * normal.x;
- r[0][1] = -2 * normal.x * normal.y;
- r[0][2] = -2 * normal.x * normal.z;
-
- r[1][0] = -2 * normal.x * normal.y;
- r[1][1] = 1 - 2 * normal.y * normal.y;
- r[1][2] = -2 * normal.y * normal.z;
-
- r[2][0] = -2 * normal.x * normal.z;
- r[2][1] = -2 * normal.y * normal.z;
- r[2][2] = 1 - 2 * normal.z * normal.z;
- return m * r;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x3<T, P> proj2D(
- const tmat3x3<T, P>& m,
- const tvec3<T, P>& normal)
- {
- tmat3x3<T, P> r(1);
- r[0][0] = 1 - normal.x * normal.x;
- r[0][1] = - normal.x * normal.y;
- r[1][0] = - normal.x * normal.y;
- r[1][1] = 1 - normal.y * normal.y;
- return m * r;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> proj3D(
- const tmat4x4<T, P>& m,
- const tvec3<T, P>& normal)
- {
- tmat4x4<T, P> r(1);
- r[0][0] = 1 - normal.x * normal.x;
- r[0][1] = - normal.x * normal.y;
- r[0][2] = - normal.x * normal.z;
- r[1][0] = - normal.x * normal.y;
- r[1][1] = 1 - normal.y * normal.y;
- r[1][2] = - normal.y * normal.z;
- r[2][0] = - normal.x * normal.z;
- r[2][1] = - normal.y * normal.z;
- r[2][2] = 1 - normal.z * normal.z;
- return m * r;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> scaleBias(
- T scale,
- T bias)
- {
- tmat4x4<T, P> result;
- result[3] = tvec4<T, P>(tvec3<T, P>(bias), T(1));
- result[0][0] = scale;
- result[1][1] = scale;
- result[2][2] = scale;
- return result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> scaleBias(
- const tmat4x4<T, P>& m,
- T scale,
- T bias)
- {
- return m * scaleBias(scale, bias);
- }
-}//namespace glm
-
diff --git a/inc/glm/gtx/type_aligned.hpp b/inc/glm/gtx/type_aligned.hpp deleted file mode 100644 index 9374a69..0000000 --- a/inc/glm/gtx/type_aligned.hpp +++ /dev/null @@ -1,995 +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 gtx_type_aligned
-/// @file glm/gtx/type_aligned.hpp
-/// @date 2014-11-23 / 2014-12-23
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtc_quaternion (dependence)
-///
-/// @defgroup gtx_type_aligned GLM_GTX_type_aligned
-/// @ingroup gtx
-///
-/// @brief Defines aligned types.
-///
-/// @ref core_precision defines aligned types.
-///
-/// <glm/gtx/type_aligned.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../gtc/type_precision.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_type_aligned extension included")
-#endif
-
-namespace glm
-{
- ///////////////////////////
- // Signed int vector types
-
- /// @addtogroup gtx_type_aligned
- /// @{
-
- /// Low precision 8 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_int8, aligned_lowp_int8, 1);
-
- /// Low precision 16 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_int16, aligned_lowp_int16, 2);
-
- /// Low precision 32 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_int32, aligned_lowp_int32, 4);
-
- /// Low precision 64 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_int64, aligned_lowp_int64, 8);
-
-
- /// Low precision 8 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_int8_t, aligned_lowp_int8_t, 1);
-
- /// Low precision 16 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_int16_t, aligned_lowp_int16_t, 2);
-
- /// Low precision 32 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_int32_t, aligned_lowp_int32_t, 4);
-
- /// Low precision 64 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_int64_t, aligned_lowp_int64_t, 8);
-
-
- /// Low precision 8 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_i8, aligned_lowp_i8, 1);
-
- /// Low precision 16 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_i16, aligned_lowp_i16, 2);
-
- /// Low precision 32 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_i32, aligned_lowp_i32, 4);
-
- /// Low precision 64 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_i64, aligned_lowp_i64, 8);
-
-
- /// Medium precision 8 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_int8, aligned_mediump_int8, 1);
-
- /// Medium precision 16 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_int16, aligned_mediump_int16, 2);
-
- /// Medium precision 32 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_int32, aligned_mediump_int32, 4);
-
- /// Medium precision 64 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_int64, aligned_mediump_int64, 8);
-
-
- /// Medium precision 8 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_int8_t, aligned_mediump_int8_t, 1);
-
- /// Medium precision 16 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_int16_t, aligned_mediump_int16_t, 2);
-
- /// Medium precision 32 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_int32_t, aligned_mediump_int32_t, 4);
-
- /// Medium precision 64 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_int64_t, aligned_mediump_int64_t, 8);
-
-
- /// Medium precision 8 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_i8, aligned_mediump_i8, 1);
-
- /// Medium precision 16 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_i16, aligned_mediump_i16, 2);
-
- /// Medium precision 32 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_i32, aligned_mediump_i32, 4);
-
- /// Medium precision 64 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_i64, aligned_mediump_i64, 8);
-
-
- /// High precision 8 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_int8, aligned_highp_int8, 1);
-
- /// High precision 16 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_int16, aligned_highp_int16, 2);
-
- /// High precision 32 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_int32, aligned_highp_int32, 4);
-
- /// High precision 64 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_int64, aligned_highp_int64, 8);
-
-
- /// High precision 8 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_int8_t, aligned_highp_int8_t, 1);
-
- /// High precision 16 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_int16_t, aligned_highp_int16_t, 2);
-
- /// High precision 32 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_int32_t, aligned_highp_int32_t, 4);
-
- /// High precision 64 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_int64_t, aligned_highp_int64_t, 8);
-
-
- /// High precision 8 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_i8, aligned_highp_i8, 1);
-
- /// High precision 16 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_i16, aligned_highp_i16, 2);
-
- /// High precision 32 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_i32, aligned_highp_i32, 4);
-
- /// High precision 64 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_i64, aligned_highp_i64, 8);
-
-
- /// Default precision 8 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(int8, aligned_int8, 1);
-
- /// Default precision 16 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(int16, aligned_int16, 2);
-
- /// Default precision 32 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(int32, aligned_int32, 4);
-
- /// Default precision 64 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(int64, aligned_int64, 8);
-
-
- /// Default precision 8 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(int8_t, aligned_int8_t, 1);
-
- /// Default precision 16 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(int16_t, aligned_int16_t, 2);
-
- /// Default precision 32 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(int32_t, aligned_int32_t, 4);
-
- /// Default precision 64 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(int64_t, aligned_int64_t, 8);
-
-
- /// Default precision 8 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(i8, aligned_i8, 1);
-
- /// Default precision 16 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(i16, aligned_i16, 2);
-
- /// Default precision 32 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(i32, aligned_i32, 4);
-
- /// Default precision 64 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(i64, aligned_i64, 8);
-
-
- /// Default precision 32 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(ivec1, aligned_ivec1, 4);
-
- /// Default precision 32 bit signed integer aligned vector of 2 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(ivec2, aligned_ivec2, 8);
-
- /// Default precision 32 bit signed integer aligned vector of 3 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(ivec3, aligned_ivec3, 16);
-
- /// Default precision 32 bit signed integer aligned vector of 4 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(ivec4, aligned_ivec4, 16);
-
-
- /// Default precision 8 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(i8vec1, aligned_i8vec1, 1);
-
- /// Default precision 8 bit signed integer aligned vector of 2 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(i8vec2, aligned_i8vec2, 2);
-
- /// Default precision 8 bit signed integer aligned vector of 3 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(i8vec3, aligned_i8vec3, 4);
-
- /// Default precision 8 bit signed integer aligned vector of 4 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(i8vec4, aligned_i8vec4, 4);
-
-
- /// Default precision 16 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(i16vec1, aligned_i16vec1, 2);
-
- /// Default precision 16 bit signed integer aligned vector of 2 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(i16vec2, aligned_i16vec2, 4);
-
- /// Default precision 16 bit signed integer aligned vector of 3 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(i16vec3, aligned_i16vec3, 8);
-
- /// Default precision 16 bit signed integer aligned vector of 4 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(i16vec4, aligned_i16vec4, 8);
-
-
- /// Default precision 32 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(i32vec1, aligned_i32vec1, 4);
-
- /// Default precision 32 bit signed integer aligned vector of 2 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(i32vec2, aligned_i32vec2, 8);
-
- /// Default precision 32 bit signed integer aligned vector of 3 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(i32vec3, aligned_i32vec3, 16);
-
- /// Default precision 32 bit signed integer aligned vector of 4 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(i32vec4, aligned_i32vec4, 16);
-
-
- /// Default precision 64 bit signed integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(i64vec1, aligned_i64vec1, 8);
-
- /// Default precision 64 bit signed integer aligned vector of 2 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(i64vec2, aligned_i64vec2, 16);
-
- /// Default precision 64 bit signed integer aligned vector of 3 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(i64vec3, aligned_i64vec3, 32);
-
- /// Default precision 64 bit signed integer aligned vector of 4 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(i64vec4, aligned_i64vec4, 32);
-
-
- /////////////////////////////
- // Unsigned int vector types
-
- /// Low precision 8 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_uint8, aligned_lowp_uint8, 1);
-
- /// Low precision 16 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_uint16, aligned_lowp_uint16, 2);
-
- /// Low precision 32 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_uint32, aligned_lowp_uint32, 4);
-
- /// Low precision 64 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_uint64, aligned_lowp_uint64, 8);
-
-
- /// Low precision 8 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_uint8_t, aligned_lowp_uint8_t, 1);
-
- /// Low precision 16 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_uint16_t, aligned_lowp_uint16_t, 2);
-
- /// Low precision 32 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_uint32_t, aligned_lowp_uint32_t, 4);
-
- /// Low precision 64 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_uint64_t, aligned_lowp_uint64_t, 8);
-
-
- /// Low precision 8 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_u8, aligned_lowp_u8, 1);
-
- /// Low precision 16 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_u16, aligned_lowp_u16, 2);
-
- /// Low precision 32 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_u32, aligned_lowp_u32, 4);
-
- /// Low precision 64 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(lowp_u64, aligned_lowp_u64, 8);
-
-
- /// Medium precision 8 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_uint8, aligned_mediump_uint8, 1);
-
- /// Medium precision 16 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_uint16, aligned_mediump_uint16, 2);
-
- /// Medium precision 32 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_uint32, aligned_mediump_uint32, 4);
-
- /// Medium precision 64 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_uint64, aligned_mediump_uint64, 8);
-
-
- /// Medium precision 8 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_uint8_t, aligned_mediump_uint8_t, 1);
-
- /// Medium precision 16 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_uint16_t, aligned_mediump_uint16_t, 2);
-
- /// Medium precision 32 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_uint32_t, aligned_mediump_uint32_t, 4);
-
- /// Medium precision 64 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_uint64_t, aligned_mediump_uint64_t, 8);
-
-
- /// Medium precision 8 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_u8, aligned_mediump_u8, 1);
-
- /// Medium precision 16 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_u16, aligned_mediump_u16, 2);
-
- /// Medium precision 32 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_u32, aligned_mediump_u32, 4);
-
- /// Medium precision 64 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mediump_u64, aligned_mediump_u64, 8);
-
-
- /// High precision 8 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_uint8, aligned_highp_uint8, 1);
-
- /// High precision 16 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_uint16, aligned_highp_uint16, 2);
-
- /// High precision 32 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_uint32, aligned_highp_uint32, 4);
-
- /// High precision 64 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_uint64, aligned_highp_uint64, 8);
-
-
- /// High precision 8 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_uint8_t, aligned_highp_uint8_t, 1);
-
- /// High precision 16 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_uint16_t, aligned_highp_uint16_t, 2);
-
- /// High precision 32 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_uint32_t, aligned_highp_uint32_t, 4);
-
- /// High precision 64 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_uint64_t, aligned_highp_uint64_t, 8);
-
-
- /// High precision 8 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_u8, aligned_highp_u8, 1);
-
- /// High precision 16 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_u16, aligned_highp_u16, 2);
-
- /// High precision 32 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_u32, aligned_highp_u32, 4);
-
- /// High precision 64 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(highp_u64, aligned_highp_u64, 8);
-
-
- /// Default precision 8 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(uint8, aligned_uint8, 1);
-
- /// Default precision 16 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(uint16, aligned_uint16, 2);
-
- /// Default precision 32 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(uint32, aligned_uint32, 4);
-
- /// Default precision 64 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(uint64, aligned_uint64, 8);
-
-
- /// Default precision 8 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(uint8_t, aligned_uint8_t, 1);
-
- /// Default precision 16 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(uint16_t, aligned_uint16_t, 2);
-
- /// Default precision 32 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(uint32_t, aligned_uint32_t, 4);
-
- /// Default precision 64 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(uint64_t, aligned_uint64_t, 8);
-
-
- /// Default precision 8 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(u8, aligned_u8, 1);
-
- /// Default precision 16 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(u16, aligned_u16, 2);
-
- /// Default precision 32 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(u32, aligned_u32, 4);
-
- /// Default precision 64 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(u64, aligned_u64, 8);
-
-
- /// Default precision 32 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(uvec1, aligned_uvec1, 4);
-
- /// Default precision 32 bit unsigned integer aligned vector of 2 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(uvec2, aligned_uvec2, 8);
-
- /// Default precision 32 bit unsigned integer aligned vector of 3 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(uvec3, aligned_uvec3, 16);
-
- /// Default precision 32 bit unsigned integer aligned vector of 4 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(uvec4, aligned_uvec4, 16);
-
-
- /// Default precision 8 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(u8vec1, aligned_u8vec1, 1);
-
- /// Default precision 8 bit unsigned integer aligned vector of 2 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(u8vec2, aligned_u8vec2, 2);
-
- /// Default precision 8 bit unsigned integer aligned vector of 3 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(u8vec3, aligned_u8vec3, 4);
-
- /// Default precision 8 bit unsigned integer aligned vector of 4 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(u8vec4, aligned_u8vec4, 4);
-
-
- /// Default precision 16 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(u16vec1, aligned_u16vec1, 2);
-
- /// Default precision 16 bit unsigned integer aligned vector of 2 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(u16vec2, aligned_u16vec2, 4);
-
- /// Default precision 16 bit unsigned integer aligned vector of 3 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(u16vec3, aligned_u16vec3, 8);
-
- /// Default precision 16 bit unsigned integer aligned vector of 4 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(u16vec4, aligned_u16vec4, 8);
-
-
- /// Default precision 32 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(u32vec1, aligned_u32vec1, 4);
-
- /// Default precision 32 bit unsigned integer aligned vector of 2 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(u32vec2, aligned_u32vec2, 8);
-
- /// Default precision 32 bit unsigned integer aligned vector of 3 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(u32vec3, aligned_u32vec3, 16);
-
- /// Default precision 32 bit unsigned integer aligned vector of 4 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(u32vec4, aligned_u32vec4, 16);
-
-
- /// Default precision 64 bit unsigned integer aligned scalar type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(u64vec1, aligned_u64vec1, 8);
-
- /// Default precision 64 bit unsigned integer aligned vector of 2 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(u64vec2, aligned_u64vec2, 16);
-
- /// Default precision 64 bit unsigned integer aligned vector of 3 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(u64vec3, aligned_u64vec3, 32);
-
- /// Default precision 64 bit unsigned integer aligned vector of 4 components type.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(u64vec4, aligned_u64vec4, 32);
-
-
- //////////////////////
- // Float vector types
-
- /// 32 bit single-precision floating-point aligned scalar.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(float32, aligned_float32, 4);
-
- /// 64 bit double-precision floating-point aligned scalar.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(float64, aligned_float64, 8);
-
-
- /// 32 bit single-precision floating-point aligned scalar.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(float32_t, aligned_float32_t, 4);
-
- /// 64 bit double-precision floating-point aligned scalar.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(float64_t, aligned_float64_t, 8);
-
-
- /// 32 bit single-precision floating-point aligned scalar.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(float32, aligned_f32, 4);
-
- /// 64 bit double-precision floating-point aligned scalar.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(float64, aligned_f64, 8);
-
-
- /// Single-precision floating-point aligned vector of 1 component.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(vec1, aligned_vec1, 4);
-
- /// Single-precision floating-point aligned vector of 2 components.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(vec2, aligned_vec2, 8);
-
- /// Single-precision floating-point aligned vector of 3 components.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(vec3, aligned_vec3, 16);
-
- /// Single-precision floating-point aligned vector of 4 components.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(vec4, aligned_vec4, 16);
-
-
- /// Single-precision floating-point aligned vector of 1 component.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(fvec1, aligned_fvec1, 4);
-
- /// Single-precision floating-point aligned vector of 2 components.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(fvec2, aligned_fvec2, 8);
-
- /// Single-precision floating-point aligned vector of 3 components.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(fvec3, aligned_fvec3, 16);
-
- /// Single-precision floating-point aligned vector of 4 components.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(fvec4, aligned_fvec4, 16);
-
-
- /// Single-precision floating-point aligned vector of 1 component.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f32vec1, aligned_f32vec1, 4);
-
- /// Single-precision floating-point aligned vector of 2 components.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f32vec2, aligned_f32vec2, 8);
-
- /// Single-precision floating-point aligned vector of 3 components.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f32vec3, aligned_f32vec3, 16);
-
- /// Single-precision floating-point aligned vector of 4 components.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f32vec4, aligned_f32vec4, 16);
-
-
- /// Double-precision floating-point aligned vector of 1 component.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(dvec1, aligned_dvec1, 8);
-
- /// Double-precision floating-point aligned vector of 2 components.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(dvec2, aligned_dvec2, 16);
-
- /// Double-precision floating-point aligned vector of 3 components.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(dvec3, aligned_dvec3, 32);
-
- /// Double-precision floating-point aligned vector of 4 components.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(dvec4, aligned_dvec4, 32);
-
-
- /// Double-precision floating-point aligned vector of 1 component.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f64vec1, aligned_f64vec1, 8);
-
- /// Double-precision floating-point aligned vector of 2 components.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f64vec2, aligned_f64vec2, 16);
-
- /// Double-precision floating-point aligned vector of 3 components.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f64vec3, aligned_f64vec3, 32);
-
- /// Double-precision floating-point aligned vector of 4 components.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f64vec4, aligned_f64vec4, 32);
-
-
- //////////////////////
- // Float matrix types
-
- /// Single-precision floating-point aligned 1x1 matrix.
- /// @see gtx_type_aligned
- //typedef detail::tmat1<f32> mat1;
-
- /// Single-precision floating-point aligned 2x2 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mat2, aligned_mat2, 16);
-
- /// Single-precision floating-point aligned 3x3 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mat3, aligned_mat3, 16);
-
- /// Single-precision floating-point aligned 4x4 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mat4, aligned_mat4, 16);
-
-
- /// Single-precision floating-point aligned 1x1 matrix.
- /// @see gtx_type_aligned
- //typedef detail::tmat1x1<f32> mat1;
-
- /// Single-precision floating-point aligned 2x2 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mat2x2, aligned_mat2x2, 16);
-
- /// Single-precision floating-point aligned 3x3 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mat3x3, aligned_mat3x3, 16);
-
- /// Single-precision floating-point aligned 4x4 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(mat4x4, aligned_mat4x4, 16);
-
-
- /// Single-precision floating-point aligned 1x1 matrix.
- /// @see gtx_type_aligned
- //typedef detail::tmat1x1<f32> fmat1;
-
- /// Single-precision floating-point aligned 2x2 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(fmat2x2, aligned_fmat2, 16);
-
- /// Single-precision floating-point aligned 3x3 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(fmat3x3, aligned_fmat3, 16);
-
- /// Single-precision floating-point aligned 4x4 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(fmat4x4, aligned_fmat4, 16);
-
-
- /// Single-precision floating-point aligned 1x1 matrix.
- /// @see gtx_type_aligned
- //typedef f32 fmat1x1;
-
- /// Single-precision floating-point aligned 2x2 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(fmat2x2, aligned_fmat2x2, 16);
-
- /// Single-precision floating-point aligned 2x3 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(fmat2x3, aligned_fmat2x3, 16);
-
- /// Single-precision floating-point aligned 2x4 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(fmat2x4, aligned_fmat2x4, 16);
-
- /// Single-precision floating-point aligned 3x2 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(fmat3x2, aligned_fmat3x2, 16);
-
- /// Single-precision floating-point aligned 3x3 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(fmat3x3, aligned_fmat3x3, 16);
-
- /// Single-precision floating-point aligned 3x4 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(fmat3x4, aligned_fmat3x4, 16);
-
- /// Single-precision floating-point aligned 4x2 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(fmat4x2, aligned_fmat4x2, 16);
-
- /// Single-precision floating-point aligned 4x3 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(fmat4x3, aligned_fmat4x3, 16);
-
- /// Single-precision floating-point aligned 4x4 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(fmat4x4, aligned_fmat4x4, 16);
-
-
- /// Single-precision floating-point aligned 1x1 matrix.
- /// @see gtx_type_aligned
- //typedef detail::tmat1x1<f32, defaultp> f32mat1;
-
- /// Single-precision floating-point aligned 2x2 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f32mat2x2, aligned_f32mat2, 16);
-
- /// Single-precision floating-point aligned 3x3 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f32mat3x3, aligned_f32mat3, 16);
-
- /// Single-precision floating-point aligned 4x4 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f32mat4x4, aligned_f32mat4, 16);
-
-
- /// Single-precision floating-point aligned 1x1 matrix.
- /// @see gtx_type_aligned
- //typedef f32 f32mat1x1;
-
- /// Single-precision floating-point aligned 2x2 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f32mat2x2, aligned_f32mat2x2, 16);
-
- /// Single-precision floating-point aligned 2x3 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f32mat2x3, aligned_f32mat2x3, 16);
-
- /// Single-precision floating-point aligned 2x4 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f32mat2x4, aligned_f32mat2x4, 16);
-
- /// Single-precision floating-point aligned 3x2 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f32mat3x2, aligned_f32mat3x2, 16);
-
- /// Single-precision floating-point aligned 3x3 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f32mat3x3, aligned_f32mat3x3, 16);
-
- /// Single-precision floating-point aligned 3x4 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f32mat3x4, aligned_f32mat3x4, 16);
-
- /// Single-precision floating-point aligned 4x2 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f32mat4x2, aligned_f32mat4x2, 16);
-
- /// Single-precision floating-point aligned 4x3 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f32mat4x3, aligned_f32mat4x3, 16);
-
- /// Single-precision floating-point aligned 4x4 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f32mat4x4, aligned_f32mat4x4, 16);
-
-
- /// Double-precision floating-point aligned 1x1 matrix.
- /// @see gtx_type_aligned
- //typedef detail::tmat1x1<f64, defaultp> f64mat1;
-
- /// Double-precision floating-point aligned 2x2 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f64mat2x2, aligned_f64mat2, 32);
-
- /// Double-precision floating-point aligned 3x3 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f64mat3x3, aligned_f64mat3, 32);
-
- /// Double-precision floating-point aligned 4x4 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f64mat4x4, aligned_f64mat4, 32);
-
-
- /// Double-precision floating-point aligned 1x1 matrix.
- /// @see gtx_type_aligned
- //typedef f64 f64mat1x1;
-
- /// Double-precision floating-point aligned 2x2 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f64mat2x2, aligned_f64mat2x2, 32);
-
- /// Double-precision floating-point aligned 2x3 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f64mat2x3, aligned_f64mat2x3, 32);
-
- /// Double-precision floating-point aligned 2x4 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f64mat2x4, aligned_f64mat2x4, 32);
-
- /// Double-precision floating-point aligned 3x2 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f64mat3x2, aligned_f64mat3x2, 32);
-
- /// Double-precision floating-point aligned 3x3 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f64mat3x3, aligned_f64mat3x3, 32);
-
- /// Double-precision floating-point aligned 3x4 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f64mat3x4, aligned_f64mat3x4, 32);
-
- /// Double-precision floating-point aligned 4x2 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f64mat4x2, aligned_f64mat4x2, 32);
-
- /// Double-precision floating-point aligned 4x3 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f64mat4x3, aligned_f64mat4x3, 32);
-
- /// Double-precision floating-point aligned 4x4 matrix.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f64mat4x4, aligned_f64mat4x4, 32);
-
-
- //////////////////////////
- // Quaternion types
-
- /// Single-precision floating-point aligned quaternion.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(quat, aligned_quat, 16);
-
- /// Single-precision floating-point aligned quaternion.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(fquat, aligned_fquat, 16);
-
- /// Double-precision floating-point aligned quaternion.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(dquat, aligned_dquat, 32);
-
- /// Single-precision floating-point aligned quaternion.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f32quat, aligned_f32quat, 16);
-
- /// Double-precision floating-point aligned quaternion.
- /// @see gtx_type_aligned
- GLM_ALIGNED_TYPEDEF(f64quat, aligned_f64quat, 32);
-
- /// @}
-}//namespace glm
-
-#include "type_aligned.inl"
diff --git a/inc/glm/gtx/type_aligned.inl b/inc/glm/gtx/type_aligned.inl deleted file mode 100644 index fe6544c..0000000 --- a/inc/glm/gtx/type_aligned.inl +++ /dev/null @@ -1,36 +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_type_aligned
-/// @file glm/gtc/type_aligned.inl
-/// @date 2014-11-23 / 2014-11-23
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
-
-}
diff --git a/inc/glm/gtx/vector_angle.hpp b/inc/glm/gtx/vector_angle.hpp deleted file mode 100644 index 65578e3..0000000 --- a/inc/glm/gtx/vector_angle.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 gtx_vector_angle
-/// @file glm/gtx/vector_angle.hpp
-/// @date 2005-12-30 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-/// @see gtx_quaternion (dependence)
-/// @see gtx_epsilon (dependence)
-///
-/// @defgroup gtx_vector_angle GLM_GTX_vector_angle
-/// @ingroup gtx
-///
-/// @brief Compute angle between vectors
-///
-/// <glm/gtx/vector_angle.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../gtc/epsilon.hpp"
-#include "../gtx/quaternion.hpp"
-#include "../gtx/rotate_vector.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_vector_angle extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_vector_angle
- /// @{
-
- //! Returns the absolute angle between two vectors
- //! Parameters need to be normalized.
- /// @see gtx_vector_angle extension
- template <typename vecType>
- GLM_FUNC_DECL typename vecType::value_type angle(
- vecType const & x,
- vecType const & y);
-
- //! Returns the oriented angle between two 2d vectors
- //! Parameters need to be normalized.
- /// @see gtx_vector_angle extension.
- template <typename T, precision P>
- GLM_FUNC_DECL T orientedAngle(
- tvec2<T, P> const & x,
- tvec2<T, P> const & y);
-
- //! Returns the oriented angle between two 3d vectors based from a reference axis.
- //! Parameters need to be normalized.
- /// @see gtx_vector_angle extension.
- template <typename T, precision P>
- GLM_FUNC_DECL T orientedAngle(
- tvec3<T, P> const & x,
- tvec3<T, P> const & y,
- tvec3<T, P> const & ref);
-
- /// @}
-}// namespace glm
-
-#include "vector_angle.inl"
diff --git a/inc/glm/gtx/vector_angle.inl b/inc/glm/gtx/vector_angle.inl deleted file mode 100644 index dd61b3d..0000000 --- a/inc/glm/gtx/vector_angle.inl +++ /dev/null @@ -1,87 +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 gtx_vector_angle
-/// @file glm/gtx/vector_angle.inl
-/// @date 2005-12-30 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename genType>
- GLM_FUNC_QUALIFIER genType angle
- (
- genType const & x,
- genType const & y
- )
- {
- GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'angle' only accept floating-point inputs");
- return acos(clamp(dot(x, y), genType(-1), genType(1)));
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER T angle
- (
- vecType<T, P> const & x,
- vecType<T, P> const & y
- )
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'angle' only accept floating-point inputs");
- return acos(clamp(dot(x, y), T(-1), T(1)));
- }
-
- //! \todo epsilon is hard coded to 0.01
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T orientedAngle
- (
- tvec2<T, P> const & x,
- tvec2<T, P> const & y
- )
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'orientedAngle' only accept floating-point inputs");
- T const Angle(acos(clamp(dot(x, y), T(-1), T(1))));
-
- if(all(epsilonEqual(y, glm::rotate(x, Angle), T(0.0001))))
- return Angle;
- else
- return -Angle;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T orientedAngle
- (
- tvec3<T, P> const & x,
- tvec3<T, P> const & y,
- tvec3<T, P> const & ref
- )
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'orientedAngle' only accept floating-point inputs");
-
- T const Angle(acos(clamp(dot(x, y), T(-1), T(1))));
- return mix(Angle, -Angle, dot(ref, cross(x, y)) < T(0));
- }
-}//namespace glm
diff --git a/inc/glm/gtx/vector_query.hpp b/inc/glm/gtx/vector_query.hpp deleted file mode 100644 index aef277c..0000000 --- a/inc/glm/gtx/vector_query.hpp +++ /dev/null @@ -1,91 +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 gtx_vector_query
-/// @file glm/gtx/vector_query.hpp
-/// @date 2008-03-10 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_vector_query GLM_GTX_vector_query
-/// @ingroup gtx
-///
-/// @brief Query informations of vector types
-///
-/// <glm/gtx/vector_query.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include <cfloat>
-#include <limits>
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_vector_query extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_vector_query
- /// @{
-
- //! Check whether two vectors are collinears.
- /// @see gtx_vector_query extensions.
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL bool areCollinear(vecType<T, P> const & v0, vecType<T, P> const & v1, T const & epsilon);
-
- //! Check whether two vectors are orthogonals.
- /// @see gtx_vector_query extensions.
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL bool areOrthogonal(vecType<T, P> const & v0, vecType<T, P> const & v1, T const & epsilon);
-
- //! Check whether a vector is normalized.
- /// @see gtx_vector_query extensions.
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL bool isNormalized(vecType<T, P> const & v, T const & epsilon);
-
- //! Check whether a vector is null.
- /// @see gtx_vector_query extensions.
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL bool isNull(vecType<T, P> const & v, T const & epsilon);
-
- //! Check whether a each component of a vector is null.
- /// @see gtx_vector_query extensions.
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<bool, P> isCompNull(vecType<T, P> const & v, T const & epsilon);
-
- //! Check whether two vectors are orthonormal.
- /// @see gtx_vector_query extensions.
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL bool areOrthonormal(vecType<T, P> const & v0, vecType<T, P> const & v1, T const & epsilon);
-
- /// @}
-}// namespace glm
-
-#include "vector_query.inl"
diff --git a/inc/glm/gtx/vector_query.inl b/inc/glm/gtx/vector_query.inl deleted file mode 100644 index ad6a407..0000000 --- a/inc/glm/gtx/vector_query.inl +++ /dev/null @@ -1,222 +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 gtx_vector_query
-/// @file glm/gtx/vector_query.inl
-/// @date 2008-03-10 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#include <cassert>
-
-namespace glm{
-namespace detail
-{
- template <typename T, precision P, template <typename, precision> class vecType>
- struct compute_areCollinear{};
-
- template <typename T, precision P>
- struct compute_areCollinear<T, P, tvec2>
- {
- GLM_FUNC_QUALIFIER static bool call(tvec2<T, P> const & v0, tvec2<T, P> const & v1, T const & epsilon)
- {
- return length(cross(tvec3<T, P>(v0, static_cast<T>(0)), tvec3<T, P>(v1, static_cast<T>(0)))) < epsilon;
- }
- };
-
- template <typename T, precision P>
- struct compute_areCollinear<T, P, tvec3>
- {
- GLM_FUNC_QUALIFIER static bool call(tvec3<T, P> const & v0, tvec3<T, P> const & v1, T const & epsilon)
- {
- return length(cross(v0, v1)) < epsilon;
- }
- };
-
- template <typename T, precision P>
- struct compute_areCollinear<T, P, tvec4>
- {
- GLM_FUNC_QUALIFIER static bool call(tvec4<T, P> const & v0, tvec4<T, P> const & v1, T const & epsilon)
- {
- return length(cross(tvec3<T, P>(v0), tvec3<T, P>(v1))) < epsilon;
- }
- };
-
- template <typename T, precision P, template <typename, precision> class vecType>
- struct compute_isCompNull{};
-
- template <typename T, precision P>
- struct compute_isCompNull<T, P, tvec2>
- {
- GLM_FUNC_QUALIFIER static tvec2<bool, P> call(tvec2<T, P> const & v, T const & epsilon)
- {
- return tvec2<bool, P>(
- (abs(v.x) < epsilon),
- (abs(v.y) < epsilon));
- }
- };
-
- template <typename T, precision P>
- struct compute_isCompNull<T, P, tvec3>
- {
- GLM_FUNC_QUALIFIER static tvec3<bool, P> call(tvec3<T, P> const & v, T const & epsilon)
- {
- return tvec3<bool, P>(
- (abs(v.x) < epsilon),
- (abs(v.y) < epsilon),
- (abs(v.z) < epsilon));
- }
- };
-
- template <typename T, precision P>
- struct compute_isCompNull<T, P, tvec4>
- {
- GLM_FUNC_QUALIFIER static tvec4<bool, P> call(tvec4<T, P> const & v, T const & epsilon)
- {
- return tvec4<bool, P>(
- (abs(v.x) < epsilon),
- (abs(v.y) < epsilon),
- (abs(v.z) < epsilon),
- (abs(v.w) < epsilon));
- }
- };
-
-}//namespace detail
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER bool areCollinear
- (
- vecType<T, P> const & v0,
- vecType<T, P> const & v1,
- T const & epsilon
- )
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'areCollinear' only accept floating-point inputs");
-
- return detail::compute_areCollinear<T, P, vecType>::call(v0, v1, epsilon);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER bool areOrthogonal
- (
- vecType<T, P> const & v0,
- vecType<T, P> const & v1,
- T const & epsilon
- )
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'areOrthogonal' only accept floating-point inputs");
-
- return abs(dot(v0, v1)) <= max(
- static_cast<T>(1),
- length(v0)) * max(static_cast<T>(1), length(v1)) * epsilon;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER bool isNormalized
- (
- vecType<T, P> const & v,
- T const & epsilon
- )
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isNormalized' only accept floating-point inputs");
-
- return abs(length(v) - static_cast<T>(1)) <= static_cast<T>(2) * epsilon;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER bool isNull
- (
- vecType<T, P> const & v,
- T const & epsilon
- )
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isNull' only accept floating-point inputs");
-
- return length(v) <= epsilon;
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER vecType<bool, P> isCompNull
- (
- vecType<T, P> const & v,
- T const & epsilon
- )
- {
- GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isCompNull' only accept floating-point inputs");
-
- return detail::compute_isCompNull<T, P, vecType>::call(v, epsilon);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<bool, P> isCompNull
- (
- tvec2<T, P> const & v,
- T const & epsilon)
- {
- return tvec2<bool, P>(
- abs(v.x) < epsilon,
- abs(v.y) < epsilon);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<bool, P> isCompNull
- (
- tvec3<T, P> const & v,
- T const & epsilon
- )
- {
- return tvec3<bool, P>(
- abs(v.x) < epsilon,
- abs(v.y) < epsilon,
- abs(v.z) < epsilon);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<bool, P> isCompNull
- (
- tvec4<T, P> const & v,
- T const & epsilon
- )
- {
- return tvec4<bool, P>(
- abs(v.x) < epsilon,
- abs(v.y) < epsilon,
- abs(v.z) < epsilon,
- abs(v.w) < epsilon);
- }
-
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_QUALIFIER bool areOrthonormal
- (
- vecType<T, P> const & v0,
- vecType<T, P> const & v1,
- T const & epsilon
- )
- {
- return isNormalized(v0, epsilon) && isNormalized(v1, epsilon) && (abs(dot(v0, v1)) <= epsilon);
- }
-
-}//namespace glm
diff --git a/inc/glm/gtx/wrap.hpp b/inc/glm/gtx/wrap.hpp deleted file mode 100644 index 3f5c4a7..0000000 --- a/inc/glm/gtx/wrap.hpp +++ /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 gtx_wrap
-/// @file glm/gtx/wrap.hpp
-/// @date 2009-11-25 / 2011-06-07
-/// @author Christophe Riccio
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_wrap GLM_GTX_wrap
-/// @ingroup gtx
-///
-/// @brief Wrapping mode of texture coordinates.
-///
-/// <glm/gtx/wrap.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
-# pragma message("GLM: GLM_GTX_wrap extension included")
-#endif
-
-namespace glm
-{
- /// @addtogroup gtx_wrap
- /// @{
-
- /// Simulate GL_CLAMP OpenGL wrap mode
- /// @see gtx_wrap extension.
- template <typename genType>
- GLM_FUNC_DECL genType clamp(genType const & Texcoord);
-
- /// Simulate GL_REPEAT OpenGL wrap mode
- /// @see gtx_wrap extension.
- template <typename genType>
- GLM_FUNC_DECL genType repeat(genType const & Texcoord);
-
- /// Simulate GL_MIRROR_REPEAT OpenGL wrap mode
- /// @see gtx_wrap extension.
- template <typename genType>
- GLM_FUNC_DECL genType mirrorRepeat(genType const & Texcoord);
-
- /// @}
-}// namespace glm
-
-#include "wrap.inl"
diff --git a/inc/glm/gtx/wrap.inl b/inc/glm/gtx/wrap.inl deleted file mode 100644 index 6dc20ff..0000000 --- a/inc/glm/gtx/wrap.inl +++ /dev/null @@ -1,185 +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 gtx_wrap
-/// @file glm/gtx/wrap.inl
-/// @date 2009-11-25 / 2011-06-07
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-namespace glm
-{
- template <typename genType>
- GLM_FUNC_QUALIFIER genType clamp
- (
- genType const & Texcoord
- )
- {
- return glm::clamp(Texcoord, genType(0), genType(1));
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> clamp
- (
- tvec2<T, P> const & Texcoord
- )
- {
- tvec2<T, P> Result;
- for(typename tvec2<T, P>::size_type i = 0; i < tvec2<T, P>::value_size(); ++i)
- Result[i] = clamp(Texcoord[i]);
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> clamp
- (
- tvec3<T, P> const & Texcoord
- )
- {
- tvec3<T, P> Result;
- for(typename tvec3<T, P>::size_type i = 0; i < tvec3<T, P>::value_size(); ++i)
- Result[i] = clamp(Texcoord[i]);
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> clamp
- (
- tvec4<T, P> const & Texcoord
- )
- {
- tvec4<T, P> Result;
- for(typename tvec4<T, P>::size_type i = 0; i < tvec4<T, P>::value_size(); ++i)
- Result[i] = clamp(Texcoord[i]);
- return Result;
- }
-
- ////////////////////////
- // repeat
-
- template <typename genType>
- GLM_FUNC_QUALIFIER genType repeat
- (
- genType const & Texcoord
- )
- {
- return glm::fract(Texcoord);
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> repeat
- (
- tvec2<T, P> const & Texcoord
- )
- {
- tvec2<T, P> Result;
- for(typename tvec2<T, P>::size_type i = 0; i < tvec2<T, P>::value_size(); ++i)
- Result[i] = repeat(Texcoord[i]);
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> repeat
- (
- tvec3<T, P> const & Texcoord
- )
- {
- tvec3<T, P> Result;
- for(typename tvec3<T, P>::size_type i = 0; i < tvec3<T, P>::value_size(); ++i)
- Result[i] = repeat(Texcoord[i]);
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> repeat
- (
- tvec4<T, P> const & Texcoord
- )
- {
- tvec4<T, P> Result;
- for(typename tvec4<T, P>::size_type i = 0; i < tvec4<T, P>::value_size(); ++i)
- Result[i] = repeat(Texcoord[i]);
- return Result;
- }
-
- ////////////////////////
- // mirrorRepeat
-
- template <typename genType, precision P>
- GLM_FUNC_QUALIFIER genType mirrorRepeat
- (
- genType const & Texcoord
- )
- {
- genType const Clamp = genType(int(glm::floor(Texcoord)) % 2);
- genType const Floor = glm::floor(Texcoord);
- genType const Rest = Texcoord - Floor;
- genType const Mirror = Clamp + Rest;
-
- genType Out;
- if(Mirror >= genType(1))
- Out = genType(1) - Rest;
- else
- Out = Rest;
- return Out;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec2<T, P> mirrorRepeat
- (
- tvec2<T, P> const & Texcoord
- )
- {
- tvec2<T, P> Result;
- for(typename tvec2<T, P>::size_type i = 0; i < tvec2<T, P>::value_size(); ++i)
- Result[i] = mirrorRepeat(Texcoord[i]);
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> mirrorRepeat
- (
- tvec3<T, P> const & Texcoord
- )
- {
- tvec3<T, P> Result;
- for(typename tvec3<T, P>::size_type i = 0; i < tvec3<T, P>::value_size(); ++i)
- Result[i] = mirrorRepeat(Texcoord[i]);
- return Result;
- }
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> mirrorRepeat
- (
- tvec4<T, P> const & Texcoord
- )
- {
- tvec4<T, P> Result;
- for(typename tvec4<T, P>::size_type i = 0; i < tvec4<T, P>::value_size(); ++i)
- Result[i] = mirrorRepeat(Texcoord[i]);
- return Result;
- }
-}//namespace glm
diff --git a/inc/glm/integer.hpp b/inc/glm/integer.hpp deleted file mode 100644 index 954d4ca..0000000 --- a/inc/glm/integer.hpp +++ /dev/null @@ -1,35 +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 core
-/// @file glm/integer.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/func_integer.hpp"
diff --git a/inc/glm/mat2x2.hpp b/inc/glm/mat2x2.hpp deleted file mode 100644 index 926ce77..0000000 --- a/inc/glm/mat2x2.hpp +++ /dev/null @@ -1,81 +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 core
-/// @file glm/mat2x2.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/type_mat2x2.hpp"
-
-namespace glm
-{
- /// 2 columns of 2 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x2<float, lowp> lowp_mat2;
-
- /// 2 columns of 2 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x2<float, mediump> mediump_mat2;
-
- /// 2 columns of 2 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x2<float, highp> highp_mat2;
-
- /// 2 columns of 2 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x2<float, lowp> lowp_mat2x2;
-
- /// 2 columns of 2 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x2<float, mediump> mediump_mat2x2;
-
- /// 2 columns of 2 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x2<float, highp> highp_mat2x2;
-
-}//namespace glm
diff --git a/inc/glm/mat2x3.hpp b/inc/glm/mat2x3.hpp deleted file mode 100644 index 9ab6ff8..0000000 --- a/inc/glm/mat2x3.hpp +++ /dev/null @@ -1,61 +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 core
-/// @file glm/mat2x3.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/type_mat2x3.hpp"
-
-namespace glm
-{
- /// 2 columns of 3 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x3<float, lowp> lowp_mat2x3;
-
- /// 2 columns of 3 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x3<float, mediump> mediump_mat2x3;
-
- /// 2 columns of 3 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x3<float, highp> highp_mat2x3;
-
-}//namespace glm
-
diff --git a/inc/glm/mat2x4.hpp b/inc/glm/mat2x4.hpp deleted file mode 100644 index 09306b3..0000000 --- a/inc/glm/mat2x4.hpp +++ /dev/null @@ -1,60 +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 core
-/// @file glm/mat2x4.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/type_mat2x4.hpp"
-
-namespace glm
-{
- /// 2 columns of 4 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x4<float, lowp> lowp_mat2x4;
-
- /// 2 columns of 4 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x4<float, mediump> mediump_mat2x4;
-
- /// 2 columns of 4 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat2x4<float, highp> highp_mat2x4;
-
-}//namespace glm
diff --git a/inc/glm/mat3x2.hpp b/inc/glm/mat3x2.hpp deleted file mode 100644 index b97cb8b..0000000 --- a/inc/glm/mat3x2.hpp +++ /dev/null @@ -1,60 +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 core
-/// @file glm/mat3x2.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/type_mat3x2.hpp"
-
-namespace glm
-{
- /// 3 columns of 2 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x2<float, lowp> lowp_mat3x2;
-
- /// 3 columns of 2 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x2<float, mediump> mediump_mat3x2;
-
- /// 3 columns of 2 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x2<float, highp> highp_mat3x2;
-
-}//namespace
diff --git a/inc/glm/mat3x3.hpp b/inc/glm/mat3x3.hpp deleted file mode 100644 index a687351..0000000 --- a/inc/glm/mat3x3.hpp +++ /dev/null @@ -1,81 +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 core
-/// @file glm/mat3x3.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/type_mat3x3.hpp"
-
-namespace glm
-{
- /// 3 columns of 3 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x3<float, lowp> lowp_mat3;
-
- /// 3 columns of 3 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x3<float, mediump> mediump_mat3;
-
- /// 3 columns of 3 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x3<float, highp> highp_mat3;
-
- /// 3 columns of 3 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x3<float, lowp> lowp_mat3x3;
-
- /// 3 columns of 3 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x3<float, mediump> mediump_mat3x3;
-
- /// 3 columns of 3 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x3<float, highp> highp_mat3x3;
-
-}//namespace glm
diff --git a/inc/glm/mat3x4.hpp b/inc/glm/mat3x4.hpp deleted file mode 100644 index d41a619..0000000 --- a/inc/glm/mat3x4.hpp +++ /dev/null @@ -1,60 +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 core
-/// @file glm/mat3x4.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/type_mat3x4.hpp"
-
-namespace glm
-{
- /// 3 columns of 4 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x4<float, lowp> lowp_mat3x4;
-
- /// 3 columns of 4 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x4<float, mediump> mediump_mat3x4;
-
- /// 3 columns of 4 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat3x4<float, highp> highp_mat3x4;
-
-}//namespace glm
diff --git a/inc/glm/mat4x2.hpp b/inc/glm/mat4x2.hpp deleted file mode 100644 index 597edf6..0000000 --- a/inc/glm/mat4x2.hpp +++ /dev/null @@ -1,60 +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 core
-/// @file glm/mat4x2.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/type_mat4x2.hpp"
-
-namespace glm
-{
- /// 4 columns of 2 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x2<float, lowp> lowp_mat4x2;
-
- /// 4 columns of 2 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x2<float, mediump> mediump_mat4x2;
-
- /// 4 columns of 2 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x2<float, highp> highp_mat4x2;
-
-}//namespace glm
diff --git a/inc/glm/mat4x3.hpp b/inc/glm/mat4x3.hpp deleted file mode 100644 index fcd73b5..0000000 --- a/inc/glm/mat4x3.hpp +++ /dev/null @@ -1,60 +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 core
-/// @file glm/mat4x4.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/type_mat4x3.hpp"
-
-namespace glm
-{
- /// 4 columns of 3 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x3<float, lowp> lowp_mat4x3;
-
- /// 4 columns of 3 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x3<float, mediump> mediump_mat4x3;
-
- /// 4 columns of 3 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x3<float, highp> highp_mat4x3;
-
-}//namespace glm
diff --git a/inc/glm/mat4x4.hpp b/inc/glm/mat4x4.hpp deleted file mode 100644 index 36195b8..0000000 --- a/inc/glm/mat4x4.hpp +++ /dev/null @@ -1,81 +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 core
-/// @file glm/mat4x4.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/type_mat4x4.hpp"
-
-namespace glm
-{
- /// 4 columns of 4 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x4<float, lowp> lowp_mat4;
-
- /// 4 columns of 4 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x4<float, mediump> mediump_mat4;
-
- /// 4 columns of 4 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x4<float, highp> highp_mat4;
-
- /// 4 columns of 4 components matrix of low precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x4<float, lowp> lowp_mat4x4;
-
- /// 4 columns of 4 components matrix of medium precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x4<float, mediump> mediump_mat4x4;
-
- /// 4 columns of 4 components matrix of high precision floating-point numbers.
- /// There is no guarantee on the actual precision.
- ///
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
- /// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
- typedef tmat4x4<float, highp> highp_mat4x4;
-
-}//namespace glm
diff --git a/inc/glm/matrix.hpp b/inc/glm/matrix.hpp deleted file mode 100644 index 5d8e019..0000000 --- a/inc/glm/matrix.hpp +++ /dev/null @@ -1,35 +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 core
-/// @file glm/matrix.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/func_matrix.hpp"
diff --git a/inc/glm/packing.hpp b/inc/glm/packing.hpp deleted file mode 100644 index fbb480a..0000000 --- a/inc/glm/packing.hpp +++ /dev/null @@ -1,35 +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 core
-/// @file glm/packing.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/func_packing.hpp"
diff --git a/inc/glm/trigonometric.hpp b/inc/glm/trigonometric.hpp deleted file mode 100644 index 9162b5c..0000000 --- a/inc/glm/trigonometric.hpp +++ /dev/null @@ -1,35 +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 core
-/// @file glm/trigonometric.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/func_trigonometric.hpp"
diff --git a/inc/glm/vec2.hpp b/inc/glm/vec2.hpp deleted file mode 100644 index e3826d3..0000000 --- a/inc/glm/vec2.hpp +++ /dev/null @@ -1,35 +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 core
-/// @file glm/vec2.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/type_vec2.hpp"
diff --git a/inc/glm/vec3.hpp b/inc/glm/vec3.hpp deleted file mode 100644 index 4905f02..0000000 --- a/inc/glm/vec3.hpp +++ /dev/null @@ -1,35 +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 core
-/// @file glm/vec3.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/type_vec3.hpp"
diff --git a/inc/glm/vec4.hpp b/inc/glm/vec4.hpp deleted file mode 100644 index 4bc84c9..0000000 --- a/inc/glm/vec4.hpp +++ /dev/null @@ -1,35 +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 core
-/// @file glm/vec4.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/type_vec4.hpp"
diff --git a/inc/glm/vector_relational.hpp b/inc/glm/vector_relational.hpp deleted file mode 100644 index e2091fa..0000000 --- a/inc/glm/vector_relational.hpp +++ /dev/null @@ -1,35 +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 core
-/// @file glm/vector_relational.hpp
-/// @date 2013-12-24 / 2013-12-24
-/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "detail/func_vector_relational.hpp"
diff --git a/inc/list.hpp b/inc/list.hpp index 14a824c..aff57a2 100644 --- a/inc/list.hpp +++ b/inc/list.hpp @@ -8,7 +8,7 @@ #include "functions.hpp" #include "creature.hpp" #include "resource.hpp" -#include "window.hpp" +#include "sdl/window.hpp" #include "constants.hpp" #include "rectangle.hpp" #include "quadtree.hpp" diff --git a/inc/main.hpp b/inc/main.hpp index aa41738..3fe405f 100644 --- a/inc/main.hpp +++ b/inc/main.hpp @@ -4,13 +4,13 @@ #include <time.h> #include <vector> -#include "geoshader.hpp" -#include "rectdrawer.hpp" -#include "spritebatch.hpp" -#include "window.hpp" -#include "event.hpp" +#include "opengl/geoshader.hpp" +#include "opengl/rectdrawer.hpp" +#include "opengl/spritebatch.hpp" +#include "sdl/window.hpp" +#include "sdl/event.hpp" #include "list.hpp" -#include "timer.hpp" +#include "sdl/timer.hpp" #include "constants.hpp" #endif diff --git a/inc/camera.hpp b/inc/opengl/camera.hpp index 62ae837..62ae837 100644 --- a/inc/camera.hpp +++ b/inc/opengl/camera.hpp diff --git a/inc/geoshader.hpp b/inc/opengl/geoshader.hpp index 65e2fc3..2619a92 100644 --- a/inc/geoshader.hpp +++ b/inc/opengl/geoshader.hpp @@ -5,7 +5,8 @@ #include <GL/glew.h>
#include "constants.hpp"
-#include "graphicsobjects.hpp"
+#include "graphicsdata.hpp"
+#include "transform.hpp"
class GeoShader
{
diff --git a/inc/opengl/graphicsdata.hpp b/inc/opengl/graphicsdata.hpp new file mode 100644 index 0000000..df8d76e --- /dev/null +++ b/inc/opengl/graphicsdata.hpp @@ -0,0 +1,49 @@ +#ifndef graphicsdata_h
+#define graphicsdata_h
+
+#include <glm/glm.hpp>
+#include <glm/gtx/transform.hpp>
+
+#include "camera.hpp"
+
+class GraphicsData
+{
+ public:
+
+ float x;
+ float y;
+ float r;
+ float g;
+ float b;
+ float sides;
+
+ GraphicsData(){
+ this->x = 0;
+ this->y = 0;
+ this->r = 0;
+ this->g = 0;
+ this->b = 0;
+ this->sides = 0;
+ }
+
+
+ GraphicsData(float x,float y,float r,float g,float b,float sides){
+ this->x = 0;
+ this->y = 0;
+ this->r = 0;
+ this->g = 0;
+ this->b = 0;
+ this->sides = 0;
+ }
+
+ float getX(){
+ return x;
+ }
+
+ float getY(){
+ return y;
+ }
+
+};
+
+#endif
diff --git a/inc/rectdrawer.hpp b/inc/opengl/rectdrawer.hpp index 73db96b..f2ca1e5 100644 --- a/inc/rectdrawer.hpp +++ b/inc/opengl/rectdrawer.hpp @@ -6,7 +6,7 @@ #include <vector>
#include <iostream>
#include "geoshader.hpp"
-#include "graphicsobjects.hpp"
+#include "graphicsdata.hpp"
#include "spritebatch.hpp"
diff --git a/inc/opengl/basicshader.frag b/inc/opengl/shaders/basicshader.frag index 9aa9d0b..9aa9d0b 100644 --- a/inc/opengl/basicshader.frag +++ b/inc/opengl/shaders/basicshader.frag diff --git a/inc/opengl/basicshader.geom b/inc/opengl/shaders/basicshader.geom index 3540d10..3540d10 100644 --- a/inc/opengl/basicshader.geom +++ b/inc/opengl/shaders/basicshader.geom diff --git a/inc/opengl/basicshader.vert b/inc/opengl/shaders/basicshader.vert index f17aef5..f17aef5 100644 --- a/inc/opengl/basicshader.vert +++ b/inc/opengl/shaders/basicshader.vert diff --git a/inc/opengl/theshader.frag b/inc/opengl/shaders/theshader.frag index 4f870cb..4f870cb 100644 --- a/inc/opengl/theshader.frag +++ b/inc/opengl/shaders/theshader.frag diff --git a/inc/opengl/theshader.geom b/inc/opengl/shaders/theshader.geom index a49e6bc..a49e6bc 100644 --- a/inc/opengl/theshader.geom +++ b/inc/opengl/shaders/theshader.geom diff --git a/inc/opengl/theshader.vert b/inc/opengl/shaders/theshader.vert index b7cfe3b..b7cfe3b 100644 --- a/inc/opengl/theshader.vert +++ b/inc/opengl/shaders/theshader.vert diff --git a/inc/spritebatch.hpp b/inc/opengl/spritebatch.hpp index 4379954..3ece593 100644 --- a/inc/spritebatch.hpp +++ b/inc/opengl/spritebatch.hpp @@ -2,7 +2,7 @@ #define spritebatch_h
#include <GL/glew.h>
-#include "graphicsobjects.hpp"
+#include "graphicsdata.hpp"
#include <vector>
#include "geoshader.hpp"
#include <iostream>
diff --git a/inc/graphicsobjects.hpp b/inc/opengl/transform.hpp index de85467..9d0988c 100644 --- a/inc/graphicsobjects.hpp +++ b/inc/opengl/transform.hpp @@ -1,94 +1,52 @@ -#ifndef graphicsobjects_h
-#define graphicsobjects_h
-
-#include <glm/glm.hpp>
-#include <glm/gtx/transform.hpp>
-
-#include "camera.hpp"
-
-
-struct Transform
-{
-public:
- Transform(const glm::vec3& pos = glm::vec3(), const glm::vec3& rot = glm::vec3(), const glm::vec3& scale = glm::vec3(1.0f, 1.0f, 1.0f))
- {
- this->pos = pos;
- this->rot = rot;
- this->scale = scale;
- }
-
- inline glm::mat4 GetModel() const
- {
- glm::mat4 posMat = glm::translate(pos);
- glm::mat4 scaleMat = glm::scale(scale);
- glm::mat4 rotX = glm::rotate(rot.x, glm::vec3(1.0, 0.0, 0.0));
- glm::mat4 rotY = glm::rotate(rot.y, glm::vec3(0.0, 1.0, 0.0));
- glm::mat4 rotZ = glm::rotate(rot.z, glm::vec3(0.0, 0.0, 1.0));
- glm::mat4 rotMat = rotX * rotY * rotZ;
-
- return posMat * rotMat * scaleMat;
- }
-
- inline glm::mat4 GetMVP(const Camera& camera) const
- {
- glm::mat4 VP = camera.GetViewProjection();
- glm::mat4 M = GetModel();
-
- return VP * M;
- }
-
- inline glm::vec3* GetPos() { return &pos; }
- inline glm::vec3* GetRot() { return &rot; }
- inline glm::vec3* GetScale() { return &scale; }
-
- inline void SetPos(glm::vec3& pos) { this->pos = pos; }
- inline void SetRot(glm::vec3& rot) { this->rot = rot; }
- inline void SetScale(glm::vec3& scale) { this->scale = scale; }
-protected:
-private:
- glm::vec3 pos;
- glm::vec3 rot;
- glm::vec3 scale;
-};
-
-class GraphicsData
-{
- public:
-
- float x;
- float y;
- float r;
- float g;
- float b;
- float sides;
-
- GraphicsData(){
- this->x = 0;
- this->y = 0;
- this->r = 0;
- this->g = 0;
- this->b = 0;
- this->sides = 0;
- }
-
-
- GraphicsData(float x,float y,float r,float g,float b,float sides){
- this->x = 0;
- this->y = 0;
- this->r = 0;
- this->g = 0;
- this->b = 0;
- this->sides = 0;
- }
-
- float getX(){
- return x;
- }
-
- float getY(){
- return y;
- }
-
-};
-
-#endif
+#ifndef transform_h +#define transform_h + +#include <glm/glm.hpp> +#include <glm/gtx/transform.hpp> + +#include "camera.hpp" + +struct Transform +{ +public: + Transform(const glm::vec3& pos = glm::vec3(), const glm::vec3& rot = glm::vec3(), const glm::vec3& scale = glm::vec3(1.0f, 1.0f, 1.0f)) + { + this->pos = pos; + this->rot = rot; + this->scale = scale; + } + + inline glm::mat4 GetModel() const + { + glm::mat4 posMat = glm::translate(pos); + glm::mat4 scaleMat = glm::scale(scale); + glm::mat4 rotX = glm::rotate(rot.x, glm::vec3(1.0, 0.0, 0.0)); + glm::mat4 rotY = glm::rotate(rot.y, glm::vec3(0.0, 1.0, 0.0)); + glm::mat4 rotZ = glm::rotate(rot.z, glm::vec3(0.0, 0.0, 1.0)); + glm::mat4 rotMat = rotX * rotY * rotZ; + + return posMat * rotMat * scaleMat; + } + + inline glm::mat4 GetMVP(const Camera& camera) const + { + glm::mat4 VP = camera.GetViewProjection(); + glm::mat4 M = GetModel(); + + return VP * M; + } + + inline glm::vec3* GetPos() { return &pos; } + inline glm::vec3* GetRot() { return &rot; } + inline glm::vec3* GetScale() { return &scale; } + + inline void SetPos(glm::vec3& pos) { this->pos = pos; } + inline void SetRot(glm::vec3& rot) { this->rot = rot; } + inline void SetScale(glm::vec3& scale) { this->scale = scale; } +private: + glm::vec3 pos; + glm::vec3 rot; + glm::vec3 scale; +}; + +#endif diff --git a/inc/quadtree.hpp b/inc/quadtree.hpp index fab20da..8da34aa 100644 --- a/inc/quadtree.hpp +++ b/inc/quadtree.hpp @@ -4,12 +4,12 @@ #include <list>
#include <vector>
-#include "window.hpp"
+#include "sdl/window.hpp"
#include "creature.hpp"
#include "resource.hpp"
#include "entity.hpp"
#include "rectangle.hpp"
-#include "graphicsobjects.hpp"
+#include "opengl/graphicsdata.hpp"
class Quadtree {
diff --git a/inc/event.hpp b/inc/sdl/event.hpp index 3a0a868..3a0a868 100644 --- a/inc/event.hpp +++ b/inc/sdl/event.hpp diff --git a/inc/timer.hpp b/inc/sdl/timer.hpp index d4e46e8..d4e46e8 100644 --- a/inc/timer.hpp +++ b/inc/sdl/timer.hpp diff --git a/inc/window.hpp b/inc/sdl/window.hpp index fc0f325..fc0f325 100644 --- a/inc/window.hpp +++ b/inc/sdl/window.hpp diff --git a/src/event.cpp b/src/event.cpp index 56c4951..15358c7 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -1,4 +1,4 @@ -#include "event.hpp" +#include "sdl/event.hpp" Event::Event() { diff --git a/src/geoshader.cpp b/src/geoshader.cpp index b870313..3bd172b 100644 --- a/src/geoshader.cpp +++ b/src/geoshader.cpp @@ -1,4 +1,4 @@ -#include "geoshader.hpp" +#include "opengl/geoshader.hpp" #include <iostream> #include <fstream> diff --git a/src/main.cpp b/src/main.cpp index eb4438f..c7ce9e7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -11,8 +11,8 @@ int main() //New opengl stuff
Transform transform;
Camera camera(glm::vec3(0,0,70), 70.0f, (float)800/(float)600, 0.01f, 1000.0f);
- GeoShader shader("./inc/opengl/theshader");
- GeoShader shader2("./inc/opengl/basicshader");
+ GeoShader shader("./inc/opengl/shaders/theshader");
+ GeoShader shader2("./inc/opengl/shaders/basicshader");
Rectdrawer rectrenderer(shader2);
SpriteBatch _spriteBatch(shader);
diff --git a/src/rectdrawer.cpp b/src/rectdrawer.cpp index 980f348..8714471 100644 --- a/src/rectdrawer.cpp +++ b/src/rectdrawer.cpp @@ -1,4 +1,4 @@ -#include "rectdrawer.hpp"
+#include "opengl/rectdrawer.hpp"
Rectdrawer::Rectdrawer(GeoShader theshader) : _vbo(0), _vao(0), shader(theshader){
// Generate the VAO if it isn't already generated
diff --git a/src/spritebatch.cpp b/src/spritebatch.cpp index 91e04ba..2dd5463 100644 --- a/src/spritebatch.cpp +++ b/src/spritebatch.cpp @@ -1,4 +1,4 @@ -#include "spritebatch.hpp"
+#include "opengl/spritebatch.hpp"
SpriteBatch::SpriteBatch(GeoShader theshader) : _vbo(0), _vao(0), shader(theshader)
{
diff --git a/src/timer.cpp b/src/timer.cpp index 3a0b55e..9a8e7c8 100644 --- a/src/timer.cpp +++ b/src/timer.cpp @@ -1,4 +1,4 @@ -#include "timer.hpp" +#include "sdl/timer.hpp" Timer::Timer() { diff --git a/src/window.cpp b/src/window.cpp index 28af6bf..77d9549 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -1,4 +1,4 @@ -#include "window.hpp" +#include "sdl/window.hpp" Window::Window(int width, int height, const std::string& title) { |