Merge pull request #939 from louis-e/feature/elevation-terrain-improvements

Add multi-source elevation pipeline with terrain improvements

Author: louis-e

Cargo.lock

@@ -51,6 +51,7 @@ serde_json = "1.0"
 tauri = { version = "2", optional = true }
 tauri-plugin-log = { version = "2.6.0", optional = true }
 tauri-plugin-shell = { version = "2", optional = true }
+tiff = "0.11"
 tokio = { version = "1.48.0", features = ["full"], optional = true }
 bedrockrs_level = { git = "https://github.com/bedrock-crustaceans/bedrock-rs", rev = "7ef268b", package = "bedrockrs_level", optional = true }
 bedrockrs_shared = { git = "https://github.com/bedrock-crustaceans/bedrock-rs", rev = "7ef268b", package = "bedrockrs_shared", optional = true }

Cargo.toml

@@ -239,6 +239,9 @@ impl Block {
             148 => "red_wall_banner",
             149 => "green_wall_banner",
             150 => "mossy_stone_bricks",
+            151 => "deepslate",
+            152 => "tuff",
+            153 => "cobbled_deepslate",
             155 => "chest",
             156 => "red_carpet",
             157 => "anvil",
@@ -342,6 +345,8 @@ impl Block {
             255 => "light_gray_wall_banner",
             _ => panic!("Invalid id"),
         }
+        // Note: If you want to add more blocks, please find unused ID
+        // slots below 255 so we don't need to update to u16 or higher.
     }
 
     pub fn properties(&self) -> Option<Value> {
@@ -896,6 +901,9 @@ pub const BLACK_WALL_BANNER: Block = Block::new(147);
 pub const RED_WALL_BANNER: Block = Block::new(148);
 pub const GREEN_WALL_BANNER: Block = Block::new(149);
 pub const MOSSY_STONE_BRICKS: Block = Block::new(150);
+pub const DEEPSLATE: Block = Block::new(151);
+pub const TUFF: Block = Block::new(152);
+pub const COBBLED_DEEPSLATE: Block = Block::new(153);
 pub const CHEST: Block = Block::new(155);
 pub const RED_CARPET: Block = Block::new(156);
 pub const ANVIL: Block = Block::new(157);

src/block_definitions.rs

@@ -94,6 +94,9 @@ pub fn generate_world_with_options(
     let progress_increment_prcs: f64 = 45.0 / elements_count as f64;
     let mut current_progress_prcs: f64 = 25.0;
     let mut last_emitted_progress: f64 = current_progress_prcs;
+    let desired_updates: u64 = 500;
+    let pb_batch_size: u64 = (elements_count as u64 / desired_updates).max(1);
+    let mut element_counter: u64 = 0;
 
     // Pre-scan: detect building relation outlines that should be suppressed.
     // Only applies to type=building relations (NOT type=multipolygon).
@@ -124,7 +127,10 @@ pub fn generate_world_with_options(
 
     // Process all elements
     for element in elements.into_iter() {
-        process_pb.inc(1);
+        element_counter += 1;
+        if element_counter.is_multiple_of(pb_batch_size) {
+            process_pb.inc(pb_batch_size);
+        }
         current_progress_prcs += progress_increment_prcs;
         if (current_progress_prcs - last_emitted_progress).abs() > 0.25 {
             emit_gui_progress_update(current_progress_prcs, "");
@@ -138,6 +144,11 @@ pub fn generate_world_with_options(
                 element.kind()
             ));
         } else {
+            // Clear on every non-debug iteration so any transient warning
+            // message set by downstream element processing (missing nodes,
+            // etc.) doesn't stick for the rest of the run. The cost is
+            // trivial — indicatif's set_message is just a mutex + string
+            // compare (~20 ns), ~40 ms over a full world.
             process_pb.set_message("");
         }
 
@@ -330,6 +341,7 @@ pub fn generate_world_with_options(
         // Element is dropped here, freeing its memory immediately
     }
 
+    process_pb.inc(element_counter % pb_batch_size);
     process_pb.finish();
 
     // Drop remaining caches