Fix stuck at 70% generation

Author: louis-e

src/floodfill.rs

@@ -68,18 +68,30 @@ fn optimized_flood_fill_area(
 
     // Pre-allocate queue with reasonable capacity to avoid reallocations
     let mut queue = VecDeque::with_capacity(1024);
+    let mut iterations = 0u64;
+    const MAX_ITERATIONS: u64 = 1_000_000; // Safety limit to prevent infinite loops
 
     for z in (min_z..=max_z).step_by(step_z as usize) {
         for x in (min_x..=max_x).step_by(step_x as usize) {
-            // Fast timeout check - only every few iterations
-            if filled_area.len() % 100 == 0 {
+            // Check timeout more frequently for small areas
+            if iterations % 50 == 0 {
                 if let Some(timeout) = timeout {
                     if start_time.elapsed() > *timeout {
                         return filled_area;
                     }
                 }
             }
 
+            // Safety check: prevent infinite loops
+            iterations += 1;
+            if iterations > MAX_ITERATIONS {
+                eprintln!(
+                    "Warning: Flood fill exceeded max iterations ({}), aborting",
+                    MAX_ITERATIONS
+                );
+                return filled_area;
+            }
+
             // Skip if already visited or not inside polygon
             if global_visited.contains(&(x, z))
                 || !polygon.contains(&Point::new(x as f64, z as f64))
@@ -93,6 +105,25 @@ fn optimized_flood_fill_area(
             global_visited.insert((x, z));
 
             while let Some((curr_x, curr_z)) = queue.pop_front() {
+                // Additional iteration check inside inner loop
+                iterations += 1;
+                if iterations > MAX_ITERATIONS {
+                    eprintln!(
+                        "Warning: Flood fill exceeded max iterations ({}), aborting",
+                        MAX_ITERATIONS
+                    );
+                    return filled_area;
+                }
+
+                // Timeout check in inner loop for problematic polygons
+                if iterations % 1000 == 0 {
+                    if let Some(timeout) = timeout {
+                        if start_time.elapsed() > *timeout {
+                            return filled_area;
+                        }
+                    }
+                }
+
                 // Add current point to filled area
                 filled_area.push((curr_x, curr_z));
 
@@ -155,19 +186,31 @@ fn original_flood_fill_area(
     // Pre-allocate queue and reserve space for filled_area
     let mut queue: VecDeque<(i32, i32)> = VecDeque::with_capacity(2048);
     filled_area.reserve(1000); // Reserve space to reduce reallocations
+    let mut iterations = 0u64;
+    const MAX_ITERATIONS: u64 = 1_000_000; // Safety limit to prevent infinite loops
 
     // Scan for multiple seed points to handle U-shapes and concave polygons
     for z in (min_z..=max_z).step_by(step_z as usize) {
         for x in (min_x..=max_x).step_by(step_x as usize) {
-            // Reduced timeout checking frequency for better performance
-            // Use manual % check since is_multiple_of() is unstable on stable Rust
-            #[allow(clippy::manual_is_multiple_of)]
-            if let Some(timeout) = timeout {
-                if &start_time.elapsed() > timeout {
-                    return filled_area;
+            // Check timeout more frequently for problematic polygons
+            if iterations % 50 == 0 {
+                if let Some(timeout) = timeout {
+                    if &start_time.elapsed() > timeout {
+                        return filled_area;
+                    }
                 }
             }
 
+            // Safety check: prevent infinite loops
+            iterations += 1;
+            if iterations > MAX_ITERATIONS {
+                eprintln!(
+                    "Warning: Flood fill exceeded max iterations ({}), aborting",
+                    MAX_ITERATIONS
+                );
+                return filled_area;
+            }
+
             // Skip if already processed or not inside polygon
             if global_visited.contains(&(x, z))
                 || !polygon.contains(&Point::new(x as f64, z as f64))
@@ -181,6 +224,25 @@ fn original_flood_fill_area(
             global_visited.insert((x, z));
 
             while let Some((curr_x, curr_z)) = queue.pop_front() {
+                // Additional iteration check inside inner loop
+                iterations += 1;
+                if iterations > MAX_ITERATIONS {
+                    eprintln!(
+                        "Warning: Flood fill exceeded max iterations ({}), aborting",
+                        MAX_ITERATIONS
+                    );
+                    return filled_area;
+                }
+
+                // Timeout check in inner loop
+                if iterations % 1000 == 0 {
+                    if let Some(timeout) = timeout {
+                        if &start_time.elapsed() > timeout {
+                            return filled_area;
+                        }
+                    }
+                }
+
                 // Only check polygon containment once per point when adding to filled_area
                 if polygon.contains(&Point::new(curr_x as f64, curr_z as f64)) {
                     filled_area.push((curr_x, curr_z));

src/gui.rs

@@ -88,7 +88,7 @@ pub fn run_gui() {
     tauri::Builder::default()
         .plugin(
             LogBuilder::default()
-                .level(LevelFilter::Trace)
+                .level(LevelFilter::Warn)
                 .targets([
                     Target::new(TargetKind::LogDir {
                         file_name: Some("arnis".into()),