From c5bb96d6885cd6a83ce58e48d4cb8ea05a39a878 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 12 Mar 2023 10:02:36 +0300 Subject: [PATCH] Reformat code Signed-off-by: Ivan Bushchik --- Cargo.toml | 1 + matrix_graphics/src/main.rs | 4 ++-- matrix_graphics/src/structs.rs | 10 ++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a43f14b..ae2d5a2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,4 @@ [workspace] members = ["matrix", "matrix_graphics"] +default-members = ["matrix_graphics"] resolver = "2" diff --git a/matrix_graphics/src/main.rs b/matrix_graphics/src/main.rs index 7ae7817..48b985a 100644 --- a/matrix_graphics/src/main.rs +++ b/matrix_graphics/src/main.rs @@ -181,8 +181,8 @@ fn main() { i.update(); } bitmap = [[false; WIDTH as usize]; HEIGHT as usize]; - for l in 0..objects.len() { - let current_dots = objects[l].get_points(); + for object in &objects { + let current_dots = object.get_points(); for (x, y) in current_dots { if x >= 0 && y >= 0 && x < WIDTH as isize && y < HEIGHT as isize { bitmap[y as usize][x as usize] = true; diff --git a/matrix_graphics/src/structs.rs b/matrix_graphics/src/structs.rs index 5c36555..c5e9144 100644 --- a/matrix_graphics/src/structs.rs +++ b/matrix_graphics/src/structs.rs @@ -1,5 +1,3 @@ -use bresenham; - #[derive(Copy, Clone)] pub struct Line { pub start_x: f64, @@ -43,12 +41,12 @@ impl Line { vec![self.rotate_angle.sin(), self.rotate_angle.cos()], ]; let matrix_start = vec![ - vec![(self.start_x - self.rotate_center_x) as f64], - vec![(self.start_y - self.rotate_center_y) as f64], + vec![(self.start_x - self.rotate_center_x)], + vec![(self.start_y - self.rotate_center_y)], ]; let matrix_end = vec![ - vec![(self.end_x - self.rotate_center_x) as f64], - vec![(self.end_y - self.rotate_center_y) as f64], + vec![(self.end_x - self.rotate_center_x)], + vec![(self.end_y - self.rotate_center_y)], ]; let res_start = matrix::mult(&matrix_rotate, &matrix_start).unwrap(); let res_end = matrix::mult(&matrix_rotate, &matrix_end).unwrap();