From 34ce172a907778bc4c220dba02cd5ab3761ae761 Mon Sep 17 00:00:00 2001
From: spherallic <spherallic@gmail.com>
Date: Fri, 14 Jul 2023 15:03:43 +0200
Subject: [PATCH] Allow toggling PF_NoDepthTest for OpenGL hitboxes
---
src/d_netcmd.c | 1 +
src/hardware/hw_main.c | 4 ++--
src/r_bbox.c | 3 ++-
src/screen.h | 3 ++-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 0f859a569f..c3cd7daa87 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -874,6 +874,7 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_fullscreen);
CV_RegisterVar(&cv_renderview);
CV_RegisterVar(&cv_renderhitboxinterpolation);
+ CV_RegisterVar(&cv_renderhitboxgldepth);
CV_RegisterVar(&cv_renderhitbox);
CV_RegisterVar(&cv_renderer);
CV_RegisterVar(&cv_scr_depth);
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index bb05f2a6d6..194d68c547 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -4081,8 +4081,8 @@ static void HWR_DrawBoundingBox(gl_vissprite_t *vis)
v[017].y = v[020].y = v[021].y = v[025].y = v[026].y = v[027].y = vis->gzt; // top
Surf.PolyColor = V_GetColor(R_GetBoundingBoxColor(vis->mobj));
-
- HWR_ProcessPolygon(&Surf, v, 24, PF_Modulated|PF_NoTexture|PF_WireFrame, SHADER_NONE, false);
+
+ HWR_ProcessPolygon(&Surf, v, 24, (cv_renderhitboxgldepth.value ? 0 : PF_NoDepthTest)|PF_Modulated|PF_NoTexture|PF_WireFrame, SHADER_NONE, false);
}
// -----------------+
diff --git a/src/r_bbox.c b/src/r_bbox.c
index 7ed693fd0a..59d0893c4b 100644
--- a/src/r_bbox.c
+++ b/src/r_bbox.c
@@ -34,8 +34,9 @@ static CV_PossibleValue_t renderhitbox_cons_t[] = {
{RENDERHITBOX_RINGS, "Rings"},
{0}};
-consvar_t cv_renderhitbox = CVAR_INIT ("renderhitbox", "Off", 0, renderhitbox_cons_t, NULL);
+consvar_t cv_renderhitbox = CVAR_INIT ("renderhitbox", "Off", CV_CHEAT, renderhitbox_cons_t, NULL);
consvar_t cv_renderhitboxinterpolation = CVAR_INIT ("renderhitbox_interpolation", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_renderhitboxgldepth = CVAR_INIT ("renderhitbox_gldepth", "Off", CV_SAVE, CV_OnOff, NULL);
struct bbox_col {
INT32 x;
diff --git a/src/screen.h b/src/screen.h
index b021a419dd..9222805fb4 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -199,7 +199,8 @@ extern CV_PossibleValue_t cv_renderer_t[];
extern INT32 scr_bpp;
extern UINT8 *scr_borderpatch; // patch used to fill the view borders
-extern consvar_t cv_scr_width, cv_scr_height, cv_scr_depth, cv_renderview, cv_renderer, cv_renderhitbox, cv_renderhitboxinterpolation, cv_fullscreen;
+extern consvar_t cv_scr_width, cv_scr_height, cv_scr_depth, cv_renderview, cv_renderer, cv_fullscreen;
+extern consvar_t cv_renderhitbox, cv_renderhitboxinterpolation, cv_renderhitboxgldepth;
// wait for page flipping to end or not
extern consvar_t cv_vidwait;
extern consvar_t cv_timescale;
--
GitLab