Migrate transpose_from_heitmap

main.py

@@ -3,7 +3,8 @@ import random
 import gdpc.exceptions
 
 from world_maker.world_maker import *
-from world_maker.Skeleton import Skeleton, transpose_form_heightmap, simplify_coordinates
+from world_maker.data_analysis import transpose_form_heightmap
+from world_maker.Skeleton import Skeleton, simplify_coordinates
 from networks.geometry.Point3D import Point3D
 from networks.roads_2.Road import Road
 from networks.legacy_roads import roads
@@ -17,12 +18,13 @@ def main():
 
     editor = Editor(buffering=True)
     buildArea = editor.getBuildArea()
+    origin = ((buildArea.begin).x, (buildArea.begin).z)
 
-    # set_roads(skeleton_mountain)
-    # set_roads(skeleton_highway)
-    # set_roads_grids(road_grid)
-    roads.setRoads(skeleton_mountain)
-    roads.setRoads(skeleton_highway)
+    set_roads(skeleton_mountain, origin)
+    set_roads(skeleton_highway, origin)
+    set_roads_grids(road_grid, origin)
+    # roads.setRoads(skeleton_mountain)
+    # roads.setRoads(skeleton_highway)
 
     blocks = {
         "wall": "blackstone",
@@ -61,28 +63,28 @@ def main():
         house.build()
 
 
-def set_roads_grids(road_grid: Road_grid):
+def set_roads_grids(road_grid: Road_grid, origin):
     for i in range(len(road_grid)):
         if road_grid[i].border:
             for j in range(len(road_grid)):
                 # Same line
                 if (road_grid[i].position.x == road_grid[j].position.x and road_grid[i].position.y != road_grid[j].position.y) or (road_grid[i].position.x != road_grid[j].position.x and road_grid[i].position.y == road_grid[j].position.y):
                     point_1 = transpose_form_heightmap(
-                        './world_maker/data/heightmap.png', (road_grid[i].position.x, road_grid[i].position.y))
+                        './world_maker/data/heightmap.png', (road_grid[i].position.x, road_grid[i].position.y), origin)
                     point_2 = transpose_form_heightmap(
-                        './world_maker/data/heightmap.png', (road_grid[j].position.x, road_grid[j].position.y))
+                        './world_maker/data/heightmap.png', (road_grid[j].position.x, road_grid[j].position.y), origin)
                     Road(
                         [Point3D(point_1[0], point_1[1], point_1[2]), Point3D(point_2[0], point_2[1], point_2[2])], 9)
 
 
-def set_roads(skeleton: Skeleton):
+def set_roads(skeleton: Skeleton, origin):
     # Parsing
     print("[Roads] Start parsing...")
     for i in range(len(skeleton.lines)):
         print(f"[Roads] Parsing skeleton {i+1}/{len(skeleton.lines)}.")
         for j in range(len(skeleton.lines[i])):
             xyz = transpose_form_heightmap('./world_maker/data/heightmap.png',
-                                           skeleton.coordinates[skeleton.lines[i][j]])
+                                           skeleton.coordinates[skeleton.lines[i][j]], origin)
             skeleton.lines[i][j] = xyz
 
     print("[Roads] Start simplification...")

world_maker/Skeleton.py

@@ -16,17 +16,6 @@ def handle_import_image(image: Union[str, Image]) -> Image:
     return image
 
 
-def transpose_form_heightmap(heightmap: Union[str, Image], coordinates):
-    heightmap = handle_import_image(heightmap).convert('L')
-
-    editor = Editor()
-    xMin = (editor.getBuildArea().begin).x
-    zMin = (editor.getBuildArea().begin).z
-
-    return (coordinates[0] + xMin, heightmap.getpixel(
-        (coordinates[0], coordinates[-1])), coordinates[-1] + zMin)
-
-
 def simplify_coordinates(coordinates, epsilon):
     if len(coordinates) < 3:
         return coordinates

world_maker/data_analysis.py

@@ -299,3 +299,12 @@ def rectangle_2D_to_3D(rectangle: list[tuple[tuple[int, int], tuple[int, int]]],
         new_rectangle.append(
             ((start[0], avg_height, start[1]), (end[0], avg_height + randint(height_min, height_max), end[1])))
     return new_rectangle
+
+
+def transpose_form_heightmap(heightmap: Union[str, Image], coordinates, origin: tuple[int, int]) -> tuple[int, int, int]:
+    heightmap = handle_import_image(heightmap).convert('L')
+
+    xMin, zMin = origin
+
+    return (coordinates[0] + xMin, heightmap.getpixel(
+        (coordinates[0], coordinates[-1])), coordinates[-1] + zMin)