diff --git a/src/camera.rs b/src/camera.rs index bc7b230..6ad1d50 100644 --- a/src/camera.rs +++ b/src/camera.rs @@ -70,8 +70,8 @@ impl<'a> Camera<'a> { // viewport_width, // viewport_height, center, - look_at, - v_up, + // look_at, + // v_up, // focal_length, // viewport_u, // viewport_v, @@ -99,7 +99,6 @@ impl<'a> Camera<'a> { for i in 0..self.image_width { // color let mut color = Color::new(0.0, 0.0, 0.0); - let rng = &mut rng(); for _ in 0..self.sample_times { let r = self.get_ray(i, j); let sample_color = self.ray_color(&r, self.reflect_depth, world); @@ -200,7 +199,7 @@ impl<'a> Camera<'a> { // -> [x, y, 0] fn random_square(&self, rng: &mut ThreadRng) -> Vec3 { - Vec3::new(rng.gen_range(-0.5..0.1), rng.gen_range(-0.5..0.1), 0.0) + Vec3::new(rng.random_range(-0.5..0.1), rng.random_range(-0.5..0.1), 0.0) } diff --git a/src/material.rs b/src/material.rs index 2627753..2effd31 100644 --- a/src/material.rs +++ b/src/material.rs @@ -31,7 +31,7 @@ impl Material for Lambertian { let mut scatter_direction = r_in.direction + Vec3::random_unit_on_hemisphere(hit_record.normal); - if (near_zero(scatter_direction)) { + if near_zero(scatter_direction) { scatter_direction = hit_record.normal; } diff --git a/src/math_utils.rs b/src/math_utils.rs index 3ee490d..ddb9c3d 100644 --- a/src/math_utils.rs +++ b/src/math_utils.rs @@ -8,7 +8,7 @@ pub fn random_in_unit_disk() -> Vec3 { let rng = &mut rng(); loop { let p = Vec3::new(rng.random_range(-1.0..1.0), rng.random_range(-1.0..1.0), 0.0); - if (p.length_squared() < 1.0) { + if p.length_squared() < 1.0 { return p; } } diff --git a/src/types_defined.rs b/src/types_defined.rs index 21be19d..63b508f 100644 --- a/src/types_defined.rs +++ b/src/types_defined.rs @@ -1,5 +1,5 @@ use std::{fs::File, io::{BufWriter}}; -use crate::{material::MaterialKind, vec3}; +use crate::{material::MaterialKind}; use crate::ppm_writer::PPMWriter; /* @@ -38,8 +38,8 @@ pub struct Camera<'a> { // pub viewport_width: f32, // pub viewport_height: f32, pub center: Point, - pub look_at: Point, - pub v_up: Vec3, + // pub look_at: Point, + // pub v_up: Vec3, // pub focal_length: Vec3, // pub viewport_u: Vec3, // pub viewport_v: Vec3, diff --git a/src/vec3.rs b/src/vec3.rs index 05b69e3..2f78cd3 100644 --- a/src/vec3.rs +++ b/src/vec3.rs @@ -1,7 +1,7 @@ use std::{fmt::Display, ops::{Add, AddAssign, Div, Mul, MulAssign, Sub}}; use std::fmt; -use rand::{thread_rng, Rng}; +use rand::{rng, Rng}; use crate::types_defined::Vec3; impl Display for Vec3 { @@ -50,13 +50,13 @@ impl Vec3 { } pub fn random_range(min: f32, max: f32) -> Self { - let rng = &mut thread_rng(); - Vec3::new(rng.gen_range(min..max), rng.gen_range(min..max), rng.gen_range(min..max)) + let rng = &mut rng(); + Vec3::new(rng.random_range(min..max), rng.random_range(min..max), rng.random_range(min..max)) } pub fn random() -> Self { - let rng = &mut thread_rng(); - Vec3::new(rng.r#gen(), rng.r#gen(), rng.r#gen()) + let rng = &mut rng(); + Vec3::new(rng.random(), rng.random(), rng.random()) } pub fn random_unit() -> Self {