Fix a bad assumption about Dawntrail bone matrix data

For some reason, I thought there was a limit of 768 bones which doesn't
make any sense. No, it's a 768 element array of vec4s which is clearly a
256 element array of mat 3x4s.

Author: redstrate

parts/mdl/mdlpart.cpp

@@ -207,7 +207,7 @@ void MDLPart::reloadBoneData()
             }
 
             for (uint32_t i = 0; i < model->boneData.size(); i++) {
-                model->boneData[i] = glm::mat4(1.0f);
+                model->boneData[i] = glm::mat3x4(1.0f);
             }
 
             for (uint32_t i = 0; i < model->model.num_affected_bones; i++) {

renderer/include/drawobject.h

@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include "shaderstructs.h"
 #include "texture.h"
 
 struct RenderPart {
@@ -37,7 +38,7 @@ struct RenderMaterial {
 struct DrawObject {
     physis_MDL model;
     std::vector<RenderPart> parts;
-    std::array<glm::mat4, 768> boneData; // JOINT_MATRIX_SIZE_DAWNTRAIL
+    std::array<glm::mat3x4, JOINT_MATRIX_SIZE_DAWNTRAIL> boneData; // JOINT_MATRIX_SIZE_DAWNTRAIL
     std::vector<RenderMaterial> materials;
     bool skinned = false;
 

renderer/include/shaderstructs.h

@@ -22,8 +22,7 @@ struct CameraParameter {
     glm::mat4 m_unknown4; // noooo idea
 };
 
-const int JOINT_MATRIX_SIZE_ARR = 64;
-const int JOINT_MATRIX_SIZE_DAWNTRAIL = 768;
+const int JOINT_MATRIX_SIZE_DAWNTRAIL = 256;
 
 struct CameraLight {
     glm::vec4 m_DiffuseSpecular;

renderer/shaders/mesh.vert

@@ -28,7 +28,7 @@ layout(std430, push_constant) uniform PushConstant {
 };
 
 layout(std430, binding = 2) buffer readonly BoneInformation {
-    mat4 bones[768];
+    mat3x4 bones[256];
 };
 
 void main() {

renderer/shaders/mesh.vert.spv

@@ -28,14 +28,14 @@ layout(std430, push_constant) uniform PushConstant {
 };
 
 layout(binding = 2) uniform BoneInformation {
-    mat4 bones[768];
+    mat3x4 bones[256];
 };
 
 void main() {
-    mat4 BoneTransform = bones[boneOffset + inBoneIds[0]] * inBoneWeights[0];
-    BoneTransform += bones[boneOffset + inBoneIds[1]] * inBoneWeights[1];
-    BoneTransform += bones[boneOffset + inBoneIds[2]] * inBoneWeights[2];
-    BoneTransform += bones[boneOffset + inBoneIds[3]] * inBoneWeights[3];
+    mat4 BoneTransform = mat4(bones[boneOffset + inBoneIds[0]]) * inBoneWeights[0];
+    BoneTransform += mat4(bones[boneOffset + inBoneIds[1]]) * inBoneWeights[1];
+    BoneTransform += mat4(bones[boneOffset + inBoneIds[2]]) * inBoneWeights[2];
+    BoneTransform += mat4(bones[boneOffset + inBoneIds[3]]) * inBoneWeights[3];
 
     BoneTransform = model * BoneTransform;
 

renderer/shaders/skinned.vert

@@ -572,7 +572,7 @@ void RenderManager::reloadDrawObject(DrawObject &DrawObject, uint32_t lod)
         DrawObject.parts.push_back(renderPart);
     }
 
-    const size_t bufferSize = sizeof(glm::mat4) * JOINT_MATRIX_SIZE_DAWNTRAIL;
+    const size_t bufferSize = sizeof(glm::mat3x4) * JOINT_MATRIX_SIZE_DAWNTRAIL;
     DrawObject.boneInfoBuffer = m_device->createBuffer(bufferSize, VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT);
 }
 

renderer/shaders/skinned.vert.spv

@@ -7,6 +7,7 @@
 #include "camera.h"
 #include "device.h"
 #include "drawobject.h"
+#include "shaderstructs.h"
 #include "swapchain.h"
 
 SimpleRenderer::SimpleRenderer(Device &device)
@@ -88,7 +89,7 @@ void SimpleRenderer::render(VkCommandBuffer commandBuffer, Camera &camera, Scene
 
         // copy bone data
         {
-            const size_t bufferSize = sizeof(glm::mat4) * 768;
+            const size_t bufferSize = sizeof(glm::mat3x4) * JOINT_MATRIX_SIZE_DAWNTRAIL;
             void *mapped_data = nullptr;
             vkMapMemory(m_device.device, model.sourceObject->boneInfoBuffer.memory, 0, bufferSize, 0, &mapped_data);
 
@@ -467,7 +468,7 @@ VkDescriptorSet SimpleRenderer::createDescriptorFor(const DrawObject &model, con
         return VK_NULL_HANDLE;
     }
 
-    const size_t bufferSize = sizeof(glm::mat4) * 768;
+    const size_t bufferSize = sizeof(glm::mat4) * JOINT_MATRIX_SIZE_DAWNTRAIL;
 
     std::vector<VkWriteDescriptorSet> writes;