X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Flevel%2Flvlgen.rs;h=4a22807a886aced0aab5ae95b79011b3961d008d;hb=9a6d1261d88ddaec58166d83b44b134948a9fabc;hp=a549166a62a690dfd1db3680010021ec34ef6663;hpb=9768e2bbbcdfa38e84d593215c098ba96db754da;p=kaka%2Frust-sdl-test.git

diff --git a/src/core/level/lvlgen.rs b/src/core/level/lvlgen.rs
index a549166..4a22807 100644
--- a/src/core/level/lvlgen.rs
+++ b/src/core/level/lvlgen.rs
@@ -6,19 +6,25 @@ use rand::Rng;
 
 ////////// LEVEL GENERATOR /////////////////////////////////////////////////////
 
-#[derive(Default)]
+#[derive(Debug, Default)]
 pub struct LevelGenerator {
     pub seed: u32,
     pub iterations: u8,
+    pub wall_smooth_radius: u8,
 }
 
 impl LevelGenerator {
-    pub fn new(seed: u32, iterations: u8) -> Self{
-	LevelGenerator { seed, iterations }
+    pub fn new(seed: u32) -> Self{
+	LevelGenerator {
+	    seed,
+	    iterations: 5,
+	    wall_smooth_radius: 2,
+	}
     }
 
     pub fn generate(&self) -> Level {
-	time_scope!("grid generation");
+	println!("new level from {:?}", self);
+	time_scope!("level generation");
 
 	let cell_size = 20;
 	let (width, height) = (2560 / cell_size, 1440 / cell_size);
@@ -114,7 +120,7 @@ impl LevelGenerator {
 		grid.cells = next;
 	    }
 	}
-	println!("{} iterations needed", count);
+	println!("  {} iterations needed", count);
     }
 
     fn neighbours(&self, grid: &Vec<Vec<bool>>, px: usize, py: usize, distance: usize) -> u8 {
@@ -154,7 +160,7 @@ impl LevelGenerator {
     }
 
     fn find_regions(&self, grid: &Grid<bool>) -> Vec<Region> {
-	time_scope!("finding all regions");
+	time_scope!("  finding all regions");
 	let mut regions = vec!();
 	let mut marked = vec!(vec!(false; grid.height); grid.width);
 	for x in 0..grid.width {
@@ -198,14 +204,14 @@ impl LevelGenerator {
 
     fn filter_regions(&self, grid: &mut Grid<bool>) {
 	let min_wall_size = 0.0015;
-	println!("grid size: ({}, {}) = {} cells", grid.width, grid.height, grid.width * grid.height);
-	println!("min wall size: {}", (grid.width * grid.height) as f64 * min_wall_size);
+	println!("  grid size: ({}, {}) = {} cells", grid.width, grid.height, grid.width * grid.height);
+	println!("  min wall size: {}", (grid.width * grid.height) as f64 * min_wall_size);
 
 	// delete all smaller wall regions
 	for r in self.find_regions(grid).iter().filter(|r| r.value) {
 	    let percent = r.cells.len() as f64 / (grid.width * grid.height) as f64;
 	    if percent < min_wall_size {
-		// println!("delete wall region of size {}", r.cells.len());
+		// println!("  delete wall region of size {}", r.cells.len());
 		self.delete_region(grid, r);
 	    }
 	}