From 9d3bc5ac68148a53cba3315a3ae884b9a2a03b59 Mon Sep 17 00:00:00 2001 From: Roxeena Date: Wed, 28 May 2025 15:28:09 +0200 Subject: [PATCH] Update the parent transform class in Timeline updates fixes #3691 --- modules/base/rotation/timelinerotation.cpp | 2 ++ modules/base/scale/timelinescale.cpp | 2 ++ modules/base/translation/multitranslation.cpp | 8 ++++---- modules/base/translation/timelinetranslation.cpp | 2 ++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/base/rotation/timelinerotation.cpp b/modules/base/rotation/timelinerotation.cpp index 2643ec7646..b40b4ebbcc 100644 --- a/modules/base/rotation/timelinerotation.cpp +++ b/modules/base/rotation/timelinerotation.cpp @@ -93,6 +93,8 @@ void TimelineRotation::update(const UpdateData& data) { if (KeyframePointer next = _timeline.firstKeyframeAfter(now, true); next) { next->data->update(data); } + + Rotation::update(data); } glm::dmat3 TimelineRotation::matrix(const UpdateData& data) const { diff --git a/modules/base/scale/timelinescale.cpp b/modules/base/scale/timelinescale.cpp index 0f2c832b66..2d4c6938ec 100644 --- a/modules/base/scale/timelinescale.cpp +++ b/modules/base/scale/timelinescale.cpp @@ -91,6 +91,8 @@ void TimelineScale::update(const UpdateData& data) { if (KeyframePointer next = _timeline.firstKeyframeAfter(now, true); next) { next->data->update(data); } + + Scale::update(data); } glm::dvec3 TimelineScale::scaleValue(const UpdateData& data) const { diff --git a/modules/base/translation/multitranslation.cpp b/modules/base/translation/multitranslation.cpp index 854fd779ba..2742acff10 100644 --- a/modules/base/translation/multitranslation.cpp +++ b/modules/base/translation/multitranslation.cpp @@ -65,15 +65,15 @@ MultiTranslation::MultiTranslation(const ghoul::Dictionary& dictionary) } void MultiTranslation::update(const UpdateData& data) { - for (const ghoul::mm_unique_ptr& rot : _translations) { - rot->update(data); + for (const ghoul::mm_unique_ptr& translation : _translations) { + translation->update(data); } } glm::dvec3 MultiTranslation::position(const UpdateData& data) const { glm::dvec3 res = glm::dvec3(1.0); - for (const ghoul::mm_unique_ptr& rot : _translations) { - res += rot->position(data); + for (const ghoul::mm_unique_ptr& translation : _translations) { + res += translation->position(data); } return res; } diff --git a/modules/base/translation/timelinetranslation.cpp b/modules/base/translation/timelinetranslation.cpp index 690d820e36..bcf417fbe9 100644 --- a/modules/base/translation/timelinetranslation.cpp +++ b/modules/base/translation/timelinetranslation.cpp @@ -93,6 +93,8 @@ void TimelineTranslation::update(const UpdateData& data) { if (KeyframePointer next = _timeline.firstKeyframeAfter(now, true); next) { next->data->update(data); } + + Translation::update(data); } glm::dvec3 TimelineTranslation::position(const UpdateData& data) const {