s_shareground

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, cut_inside, zshift, solid
+    img: LayeredImage, scale, left_parts, right_parts, s_shareground, cut_inside, zshift, solid
 ) -> LayeredImage:
     if img.alpha is not None:
         r = np.arange(img.h)[:, np.newaxis] + img.yofs + 0.5 + zshift * scale
@@ -50,6 +50,10 @@ def make_foundation_subimage(
         if cut_inside:
             # FIXME
             pass
+
+        if not s_shareground:
+            alphamask *= (1 - (r * 2 - c > 48 * scale) * (r * 2 + c > 48 * scale)).astype(np.uint8)
+
         alpha = img.alpha * alphamask
     else:
         alpha = None
@@ -58,12 +62,14 @@ def make_foundation_subimage(
 
 
 def make_foundation(
-    solid: LayeredImage, ground: LayeredImage, scale, left_parts, right_parts, cut_inside, zshift
+    solid: LayeredImage, ground: LayeredImage, scale, left_parts, right_parts, s_shareground, cut_inside, zshift
 ) -> LayeredImage:
     if solid is not None:
-        solid = make_foundation_subimage(solid, scale, left_parts, right_parts, cut_inside, zshift, True)
+        solid = make_foundation_subimage(solid, scale, left_parts, right_parts, s_shareground, cut_inside, zshift, True)
     if ground is not None:
-        ground = make_foundation_subimage(ground, scale, left_parts, right_parts, cut_inside, zshift, False)
+        ground = make_foundation_subimage(
+            ground, scale, left_parts, right_parts, s_shareground, 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/sprites/foundation.py

@@ -8,7 +8,9 @@
 
 
 class FoundationSprite(grf.Sprite):
-    def __init__(self, solid_sprite, ground_sprite, left_parts, right_parts, cut_inside, zshift, zoffset):
+    def __init__(
+        self, solid_sprite, ground_sprite, left_parts, right_parts, s_shareground, cut_inside, zshift, zoffset
+    ):
         representative = ground_sprite or solid_sprite
         super().__init__(
             representative.w,
@@ -23,6 +25,7 @@ def __init__(self, solid_sprite, ground_sprite, left_parts, right_parts, cut_ins
         self.ground_sprite = ground_sprite
         self.left_parts = left_parts
         self.right_parts = right_parts
+        self.s_shareground = s_shareground
         self.cut_inside = cut_inside
         self.zshift = zshift
         self.zoffset = zoffset
@@ -33,6 +36,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,
             "cut_inside": self.cut_inside,
             "zshift": self.zshift,
             "zoffset": self.zoffset,
@@ -55,6 +59,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.cut_inside,
             self.zshift,
         )

agrf/lib/building/foundation.py

@@ -21,6 +21,7 @@ class Foundation(CachedFunctorMixin):
     ne_clip: bool = False
     sw_shareground: bool = False
     se_shareground: bool = False
+    s_shareground: bool = False
     debug_number: int = -1
 
     def __post_init__(self):
@@ -138,7 +139,14 @@ def make_foundations_subset(self, subset):
 
                     if s is not None or g is not None:
                         fs = FoundationSprite(
-                            s, g, l, r, self.cut_inside, zshift=self.zshift, zoffset=(8 if style == "ground" else 0)
+                            s,
+                            g,
+                            l,
+                            r,
+                            self.s_shareground,
+                            self.cut_inside,
+                            zshift=self.zshift,
+                            zoffset=(8 if style == "ground" else 0),
                         )
                         alts.append(fs)
 
@@ -173,5 +181,6 @@ def get_fingerprint(self):
             "ne_clip": int(self.ne_clip),
             "sw_shareground": int(self.sw_shareground),
             "se_shareground": int(self.se_shareground),
+            "s_shareground": int(self.s_shareground),
             "debug_number": self.debug_number,
         }