Fix #798

Author: hzqst

Build/svencoop/renderer/shader/hdr_brightpass.frag.glsl

@@ -24,5 +24,5 @@ void main()
 	vec4 vColor = texture(baseTex, texCoord.xy);
 	float fLumValue = dot(vec3(0.27, 0.67, 0.06), vColor.rgb);
 
-	out_Color = max(vColor * (fLumValue - CalcLum()) * 5.0, vec4(0.0, 0.0, 0.0, 1.0));
+	out_Color = min( max(vColor * (fLumValue - CalcLum()) * 5.0, vec4(0.0, 0.0, 0.0, 1.0)), vec4(16.0, 16.0, 16.0, 16.0));
 }

Build/svencoop/sprites/laserbeam_Frame_0.hdr

@@ -2,8 +2,4 @@
   "classname" "sprite_frame_texture"
   "frame" "0"
   "replacetexture" "sprites/laserbeam_Frame_0.hdr"
-}
-{
-  "classname" "sprite_efx"
-  "flags" "FMODEL_NOBLOOM"
 }

Build/svencoop/sprites/laserbeam_external.txt

@@ -12364,6 +12364,7 @@ void Engine_FillAddress(const mh_dll_info_t &DllInfo, const mh_dll_info_t& RealD
 	gPrivateFuncs.triapi_BoxInPVS = gEngfuncs.pTriAPI->BoxInPVS;
 	gPrivateFuncs.triapi_Fog = gEngfuncs.pTriAPI->Fog;
 	gPrivateFuncs.triapi_FogParams = gEngfuncs.pTriAPI->FogParams;
+	gPrivateFuncs.triapi_SpriteTexture = gEngfuncs.pTriAPI->SpriteTexture;
 
 	EngineSurface_FillAddress(DllInfo, RealDllInfo);
 
@@ -12653,6 +12654,7 @@ void Engine_InstallHooks(void)
 	gEngfuncs.pTriAPI->BoxInPVS = triapi_BoxInPVS;
 	gEngfuncs.pTriAPI->Fog = triapi_Fog;
 	gEngfuncs.pTriAPI->FogParams = triapi_FogParams;
+	gEngfuncs.pTriAPI->SpriteTexture = triapi_SpriteTexture;
 
 	Install_InlineHook(BuildGammaTable);
 	Install_InlineHook(R_CullBox);

Plugins/Renderer/gl_hooks.cpp

@@ -533,6 +533,7 @@ int triapi_BoxInPVS(float* mins, float* maxs);
 void triapi_GetMatrix(const int pname, float* matrix);
 void triapi_Fog(float* flFogColor, float flStart, float flEnd, qboolean bOn);
 void triapi_FogParams(float flDensity, qboolean bFogAffectsSkybox);
+qboolean triapi_SpriteTexture(model_t* pSpriteModel, int frame);
 
 float* R_GetWorldMatrix();
 void R_PushWorldMatrix();

Plugins/Renderer/gl_local.h

@@ -1283,33 +1283,13 @@ class CTriAPICommand
 	int RenderMode{ };
 	int DrawRenderMode{ };
 	GLuint hVAO{};
+	std::shared_ptr<CSpriteModelRenderData> pSpriteRenderData;
 };
 
 CTriAPICommand gTriAPICommand;
 IPMBRingBuffer* g_TriAPIVertexBuffer{};
 IPMBRingBuffer* g_TriAPIIndexBuffer{};
 
-void triapi_Shutdown()
-{
-	if (g_TriAPIVertexBuffer)
-	{
-		g_TriAPIVertexBuffer->Destroy();
-		g_TriAPIVertexBuffer = nullptr;
-	}
-
-	if (g_TriAPIIndexBuffer)
-	{
-		g_TriAPIIndexBuffer->Destroy();
-		g_TriAPIIndexBuffer = nullptr;
-	}
-
-	if (gTriAPICommand.hVAO)
-	{
-		GL_DeleteVAO(gTriAPICommand.hVAO);
-		gTriAPICommand.hVAO = 0;
-	}
-}
-
 void triapi_RenderMode(int mode)
 {
 	gTriAPICommand.RenderMode = mode;
@@ -1345,6 +1325,29 @@ void triapi_EndClear()
 	gTriAPICommand.Indices.clear();
 }
 
