Add r_showEntityNormals cvar that toggles debug display of world spac…

…e normals on entities. You can use r_normalMapping to toggle inclusion of normal map data.
Unvanquished · May 28, 2014 · 8094c33 · 8094c33
1 parent 5571082
commit 8094c33
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/main/glsl/vertexLighting_DBS_entity_fp.glsl b/main/glsl/vertexLighting_DBS_entity_fp.glsl
@@ -264,6 +264,9 @@ void	main()
 	gl_FragColor = vec4(vec3(0.0, 1.0, 0.0), diffuse.a);
 #endif
 #endif
-}
-
 
+// Debugging
+#if defined(r_showEntityNormals)
+	gl_FragColor = vec4(N, 1.0);
+#endif
+}
diff --git a/src/engine/renderer/gl_shader.cpp b/src/engine/renderer/gl_shader.cpp
@@ -376,6 +376,11 @@ std::string     GLShaderManager::BuildGPUShaderText( const char *mainShaderName,
 		AddGLSLDefine( bufferExtra, "r_showDeluxeMaps", r_showDeluxeMaps->integer );
 	}
 
+	if ( r_showEntityNormals->integer )
+	{
+		AddGLSLDefine( bufferExtra, "r_showEntityNormals", r_showEntityNormals->integer );
+	}
+
 	if ( glConfig2.vboVertexSkinningAvailable )
 	{
 		AddGLSLDefine( bufferExtra, "r_VertexSkinning", 1 );

diff --git a/src/engine/renderer/tr_init.cpp b/src/engine/renderer/tr_init.cpp
@@ -231,6 +231,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 	cvar_t      *r_showBatches;
 	cvar_t      *r_showLightMaps;
 	cvar_t      *r_showDeluxeMaps;
+	cvar_t      *r_showEntityNormals;
 	cvar_t      *r_showAreaPortals;
 	cvar_t      *r_showCubeProbes;
 	cvar_t      *r_showBspNodes;
@@ -1375,6 +1376,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 		r_showBatches = ri.Cvar_Get( "r_showBatches", "0", CVAR_CHEAT );
 		r_showLightMaps = ri.Cvar_Get( "r_showLightMaps", "0", CVAR_CHEAT | CVAR_SHADER );
 		r_showDeluxeMaps = ri.Cvar_Get( "r_showDeluxeMaps", "0", CVAR_CHEAT | CVAR_SHADER );
+		r_showEntityNormals = ri.Cvar_Get( "r_showEntityNormals", "0", CVAR_CHEAT | CVAR_SHADER );
 		r_showAreaPortals = ri.Cvar_Get( "r_showAreaPortals", "0", CVAR_CHEAT );
 		r_showCubeProbes = ri.Cvar_Get( "r_showCubeProbes", "0", CVAR_CHEAT );
 		r_showBspNodes = ri.Cvar_Get( "r_showBspNodes", "0", CVAR_CHEAT );

diff --git a/src/engine/renderer/tr_local.h b/src/engine/renderer/tr_local.h
@@ -3002,6 +3002,7 @@ static inline byte floatToSnorm8(float f) {
 	extern cvar_t *r_showBatches;
 	extern cvar_t *r_showLightMaps; // render lightmaps only
 	extern cvar_t *r_showDeluxeMaps;
+	extern cvar_t *r_showEntityNormals;
 	extern cvar_t *r_showAreaPortals;
 	extern cvar_t *r_showCubeProbes;
 	extern cvar_t *r_showBspNodes;