Added tests for animation data

Author: jonjondev

engine/resources/AnimationData.h

@@ -10,10 +10,9 @@
 #ifndef SIEGE_ENGINE_ANIMATIONDATA_H
 #define SIEGE_ENGINE_ANIMATIONDATA_H
 
-#include <utils/math/vec/Vec3.h>
+#include <utils/BinarySerialisation.h>
 #include <utils/math/mat/Mat4.h>
-
-#include "PackFile.h"
+#include <utils/math/vec/Vec3.h>
 
 namespace Siege
 {

engine/resources/PackFile.h

@@ -18,10 +18,11 @@
 #include <filesystem>
 #include <map>
 
+#include "AnimationData.h"
 #include "PackFileData.h"
 #include "SceneData.h"
-#include "StaticMeshData.h"
 #include "SkeletalMeshData.h"
+#include "StaticMeshData.h"
 #include "Texture2DData.h"
 
 #define PACKER_MAGIC_NUMBER_FILE "pck"

engine/resources/SkeletalMeshData.h

@@ -10,11 +10,12 @@
 #ifndef SIEGE_ENGINE_SKELETALMESHDATA_H
 #define SIEGE_ENGINE_SKELETALMESHDATA_H
 
+#include <utils/BinarySerialisation.h>
 #include <utils/Colour.h>
+#include <utils/math/mat/Mat4.h>
 #include <utils/math/vec/Hashing.h>
 #include <utils/math/vec/Vec2.h>
 #include <utils/math/vec/Vec3.h>
-#include <utils/math/mat/Mat4.h>
 
 #include "StaticMeshData.h"
 
@@ -34,7 +35,8 @@ struct SkinnedVertex : BaseVertex
 
 inline bool operator==(const SkinnedVertex& left, const SkinnedVertex& right)
 {
-    return static_cast<BaseVertex>(left) == static_cast<BaseVertex>(right) && left.bones == right.bones && left.weights == right.weights;
+    return static_cast<BaseVertex>(left) == static_cast<BaseVertex>(right) &&
+           left.bones == right.bones && left.weights == right.weights;
 }
 
 inline bool operator!=(const SkinnedVertex& left, const SkinnedVertex& right)

engine/resources/StaticMeshData.h

@@ -16,8 +16,6 @@
 #include <utils/math/vec/Vec2.h>
 #include <utils/math/vec/Vec3.h>
 
-#include "PackFile.h"
-
 namespace Siege
 {
 

engine/utils/Colour.h

@@ -247,7 +247,6 @@ inline String ToString(const IColour& colour)
     return String("%d,%d,%d,%d").Formatted(colour.r, colour.g, colour.b, colour.a);
 }
 
-
 /**
  * Converts a float colour to a string
  * @param colour the colour to convert to a string
@@ -258,7 +257,6 @@ inline String ToString(const FColour& colour)
     return String("%.2f,%.2f,%.2f,%.2f").Formatted(colour.r, colour.g, colour.b, colour.a);
 }
 
-
 } // namespace Siege
 
 namespace std

engine/utils/Logging.h

@@ -15,6 +15,7 @@
 #include <variant>
 #include <vector>
 
+#include "Colour.h"
 #include "Macros.h"
 #include "String.h"
 #include "Token.h"
@@ -23,7 +24,6 @@
 #include "math/mat/Mat2.h"
 #include "math/mat/Mat3.h"
 #include "math/vec/Format.h"
-#include "Colour.h"
 
 // Define terminal colour wrapping macros
 #define _CC_LOG_COLOUR_RED "31"

examples/game/Makefile

@@ -30,6 +30,8 @@ else ifeq ($(platform), macos)
 endif
 engineRenderBuildDir := $(binDir)/engine/render/build
 exampleGameAssets := $(patsubst ./%,%, $(call rwildcard,$(exampleGameSrcDir),*.sm))
+exampleGameAssets += $(patsubst ./%,%, $(call rwildcard,$(exampleGameSrcDir),*.sk))
+exampleGameAssets += $(patsubst ./%,%, $(call rwildcard,$(exampleGameSrcDir),*.ska))
 exampleGameAssets += $(patsubst ./%,%, $(call rwildcard,$(exampleGameSrcDir),*.png))
 exampleGameAssets += $(patsubst ./%,%, $(call rwildcard,$(exampleGameSrcDir),*.jpg))
 exampleGameAssets += $(patsubst $(engineRenderBuildDir)/%,%, $(call rwildcard,$(engineRenderBuildDir),*.spv))

packer/src/types/AnimationDataPacker.cpp

@@ -8,15 +8,14 @@
 
 #include "AnimationDataPacker.h"
 
+#include <assimp/postprocess.h>
+#include <assimp/scene.h>
 #include <resources/AnimationData.h>
 #include <utils/FileSystem.h>
 #include <utils/Logging.h>
 
-#include <assimp/postprocess.h>
-#include <assimp/scene.h>
-#include <assimp/Importer.hpp>
-
 #include <algorithm>
+#include <assimp/Importer.hpp>
 #include <fstream>
 
 #include "StaticMeshDataPacker.h"
@@ -29,7 +28,9 @@ static void GetAnimationData(aiAnimation* animation, OUT Siege::AnimationData& a
     anim.speed = animation->mTicksPerSecond;
 
     Siege::String animName = animation->mName.C_Str();
-    CC_LOG_INFO("Reading animation \"{}\" with duration of {} seconds", animName, anim.length / anim.speed)
+    CC_LOG_INFO("Reading animation \"{}\" with duration of {} seconds",
+                animName,
+                anim.length / anim.speed)
 
     for (uint32_t i = 0; i < animation->mNumChannels; i++)
     {
@@ -66,10 +67,12 @@ static void GetAnimationData(aiAnimation* animation, OUT Siege::AnimationData& a
     }
 }
 
-Siege::PackFileData* PackAnimationFile(const Siege::String& filePath, const Siege::String& assetsPath)
+Siege::PackFileData* PackAnimationFile(const Siege::String& filePath,
+                                       const Siege::String& assetsPath)
 {
     Siege::String contents = Siege::FileSystem::Read(filePath);
-    std::map<Siege::Token, Siege::String> attributes = Siege::FileSystem::ParseAttributeFileData(contents);
+    std::map<Siege::Token, Siege::String> attributes =
+        Siege::FileSystem::ParseAttributeFileData(contents);
 
     if (attributes.empty())
     {

packer/src/types/AnimationDataPacker.h

@@ -11,6 +11,7 @@
 
 #include <resources/PackFile.h>
 
-Siege::PackFileData* PackAnimationFile(const Siege::String& filePath, const Siege::String& assetsPath);
+Siege::PackFileData* PackAnimationFile(const Siege::String& filePath,
+                                       const Siege::String& assetsPath);
 
 #endif // SIEGE_ENGINE_ANIMATIONDATAPACKER_H

packer/src/types/SkeletalMeshDataPacker.cpp

@@ -30,7 +30,7 @@ static void GetMeshData(const aiScene* scene,
     {
         Siege::SkinnedVertex vertex {};
         vertex.bones = {-1, -1, -1, -1};
-        vertex.weights = {0.f, 0.f, 0.f, 0.f };
+        vertex.weights = {0.f, 0.f, 0.f, 0.f};
 
         aiVector3t<ai_real> vert = mesh->mVertices[i];
         vertex.position = mat * Siege::Vec4(vert.x, vert.y, vert.z, 1.f);
@@ -100,7 +100,10 @@ static void GetMeshData(const aiScene* scene,
     }
 }
 
-static aiMesh* FindMeshAtPath(const aiScene* scene, aiNode* node, const Siege::String& requestPath, Siege::String currentPath)
+static aiMesh* FindMeshAtPath(const aiScene* scene,
+                              aiNode* node,
+                              const Siege::String& requestPath,
+                              Siege::String currentPath)
 {
     currentPath = currentPath + node->mName.C_Str();
     CC_LOG_INFO("Reading node at {}", currentPath)
@@ -124,10 +127,12 @@ static aiMesh* FindMeshAtPath(const aiScene* scene, aiNode* node, const Siege::S
     return nullptr;
 }
 
-Siege::PackFileData* PackSkeletalMeshFile(const Siege::String& filePath, const Siege::String& assetsPath)
+Siege::PackFileData* PackSkeletalMeshFile(const Siege::String& filePath,
+                                          const Siege::String& assetsPath)
 {
     Siege::String contents = Siege::FileSystem::Read(filePath);
-    std::map<Siege::Token, Siege::String> attributes = Siege::FileSystem::ParseAttributeFileData(contents);
+    std::map<Siege::Token, Siege::String> attributes =
+        Siege::FileSystem::ParseAttributeFileData(contents);
 
     if (attributes.empty())
     {