maps4fs 1.8.244__tar.gz → 1.8.246__tar.gz

{maps4fs-1.8.244 → maps4fs-1.8.246}/PKG-INFO

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

{maps4fs-1.8.244 → maps4fs-1.8.246}/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-1.8.244 → maps4fs-1.8.246}/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.244 → maps4fs-1.8.246}/maps4fs.egg-info/PKG-INFO

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

{maps4fs-1.8.244 → maps4fs-1.8.246}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maps4fs"
-version = "1.8.244"
+version = "1.8.246"
 description = "Generate map templates for Farming Simulator from real places."
 authors = [{name = "iwatkot", email = "iwatkot@gmail.com"}]
 license = {text = "MIT License"}