Skip to content

Commit

Permalink
animationmgr: fix damage
Browse files Browse the repository at this point in the history
  • Loading branch information
@PaideiaDilemma
PaideiaDilemma committed Dec 28, 2024
1 parent 1b15119 commit 263bfec
Show file tree
Hide file tree
Showing 2 changed files with 92 additions and 75 deletions.
161 changes: 92 additions & 69 deletions src/managers/AnimationManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,78 +71,12 @@ void updateColorVariable(CAnimatedVariable<CHyprColor>* pav, const float POINTY,
pav->value() = {lerped, lerp(pav->begun().a, pav->goal().a, POINTY)};
}

void CHyprAnimationManager::tick() {
static std::chrono::time_point lastTick = std::chrono::high_resolution_clock::now();
m_fLastTickTime = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::high_resolution_clock::now() - lastTick).count() / 1000.0;
lastTick = std::chrono::high_resolution_clock::now();

static auto PANIMENABLED = CConfigValue<Hyprlang::INT>("animations:enabled");
for (auto const& pav : m_vActiveAnimatedVariables) {
const auto PAV = pav.lock();
// for disabled anims just warp
bool warp = !*PANIMENABLED || !PAV->enabled();

const auto SPENT = PAV->getPercent();
const auto PBEZIER = getBezier(PAV->getBezierName());
const auto POINTY = PBEZIER->getYForPoint(SPENT);

switch (PAV->m_Type) {
case AVARTYPE_FLOAT: {
auto pTypedAV = dynamic_cast<CAnimatedVariable<float>*>(PAV.get());
RASSERT(pTypedAV, "Failed to upcast animated float");
warp = warp || handleContext(pTypedAV->m_Context);
updateVariable(pTypedAV, POINTY, warp);
} break;
case AVARTYPE_VECTOR: {
auto pTypedAV = dynamic_cast<CAnimatedVariable<Vector2D>*>(PAV.get());
RASSERT(pTypedAV, "Failed to upcast animated Vector2D");
warp = warp || handleContext(pTypedAV->m_Context);
updateVariable(pTypedAV, POINTY, warp);
} break;
case AVARTYPE_COLOR: {
auto pTypedAV = dynamic_cast<CAnimatedVariable<CHyprColor>*>(PAV.get());
RASSERT(pTypedAV, "Failed to upcast animated CHyprColor");
warp = warp || handleContext(pTypedAV->m_Context);
updateColorVariable(pTypedAV, POINTY, warp);
} break;
default: UNREACHABLE();
}

PAV->onUpdate();
}

tickDone();
}

bool CHyprAnimationManager::handleContext(const SAnimationContext& ctx) {
PHLWINDOW PWINDOW = ctx.pWindow.lock();
PHLWORKSPACE PWORKSPACE = ctx.pWorkspace.lock();
PHLLS PLAYER = ctx.pLayer.lock();

if (ctx.eDamagePolicy == AVARDAMAGE_NONE)
return false;

if (PWINDOW) {
g_pAnimationManager->damageAnimatedWindow(PWINDOW, ctx.eDamagePolicy);
return PWINDOW->m_sWindowData.noAnim.valueOr(false);
} else if (PWORKSPACE)
g_pAnimationManager->damageAnimatedWorkspace(PWORKSPACE, ctx.eDamagePolicy);

else if (PLAYER) {
g_pAnimationManager->damageAnimatedLayer(PLAYER, ctx.eDamagePolicy);
return PLAYER->noAnimations;
}

return false;
}

