diff --git a/world_maker/data/building.png b/world_maker/data/building.png index dcbcdab..9dc311c 100644 Binary files a/world_maker/data/building.png and b/world_maker/data/building.png differ diff --git a/world_maker/data/city_map.png b/world_maker/data/city_map.png new file mode 100644 index 0000000..1a5949c Binary files /dev/null and b/world_maker/data/city_map.png differ diff --git a/world_maker/data/district.png b/world_maker/data/district.png index f6df0f7..96b3d4f 100644 Binary files a/world_maker/data/district.png and b/world_maker/data/district.png differ diff --git a/world_maker/data/mountain_map.png b/world_maker/data/mountain_map.png index 47746e8..082c138 100644 Binary files a/world_maker/data/mountain_map.png and b/world_maker/data/mountain_map.png differ diff --git a/world_maker/data/roadmap.png b/world_maker/data/roadmap.png index 4375229..3c976c0 100644 Binary files a/world_maker/data/roadmap.png and b/world_maker/data/roadmap.png differ diff --git a/world_maker/data/skeleton_highway.png b/world_maker/data/skeleton_highway.png index cee9fe4..221a5d9 100644 Binary files a/world_maker/data/skeleton_highway.png and b/world_maker/data/skeleton_highway.png differ diff --git a/world_maker/data/skeleton_mountain.png b/world_maker/data/skeleton_mountain.png index 8c170dd..050fff0 100644 Binary files a/world_maker/data/skeleton_mountain.png and b/world_maker/data/skeleton_mountain.png differ diff --git a/world_maker/data/skeleton_mountain_area.png b/world_maker/data/skeleton_mountain_area.png index 3f54167..af563e2 100644 Binary files a/world_maker/data/skeleton_mountain_area.png and b/world_maker/data/skeleton_mountain_area.png differ diff --git a/world_maker/data_analysis.py b/world_maker/data_analysis.py index 717b335..6386d74 100644 --- a/world_maker/data_analysis.py +++ b/world_maker/data_analysis.py @@ -234,7 +234,7 @@ def skeleton_mountain_map(image: Union[str, Image] = './world_maker/data/mountai skeleton.parse_graph() heightmap_skeleton = skeleton.map() heightmap_skeleton.save('./world_maker/data/skeleton_mountain.png') - skeleton.road_area('skeleton_mountain_area.png',3) + skeleton.road_area('skeleton_mountain_area.png', 3) return skeleton @@ -275,18 +275,18 @@ def detect_mountain(image: Union[str, Image] = './world_maker/data/sobelmap.png' return (cX, cY) -def rectangle_2D_to_3D(rectangle: list[tuple[tuple[int, int],tuple[int, int]]], - height_min:int = 6, height_max:int = 10) \ +def rectangle_2D_to_3D(rectangle: list[tuple[tuple[int, int], tuple[int, int]]], + height_min: int = 6, height_max: int = 10) \ -> list[tuple[tuple[int, int, int], tuple[int, int, int]]]: - image = handle_import_image('./world_maker/data/heightmap.png') + image = handle_import_image('./world_maker/data/heightmap.png').convert('L') new_rectangle = [] for rect in rectangle: start, end = rect avg_height = 0 for x in range(start[0], end[0]): for y in range(start[1], end[1]): - avg_height += np.array(image.getpixel((x, y))) + avg_height += image.getpixel((x, y)) avg_height = int(avg_height / ((end[0] - start[0]) * (end[1] - start[1]))) - new_rectangle.append(((start[0], avg_height, start[1]), (end[0], avg_height + randint(height_min, height_max), end[1]))) + new_rectangle.append( + ((start[0], avg_height, start[1]), (end[0], avg_height + randint(height_min, height_max), end[1]))) return new_rectangle -