voxcity 0.5.24__py3-none-any.whl → 0.5.26__py3-none-any.whl

voxcity/exporter/envimet.py

@@ -147,8 +147,8 @@ def prepare_grids(building_height_grid_ori, building_id_grid_ori, canopy_height_
     veg_translation_dict = {
         1: '',  # Bareland
         2: '0200XX',  # Rangeland
-        3: '',  # Shrub
-        4: '',  # Moss and lichen
+        3: '0200H1',  # Shrub
+        4: '0200XX',  # Moss and lichen
         5: '0200XX',  # Agriculture land
         6: '',  # Tree
         7: '0200XX',  # Wet land
@@ -171,7 +171,7 @@ def prepare_grids(building_height_grid_ori, building_id_grid_ori, canopy_height_
         11: '0200PG', # Developed space
         12: '0200ST', # Road
         13: '000000', # Building
-        14: '0200SD', # No Data
+        14: '000000', # No Data
     }
     land_cover_mat_grid = translate_array(land_cover_grid, mat_translation_dict)
 

voxcity/geoprocessor/mesh.py

@@ -590,7 +590,7 @@ def split_vertices_manual(mesh):
     out_mesh = trimesh.util.concatenate(new_meshes)
     return out_mesh
 
-def save_obj_from_colored_mesh(meshes, output_path, base_filename):
+def save_obj_from_colored_mesh(meshes, output_path, base_filename, max_materials=None):
     """
     Save a collection of colored meshes as OBJ and MTL files with material support.
     
@@ -620,6 +620,12 @@ def save_obj_from_colored_mesh(meshes, output_path, base_filename):
         - {base_filename}.obj : The main geometry file
         - {base_filename}.mtl : The material definitions file
     
+    max_materials : int, optional
+        Maximum number of materials/colors to create. If specified and the number
+        of unique colors exceeds this limit, colors will be quantized using
+        k-means clustering to reduce them to the specified number.
+        If None (default), all unique colors are preserved as separate materials.
+    
     Returns
     -------
     tuple
@@ -644,6 +650,11 @@ def save_obj_from_colored_mesh(meshes, output_path, base_filename):
     ...     meshes, 'output/models', 'city'
     ... )
     
+    Limiting materials to 5:
+    >>> obj_path, mtl_path = save_obj_from_colored_mesh(
+    ...     meshes, 'output/models', 'city', max_materials=5
+    ... )
+    
     Notes
     -----
     - Creates unique materials for each distinct face color
@@ -653,6 +664,9 @@ def save_obj_from_colored_mesh(meshes, output_path, base_filename):
     - Vertices are written in OBJ's 1-based indexing format
     - Faces are grouped by material for efficient rendering
     - The MTL file is automatically referenced in the OBJ file
+    - If max_materials is specified, k-means clustering is used for color quantization
+    - Color quantization preserves the overall color distribution while reducing material count
+    - Requires scikit-learn package when max_materials is specified (install with: pip install scikit-learn)
     
     File Format Details
     -----------------
@@ -674,8 +688,38 @@ def save_obj_from_colored_mesh(meshes, output_path, base_filename):
     combined_mesh = trimesh.util.concatenate(list(meshes.values()))
     combined_mesh = split_vertices_manual(combined_mesh)
     
-    # Create unique materials for each unique face color
+    # Get face colors
     face_colors = combined_mesh.visual.face_colors
+    
+    # Apply color quantization if max_materials is specified
+    if max_materials is not None:
+        try:
+            from sklearn.cluster import KMeans
+        except ImportError:
+            raise ImportError("scikit-learn is required for color quantization. "
+                            "Install it with: pip install scikit-learn")
+        
+        # Prepare colors for clustering (use only RGB, not alpha)
+        colors_rgb = face_colors[:, :3].astype(float)
+        
+        # Perform k-means clustering
+        kmeans = KMeans(n_clusters=max_materials, random_state=42, n_init=10)
+        color_labels = kmeans.fit_predict(colors_rgb)
+        
+        # Get the cluster centers as the new colors
+        quantized_colors_rgb = kmeans.cluster_centers_.astype(np.uint8)
+        
+        # Create new face colors with quantized RGB and original alpha
+        quantized_face_colors = np.zeros_like(face_colors)
+        # Assign each face to its nearest cluster center
+        quantized_face_colors[:, :3] = quantized_colors_rgb[color_labels]
+        quantized_face_colors[:, 3] = face_colors[:, 3]  # Preserve original alpha
+        
+        # Update the mesh with quantized colors
+        combined_mesh.visual.face_colors = quantized_face_colors
+        face_colors = quantized_face_colors
+    
+    # Create unique materials for each unique face color
     unique_colors = np.unique(face_colors, axis=0)
     
     # Write MTL file

voxcity/utils/visualization.py

@@ -2504,7 +2504,8 @@ def visualize_voxcity_with_sim_meshes(voxel_array, meshsize, custom_meshes=None,
     if save_obj:
         output_directory = kwargs.get('output_directory', 'output')
         output_file_name = kwargs.get('output_file_name', 'voxcity_mesh')
-        obj_path, mtl_path = save_obj_from_colored_mesh(meshes, output_directory, output_file_name)
+        max_materials = kwargs.get('max_materials', 20)
+        obj_path, mtl_path = save_obj_from_colored_mesh(meshes, output_directory, output_file_name, max_materials=max_materials)
         print(f"Saved mesh files to:\n  {obj_path}\n  {mtl_path}")    
 
     if show_views:

{voxcity-0.5.24.dist-info → voxcity-0.5.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: voxcity
-Version: 0.5.24
+Version: 0.5.26
 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>
@@ -52,6 +52,7 @@ Requires-Dist: trimesh
 Requires-Dist: pyvista
 Requires-Dist: IPython
 Requires-Dist: lxml
+Requires-Dist: scikit-learn
 Provides-Extra: dev
 Requires-Dist: coverage; extra == "dev"
 Requires-Dist: mypy; extra == "dev"

{voxcity-0.5.24.dist-info → voxcity-0.5.26.dist-info}/RECORD

@@ -10,13 +10,13 @@ voxcity/downloader/osm.py,sha256=kXiUedT7dwPOQ_4nxXptfeqNb5RKTIsQLG5km7Q8kKk,416
 voxcity/downloader/overture.py,sha256=4YG2DMwUSSyZKUw_o8cGhMmAkPJon82aPqOFBvrre-Y,11987
 voxcity/downloader/utils.py,sha256=tz6wt4B9BhEOyvoF5OYXlr8rUd5cBEDedWL3j__oT70,3099
 voxcity/exporter/__init__.py,sha256=2htEXMrq6knO8JMROtfz-0HFGddsAJkXqNUB2_MhqvM,70
-voxcity/exporter/envimet.py,sha256=un8Ay55XttGWFkFzkxLymHoRuA-UJkowQ4bMCjod_Jk,31093
+voxcity/exporter/envimet.py,sha256=Sh7s1JdQ6SgT_L2Xd_c4gtEGWK2hTS87bccaoIqik-s,31105
 voxcity/exporter/magicavoxel.py,sha256=SfGEgTZRlossKx3Xrv9d3iKSX-HmfQJEL9lZHgWMDX4,12782
 voxcity/exporter/obj.py,sha256=h1_aInpemcsu96fSTwjKMqX2VZAFYbZbElWd4M1ogyI,27973
 voxcity/geoprocessor/__init__.py,sha256=JzPVhhttxBWvaZ0IGX2w7OWL5bCo_TIvpHefWeNXruA,133
 voxcity/geoprocessor/draw.py,sha256=lcBtf4VAWXjk46cInPdSBeiLCTESdxzLOayr_0YOnus,22184
 voxcity/geoprocessor/grid.py,sha256=Uy8Oz4iL7vnPMqp_qtp4dQrs00yd2L9CSIPmF5KnbtI,63961
-voxcity/geoprocessor/mesh.py,sha256=MK2rkBfVyLQ_nkhgLMa6R3_SxYFE2-MHaSiRP6bJ7no,28584
+voxcity/geoprocessor/mesh.py,sha256=ElqAE2MA8KZs7yD7B1P88XYmryC6F9nkkP6cXv7FzIk,30777
 voxcity/geoprocessor/network.py,sha256=YynqR0nq_NUra_cQ3Z_56KxfRia1b6-hIzGCj3QT-wE,25137
 voxcity/geoprocessor/polygon.py,sha256=-LonxtW5du3UP61oygqtDJl6GGsCYnUuN9KYwl1UFdc,53707
 voxcity/geoprocessor/utils.py,sha256=DVg3EMRytLQLEQeXLvNgjt1Ynoa689EsD-To-14xgSQ,30369
@@ -27,11 +27,11 @@ voxcity/simulator/view.py,sha256=F2c-XFdRN811_RJvsznRjbUu5Uv7C6iniezsUMD-Olw,594
 voxcity/utils/__init__.py,sha256=Q-NYCqYnAAaF80KuNwpqIjbE7Ec3Gr4y_khMLIMhJrg,68
 voxcity/utils/lc.py,sha256=h2yOWLUIrrummkyMyhRK5VbyrsPtslS0MJov_y0WGIQ,18925
 voxcity/utils/material.py,sha256=H8K8Lq4wBL6dQtgj7esUW2U6wLCOTeOtelkTDJoRgMo,10007
-voxcity/utils/visualization.py,sha256=DWdkViMhwzoKf7qBD47uti5Qw7wYsI041jFePZm63KQ,112832
+voxcity/utils/visualization.py,sha256=T-jKrCA4UMm93p-1O678RWM7e99iE0_Lj4wD07efcwI,112918
 voxcity/utils/weather.py,sha256=2Jtg-rIVJcsTtiKE-KuDnhIqS1-MSS16_zFRzj6zmu4,36435
-voxcity-0.5.24.dist-info/licenses/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
-voxcity-0.5.24.dist-info/licenses/LICENSE,sha256=s_jE1Df1nTPL4A_5GCGic5Zwex0CVaPKcAmSilxJPPE,1089
-voxcity-0.5.24.dist-info/METADATA,sha256=ADjf1Z75Z0BVCKAo2s-QbD2C890hbOkHpMx9FJNv5w4,26695
-voxcity-0.5.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-voxcity-0.5.24.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
-voxcity-0.5.24.dist-info/RECORD,,
+voxcity-0.5.26.dist-info/licenses/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
+voxcity-0.5.26.dist-info/licenses/LICENSE,sha256=s_jE1Df1nTPL4A_5GCGic5Zwex0CVaPKcAmSilxJPPE,1089
+voxcity-0.5.26.dist-info/METADATA,sha256=EdbTSCTEB_oW67EK3cHHmBB5V7LrlDECoEsB5ATGgVI,26724
+voxcity-0.5.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+voxcity-0.5.26.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
+voxcity-0.5.26.dist-info/RECORD,,