next #1

Merged
vinzenz merged 9 commits from next into main 2025-05-03 11:53:41 +02:00
3 changed files with 12 additions and 10 deletions
Showing only changes of commit fa8118bb78 - Show all commits

View file

@ -45,7 +45,7 @@ impl App {
connection,
sim: Simulation::new(),
terminated: false,
target_duration: FRAME_PACING,
target_duration: FRAME_PACING * 4,
pixels: Bitmap::max_sized(),
luma: BrightnessGrid::new(TILE_WIDTH, TILE_HEIGHT),
}

View file

@ -12,8 +12,11 @@ pub struct Rules<T: Value>
type Kernel3x3 = [[bool; 3]; 3];
pub const MOORE_NEIGHBORHOOD: Kernel3x3 =
[[true, true, true], [true, false, true], [true, true, true]];
pub const MOORE_NEIGHBORHOOD: Kernel3x3 = [
[true, true, true],
[true, false, true],
[true, true, true]
];
pub const NEUMANN_NEIGHBORHOOD: Kernel3x3 = [
[false, true, false],
@ -83,8 +86,8 @@ pub fn generate_u8b3() -> Rules<u8> {
&[],
);
let add = rng.gen_range(5..40);
let sub = rng.gen_range(5..40);
let add = rng.gen_range(1..15);
let sub = rng.gen_range(1..15);
println_info(format!("generated u8b3: Birth {birth:?} Survival {survive:?}, kernel: {kernel:?}, alive_thresh: {alive_threshold}, delta: {add}/{sub}"));

View file

@ -75,10 +75,8 @@ impl Simulation {
self.left_pixels.step();
self.right_pixels.step();
if self.iteration % Wrapping(10) == Wrapping(0) {
self.left_luma.step();
self.right_luma.step();
}
self.iteration += Wrapping(1u8);
@ -121,7 +119,8 @@ impl Simulation {
};
for y in 0..luma.height() {
let set = left_or_right.get(x, y) as f32 / u8::MAX as f32 * u8::from(Brightness::MAX) as f32;
let set = Brightness::try_from(set as u8).unwrap();
let set = (set as u8).max(1);
let set = Brightness::try_from(set).unwrap();
luma.set(x, y, set);
}
}