Revert "Using HybridArray with MAX_BONES and MAX_MORPHTARGETS"

This reverts commit 94a1cad.

Author: eduardodoria

engine/core/component/MeshComponent.h

@@ -89,11 +89,11 @@ namespace Supernova{
         HybridArray<Submesh, MAX_SUBMESHES> submeshes;
         unsigned int numSubmeshes = 0;
 
-        HybridArray<Matrix4, MAX_BONES> bonesMatrix;
+        Matrix4 bonesMatrix[MAX_BONES];
         float normAdjustJoint = 1;
         float normAdjustWeight = 1;
 
-        HybridArray<float, MAX_MORPHTARGETS> morphWeights;
+        float morphWeights[MAX_MORPHTARGETS];
 
         AABB aabb = AABB::ZERO;
         AABB verticesAABB = AABB::ZERO; // is not influenced by instances

engine/core/subsystem/RenderSystem.cpp

@@ -1065,14 +1065,14 @@ bool RenderSystem::drawMesh(MeshComponent& mesh, Transform& transform, CameraCom
             }
 
             if (mesh.submeshes[i].hasSkinning){
-                render.applyUniformBlock(mesh.submeshes[i].slotVSSkinning, sizeof(Matrix4) * mesh.bonesMatrix.size() + (sizeof(float) * 4), mesh.bonesMatrix.data());
+                render.applyUniformBlock(mesh.submeshes[i].slotVSSkinning, sizeof(float) * 16 * MAX_BONES + (sizeof(float) * 4), &mesh.bonesMatrix);
             }
 
             if (mesh.submeshes[i].hasMorphTarget){
                 if (!mesh.submeshes[i].hasMorphNormal && !mesh.submeshes[i].hasMorphTangent){
-                    render.applyUniformBlock(mesh.submeshes[i].slotVSMorphTarget, sizeof(float) * mesh.morphWeights.size(), mesh.morphWeights.data());
+                    render.applyUniformBlock(mesh.submeshes[i].slotVSMorphTarget, sizeof(float) * MAX_MORPHTARGETS, &mesh.morphWeights);
                 }else{
-                    render.applyUniformBlock(mesh.submeshes[i].slotVSMorphTarget, sizeof(float) * mesh.morphWeights.size() / 2, mesh.morphWeights.data());
+                    render.applyUniformBlock(mesh.submeshes[i].slotVSMorphTarget, sizeof(float) * MAX_MORPHTARGETS / 2, &mesh.morphWeights);
                 }
             }
 
@@ -1127,13 +1127,13 @@ bool RenderSystem::drawMeshDepth(MeshComponent& mesh, const float cameraFar, con
             depthRender.applyUniformBlock(mesh.submeshes[i].slotVSDepthParams, sizeof(float) * 32, &vsDepthParams);
 
             if (mesh.submeshes[i].hasSkinning){
-                depthRender.applyUniformBlock(mesh.submeshes[i].slotVSDepthSkinning, sizeof(Matrix4) * mesh.bonesMatrix.size() + (sizeof(float) * 4), mesh.bonesMatrix.data());
+                depthRender.applyUniformBlock(mesh.submeshes[i].slotVSDepthSkinning, sizeof(float) * 16 * MAX_BONES + (sizeof(float) * 4), &mesh.bonesMatrix);
             }
             if (mesh.submeshes[i].hasMorphTarget){
                 if (!mesh.submeshes[i].hasMorphNormal && !mesh.submeshes[i].hasMorphTangent){
-                    depthRender.applyUniformBlock(mesh.submeshes[i].slotVSDepthMorphTarget, sizeof(float) * mesh.morphWeights.size(), mesh.morphWeights.data());
+                    depthRender.applyUniformBlock(mesh.submeshes[i].slotVSDepthMorphTarget, sizeof(float) * MAX_MORPHTARGETS, &mesh.morphWeights);
                 }else{
-                    depthRender.applyUniformBlock(mesh.submeshes[i].slotVSDepthMorphTarget, sizeof(float) * mesh.morphWeights.size() / 2, mesh.morphWeights.data());
+                    depthRender.applyUniformBlock(mesh.submeshes[i].slotVSDepthMorphTarget, sizeof(float) * MAX_MORPHTARGETS / 2, &mesh.morphWeights);
                 }
             }
 
@@ -3069,7 +3069,7 @@ void RenderSystem::update(double dt){
                     if (model && mesh) {
                         Matrix4 skinning = model->inverseDerivedTransform * transform.modelMatrix * bone.offsetMatrix;
 
-                        if (mesh->bonesMatrix.validIndex(bone.index))
+                        if (bone.index >= 0 && bone.index < MAX_BONES)
                             mesh->bonesMatrix[bone.index] = skinning;
                     }
                 }