about summary refs log tree commit diff
path: root/src/level_gen/cave_automata.rs
diff options
context:
space:
mode:
authorGriffin Smith <root@gws.fyi>2019-07-23T00·20-0400
committerGriffin Smith <root@gws.fyi>2019-07-23T00·20-0400
commit68e8ad8a0e6a5ac38b34658f03807ade603a687c (patch)
tree80059db1e872ebbd1b7c5bbf04efc58654d69673 /src/level_gen/cave_automata.rs
parentd001b0a017cf4d1a614e636059db257fa75dcc9d (diff)
Add more command-line options for generating caves
Add all the necessary params to the CLI options for generating caves
Diffstat (limited to 'src/level_gen/cave_automata.rs')
-rw-r--r--src/level_gen/cave_automata.rs48
1 files changed, 41 insertions, 7 deletions
diff --git a/src/level_gen/cave_automata.rs b/src/level_gen/cave_automata.rs
index e46d542e6955..6a237c0303df 100644
--- a/src/level_gen/cave_automata.rs
+++ b/src/level_gen/cave_automata.rs
@@ -4,17 +4,46 @@ use rand::Rng;
 
 pub struct Params {
     chance_to_start_alive: f64,
-    dimensions: Dimensions,
     birth_limit: i32,
     death_limit: i32,
     steps: usize,
 }
 
+macro_rules! parse_optional {
+    ($out: ident . $attr: ident, $matches: expr, $arg: expr) => {
+        if let Some(val_s) = $matches.value_of($arg) {
+            $out.$attr = val_s.parse().unwrap();
+        }
+    };
+}
+
+macro_rules! parse_optional_matches {
+    ($matches: expr) => {};
+    ($matches: expr , { $ret: ident . $attr: ident = $arg: expr }) => {
+        parse_optional!($ret.$attr, $matches, $arg);
+    };
+    ($matches: expr, { $($ret: ident . $attr: ident = $arg: expr ,)* }) => {
+        $(parse_optional!($ret.$attr, $matches, $arg);)*
+    };
+}
+
+impl Params {
+    pub fn from_matches<'a>(matches: &clap::ArgMatches<'a>) -> Self {
+        let mut ret: Self = Default::default();
+        parse_optional_matches!(matches, {
+            ret.chance_to_start_alive = "start-alive-chance",
+            ret.birth_limit = "birth-limit",
+            ret.death_limit = "death-limit",
+            ret.steps = "steps",
+        });
+        ret
+    }
+}
+
 impl Default for Params {
     fn default() -> Self {
         Params {
             chance_to_start_alive: 0.45,
-            dimensions: Dimensions { w: 80, h: 20 },
             birth_limit: 4,
             death_limit: 3,
             steps: 2,
@@ -23,21 +52,26 @@ impl Default for Params {
 }
 
 pub fn generate<R: Rng + ?Sized>(
+    dimensions: &Dimensions,
     params: &Params,
     rand: &mut R,
 ) -> Vec<Vec<bool>> {
     let mut cells =
-        rand_initialize(&params.dimensions, rand, params.chance_to_start_alive);
+        rand_initialize(&dimensions, rand, params.chance_to_start_alive);
     for _ in 0..params.steps {
-        step_automata(&mut cells, params);
+        step_automata(&mut cells, dimensions, params);
     }
     cells
 }
 
-fn step_automata(cells: &mut Vec<Vec<bool>>, params: &Params) {
+fn step_automata(
+    cells: &mut Vec<Vec<bool>>,
+    dimensions: &Dimensions,
+    params: &Params,
+) {
     let orig_cells = (*cells).clone();
-    for x in 0..(params.dimensions.h as usize) {
-        for y in 0..(params.dimensions.w as usize) {
+    for x in 0..(dimensions.h as usize) {
+        for y in 0..(dimensions.w as usize) {
             let nbs = num_alive_neighbors(&orig_cells, x as i32, y as i32);
             if orig_cells[x][y] {
                 if nbs < params.death_limit {