generate textures by rlloadtexture

Author: HeliumAnt

Source/Managers/FrameMan.cpp

@@ -142,7 +142,7 @@ int FrameMan::CreateBackBuffers() {
 	m_BackBuffer32 = std::unique_ptr<BITMAP, BitmapDeleter>(create_bitmap_ex(c_BPP, resX, resY));
 	ClearBackBuffer32();
 
-	m_BackBuffer = std::make_unique<RenderTarget>(FloatRect(0, 0, resX, resY), FloatRect(0, 0, resX, resY));
+	m_BackBuffer = std::make_unique<RenderTarget>(FloatRect(0, 0, resX, resY), FloatRect(0, 0, resX, resY), 8);
 
 	m_OverlayBitmap32 = std::unique_ptr<BITMAP, BitmapDeleter>(create_bitmap_ex(c_BPP, resX, resY));
 	clear_to_color(m_OverlayBitmap32.get(), 0);
@@ -173,7 +173,7 @@ int FrameMan::CreateBackBuffers() {
 		clear_to_color(m_PlayerScreen8.get(), 0);
 		set_clip_state(m_PlayerScreen8.get(), 1);
 
-		m_PlayerScreen = std::make_unique<RenderTarget>(FloatRect(0, 0, resX / (m_VSplit ? 2 : 1), resY / (m_HSplit ? 2 : 1)), FloatRect(0, 0, resX / (m_VSplit ? 2 : 1), resY / (m_HSplit ? 2 : 1)), g_GLResourceMan.GetStaticTextureFromBitmap(m_PlayerScreen8.get()));
+		m_PlayerScreen = std::make_unique<RenderTarget>(FloatRect(0, 0, resX / (m_VSplit ? 2 : 1), resY / (m_HSplit ? 2 : 1)), FloatRect(0, 0, resX / (m_VSplit ? 2 : 1), resY / (m_HSplit ? 2 : 1)), 8, g_GLResourceMan.GetStaticTextureFromBitmap(m_PlayerScreen8.get()));
 
 		// Update these to represent the split screens
 		m_PlayerScreenWidth = m_PlayerScreen->GetSize().w;
@@ -269,7 +269,7 @@ void FrameMan::ResetSplitScreens(bool hSplit, bool vSplit) {
 		clear_to_color(m_PlayerScreen8.get(), 0);
 		set_clip_state(m_PlayerScreen8.get(), 1);
 
-		m_PlayerScreen = std::make_unique<RenderTarget>(FloatRect(0, 0, g_WindowMan.GetResX() / (m_VSplit ? 2 : 1), g_WindowMan.GetResY() / (m_HSplit ? 2 : 1)), FloatRect(0, 0, g_WindowMan.GetResX() / (m_VSplit ? 2 : 1), g_WindowMan.GetResY() / (m_HSplit ? 2 : 1)), g_GLResourceMan.GetStaticTextureFromBitmap(m_PlayerScreen8.get()));
+		m_PlayerScreen = std::make_unique<RenderTarget>(FloatRect(0, 0, g_WindowMan.GetResX() / (m_VSplit ? 2 : 1), g_WindowMan.GetResY() / (m_HSplit ? 2 : 1)), FloatRect(0, 0, g_WindowMan.GetResX() / (m_VSplit ? 2 : 1), g_WindowMan.GetResY() / (m_HSplit ? 2 : 1)), 8, g_GLResourceMan.GetStaticTextureFromBitmap(m_PlayerScreen8.get()));
 
 		// Update these to represent the split screens
 		m_PlayerScreenWidth = m_PlayerScreen->GetSize().w;
@@ -831,6 +831,9 @@ void FrameMan::Draw() {
 
 		m_PlayerScreen->Begin(true);
 		backgroundShader.Begin();
+		backgroundShader.Enable();
+		backgroundShader.SetInt("drawMasked", 1);
+		
 		//rlSetUniformSampler(backgroundShader.GetUniformLocation("rtePalette"), g_PostProcessMan.GetPaletteTexture());
 		BITMAP* drawScreen = (screenCount == 1) ? m_BackBuffer8.get() : m_PlayerScreen8.get();
 		BITMAP* drawScreenGUI = (screenCount == 1) ? m_BackBuffer8.get() : m_PlayerScreen8.get();

Source/Managers/GLResourceMan.cpp

@@ -71,15 +71,10 @@ Texture2D GLResourceMan::GetStaticTextureFromBitmap(BITMAP* bitmap) {
 	if (!bitmap->extra) {
 		m_StaticTextures.emplace_back(new GLBitmapInfo);
 		m_StaticTextures.back()->m_ID = m_StaticTextures.size();
-		GL_CHECK(glGenTextures(1, &m_StaticTextures.back()->m_Texture));
 		bitmap->extra = reinterpret_cast<void*>(m_StaticTextures.back().get());
 		GL_CHECK(glPixelStorei(GL_UNPACK_ALIGNMENT, bitmap_color_depth(bitmap) == 8 ? 1 : 4));
-		GL_CHECK(glActiveTexture(GL_TEXTURE0));
-		GL_CHECK(glBindTexture(GL_TEXTURE_2D, GetBitmapInfo(bitmap)->m_Texture));
-		GL_CHECK(glTexImage2D(GL_TEXTURE_2D, 0, bitmap_color_depth(bitmap) == 8 ? GL_R8 : GL_RGBA, bitmap->w, bitmap->h, 0, bitmap_color_depth(bitmap) == 8 ? GL_RED : GL_RGBA, GL_UNSIGNED_BYTE, bitmap->line[0]));
-		GL_CHECK(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
-		GL_CHECK(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST));
-		// GL_CHECK(glGenerateMipmap(GL_TEXTURE_2D));
+		m_StaticTextures.back()->m_Texture = rlLoadTexture(bitmap->line[0], bitmap->w, bitmap->h, bitmap_color_depth(bitmap) == 8 ? PIXELFORMAT_UNCOMPRESSED_GRAYSCALE : PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, 1);
+
 		return {
 		    .id = m_StaticTextures.back()->m_Texture,
 		    .width = bitmap->w,

Source/Renderer/RenderTarget.cpp

@@ -10,19 +10,19 @@
 
 using namespace RTE;
 
-RenderTarget::RenderTarget(const FloatRect& size, const FloatRect& defaultViewport, Texture2D colorTexture, bool defaultFB0) {
+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, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, 1),
+		    .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 = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8,
+		    .format = bitDepth == 8 ? PIXELFORMAT_UNCOMPRESSED_GRAYSCALE : PIXELFORMAT_UNCOMPRESSED_R8G8B8A8,
 		};
 	}
 	m_Depth = {

Source/Renderer/RenderTarget.h

@@ -8,7 +8,7 @@ namespace RTE {
 	class Shader;
 	class RenderTarget {
 	public:
-		RenderTarget(const FloatRect& size, const FloatRect& defaultViewport, Texture2D colorTexture = {0, 0, 0, 0, -1}, bool defaultFB0 = false);
+		RenderTarget(const FloatRect& size, const FloatRect& defaultViewport, int bitDepth = 32, Texture2D colorTexture = {0, 0, 0, 0, -1}, bool defaultFB0 = false);
 		virtual ~RenderTarget();
 		void Begin(bool clear = true);
 		void End();