voxcity 0.3.23__tar.gz → 0.3.24__tar.gz

{voxcity-0.3.23 → voxcity-0.3.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: voxcity
-Version: 0.3.23
+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.23 → voxcity-0.3.24}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "voxcity"
-version = "0.3.23"
+version = "0.3.24"
 requires-python = ">=3.10,<3.13"
 classifiers = [
     "Programming Language :: Python :: 3.10",

{voxcity-0.3.23 → voxcity-0.3.24}/src/voxcity/utils/visualization.py

@@ -923,9 +923,14 @@ 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")
     """
     # Compute overall bounding box across all meshes
     vertices_list = [mesh.vertices for mesh in meshes.values()]
@@ -939,8 +944,11 @@ def create_multi_view_scene(meshes, output_directory="output"):
     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.23 → voxcity-0.3.24}/src/voxcity.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: voxcity
-Version: 0.3.23
+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>