fixed the GRP drawing a fog's surfaces when inside it

code/renderer/grp_world.cpp

@@ -1042,6 +1042,32 @@ void World::DrawSceneView(const drawSceneViewCommand_t& cmd)
 			}
 		}
 
+		// skip the fog caps of the fog box we're inside of
+		// we should also skip the interior facing fog caps of other fogs when inside a fog box
+		// seeing the inside of a fog from another fog is exceedingly rare, so we don't bother
+		if(ds >= opaqueCount &&
+			shader->isFog &&
+			drawSurf->fogIndex >= 1 &&
+			drawSurf->fogIndex < tr.world->numfogs)
+		{
+			const fog_t& fog = tr.world->fogs[drawSurf->fogIndex];
+			bool inside = true;
+			for(int a = 0; a < 3; ++a)
+			{
+				if(backEnd.viewParms.orient.origin[a] < fog.bounds[0][a] ||
+					backEnd.viewParms.orient.origin[a] > fog.bounds[1][a])
+				{
+					inside = false;
+					break;
+				}
+			}
+
+			if(inside)
+			{
+				continue;
+			}
+		}
+
 		const bool hasStaticGeo = HasStaticGeo(drawSurf->staticGeoChunk, shader);
 		const bool staticChanged = hasStaticGeo != oldHasStaticGeo;
 		const bool shaderChanged = shader != oldShader;

code/renderer/tr_local.h

@@ -539,13 +539,14 @@ struct drawSurf_t {
 	int						index;		// transparent surface's registration order
 	float					shaderSort;	// transparent surface's shader sort
 	int						shaderNum;	// unsorted shader index, for when we need to do fix-ups
-	float					greyscale;  // how monochrome to draw all the stages
+	float					greyscale;	// how monochrome to draw all the stages
 	int						staticGeoChunk;
 	int						zppFirstIndex;
 	int						zppIndexCount;
 	float					radiusOverZ;
 	int						uniqueEntityId;
 	float					motionBlurScale;
+	int						fogIndex;	// 0 is invalid
 };
 
 void R_TessellateSurface( const surfaceType_t* surfType );
@@ -733,7 +734,6 @@ struct msurface_t {
 	const surfaceType_t* data; // any of srf*_t
 };
 
