Switched out alloca calls for file buffers to heap allocate

Author: jonjondev

engine/core/entity/Entity.h

@@ -33,23 +33,21 @@ class Entity
 
     /**
      * Zero-param constructor for Entity, initialises both
-     * position and rotation to zero, and name to "Entity"
+     * position and rotation to zero, and type to Entity
      */
     Entity() : Entity(TOKEN_Entity) {};
 
     /**
      * Single-param constructor for Entity that simply defines
      * a custom name for the Entity
-     * @param typeName - a const reference to the name of the
-     *                   entity as a string
+     * @param type - a token for the entity to use as its type
      */
     Entity(Token type) : Entity(type, {Vec3::Zero(), 0.f}) {};
 
     /**
      * Delegate constructor for Entity, initialises
      * generational index to zero
-     * @param name - a const reference to the name of the
-     *               entity as a string
+     * @param type - a token for the entity to use as its type
      * @param transform - the initial transition of the entity
      * @param zIndex - the initial z-index of the entity,
      *                 defaults to zero

engine/utils/FileSystem.cpp

@@ -13,27 +13,26 @@
 #include <cstdio>
 #include <fstream>
 
+#include "Defer.h"
 #include "Logging.h"
 
 namespace Siege::FileSystem
 {
 String Read(const String& filename)
 {
-    // Try open the file for reading
     FILE* file = fopen(filename, "rb");
     if (!file) return "";
 
-    // Determine file size
     fseek(file, 0, SEEK_END);
     size_t size = ftell(file);
     rewind(file);
 
-    // Copy the content
-    char* content = static_cast<char*>(alloca(size + 1));
+    char* content = static_cast<char*>(malloc(size + 1));
+    defer([&content] { free(content); });
+
     fread(content, sizeof(char), size, file);
     content[size] = '\0';
 
-    // Close the file stream and return
     fclose(file);
     return content;
 }

engine/utils/math/mat/Mat4.h

@@ -216,7 +216,7 @@ struct Mat<T, 4, 4>
 
     static inline constexpr Mat<T, 4, 4> Scale(const Vec<T, 3>& scale)
     {
-        Mat<T,4,4> mat = Mat<T,4,4>::Identity();
+        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;

packer/src/types/MathUtils.h renamed to packer/src/PackerUtils.h

@@ -7,18 +7,18 @@
 //     https://opensource.org/licenses/Zlib
 //
 
-#ifndef SIEGE_ENGINE_PACKER_MATHUTILS_H
-#define SIEGE_ENGINE_PACKER_MATHUTILS_H
+#ifndef SIEGE_ENGINE_PACKER_PACKERUTILS_H
+#define SIEGE_ENGINE_PACKER_PACKERUTILS_H
 
+#include <assimp/types.h>
 #include <utils/math/mat/Mat4.h>
-#include <assimp/Importer.hpp>
 
-static inline constexpr Siege::Mat4 AssimptMat4ToMat4(const aiMatrix4x4& matrix)
+static constexpr Siege::Mat4 AssimpMat4ToMat4(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
+#endif // SIEGE_ENGINE_PACKER_PACKERUTILS_H

packer/src/types/GenericFileDataPacker.cpp

@@ -10,6 +10,7 @@
 #include "GenericFileDataPacker.h"
 
 #include <resources/GenericFileData.h>
+#include <utils/Defer.h>
 #include <utils/Logging.h>
 
 #include <fstream>
@@ -25,9 +26,11 @@ void* PackGenericFile(const Siege::String& filePath)
 
     // Since we consumed the entire file, we can tell the size by checking where
     // the file stream is reading from (which presumably is at the end of the file).
-    uint32_t fileSize = static_cast<uint32_t>(file.tellg());
+    uint32_t fileSize = file.tellg();
+
+    char* data = static_cast<char*>(malloc(fileSize));
+    defer([&data] { free(data); });
 
-    char* data = static_cast<char*>(alloca(fileSize));
     file.seekg(0); // Move to the beginning of the file.
     file.read(data, fileSize);
     file.close();

packer/src/types/SceneDataPacker.cpp

@@ -10,6 +10,7 @@
 #include "SceneDataPacker.h"
 
 #include <resources/SceneData.h>
+#include <utils/Defer.h>
 #include <utils/FileSystem.h>
 #include <utils/Logging.h>
 
@@ -36,7 +37,9 @@ void* PackSceneFile(const Siege::String& filePath)
     bodyString = Siege::FileSystem::StripNewLines(bodyString);
 
     uint32_t fileSize = bodyString.Size() + 1;
-    char* data = static_cast<char*>(alloca(fileSize));
+    char* data = static_cast<char*>(malloc(fileSize));
+    defer([&data] { free(data); });
+
     memcpy(data, bodyString.Str(), fileSize);
 
     Siege::SceneData* sceneData = Siege::SceneData::Create(&data[0], fileSize);

packer/src/types/StaticMeshDataPacker.cpp

@@ -8,7 +8,6 @@
 //
 
 #include "StaticMeshDataPacker.h"
-#include "MathUtils.h"
 
 #include <assimp/postprocess.h>
 #include <assimp/scene.h>
@@ -17,8 +16,11 @@
 #include <utils/Logging.h>
 
 #include <algorithm>
+#include <assimp/Importer.hpp>
 #include <fstream>
 
+#include "../PackerUtils.h"
+
 enum RequestPathStage
 {
     PARENT,
@@ -59,11 +61,7 @@ static void GetMeshData(const aiScene* scene,
         Siege::BaseVertex vertex {};
 
         aiVector3t<ai_real> vert = mesh->mVertices[i];
-        Siege::Vec4 v = {vert.x, vert.y, vert.z, 1.f};
-
-        v = mat * v;
-
-        vertex.position = {v.x, v.y, v.z};
+        vertex.position = mat * Siege::Vec4(vert.x, vert.y, vert.z, 1.f);
 
         aiVector3t<ai_real> norm = mesh->mNormals[i];
         vertex.normal = {norm.x, norm.y, norm.z};
@@ -112,7 +110,7 @@ static void GetMeshesForNode(const aiScene* scene,
 
     if (nodePathStage == CHILD || nodePathStage == SELF)
     {
-        matrix *= AssimptMat4ToMat4(node->mTransformation);
+        matrix *= AssimpMat4ToMat4(node->mTransformation);
     }
 
     for (uint32_t i = 0; i < node->mNumMeshes; i++)

tests/src/utils/test_Token.cpp

@@ -29,7 +29,7 @@ UTEST(test_Token, StaticallyRegistered)
     ASSERT_TRUE(tk2.IsValid());
     ASSERT_TRUE(tk3.IsValid());
     ASSERT_TRUE(tk4.IsValid());
-    ASSERT_TRUE(!tk5.IsValid());
+    ASSERT_FALSE(tk5.IsValid());
     ASSERT_TRUE(tk6.IsValid());
     ASSERT_TRUE(tk7.IsValid());
 
@@ -89,7 +89,7 @@ UTEST(test_Token, DynamicallyRegistered)
     Siege::Token tk9 = Siege::Token::FindToken("FooBar");
 
     ASSERT_TRUE(tk8.IsValid());
-    ASSERT_TRUE(!tk9.IsValid());
+    ASSERT_FALSE(tk9.IsValid());
 
     ASSERT_STREQ("GoodbyeWorld", tk8.GetId());