Skip to content

tweak(gui): Decouple GUI transition and world animation timing from render update #2056

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

Open
bobtista wants to merge 2 commits into
base: main
Choose a base branch
from
Open

tweak(gui): Decouple GUI transition and world animation timing from render update #2056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a33c8d6
Decouple GUI transition and world animation timing from render update
bobtista Jan 4, 2026
1b3e8ed
Replicate to generals
bobtista Jan 4, 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
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Include/GameClient/GameWindowTransitions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ class TransitionGroup
typedef std::list<TransitionWindow *> TransitionWindowList;
TransitionWindowList m_transitionWindowList;
Int m_directionMultiplier;
Int m_currentFrame; ///< maintain how long we've spent on this transition;
Real m_currentFrame; ///< maintain how long we've spent on this transition (in 30fps-equivalent frames);
AsciiString m_name;
};

Expand Down
5 changes: 4 additions & 1 deletion Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
#include "GameClient/GameWindowTransitions.h"
#include "GameClient/GameWindow.h"
#include "GameClient/GameWindowManager.h"
#include "Common/FramePacer.h"
//-----------------------------------------------------------------------------
// DEFINES ////////////////////////////////////////////////////////////////////
//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -270,7 +271,9 @@ void TransitionGroup::init( void )

void TransitionGroup::update( void )
{
m_currentFrame += m_directionMultiplier; // we go forward or backwards depending.
// TheSuperHackers @tweak GUI transition timing is now decoupled from the render update.
const Real timeScale = TheFramePacer->getActualLogicTimeScaleOverFpsRatio();
m_currentFrame += m_directionMultiplier * timeScale; // we go forward or backwards depending.
TransitionWindowList::iterator it = m_transitionWindowList.begin();
while (it != m_transitionWindowList.end())
{
Expand Down
6 changes: 5 additions & 1 deletion Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5430,8 +5430,12 @@ void InGameUI::updateAndDrawWorldAnimations( void )
}

// update the Z value
// TheSuperHackers @tweak World animation Z-rise is now decoupled from the render update.
if( wad->m_zRisePerSecond )
wad->m_worldPos.z += wad->m_zRisePerSecond / LOGICFRAMES_PER_SECOND;
{
const Real timeScale = TheFramePacer->getActualLogicTimeScaleOverFpsRatio();
wad->m_worldPos.z += wad->m_zRisePerSecond / LOGICFRAMES_PER_SECOND * timeScale;
}

}

Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowTransitions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ class TransitionGroup
typedef std::list<TransitionWindow *> TransitionWindowList;
TransitionWindowList m_transitionWindowList;
Int m_directionMultiplier;
Int m_currentFrame; ///< maintain how long we've spent on this transition;
Real m_currentFrame; ///< maintain how long we've spent on this transition (in 30fps-equivalent frames);
AsciiString m_name;
};

Expand Down
5 changes: 4 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
#include "GameClient/GameWindowTransitions.h"
#include "GameClient/GameWindow.h"
#include "GameClient/GameWindowManager.h"
#include "Common/FramePacer.h"
//-----------------------------------------------------------------------------
// DEFINES ////////////////////////////////////////////////////////////////////
//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -270,7 +271,9 @@ void TransitionGroup::init( void )

void TransitionGroup::update( void )
{
m_currentFrame += m_directionMultiplier; // we go forward or backwards depending.
// TheSuperHackers @tweak GUI transition timing is now decoupled from the render update.
const Real timeScale = TheFramePacer->getActualLogicTimeScaleOverFpsRatio();
m_currentFrame += m_directionMultiplier * timeScale; // we go forward or backwards depending.
TransitionWindowList::iterator it = m_transitionWindowList.begin();
while (it != m_transitionWindowList.end())
{
Expand Down
6 changes: 5 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5603,8 +5603,12 @@ void InGameUI::updateAndDrawWorldAnimations( void )
}

// update the Z value
// TheSuperHackers @tweak World animation Z-rise is now decoupled from the render update.
if( wad->m_zRisePerSecond )
wad->m_worldPos.z += wad->m_zRisePerSecond / LOGICFRAMES_PER_SECOND;
{
const Real timeScale = TheFramePacer->getActualLogicTimeScaleOverFpsRatio();
wad->m_worldPos.z += wad->m_zRisePerSecond / LOGICFRAMES_PER_SECOND * timeScale;
}

}

Expand Down
Loading