Skip to content

Commit a0cb71e

Browse files
committed
formatting and redundancy
1 parent 02c2c00 commit a0cb71e

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

Diff for: src/camera.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use std::{f64::INFINITY, io::stdout};
33
use rand::{thread_rng, Rng};
44

55
use crate::{color::{write_color, Color}, hittable::{HitRecord, Hittable}, interval::Interval, ray::Ray, vec3::{unit_vector, Point3, Vec3}};
6-
use crate::material::Material;
76
#[derive(Default)]
87
pub struct Camera {
98
pub aspect_ratio: f64,
@@ -65,7 +64,7 @@ impl Camera {
6564
return Color::default();
6665
}
6766
let mut rec = HitRecord::default();
68-
if world.hit(r, Interval::from(0.001, INFINITY), &mut rec) {
67+
if world.hit(r, Interval::new(0.001, INFINITY), &mut rec) {
6968
let mut scattered = Ray::default();
7069
let mut attenuation = Color::default();
7170
if rec.mat.scatter(r, &rec, &mut attenuation, &mut scattered) {

Diff for: src/color.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub fn write_color(out: &mut Stdout, pixel_color: Color) {
1313
let g = linear_to_gamma(g);
1414
let b = linear_to_gamma(b);
1515

16-
let intensity = Interval::from(0.0, 0.999);
16+
let intensity = Interval::new(0.0, 0.999);
1717
let rbyte = (256.0 * intensity.clamp(r)) as i32;
1818
let gbyte = (256.0 * intensity.clamp(g)) as i32;
1919
let bbyte = (256.0 * intensity.clamp(b)) as i32;

Diff for: src/hittable_list.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ impl<'a> Hittable<'a> for HittableList<'a> {
1818
let mut closest_so_far = ray_t.max;
1919

2020
for object in &self.objects {
21-
if object.hit(r, Interval::from(ray_t.min, closest_so_far), &mut temp_rec) {
21+
if object.hit(r, Interval::new(ray_t.min, closest_so_far), &mut temp_rec) {
2222
hit_anything = true;
2323
closest_so_far = temp_rec.clone().t;
2424
*rec = temp_rec.clone();

Diff for: src/interval.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ pub struct Interval {
55
pub max: f64
66
}
77
impl Interval {
8-
pub fn new() -> Self {
9-
Interval {min: NEG_INFINITY, max: INFINITY}
10-
}
11-
pub fn from(min: f64, max: f64) -> Self {
8+
pub fn new(min: f64, max: f64) -> Self {
129
Interval {min, max}
1310
}
1411
pub fn size(&self) -> f64 {
@@ -23,4 +20,9 @@ impl Interval {
2320
pub fn clamp(&self, x: f64) -> f64 {
2421
x.clamp(self.min, self.max)
2522
}
23+
}
24+
impl Default for Interval {
25+
fn default() -> Self {
26+
Interval {min: NEG_INFINITY, max: INFINITY}
27+
}
2628
}

Diff for: src/material.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pub trait Material {
55
}
66
pub struct DefaultMaterial;
77
impl Material for DefaultMaterial {
8-
fn scatter(&self, r_in: &Ray, rec: &HitRecord, attenuation: &mut Color, scattered: &mut Ray) -> bool {
8+
fn scatter(&self, _: &Ray, _: &HitRecord, _: &mut Color, _: &mut Ray) -> bool {
99
false
1010
}
1111
}

Diff for: src/sphere.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ impl<'a> Hittable<'a> for Sphere<'a> {
3636
rec.p = r.at(rec.t);
3737
let outward_normal = (rec.p - self.center) / self.radius;
3838
rec.set_face_normal(r, &outward_normal);
39-
rec.mat = self.mat.clone();
39+
rec.mat = self.mat;
4040

4141
true
4242
}

Diff for: src/vec3.rs

-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ pub fn random_in_unit_sphere() -> Vec3 {
152152
}
153153
}
154154

155-
// Consider using lifetime
156155
pub fn random_unit_vector() -> Vec3 {
157156
unit_vector(&random_in_unit_sphere())
158157
}

0 commit comments

Comments
 (0)