diff --git a/aura/examples/animatrix.rs b/aura/examples/animatrix.rs index fdcac245..52f9d5be 100644 --- a/aura/examples/animatrix.rs +++ b/aura/examples/animatrix.rs @@ -4,7 +4,8 @@ use tinybmp::{Bmp, Pixel}; fn main() { let mut writer = AniMeDbusWriter::new().unwrap(); - let bmp = Bmp::from_slice(include_bytes!("test.bmp")).expect("Failed to parse BMP image"); + let bmp = + Bmp::from_slice(include_bytes!("non-skewed_r.bmp")).expect("Failed to parse BMP image"); let pixels: Vec = bmp.into_iter().collect(); //assert_eq!(pixels.len(), 56 * 56); @@ -13,8 +14,10 @@ fn main() { // Aligned left for px in pixels { - if (px.x as usize) < WIDTH { - matrix.get_mut()[px.y as usize][px.x as usize] = px.color as u8; + if (px.x as usize / 2) < WIDTH && (px.y as usize) < HEIGHT { + if px.x % 2 == 0 { + matrix.get_mut()[px.y as usize][px.x as usize / 2] = px.color as u8; + } } } diff --git a/aura/examples/non-skewed.bmp b/aura/examples/non-skewed.bmp new file mode 100644 index 00000000..4d43c87f Binary files /dev/null and b/aura/examples/non-skewed.bmp differ diff --git a/aura/examples/non-skewed_r.bmp b/aura/examples/non-skewed_r.bmp new file mode 100644 index 00000000..2fb40a23 Binary files /dev/null and b/aura/examples/non-skewed_r.bmp differ diff --git a/aura/examples/test2.bmp b/aura/examples/test2.bmp new file mode 100644 index 00000000..589295a7 Binary files /dev/null and b/aura/examples/test2.bmp differ diff --git a/aura/src/anime_matrix.rs b/aura/src/anime_matrix.rs index de4ecabf..775eea5e 100644 --- a/aura/src/anime_matrix.rs +++ b/aura/src/anime_matrix.rs @@ -69,7 +69,7 @@ impl AniMeMatrix { let index = row.len() - prog_row_len; if count % 2 == 0 { - print!(" "); + print!(" "); } for (i, x) in row.iter().enumerate() { if i >= index {