summaryrefslogtreecommitdiff
path: root/src/render
diff options
context:
space:
mode:
authorVaxry <43317083+vaxerski@users.noreply.github.com>2025-08-16 20:02:15 +0100
committerGitHub <noreply@github.com>2025-08-16 20:02:15 +0100
commit3d4dc19412921864c25cd25e0cbffd6e1693c43c (patch)
tree0a0e54a2336fb408bbd7d3767682f33391c3fee3 /src/render
parent78c9e2080c800e9da0792b73ca436ef49384bfb7 (diff)
renderer: improve zoom in anims (#11453)
Removes `animations:first_launch_animation` as it's useless now
Diffstat (limited to 'src/render')
-rw-r--r--src/render/Renderer.cpp29
-rw-r--r--src/render/Renderer.hpp2
2 files changed, 2 insertions, 29 deletions
diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
index dfafbead..326f71bb 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -1186,8 +1186,6 @@ void CHyprRenderer::renderMonitor(PHLMONITOR pMonitor, bool commit) {
static auto PDAMAGEBLINK = CConfigValue<Hyprlang::INT>("debug:damage_blink");
static auto PDIRECTSCANOUT = CConfigValue<Hyprlang::INT>("render:direct_scanout");
static auto PVFR = CConfigValue<Hyprlang::INT>("misc:vfr");
- static auto PANIMENABLED = CConfigValue<Hyprlang::INT>("animations:enabled");
- static auto PFIRSTLAUNCHANIM = CConfigValue<Hyprlang::INT>("animations:first_launch_animation");
static auto PTEARINGENABLED = CConfigValue<Hyprlang::INT>("general:allow_tearing");
static int damageBlinkCleanup = 0; // because double-buffered
@@ -1202,28 +1200,6 @@ void CHyprRenderer::renderMonitor(PHLMONITOR pMonitor, bool commit) {
if (!*PDAMAGEBLINK)
damageBlinkCleanup = 0;
- static bool firstLaunch = true;
- static bool firstLaunchAnimActive = *PFIRSTLAUNCHANIM;
-
- float zoomInFactorFirstLaunch = 1.f;
-
- if (firstLaunch) {
- firstLaunch = false;
- m_renderTimer.reset();
- }
-
- if (m_renderTimer.getSeconds() < 1.5f && firstLaunchAnimActive) { // TODO: make the animation system more damage-flexible so that this can be migrated to there
- if (!*PANIMENABLED) {
- zoomInFactorFirstLaunch = 1.f;
- firstLaunchAnimActive = false;
- } else {
- zoomInFactorFirstLaunch = 2.f - g_pAnimationManager->getBezier("default")->getYForPoint(m_renderTimer.getSeconds() / 1.5);
- damageMonitor(pMonitor);
- }
- } else {
- firstLaunchAnimActive = false;
- }
-
if (*PDEBUGOVERLAY == 1) {
renderStart = std::chrono::high_resolution_clock::now();
g_pDebugOverlay->frameData(pMonitor);
@@ -1334,11 +1310,10 @@ void CHyprRenderer::renderMonitor(PHLMONITOR pMonitor, bool commit) {
else
g_pHyprOpenGL->m_renderData.mouseZoomFactor = 1.f;
- if (zoomInFactorFirstLaunch > 1.f) {
- g_pHyprOpenGL->m_renderData.mouseZoomFactor = zoomInFactorFirstLaunch;
+ if (pMonitor->m_zoomAnimProgress->isBeingAnimated()) {
+ g_pHyprOpenGL->m_renderData.mouseZoomFactor = 2.0 - pMonitor->m_zoomAnimProgress->value(); // 2x zoom -> 1x zoom
g_pHyprOpenGL->m_renderData.mouseZoomUseMouse = false;
g_pHyprOpenGL->m_renderData.useNearestNeighbor = false;
- pMonitor->m_forceFullFrames = 10;
}
CRegion damage, finalDamage;
diff --git a/src/render/Renderer.hpp b/src/render/Renderer.hpp
index 4018fe40..b898e37c 100644
--- a/src/render/Renderer.hpp
+++ b/src/render/Renderer.hpp
@@ -104,8 +104,6 @@ class CHyprRenderer {
wl_event_source* m_crashingLoop = nullptr;
wl_event_source* m_cursorTicker = nullptr;
- CTimer m_renderTimer;
-
std::vector<CHLBufferReference> m_usedAsyncBuffers;
struct {