Skip to content

tweak(gui): Decouple GUI window-move animations from the render frame rate #2833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 6 commits into from
Aug 4, 2026
Merged

tweak(gui): Decouple GUI window-move animations from the render frame rate #2833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a40483a
tweak: decouple GUI window-move animations from the render frame rate
bobtista Jun 27, 2026
e829b80
tweak: decouple GUI window-move animations from the render frame rate…
bobtista Jun 27, 2026
c240eba
tweak: use frame pacer ratio for animation pacing and pump the manage…
bobtista Jul 8, 2026
9e1972c
tweak: use frame pacer ratio for animation pacing and pump the manage…
bobtista Jul 8, 2026
a1f7b2e
tweak: Remove superfluous comment on the animate window manager update
bobtista Aug 3, 2026
4c00e5c
tweak: Remove superfluous comment on the animate window manager updat…
bobtista Aug 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,13 @@ class AnimateWindowManager : public SubsystemInterface
Bool isReversed(); ///< Returns whether or not we're in our reversed state.
Bool isEmpty();
private:
void step(); ///< Runs a single base-rate step of all registered window animations

AnimateWindowList m_winList; ///< A list of AnimationWindows that we don't care if their finished animating
AnimateWindowList m_winMustFinishList; ///< A list of AnimationWindows that we do care about
Bool m_needsUpdate; ///< If we're done animating all our monitored windows, then this will be false
Bool m_reverse; ///< Are we in a reverse state?
Real m_frameAccumulator; ///< Carries fractional base-rate frames between updates
ProcessAnimateWindowSlideFromRight *m_slideFromRight; ///< Holds the process in which the windows slide from the right
ProcessAnimateWindowSlideFromRightFast *m_slideFromRightFast;
ProcessAnimateWindowSlideFromTop *m_slideFromTop; ///< Holds the process in which the windows slide from the Top
Expand Down
17 changes: 17 additions & 0 deletions Generals/Code/GameEngine/Source/GameClient/GUI/AnimateWindowManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
#include "GameClient/GameWindow.h"
#include "GameClient/Display.h"
#include "GameClient/ProcessAnimateWindow.h"
#include "Common/FramePacer.h"
//-----------------------------------------------------------------------------
// DEFINES ////////////////////////////////////////////////////////////////////
//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -133,6 +134,7 @@ AnimateWindowManager::AnimateWindowManager()
m_winList.clear();
m_needsUpdate = FALSE;
m_reverse = FALSE;
m_frameAccumulator = 0.0f;
m_winMustFinishList.clear();
}
AnimateWindowManager::~AnimateWindowManager()
Expand All @@ -159,6 +161,7 @@ void AnimateWindowManager::init()
clearWinList(m_winMustFinishList);
m_needsUpdate = FALSE;
m_reverse = FALSE;
m_frameAccumulator = 0.0f;
}

void AnimateWindowManager::reset()
Expand All @@ -168,9 +171,23 @@ void AnimateWindowManager::reset()
clearWinList(m_winMustFinishList);
m_needsUpdate = FALSE;
m_reverse = FALSE;
m_frameAccumulator = 0.0f;
}

// TheSuperHackers @tweak bobtista 27/06/2026 Decouple GUI window-move animations from the render frame rate
void AnimateWindowManager::update()
{
m_frameAccumulator += TheFramePacer->getBaseOverUpdateFpsRatio();
Int steps = (Int)m_frameAccumulator;
m_frameAccumulator -= (Real)steps;

while (steps-- > 0)
{
step();
}
}

void AnimateWindowManager::step()
{

ProcessAnimateWindow *processAnim = nullptr;
Expand Down
5 changes: 2 additions & 3 deletions Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,16 +205,15 @@ void Shell::update()

}

// Update the animate window manager
m_animateWindowManager->update();

m_schemeManager->update();

// mark last time we ran the updates
lastUpdate = now;

}

m_animateWindowManager->update();

}

//-------------------------------------------------------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,13 @@ class AnimateWindowManager : public SubsystemInterface
Bool isReversed(); ///< Returns whether or not we're in our reversed state.
Bool isEmpty();
private:
void step(); ///< Runs a single base-rate step of all registered window animations

AnimateWindowList m_winList; ///< A list of AnimationWindows that we don't care if their finished animating
AnimateWindowList m_winMustFinishList; ///< A list of AnimationWindows that we do care about
Bool m_needsUpdate; ///< If we're done animating all our monitored windows, then this will be false
Bool m_reverse; ///< Are we in a reverse state?
Real m_frameAccumulator; ///< Carries fractional base-rate frames between updates
ProcessAnimateWindowSlideFromRight *m_slideFromRight; ///< Holds the process in which the windows slide from the right
ProcessAnimateWindowSlideFromRightFast *m_slideFromRightFast;
ProcessAnimateWindowSlideFromTop *m_slideFromTop; ///< Holds the process in which the windows slide from the Top
Expand Down
17 changes: 17 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/AnimateWindowManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
#include "GameClient/GameWindow.h"
#include "GameClient/Display.h"
#include "GameClient/ProcessAnimateWindow.h"
#include "Common/FramePacer.h"
//-----------------------------------------------------------------------------
// DEFINES ////////////////////////////////////////////////////////////////////
//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -133,6 +134,7 @@ AnimateWindowManager::AnimateWindowManager()
m_winList.clear();
m_needsUpdate = FALSE;
m_reverse = FALSE;
m_frameAccumulator = 0.0f;
m_winMustFinishList.clear();
}
AnimateWindowManager::~AnimateWindowManager()
Expand All @@ -159,6 +161,7 @@ void AnimateWindowManager::init()
clearWinList(m_winMustFinishList);
m_needsUpdate = FALSE;
m_reverse = FALSE;
m_frameAccumulator = 0.0f;
}

void AnimateWindowManager::reset()
Expand All @@ -168,9 +171,23 @@ void AnimateWindowManager::reset()
clearWinList(m_winMustFinishList);
m_needsUpdate = FALSE;
m_reverse = FALSE;
m_frameAccumulator = 0.0f;
}

// TheSuperHackers @tweak bobtista 27/06/2026 Decouple GUI window-move animations from the render frame rate
void AnimateWindowManager::update()
{
m_frameAccumulator += TheFramePacer->getBaseOverUpdateFpsRatio();

@xezon xezon Aug 3, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You did the same thing in TransitionGroup::update so this is consistent.

But I do wonder, can this perhaps animate fluently on high frame rates? Maybe in a follow up change? Right now it decouples from render update, but it still uses a low update step of 30 positions a second.

@bobtista bobtista Aug 4, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes in a follow up change

@xezon xezon Aug 4, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could also make a follow up for multiplying this by a new TheGlobalData->m_gameWindowMovementSpeedMultiplier

Int steps = (Int)m_frameAccumulator;
m_frameAccumulator -= (Real)steps;

while (steps-- > 0)
{
step();
}
}

void AnimateWindowManager::step()
{

ProcessAnimateWindow *processAnim = nullptr;
Expand Down
5 changes: 2 additions & 3 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,16 +205,15 @@ void Shell::update()

}

// Update the animate window manager
m_animateWindowManager->update();

m_schemeManager->update();

// mark last time we ran the updates
lastUpdate = now;

}

m_animateWindowManager->update();

}

//-------------------------------------------------------------------------------------------------
Expand Down
Loading