maps4fs 1.8.245__py3-none-any.whl → 1.8.247__py3-none-any.whl

maps4fs/generator/component/background.py

@@ -6,10 +6,12 @@ from __future__ import annotations
 import os
 import shutil
 from copy import deepcopy
+from typing import Any
 
 import cv2
 import numpy as np
 from tqdm import tqdm
+from trimesh import Trimesh
 
 from maps4fs.generator.component.base.component_image import ImageComponent
 from maps4fs.generator.component.base.component_mesh import MeshComponent
@@ -44,6 +46,7 @@ class Background(MeshComponent, ImageComponent):
 
         self.background_size = self.map_size + Parameters.BACKGROUND_DISTANCE * 2
         self.rotated_size = int(self.background_size * output_size_multiplier)
+        self.mesh_info: list[dict[str, Any]] = []
 
         self.background_directory = os.path.join(self.map_directory, "background")
         self.water_directory = os.path.join(self.map_directory, "water")
@@ -194,6 +197,7 @@ class Background(MeshComponent, ImageComponent):
 
         dem_info_sequence = self.dem.info_sequence()
         data["DEM"] = dem_info_sequence
+        data["Mesh"] = self.mesh_info
         return data  # type: ignore
 
     def qgis_sequence(self) -> None:
@@ -300,6 +304,11 @@ class Background(MeshComponent, ImageComponent):
             remove_size=self.map_size,
         )
 
+        try:
+            self.update_mesh_info(save_path, mesh)
+        except Exception as e:
+            self.logger.error("Could not update mesh info: %s", e)
+
         mesh.export(save_path)
         self.logger.debug("Obj file saved: %s", save_path)
 
@@ -307,6 +316,29 @@ class Background(MeshComponent, ImageComponent):
             mesh.apply_scale([0.5, 0.5, 0.5])
             self.mesh_to_stl(mesh, save_path=self.stl_preview_path)
 
