Removed assimp matrices and vectors and added conversion functions

Author: Raelr

engine/utils/math/mat/Mat4.h

@@ -214,6 +214,15 @@ struct Mat<T, 4, 4>
                 {matrix[0][3], matrix[1][3], matrix[2][3], matrix[3][3]}};
     }
 
+    static inline constexpr Mat<T, 4, 4> Scale(const Vec<T, 3>& scale)
+    {
+        Mat<T,4,4> mat = Mat<T,4,4>::Identity();
+        mat[0][0] = scale.x;
+        mat[1][1] = scale.y;
+        mat[2][2] = scale.z;
+        return mat;
+    }
+
     // 'Structors
 
     /**

packer/src/types/MathUtils.h

@@ -0,0 +1,24 @@
+//
+// Copyright (c) 2020-present Caps Collective & contributors
+// Originally authored by Jonathan Moallem (@jonjondev) & Aryeh Zinn (@Raelr)
+//
+// This code is released under an unmodified zlib license.
+// For conditions of distribution and use, please see:
+//     https://opensource.org/licenses/Zlib
+//
+
+#ifndef SIEGE_ENGINE_PACKER_MATHUTILS_H
+#define SIEGE_ENGINE_PACKER_MATHUTILS_H
+
+#include <utils/math/mat/Mat4.h>
+#include <assimp/Importer.hpp>
+
+static inline constexpr Siege::Mat4 AssimptMat4ToMat4(const aiMatrix4x4& matrix)
+{
+    return {{matrix.a1, matrix.b1, matrix.c1, matrix.d1},
+            {matrix.a2, matrix.b2, matrix.c2, matrix.d2},
+            {matrix.a3, matrix.b3, matrix.c3, matrix.d3},
+            {matrix.a4, matrix.b4, matrix.c4, matrix.d4}};
+}
+
+#endif // SIEGE_ENGINE_PACKER_MATHUTILS_H

packer/src/types/StaticMeshDataPacker.cpp

@@ -8,6 +8,7 @@
 //
 
 #include "StaticMeshDataPacker.h"
+#include "MathUtils.h"
 
 #include <assimp/postprocess.h>
 #include <assimp/scene.h>
@@ -16,7 +17,6 @@
 #include <utils/Logging.h>
 
 #include <algorithm>
-#include <assimp/Importer.hpp>
 #include <fstream>
 
 enum RequestPathStage
@@ -50,7 +50,7 @@ static RequestPathStage GetRequestPathStage(const Siege::String& requestPath,
 
 static void GetMeshData(const aiScene* scene,
                         const aiMesh* mesh,
-                        const aiMatrix4x4t<ai_real>& matrix,
+                        const Siege::Mat4& mat,
                         OUT std::vector<Siege::BaseVertex>& vertices,
                         OUT std::vector<uint32_t>& indices)
 {
@@ -59,8 +59,11 @@ static void GetMeshData(const aiScene* scene,
         Siege::BaseVertex vertex {};
 
         aiVector3t<ai_real> vert = mesh->mVertices[i];
-        vert *= matrix;
-        vertex.position = {vert.x, vert.y, vert.z};
+        Siege::Vec4 v = {vert.x, vert.y, vert.z, 1.f};
+
+        v = mat * v;
+
+        vertex.position = {v.x, v.y, v.z};
 
         aiVector3t<ai_real> norm = mesh->mNormals[i];
         vertex.normal = {norm.x, norm.y, norm.z};
@@ -93,7 +96,7 @@ static void GetMeshesForNode(const aiScene* scene,
                              const aiNode* node,
                              const Siege::String& requestPath,
                              Siege::String currentPath,
-                             aiMatrix4x4t<ai_real> matrix,
+                             Siege::Mat4 matrix,
                              OUT std::vector<Siege::BaseVertex>& vertices,
                              OUT std::vector<uint32_t>& indices)
 {
@@ -109,7 +112,7 @@ static void GetMeshesForNode(const aiScene* scene,
 
     if (nodePathStage == CHILD || nodePathStage == SELF)
     {
-        matrix *= node->mTransformation;
+        matrix *= AssimptMat4ToMat4(node->mTransformation);
     }
 
     for (uint32_t i = 0; i < node->mNumMeshes; i++)
@@ -175,7 +178,7 @@ void* PackStaticMeshFile(const Siege::String& filePath, const Siege::String& ass
 
     CC_LOG_INFO("Reading static mesh for file {} with node path {}", it->second, requestedNodePath)
 
-    aiMatrix4x4t<ai_real> baseXform;
+    Siege::Mat4 baseXform = Siege::Mat4::Identity();
     auto flipAxesIt = attributes.find(TOKEN_FLIP_AXES);
     if (flipAxesIt != attributes.end())
     {
@@ -186,7 +189,7 @@ void* PackStaticMeshFile(const Siege::String& filePath, const Siege::String& ass
 
         for (int32_t i = 0; i < flipAxesIt->second.Size(); ++i)
         {
-            aiVector3t<ai_real> scale {1.f, 1.f, 1.f};
+            Siege::Vec4 scale = {1.f, 1.f, 1.f, 1.f};
             switch (flipAxesIt->second[i])
             {
                 case 'x':
@@ -203,8 +206,7 @@ void* PackStaticMeshFile(const Siege::String& filePath, const Siege::String& ass
                                    flipAxesIt->second[i])
                     break;
             }
-            aiMatrix4x4t<ai_real> scalingMat;
-            baseXform *= aiMatrix4x4t<ai_real>::Scaling(scale, scalingMat);
+            baseXform *= Siege::Mat4::Scale(scale);
         }
     }