edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 06:28:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #6607

Browse source 
6607: Minor refactoring of `CMenus::RenderLoading` r=Learath2 a=Robyt3



## Checklist

- [X] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test (especially base/) or added coverage to integration test
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Robert Müller <robytemueller@gmail.com>
This commit is contained in:
bors[bot] 2023-05-18 10:52:23 +00:00 committed by GitHub
parent 4091d394df 13ed0e386a
commit ac820ce62d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/game/client/components/menus.cpp
View file

@ -872,24 +872,21 @@ void CMenus::RenderLoading(const char *pCaption, const char *pContent, int Incre
{ {
// TODO: not supported right now due to separate render thread // TODO: not supported right now due to separate render thread
static std::chrono::nanoseconds LastLoadRender{0}; static std::chrono::nanoseconds s_LastLoadRender{0};
auto CurLoadRenderCount = m_LoadCurrent; const int CurLoadRenderCount = m_LoadCurrent;
m_LoadCurrent += IncreaseCounter; m_LoadCurrent += IncreaseCounter;
float Percent = CurLoadRenderCount / (float)m_LoadTotal; const float Percent = CurLoadRenderCount / (float)m_LoadTotal;
// make sure that we don't render for each little thing we load // make sure that we don't render for each little thing we load
// because that will slow down loading if we have vsync // because that will slow down loading if we have vsync
if(time_get_nanoseconds() - LastLoadRender < std::chrono::nanoseconds(1s) / 60l) if(time_get_nanoseconds() - s_LastLoadRender < std::chrono::nanoseconds(1s) / 60l)
return; return;
LastLoadRender = time_get_nanoseconds(); s_LastLoadRender = time_get_nanoseconds();
// need up date this here to get correct // need up date this here to get correct
ms_GuiColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_UiColor, true)); ms_GuiColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_UiColor, true));
CUIRect Screen = *UI()->Screen();
// some margin around the screen
Screen.Margin(10.0f, &Screen);
UI()->MapScreen(); UI()->MapScreen();
if(!RenderMenuBackgroundMap || !m_pBackground->Render()) if(!RenderMenuBackgroundMap || !m_pBackground->Render())
@ -897,8 +894,8 @@ void CMenus::RenderLoading(const char *pCaption, const char *pContent, int Incre
RenderBackground(); RenderBackground();
} }
CUIRect Box = Screen; CUIRect Box = *UI()->Screen();
Box.Margin(150.0f, &Box); Box.Margin(160.0f, &Box);
Graphics()->BlendNormal(); Graphics()->BlendNormal();
@ -906,18 +903,14 @@ void CMenus::RenderLoading(const char *pCaption, const char *pContent, int Incre
Box.Draw(ColorRGBA{0, 0, 0, 0.50f}, IGraphics::CORNER_ALL, 15.0f); Box.Draw(ColorRGBA{0, 0, 0, 0.50f}, IGraphics::CORNER_ALL, 15.0f);
CUIRect Part; CUIRect Part;
Box.HSplitTop(20.f, nullptr, &Box);
Box.HSplitTop(20.f, &Part, &Box);
Box.HSplitTop(24.f, &Part, &Box); Box.HSplitTop(24.f, &Part, &Box);
Part.VMargin(20.f, &Part); Part.VMargin(20.f, &Part);
SLabelProperties Props;
Props.m_MaxWidth = (int)Part.w;
UI()->DoLabel(&Part, pCaption, 24.f, TEXTALIGN_MC); UI()->DoLabel(&Part, pCaption, 24.f, TEXTALIGN_MC);
Box.HSplitTop(20.f, &Part, &Box);
Box.HSplitTop(20.f, nullptr, &Box);
Box.HSplitTop(24.f, &Part, &Box); Box.HSplitTop(24.f, &Part, &Box);
Part.VMargin(20.f, &Part); Part.VMargin(20.f, &Part);
Props.m_MaxWidth = (int)Part.w;
UI()->DoLabel(&Part, pContent, 20.0f, TEXTALIGN_MC); UI()->DoLabel(&Part, pContent, 20.0f, TEXTALIGN_MC);
if(RenderLoadingBar) if(RenderLoadingBar)