skip 8bit intermediary buffer and go straight to 32bit colorbuffer

Author: HeliumAnt

Data/Base.rte/Shaders/Background.frag

@@ -6,6 +6,7 @@ in vec4 vertexColor;
 out vec4 FragColor;
 
 uniform sampler2D rteTexture;
+uniform sampler2D rtePalette;
 uniform vec4 rteColor;
 uniform bool drawMasked;
 
@@ -24,5 +25,5 @@ void main() {
 	if (red==0 && drawMasked) {
 		discard;
 	}
-	FragColor = vec4(red, 0.0, 0.0, 0) * vertexColor.r;
+	FragColor = texture2DAA(rtePalette, vec2(red * rteColor.r * vertexColor.r, 0.0)) * vec4(vec3(1.0), rteColor.a * vertexColor.a);
 }

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), 8);
+	m_BackBuffer = std::make_unique<RenderTarget>(FloatRect(0, 0, resX, resY), FloatRect(0, 0, resX, resY));
 
 	m_OverlayBitmap32 = std::unique_ptr<BITMAP, BitmapDeleter>(create_bitmap_ex(c_BPP, resX, resY));
 	clear_to_color(m_OverlayBitmap32.get(), 0);
@@ -472,6 +472,7 @@ void FrameMan::SetTransTableFromPreset(TransparencyPreset transPreset) {
 		color_map = &m_ColorTables[DrawBlendMode::BlendTransparency].at(colorChannelBlendAmounts).first;
 		m_ColorTables[DrawBlendMode::BlendTransparency].at(colorChannelBlendAmounts).second = -1;
 	}
+	m_CurrentAlpha = 255 - transPreset;
 }
 
 void FrameMan::CreateNewNetworkPlayerBackBuffer(int player, int width, int height) {
@@ -809,9 +810,14 @@ void FrameMan::Draw() {
 	g_PresetMan.GetEntityPreset("Shader", "Background")->Clone(&backgroundShader);
 	glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 	clear_to_color(m_BackBuffer8.get(), 0);
-	rlDisableColorBlend();
-	rlDisableDepthTest();
+	rlEnableColorBlend();
+	rlSetBlendMode(RL_BLEND_ALPHA);
+	rlEnableDepthTest();
 	m_BackBuffer->Begin(true);
+	backgroundShader.Begin();
+	backgroundShader.Enable();
+	rlSetUniformSampler(backgroundShader.GetUniformLocation("rtePalette"), g_PostProcessMan.GetPaletteTexture());
+	backgroundShader.SetInt("drawMasked", 1);
 
 	// Count how many split screens we'll need
 	int screenCount = (m_HSplit ? 2 : 1) * (m_VSplit ? 2 : 1);
@@ -830,9 +836,6 @@ void FrameMan::Draw() {
 		screenRelativeGlowBoxes.clear();
 
 		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();
@@ -954,8 +957,10 @@ void FrameMan::Draw() {
 	if (IsInMultiplayerMode()) {
 		PrepareFrameForNetwork();
 	}
+	rlDisableDepthTest();
 	g_GLResourceMan.UpdateDynamicBitmap(m_BackBuffer8.get(), true);
 	DrawTexture(g_GLResourceMan.GetStaticTextureFromBitmap(m_BackBuffer8.get()), 0.0f, 0.0f, {255, 255, 255, 255});
+	backgroundShader.End();
 	m_BackBuffer->End();
 	if (g_ActivityMan.IsInActivity()) {
 		g_PostProcessMan.PostProcess();

Source/Managers/FrameMan.h

@@ -199,6 +199,10 @@ namespace RTE {
 		/// @param transValue The transparency preset value. See the TransparencyPreset enumeration for values.
 		void SetTransTableFromPreset(TransparencyPreset transValue);
 
+		/// @brief Get the current alpha level for transparent draws.
+		/// @return Integer between 0-255 of alpha value.
+		unsigned char GetCurrentAlpha() {return m_CurrentAlpha;}
+
 		/// Flashes any of the players' screen with the specified color for this frame.
 		/// @param screen Which screen to flash.
 		/// @param color What color to flash it. -1 means no color or flash.
@@ -396,6 +400,7 @@ namespace RTE {
 		/// The key is an array of the RGBA values. The value is a pair of the color table itself and a time stamp of when it was last accessed for use during color table pruning.
 		std::array<std::unordered_map<std::array<int, 4>, std::pair<COLOR_MAP, long long>>, DrawBlendMode::BlendModeCount> m_ColorTables;
 		Timer m_ColorTablePruneTimer; //!< Timer for pruning unused color tables to prevent ridiculous memory usage.
+		int m_CurrentAlpha;
 
 		std::shared_ptr<BITMAP> m_PlayerScreen8; //!< Intermediary split screen bitmap.
 		std::shared_ptr<RenderTarget> m_PlayerScreen; //!< Intermediary split screen bitmap.

Source/Managers/PostProcessMan.cpp

@@ -349,17 +349,14 @@ void PostProcessMan::PostProcess() {
 	UpdatePalette();
 
 	// First copy the current 8bpp backbuffer to the 32bpp buffer; we'll add effects to it
-	GL_CHECK(glDisable(GL_BLEND));
-	GL_CHECK(glActiveTexture(GL_TEXTURE0));
-	GL_CHECK(glBindTexture(GL_TEXTURE_2D, g_FrameMan.GetBackBuffer()->GetColorTexture().id));
-	GL_CHECK(glActiveTexture(GL_TEXTURE1));
-	GL_CHECK(glBindTexture(GL_TEXTURE_2D, m_Palette8Texture));
 	m_PostProcessFramebuffer->Begin(false);
-	m_Blit8->Begin();
-	int paletteUniform = m_Blit8->GetUniformLocation("rtePalette");
-	rlSetUniformSampler(paletteUniform, m_Palette8Texture);
-	DrawTexture(g_FrameMan.GetBackBuffer()->GetColorTexture(), 0, 0, {255, 255, 255, 255});
-	m_Blit8->End();
+	//m_Blit8->Begin();
+	//int paletteUniform = m_Blit8->GetUniformLocation("rtePalette");
+	//rlSetUniformSampler(paletteUniform, m_Palette8Texture);
+	rlDisableColorBlend();
+	rlDisableDepthTest();
+	DrawTextureRec(g_FrameMan.GetBackBuffer()->GetColorTexture(), {0, 0, g_FrameMan.GetBackBuffer()->GetSize().w, -g_FrameMan.GetBackBuffer()->GetSize().h}, {0.0f, 0.0f}, {255, 255, 255, 255});
+	//m_Blit8->End();
 
 	// Set the screen blender mode for glows
 	set_screen_blender(128, 128, 128, 128);