claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code cleanup

Browse source
This commit is contained in:
Sascha Willems 2020-05-15 07:22:01 +02:00
parent 149ff8f94e
commit 451c895525
2 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
examples/gltfskinning/gltfskinning.cpp
View file

@ -30,7 +30,6 @@
*/ */
/* /*
Get a node's local matrix from the current translation, rotation and scale values Get a node's local matrix from the current translation, rotation and scale values
These are calculated from the current animation an need to be calculated dynamically These are calculated from the current animation an need to be calculated dynamically
@ -59,7 +58,7 @@ VulkanglTFModel::~VulkanglTFModel()
/* /*
glTF loading functions glTF loading functions
The following functions take a glTF input model loaded via tinyglTF and convert all required data into our own structure The following functions take a glTF input model loaded via tinyglTF and converts all required data into our own structures
*/ */
void VulkanglTFModel::loadImages(tinygltf::Model& input) void VulkanglTFModel::loadImages(tinygltf::Model& input)
@ -441,31 +440,22 @@ void VulkanglTFModel::loadNode(const tinygltf::Node& inputNode, const tinygltf::
/* /*
glTF vertex skinning functions glTF vertex skinning functions
*/ */
// @todo: Comment
glm::mat4 VulkanglTFModel::getNodeMatrix(VulkanglTFModel::Node* node) { glm::mat4 VulkanglTFModel::getNodeMatrix(VulkanglTFModel::Node* node) {
// Pass the node's matrix via push constanst
// Traverse the node hierarchy to the top-most parent to get the final matrix of the current node // Traverse the node hierarchy to the top-most parent to get the final matrix of the current node
glm::mat4 nodeMatrix = node->matrix; glm::mat4 nodeMatrix = node->getLocalMatrix();
VulkanglTFModel::Node* currentParent = node->parent; VulkanglTFModel::Node* currentParent = node->parent;
while (currentParent) { while (currentParent) {
nodeMatrix = currentParent->matrix * nodeMatrix; nodeMatrix = currentParent->getLocalMatrix() * nodeMatrix;
currentParent = currentParent->parent; currentParent = currentParent->parent;
} }
return nodeMatrix; return nodeMatrix;
} }
glm::mat4 VulkanglTFModel::getNodeMatrix2(VulkanglTFModel::Node* node) {
glm::mat4 m = node->getLocalMatrix();
VulkanglTFModel::Node* p = node->parent;
while (p) {
m = p->getLocalMatrix() * m;
p = p->parent;
}
return m;
}
void VulkanglTFModel::updateJoints(VulkanglTFModel::Node* node) { void VulkanglTFModel::updateJoints(VulkanglTFModel::Node* node) {
if (node->skin > -1) { if (node->skin > -1) {
glm::mat4 m = getNodeMatrix2(node); glm::mat4 m = getNodeMatrix(node);
// Update joint matrices // Update joint matrices
glm::mat4 inverseTransform = glm::inverse(m); glm::mat4 inverseTransform = glm::inverse(m);
Skin skin = skins[node->skin]; Skin skin = skins[node->skin];
@ -474,7 +464,7 @@ void VulkanglTFModel::updateJoints(VulkanglTFModel::Node* node) {
std::vector<glm::mat4> jointMatrices(numJoints); std::vector<glm::mat4> jointMatrices(numJoints);
// @todo: bail out if model has more joints than shader can handle // @todo: bail out if model has more joints than shader can handle
for (size_t i = 0; i < numJoints; i++) { for (size_t i = 0; i < numJoints; i++) {
jointMatrices[i] = getNodeMatrix2(skin.joints[i]) * skin.inverseBindMatrices[i]; jointMatrices[i] = getNodeMatrix(skin.joints[i]) * skin.inverseBindMatrices[i];
jointMatrices[i] = inverseTransform * jointMatrices[i]; jointMatrices[i] = inverseTransform * jointMatrices[i];
} }
// Update ssbo // Update ssbo

1
examples/gltfskinning/gltfskinning.h
View file

@ -199,7 +199,6 @@ public:
void loadAnimations(tinygltf::Model& input); void loadAnimations(tinygltf::Model& input);
void loadNode(const tinygltf::Node& inputNode, const tinygltf::Model& input, VulkanglTFModel::Node* parent, uint32_t nodeIndex, std::vector<uint32_t>& indexBuffer, std::vector<VulkanglTFModel::Vertex>& vertexBuffer); void loadNode(const tinygltf::Node& inputNode, const tinygltf::Model& input, VulkanglTFModel::Node* parent, uint32_t nodeIndex, std::vector<uint32_t>& indexBuffer, std::vector<VulkanglTFModel::Vertex>& vertexBuffer);
glm::mat4 getNodeMatrix(VulkanglTFModel::Node* node); glm::mat4 getNodeMatrix(VulkanglTFModel::Node* node);
glm::mat4 getNodeMatrix2(VulkanglTFModel::Node* node);
void updateJoints(VulkanglTFModel::Node* node); void updateJoints(VulkanglTFModel::Node* node);
void updateAnimation(float deltaTime); void updateAnimation(float deltaTime);
void drawNode(VkCommandBuffer commandBuffer, VkPipelineLayout pipelineLayout, VulkanglTFModel::Node node); void drawNode(VkCommandBuffer commandBuffer, VkPipelineLayout pipelineLayout, VulkanglTFModel::Node node);