-
 #define CONTENTS_NODE -1
 
 struct mnode_t {
@@ -760,6 +760,8 @@ typedef struct {
 	int			numSurfaces;
 } bmodel_t;
 
+#define FOG_NONE 0
+
 typedef struct {
 	char		name[MAX_QPATH];		// ie: maps/tim_dm2.bsp
 	char		baseName[MAX_QPATH];	// ie: tim_dm2
@@ -1180,7 +1182,8 @@ void R_AddMD3Surfaces( trRefEntity_t *e );
 
 void R_AddPolygonSurfaces();
 
-void R_AddDrawSurf( const surfaceType_t* surface, const shader_t* shader, int uniqueEntityId, float mblurScale, int staticGeoChunk = 0, int zppFirstIndex = 0, int zppIndexCount = 0, float radiusOverZ = 666.0f );
+void R_AddDrawSurf( const surfaceType_t* surface, const shader_t* shader, int fogIndex, int uniqueEntityId,
+	float mblurScale, int staticGeoChunk = 0, int zppFirstIndex = 0, int zppIndexCount = 0, float radiusOverZ = 666.0f );
 void R_AddLitSurf( const surfaceType_t* surface, const shader_t* shader, int staticGeoChunk );
 void R_AddRTSurf( const surfaceType_t* surface, const shader_t* shader );
 uint64_t R_ComposeSort( int entityNum, const shader_t* shader, int staticGeoChunk );

code/renderer/tr_main.cpp

@@ -1307,7 +1307,8 @@ static float SurfGreyscaleAmount( const shader_t* shader )
 }
 
 
-void R_AddDrawSurf( const surfaceType_t* surface, const shader_t* shader, int uniqueEntityId, float mblurScale, int staticGeoChunk, int zppFirstIndex, int zppIndexCount, float radiusOverZ )
+void R_AddDrawSurf( const surfaceType_t* surface, const shader_t* shader, int fogIndex, int uniqueEntityId,
+	float mblurScale, int staticGeoChunk, int zppFirstIndex, int zppIndexCount, float radiusOverZ )
 {
 	if (tr.refdef.numDrawSurfs >= MAX_DRAWSURFS)
 		return;
@@ -1324,6 +1325,7 @@ void R_AddDrawSurf( const surfaceType_t* surface, const shader_t* shader, int un
 	drawSurf->radiusOverZ = radiusOverZ;
 	drawSurf->uniqueEntityId = uniqueEntityId;
 	drawSurf->motionBlurScale = mblurScale;
+	drawSurf->fogIndex = fogIndex;
 }
 
 
@@ -1673,7 +1675,7 @@ static void R_AddEntitySurfaces()
 				continue;
 			}
 			shader = R_GetShaderByHandle( ent->e.customShader );
-			R_AddDrawSurf( &entitySurface, shader, ent->e.uniqueId, ent->e.motionBlurScale );
+			R_AddDrawSurf( &entitySurface, shader, FOG_NONE, ent->e.uniqueId, ent->e.motionBlurScale );
 			R_AddRTSurf( &entitySurface, shader ); // @TODO: billboards need to be procedural geometry
 			break;
 
@@ -1683,7 +1685,7 @@ static void R_AddEntitySurfaces()
 
 			tr.currentModel = R_GetModelByHandle( ent->e.hModel );
 			if (!tr.currentModel) {
-				R_AddDrawSurf( &entitySurface, tr.defaultShader, ent->e.uniqueId, ent->e.motionBlurScale );
+				R_AddDrawSurf( &entitySurface, tr.defaultShader, FOG_NONE, ent->e.uniqueId, ent->e.motionBlurScale );
 			} else {
 				switch ( tr.currentModel->type ) {
 				case MOD_MD3:
@@ -1698,7 +1700,7 @@ static void R_AddEntitySurfaces()
 				case MOD_BAD:		// null model axis
 					if ( (ent->e.renderfx & RF_THIRD_PERSON) && !tr.viewParms.isPortal)
 						break;
-					R_AddDrawSurf( &entitySurface, tr.defaultShader, ent->e.uniqueId, ent->e.motionBlurScale );
+					R_AddDrawSurf( &entitySurface, tr.defaultShader, FOG_NONE, ent->e.uniqueId, ent->e.motionBlurScale );
 					break;
 				default:
 					ri.Error( ERR_DROP, "R_AddEntitySurfaces: Bad modeltype" );

code/renderer/tr_mesh.cpp

@@ -287,7 +287,7 @@ void R_AddMD3Surfaces( trRefEntity_t* ent )
 		// don't add third_person objects if not viewing through a portal
 		if ( !personalModel ) {
 			if( !culled )
-				R_AddDrawSurf( (const surfaceType_t*)surface, shader, ent->e.uniqueId, ent->e.motionBlurScale );
+				R_AddDrawSurf( (const surfaceType_t*)surface, shader, FOG_NONE, ent->e.uniqueId, ent->e.motionBlurScale );
 			R_AddRTSurf( (const surfaceType_t*)surface, shader );
 		}
 

code/renderer/tr_scene.cpp

@@ -83,7 +83,7 @@ void R_AddPolygonSurfaces()
 
 	const srfPoly_t* poly = tr.refdef.polys;
 	for (int i = 0; i < tr.refdef.numPolys; ++i, ++poly) {
-		R_AddDrawSurf( (const surfaceType_t*)poly, R_GetShaderByHandle( poly->hShader ), 0, 1.0f );
+		R_AddDrawSurf( (const surfaceType_t*)poly, R_GetShaderByHandle( poly->hShader ), FOG_NONE, 0, 1.0f );
 		// @TODO: polygons are sometimes used to replace sprites (e.g. CPMA rocket smoke),
 		// they should be procedural geometry
 		R_AddRTSurf( (const surfaceType_t*)poly, R_GetShaderByHandle( poly->hShader ) );

code/renderer/tr_world.cpp

@@ -210,7 +210,8 @@ static void R_AddWorldSurface( msurface_t* surf, int uniqueId, float mblurScale
 		radiusOverZ = triangles->radius / max( dist, 0.001f );
 	}
 
-	R_AddDrawSurf( surf->data, surf->shader, uniqueId, mblurScale, surf->staticGeoChunk, surf->zppFirstIndex, surf->zppIndexCount, radiusOverZ );
+	R_AddDrawSurf( surf->data, surf->shader, surf->fogIndex, uniqueId, mblurScale,
+		surf->staticGeoChunk, surf->zppFirstIndex, surf->zppIndexCount, radiusOverZ );
 }