Merge pull request #23 from oiwn/dev

update deps

.gitignore

@@ -5,4 +5,5 @@ Cargo.lock
 *.profraw
 
 # misc
+tmp/
 tags

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tarts"  # shortcut from Terminal Arts
-version = "0.1.6"
+version = "0.1.7"
 edition = "2021"
 
 authors = ["oiwn <[email protected]>"]
@@ -13,9 +13,9 @@ homepage = "https://github.com/oiwn/tui-screen-savers-rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-crossterm = "0.27"
-derive_builder = "0.12"
-once_cell = "1.18"
+crossterm = "0.28"
+derive_builder = "0.20"
+once_cell = "1.19"
 pico-args = "0.5"
 rand = "0.8"
 tracing = "0.1"
@@ -32,6 +32,6 @@ harness = false
 [profile.release]
 panic = "abort"
 strip = true  # Automatically strip symbols from the binary.
-opt-level = "z"  # Optimize for size.
+opt-level = "s"  # Optimize for size.
 lto = true  # enable link time optimization
 codegen-units = 1

benches/rain_benchmarks.rs

@@ -34,7 +34,7 @@ fn run_loop_benchmark(_c: &mut Criterion) {
 
 fn vertical_worm_benchmark(c: &mut Criterion) {
     let options = get_sane_options();
-    c.bench_function("benchmark_worm_new_1000", |b| {
+    c.bench_function("benchmark_raindrop_new_1000", |b| {
         b.iter(|| {
             let mut rng = rand::thread_rng();
             for index in 1..=1000 {
@@ -43,7 +43,7 @@ fn vertical_worm_benchmark(c: &mut Criterion) {
         })
     });
 
-    c.bench_function("benchmark_worm_update_1000", |b| {
+    c.bench_function("benchmark_raindrop_update_1000", |b| {
         let mut rng = rand::thread_rng();
         let options = get_sane_options();
         let mut drops: Vec<rain_drop::RainDrop> = vec![];

src/common.rs

@@ -104,7 +104,9 @@ where
 
         // calculate actual frame rate
         let ended_at = std::time::SystemTime::now();
-        let delta = ended_at.duration_since(started_at).unwrap();
+        let delta = ended_at
+            .duration_since(started_at)
+            .unwrap_or(std::time::Duration::from_secs(0));
         frames_per_second = (frames_per_second + (1.0 / delta.as_secs_f64())) / 2.0;
 
         if delta < target_frame_duration {

src/life/conway_life.rs

@@ -61,20 +61,21 @@ impl LifeCell {
     ) {
         let green_color = 255_u8.wrapping_sub(current_gen);
         match current_gen {
-            0..=250 => {
+            0..=230 => {
                 self.color = style::Color::Rgb {
                     r: 0,
                     g: green_color,
                     b: 0,
                 }; // Green
-                self.character = '*';
+                let random_index = rng.gen_range(0..DEAD_CELLS_CHARS.len());
+                self.character = *DEAD_CELLS_CHARS.get(random_index).unwrap();
             }
             _ => {
                 self.color = style::Color::Rgb {
-                    r: 128,
+                    r: 0,
                     g: green_color,
-                    b: 128,
-                }; // Purple
+                    b: 0,
+                };
                 let random_index = rng.gen_range(0..DEAD_CELLS_CHARS.len());
                 self.character = *DEAD_CELLS_CHARS.get(random_index).unwrap();
             }

src/main.rs

@@ -108,8 +108,8 @@ fn main() -> std::io::Result<()> {
                 .screen_size((width, height))
                 .build()
                 .unwrap();
-            let mut wilson_maze = maze::Maze::new(options);
-            common::run_loop(&mut stdout, &mut wilson_maze, None)?
+            let mut maze = maze::Maze::new(options);
+            common::run_loop(&mut stdout, &mut maze, None)?
         }
         "check" => {
             let options = check::CheckOptionsBuilder::default()