From c833feb3af11fc8a008573d9906e55c924210460 Mon Sep 17 00:00:00 2001 From: Garux Date: Wed, 3 Dec 2025 18:47:38 +0500 Subject: [PATCH] fix samplesize units in docs --- docs/Complete_list_of_command_line_parameters.htm | 10 +++++----- tools/quake3/q3map2/help.cpp | 10 +++++----- tools/quake3/q3map2/lightmaps_ydnar.cpp | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/Complete_list_of_command_line_parameters.htm b/docs/Complete_list_of_command_line_parameters.htm index 5368ed00..14a44829 100644 --- a/docs/Complete_list_of_command_line_parameters.htm +++ b/docs/Complete_list_of_command_line_parameters.htm @@ -147,7 +147,7 @@ td.formatted_questions ol { margin-top: 0px; margin-bottom: 0px; }
  • -meta: Combine adjacent triangles of the same texture to surfaces (ALWAYS USE THIS)
  • -metaadequatescore N: Adequate score for adding triangles to meta surfaces
  • -metagoodscore N: Good score for adding triangles to meta surfaces
    • -
  • -minsamplesize N: Sets minimum lightmap resolution in luxels/qu
    • +
  • -minsamplesize N: Sets minimum lightmap resolution in qu/luxel
  • -mi N: Sets the maximum number of indexes per surface
  • -mv N: Sets the maximum number of vertices of a lightmapped surface
  • -ne F: Normal epsilon for plane snapping etc.
    • @@ -168,7 +168,7 @@ td.formatted_questions ol { margin-top: 0px; margin-bottom: 0px; }
  • -onlyents: Only update entities in the BSP
  • -patchmeta: Turn patches into triangle meshes for display
  • -rename: Append "\_bsp" suffix to misc\_model shaders (needed for SoF2)
    • -
  • -samplesize N: Sets default lightmap resolution in luxels/qu
    • +
  • -samplesize N: Sets default lightmap resolution in qu/luxel
  • -skyfix: Turn sky box into six surfaces to work around ATI problems
  • -snap N: Snap brush bevel planes to the given number of units
  • -sRGBcolor: Treat shader and light entity colors as sRGB colorspace
    • @@ -259,7 +259,7 @@ td.formatted_questions ol { margin-top: 0px; margin-bottom: 0px; }
  • -lightmapsize N: Size of lightmaps to generate (must be a power of two)
  • -lomem: Low memory but slower lighting mode
  • -lowquality: Low quality floodlight (appears to currently break floodlight)
    • -
  • -minsamplesize N: Sets minimum lightmap resolution in luxels/qu
    • +
  • -minsamplesize N: Sets minimum lightmap resolution in qu/luxel
  • -nobouncestore: Store BSP, lightmap and shader files only once after last bounce
  • -nocollapse: Do not collapse identical lightmaps
  • -nodeluxe, -nodeluxemap: Disable deluxemapping
    • @@ -281,9 +281,9 @@ td.formatted_questions ol { margin-top: 0px; margin-bottom: 0px; }
  • -pointscale F, -point F: Scaling factor for spherical and spot point lights (light entities)
  • -q3: Use nonlinear falloff curve by default (like Q3A)
  • -randomsamples: Use random sampling for lightmaps
    • -
  • -rawlightmapsizelimit N: Sets maximum lightmap resolution in luxels/qu (only affects patches if used -patchmeta in BSP stage)
    • +
  • -rawlightmapsizelimit N: Sets maximum lightmap resolution in pixels (only affects patches if used -patchmeta in BSP stage)
  • -samplescale F: Scales all lightmap resolutions
    • -
  • -samplesize N: Sets default lightmap resolution in luxels/qu
    • +
  • -samplesize N: Sets default lightmap resolution in qu/luxel
  • -samplessearchboxsize N: Search box size (1 to 4) for lightmap adaptive supersampling
  • -samples N: Adaptive supersampling quality
  • -saturation F: Lighting saturation: default = 1, > 1 = saturate, 0 = grayscale, < 0 = complementary colors
    • diff --git a/tools/quake3/q3map2/help.cpp b/tools/quake3/q3map2/help.cpp index 7a360cdb..9cbdf7ab 100644 --- a/tools/quake3/q3map2/help.cpp +++ b/tools/quake3/q3map2/help.cpp @@ -109,7 +109,7 @@ static void HelpBsp() { "-meta", "Combine adjacent triangles of the same texture to surfaces (ALWAYS USE THIS)" }, { "-metaadequatescore ", "Adequate score for adding triangles to meta surfaces" }, { "-metagoodscore ", "Good score for adding triangles to meta surfaces" }, - { "-minsamplesize ", "Sets minimum lightmap resolution in luxels/qu" }, + { "-minsamplesize ", "Sets minimum lightmap resolution in qu/luxel" }, { "-mi ", "Sets the maximum number of indexes per surface" }, { "-mv ", "Sets the maximum number of vertices of a lightmapped surface" }, { "-ne ", "Normal epsilon for plane snapping etc." }, @@ -130,7 +130,7 @@ static void HelpBsp() { "-onlyents", "Only update entities in the BSP" }, { "-patchmeta", "Turn patches into triangle meshes for display" }, { "-rename", "Append suffix to miscmodel shaders (needed for SoF2)" }, - { "-samplesize ", "Sets default lightmap resolution in luxels/qu" }, + { "-samplesize ", "Sets default lightmap resolution in qu/luxel" }, { "-skyfix", "Turn sky box into six surfaces to work around ATI problems" }, { "-snap ", "Snap brush bevel planes to the given number of units" }, { "-sRGBcolor", "Treat shader and light entity colors as sRGB colorspace" }, @@ -225,7 +225,7 @@ static void HelpLight() { "-lightmapsize ", "Size of lightmaps to generate (must be a power of two)" }, { "-lomem", "Low memory but slower lighting mode" }, { "-lowquality", "Low quality floodlight (appears to currently break floodlight)" }, - { "-minsamplesize ", "Sets minimum lightmap resolution in luxels/qu" }, + { "-minsamplesize ", "Sets minimum lightmap resolution in qu/luxel" }, { "-nobouncestore", "Store BSP, lightmap and shader files only once after last bounce" }, { "-nocollapse", "Do not collapse identical lightmaps" }, { "-nodeluxe, -nodeluxemap", "Disable deluxemapping" }, @@ -247,9 +247,9 @@ static void HelpLight() { "-pointscale , -point ", "Scaling factor for spherical and spot point lights (light entities)" }, { "-q3", "Use nonlinear falloff curve by default (like Q3A)" }, { "-randomsamples", "Use random sampling for lightmaps" }, - { "-rawlightmapsizelimit ", "Sets maximum lightmap resolution in luxels/qu (only affects patches if used -patchmeta in BSP stage)" }, + { "-rawlightmapsizelimit ", "Sets maximum lightmap resolution in pixels (only affects patches if used -patchmeta in BSP stage)" }, { "-samplescale ", "Scales all lightmap resolutions" }, - { "-samplesize ", "Sets default lightmap resolution in luxels/qu" }, + { "-samplesize ", "Sets default lightmap resolution in qu/luxel" }, { "-samplessearchboxsize ", "Search box size (1 to 4) for lightmap adaptive supersampling" }, { "-samples ", "Adaptive supersampling quality" }, { "-saturation ", "Lighting saturation: default = 1, > 1 = saturate, 0 = grayscale, < 0 = complementary colors" }, diff --git a/tools/quake3/q3map2/lightmaps_ydnar.cpp b/tools/quake3/q3map2/lightmaps_ydnar.cpp index 3efde9f6..e25b2a81 100644 --- a/tools/quake3/q3map2/lightmaps_ydnar.cpp +++ b/tools/quake3/q3map2/lightmaps_ydnar.cpp @@ -632,7 +632,7 @@ static bool AddSurfaceToRawLightmap( int num, rawLightmap_t& lm ){ size[ i ] = ( maxs[ i ] - mins[ i ] ) / sampleSize + 1; /* hack (god this sucks) */ - if ( size[ i ] > lm.customWidth || size[ i ] > lm.customHeight || ( lmLimitSize && size[i] > lmLimitSize ) ) { + if ( size[ i ] > lm.customWidth || size[ i ] > lm.customHeight || ( lmLimitSize && size[i] > lmLimitSize ) ) { i = -1; sampleSize += 1; }