From cc6b0b7834951c80a77b4331a80759f74212bbc0 Mon Sep 17 00:00:00 2001 From: ankitgamezop Date: Sat, 19 Feb 2022 23:16:20 +0530 Subject: [PATCH] Fixed errors in skeletal animation code --- CMakeLists.txt | 2 +- includes/learnopengl/animator.h | 8 ++++---- includes/learnopengl/bone.h | 2 +- src/8.guest/2020/skeletal_animation/anim_model.fs | 4 ++-- src/8.guest/2020/skeletal_animation/anim_model.vs | 4 ++-- .../2020/skeletal_animation/skeletal_animation.cpp | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c61a75..1f2fd4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -171,7 +171,7 @@ set(7.in_practice set(GUEST_ARTICLES 8.guest/2020/oit - #8.guest/2020/skeletal_animation + 8.guest/2020/skeletal_animation 8.guest/2021/1.scene/1.scene_graph 8.guest/2021/1.scene/2.frustum_culling 8.guest/2021/2.csm diff --git a/includes/learnopengl/animator.h b/includes/learnopengl/animator.h index b0b1b27..2936559 100644 --- a/includes/learnopengl/animator.h +++ b/includes/learnopengl/animator.h @@ -22,7 +22,7 @@ public: m_FinalBoneMatrices.push_back(glm::mat4(1.0f)); } - void Animator::UpdateAnimation(float dt) + void UpdateAnimation(float dt) { m_DeltaTime = dt; if (m_CurrentAnimation) @@ -33,13 +33,13 @@ public: } } - void Animator::PlayAnimation(Animation* pAnimation) + void PlayAnimation(Animation* pAnimation) { m_CurrentAnimation = pAnimation; m_CurrentTime = 0.0f; } - void Animator::CalculateBoneTransform(const AssimpNodeData* node, glm::mat4 parentTransform) + void CalculateBoneTransform(const AssimpNodeData* node, glm::mat4 parentTransform) { std::string nodeName = node->name; glm::mat4 nodeTransform = node->transformation; @@ -77,4 +77,4 @@ private: float m_CurrentTime; float m_DeltaTime; -}; \ No newline at end of file +}; diff --git a/includes/learnopengl/bone.h b/includes/learnopengl/bone.h index e562041..8e48b16 100644 --- a/includes/learnopengl/bone.h +++ b/includes/learnopengl/bone.h @@ -160,7 +160,7 @@ private: } - glm::mat4 Bone::InterpolateScaling(float animationTime) + glm::mat4 InterpolateScaling(float animationTime) { if (1 == m_NumScalings) return glm::scale(glm::mat4(1.0f), m_Scales[0].scale); diff --git a/src/8.guest/2020/skeletal_animation/anim_model.fs b/src/8.guest/2020/skeletal_animation/anim_model.fs index 1835b23..c3e39b6 100644 --- a/src/8.guest/2020/skeletal_animation/anim_model.fs +++ b/src/8.guest/2020/skeletal_animation/anim_model.fs @@ -1,4 +1,4 @@ -#version 430 core +#version 330 core out vec4 FragColor; in vec2 TexCoords; @@ -8,4 +8,4 @@ uniform sampler2D texture_diffuse1; void main() { FragColor = texture(texture_diffuse1, TexCoords); -} \ No newline at end of file +} diff --git a/src/8.guest/2020/skeletal_animation/anim_model.vs b/src/8.guest/2020/skeletal_animation/anim_model.vs index 654c57e..552adb2 100644 --- a/src/8.guest/2020/skeletal_animation/anim_model.vs +++ b/src/8.guest/2020/skeletal_animation/anim_model.vs @@ -1,4 +1,4 @@ -#version 430 core +#version 330 core layout(location = 0) in vec3 pos; layout(location = 1) in vec3 norm; @@ -36,4 +36,4 @@ void main() mat4 viewModel = view * model; gl_Position = projection * viewModel * totalPosition; TexCoords = tex; -} \ No newline at end of file +} diff --git a/src/8.guest/2020/skeletal_animation/skeletal_animation.cpp b/src/8.guest/2020/skeletal_animation/skeletal_animation.cpp index e933d5d..889e316 100644 --- a/src/8.guest/2020/skeletal_animation/skeletal_animation.cpp +++ b/src/8.guest/2020/skeletal_animation/skeletal_animation.cpp @@ -124,7 +124,7 @@ int main() ourShader.setMat4("projection", projection); ourShader.setMat4("view", view); - auto transforms = animator.GetPoseTransforms(); + auto transforms = animator.GetFinalBoneMatrices(); for (int i = 0; i < transforms.size(); ++i) ourShader.setMat4("finalBonesTransformations[" + std::to_string(i) + "]", transforms[i]);