From 2f19925eef6dc37feefdc130588638ca1640de6e Mon Sep 17 00:00:00 2001 From: Tony Leinonen Date: Mon, 15 Mar 2021 13:43:06 +0200 Subject: Remove overriding code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ComponentManager code was overriding gotoSlide data which caused problems with slide changes. If check was forcing queued slide changes to slide 1 when object was first activated. Task-number: QT3DS-4221 Change-Id: I614fd5e50dc96db0930de860a90a5f99656293f3 Reviewed-by: Antti Määttä Reviewed-by: Tomi Korpipää --- src/runtime/Qt3DSActivationManager.cpp | 3 +-- src/runtime/Qt3DSComponentManager.cpp | 7 ------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/runtime/Qt3DSActivationManager.cpp b/src/runtime/Qt3DSActivationManager.cpp index f03eff1..9aa16f5 100644 --- a/src/runtime/Qt3DSActivationManager.cpp +++ b/src/runtime/Qt3DSActivationManager.cpp @@ -690,8 +690,7 @@ struct STimeContext // When the component is activated the first time go to the first slide // Subsequent activations should continue from the deactivated slide - if (theContextNode.GetCurrentSlide() == 0 - || inComponentManager.hasSlideChangeQueued(&theContextNode)) { + if (theContextNode.GetCurrentSlide() == 0) { inComponentManager.GotoSlideIndex(&theContextNode, 1, false); } inComponentManager.applyQueuedChanges(&theContextNode); diff --git a/src/runtime/Qt3DSComponentManager.cpp b/src/runtime/Qt3DSComponentManager.cpp index 03c7b2c..9bbff99 100644 --- a/src/runtime/Qt3DSComponentManager.cpp +++ b/src/runtime/Qt3DSComponentManager.cpp @@ -94,13 +94,6 @@ void CComponentManager::GotoSlideIndex(TElement *inComponent, } SComponentGotoSlideData theGotoSlideData(inGotoData); - - TComponentGotoSlideDataMap::iterator iter = m_ComponentInitialSlideMap.find(inComponent); - if (iter != m_ComponentInitialSlideMap.end()) { - theGotoSlideData = iter->second; - m_ComponentInitialSlideMap.erase(iter); - } - const UINT8 theCurrentSlideIndex = theComponent->GetCurrentSlide(); QString elementPath; -- cgit v1.2.3