Add smooth building terrain

world_maker/data_analysis.py

@@ -169,13 +169,13 @@ def overide_map(base: Image, top: Image) -> Image:
 
     for x in range(width):
         for y in range(height):
-            pixel1 = base.getpixel((x, y))
+            base_pixel = base.getpixel((x, y))
-            pixel2 = top.getpixel((x, y))
+            top_pixel = top.getpixel((x, y))
 
-            if pixel1 != 0:
+            if top_pixel != 0:
-                result_image.putpixel((x, y), pixel1)
+                result_image.putpixel((x, y), top_pixel)
             else:
-                result_image.putpixel((x, y), pixel2)
+                result_image.putpixel((x, y), base_pixel)
 
     return result_image
 
@@ -247,7 +247,8 @@ def create_volume(surface: np.ndarray, heightmap: np.ndarray, make_it_flat: bool
 
 def convert_2D_to_3D(image: Union[str, Image], make_it_flat: bool = False) -> np.ndarray:
     image = handle_import_image(image)
-    heightmap = Image.open('./world_maker/data/heightmap.png').convert('L')
+    heightmap = Image.open(
+        './world_maker/data/heightmap_smooth.png').convert('L')
     heightmap = np.array(heightmap)
     surface = np.array(image)
     volume = create_volume(surface, heightmap, make_it_flat)

world_maker/pack_rectangle.py

@@ -97,9 +97,14 @@ def draw_rectangles(rectangles, grid, heightmap):
     image = Image.new('L', (len(grid[0]), len(grid)), (0))
     for rectangle in rectangles:
         start, end = rectangle
+        height = []
         for x in range(start[0], end[0]):
             for y in range(start[1], end[1]):
-                image.putpixel((x, y), heightmap.getpixel((x, y)))
+                height.append(heightmap.getpixel((x, y)))
+        height_average = sum(height)/len(height)
+        for x in range(start[0], end[0]):
+            for y in range(start[1], end[1]):
+                image.putpixel((x, y), round(height_average))
     return image
 
 

world_maker/world_maker.py

@@ -12,9 +12,6 @@ def world_maker():
     world = World()
     heightmap, watermap, treemap = get_data(world)
 
-    filter_smooth(
-        './world_maker/data/heightmap.png', 4).save('./world_maker/data/heightmap_smooth.png')
-
     filter_sobel(
         "./world_maker/data/heightmap.png").save('./world_maker/data/sobelmap.png')
 
@@ -53,4 +50,18 @@ def world_maker():
                 './world_maker/data/building_moutain.png').save('./world_maker/data/heightmap_with_building.png')
     overide_map('./world_maker/data/heightmap_with_building.png',
                 './world_maker/data/building.png').save('./world_maker/data/heightmap_with_building.png')
+    filter_smooth(
+        './world_maker/data/heightmap_with_building.png', 2).save('./world_maker/data/heightmap_smooth.png')
+    overide_map('./world_maker/data/heightmap_with_building.png',
+                './world_maker/data/building_moutain.png').save('./world_maker/data/heightmap_with_building.png')
+    overide_map('./world_maker/data/heightmap_with_building.png',
+                './world_maker/data/building.png').save('./world_maker/data/heightmap_with_building.png')
+    filter_smooth(
+        './world_maker/data/heightmap_with_building.png', 2).save('./world_maker/data/heightmap_smooth.png')
+    overide_map('./world_maker/data/heightmap_with_building.png',
+                './world_maker/data/building_moutain.png').save('./world_maker/data/heightmap_with_building.png')
+    overide_map('./world_maker/data/heightmap_with_building.png',
+                './world_maker/data/building.png').save('./world_maker/data/heightmap_with_building.png')
+    filter_smooth(
+        './world_maker/data/heightmap_with_building.png', 2).save('./world_maker/data/heightmap_smooth.png')
     return rectangle_mountain, rectangle_building, skeleton_highway, skeleton_mountain, road_grid