..

Author: ahyangyi

agrf/graphics/cv/foundation.py

@@ -34,7 +34,7 @@ def get_left_part(left_parts, r, c, solid, scale):
 
 
 def make_foundation_subimage(
-    img: LayeredImage, scale, left_parts, right_parts, s_shareground, cut_inside, zshift, solid
+    img: LayeredImage, scale, left_parts, right_parts, y_limit, cut_inside, zshift, solid
 ) -> LayeredImage:
     if img.alpha is not None:
         r = np.arange(img.h)[:, np.newaxis] + img.yofs + 0.5 + zshift * scale
@@ -51,8 +51,7 @@ def make_foundation_subimage(
             # FIXME
             pass
 
-        if not s_shareground:
-            alphamask *= (1 - (r * 2 - c > 48 * scale) * (r * 2 + c > 48 * scale)).astype(np.uint8)
+        alphamask *= (1 - (r * 2 - c > y_limit * scale) * (r * 2 + c > y_limit * scale)).astype(np.uint8)
 
         alpha = img.alpha * alphamask
     else:
@@ -62,14 +61,12 @@ def make_foundation_subimage(
 
 
 def make_foundation(
-    solid: LayeredImage, ground: LayeredImage, scale, left_parts, right_parts, s_shareground, cut_inside, zshift
+    solid: LayeredImage, ground: LayeredImage, scale, left_parts, right_parts, y_limit, cut_inside, zshift
 ) -> LayeredImage:
     if solid is not None:
-        solid = make_foundation_subimage(solid, scale, left_parts, right_parts, s_shareground, cut_inside, zshift, True)
+        solid = make_foundation_subimage(solid, scale, left_parts, right_parts, y_limit, cut_inside, zshift, True)
     if ground is not None:
-        ground = make_foundation_subimage(
-            ground, scale, left_parts, right_parts, s_shareground, cut_inside, zshift, False
-        )
+        ground = make_foundation_subimage(ground, scale, left_parts, right_parts, y_limit, cut_inside, zshift, False)
     if solid is not None and ground is not None:
         return ground.copy().blend_over(solid)
     return solid or ground

agrf/graphics/cv/foundation_test.py

@@ -14,7 +14,7 @@ def test_make_foundation_subimage_basic_left_side():
     base = _full_alpha_image()
     # part (6, 0) targets the left side (c <= 0) when scale=4 and xofs=0
     out = make_foundation_subimage(
-        base, scale=4, left_parts=6, right_parts=None, s_shareground=True, cut_inside=False, zshift=0, solid=True
+        base, scale=4, left_parts=6, right_parts=None, y_limit=64, cut_inside=False, zshift=0, solid=True
     )
     assert out.alpha is not None
     # Left-most column should be non-zero
@@ -28,7 +28,7 @@ def test_make_foundation_subimage_alpha_none_passthrough():
     rgb = np.zeros((8, 8, 3), dtype=np.uint8)
     base = LayeredImage(0, 0, 8, 8, rgb, None, None)
     out = make_foundation_subimage(
-        base, scale=4, left_parts=6, right_parts=None, s_shareground=True, cut_inside=False, zshift=0, solid=True
+        base, scale=4, left_parts=6, right_parts=None, y_limit=64, cut_inside=False, zshift=0, solid=True
     )
     assert out.alpha is None
 
@@ -37,26 +37,19 @@ def test_make_foundation_passthrough_single_input():
     base = _full_alpha_image()
     # Only solid provided
     expected_solid = make_foundation_subimage(
-        base.copy(), scale=4, left_parts=6, right_parts=None, s_shareground=True, cut_inside=False, zshift=0, solid=True
+        base.copy(), scale=4, left_parts=6, right_parts=None, y_limit=64, cut_inside=False, zshift=0, solid=True
     )
     out_solid = make_foundation(
-        base, None, scale=4, left_parts=6, right_parts=None, s_shareground=True, cut_inside=False, zshift=0
+        base, None, scale=4, left_parts=6, right_parts=None, y_limit=64, cut_inside=False, zshift=0
     )
     assert np.array_equal(out_solid.alpha, expected_solid.alpha)
 
     # Only ground provided
     expected_ground = make_foundation_subimage(
-        base.copy(),
-        scale=4,
-        left_parts=6,
-        right_parts=None,
-        s_shareground=True,
-        cut_inside=False,
-        zshift=0,
-        solid=False,
+        base.copy(), scale=4, left_parts=6, right_parts=None, y_limit=64, cut_inside=False, zshift=0, solid=False
     )
     out_ground = make_foundation(
-        None, base, scale=4, left_parts=6, right_parts=None, s_shareground=True, cut_inside=False, zshift=0
+        None, base, scale=4, left_parts=6, right_parts=None, y_limit=64, cut_inside=False, zshift=0
     )
     assert np.array_equal(out_ground.alpha, expected_ground.alpha)
 
@@ -66,10 +59,10 @@ def test_make_foundation_subimage_zshift_reduces_coverage_for_part0():
     base = _full_alpha_image()
     base.yofs = 120
     out0 = make_foundation_subimage(
-        base, scale=4, left_parts=6, right_parts=None, s_shareground=True, cut_inside=False, zshift=0, solid=True
+        base, scale=4, left_parts=6, right_parts=None, y_limit=64, cut_inside=False, zshift=0, solid=True
     )
     out1 = make_foundation_subimage(
-        base, scale=4, left_parts=6, right_parts=None, s_shareground=True, cut_inside=False, zshift=2, solid=True
+        base, scale=4, left_parts=6, right_parts=None, y_limit=64, cut_inside=False, zshift=2, solid=True
     )
     sum0 = int(out0.alpha.sum())
     sum1 = int(out1.alpha.sum())

agrf/graphics/sprites/foundation.py

@@ -8,9 +8,7 @@
 
 
 class FoundationSprite(grf.Sprite):
-    def __init__(
-        self, solid_sprite, ground_sprite, left_parts, right_parts, s_shareground, cut_inside, zshift, zoffset
-    ):
+    def __init__(self, solid_sprite, ground_sprite, left_parts, right_parts, y_limit, cut_inside, zshift, zoffset):
         representative = ground_sprite or solid_sprite
         super().__init__(
             representative.w,
@@ -25,7 +23,7 @@ def __init__(
         self.ground_sprite = ground_sprite
         self.left_parts = left_parts
         self.right_parts = right_parts
-        self.s_shareground = s_shareground
+        self.y_limit = y_limit
         self.cut_inside = cut_inside
         self.zshift = zshift
         self.zoffset = zoffset
@@ -36,7 +34,7 @@ def get_fingerprint(self):
             "ground_sprite": self.ground_sprite.get_fingerprint() if self.ground_sprite is not None else None,
             "left_parts": self.left_parts,
             "right_parts": self.right_parts,
-            "s_shareground": self.s_shareground,
+            "y_limit": self.y_limit,
             "cut_inside": self.cut_inside,
             "zshift": self.zshift,
             "zoffset": self.zoffset,
@@ -59,7 +57,7 @@ def get_data_layers(self, context):
             ZOOM_TO_SCALE[(self.solid_sprite or self.ground_sprite).zoom],
             self.left_parts,
             self.right_parts,
-            self.s_shareground,
+            self.y_limit,
             self.cut_inside,
             self.zshift,
         )

agrf/lib/building/foundation.py

@@ -104,6 +104,13 @@ def get_sprite_conf(self, style, i):
             ("extended", 9): (5, 7),
         }[style, i]
 
+        if (left is not None and (left & 1)) or (right is not None and (right & 1)):
+            y_limit = 48
+        else:
+            y_limit = 64
+        if self.s_shareground:
+            y_limit += 16
+
         if left is not None:
             left = (left & 3) + (left & 6) * 2
             if self.nw_clip:
@@ -118,13 +125,13 @@ def get_sprite_conf(self, style, i):
             if self.se_shareground:
                 right = right & 12
 
-        return left, right
+        return left, right, y_limit
 
     def make_foundations_subset(self, subset):
         # sprite.voxel.render()  # FIXME agrf cannot correctly track dependencies here
         ret = []
         for style, i in subset:
-            l, r = self.get_sprite_conf(style, i)
+            l, r, y_limit = self.get_sprite_conf(style, i)
             alts = []
             for scale in [1, 2, 4]:
                 for bpp in [32]:
@@ -143,7 +150,7 @@ def make_foundations_subset(self, subset):
                             g,
                             l,
                             r,
-                            self.s_shareground,
+                            y_limit,
                             self.cut_inside,
                             zshift=self.zshift,
                             zoffset=(8 if style == "ground" else 0),