From fbbf2f83465d5502ef004f9bbd6069ba19562a43 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 30 Apr 2018 21:42:36 +0200
Subject: [PATCH] - fixed a few things in the weapon drawer.

---
 src/gl/scene/gl_scene.cpp  |  3 ++
 src/gl/scene/gl_weapon.cpp | 79 +++++++++++++++-----------------------
 2 files changed, 34 insertions(+), 48 deletions(-)

diff --git a/src/gl/scene/gl_scene.cpp b/src/gl/scene/gl_scene.cpp
index c5c52a5bf..26e37e8ac 100644
--- a/src/gl/scene/gl_scene.cpp
+++ b/src/gl/scene/gl_scene.cpp
@@ -551,6 +551,9 @@ void GLSceneDrawer::DrawEndScene2D(sector_t * viewsector)
 	gl_RenderState.mViewMatrix.loadIdentity();
 	gl_RenderState.mProjectionMatrix.ortho(0, screen->GetWidth(), screen->GetHeight(), 0, -1.0f, 1.0f);
 	gl_RenderState.ApplyMatrices();
+	glDisable(GL_DEPTH_TEST);
+	glDisable(GL_MULTISAMPLE);
+
 
 	// [BB] Only draw the sprites if we didn't render a HUD model before.
 	if (renderHUDModel == false)
diff --git a/src/gl/scene/gl_weapon.cpp b/src/gl/scene/gl_weapon.cpp
index 810198395..002899935 100644
--- a/src/gl/scene/gl_weapon.cpp
+++ b/src/gl/scene/gl_weapon.cpp
@@ -73,7 +73,7 @@ void GLSceneDrawer::DrawPSprite (player_t * player,DPSprite *psp, float sx, floa
 	qd.Set(2, rc.x2, rc.y1, 0, rc.u2, rc.v1);
 	qd.Set(3, rc.x2, rc.y2, 0, rc.u2, rc.v2);
 	qd.Render(GL_TRIANGLE_STRIP);
-	gl_RenderState.AlphaFunc(GL_GEQUAL, 0.5f);
+	gl_RenderState.AlphaFunc(GL_GEQUAL, gl_mask_sprite_threshold);
 }
 
 //==========================================================================
@@ -151,6 +151,7 @@ void GLSceneDrawer::DrawPlayerSprites(sector_t * viewsector, bool hudModelStep)
 
 	for(DPSprite *psp = player->psprites; psp != nullptr && psp->GetID() < PSP_TARGETCENTER; psp = psp->GetNext())
 	{
+		if (!psp->GetState()) continue;
 		WeaponRenderStyle rs = GetWeaponRenderStyle(psp, camera);
 		if (rs.RenderStyle.BlendOp == STYLEOP_None) continue;
 
@@ -164,65 +165,47 @@ void GLSceneDrawer::DrawPlayerSprites(sector_t * viewsector, bool hudModelStep)
 		gl_RenderState.EnableBrightmap(!(rs.RenderStyle.Flags & STYLEF_ColorIsFixed));
 
 		const bool bright = isBright(psp);
-		const PalEntry finalcol = bright
-			? ThingColor
-			: ThingColor.Modulate(viewsector->SpecialColors[sector_t::sprites]);
+		const PalEntry finalcol = bright? ThingColor : ThingColor.Modulate(viewsector->SpecialColors[sector_t::sprites]);
 		gl_RenderState.SetObjectColor(finalcol);
 
-		if (psp->GetState() != nullptr) 
+		auto ll = light;
+		if (bright) ll.SetBright();
+
+		// set the lighting parameters
+		if (rs.RenderStyle.BlendOp == STYLEOP_Shadow)
 		{
-			FColormap cmc = light.cm;
-			int ll = light.lightlevel;
-			if (bright)
+			gl_RenderState.SetColor(0.2f, 0.2f, 0.2f, 0.33f, ll.cm.Desaturation);
+		}
+		else
+		{
+			if (gl_lights && GLRenderer->mLightCount && FixedColormap == CM_DEFAULT && gl_light_sprites)
 			{
-				if (light.isbelow)	
+				FSpriteModelFrame *smf = playermo->player->ReadyWeapon ? gl_FindModelFrame(playermo->player->ReadyWeapon->GetClass(), psp->GetState()->sprite, psp->GetState()->GetFrame(), false) : nullptr;
+				if (smf && !gl.legacyMode)
 				{
-					cmc.MakeWhite();
+					gl_SetDynModelLight(playermo, weapondynlightindex[psp]);
 				}
 				else
 				{
-					// under water areas keep most of their color for fullbright objects
-					cmc.LightColor.r = (3 * cmc.LightColor.r + 0xff) / 4;
-					cmc.LightColor.g = (3*cmc.LightColor.g + 0xff)/4;
-					cmc.LightColor.b = (3*cmc.LightColor.b + 0xff)/4;
+					float out[3];
+					gl_drawinfo->GetDynSpriteLight(playermo, nullptr, out);
+					gl_RenderState.SetDynLight(out[0], out[1], out[2]);
 				}
-				ll = 255;
-			}
-			// set the lighting parameters
-			if (rs.RenderStyle.BlendOp == STYLEOP_Shadow)
-			{
-				gl_RenderState.SetColor(0.2f, 0.2f, 0.2f, 0.33f, cmc.Desaturation);
-			}
-			else
-			{
-				if (gl_lights && GLRenderer->mLightCount && FixedColormap == CM_DEFAULT && gl_light_sprites)
-				{
-					FSpriteModelFrame *smf = playermo->player->ReadyWeapon ? gl_FindModelFrame(playermo->player->ReadyWeapon->GetClass(), psp->GetState()->sprite, psp->GetState()->GetFrame(), false) : nullptr;
-					if (smf && !gl.legacyMode)
-					{
-						gl_SetDynModelLight(playermo, weapondynlightindex[psp]);
-					}
-					else
-					{
-						float out[3];
-						gl_drawinfo->GetDynSpriteLight(playermo, nullptr, out);
-						gl_RenderState.SetDynLight(out[0], out[1], out[2]);
-					}
-				}
-				SetColor(ll, 0, cmc, rs.alpha, true);
 			}
+			SetColor(ll.lightlevel, 0, ll.cm, rs.alpha, true);
+		}
 
-			FVector2 spos = BobWeapon(weap, psp);
+		FVector2 spos = BobWeapon(weap, psp);
 
-			// [BB] In the HUD model step we just render the model and break out. 
-			if (hudModelStep)
-			{
-				gl_RenderHUDModel(psp, spos.X, spos.Y, weapondynlightindex[psp]);
-			}
-			else
-			{
-				DrawPSprite(player, psp, spos.X, spos.Y, rs.OverrideShader, !!(rs.RenderStyle.Flags & STYLEF_RedIsAlpha));
-			}
+		// [BB] In the HUD model step we just render the model and break out. 
+		if (hudModelStep)
+		{
+			gl_RenderState.AlphaFunc(GL_GEQUAL, 0.f);
+			gl_RenderHUDModel(psp, spos.X, spos.Y, weapondynlightindex[psp]);
+		}
+		else
+		{
+			DrawPSprite(player, psp, spos.X, spos.Y, rs.OverrideShader, !!(rs.RenderStyle.Flags & STYLEF_RedIsAlpha));
 		}
 	}
 	gl_RenderState.SetObjectColor(0xffffffff);