hyprwm/hyprutils
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprutils.git synced 2025-02-05 09:19:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

animations: fix adding/removing vars during ::tick (#35)

Browse source
This commit is contained in:
Maximilian Seidler 2025-01-11 16:37:12 +00:00 committed by GitHub
parent 5dd4f4a9f7
commit 72dfbf5296
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 63 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/hyprutils/animation/AnimatedVariable.hpp
View file

@ -148,10 +148,10 @@ namespace Hyprutils {
m_Value = m_Goal; m_Value = m_Goal;
m_bIsBeingAnimated = false;
onUpdate(); onUpdate();
m_bIsBeingAnimated = false;
if (endCallback) if (endCallback)
onAnimationEnd(); onAnimationEnd();
} }

82
tests/animation.cpp
View file

@ -43,20 +43,21 @@ CAnimationConfigTree animationTree;
class CMyAnimationManager : public CAnimationManager { class CMyAnimationManager : public CAnimationManager {
public: public:
void tick() { void tick() {
for (auto const& av : m_vActiveAnimatedVariables) { for (size_t i = 0; i < m_vActiveAnimatedVariables.size(); i++) {
const auto PAV = av.lock(); const auto PAV = m_vActiveAnimatedVariables[i].lock();
if (!PAV || !PAV->ok()) if (!PAV || !PAV->ok())
continue; continue;
const auto SPENT = PAV->getPercent(); const auto SPENT = PAV->getPercent();
const auto PBEZIER = getBezier(PAV->getBezierName()); const auto PBEZIER = getBezier(PAV->getBezierName());
const auto POINTY = PBEZIER->getYForPoint(SPENT);
if (POINTY >= 1.f || !PAV->enabled()) { if (SPENT >= 1.f || !PAV->enabled()) {
PAV->warp(); PAV->warp();
continue; continue;
} }
const auto POINTY = PBEZIER->getYForPoint(SPENT);
switch (PAV->m_Type) { switch (PAV->m_Type) {
case eAVTypes::INT: { case eAVTypes::INT: {
auto avInt = dynamic_cast<CAnimatedVariable<int>*>(PAV.get()); auto avInt = dynamic_cast<CAnimatedVariable<int>*>(PAV.get());
@ -79,7 +80,7 @@ class CMyAnimationManager : public CAnimationManager {
} break; } break;
} }
av->onUpdate(); PAV->onUpdate();
} }
tickDone(); tickDone();
@ -253,34 +254,73 @@ int main(int argc, char** argv, char** envp) {
EXPECT(s.m_iA->getStyle(), ""); EXPECT(s.m_iA->getStyle(), "");
EXPECT(s.m_iA->getPercent(), 1.f); EXPECT(s.m_iA->getPercent(), 1.f);
// Reset
animationTree.setConfigForNode("default", 1, 1, "default");
// //
// Test callbacks // Test callbacks
// //
bool beginCallbackRan = false; int beginCallbackRan = 0;
bool updateCallbackRan = false; int updateCallbackRan = 0;
bool endCallbackRan = false; int endCallbackRan = 0;
s.m_iA->setCallbackOnBegin([&beginCallbackRan](WP<CBaseAnimatedVariable> pav) { beginCallbackRan = true; }); s.m_iA->setCallbackOnBegin([&beginCallbackRan](WP<CBaseAnimatedVariable> pav) { beginCallbackRan++; });
s.m_iA->setUpdateCallback([&updateCallbackRan](WP<CBaseAnimatedVariable> pav) { updateCallbackRan = true; }); s.m_iA->setUpdateCallback([&updateCallbackRan](WP<CBaseAnimatedVariable> pav) { updateCallbackRan++; });
s.m_iA->setCallbackOnEnd([&endCallbackRan](WP<CBaseAnimatedVariable> pav) { endCallbackRan = true; }, false); s.m_iA->setCallbackOnEnd([&endCallbackRan](WP<CBaseAnimatedVariable> pav) { endCallbackRan++; }, false);
s.m_iA->setValueAndWarp(42); s.m_iA->setValueAndWarp(42);
EXPECT(beginCallbackRan, false); EXPECT(beginCallbackRan, 0);
EXPECT(updateCallbackRan, true); EXPECT(updateCallbackRan, 1);
EXPECT(endCallbackRan, true); EXPECT(endCallbackRan, 2); // first called when setting the callback, then when warping.
beginCallbackRan = false;
updateCallbackRan = false;
endCallbackRan = false;
*s.m_iA = 1337; *s.m_iA = 1337;
while (gAnimationManager.shouldTickForNext()) { while (gAnimationManager.shouldTickForNext()) {
gAnimationManager.tick(); gAnimationManager.tick();
} }
EXPECT(beginCallbackRan, true); EXPECT(beginCallbackRan, 1);
EXPECT(updateCallbackRan, true); EXPECT(updateCallbackRan > 2, true);
EXPECT(endCallbackRan, true); EXPECT(endCallbackRan, 3);
std::vector<PANIMVAR<int>> vars;
for (int i = 0; i < 10; i++) {
vars.resize(vars.size() + 1);
gAnimationManager.createAnimation(1, vars.back(), "default");
*vars.back() = 1337;
}
// test adding / removing vars during a tick
s.m_iA->resetAllCallbacks();
s.m_iA->setUpdateCallback([&vars](WP<CBaseAnimatedVariable> v) {
if (v.lock() != vars.back())
vars.back()->warp();
});
s.m_iA->setCallbackOnEnd([&s, &vars](auto) {
vars.resize(vars.size() + 1);
gAnimationManager.createAnimation(1, vars.back(), "default");
*vars.back() = 1337;
});
*s.m_iA = 1000000;
while (gAnimationManager.shouldTickForNext()) {
gAnimationManager.tick();
}
EXPECT(s.m_iA->value(), 1000000);
// all vars should be set to 1337
EXPECT(std::find_if(vars.begin(), vars.end(), [](const auto& v) { return v->value() != 1337; }) == vars.end(), true);
// test one-time callbacks
s.m_iA->resetAllCallbacks();
s.m_iA->setCallbackOnEnd([&endCallbackRan](auto) { endCallbackRan++; }, true);
EXPECT(endCallbackRan, 4);
s.m_iA->setValueAndWarp(10);
EXPECT(endCallbackRan, 4);
EXPECT(s.m_iA->value(), 10);
return ret; return ret;
} }