ray-tracer-challenge/ray-tracer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed extra .0s

Browse Source
This commit is contained in:
Jon Janzen
2022-01-02 17:16:42 -07:00
parent b40d7c5b7b
commit be9abb56d9
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/main.rs
View File

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