Reformat code

Signed-off-by: Ivan Bushchik <ivabus@ivabus.dev>
This commit is contained in:
Ivan Bushchik 2023-03-12 10:02:36 +03:00
parent f022ce2553
commit c5bb96d688
No known key found for this signature in database
GPG key ID: 9F6DDABE11A2674D
3 changed files with 7 additions and 8 deletions

View file

@ -1,3 +1,4 @@
[workspace] [workspace]
members = ["matrix", "matrix_graphics"] members = ["matrix", "matrix_graphics"]
default-members = ["matrix_graphics"]
resolver = "2" resolver = "2"

View file

@ -181,8 +181,8 @@ fn main() {
i.update(); i.update();
} }
bitmap = [[false; WIDTH as usize]; HEIGHT as usize]; bitmap = [[false; WIDTH as usize]; HEIGHT as usize];
for l in 0..objects.len() { for object in &objects {
let current_dots = objects[l].get_points(); let current_dots = object.get_points();
for (x, y) in current_dots { for (x, y) in current_dots {
if x >= 0 && y >= 0 && x < WIDTH as isize && y < HEIGHT as isize { if x >= 0 && y >= 0 && x < WIDTH as isize && y < HEIGHT as isize {
bitmap[y as usize][x as usize] = true; bitmap[y as usize][x as usize] = true;

View file

@ -1,5 +1,3 @@
use bresenham;
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
pub struct Line { pub struct Line {
pub start_x: f64, pub start_x: f64,
@ -43,12 +41,12 @@ impl Line {
vec![self.rotate_angle.sin(), self.rotate_angle.cos()], vec![self.rotate_angle.sin(), self.rotate_angle.cos()],
]; ];
let matrix_start = vec![ let matrix_start = vec![
vec![(self.start_x - self.rotate_center_x) as f64], vec![(self.start_x - self.rotate_center_x)],
vec![(self.start_y - self.rotate_center_y) as f64], vec![(self.start_y - self.rotate_center_y)],
]; ];
let matrix_end = vec![ let matrix_end = vec![
vec![(self.end_x - self.rotate_center_x) as f64], vec![(self.end_x - self.rotate_center_x)],
vec![(self.end_y - self.rotate_center_y) as f64], vec![(self.end_y - self.rotate_center_y)],
]; ];
let res_start = matrix::mult(&matrix_rotate, &matrix_start).unwrap(); let res_start = matrix::mult(&matrix_rotate, &matrix_start).unwrap();
let res_end = matrix::mult(&matrix_rotate, &matrix_end).unwrap(); let res_end = matrix::mult(&matrix_rotate, &matrix_end).unwrap();