Danger Rings: share terrain-occlusion setting with in-game rendering

Danger Rings kept its own always-on "Occlude behind terrain" toggle. With
occlusion on, the ring mesh is draped tight to the floor (z_lift 5), so the
flat triangle chords between its 48 segments dip below the real terrain and
fail the scene depth test - dropping arcs that shift as the camera rotates
(the reported "incomplete circles depending on camera angle").

Remove the module's own occlude_behind_terrain boolean (and its duplicated
z-near/z-far constants) and read the shared "In-game rendering" module's
GetOccludeBehindTerrain()/GetDepthZNear()/GetDepthZFar() instead. That
setting defaults off, so full circles draw by default, and occlusion is now
configured in one place for all in-world overlays.

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

Author: GWToolbox Bot

GWToolboxdll/Modules/DangerRingsModule.cpp

@@ -12,13 +12,16 @@
 #include <Utils/GameWorldCompositor.h>
 #include <Utils/SettingsRegistry.h>
 #include <Utils/TerrainDrape.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 kSegments = 48;
     constexpr int kMaxBuildsPerFrame = 4; // draping QueryAltitude budget: ~200 queries per ring build
 
-    bool occlude_behind_terrain = true;
+    // 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: a ring draped tight to the floor otherwise self-
+    // occludes against terrain it dips into between segments, dropping arcs that change with the camera angle.
     float render_max_distance = 5000.f;
     float fog_factor = 1.0f;
     float ring_thickness = 40.f;
@@ -149,7 +152,9 @@ void DangerRingsModule::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(RingVertex));
@@ -160,7 +165,6 @@ void DangerRingsModule::DrawInWorld(IDirect3DDevice9* device)
 
 void DangerRingsModule::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, "ring_thickness", &ring_thickness);
@@ -199,7 +203,7 @@ void DangerRingsModule::DrawSettingsInternal()
     if (!GameWorldCompositor::IsActive())
         ImGui::TextColored(red, GameWorldCompositor::HasFailed() ? "In-world compositor FAILED to install." : "In-world compositor: not installed yet.");
 
-    if (ImGui::Checkbox("Occlude behind terrain", &occlude_behind_terrain)) meshes_dirty = true;
+    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);
     if (ImGui::DragFloat("Ring thickness", &ring_thickness, 1.f, 5.f, 500.f, "%.0f", ImGuiSliderFlags_AlwaysClamp)) meshes_dirty = true;
     if (ImGui::DragFloat("Rim opacity", &rim_opacity, 0.01f, 0.f, 1.f, "%.2f", ImGuiSliderFlags_AlwaysClamp)) meshes_dirty = true;

GWToolboxdll/Widgets/Minimap/GameWorldRenderer.cpp

@@ -724,6 +724,9 @@ void GameWorldRenderer::ClearNavmeshLines()
 const std::vector<GameWorldRenderer::BatchedLine>& GameWorldRenderer::GetNavmeshWorldMapLines() { return navmesh_worldmap_lines; }
 GW::Constants::MapID GameWorldRenderer::GetNavmeshWorldMapMapId() { return navmesh_worldmap_map; }
 float GameWorldRenderer::GetRenderMaxDistance() { return render_max_distance; }
+bool GameWorldRenderer::GetOccludeBehindTerrain() { return occlude_behind_terrain; }
+float GameWorldRenderer::GetDepthZNear() { return z_near; }
+float GameWorldRenderer::GetDepthZFar() { return z_far; }
 
 void GameWorldRenderer::Terminate()
 {

GWToolboxdll/Widgets/Minimap/GameWorldRenderer.h

@@ -118,6 +118,12 @@ class GameWorldRenderer : public ToolboxModule {
     // Max in-world render distance (game units) — the shared "Maximum render distance" for terrain overlays.
     static float GetRenderMaxDistance();
 
+    // Shared "Occlude behind terrain" configuration, so other in-world overlays (e.g. Danger Rings) test
+    // against the scene depth buffer identically and occlusion is controlled from one place (these settings).
+    static bool GetOccludeBehindTerrain();
+    static float GetDepthZNear();
+    static float GetDepthZFar();
+
 private:
     static void RegisterSettings(ToolboxModule* module);
     static void OnSettingsLoaded();