Updated boneId to boneIndices, relocated boneMatrices from Mesh to Model, added currentPose

Author: execphantasmagoria

include/MeshUnmanaged.hpp

@@ -35,9 +35,8 @@ class MeshUnmanaged : public ::Mesh {
         indices = nullptr;
         animVertices = nullptr;
         animNormals = nullptr;
-        boneIds = nullptr;
+        boneIndices = nullptr;
         boneWeights = nullptr;
-        boneMatrices = nullptr;
         boneCount = 0;
         vaoId = 0;
         vboId = nullptr;
@@ -130,7 +129,7 @@ class MeshUnmanaged : public ::Mesh {
     GETTERSETTER(unsigned short*, Indices, indices) // NOLINT
     GETTERSETTER(float*, AnimVertices, animVertices)
     GETTERSETTER(float*, AnimNormals, animNormals)
-    GETTERSETTER(unsigned char*, BoneIds, boneIds)
+    GETTERSETTER(unsigned char*, BoneIndices, boneIndices)
     GETTERSETTER(float*, BoneWeights, boneWeights)
     GETTERSETTER(unsigned int, VaoId, vaoId)
     GETTERSETTER(unsigned int*, VboId, vboId)
@@ -242,9 +241,8 @@ class MeshUnmanaged : public ::Mesh {
         indices = mesh.indices;
         animVertices = mesh.animVertices;
         animNormals = mesh.animNormals;
-        boneIds = mesh.boneIds;
+        boneIndices = mesh.boneIndices;
         boneWeights = mesh.boneWeights;
-        boneMatrices = mesh.boneMatrices;
         vaoId = mesh.vaoId;
         vboId = mesh.vboId;
     }

include/Model.hpp

@@ -59,13 +59,12 @@ class Model : public ::Model {
         other.materials = nullptr;
         other.meshMaterial = nullptr;
 
-        /*
-        The Animation Data is now stored within a separate struct called
-        `ModelSkeleton`. The changes below reflect this update.
-        */
         other.skeleton.boneCount = 0;
         other.skeleton.bones = nullptr;
         other.skeleton.bindPose = nullptr;
+
+        ModelAnimPose currentPose;
+        Matrix *boneMatrices;
     }
 
     GETTERSETTER(::Matrix, Transform, transform)
@@ -77,6 +76,8 @@ class Model : public ::Model {
     GETTERSETTER(int, BoneCount, skeleton.boneCount)
     GETTERSETTER(::BoneInfo*, Bones, skeleton.bones)
     GETTERSETTER(::Transform*, BindPose, skeleton.bindPose)
+    GETTERSETTER(::ModelAnimPose, CurrentPose, currentPose)
+    GETTERSETTER(::Matrix*, BoneMatrices, boneMatrices)
 
     Model& operator=(const ::Model& model) {
         set(model);
@@ -101,6 +102,8 @@ class Model : public ::Model {
         other.skeleton.boneCount = 0;
         other.skeleton.bones = nullptr;
         other.skeleton.bindPose = nullptr;
+        other.currentPose = nullptr;
+        other.boneMatrices = nullptr;
 
         return *this;
     }
@@ -248,6 +251,8 @@ class Model : public ::Model {
         skeleton.boneCount = model.skeleton.boneCount;
         skeleton.bones = model.skeleton.bones;
         skeleton.bindPose = model.skeleton.bindPose;
+        currentPose = model.currentPose;
+        boneMatrices = model.boneMatrices;
     }
 };