maps4fs 1.8.250__py3-none-any.whl → 1.8.252__py3-none-any.whl

maps4fs/generator/component/background.py

@@ -510,6 +510,18 @@ class Background(MeshComponent, ImageComponent):
         cv2.imwrite(self.output_path, dem_image)
         self.logger.debug("Water depth subtracted from DEM data: %s", self.output_path)
 
+    def _get_blur_power(self) -> int:
+        """Returns the blur power for the water resources to apply Gaussian blur.
+
+        Returns:
+            int: The blur power for the water resources.
+        """
+        blur_power = max(3, min(self.map.background_settings.water_blurriness, 99))
+        if blur_power % 2 == 0:
+            blur_power += 1
+
+        return blur_power
+
     def generate_water_resources_obj(self) -> None:
         """Generates 3D obj files based on water resources data."""
         if not os.path.isfile(self.water_resources_path):
@@ -533,6 +545,13 @@ class Background(MeshComponent, ImageComponent):
         # Single channeled 16 bit DEM image of terrain.
         background_dem = cv2.imread(self.not_substracted_path, cv2.IMREAD_UNCHANGED)
 
+        if self.map.background_settings.water_blurriness:
+            # Apply Gaussian blur to the background dem.
+            blur_power = self._get_blur_power()
+            background_dem = cv2.GaussianBlur(
+                background_dem, (blur_power, blur_power), sigmaX=blur_power, sigmaY=blur_power
+            )
+
         # Remove all the values from the background dem where the plane_water is 0.
         background_dem[plane_water == 0] = 0
 

maps4fs/generator/component/grle.py

@@ -173,18 +173,22 @@ class GRLE(ImageComponent, XMLComponent):
     def _add_farmlands(self) -> None:
         """Adds farmlands to the InfoLayer PNG file."""
         farmlands = []
+
+        fields = self.get_infolayer_data(Parameters.TEXTURES, Parameters.FIELDS)
+        if fields:
+            self.logger.debug("Found %s fields in textures info layer.", len(fields))
+            farmlands.extend(fields)
+
         farmyards = self.get_infolayer_data(Parameters.TEXTURES, Parameters.FARMYARDS)
         if farmyards and self.map.grle_settings.add_farmyards:
             farmlands.extend(farmyards)
             self.logger.debug("Found %s farmyards in textures info layer.", len(farmyards))
 
-        fields = self.get_infolayer_data(Parameters.TEXTURES, Parameters.FIELDS)
-        if not fields:
-            self.logger.debug("Fields data not found in textures info layer.")
+        if not farmlands:
+            self.logger.warning(
+                "No farmlands was obtained from fields or farmyards, skipping the processing."
+            )
             return
-        farmlands.extend(fields)
-
-        self.logger.debug("Found %s fields in textures info layer.", len(fields))
 
         info_layer_farmlands_path = self.game.get_farmlands_path(self.map_directory)
 

maps4fs/generator/settings.py

@@ -149,6 +149,7 @@ class BackgroundSettings(SettingsModel):
 
     generate_background: bool = False
     generate_water: bool = False
+    water_blurriness: int = 20
     resize_factor: int = 8
     remove_center: bool = True
     apply_decimation: bool = False