+    def update_mesh_info(self, save_path: str, mesh: Trimesh) -> None:
+        """Updates the mesh info with the data from the mesh.
+
+        Arguments:
+            save_path (str): The path where the mesh is saved.
+            mesh (Trimesh): The mesh to get the data from.
+        """
+        filename = os.path.splitext(os.path.basename(save_path))[0]
+        x_size, y_size, z_size = mesh.extents
+        x_center, y_center, z_center = mesh.centroid
+
+        entry = {
+            "name": filename,
+            "x_size": round(x_size, 4),
+            "y_size": round(y_size, 4),
+            "z_size": round(z_size, 4),
+            "x_center": round(x_center, 4),
+            "y_center": round(y_center, 4),
+            "z_center": round(z_center, 4),
+        }
+
+        self.mesh_info.append(entry)
+
     def previews(self) -> list[str]:
         """Returns the path to the image previews paths and the path to the STL preview file.
 

maps4fs/generator/component/base/component_mesh.py

@@ -130,11 +130,12 @@ class MeshComponent(Component):
                 percent=percent, aggression=decimation_agression
             )
 
-        try:
-            if not mesh.is_watertight:
-                mesh = MeshComponent.fix_mesh(mesh)
-        except Exception:
-            pass
+        # * Looks like it takes some time but has no effect on the result.
+        # try:
+        #     if not mesh.is_watertight:
+        #         mesh = MeshComponent.fix_mesh(mesh)
+        # except Exception:
+        #     pass
 
         mesh = MeshComponent.mesh_to_output_size(
             mesh,
@@ -249,7 +250,26 @@ class MeshComponent(Component):
 
         _, _, z_size = mesh_copy.extents
 
+        try:
+            mesh_copy = MeshComponent.mesh_to_origin(mesh_copy)
+        except Exception:
+            pass
         cube_mesh = trimesh.creation.box([remove_size, remove_size, z_size * 4])
-        cube_mesh.apply_translation(mesh_copy.centroid - cube_mesh.centroid)
 
         return trimesh.boolean.difference([mesh_copy, cube_mesh], check_volume=False)
+
+    @staticmethod
+    def mesh_to_origin(mesh: trimesh.Trimesh) -> trimesh.Trimesh:
+        """Moves the mesh to the origin using mesh size.
+
+        Arguments:
+            mesh (trimesh.Trimesh): The mesh to move to the origin.
+
+        Returns:
+            trimesh.Trimesh: The mesh moved to the origin.
+        """
+        mesh_copy = mesh.copy()
+        x_size, _, _ = mesh_copy.extents
+        distance = int(round(x_size) / 2)
+        mesh_copy.apply_translation([-distance, distance, 0])
+        return mesh_copy

{maps4fs-1.8.245.dist-info → maps4fs-1.8.247.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: maps4fs
-Version: 1.8.245
+Version: 1.8.247
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License

{maps4fs-1.8.245.dist-info → maps4fs-1.8.247.dist-info}/RECORD

@@ -8,7 +8,7 @@ maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,611
 maps4fs/generator/settings.py,sha256=285LjC5mUuzpHNPubBqd928MU7Yd_ZlLEnkBY3RbiHs,6937
 maps4fs/generator/statistics.py,sha256=aynS3zbAtiwnU_YLKHPTiiaKW98_suvQUhy1SGBA6mc,2448
 maps4fs/generator/component/__init__.py,sha256=s01yVVVi8R2xxNvflu2D6wTd9I_g73AMM2x7vAC7GX4,490
-maps4fs/generator/component/background.py,sha256=QwyTaltQOTo3lD1uxewY99zw5Wd91CBWRQ35cC67WuE,21047
+maps4fs/generator/component/background.py,sha256=gqKQnyHZ58i54KkU6m-zhZui5081Z7GaXAimGB-xJgM,22153
 maps4fs/generator/component/config.py,sha256=RitKgFDZPzjA1fi8GcEi1na75qqaueUvpcITHjBvCXc,3674
 maps4fs/generator/component/grle.py,sha256=KlNbbYY4oyFfB_0qTInrweBTyLUW0koSSpqclkRw-Lk,19381
 maps4fs/generator/component/i3d.py,sha256=QsqtyOLyc_Y10UthV03EjZO60mHBubPvbEvLIsxzank,23017
@@ -18,7 +18,7 @@ maps4fs/generator/component/texture.py,sha256=ELU5QwysZaMPH9QQkE5jzIHAOzZ_Y8khcT
 maps4fs/generator/component/base/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
 maps4fs/generator/component/base/component.py,sha256=CIR4Fjn9YfLU4y7nB_jOaz7PjGFvBcDnHlvXxeahpdM,21499
 maps4fs/generator/component/base/component_image.py,sha256=2QnJ9xm0D54v4whg7bc1s-kwRVjZHhOo1OR5jHr1Qp0,4786
-maps4fs/generator/component/base/component_mesh.py,sha256=pc7UVakZCnJPV-0Ukdsm6aUD3NFZbOUazuEbb44k170,8747
+maps4fs/generator/component/base/component_mesh.py,sha256=BsxS5NlUK2hLhksgCwSoMK-00GNAwK2fYGpgb3R4n1w,9396
 maps4fs/generator/component/base/component_xml.py,sha256=6OO1dKoceO1ACk7-k1oGtnkfNud8ZN3u3ZNjdNMpTqw,3967
 maps4fs/generator/dtm/__init__.py,sha256=VIWcZiMZ0UtnJl7rQL-PVHDivXbZVwrBWumjhTTnnKY,1454
 maps4fs/generator/dtm/arctic.py,sha256=LSivLLjtd6TJUaPYvgSYQ4KalMTaY58zFvwivSh45uM,2587
@@ -53,8 +53,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.245.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.8.245.dist-info/METADATA,sha256=R1oGGAr_10yySkzzFPJiOXvZZa7EWACDgVt7QKBAXpk,47093
-maps4fs-1.8.245.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
-maps4fs-1.8.245.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.8.245.dist-info/RECORD,,
+maps4fs-1.8.247.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.8.247.dist-info/METADATA,sha256=zH2xHd_cCbDtGc2Am8LIduDJCOJ3l3wElz7k4ixLu78,47093
+maps4fs-1.8.247.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+maps4fs-1.8.247.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.8.247.dist-info/RECORD,,

{maps4fs-1.8.245.dist-info → maps4fs-1.8.247.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.1)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any