From ed3773a299caceacb44ecd3101c33c3fd3c40063 Mon Sep 17 00:00:00 2001 From: Jon Janzen Date: Sat, 11 Sep 2021 20:16:07 -0600 Subject: [PATCH] refactored main to make room for clock --- src/main.rs | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/src/main.rs b/src/main.rs index 140e616..06e7cfd 100644 --- a/src/main.rs +++ b/src/main.rs @@ -57,7 +57,23 @@ fn init_env() -> Environment { } } -fn main() { +fn write_canvas_to_file(canvas: Canvas, file_path: &str) { + let ppm = canvas.to_ppm(); + + let mut f = match File::create(file_path) { + Ok(f) => f, + Err(e) => panic!("file error. {}", e), + }; + + let _ = match f.write_all(ppm.as_bytes()) { + Ok(w) => w, + Err(e) => panic!("did not write. {}", e), + }; + + +} + +fn before_clock() { let env = init_env(); let mut ball = Projectile::new( @@ -95,19 +111,7 @@ fn main() { } } - let ppm = canvas.to_ppm(); - - let mut f = match File::create("out.ppm") { - Ok(f) => f, - Err(e) => panic!("file error. {}", e), - }; - - let _ = match f.write_all(ppm.as_bytes()) { - Ok(w) => w, - Err(e) => panic!("did not write. {}", e), - }; - - + write_canvas_to_file(canvas, "out.ppm"); let i = Matrix::identity(4); println!("The identity matrix is: {:#?}", i); let inverse_i = i.inverse(); @@ -140,3 +144,7 @@ fn main() { println!("{:?}", id); println!("{:?}", q); } + +fn main() { + before_clock(); +}