From e15f5bcee9a48932c66d4a4499a4a2ee23e26d3f Mon Sep 17 00:00:00 2001
From: doop <56421834+dooplecks@users.noreply.github.com>
Date: Wed, 29 Apr 2026 03:40:49 +0000
Subject: [PATCH 1/2] Improve map outline rendering

---
 src/d/d_map_path.cpp | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/src/d/d_map_path.cpp b/src/d/d_map_path.cpp
index f94cdc9475..911dd09cdd 100644
--- a/src/d/d_map_path.cpp
+++ b/src/d/d_map_path.cpp
@@ -16,6 +16,7 @@
 
 #ifdef TARGET_PC
 constexpr u16 kMapResolutionMultiplier = 4;
+constexpr u16 kMapCircleSize = 16 * kMapResolutionMultiplier;
 #endif
 
 void dMpath_n::dTexObjAggregate_c::create() {
@@ -32,6 +33,47 @@ void dMpath_n::dTexObjAggregate_c::create() {
         JUT_ASSERT(74, image->magFilter == GX_NEAR);
         mDoLib_setResTimgObj(image, mp_texObj[lp1], 0, NULL);
     }
+
+#if TARGET_PC
+    auto hqCircle = JKR_NEW TGXTexObj();
+
+    static bool hqCircleDrawn = false;
+    static u8 hqCircleData[kMapCircleSize * kMapCircleSize];
+
+    if (!hqCircleDrawn) {
+        const auto center = kMapCircleSize / 2.0f;
+        const auto radiusSq = center * center;
+        const auto blocksAcross = kMapCircleSize >> 3;
+
+        for (u16 y = 0; y < kMapCircleSize; y++) {
+            for (u16 x = 0; x < kMapCircleSize; x++) {
+                // swizzle raster order to I8 blocks
+                auto blockX = x >> 3;
+                auto blockY = y >> 2;
+                auto blockIdx = (blockY * blocksAcross) + blockX;
+
+                auto localX = x & 7;
+                auto localY = y & 3;
+                auto localIdx = (localY << 3) + localX;
+
+                auto finalOffset = (blockIdx << 5) + localIdx;
+
+                auto dx = (x + 0.5f) - center;
+                auto dy = (y + 0.5f) - center;
+
+                // the original texture is in I4 format and uses 1 to indicate if inside the circle
+                // so we scale to I8 range: 255 / 15 = 17
+                hqCircleData[finalOffset] = (dx * dx + dy * dy < radiusSq) ? 17 : 0;
+            }
+        }
+        hqCircleDrawn = true;
+    }
+
+    GXInitTexObj(hqCircle, hqCircleData, kMapCircleSize, kMapCircleSize, GX_TF_I8, GX_CLAMP,
+        GX_CLAMP, GX_FALSE);
+    GXInitTexObjLOD(hqCircle, GX_NEAR, GX_NEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1);
+    mp_texObj[6] = hqCircle;
+#endif
 }
 
 void dMpath_n::dTexObjAggregate_c::remove() {

From afe54f22abe94ad52c56622579f45ae503081907 Mon Sep 17 00:00:00 2001
From: doop <56421834+dooplecks@users.noreply.github.com>
Date: Wed, 29 Apr 2026 04:16:24 +0000
Subject: [PATCH 2/2] Write circle pixels linearly

---
 src/d/d_map_path.cpp | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/d/d_map_path.cpp b/src/d/d_map_path.cpp
index 911dd09cdd..eca620ef98 100644
--- a/src/d/d_map_path.cpp
+++ b/src/d/d_map_path.cpp
@@ -44,33 +44,34 @@ void dMpath_n::dTexObjAggregate_c::create() {
         const auto center = kMapCircleSize / 2.0f;
         const auto radiusSq = center * center;
         const auto blocksAcross = kMapCircleSize >> 3;
+        const auto totalPixels = sizeof(hqCircleData);
 
-        for (u16 y = 0; y < kMapCircleSize; y++) {
-            for (u16 x = 0; x < kMapCircleSize; x++) {
-                // swizzle raster order to I8 blocks
-                auto blockX = x >> 3;
-                auto blockY = y >> 2;
-                auto blockIdx = (blockY * blocksAcross) + blockX;
+        for (size_t i = 0; i < totalPixels; i++) {
+            // 8x4 block swizzling for I8
+            const auto blockIdx = i >> 5;
+            const auto localIdx = i & 31;
 
-                auto localX = x & 7;
-                auto localY = y & 3;
-                auto localIdx = (localY << 3) + localX;
+            const auto blockY = blockIdx / blocksAcross;
+            const auto blockX = blockIdx % blocksAcross;
 
-                auto finalOffset = (blockIdx << 5) + localIdx;
+            const auto localY = localIdx >> 3;
+            const auto localX = localIdx & 7;
 
-                auto dx = (x + 0.5f) - center;
-                auto dy = (y + 0.5f) - center;
+            const auto x = (blockX << 3) + localX;
+            const auto y = (blockY << 2) + localY;
 
-                // the original texture is in I4 format and uses 1 to indicate if inside the circle
-                // so we scale to I8 range: 255 / 15 = 17
-                hqCircleData[finalOffset] = (dx * dx + dy * dy < radiusSq) ? 17 : 0;
-            }
+            const auto dx = (x + 0.5f) - center;
+            const auto dy = (y + 0.5f) - center;
+
+            // the original texture is in I4 format and uses 1 to indicate if inside the circle
+            // so we scale to I8 range: 255 / 15 = 17
+            hqCircleData[i] = (dx * dx + dy * dy < radiusSq) ? 17 : 0;
         }
         hqCircleDrawn = true;
     }
 
     GXInitTexObj(hqCircle, hqCircleData, kMapCircleSize, kMapCircleSize, GX_TF_I8, GX_CLAMP,
-        GX_CLAMP, GX_FALSE);
+                 GX_CLAMP, GX_FALSE);
     GXInitTexObjLOD(hqCircle, GX_NEAR, GX_NEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1);
     mp_texObj[6] = hqCircle;
 #endif