render: allowed studiomodels rendering in envshot pass

SNMetamorph · Aug 25, 2021 · c6ea5e0 · c6ea5e0
1 parent 1124466
commit c6ea5e0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/client/render/gl_frustum.cpp b/client/render/gl_frustum.cpp
@@ -260,8 +260,10 @@ bool CFrustum :: CullBox( const Vector &mins, const Vector &maxs, int userClipFl
 {
 	int iClipFlags;
 
-	if( CVAR_TO_BOOL( r_nocull ))
+	if (CVAR_TO_BOOL(r_nocull))
 		return false;
+	else if (RP_CUBEPASS()) // disable culling when rendering envmap
+		return true;
 
 	if( userClipFlags != 0 )
 		iClipFlags = userClipFlags;

diff --git a/client/render/gl_rmain.cpp b/client/render/gl_rmain.cpp
@@ -589,8 +589,8 @@ static void R_SetupViewCache( const ref_viewpass_t *rvp )
 			RI->view.parallelSplitDistances[NUM_SHADOW_SPLITS] = farClip;
 		}
 
-		// don't draw the entities while render skybox or cubemap
-		if (!FBitSet(RI->params, (RP_ENVVIEW | RP_SKYVIEW)))
+		// don't draw the entities while render skybox
+		if (!FBitSet(RI->params, (RP_SKYVIEW)))
 		{
 			// before process of tr.draw_entities
 			// we can add muzzleflashes here

diff --git a/client/utils.cpp b/client/utils.cpp
@@ -337,7 +337,7 @@ bool Mod_BoxVisible( const Vector mins, const Vector maxs, const byte *visbits )
 	mnode_t	*headnode;
 	int	i, count;
 
-	if( !visbits || !mins || !maxs )
+	if( !visbits || !mins || !maxs || RP_CUBEPASS())
 		return true;
 
 	count = Mod_BoxLeafnums( mins, maxs, leafList, ARRAYSIZE( leafList ), &headnode );