voxcity 0.3.22__py3-none-any.whl → 0.3.24__py3-none-any.whl

voxcity/utils/visualization.py

@@ -923,24 +923,32 @@ def visualize_point_grid_on_basemap(point_gdf, value_name='value', **kwargs):
     plt.tight_layout()
     plt.show()
 
-def create_multi_view_scene(meshes, output_directory="output"):
+def create_multi_view_scene(meshes, output_directory="output", projection_type="perspective", distance_factor=1.0):
     """
     Create multiple views of the scene from different angles.
+    
+    Args:
+        meshes: Dictionary of meshes to visualize
+        output_directory: Directory to save output images
+        projection_type: Either "perspective" or "orthographic" (default: "perspective")
     """
-    # Get the first mesh to compute bounding box
-    first_mesh = next(iter(meshes.values()))
-    vertices = first_mesh.vertices
+    # Compute overall bounding box across all meshes
+    vertices_list = [mesh.vertices for mesh in meshes.values()]
+    all_vertices = np.vstack(vertices_list)
     bbox = np.array([
-        [vertices[:, 0].min(), vertices[:, 1].min(), vertices[:, 2].min()],
-        [vertices[:, 0].max(), vertices[:, 1].max(), vertices[:, 2].max()]
+        [all_vertices[:, 0].min(), all_vertices[:, 1].min(), all_vertices[:, 2].min()],
+        [all_vertices[:, 0].max(), all_vertices[:, 1].max(), all_vertices[:, 2].max()]
     ])
 
     # Compute the center and diagonal of the bounding box
     center = (bbox[1] + bbox[0]) / 2
     diagonal = np.linalg.norm(bbox[1] - bbox[0])
 
-    # Use the diagonal to set the camera distance
-    distance = diagonal * 2
+    # Adjust distance based on projection type
+    if projection_type.lower() == "orthographic":
+        distance = diagonal * 5  # Increase distance for orthographic to capture full scene
+    else:
+        distance = diagonal * 1.8 * distance_factor  # Original distance for perspective
 
     # Define the isometric viewing angles
     iso_angles = {
@@ -972,6 +980,15 @@ def create_multi_view_scene(meshes, output_directory="output"):
     for view_name, camera_pos in camera_positions.items():
         # Create new plotter for each view
         plotter = pv.Plotter(notebook=True, off_screen=True)
+        
+        # Set the projection type
+        if projection_type.lower() == "orthographic":
+            plotter.enable_parallel_projection()
+            # Set parallel scale to ensure the whole scene is visible
+            plotter.camera.parallel_scale = diagonal * 0.4 * distance_factor  # Adjust this factor as needed
+
+        elif projection_type.lower() != "perspective":
+            print(f"Warning: Unknown projection_type '{projection_type}'. Using perspective projection.")
 
         # Add each mesh to the scene
         for class_id, mesh in meshes.items():
@@ -1038,6 +1055,8 @@ def visualize_voxcity_multi_view(voxel_array, meshsize, **kwargs):
     cmap_name = kwargs.get("colormap", "viridis")
     vmin = kwargs.get("vmin", np.nanmin(sim_grid))
     vmax = kwargs.get("vmax", np.nanmax(sim_grid))
+    projection_type = kwargs.get("projection_type", "perspective")
+    distance_factor = kwargs.get("distance_factor", 1.0)
 
     # Create meshes
     print("Creating voxel meshes...")
@@ -1078,7 +1097,7 @@ def visualize_voxcity_multi_view(voxel_array, meshsize, **kwargs):
     print("Creating multiple views...")        
     # Create output directory if it doesn't exist
     os.makedirs(output_directory, exist_ok=True)
-    image_files = create_multi_view_scene(meshes, output_directory=output_directory)
+    image_files = create_multi_view_scene(meshes, output_directory=output_directory, projection_type=projection_type, distance_factor=distance_factor)
 
     # Display each view separately
     for view_name, img_file in image_files:

{voxcity-0.3.22.dist-info → voxcity-0.3.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: voxcity
-Version: 0.3.22
+Version: 0.3.24
 Summary: voxcity is an easy and one-stop tool to output 3d city models for microclimate simulation by integrating multiple geospatial open-data
 Author-email: Kunihiko Fujiwara <kunihiko@nus.edu.sg>
 Maintainer-email: Kunihiko Fujiwara <kunihiko@nus.edu.sg>

{voxcity-0.3.22.dist-info → voxcity-0.3.24.dist-info}/RECORD

@@ -27,11 +27,11 @@ voxcity/simulator/view.py,sha256=zNbfTLQ2Jo0V5-rFA3-xamRjOuw3H3MBrLKpQp8x3hY,367
 voxcity/utils/__init_.py,sha256=nLYrj2huBbDBNMqfchCwexGP8Tlt9O_XluVDG7MoFkw,98
 voxcity/utils/lc.py,sha256=RwPd-VY3POV3gTrBhM7TubgGb9MCd3nVah_G8iUEF7k,11562
 voxcity/utils/material.py,sha256=Vt3IID5Ft54HNJcEC4zi31BCPqi_687X3CSp7rXaRVY,5907
-voxcity/utils/visualization.py,sha256=WZkwxihy6XrSxMOPgAs0--MeoKK_lKIHRdPW9d-hQbQ,48626
+voxcity/utils/visualization.py,sha256=QgcEc6SZb4J4mtk45rRjwJ6JCvfrh1rPxrZhHveyDn8,49852
 voxcity/utils/weather.py,sha256=P6s1y_EstBL1OGP_MR_6u3vr-t6Uawg8uDckJnoI7FI,21482
-voxcity-0.3.22.dist-info/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
-voxcity-0.3.22.dist-info/LICENSE,sha256=-hGliOFiwUrUSoZiB5WF90xXGqinKyqiDI2t6hrnam8,1087
-voxcity-0.3.22.dist-info/METADATA,sha256=X27qtDw9i9619sVIcpoKLZ11DOHa_uOOLj3oRdSRcgc,25186
-voxcity-0.3.22.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-voxcity-0.3.22.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
-voxcity-0.3.22.dist-info/RECORD,,
+voxcity-0.3.24.dist-info/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
+voxcity-0.3.24.dist-info/LICENSE,sha256=-hGliOFiwUrUSoZiB5WF90xXGqinKyqiDI2t6hrnam8,1087
+voxcity-0.3.24.dist-info/METADATA,sha256=s3WbdeRZe04Wo-_0-3WGZmX3Zd7AG0iuISi2Km5ROSo,25186
+voxcity-0.3.24.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+voxcity-0.3.24.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
+voxcity-0.3.24.dist-info/RECORD,,