utils: pxrad: fix crash when no lightmapped faces, remove old fastsky (#257)

Author: ncuxonaT

utils/pxrad/lerp.cpp

@@ -1764,7 +1764,7 @@ void GetTriangulationPatches( int facenum, int *numpatches, const int **patches
 {
 	const facetriangulation_t	*facetrian;
 
-	if( g_numbounce <= 0 && !g_fastmode && g_indirect_sun == 0.0f )
+	if( !g_usingpatches )
 	{
 		*numpatches = 0;
 		*patches = NULL;

utils/pxrad/lightmap.cpp

@@ -2548,7 +2548,7 @@ GatherSampleLight
 =============
 */
 void GatherSampleLight( int threadnum, int fn, const vec3_t pos, int leafnum, const vec3_t n,
-vec3_t *s_light, vec3_t *s_dir, vec_t *s_occ, byte *styles, byte *vislight, bool topatch, entity_t *ignoreent, const vec_t sky_visibility )
+vec3_t *s_light, vec3_t *s_dir, vec_t *s_occ, byte *styles, byte *vislight, bool topatch, entity_t *ignoreent )
 {
 	vec3_t	add, delta, add_one;
 	vec3_t	testline_origin;
@@ -2567,7 +2567,7 @@ vec3_t *s_light, vec3_t *s_dir, vec_t *s_occ, byte *styles, byte *vislight, bool
 		// check light visibility
 		if( leafnum && g_fakeskylight.pvs && CHECKVISBIT( g_fakeskylight.pvs, leafnum - 1 ) )
 		{
-			int	skylevel = g_fastsky && (sky_visibility > 2.0f) ? SKYLEVEL_FASTSKY : SKYLEVEL_SOFTSKYON;		
+			int	skylevel = SKYLEVEL_SOFTSKYON;		
 
 			vec3_t	*skynormals = g_skynormals[skylevel];
 			vec3_t	sky_intensity;
@@ -3484,7 +3484,7 @@ void BuildFaceLights( int facenum, int thread )
 	{
 		int	leafnum = p->leafnum;
 #ifdef HLRAD_DELUXEMAPPING
-		GatherSampleLight( thread, l.surfnum, p->origin, leafnum, normal, p->totallight, p->totallight_dir, NULL, p->totalstyle, NULL, 1, NULL, M_PI - p->trans_sum );
+		GatherSampleLight( thread, l.surfnum, p->origin, leafnum, normal, p->totallight, p->totallight_dir, NULL, p->totalstyle, NULL, 1, NULL );
 #else
 		GatherSampleLight( thread, l.surfnum, p->origin, leafnum, normal, p->totallight, NULL, NULL, p->totalstyle, NULL, 1 );
 #endif

utils/pxrad/qrad.cpp

@@ -77,11 +77,10 @@ vec_t		g_lightprobeepsilon = DEFAULT_LIGHTPROBE_EPSILON;
 int			g_lightprobesamples = 256;
 bool		g_vertexblur = false;
 uint		g_numstudiobounce = DEFAULT_STUDIO_BOUNCE;
-int		g_studiogipasscounter = 0;
-vec3_t		*g_studioskynormals;
-int		g_numstudioskynormals;
+int			g_studiogipasscounter = 0;
 bool		g_noemissive = false;
-int		g_skystyle = -1;
+int			g_skystyle = -1;
+bool		g_usingpatches = true;
 
 
 bool		g_drawsample = false;
@@ -1918,8 +1917,7 @@ static void SortPatches( void )
 		}
 	}
 
-	// if we haven't patches we don't need bounces
-	if( g_num_patches <= 0 ) g_numbounce = 0;
+	if( g_num_patches <= 0 ) g_usingpatches = false;
 }
 
 /*
@@ -2516,8 +2514,6 @@ void RadWorld( void )
 	RunThreadsOnIndividual( g_numfaces, true, FindFacePositions );
 	CalcPositionsSize();
 
-	if( g_fastsky )
-		MakeTransfers();
 	if( g_envsky )
 		LoadEnvSkyTextures();
 
@@ -2529,7 +2525,7 @@ void RadWorld( void )
 #ifdef HLRAD_VERTEXLIGHTING
 	BuildVertexLights();	//BuildFaceLights will get single gi bounce from studiomodels
 
-	if( g_numstudiobounce > 0 || g_indirect_sun > 0.0f )
+	if( g_numstudiobounce > 0 )
 	{
 		g_studiogipasscounter = 1;		
 		VertexPatchLights();
@@ -2546,11 +2542,10 @@ void RadWorld( void )
 
 	CalcLuxelsCount();
 
-	if( g_numbounce > 0 )
+	if( g_numbounce > 0 && g_usingpatches )
 	{
 		// build transfer lists	
-		if(!g_fastsky)
-			MakeTransfers();
+		MakeTransfers();
 
 		emitlight = (vec3_t (*)[MAXLIGHTMAPS])Mem_Alloc(( g_num_patches + 1 ) * sizeof( vec3_t[MAXLIGHTMAPS] ));
 		addlight = (vec3_t (*)[MAXLIGHTMAPS])Mem_Alloc(( g_num_patches + 1 ) * sizeof( vec3_t[MAXLIGHTMAPS] ));
@@ -2574,10 +2569,9 @@ void RadWorld( void )
 		emitlight_dir = NULL;
 		addlight_dir = NULL;
 #endif
-	}
-
-	if( g_fastsky ||( g_numbounce > 0 ))
+		// transfers don't need anymore
 		FreeTransfers();
+	}
 
 	// remove direct light from patches
 	for( int i = 0; i < g_num_patches; i++ )
@@ -2597,13 +2591,13 @@ void RadWorld( void )
 		ScaleDirectLights();
 
 	// because fastmode uses patches instead of samples
-	if( g_numbounce > 0 || g_fastmode || g_indirect_sun > 0.0f )
+	if( g_usingpatches )
 		RunThreadsOnIndividual( g_numfaces, false, CreateTriangulations );
 
 	// blend bounced light into direct light and save
 	PrecompLightmapOffsets();
 
-	if( g_numbounce > 0 || g_fastmode || g_indirect_sun > 0.0f )
+	if( g_usingpatches )
 	{
 		CreateFacelightDependencyList();
 
@@ -2612,7 +2606,7 @@ void RadWorld( void )
 		FreeFacelightDependencyList();
 	}
 
-	if( g_numbounce > 0 || g_fastmode || g_indirect_sun > 0.0f )
+	if( g_usingpatches )
 		FreeTriangulations();
 
 	if( g_lightbalance )
@@ -2626,7 +2620,7 @@ void RadWorld( void )
 
 #ifdef HLRAD_VERTEXLIGHTING
 	g_studiogipasscounter = 0;
-	for( int i = 0; i < g_numstudiobounce; i++ )
+	for( int i = 0; i < Q_max( 1, g_numstudiobounce ); i++ )
 	{
 		g_studiogipasscounter++;		
 		VertexPatchLights();
@@ -3085,6 +3079,7 @@ int main( int argc, char **argv )
 
 	if( g_skystyle < 0 )
 		g_skystyle = IntForKey( &g_entities[0], "zhlt_skystyle" );
+	g_usingpatches = g_numbounce > 0 || g_fastmode || g_indirect_sun > 0.0f;
 
 	// keep it in acceptable range
 	g_blur = bound( 1.0, g_blur, 8.0 );

utils/pxrad/qrad.h

@@ -62,7 +62,6 @@
 #define SKYLEVELMAX				8
 #define SKYLEVEL_SOFTSKYON		7
 #define SKYLEVEL_SOFTSKYOFF		4
-#define SKYLEVEL_FASTSKY		6
 #define STUDIO_SAMPLES_PER_PASS	32
 #define STUDIO_SAMPLES_SKY		256
 #define SKYNORMALS_RANDOM		16384
@@ -439,6 +438,7 @@ extern int		g_studiogipasscounter;
 extern vec3_t	g_skynormals_random[SKYNORMALS_RANDOM];
 extern bool		g_noemissive;
 extern int		g_skystyle;
+extern bool		g_usingpatches;
 
 //
 // ambientcube.c
@@ -514,7 +514,7 @@ extern void FreeTriangulations( void );
 // lightmap.c
 //
 void GatherSampleLight( int threadnum, int fn, const vec3_t pos, int leafnum, const vec3_t normal,
-vec3_t *s_light, vec3_t *s_dir, vec_t *s_occ, byte *styles, byte *vislight, bool topatch, entity_t *ignoreent = NULL, const vec_t sky_visibility = 0.0f );
+vec3_t *s_light, vec3_t *s_dir, vec_t *s_occ, byte *styles, byte *vislight, bool topatch, entity_t *ignoreent = NULL );
 void TexelSpaceToWorld( const lightinfo_t *l, vec3_t world, const vec_t s, const vec_t t );
 void WorldToTexelSpace( const lightinfo_t *l, const vec3_t world, vec_t &s, vec_t &t );
 int ParseLightIntensity( const char *pLight, vec3_t intensity );