Skip to content

Commit 6fd43ee

Browse files
committed
fix loading screen not being scaled
1 parent e1b5f55 commit 6fd43ee

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

Source/Menus/LoadingScreen.cpp

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,11 @@ void LoadingScreen::CreateLoadingSplash(int xOffset) {
7676
m_LoadingBackground->Create(ContentFile("Base.rte/GUIs/Title/LoadingSplash.png").GetAsBitmap(COLORCONV_NONE, false), false, Vector(), true, false, Vector(1.0F, 0));
7777
m_LoadingBackground->SetOffset(Vector(static_cast<float>(((m_LoadingBackground->GetBitmap()->w - g_WindowMan.GetResX()) / 2) + xOffset), 0));
7878

79-
Box loadingSplashTargetBox(Vector(0, static_cast<float>((g_WindowMan.GetResY() - m_LoadingBackground->GetBitmap()->h) / 2)), static_cast<float>(g_WindowMan.GetResX()), static_cast<float>(m_LoadingBackground->GetBitmap()->h));
80-
RenderTarget defaultTarget{
81-
FloatRect(0, 0, g_WindowMan.GetResX(), g_WindowMan.GetResY()),
82-
FloatRect(0, 0, g_WindowMan.GetResX(), g_WindowMan.GetResY()),
83-
0,
84-
Texture2D(),
85-
true
86-
};
87-
defaultTarget.Begin();
88-
g_WindowMan.ClearBackbuffer();
79+
Box loadingSplashTargetBox(Vector(0, static_cast<float>((g_WindowMan.GetResY() - g_LoadingScreen.m_LoadingBackground->GetBitmap()->h) / 2)), static_cast<float>(g_WindowMan.GetResX()), static_cast<float>(g_LoadingScreen.m_LoadingBackground->GetBitmap()->h));
80+
g_WindowMan.ClearBackbuffer(false);
81+
g_WindowMan.GetScreenBuffer()->Begin();
8982
m_LoadingBackground->Draw(loadingSplashTargetBox, loadingSplashTargetBox);
90-
rlDrawRenderBatchActive();
91-
g_WindowMan.Present();
83+
g_WindowMan.UploadFrame();
9284
}
9385

9486
void LoadingScreen::CreateProgressReportListbox(GUIControlManager* parentControlManager) {
@@ -152,6 +144,7 @@ void LoadingScreen::LoadingSplashProgressReport(const std::string& reportString,
152144
blit(g_LoadingScreen.m_ProgressListboxBitmap, g_FrameMan.GetBackBuffer32(), 0, 0, g_LoadingScreen.m_ProgressListboxPosX, g_LoadingScreen.m_ProgressListboxPosY, g_LoadingScreen.m_ProgressListboxBitmap->w, g_LoadingScreen.m_ProgressListboxBitmap->h);
153145

154146
Box loadingSplashTargetBox(Vector(0, static_cast<float>((g_WindowMan.GetResY() - g_LoadingScreen.m_LoadingBackground->GetBitmap()->h) / 2)), static_cast<float>(g_WindowMan.GetResX()), static_cast<float>(g_LoadingScreen.m_LoadingBackground->GetBitmap()->h));
147+
155148
g_WindowMan.ClearBackbuffer(false);
156149
g_WindowMan.GetScreenBuffer()->Begin();
157150
g_LoadingScreen.m_LoadingBackground->Draw(loadingSplashTargetBox, loadingSplashTargetBox);

0 commit comments

Comments
 (0)