From a44e61c1f7a91662045c05bda79b820328ae5215 Mon Sep 17 00:00:00 2001 From: djairoh Date: Sat, 2 May 2026 14:02:06 +0200 Subject: [PATCH] fx: ran linter --- src/camera.rs | 2 +- src/objects/cube.rs | 2 +- src/objects/materials/dielectric.rs | 2 +- src/objects/quad.rs | 17 ++++++++--------- src/objects/triangle.rs | 6 +++--- src/scenes/scene.rs | 16 ---------------- src/vec3.rs | 1 - 7 files changed, 14 insertions(+), 32 deletions(-) diff --git a/src/camera.rs b/src/camera.rs index 239f70f..fdab07f 100644 --- a/src/camera.rs +++ b/src/camera.rs @@ -1,6 +1,6 @@ use std::{f32::consts::PI, sync::Arc}; -use log::{info, warn}; +use log::info; use crate::{ objects::{hit::Hit, traits::Hittable}, diff --git a/src/objects/cube.rs b/src/objects/cube.rs index 42b771a..a9dd6d1 100644 --- a/src/objects/cube.rs +++ b/src/objects/cube.rs @@ -43,7 +43,7 @@ impl Hittable for Cube { Hit::hit_list(&self.faces, r) } - fn normal_at(&self, p: &Vec3) -> Vec3 { + fn normal_at(&self, _p: &Vec3) -> Vec3 { // TODO: normal calc for cube todo!() } diff --git a/src/objects/materials/dielectric.rs b/src/objects/materials/dielectric.rs index 4aac6f3..ff6c1d7 100644 --- a/src/objects/materials/dielectric.rs +++ b/src/objects/materials/dielectric.rs @@ -6,7 +6,7 @@ use serde::Deserialize; use crate::{ objects::{hit::Hit, materials::traits::Material}, ray::Ray, - vec3::{Colour, Vec3}, + vec3::Colour, }; #[derive(Debug, Deserialize)] diff --git a/src/objects/quad.rs b/src/objects/quad.rs index 98988f1..54d5510 100644 --- a/src/objects/quad.rs +++ b/src/objects/quad.rs @@ -4,7 +4,6 @@ use crate::objects::traits::Hittable; use crate::objects::triangle::Triangle; use crate::ray::Ray; use crate::{objects::materials::traits::Material, vec3::Vec3}; -use log::{info, warn}; use std::fmt::Debug; use std::sync::Arc; @@ -29,12 +28,12 @@ impl Quad { } } pub fn corner_spheres(&self) -> Vec { - let mut out: Vec = vec![]; - out.push(Sphere::new(self.p1, 1., self.material.clone())); - out.push(Sphere::new(self.p2, 1., self.material.clone())); - out.push(Sphere::new(self.p3, 1., self.material.clone())); - out.push(Sphere::new(self.p4, 1., self.material.clone())); - return out; + vec![ + Sphere::new(self.p1, 1., self.material.clone()), + Sphere::new(self.p2, 1., self.material.clone()), + Sphere::new(self.p3, 1., self.material.clone()), + Sphere::new(self.p4, 1., self.material.clone()), + ] } pub fn hit( @@ -51,7 +50,7 @@ impl Quad { if isct1.is_some() { return isct1; } - return isct2; + isct2 } } @@ -82,6 +81,6 @@ impl Hittable for Quad { fn normal_at(&self, _p: &Vec3) -> Vec3 { // FIXME: might cause ownership issues - return self.normal; + self.normal } } diff --git a/src/objects/triangle.rs b/src/objects/triangle.rs index cfdb82c..051d212 100644 --- a/src/objects/triangle.rs +++ b/src/objects/triangle.rs @@ -54,9 +54,9 @@ impl Triangle { let diff = (a4 - a1 - a2 - a3).abs(); if diff < 0.001 { - return Some(Hit::new(t, p, normal, material, normal.dot(&-r.dir()) > 0.)); + Some(Hit::new(t, p, normal, material, normal.dot(&-r.dir()) > 0.)) } else { - return None; + None } } } @@ -86,6 +86,6 @@ impl Hittable for Triangle { fn normal_at(&self, _p: &Vec3) -> Vec3 { // FIXME: might cause ownership issues - return self.normal; + self.normal } } diff --git a/src/scenes/scene.rs b/src/scenes/scene.rs index 97f8772..47439a0 100644 --- a/src/scenes/scene.rs +++ b/src/scenes/scene.rs @@ -40,22 +40,6 @@ impl Debug for Scene { } impl Scene { - pub fn new(image_width: u32, image_height: u32) -> Self { - Self { - camera: Camera::new(image_width, image_height), - materials: vec![], - objects: vec![], - } - } - - pub fn camera(&mut self) -> &mut Camera { - &mut self.camera - } - - pub fn add_hittable(&mut self, hittable: Arc) { - self.objects.push(hittable); - } - pub fn render(&mut self) { self.camera.render(&self.objects); } diff --git a/src/vec3.rs b/src/vec3.rs index 4ea48fe..582988a 100644 --- a/src/vec3.rs +++ b/src/vec3.rs @@ -1,6 +1,5 @@ use core::f32::math::sqrt; use is_close::default; -use log::warn; use rand::RngExt; use serde::{Deserialize, Serialize, Serializer}; use std::{