void CHyprAnimationManager::damageAnimatedWindow(PHLWINDOW PWINDOW, eAVarDamagePolicy policy) {
static void damageAnimatedWindow(PHLWINDOW PWINDOW, eAVarDamagePolicy policy) {
const bool VISIBLE = PWINDOW && PWINDOW->m_pWorkspace ? PWINDOW->m_pWorkspace->isVisible() : true;
if (!VISIBLE)
return;

if (policy == AVARDAMAGE_ENTIRE) {
Debug::log(LOG, "Damaging entire window {}", PWINDOW->m_szTitle);
PWINDOW->updateWindowDecos();
g_pHyprRenderer->damageWindow(PWINDOW);
} else if (policy == AVARDAMAGE_BORDER) {
Expand All @@ -161,7 +95,7 @@ void CHyprAnimationManager::damageAnimatedWindow(PHLWINDOW PWINDOW, eAVarDamageP
g_pCompositor->scheduleFrameForMonitor(PMONITOR, Aquamarine::IOutput::AQ_SCHEDULE_ANIMATION);
}

void CHyprAnimationManager::damageAnimatedWorkspace(PHLWORKSPACE PWORKSPACE, eAVarDamagePolicy policy) {
static void damageAnimatedWorkspace(PHLWORKSPACE PWORKSPACE, eAVarDamagePolicy policy) {
RASSERT(policy == AVARDAMAGE_ENTIRE, "Workspace animations should be AVARDAMAGE_ENTIRE");

PHLMONITOR PMONITOR = PWORKSPACE->m_pMonitor.lock();
Expand Down Expand Up @@ -202,7 +136,7 @@ void CHyprAnimationManager::damageAnimatedWorkspace(PHLWORKSPACE PWORKSPACE, eAV
g_pCompositor->scheduleFrameForMonitor(PMONITOR, Aquamarine::IOutput::AQ_SCHEDULE_ANIMATION);
}

void CHyprAnimationManager::damageAnimatedLayer(PHLLS PLAYER, eAVarDamagePolicy policy) {
static void damageAnimatedLayer(PHLLS PLAYER, eAVarDamagePolicy policy) {
RASSERT(policy == AVARDAMAGE_ENTIRE, "Layer animations should be AVARDAMAGE_ENTIRE");

// "some fucking layers miss 1 pixel???" -- vaxry
Expand All @@ -220,6 +154,95 @@ void CHyprAnimationManager::damageAnimatedLayer(PHLLS PLAYER, eAVarDamagePolicy
g_pCompositor->scheduleFrameForMonitor(PMONITOR, Aquamarine::IOutput::AQ_SCHEDULE_ANIMATION);
}

static void damageBefore(const SAnimationContext& ctx) {
PHLWINDOW PWINDOW = ctx.pWindow.lock();
PHLWORKSPACE PWORKSPACE = ctx.pWorkspace.lock();
PHLLS PLAYER = ctx.pLayer.lock();

if (ctx.eDamagePolicy == AVARDAMAGE_NONE)
return;

if (PWINDOW) {
damageAnimatedWindow(PWINDOW, ctx.eDamagePolicy);
} else if (PWORKSPACE)
damageAnimatedWorkspace(PWORKSPACE, ctx.eDamagePolicy);
else if (PLAYER) {
damageAnimatedLayer(PLAYER, ctx.eDamagePolicy);
}
}

static void damageAfter(const SAnimationContext& ctx) {
PHLWINDOW PWINDOW = ctx.pWindow.lock();

if (PWINDOW) {
if (ctx.eDamagePolicy == AVARDAMAGE_ENTIRE) {
PWINDOW->updateWindowDecos();
g_pHyprRenderer->damageWindow(PWINDOW);
}
}
}

static bool shouldWarp(const SAnimationContext& ctx) {
PHLWINDOW PWINDOW = ctx.pWindow.lock();
PHLLS PLAYER = ctx.pLayer.lock();

if (PWINDOW)
return PWINDOW->m_sWindowData.noAnim.valueOr(false);
else if (PLAYER)
return PLAYER->noAnimations;

return false;
}

void CHyprAnimationManager::tick() {
static std::chrono::time_point lastTick = std::chrono::high_resolution_clock::now();
m_fLastTickTime = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::high_resolution_clock::now() - lastTick).count() / 1000.0;
lastTick = std::chrono::high_resolution_clock::now();

static auto PANIMENABLED = CConfigValue<Hyprlang::INT>("animations:enabled");
for (auto const& pav : m_vActiveAnimatedVariables) {
const auto PAV = pav.lock();
// for disabled anims just warp
bool warp = !*PANIMENABLED || !PAV->enabled();

const auto SPENT = PAV->getPercent();
const auto PBEZIER = getBezier(PAV->getBezierName());
const auto POINTY = PBEZIER->getYForPoint(SPENT);

switch (PAV->m_Type) {
case AVARTYPE_FLOAT: {
auto pTypedAV = dynamic_cast<CAnimatedVariable<float>*>(PAV.get());
RASSERT(pTypedAV, "Failed to upcast animated float");

damageBefore(pTypedAV->m_Context);
updateVariable(pTypedAV, POINTY, warp || shouldWarp(pTypedAV->m_Context));
damageAfter(pTypedAV->m_Context);
} break;
case AVARTYPE_VECTOR: {
auto pTypedAV = dynamic_cast<CAnimatedVariable<Vector2D>*>(PAV.get());
RASSERT(pTypedAV, "Failed to upcast animated Vector2D");

damageBefore(pTypedAV->m_Context);
updateVariable(pTypedAV, POINTY, warp || shouldWarp(pTypedAV->m_Context));
damageAfter(pTypedAV->m_Context);
} break;
case AVARTYPE_COLOR: {
auto pTypedAV = dynamic_cast<CAnimatedVariable<CHyprColor>*>(PAV.get());
RASSERT(pTypedAV, "Failed to upcast animated CHyprColor");

damageBefore(pTypedAV->m_Context);
updateColorVariable(pTypedAV, POINTY, warp || shouldWarp(pTypedAV->m_Context));
damageAfter(pTypedAV->m_Context);
} break;
default: UNREACHABLE();
}

PAV->onUpdate();
}

tickDone();
}

void CHyprAnimationManager::scheduleTick() {
if (m_bTickScheduled)
return;
Expand Down
6 changes: 0 additions & 6 deletions src/managers/AnimationManager.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ class CHyprAnimationManager : public Hyprutils::Animation::CAnimationManager {
pav->m_Context.pLayer = pLayer;
}

void damageAnimatedWindow(PHLWINDOW, eAVarDamagePolicy);
void damageAnimatedWorkspace(PHLWORKSPACE, eAVarDamagePolicy);
void damageAnimatedLayer(PHLLS, eAVarDamagePolicy);

void onWindowPostCreateClose(PHLWINDOW, bool close = false);

std::string styleValidInConfigVar(const std::string&, const std::string&);
Expand All @@ -63,8 +59,6 @@ class CHyprAnimationManager : public Hyprutils::Animation::CAnimationManager {
// Anim stuff
void animationPopin(PHLWINDOW, bool close = false, float minPerc = 0.f);
void animationSlide(PHLWINDOW, std::string force = "", bool close = false);

bool handleContext(const SAnimationContext&);
};

inline std::unique_ptr<CHyprAnimationManager> g_pAnimationManager;

0 comments on commit 263bfec

Please sign in to comment.