From 2877f4eda3d1b0c7431039e3142ecf1a282a34b1 Mon Sep 17 00:00:00 2001
From: LaG1924 <12997935+LaG1924@users.noreply.github.com>
Date: Tue, 21 Aug 2018 20:40:38 +0500
Subject: Update glm to 0.9.9.0
---
external/include/glm/matrix.hpp | 160 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 159 insertions(+), 1 deletion(-)
(limited to 'external/include/glm/matrix.hpp')
diff --git a/external/include/glm/matrix.hpp b/external/include/glm/matrix.hpp
index 736dd49..437e388 100644
--- a/external/include/glm/matrix.hpp
+++ b/external/include/glm/matrix.hpp
@@ -1,6 +1,164 @@
/// @ref core
/// @file glm/matrix.hpp
+///
+/// @see GLSL 4.20.8 specification, section 8.6 Matrix Functions
+///
+/// @defgroup core_func_matrix Matrix functions
+/// @ingroup core
+///
+/// Include to use these core features.
+///
+/// For each of the following built-in matrix functions, there is both a
+/// single-qualifier floating point version, where all arguments and return values
+/// are single qualifier, and a double-qualifier floating version, where all
+/// arguments and return values are double qualifier. Only the single-qualifier
+/// floating point version is shown.
#pragma once
-#include "detail/func_matrix.hpp"
+// Dependencies
+#include "detail/qualifier.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
+ struct outerProduct_trait<2, 2, T, Q>
+ {
+ typedef mat<2, 2, T, Q> type;
+ };
+
+ template
+ struct outerProduct_trait<2, 3, T, Q>
+ {
+ typedef mat<3, 2, T, Q> type;
+ };
+
+ template
+ struct outerProduct_trait<2, 4, T, Q>
+ {
+ typedef mat<4, 2, T, Q> type;
+ };
+
+ template
+ struct outerProduct_trait<3, 2, T, Q>
+ {
+ typedef mat<2, 3, T, Q> type;
+ };
+
+ template
+ struct outerProduct_trait<3, 3, T, Q>
+ {
+ typedef mat<3, 3, T, Q> type;
+ };
+
+ template
+ struct outerProduct_trait<3, 4, T, Q>
+ {
+ typedef mat<4, 3, T, Q> type;
+ };
+
+ template
+ struct outerProduct_trait<4, 2, T, Q>
+ {
+ typedef mat<2, 4, T, Q> type;
+ };
+
+ template
+ struct outerProduct_trait<4, 3, T, Q>
+ {
+ typedef mat<3, 4, T, Q> type;
+ };
+
+ template
+ struct outerProduct_trait<4, 4, T, Q>
+ {
+ typedef mat<4, 4, T, Q> 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 C Integer between 1 and 4 included that qualify the number a column
+ /// @tparam R Integer between 1 and 4 included that qualify the number a row
+ /// @tparam T Floating-point or signed integer scalar types
+ /// @tparam Q Value from qualifier enum
+ ///
+ /// @see GLSL matrixCompMult man page
+ /// @see GLSL 4.20.8 specification, section 8.6 Matrix Functions
+ template
+ GLM_FUNC_DECL mat matrixCompMult(mat const& x, mat 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 C Integer between 1 and 4 included that qualify the number a column
+ /// @tparam R Integer between 1 and 4 included that qualify the number a row
+ /// @tparam T Floating-point or signed integer scalar types
+ /// @tparam Q Value from qualifier enum
+ ///
+ /// @see GLSL outerProduct man page
+ /// @see GLSL 4.20.8 specification, section 8.6 Matrix Functions
+ template
+ GLM_FUNC_DECL typename detail::outerProduct_trait::type outerProduct(vec const& c, vec const& r);
+
+ /// Returns the transposed matrix of x
+ ///
+ /// @tparam C Integer between 1 and 4 included that qualify the number a column
+ /// @tparam R Integer between 1 and 4 included that qualify the number a row
+ /// @tparam T Floating-point or signed integer scalar types
+ /// @tparam Q Value from qualifier enum
+ ///
+ /// @see GLSL transpose man page
+ /// @see GLSL 4.20.8 specification, section 8.6 Matrix Functions
+ template
+ GLM_FUNC_DECL typename mat::transpose_type transpose(mat const& x);
+
+ /// Return the determinant of a squared matrix.
+ ///
+ /// @tparam C Integer between 1 and 4 included that qualify the number a column
+ /// @tparam R Integer between 1 and 4 included that qualify the number a row
+ /// @tparam T Floating-point or signed integer scalar types
+ /// @tparam Q Value from qualifier enum
+ ///
+ /// @see GLSL determinant man page
+ /// @see GLSL 4.20.8 specification, section 8.6 Matrix Functions
+ template
+ GLM_FUNC_DECL T determinant(mat const& m);
+
+ /// Return the inverse of a squared matrix.
+ ///
+ /// @tparam C Integer between 1 and 4 included that qualify the number a column
+ /// @tparam R Integer between 1 and 4 included that qualify the number a row
+ /// @tparam T Floating-point or signed integer scalar types
+ /// @tparam Q Value from qualifier enum
+ ///
+ /// @see GLSL inverse man page
+ /// @see GLSL 4.20.8 specification, section 8.6 Matrix Functions
+ template
+ GLM_FUNC_DECL mat inverse(mat const& m);
+
+ /// @}
+}//namespace glm
+
+#include "detail/func_matrix.inl"
--
cgit v1.2.3