Revisions to fractal and conclusion slides.

src/slide/s10_conclusion.rs

@@ -71,7 +71,7 @@ impl Slide for Conclusion {
                 name: "slides",
                 position: WindowPosition::FromCenter(Vec2::new(0.0, ui.available_height() * 0.08)),
                 size: Vec2::new(ui.available_width() * 0.95, ui.available_height() * 0.85),
-                scroll: Some((elapsed * 64.0).min(1065.0)),
+                scroll: Some((elapsed * 90.0 + 350.0).min(1065.0)),
                 background: Color32::TRANSPARENT,
                 alpha: get_style_alpha(ui.style()),
                 code: String::from(include_str!("../cartoon.rs")),

src/slide/s4_automata.rs

@@ -251,7 +251,12 @@ impl Slide for Automata {
 /// Run one iteration of Conway's Game of Life on the grid, producing a new grid.
 ///
 /// A non-zero expansion parameter expands the grid on each side by that many squares.
-fn conways_game_of_life(grid: &Grid, expansion: usize, alive_color: Color32, fade: bool) -> Grid {
+pub fn conways_game_of_life(
+    grid: &Grid,
+    expansion: usize,
+    alive_color: Color32,
+    fade: bool,
+) -> Grid {
     let mut new = grid.clone();
     new.clear_fill();
 

src/slide/s6_fractals.rs

@@ -12,7 +12,7 @@ use crate::egui;
 use crate::egui::{Color32, Context, Frame, Pos2, Shape, Stroke, Ui};
 use crate::fade_in::{fade_in, fade_in_manual, fade_out, fade_out_manual};
 use crate::governor::Governor;
-use crate::slide::s4_automata::randomize_grid;
+use crate::slide::s4_automata::{conways_game_of_life, randomize_grid};
 use crate::slide::s6_fractals::circle::circle;
 use crate::slide::s6_fractals::dummy::is_black;
 use crate::slide::s6_fractals::mandelbrot::mandelbrot;
@@ -109,6 +109,11 @@ impl Default for Fractals {
 
         randomize_grid(&mut grid);
 
+        // Make grid more life-like.
+        for _ in 0..10 {
+            grid = conways_game_of_life(&grid, 0, Color32::BLACK, false);
+        }
+
         // Grid cell stroke aliases too much at this resolution.
         grid.stroke_width = 0.0;
 
@@ -271,7 +276,7 @@ impl Slide for Fractals {
                     // Fade out the automata cells.
                     for (_, _, cell) in self.grid.iter_mut() {
                         if cell.a() > 0 {
-                            *cell = set_alpha(Color32::BLACK, alpha);
+                            *cell = set_alpha(*cell, alpha);
                         }
                     }
                 });