diff --git a/sdk b/sdk index 86759bb7..de8fa400 160000 --- a/sdk +++ b/sdk @@ -1 +1 @@ -Subproject commit 86759bb726af6d40a7f16ff2f896d62ecc0f11c6 +Subproject commit de8fa4009831c954d99bc5d186b5e5bf82068f86 diff --git a/src/eter_render/ActorInstance.cpp b/src/eter_render/ActorInstance.cpp index 1ef5fe1d..da6522ac 100644 --- a/src/eter_render/ActorInstance.cpp +++ b/src/eter_render/ActorInstance.cpp @@ -280,6 +280,7 @@ bool ActorInstance::PlayMotion(MotionType type, bool loop) { m_animTime = 0.0f; m_motionDuration = std::max(0.1f, m_model->GetAnimationDuration()); m_loopMotion = loop; + m_model->SetAnimationLoop(loop, loop); if (type == MotionType::Attack || type == MotionType::ComboAttack1 || type == MotionType::ComboAttack2 || type == MotionType::ComboAttack3 || diff --git a/src/eter_render/Gr2ModelRenderer.cpp b/src/eter_render/Gr2ModelRenderer.cpp index e3131efc..1e9f6570 100644 --- a/src/eter_render/Gr2ModelRenderer.cpp +++ b/src/eter_render/Gr2ModelRenderer.cpp @@ -99,6 +99,10 @@ float Gr2ModelInstance::GetAnimationDuration() const { return m_impl ? m_impl->GetAnimationDuration() : 0.0f; } +void Gr2ModelInstance::SetAnimationLoop(bool underflow_loop, bool overflow_loop) { + if (m_impl) m_impl->SetAnimationLoop(underflow_loop, overflow_loop); +} + bool Gr2ModelInstance::GetBoneWorldTransform(const std::string& bone_name, float* out_matrix, float animation_time) const { return m_impl ? m_impl->GetBoneWorldTransform(bone_name, out_matrix, animation_time) : false; } diff --git a/src/eter_render/Gr2ModelRenderer.h b/src/eter_render/Gr2ModelRenderer.h index 2dd24b55..29b6b2d8 100644 --- a/src/eter_render/Gr2ModelRenderer.h +++ b/src/eter_render/Gr2ModelRenderer.h @@ -25,6 +25,8 @@ public: // Load external animation (.gr2) to animate this model bool LoadExternalAnimation(const std::string& anim_filepath); float GetAnimationDuration() const; + // Granny loop window: looping motions pass (true, true) so the seam samples across loops. + void SetAnimationLoop(bool underflow_loop, bool overflow_loop); // Bone queries & attachments bool GetBoneWorldTransform(const std::string& bone_name, float* out_matrix, float animation_time = -1.0f) const;