vrad: Make scaling for light_environment samples configurable + bump it 30 -> 1024

dimhotepus · dimhotepus · commit c0d19f6019c1 · 2025-08-14T12:17:55.000+03:00
See ValveSoftware/source-sdk-2013#1116
diff --git a/utils/vrad/lightmap.cpp b/utils/vrad/lightmap.cpp
@@ -1656,9 +1656,6 @@ void ExportDirectLightsToWorldLights()
 
 #define CONSTANT_DOT (.7/2)
 
-#define NSAMPLES_SUN_AREA_LIGHT 30							// number of samples to take for an
-                                                            // non-point sun light
-
 // Helper function - gathers light from sun (emit_skylight)
 void GatherSampleSkyLightSSE( SSE_sampleLightOutput_t &out, directlight_t *dl, int facenum, 
 							 FourVectors const& pos, FourVectors *pNormals, int normalCount, int iThread,
@@ -1683,7 +1680,8 @@ void GatherSampleSkyLightSSE( SSE_sampleLightOutput_t &out, directlight_t *dl, i
 	int nsamples = 1;
 	if ( g_SunAngularExtent > 0.0f )
 	{
-		nsamples = NSAMPLES_SUN_AREA_LIGHT;
+		// dimhotepus: Configurable number of samples to take for an non-point sun light.
+		nsamples = g_sunSamplesAreaLight; 
 		if ( do_fast || force_fast )
 			nsamples /= 4;
 	}
@@ -1696,7 +1694,7 @@ void GatherSampleSkyLightSSE( SSE_sampleLightOutput_t &out, directlight_t *dl, i
 	for ( int d = 0; d < nsamples; d++ )
 	{
 		// determine visibility of skylight
-		// serach back to see if we can hit a sky brush
+		// search back to see if we can hit a sky brush
 		Vector delta;
 		VectorScale( dl->light.normal, -MAX_TRACE_LENGTH, delta );
 		if ( d )
diff --git a/utils/vrad/vrad.cpp b/utils/vrad/vrad.cpp
@@ -117,6 +117,8 @@ unsigned	num_degenerate_faces;
 qboolean	g_bLowPriority = false;
 qboolean	g_bLogHashData = false;
 bool		g_bNoDetailLighting = false;
+// dimhotepus: Original VRAD has 30 non-point sun light samples count which is not enough for large surfaces.
+int			g_sunSamplesAreaLight = 1024;
 double		g_flStartTime;
 bool		g_bStaticPropLighting = false;
 bool        g_bStaticPropPolys = false;
@@ -2614,6 +2616,26 @@ static int ParseCommandLine( int argc, char **argv, bool *onlydetail )
 				return -1;
 			}
 		}
+		// dimhotepus: Allow to configure non-point sun light samples count.
+		else if (!Q_stricmp(argv[i], "-sunSamplesAreaLight"))
+		{
+			if (++i < argc)
+			{
+				int sunSamplesAreaLight = atoi(argv[i]);
+				if (sunSamplesAreaLight < 0)
+				{
+					Error("Expected non-negative samples count value after '-sunSamplesAreaLight'\n");
+					return -1;
+				}
+				g_sunSamplesAreaLight = sunSamplesAreaLight;
+				Msg("--sun-samples-area-light: %d\n", g_sunSamplesAreaLight);
+			}
+			else
+			{
+				Error("Expected a samples count value after '-sunSamplesAreaLight'\n");
+				return -1;
+			}
+		}
 		else if ( !Q_stricmp( argv[i], "-maxdispsamplesize" ) )
 		{
 			if ( ++i < argc )
@@ -2857,67 +2879,68 @@ void PrintUsage( int argc, char **argv )
 		"\n"
 		"Common options:\n"
 		"\n"
-		"  -v (or -verbose): Turn on verbose output (also shows more command\n"
-		"  -bounce #       : Set max number of bounces (default: 100).\n"
-		"  -fast           : Quick and dirty lighting.\n"
-		"  -fastambient    : Per-leaf ambient sampling is lower quality to save compute time.\n"
-		"  -final          : High quality processing. equivalent to -extrasky 16.\n"
-		"  -extrasky n     : trace N times as many rays for indirect light and sky ambient.\n"
-		"  -low            : Run as an idle-priority process.\n"
-		"  -mpi            : Use VMPI to distribute computations.\n"
-		"  -rederror       : Show errors in red.\n"
+		"  -v (or -verbose)       : Turn on verbose output (also shows more command\n"
+		"  -bounce #              : Set max number of bounces (default: 100).\n"
+		"  -fast                  : Quick and dirty lighting.\n"
+		"  -fastambient           : Per-leaf ambient sampling is lower quality to save compute time.\n"
+		"  -final                 : High quality processing. equivalent to -extrasky 16.\n"
+		"  -extrasky n            : trace N times as many rays for indirect light and sky ambient.\n"
+		"  -low                   : Run as an idle-priority process.\n"
+		"  -mpi                   : Use VMPI to distribute computations.\n"
+		"  -rederror              : Show errors in red.\n"
 		"\n"
-		"  -vproject <directory> : Override the VPROJECT environment variable.\n"
-		"  -game <directory>     : Same as -vproject.\n"
+		"  -vproject <directory>  : Override the VPROJECT environment variable.\n"
+		"  -game <directory>      : Same as -vproject.\n"
 		"\n"
 		"Other options:\n"
-		"  -novconfig      : Don't bring up graphical UI on vproject errors.\n"
-		"  -dump           : Write debugging .txt files.\n"
-		"  -dumpnormals    : Write normals to debug files.\n"
-		"  -dumptrace      : Write ray-tracing environment to debug files.\n"
-		"  -threads        : Control the number of threads vbsp uses (defaults to the #\n"
-		"                    or processors on your machine).\n"
-		"  -lights <file>  : Load a lights file in addition to lights.rad and the\n"
-		"                    level lights file.\n"
-		"  -noextra        : Disable supersampling.\n"
-		"  -debugextra     : Places debugging data in lightmaps to visualize\n"
-		"                    supersampling.\n"
-		"  -smooth #       : Set the threshold for smoothing groups, in degrees\n"
-		"                    (default 45).\n"
-		"  -dlightmap      : Force direct lighting into different lightmap than\n"
-		"                    radiosity.\n"
-		"  -stoponexit	   : Wait for a keypress on exit.\n"
-		"  -mpi_pw <pw>    : Use a password to choose a specific set of VMPI workers.\n"
-		"  -nodetaillight  : Don't light detail props.\n"
-		"  -centersamples  : Move sample centers.\n"
-		"  -luxeldensity # : Rescale all luxels by the specified amount (default: 1.0).\n"
-		"                    The number specified must be less than 1.0 or it will be\n"
-		"                    ignored.\n"
-		"  -loghash        : Log the sample hash table to samplehash.txt.\n"
-		"  -onlydetail     : Only light detail props and per-leaf lighting.\n"
-		"  -maxdispsamplesize #: Set max displacement sample size (default: 512).\n"
-		"  -softsun <n>    : Treat the sun as an area light source of size <n> degrees."
-		"                    Produces soft shadows.\n"
-		"                    Recommended values are between 0 and 5. Default is 0.\n"
-		"  -FullMinidumps  : Write large minidumps on crash.\n"
-		"  -chop           : Smallest number of luxel widths for a bounce patch, used on edges\n"
-		"  -maxchop		   : Coarsest allowed number of luxel widths for a patch, used in face interiors\n"
+		"  -novconfig             : Don't bring up graphical UI on vproject errors.\n"
+		"  -dump                  : Write debugging .txt files.\n"
+		"  -dumpnormals           : Write normals to debug files.\n"
+		"  -dumptrace             : Write ray-tracing environment to debug files.\n"
+		"  -threads               : Control the number of threads vbsp uses (defaults to the #\n"
+		"                           or processors on your machine).\n"
+		"  -lights <file>         : Load a lights file in addition to lights.rad and the\n"
+		"                           level lights file.\n"
+		"  -noextra               : Disable supersampling.\n"
+		"  -debugextra            : Places debugging data in lightmaps to visualize\n"
+		"                           supersampling.\n"
+		"  -smooth #              : Set the threshold for smoothing groups, in degrees\n"
+		"                           (default 45).\n"
+		"  -dlightmap             : Force direct lighting into different lightmap than\n"
+		"                           radiosity.\n"
+		"  -stoponexit	          : Wait for a keypress on exit.\n"
+		"  -mpi_pw <pw>           : Use a password to choose a specific set of VMPI workers.\n"
+		"  -nodetaillight         : Don't light detail props.\n"
+		"  -centersamples         : Move sample centers.\n"
+		"  -luxeldensity #        : Rescale all luxels by the specified amount (default: 1.0).\n"
+		"                           The number specified must be less than 1.0 or it will be\n"
+		"                           ignored.\n"
+		"  -loghash               : Log the sample hash table to samplehash.txt.\n"
+		"  -onlydetail            : Only light detail props and per-leaf lighting.\n"
+		"  -maxdispsamplesize #   : Set max displacement sample size (default: 512).\n"
+		"  -softsun <n>           : Treat the sun as an area light source of size <n> degrees."
+		"                           Produces soft shadows.\n"
+		"                           Recommended values are between 0 and 5 (default: 0).\n"
+		"  -sunSamplesAreaLight # : Set max number of samples from the light_enviroment (default: 1024).\n"
+		"  -FullMinidumps         : Write large minidumps on crash.\n"
+		"  -chop                  : Smallest number of luxel widths for a bounce patch, used on edges\n"
+		"  -maxchop               : Coarsest allowed number of luxel widths for a patch, used in face interiors\n"
 		"\n"
-		"  -LargeDispSampleRadius: This can be used if there are splotches of bounced light\n"
-		"                          on terrain. The compile will take longer, but it will gather\n"
-		"                          light across a wider area.\n"
-        "  -StaticPropLighting   : generate backed static prop vertex lighting\n"
-        "  -StaticPropPolys   : Perform shadow tests of static props at polygon precision\n"
-        "  -OnlyStaticProps   : Only perform direct static prop lighting (vrad debug option)\n"
-		"  -StaticPropNormals : when lighting static props, just show their normal vector\n"
-		"  -textureshadows : Allows texture alpha channels to block light - rays intersecting alpha surfaces will sample the texture\n"
-		"  -noskyboxrecurse : Turn off recursion into 3d skybox (skybox shadows on world)\n"
-		"  -nossprops      : Globally disable self-shadowing on static props\n"
+		"  -LargeDispSampleRadius : This can be used if there are splotches of bounced light\n"
+		"                           on terrain. The compile will take longer, but it will gather\n"
+		"                           light across a wider area.\n"
+        "  -StaticPropLighting    : generate backed static prop vertex lighting\n"
+        "  -StaticPropPolys       : Perform shadow tests of static props at polygon precision\n"
+        "  -OnlyStaticProps       : Only perform direct static prop lighting (vrad debug option)\n"
+		"  -StaticPropNormals     : when lighting static props, just show their normal vector\n"
+		"  -textureshadows        : Allows texture alpha channels to block light - rays intersecting alpha surfaces will sample the texture\n"
+		"  -noskyboxrecurse       : Turn off recursion into 3d skybox (skybox shadows on world)\n"
+		"  -nossprops             : Globally disable self-shadowing on static props\n"
 		"\n"
 #if 1 // Disabled for the initial SDK release with VMPI so we can get feedback from selected users.
 		);
 #else
-		"  -mpi_ListParams : Show a list of VMPI parameters.\n"
+		"  -mpi_ListParams       : Show a list of VMPI parameters.\n"
 		"\n"
 		);
 
diff --git a/utils/vrad/vrad.h b/utils/vrad/vrad.h
@@ -46,6 +46,8 @@
 
 extern float dispchop; // "-dispchop" tightest number of luxel widths for a patch, used on edges
 extern float g_MaxDispPatchRadius;
+// dimhotepus: Make non-point sun light samples count configurable.
+extern int g_sunSamplesAreaLight;
 
 //-----------------------------------------------------------------------------
 // forward declarations
