From cc2e40324d884bc0417809980a696a5084e661d7 Mon Sep 17 00:00:00 2001
From: Thales Lima Oliveira <thaleslima.ufu@gmail.com>
Date: Wed, 8 Jul 2020 12:05:44 -0300
Subject: GLM folder changed

---
 Project/glm/ext/matrix_common.inl | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 Project/glm/ext/matrix_common.inl

(limited to 'Project/glm/ext/matrix_common.inl')

diff --git a/Project/glm/ext/matrix_common.inl b/Project/glm/ext/matrix_common.inl
new file mode 100644
index 0000000..9d50848
--- /dev/null
+++ b/Project/glm/ext/matrix_common.inl
@@ -0,0 +1,16 @@
+#include "../matrix.hpp"
+
+namespace glm
+{
+	template<length_t C, length_t R, typename T, typename U, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<C, R, T, Q> mix(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, U a)
+	{
+		return mat<C, R, U, Q>(x) * (static_cast<U>(1) - a) + mat<C, R, U, Q>(y) * a;
+	}
+
+	template<length_t C, length_t R, typename T, typename U, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<C, R, T, Q> mix(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, mat<C, R, U, Q> const& a)
+	{
+		return matrixCompMult(mat<C, R, U, Q>(x), static_cast<U>(1) - a) + matrixCompMult(mat<C, R, U, Q>(y), a);
+	}
+}//namespace glm
-- 
cgit