+void triapi_Shutdown()
+{
+	if (g_TriAPIVertexBuffer)
+	{
+		g_TriAPIVertexBuffer->Destroy();
+		g_TriAPIVertexBuffer = nullptr;
+	}
+
+	if (g_TriAPIIndexBuffer)
+	{
+		g_TriAPIIndexBuffer->Destroy();
+		g_TriAPIIndexBuffer = nullptr;
+	}
+
+	if (gTriAPICommand.hVAO)
+	{
+		GL_DeleteVAO(gTriAPICommand.hVAO);
+		gTriAPICommand.hVAO = 0;
+	}
+
+	gTriAPICommand.pSpriteRenderData.reset();
+}
+
 void triapi_End()
 {
 	size_t n = gTriAPICommand.Vertices.size();
@@ -1752,6 +1755,34 @@ void triapi_End()
 	}
 	}
 
+	if (gTriAPICommand.pSpriteRenderData)
+	{
+		if (r_draw_opaque)
+		{
+			int iStencilRef = 0;
+
+			if ((gTriAPICommand.pSpriteRenderData->flags & FMODEL_NOBLOOM))
+			{
+				iStencilRef |= STENCIL_MASK_NO_BLOOM;
+
+				//has stencil write-in
+				GL_BeginStencilWrite(iStencilRef, STENCIL_MASK_ALL);
+			}
+		}
+		else
+		{
+			int iStencilRef = 0;
+
+			if ((gTriAPICommand.pSpriteRenderData->flags & FMODEL_NOBLOOM))
+			{
+				iStencilRef |= STENCIL_MASK_NO_BLOOM;
+
+				//has stencil write-in
+				GL_BeginStencilWrite(iStencilRef, STENCIL_MASK_NO_BLOOM);
+			}
+		}
+	}
+
 	triapi_program_t prog{};
 	R_UseTriAPIProgram(ProgramState, &prog);
 
@@ -1769,6 +1800,7 @@ void triapi_End()
 	//Restore pipeline state
 	glDisable(GL_BLEND);
 	glDepthMask(GL_TRUE);
+	GL_EndStencil();
 
 	GL_BindVAO(0);
 
@@ -1913,6 +1945,13 @@ void triapi_FogParams(float flDensity, qboolean bFogAffectsSkybox)
 	gPrivateFuncs.triapi_FogParams(flDensity, bFogAffectsSkybox);
 }
 
+qboolean triapi_SpriteTexture(model_t* pSpriteModel, int frame)
+{
+	gTriAPICommand.pSpriteRenderData = R_GetSpriteRenderDataFromModel(pSpriteModel);
+
+	return gPrivateFuncs.triapi_SpriteTexture(pSpriteModel, frame);
+}
+
 void __stdcall triapi_glBegin(int GLPrimitiveCode)
 {
 	gTriAPICommand.GLPrimitiveCode = GLPrimitiveCode;

Plugins/Renderer/gl_rmain.cpp

@@ -122,6 +122,7 @@ typedef struct
 	int (*triapi_BoxInPVS)(float* mins, float* maxs);
 	void (*triapi_Fog)(float* flFogColor, float flStart, float flEnd, qboolean bOn);
 	void (*triapi_FogParams)(float flDensity, qboolean bFogAffectsSkybox);
+	qboolean(*triapi_SpriteTexture)(model_t* pSpriteModel, int frame);
 	void (*Draw_Frame)(mspriteframe_t* pFrame, int x, int y, const wrect_t* prcSubRect);
 	void (*Draw_SpriteFrameHoles)(mspriteframe_t* pFrame, unsigned short* pPalette, int x, int y, const wrect_t* prcSubRect);
 	void (*Draw_SpriteFrameHoles_SvEngine)(mspriteframe_t* pFrame, int x, int y, const wrect_t* prcSubRect);