summaryrefslogtreecommitdiff
path: root/inc/glm/detail
diff options
context:
space:
mode:
Diffstat (limited to 'inc/glm/detail')
-rw-r--r--inc/glm/detail/_features.hpp428
-rw-r--r--inc/glm/detail/_fixes.hpp59
-rw-r--r--inc/glm/detail/_noise.hpp136
-rw-r--r--inc/glm/detail/_swizzle.hpp833
-rw-r--r--inc/glm/detail/_swizzle_func.hpp725
-rw-r--r--inc/glm/detail/_vectorize.hpp160
-rw-r--r--inc/glm/detail/dummy.cpp232
-rw-r--r--inc/glm/detail/func_common.hpp456
-rw-r--r--inc/glm/detail/func_common.inl758
-rw-r--r--inc/glm/detail/func_exponential.hpp132
-rw-r--r--inc/glm/detail/func_exponential.inl161
-rw-r--r--inc/glm/detail/func_geometric.hpp142
-rw-r--r--inc/glm/detail/func_geometric.inl201
-rw-r--r--inc/glm/detail/func_integer.hpp232
-rw-r--r--inc/glm/detail/func_integer.inl393
-rw-r--r--inc/glm/detail/func_matrix.hpp178
-rw-r--r--inc/glm/detail/func_matrix.inl310
-rw-r--r--inc/glm/detail/func_noise.hpp93
-rw-r--r--inc/glm/detail/func_noise.inl388
-rw-r--r--inc/glm/detail/func_packing.hpp197
-rw-r--r--inc/glm/detail/func_packing.inl119
-rw-r--r--inc/glm/detail/func_trigonometric.hpp205
-rw-r--r--inc/glm/detail/func_trigonometric.inl224
-rw-r--r--inc/glm/detail/func_vector_relational.hpp140
-rw-r--r--inc/glm/detail/func_vector_relational.inl131
-rw-r--r--inc/glm/detail/glm.cpp286
-rw-r--r--inc/glm/detail/intrinsic_common.hpp87
-rw-r--r--inc/glm/detail/intrinsic_common.inl313
-rw-r--r--inc/glm/detail/intrinsic_exponential.hpp77
-rw-r--r--inc/glm/detail/intrinsic_exponential.inl27
-rw-r--r--inc/glm/detail/intrinsic_geometric.hpp74
-rw-r--r--inc/glm/detail/intrinsic_geometric.inl147
-rw-r--r--inc/glm/detail/intrinsic_integer.hpp48
-rw-r--r--inc/glm/detail/intrinsic_integer.inl139
-rw-r--r--inc/glm/detail/intrinsic_matrix.hpp67
-rw-r--r--inc/glm/detail/intrinsic_matrix.inl1070
-rw-r--r--inc/glm/detail/intrinsic_trigonometric.hpp46
-rw-r--r--inc/glm/detail/intrinsic_trigonometric.inl27
-rw-r--r--inc/glm/detail/intrinsic_vector_relational.hpp46
-rw-r--r--inc/glm/detail/intrinsic_vector_relational.inl366
-rw-r--r--inc/glm/detail/precision.hpp44
-rw-r--r--inc/glm/detail/setup.hpp963
-rw-r--r--inc/glm/detail/type_float.hpp96
-rw-r--r--inc/glm/detail/type_gentype.hpp224
-rw-r--r--inc/glm/detail/type_gentype.inl370
-rw-r--r--inc/glm/detail/type_half.hpp48
-rw-r--r--inc/glm/detail/type_half.inl277
-rw-r--r--inc/glm/detail/type_int.hpp326
-rw-r--r--inc/glm/detail/type_mat.hpp793
-rw-r--r--inc/glm/detail/type_mat.inl32
-rw-r--r--inc/glm/detail/type_mat2x2.hpp223
-rw-r--r--inc/glm/detail/type_mat2x2.inl548
-rw-r--r--inc/glm/detail/type_mat2x3.hpp201
-rw-r--r--inc/glm/detail/type_mat2x3.inl506
-rw-r--r--inc/glm/detail/type_mat2x4.hpp202
-rw-r--r--inc/glm/detail/type_mat2x4.inl515
-rw-r--r--inc/glm/detail/type_mat3x2.hpp207
-rw-r--r--inc/glm/detail/type_mat3x2.inl540
-rw-r--r--inc/glm/detail/type_mat3x3.hpp230
-rw-r--r--inc/glm/detail/type_mat3x3.inl631
-rw-r--r--inc/glm/detail/type_mat3x4.hpp206
-rw-r--r--inc/glm/detail/type_mat3x4.inl579
-rw-r--r--inc/glm/detail/type_mat4x2.hpp212
-rw-r--r--inc/glm/detail/type_mat4x2.inl587
-rw-r--r--inc/glm/detail/type_mat4x3.hpp211
-rw-r--r--inc/glm/detail/type_mat4x3.inl631
-rw-r--r--inc/glm/detail/type_mat4x4.hpp235
-rw-r--r--inc/glm/detail/type_mat4x4.inl790
-rw-r--r--inc/glm/detail/type_vec.hpp518
-rw-r--r--inc/glm/detail/type_vec.inl31
-rw-r--r--inc/glm/detail/type_vec1.hpp322
-rw-r--r--inc/glm/detail/type_vec1.inl616
-rw-r--r--inc/glm/detail/type_vec2.hpp403
-rw-r--r--inc/glm/detail/type_vec2.inl909
-rw-r--r--inc/glm/detail/type_vec3.hpp425
-rw-r--r--inc/glm/detail/type_vec3.inl1042
-rw-r--r--inc/glm/detail/type_vec4.hpp531
-rw-r--r--inc/glm/detail/type_vec4.inl1124
-rw-r--r--inc/glm/detail/type_vec4_avx.inl41
-rw-r--r--inc/glm/detail/type_vec4_avx2.inl41
-rw-r--r--inc/glm/detail/type_vec4_sse2.inl120
81 files changed, 0 insertions, 26403 deletions
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