fix loading screen

Author: HeliumAnt

Source/Menus/LoadingScreen.cpp

@@ -15,12 +15,15 @@
 
 #include "raylib/raylib.h"
 #include "raylib/rlgl.h"
+#include "RenderTarget.h"
 
 using namespace RTE;
 
+LoadingScreen::LoadingScreen()  { Clear(); }
 void LoadingScreen::Clear() {
 	m_LoadingLogWriter = nullptr;
 	m_LoadingSplashBitmap = nullptr;
+	m_LoadingBackground.reset();
 	m_ProgressListboxBitmap = nullptr;
 	m_ProgressListboxPosX = 0;
 	m_ProgressListboxPosY = 0;
@@ -69,13 +72,21 @@ void LoadingScreen::CreateLoadingSplash(int xOffset) {
 	m_LoadingSplashBitmap = create_bitmap_ex(FrameMan::c_BPP, backbuffer->w, backbuffer->h);
 	clear_bitmap(m_LoadingSplashBitmap);
 
-	StaticSceneLayer loadingSplash;
-	loadingSplash.Create(ContentFile("Base.rte/GUIs/Title/LoadingSplash.png").GetAsBitmap(COLORCONV_NONE, false), false, Vector(), true, false, Vector(1.0F, 0));
-	loadingSplash.SetOffset(Vector(static_cast<float>(((loadingSplash.GetBitmap()->w - g_WindowMan.GetResX()) / 2) + xOffset), 0));
-
-	Box loadingSplashTargetBox(Vector(0, static_cast<float>((g_WindowMan.GetResY() - loadingSplash.GetBitmap()->h) / 2)), static_cast<float>(g_WindowMan.GetResX()), static_cast<float>(loadingSplash.GetBitmap()->h));
+	m_LoadingBackground = std::make_unique<StaticSceneLayer>();
+	m_LoadingBackground->Create(ContentFile("Base.rte/GUIs/Title/LoadingSplash.png").GetAsBitmap(COLORCONV_NONE, false), false, Vector(), true, false, Vector(1.0F, 0));
+	m_LoadingBackground->SetOffset(Vector(static_cast<float>(((m_LoadingBackground->GetBitmap()->w - g_WindowMan.GetResX()) / 2) + xOffset), 0));
+
+	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));
+	RenderTarget defaultTarget{
+		FloatRect(0, 0, g_WindowMan.GetResX(), g_WindowMan.GetResY()),
+		FloatRect(0, 0, g_WindowMan.GetResX(), g_WindowMan.GetResY()),
+		0,
+		Texture2D(),
+		true
+	};
+	defaultTarget.Begin();
 	g_WindowMan.ClearBackbuffer();
-	loadingSplash.Draw(loadingSplashTargetBox, loadingSplashTargetBox);
+	m_LoadingBackground->Draw(loadingSplashTargetBox, loadingSplashTargetBox);
 	rlDrawRenderBatchActive();
 	g_WindowMan.Present();
 }
@@ -140,7 +151,10 @@ void LoadingScreen::LoadingSplashProgressReport(const std::string& reportString,
 
 		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);
 
+		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));
 		g_WindowMan.ClearBackbuffer(false);
+		g_WindowMan.GetScreenBuffer()->Begin();
+		g_LoadingScreen.m_LoadingBackground->Draw(loadingSplashTargetBox, loadingSplashTargetBox);
 		g_WindowMan.UploadFrame();
 	}
 }

Source/Menus/LoadingScreen.h

@@ -13,14 +13,15 @@ namespace RTE {
 	class GUIInputWrapper;
 	class GUIControlManager;
 	class Writer;
+	class StaticSceneLayer;
 
 	/// Handling for the loading screen composition and loading progress box when starting the game.
 	class LoadingScreen : public Singleton<LoadingScreen> {
 
 	public:
 #pragma region Creation
 		/// Constructor method used to instantiate a LoadingScreen object in system memory.
-		LoadingScreen() { Clear(); }
+		LoadingScreen();
 
 		/// Makes the LoadingScreen object ready for use.
 		/// @param guiScreen Pointer to a GUIScreen interface that will be used by this LoadingScreen's GUIControlManager. Ownership is NOT transferred!
@@ -58,6 +59,7 @@ namespace RTE {
 
 		BITMAP* m_LoadingSplashBitmap; //!< BITMAP that is used for drawing the splash screen.
 		BITMAP* m_ProgressListboxBitmap; //!< BITMAP that the progress report will be drawn into.
+		std::unique_ptr<StaticSceneLayer> m_LoadingBackground; //!< Loading Screen Background image.
 		int m_ProgressListboxPosX; //!< Position of the progress report box on X axis.
 		int m_ProgressListboxPosY; //!< Position of the progress report box on Y axis.
 

Source/Renderer/RenderTarget.cpp

@@ -14,31 +14,35 @@ using namespace RTE;
 RenderTarget::RenderTarget(const FloatRect& size, const FloatRect& defaultViewport, int bitDepth, Texture2D colorTexture, bool defaultFB0) {
 	m_Size = size;
 	m_Viewport = defaultViewport;
-	if (colorTexture.id != 0) {
-		m_Texture = colorTexture;
-		m_ColorTextureOwned = false;
-	} else {
-		m_Texture = {
-		    .id = rlLoadTexture(nullptr, size.w, size.h, bitDepth == 8 ? PIXELFORMAT_UNCOMPRESSED_GRAYSCALE : PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, 1),
+	if (!defaultFB0) {
+		if (colorTexture.id != 0) {
+			m_Texture = colorTexture;
+			m_ColorTextureOwned = false;
+		} else {
+			m_Texture = {
+			    .id = rlLoadTexture(nullptr, size.w, size.h, bitDepth == 8 ? PIXELFORMAT_UNCOMPRESSED_GRAYSCALE : PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, 1),
+			    .width = static_cast<int>(size.w),
+			    .height = static_cast<int>(size.h),
+			    .mipmaps = 0,
+			    .format = bitDepth == 8 ? PIXELFORMAT_UNCOMPRESSED_GRAYSCALE : PIXELFORMAT_UNCOMPRESSED_R8G8B8A8,
+			};
+		}
+		m_Depth = {
+		    .id = rlLoadTextureDepth(size.w, size.h, false),
 		    .width = static_cast<int>(size.w),
 		    .height = static_cast<int>(size.h),
 		    .mipmaps = 0,
-		    .format = bitDepth == 8 ? PIXELFORMAT_UNCOMPRESSED_GRAYSCALE : PIXELFORMAT_UNCOMPRESSED_R8G8B8A8,
+		    .format = GL_DEPTH_COMPONENT,
 		};
-	}
-	m_Depth = {
-	    .id = rlLoadTextureDepth(size.w, size.h, false),
-	    .width = static_cast<int>(size.w),
-	    .height = static_cast<int>(size.h),
-	    .mipmaps = 0,
-	    .format = GL_DEPTH_COMPONENT,
-	};
-	if (!defaultFB0) {
 		m_FBO = rlLoadFramebuffer();
 		rlEnableFramebuffer(m_FBO);
 		rlFramebufferAttach(m_FBO, m_Texture.id, RL_ATTACHMENT_COLOR_CHANNEL0, RL_ATTACHMENT_TEXTURE2D, 0);
 		rlFramebufferAttach(m_FBO, m_Depth.id, RL_ATTACHMENT_DEPTH, RL_ATTACHMENT_TEXTURE2D, 0);
 		rlDisableFramebuffer();
+	} else {
+		m_ColorTextureOwned = false;
+		m_Depth.id = 0;
+		m_Texture.id = 0;
 	}
 }