Skip to content

tweak(controlbar): Decouple the general promotion star blink from the render frame rate #2835

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 2 commits into from
Jul 9, 2026
+11 −1
Merged

tweak(controlbar): Decouple the general promotion star blink from the render frame rate #2835

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4f3370
tweak: decouple the general promotion star blink from the render fram…
bobtista Jul 6, 2026
70e017f
refactor(controlbar): rename star blink time accumulator for clarity
bobtista Jul 8, 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
1 change: 1 addition & 0 deletions Core/GameEngine/Include/GameClient/ControlBar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,6 +1029,7 @@ class ControlBar : public SubsystemInterface


Bool m_genStarFlash;
Real m_genStarFlashAccumSec;
Comment thread
xezon marked this conversation as resolved.
Outdated
Int m_lastFlashedAtPointValue;

ICoord2D m_controlBarForegroundMarkerPos;
Expand Down
11 changes: 10 additions & 1 deletion Core/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#define DEFINE_RADIUSCURSOR_NAMES

#include "Common/ActionManager.h"
#include "Common/FramePacer.h"
#include "Common/GameType.h"
#include "Common/MultiplayerSettings.h"
#include "Common/NameKeyGenerator.h"
Expand Down Expand Up @@ -904,6 +905,7 @@ ControlBar::ControlBar()
m_currContext = CB_CONTEXT_NONE;
m_defaultControlBarPosition.x = m_defaultControlBarPosition.y = 0;
m_genStarFlash = FALSE;
m_genStarFlashAccumSec = 0.0f;
m_genStarOff = nullptr;
m_genStarOn = nullptr;
m_UIDirty = FALSE;
Expand Down Expand Up @@ -1681,7 +1683,14 @@ const Image *ControlBar::getStarImage()
return nullptr;
}

if(TheGameLogic->getFrame()% LOGICFRAMES_PER_SECOND > LOGICFRAMES_PER_SECOND/2)
// TheSuperHackers @tweak bobtista 27/06/2026 Blink on a wall-clock cycle so the rate is independent of render frame rate and logic time scale.
m_genStarFlashAccumSec += TheFramePacer->getUpdateTime();
const Real blinkPeriodSec = 1.0f;
while( m_genStarFlashAccumSec >= blinkPeriodSec )
{
m_genStarFlashAccumSec -= blinkPeriodSec;
}
if( m_genStarFlashAccumSec >= blinkPeriodSec / 2 )
{
GadgetButtonSetEnabledImage(win, m_generalButtonHighlight);
return nullptr;
Expand Down
Loading