summaryrefslogtreecommitdiff
path: root/src/helpers
diff options
context:
space:
mode:
authorvaxerski <43317083+vaxerski@users.noreply.github.com>2023-07-20 19:26:10 +0200
committervaxerski <43317083+vaxerski@users.noreply.github.com>2023-07-20 19:26:10 +0200
commit6c1f4faff2602a6d834d8f641a8a39783bbb9465 (patch)
treeb7c662026ce9b584baf4a2d1d65d02464dd49d79 /src/helpers
parent7940f779e9dd670157932ce17a872c14747ad490 (diff)
animationmgr: avoid looping over all avars in favor of only active ones
Diffstat (limited to 'src/helpers')
-rw-r--r--src/helpers/AnimatedVariable.cpp16
-rw-r--r--src/helpers/AnimatedVariable.hpp6
2 files changed, 20 insertions, 2 deletions
diff --git a/src/helpers/AnimatedVariable.cpp b/src/helpers/AnimatedVariable.cpp
index 5b98e426..2961439d 100644
--- a/src/helpers/AnimatedVariable.cpp
+++ b/src/helpers/AnimatedVariable.cpp
@@ -51,13 +51,14 @@ CAnimatedVariable::~CAnimatedVariable() {
}
void CAnimatedVariable::unregister() {
- g_pAnimationManager->m_lAnimatedVariables.remove(this);
+ std::erase_if(g_pAnimationManager->m_vAnimatedVariables, [&](const auto& other) { return other == this; });
m_bIsRegistered = false;
+ disconnectFromActive();
}
void CAnimatedVariable::registerVar() {
if (!m_bIsRegistered)
- g_pAnimationManager->m_lAnimatedVariables.push_back(this);
+ g_pAnimationManager->m_vAnimatedVariables.push_back(this);
m_bIsRegistered = true;
}
@@ -78,4 +79,15 @@ float CAnimatedVariable::getCurveValue() {
return 1.f;
return g_pAnimationManager->getBezier(m_pConfig->pValues->internalBezier)->getYForPoint(SPENT);
+}
+
+void CAnimatedVariable::connectToActive() {
+ if (!m_bIsConnectedToActive)
+ g_pAnimationManager->m_vActiveAnimatedVariables.push_back(this);
+ m_bIsConnectedToActive = true;
+}
+
+void CAnimatedVariable::disconnectFromActive() {
+ std::erase_if(g_pAnimationManager->m_vActiveAnimatedVariables, [&](const auto& other) { return other == this; });
+ m_bIsConnectedToActive = false;
} \ No newline at end of file
diff --git a/src/helpers/AnimatedVariable.hpp b/src/helpers/AnimatedVariable.hpp
index ccba625d..d234dce2 100644
--- a/src/helpers/AnimatedVariable.hpp
+++ b/src/helpers/AnimatedVariable.hpp
@@ -259,9 +259,14 @@ class CAnimatedVariable {
std::function<void(void* thisptr)> m_fBeginCallback;
std::function<void(void* thisptr)> m_fUpdateCallback;
+ bool m_bIsConnectedToActive = false;
+ void connectToActive();
+ void disconnectFromActive();
+
// methods
void onAnimationEnd() {
m_bIsBeingAnimated = false;
+ disconnectFromActive();
if (m_fEndCallback) {
// loading m_bRemoveEndAfterRan before calling the callback allows the callback to delete this animation safely if it is false.
@@ -274,6 +279,7 @@ class CAnimatedVariable {
void onAnimationBegin() {
m_bIsBeingAnimated = true;
+ connectToActive();
if (m_fBeginCallback) {
m_fBeginCallback(this);