diff --git a/src/main.rs b/src/main.rs index 232027c..812d121 100644 --- a/src/main.rs +++ b/src/main.rs @@ -53,8 +53,8 @@ impl fmt::Display for Projectile { fn init_env() -> Environment { Environment { - gravity: Tuple::vector(0.0, 0.0, -0.98), - wind: Tuple::vector(0.0, 0.0, 0.0), + gravity: Tuple::vector(0, 0, -0.98), + wind: Tuple::vector(0, 0, 0), } } @@ -83,24 +83,24 @@ fn before_clock() { let env = init_env(); let mut ball = Projectile::new( - Tuple::point(0.0, 0.0, 0.0), - Tuple::vector(2.2, 0.0, 21.0), + Tuple::point(0, 0, 0), + Tuple::vector(2.2, 0, 21.0), ); let mut ball2 = Projectile::new( - Tuple::point(195.0, 0.0, 0.0), - Tuple::vector(-2.2, 0.0, 21.0), + Tuple::point(195, 0, 0), + Tuple::vector(-2.2, 0, 21), ); let mut ball3 = Projectile::new( - Tuple::point(299.0, 0.0, 0.0), - Tuple::vector(-2.2, 0.0, 21.0), + Tuple::point(299, 0, 0), + Tuple::vector(-2.2, 0, 21), ); let mut canvas = Canvas::new(300, 300); - let color = Color::new(1.0, 0.0, 0.0); - let color2 = Color::new(0.0, 1.0, 0.0); - let color3 = Color::new(0.0, 0.0, 1.0); + let color = Color::new(1, 0, 0); + let color2 = Color::new(0, 1, 0); + let color3 = Color::new(0, 0, 1); loop { canvas.write_pixel(ball.position.x() as usize, canvas.height() - (ball.position.z() as usize) - 1, color); canvas.write_pixel(ball2.position.x() as usize, canvas.height() - (ball2.position.z() as usize) - 1, color2); @@ -125,9 +125,9 @@ fn before_clock() { let mut a = Matrix::from_array([ - [1.0, 2.0, 3.0], - [4.0, 5.0, 6.0], - [7.0, 8.0, 1.0] + [1, 2, 3], + [4, 5, 6], + [7, 8, 1] ]); println!("Matrix: {:?}", a); @@ -143,7 +143,7 @@ fn before_clock() { println!("transpose then inverse: {:?}", at); - let t = Tuple::point(1.0, 2.0, 3.0); + let t = Tuple::point(1, 2, 3); let mut id = Matrix::identity(4); id[1][3] = -3.0; let q = &id * &t; @@ -159,13 +159,13 @@ fn main() { fn draw_cross(canvas: &mut Canvas, start: &Tuple, color: Color) { canvas.write_pixel(start.x() as usize, start.y() as usize, color); - let top = start * &Matrix::translation(1.0, 0.0, 0.0); + let top = start * &Matrix::translation(1, 0, 0); write_point(canvas, &top, color); - let right = start * &Matrix::translation(0.0, 1.0, 0.0); + let right = start * &Matrix::translation(0, 1, 0); write_point(canvas, &right, color); - let bottom = start * &Matrix::translation(-1.0, 0.0, 0.0); + let bottom = start * &Matrix::translation(-1, 0, 0); write_point(canvas, &bottom, color); - let left = start * &Matrix::translation(0.0, -1.0, 0.0); + let left = start * &Matrix::translation(0, -1, 0); write_point(canvas, &left, color); } @@ -173,19 +173,19 @@ fn clock() { println!("Starting clock!"); let mut canvas = Canvas::new(1024, 1024); - let color = Color::new(1.0, 0.0, 0.0); - let middle = 1024.0 / 2.0; + let color = Color::new(1, 0, 0); + let middle = 1024 / 2; - let middle_point = &Tuple::point_zero() * &Matrix::translation(middle, middle, 0.0); - draw_cross(&mut canvas, &middle_point, Color::new(0.0, 1.0, 0.0)); + let middle_point = &Tuple::point_zero() * &Matrix::translation(middle, middle, 0); + draw_cross(&mut canvas, &middle_point, Color::new(0, 1, 0)); for i in 1..13 { let center = Tuple::point_zero(); - let center = &Matrix::translation(0.0, -24.0, 0.0) * ¢er; - let center = &Matrix::scaling(0.0, 10.0, 0.0) * ¢er; + let center = &Matrix::translation(0, -24, 0) * ¢er; + let center = &Matrix::scaling(0, 10, 0) * ¢er; let center = &Matrix::rotation_z((i as f32 / 12.0) * (2.0 * PI)) * ¢er; - let center = &Matrix::translation(middle, middle, 0.0) * ¢er; + let center = &Matrix::translation(middle, middle, 0) * ¢er; draw_cross(&mut canvas, ¢er, color); }