From 58c75ce61ac6635b12dbf3ddef6904d7350de4d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Kapu=C5=9Bci=C5=84ski?= <tomaszkax86@gmail.com>
Date: Sat, 14 Aug 2021 15:04:14 +0200
Subject: [PATCH] Added implicit conversion between Math::Matrix and glm::mat4

---
 src/math/matrix.h | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/math/matrix.h b/src/math/matrix.h
index 51e6fc65..de5775b0 100644
--- a/src/math/matrix.h
+++ b/src/math/matrix.h
@@ -32,6 +32,8 @@
 
 #include <cmath>
 #include <cassert>
+#include <glm/glm.hpp>
+#include <glm/gtc/type_ptr.hpp>
 
 
 // Math module namespace
@@ -100,6 +102,32 @@ struct Matrix
         }
     }
 
+    Matrix(const glm::mat4& matrix)
+    {
+        for (int c = 0; c < 4; ++c)
+        {
+            for (int r = 0; r < 4; ++r)
+            {
+                m[4 * c + r] = matrix[c][r];
+            }
+        }
+    }
+
+    operator glm::mat4() const
+    {
+        glm::mat4 matrix;
+
+        for (int c = 0; c < 4; ++c)
+        {
+            for (int r = 0; r < 4; ++r)
+            {
+                 matrix[c][r] = m[4 * c + r];
+            }
+        }
+
+        return matrix;
+    }
+
     //! Sets value in given row and col
     /**
      * \param row row (1 to 4)