From 35f58c507e2e66db6937687e87b9cff5c50ac2d5 Mon Sep 17 00:00:00 2001
From: myT <>
Date: Sat, 11 Nov 2023 19:27:08 +0100
Subject: [PATCH] removed r_showsky, r_showtris, r_shownormals

---
 changelog.txt             |  2 +-
 code/renderer/tr_init.cpp | 15 ---------------
 code/renderer/tr_local.h  | 11 -----------
 code/renderer/tr_sky.cpp  |  5 -----
 4 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 7346aba..682c8df 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -73,7 +73,7 @@ chg: much improved rendering:
 
 chg: removed cl_drawMouseLag, r_backend, r_frameSleep, r_gpuMipGen, r_alphaToCoverage, r_alphaToCoverageMipBoost
   removed r_d3d11_syncOffsets, r_d3d11_presentMode, r_gl3_geoStream, r_ignoreGLErrors, r_finish, r_khr_debug
-  removed r_verbose, r_customaspect, r_speeds, r_msaa
+  removed r_verbose, r_customaspect, r_speeds, r_msaa, r_showsky, r_showtris, r_shownormals
   replaced r_swapInterval with r_vsync <0|1> (default: 0) to enable V-Sync
   replaced r_textureMode with r_lego <0|1> (default: 0) to enable nearest-neighbor texture filtering
 
diff --git a/code/renderer/tr_init.cpp b/code/renderer/tr_init.cpp
index 0056e5e..77cad15 100644
--- a/code/renderer/tr_init.cpp
+++ b/code/renderer/tr_init.cpp
@@ -87,9 +87,6 @@ cvar_t	*r_singleShader;
 cvar_t	*r_roundImagesDown;
 cvar_t	*r_colorMipLevels;
 cvar_t	*r_picmip;
-cvar_t	*r_showsky;
-cvar_t	*r_showtris;
-cvar_t	*r_shownormals;
 cvar_t	*r_clear;
 cvar_t	*r_vsync;
 cvar_t	*r_lego;
@@ -655,18 +652,6 @@ static const cvarTableItem_t r_cvars[] =
 		&r_debugSurface, "r_debugSurface", "0", CVAR_CHEAT, CVART_BOOL, NULL, NULL, "draws collision models",
 		"", CVARCAT_GRAPHICS | CVARCAT_DEBUGGING, "", ""
 	},
-	{
-		&r_showsky, "r_showsky", "0", CVAR_CHEAT, CVART_BOOL, NULL, NULL, "forces sky in front of all surfaces",
-		"", CVARCAT_GRAPHICS | CVARCAT_DEBUGGING, "", ""
-	},
-	{
-		&r_showtris, "r_showtris", "0", CVAR_CHEAT, CVART_BITMASK, "0", XSTRING(SHOWTRIS_MAX), help_r_showtris,
-		"", CVARCAT_GRAPHICS | CVARCAT_DEBUGGING, "", ""
-	},
-	{
-		&r_shownormals, "r_shownormals", "0", CVAR_CHEAT, CVART_BITMASK, "0", XSTRING(SHOWTRIS_MAX), help_r_shownormals,
-		"", CVARCAT_GRAPHICS | CVARCAT_DEBUGGING, "", ""
-	},
 	{
 		&r_clear, "r_clear", "0", CVAR_CHEAT, CVART_BOOL, NULL, NULL, "clears to violet instead of black",
 		"", CVARCAT_GRAPHICS | CVARCAT_DEBUGGING, "", ""
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index cc2c007..3237fe2 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -996,14 +996,6 @@ extern trGlobals_t	tr;
 #define RTCF_R16G16B16A16	2
 #define RTCF_MAX			2
 
-// r_showtris + r_shownormals
-#define SHOWTRIS_ENABLE_BIT			1
-#define SHOWTRIS_OCCLUDE_BIT		2
-#define SHOWTRIS_BACKFACE_BIT		4
-#define SHOWTRIS_VERTEX_COLOR_BIT	8
-#define SHOWTRIS_VERTEX_ALPHA_BIT	16
-#define SHOWTRIS_MAX				31
-
 // r_gpuPreference
 #define GPUPREF_HIGHPERF		0
 #define GPUPREF_LOWPOWER		1
@@ -1069,9 +1061,6 @@ extern	cvar_t	*r_lego;
 extern	cvar_t	*r_vertexLight;			// vertex lighting mode for better performance
 extern	cvar_t	*r_uiFullScreen;		// ui is running fullscreen
 
-extern	cvar_t	*r_showsky;				// forces sky in front of all surfaces
-extern	cvar_t	*r_showtris;			// draws wireframe triangles
-extern	cvar_t	*r_shownormals;			// draws wireframe normals
 extern	cvar_t	*r_clear;				// clear to violet instead of black for debugging
 
 extern	cvar_t	*r_lockpvs;
diff --git a/code/renderer/tr_sky.cpp b/code/renderer/tr_sky.cpp
index 05771a8..c222337 100644
--- a/code/renderer/tr_sky.cpp
+++ b/code/renderer/tr_sky.cpp
@@ -549,11 +549,6 @@ void RB_DrawSky()
 	RB_ClipSkyPolygons();
 	RB_CalcSkyBounds();
 
-	// @TODO:
-	// r_showsky will let all the sky blocks be drawn in
-	// front of everything to allow developers to see how
-	// much sky is getting sucked in
-	
 	if (tess.shader->sky.outerbox[0] && tess.shader->sky.outerbox[0] != tr.defaultImage)
 		DrawSkyBox();