Route all in-world overlays through the shared occlude-behind-terrain setting

River, Weather and Loot Beacons each carried their own occlude_behind_terrain
(River/LootBeacons as a user toggle, Weather as an always-on constant). Point
them all at the "In-game rendering" module's GetOccludeBehindTerrain() (and the
shared depth planes where they aren't entangled with other math), so terrain
occlusion for every in-world overlay is configured in one place.

Also stop asserting a specific depth mechanism in the Danger/Skill ring
comments - the artifact is only reproduced with occlusion on; the exact
depth-buffer interaction isn't verified here, so the comment now states just
that, and the shared setting defaults off so the rings draw whole.

Behaviour note: River and Weather occlusion previously defaulted on; they now
follow the shared setting, which defaults off.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: GWToolbox Bot

GWToolboxdll/Modules/DangerRingsModule.cpp

@@ -18,11 +18,11 @@ namespace {
     constexpr int kSegments = 48;
     constexpr int kMaxBuildsPerFrame = 4; // draping QueryAltitude budget: ~200 queries per ring build
 
-    // Occlusion (whether the rings hide behind terrain, and the depth-projection planes it needs) is shared with
-    // the "In-game rendering" module via GameWorldRenderer::GetOccludeBehindTerrain()/GetDepthZNear()/GetDepthZFar()
-    // so it's configured in one place. It defaults off there: with occlusion on, the ring and the terrain it hugs
-    // land at nearly-equal depths, and the depth-test tie is resolved by the compositor's reconstructed projection
-    // vs GW's real one - a mismatch that grows non-linearly with distance, so arcs drop in/out as the camera moves.
+    // Occlusion behind terrain (and the depth-projection planes it needs) is shared with the "In-game rendering"
+    // module via GameWorldRenderer::GetOccludeBehindTerrain()/GetDepthZNear()/GetDepthZFar(), so it's configured in
+    // one place. The incomplete-ring artifact (arcs that drop in/out with the camera) only occurs with occlusion
+    // ON - it's an interaction between our depth test and GW's depth buffer - and this shared setting defaults off,
+    // so rings draw whole by default.
     float render_max_distance = 5000.f;
     float fog_factor = 1.0f;
     float ring_thickness = 40.f;

GWToolboxdll/Modules/LootBeaconsModule.cpp

@@ -16,15 +16,16 @@
 #include <Utils/SettingsRegistry.h>
 #include <Utils/TerrainDrape.h>
 #include <Utils/ToolboxUtils.h>
+#include <Widgets/Minimap/GameWorldRenderer.h>
 
 namespace {
-    constexpr float kZNear = 47.0f, kZFar = 100000.f; // must match GW's projection for occlusion to line up
     constexpr int kRingSegments = 32;
     constexpr float kRingBandWidth = 12.f;
     constexpr int kMaxBuildsPerFrame = 8;   // draping QueryAltitude budget: ~70 queries per beacon build
     constexpr uint32_t kScanIntervalMs = 250; // item agents don't move; classification only needs a coarse tick
 
-    bool occlude_behind_terrain = true;
+    // Occlusion behind terrain (and its depth-projection planes) is shared with the "In-game rendering" module
+    // via GameWorldRenderer::GetOccludeBehindTerrain()/GetDepthZNear()/GetDepthZFar() so it's set in one place.
     float render_max_distance = 20000.f;
     float fog_factor = 0.5f;
     float beam_height = 225.f;
@@ -237,7 +238,9 @@ void LootBeaconsModule::DrawInWorld(IDirect3DDevice9* device)
 
     IDirect3DStateBlock9* state_block = nullptr;
     if (device->CreateStateBlock(D3DSBT_ALL, &state_block) != D3D_OK) return;
-    if (GameWorldCompositor::SetupPipeline(device, occlude_behind_terrain, kZNear, kZFar, render_max_distance, fog_factor)) {
+    if (GameWorldCompositor::SetupPipeline(device, GameWorldRenderer::GetOccludeBehindTerrain(),
+                                           GameWorldRenderer::GetDepthZNear(), GameWorldRenderer::GetDepthZFar(),
+                                           render_max_distance, fog_factor)) {
         constexpr BOOL dotted_off[1] = {FALSE};
         device->SetPixelShaderConstantB(0, dotted_off, 1);
         device->DrawPrimitiveUP(D3DPT_TRIANGLELIST, static_cast<UINT>(scratch.size() / 3), scratch.data(), sizeof(BeaconVertex));
@@ -248,7 +251,6 @@ void LootBeaconsModule::DrawInWorld(IDirect3DDevice9* device)
 
 void LootBeaconsModule::RegisterSettings(ToolboxModule* module)
 {
-    SettingsRegistry::RegisterField(module, "occlude_behind_terrain", &occlude_behind_terrain);
     SettingsRegistry::RegisterField(module, "render_max_distance", &render_max_distance);
     SettingsRegistry::RegisterField(module, "fog_factor", &fog_factor);
     SettingsRegistry::RegisterField(module, "beam_height", &beam_height);
@@ -321,7 +323,7 @@ void LootBeaconsModule::DrawSettingsInternal()
     ImGui::ShowHelp("Drawn dimmed. Off: only unreserved drops and drops assigned to you.");
 
     ImGui::Separator();
-    ImGui::Checkbox("Occlude behind terrain", &occlude_behind_terrain);
+    ImGui::TextDisabled("Occlusion behind terrain follows the \"In-game rendering\" module's setting.");
     ImGui::DragFloat("Maximum render distance", &render_max_distance, 25.f, 10.f, 100000.f, "%.0f", ImGuiSliderFlags_AlwaysClamp);
     if (ImGui::DragFloat("Beam height", &beam_height, 5.f, 50.f, 5000.f, "%.0f", ImGuiSliderFlags_AlwaysClamp)) beacons_dirty = true;
     if (ImGui::DragFloat("Beam width", &beam_width, 1.f, 5.f, 500.f, "%.0f", ImGuiSliderFlags_AlwaysClamp)) beacons_dirty = true;

GWToolboxdll/Modules/RiverModule.cpp

@@ -14,6 +14,7 @@
 #include <Utils/GameWorldCompositor.h>
 #include <Utils/SettingsDoc.h>
 #include <Utils/SettingsRegistry.h>
+#include <Widgets/Minimap/GameWorldRenderer.h>
 
 // Generated by CMake (fxc) from the .hlsl in the shared shaders dir.
 #include "Widgets/Minimap/Shaders/river_ps.h"
@@ -35,13 +36,13 @@ namespace lava_river_module {
 namespace {
     using namespace lava_river_module;
 
-    constexpr float kZNear = 47.0f, kZFar = 100000.f; // must match GW's projection for occlusion to line up
     constexpr float kSampleSpacing = 50.f;            // resample a river centerline every ~50 gu (follow slopes)
     constexpr float kAltUnknown = 1e30f;              // sentinel: no terrain data at this (x,y)
     constexpr size_t kMaxVertices = 1500000;          // safety cap on total surface geometry per map (raise cell_size if hit)
 
     // Settings (persisted scalars via SettingsRegistry; rivers persisted separately as JSON).
-    bool occlude_behind_terrain = true;
+    // Occlusion behind terrain (and its depth-projection planes) is shared with the "In-game rendering" module
+    // via GameWorldRenderer::GetOccludeBehindTerrain()/GetDepthZNear()/GetDepthZFar() so it's set in one place.
     float render_max_distance = 5000.f;
     float fog_factor = 1.0f;     // distance-fade strength fed to the shader
     float glow = 0.4f;           // emissive brightness boost (0 = plain texture)
@@ -499,8 +500,8 @@ void RiverModule::DrawInWorld(IDirect3DDevice9* device)
 
     IDirect3DStateBlock9* state_block = nullptr; // restored on exit so GW's own rendering isn't corrupted
     if (device->CreateStateBlock(D3DSBT_ALL, &state_block) != D3D_OK) return;
-    if (device->SetVertexShader(lava_vs) == D3D_OK && device->SetPixelShader(lava_ps) == D3D_OK && device->SetVertexDeclaration(lava_decl) == D3D_OK && GameWorldCompositor::SetWorldViewProj(device, kZNear, kZFar)) {
-        GameWorldCompositor::SetWorldRenderStates(device, occlude_behind_terrain);
+    if (device->SetVertexShader(lava_vs) == D3D_OK && device->SetPixelShader(lava_ps) == D3D_OK && device->SetVertexDeclaration(lava_decl) == D3D_OK && GameWorldCompositor::SetWorldViewProj(device, GameWorldRenderer::GetDepthZNear(), GameWorldRenderer::GetDepthZFar())) {
+        GameWorldCompositor::SetWorldRenderStates(device, GameWorldRenderer::GetOccludeBehindTerrain());
         GameWorldCompositor::SetDistanceFog(device, render_max_distance, fog_factor);
         const float wave_const[4] = {t_seconds, wave_amplitude * env, wave_scale, 0.f};
         device->SetVertexShaderConstantF(8, wave_const, 1);
@@ -527,7 +528,6 @@ void RiverModule::DrawInWorld(IDirect3DDevice9* device)
 
 void RiverModule::RegisterSettings(ToolboxModule* module)
 {
-    SettingsRegistry::RegisterField(module, "occlude_behind_terrain", &occlude_behind_terrain);
     SettingsRegistry::RegisterField(module, "render_max_distance", &render_max_distance);
     SettingsRegistry::RegisterField(module, "glow", &glow);
     SettingsRegistry::RegisterField(module, "flow_speed", &flow_speed);
@@ -589,7 +589,7 @@ void RiverModule::DrawSettings()
     }
     if (textures.empty()) ImGui::TextColored(red, "No texture selected - nothing will draw.");
 
-    ImGui::Checkbox("Occlude behind terrain", &occlude_behind_terrain);
+    ImGui::TextDisabled("Occlusion behind terrain follows the \"In-game rendering\" module's setting.");
     ImGui::DragFloat("Maximum render distance", &render_max_distance, 5.f, 10.f, 100000.f, "%.0f", ImGuiSliderFlags_AlwaysClamp);
     ImGui::DragFloat("Glow", &glow, 0.02f, 0.f, 4.f, "%.2f", ImGuiSliderFlags_AlwaysClamp);
     ImGui::DragFloat("Flow speed", &flow_speed, 0.01f, -2.f, 2.f, "%.2f");

GWToolboxdll/Modules/SkillRangeRingsModule.cpp

@@ -22,11 +22,11 @@ namespace {
     constexpr float kMaxRingRadius = 5200.f; // ignore bogus range data past compass-ish sizes
     constexpr uint8_t kTargetNone = 0;        // Skill.target == no_target (flash enchant / stance / self-cast form)
 
-    // Occlusion (whether the rings hide behind terrain, and the depth-projection planes it needs) is shared with
-    // the "In-game rendering" module via GameWorldRenderer::GetOccludeBehindTerrain()/GetDepthZNear()/GetDepthZFar()
-    // so it's configured in one place. It defaults off there: with occlusion on, the ring and the terrain it hugs
-    // land at nearly-equal depths, and the depth-test tie is resolved by the compositor's reconstructed projection
-    // vs GW's real one - a mismatch that grows non-linearly with distance, so arcs drop in/out as the camera moves.
+    // Occlusion behind terrain (and the depth-projection planes it needs) is shared with the "In-game rendering"
+    // module via GameWorldRenderer::GetOccludeBehindTerrain()/GetDepthZNear()/GetDepthZFar(), so it's configured in
+    // one place. The incomplete-ring artifact (arcs that drop in/out with the camera) only occurs with occlusion
+    // ON - it's an interaction between our depth test and GW's depth buffer - and this shared setting defaults off,
+    // so rings draw whole by default.
     float render_max_distance = 7000.f;
     float fog_factor = 0.6f;
     float ring_thickness = 24.f;

GWToolboxdll/Modules/WeatherModule.cpp

@@ -25,6 +25,7 @@
 #include <Utils/SettingsDoc.h>
 #include <Utils/SettingsRegistry.h>
 #include <Utils/TextUtils.h>
+#include <Widgets/Minimap/GameWorldRenderer.h>
 
 // Generated by CMake (fxc) from the .hlsl in the shared shaders dir.
 #include <GWCA/Context/MapContext.h>
@@ -230,8 +231,8 @@ namespace {
     }
     std::vector<ClimateProfile> climate_profiles = DefaultClimateProfiles();
 
-    // Fixed, not user-facing: weather always occludes behind terrain and renders to the compass range.
-    constexpr bool occlude_behind_terrain = true;
+    // Occlusion behind terrain follows the shared "In-game rendering" setting (GetOccludeBehindTerrain()) so it's
+    // configured in one place with the other in-world overlays. render_max_distance stays fixed at the compass range.
     constexpr float render_max_distance = kMaxRadius;
     unsigned int ambient_color = 0xFFA09078u; // overcast tint of the condition currently driving the dimming (runtime)
     unsigned int active_tint = 0xFFFFFFFFu;   // the active condition's particle tint, fed to the instanced draws (runtime)
@@ -1325,7 +1326,7 @@ void WeatherModule::DrawInWorld(IDirect3DDevice9* device)
     IDirect3DStateBlock9* state_block = nullptr; // restored on exit so GW's own rendering isn't corrupted
     if (device->CreateStateBlock(D3DSBT_ALL, &state_block) != D3D_OK) return;
     if (device->SetPixelShader(weather_ps) == D3D_OK && GameWorldCompositor::SetWorldViewProj(device, kZNear, kZFar)) {
-        GameWorldCompositor::SetWorldRenderStates(device, occlude_behind_terrain);
+        GameWorldCompositor::SetWorldRenderStates(device, GameWorldRenderer::GetOccludeBehindTerrain());
         GameWorldCompositor::SetDistanceFog(device, render_max_distance, fog_factor);
         device->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
         device->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);