Minor refactor
This commit is contained in:
@ -1,7 +1,4 @@
|
||||
use crate::read;
|
||||
use itertools::Itertools;
|
||||
use std::collections::HashSet;
|
||||
use std::str::FromStr;
|
||||
|
||||
#[derive(Debug, PartialEq, Eq, Clone, Hash)]
|
||||
enum Command {
|
||||
@ -20,6 +17,10 @@ impl Command {
|
||||
}
|
||||
|
||||
pub fn run() {
|
||||
const LINE_WIDTH: usize = 40;
|
||||
const SPRITE_WIDTH: usize = 3;
|
||||
const SPRITE_WIDTH_HALF: usize = SPRITE_WIDTH / 2;
|
||||
|
||||
let input = read("10");
|
||||
let mut lines = input.lines();
|
||||
|
||||
@ -28,10 +29,11 @@ pub fn run() {
|
||||
let mut v: i32 = 1;
|
||||
let mut v_new: i32 = 1;
|
||||
let mut sig_str = vec![];
|
||||
let mut pixels = [false; 40];
|
||||
let mut pixels = [false; LINE_WIDTH];
|
||||
let mut rows = vec![];
|
||||
'outer: loop {
|
||||
if cycle == 20 || (cycle - 20) % 40 == 0 {
|
||||
sig_str.push(cycle * v);
|
||||
if cycle == 20 || (cycle > 20 && (cycle - 20) % LINE_WIDTH == 0) {
|
||||
sig_str.push(cycle as i32 * v);
|
||||
}
|
||||
if is_busy == 0 {
|
||||
match lines.next() {
|
||||
@ -52,16 +54,17 @@ pub fn run() {
|
||||
} else {
|
||||
is_busy -= 1;
|
||||
}
|
||||
if is_busy == 0 {
|
||||
v = v_new;
|
||||
|
||||
let pixel = (cycle - 1) % LINE_WIDTH;
|
||||
let is_lit = pixel.abs_diff(v as usize) <= SPRITE_WIDTH_HALF;
|
||||
pixels[pixel] = is_lit;
|
||||
if pixel == LINE_WIDTH - 1 {
|
||||
let row: String = pixels.map(|l| if l { '#' } else { ' ' }).iter().collect();
|
||||
rows.push(row);
|
||||
}
|
||||
|
||||
let pixel = cycle % 40;
|
||||
let is_lit = pixel - 1 == v || pixel == v || pixel + 1 == v;
|
||||
pixels[pixel as usize] = is_lit;
|
||||
if pixel == 0 && cycle != 0 {
|
||||
let row: String = pixels.map(|l| if l { '#' } else { '.' }).iter().collect();
|
||||
println!("{}", row);
|
||||
if is_busy == 0 {
|
||||
v = v_new;
|
||||
}
|
||||
cycle += 1;
|
||||
}
|
||||
@ -73,6 +76,6 @@ pub fn run() {
|
||||
|
||||
#[cfg(feature = "part2")]
|
||||
{
|
||||
println!("Day 10, Part 02: {}", "TODO");
|
||||
println!("Day 10, Part 02: \n{}", rows.join("\n"));
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user