{maps4fs-1.8.250.dist-info → maps4fs-1.8.252.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 1.8.250
+Version: 1.8.252
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -601,6 +601,8 @@ You can also apply some advanced settings to the map generation process.<br>
 
 - Generate water - if enabled, the water planes obj files will be generated. You can turn it off if you already have those files or don't need them. By default, it's set to True.
 
+- Water blurriness - used to make the water surface smoother. The higher the value, the more flat surface of the water planes will be. However, too high values can lead to the water planes mesh not matching the terrain.
+
 - Resize factor - the factor by which the background terrain will be resized. It will be used as 1 / resize_factor while generating the models. Which means that the larger the value the more the terrain will be resized. The lowest value is 1, in this case background terrain will not be resized. Note, than low values will lead to long processing and enormous size of the obj files.
 
 - Remove center - if enabled, the playable region (map terrain) will be removed from the background terrain. By default, it's set to True.

{maps4fs-1.8.250.dist-info → maps4fs-1.8.252.dist-info}/RECORD

@@ -5,12 +5,12 @@ maps4fs/generator/dem.py,sha256=CDfdDGCWhFn2_QYY5TtxgsXm3lgJ4W4qD-46UU3u-ck,1320
 maps4fs/generator/game.py,sha256=NZaxj5z7WzMiHzAvQyr-TvVjGoHgqGldM6ZsItuYyzA,11292
 maps4fs/generator/map.py,sha256=64uIHCwfpFyFXZJSayB0tuRFn0LVuTwf0wrAi4KMv00,13600
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
-maps4fs/generator/settings.py,sha256=285LjC5mUuzpHNPubBqd928MU7Yd_ZlLEnkBY3RbiHs,6937
+maps4fs/generator/settings.py,sha256=E5sfkfJgcjh9QHpa7ILlV_jnrF6USpsOFxkooVnxrbs,6968
 maps4fs/generator/statistics.py,sha256=aynS3zbAtiwnU_YLKHPTiiaKW98_suvQUhy1SGBA6mc,2448
 maps4fs/generator/component/__init__.py,sha256=s01yVVVi8R2xxNvflu2D6wTd9I_g73AMM2x7vAC7GX4,490
-maps4fs/generator/component/background.py,sha256=gqKQnyHZ58i54KkU6m-zhZui5081Z7GaXAimGB-xJgM,22153
+maps4fs/generator/component/background.py,sha256=hsyNmHgi9NUcp3SoSawJeCDJY3tJNDMwmb_x1ovi0Fg,22852
 maps4fs/generator/component/config.py,sha256=RitKgFDZPzjA1fi8GcEi1na75qqaueUvpcITHjBvCXc,3674
-maps4fs/generator/component/grle.py,sha256=KlNbbYY4oyFfB_0qTInrweBTyLUW0koSSpqclkRw-Lk,19381
+maps4fs/generator/component/grle.py,sha256=99CFheRn2aDuE041iZj2usmh5spKSryKg3L848jVWdg,19475
 maps4fs/generator/component/i3d.py,sha256=iVXYYGzDpSp5J7vAo_LFnDA8GDAy43Y6aUIf7yP_ZTI,23101
 maps4fs/generator/component/layer.py,sha256=hbTBMLamKOWv_MXbnk-LjLyNV91jPsF33UEc17rBZCM,6185
 maps4fs/generator/component/satellite.py,sha256=oZBHjP_QY0ik1-Vk7JqMS__zIG8ffw2voeozB7-HUQc,4946
@@ -54,8 +54,8 @@ maps4fs/toolbox/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,4
 maps4fs/toolbox/background.py,sha256=RclEqxEWLbMxuEkkegQP8jybzugwQ1_R3rdfDe0s21U,2104
 maps4fs/toolbox/custom_osm.py,sha256=X6ZlPqiOhNjkmdD_qVroIfdOl9Rb90cDwVSLDVYgx80,1892
 maps4fs/toolbox/dem.py,sha256=z9IPFNmYbjiigb3t02ZenI3Mo8odd19c5MZbjDEovTo,3525
-maps4fs-1.8.250.dist-info/licenses/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.8.250.dist-info/METADATA,sha256=1Z_9w4Lf6h6jhymM3eANMJZz9gX3M0pnzy48hQRfv1g,47222
-maps4fs-1.8.250.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-maps4fs-1.8.250.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.8.250.dist-info/RECORD,,
+maps4fs-1.8.252.dist-info/licenses/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.8.252.dist-info/METADATA,sha256=mzBKk-bH_1vcnlmLvPM9WRrvKIpmaPU2mhDcCzAxSSQ,47443
+maps4fs-1.8.252.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+maps4fs-1.8.252.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.8.252.dist-info/RECORD,,