Optimize remove_trees

2024-09-27 23:37:24 +02:00
parent 68241ae415
commit 12cdacba4e
14 changed files with 2 additions and 5 deletions
--- a/world_maker/data/building_moutain.png
+++ b/world_maker/data/building_moutain.png
--- a/world_maker/data/district.png
+++ b/world_maker/data/district.png
--- a/world_maker/data/heightmap.png
+++ b/world_maker/data/heightmap.png
--- a/world_maker/data/heightmap_smooth.png
+++ b/world_maker/data/heightmap_smooth.png
--- a/world_maker/data/heightmap_smooth_2.png
+++ b/world_maker/data/heightmap_smooth_2.png
--- a/world_maker/data/heightmap_with_building.png
+++ b/world_maker/data/heightmap_with_building.png
--- a/world_maker/data/removed_treesmap.png
+++ b/world_maker/data/removed_treesmap.png
--- a/world_maker/data/skeleton_highway.png
+++ b/world_maker/data/skeleton_highway.png
--- a/world_maker/data/skeleton_mountain.png
+++ b/world_maker/data/skeleton_mountain.png
--- a/world_maker/data/smooth_for_highway.png
+++ b/world_maker/data/smooth_for_highway.png
--- a/world_maker/data/sobelmap.png
+++ b/world_maker/data/sobelmap.png
--- a/world_maker/data/sobelmap_from_smooth.png
+++ b/world_maker/data/sobelmap_from_smooth.png
--- a/world_maker/data/treemap.png
+++ b/world_maker/data/treemap.png
--- a/world_maker/terraforming.py
+++ b/world_maker/terraforming.py
@@ -31,11 +31,8 @@ def remove_trees(heightmap: Union[str, Image], treesmap: Union[str, Image], mask
        if mask.getpixel((x, z)) != 0 and treesmap.getpixel((x, z)) > 0:

            tree_area = morphology.flood(treesmap, (z, x), tolerance=1)
-            blend = img.blend(img.fromarray(tree_area).convert(
-                'L'), removed_treesmap.convert('L'), 0.5)
-            array = np.array(blend.convert('L'))
-            bool_array = array > 1
-            removed_treesmap = img.fromarray(bool_array)
+            removed_treesmap = img.fromarray(
+                np.where(tree_area, treesmap, 0).astype(np.uint8))

            y = heightmap.getpixel((x, z))
            y_top = removed_treesmap.getpixel((x, z))