From dc8d406715115e4d227f4e0f824fa00c95b278f4 Mon Sep 17 00:00:00 2001 From: stickynotememo Date: Fri, 16 Jan 2026 16:32:31 +1100 Subject: [PATCH] Clippy fixes --- src/main.rs | 2 +- src/points.rs | 17 ++++++++--------- src/render.rs | 4 ++-- src/scene.rs | 6 ++---- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/main.rs b/src/main.rs index 8674bb0..29936c3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -69,7 +69,7 @@ fn main() { let now = Instant::now(); - render( &scene, &mut *sbuffer); + render( &scene, &mut sbuffer); set_scene(dt, &mut scene); let elapsed = now.elapsed(); // Timing operations diff --git a/src/points.rs b/src/points.rs index c5009f4..cdd52aa 100644 --- a/src/points.rs +++ b/src/points.rs @@ -1,4 +1,3 @@ -use std::collections::HashMap; use crate::consts::*; @@ -53,17 +52,17 @@ impl Object { }; for (i_start, i_end) in ret.edge_indices.iter() { - ret.edges.push((ret.vertices[*i_start].clone(), ret.vertices[*i_end].clone())); + ret.edges.push((ret.vertices[*i_start], ret.vertices[*i_end])); } for (i_one, i_two, i_three /* The three vertices of the triangle */) in ret.triangle_indices.iter() { - ret.triangles.push((ret.vertices[*i_one].clone(), ret.vertices[*i_two].clone(), ret.vertices[*i_three].clone())); + ret.triangles.push((ret.vertices[*i_one], ret.vertices[*i_two], ret.vertices[*i_three])); } ret } - fn ear_clip(polygon: &Vec) -> Vec<(Point3D, Point3D, Point3D)> { + fn ear_clip(_polygon: &Vec) -> Vec<(Point3D, Point3D, Point3D)> { todo!() } @@ -74,7 +73,7 @@ impl Object { // OPTIMISATION: Do we need to re-initalise self.{edges, faces, triangles} every execution? self.edges = vec![]; for (i_start, i_end) in self.edge_indices.iter() { - self.edges.push((self.vertices[*i_start].clone(), self.vertices[*i_end].clone())); + self.edges.push((self.vertices[*i_start], self.vertices[*i_end])); } self.faces = vec![]; @@ -84,10 +83,10 @@ impl Object { self.triangles = vec![]; for face in self.faces.iter() { - self.triangles.append(&mut Self::ear_clip(&face)); + self.triangles.append(&mut Self::ear_clip(face)); } for (i_one, i_two, i_three /* The three vertices of the triangle */) in self.triangle_indices.iter() { - self.triangles.push((self.vertices[*i_one].clone(), self.vertices[*i_two].clone(), self.vertices[*i_three].clone())); + self.triangles.push((self.vertices[*i_one], self.vertices[*i_two], self.vertices[*i_three])); } } } @@ -147,8 +146,8 @@ impl Point2D { // Pythagorean formula // TODO: use hypot function f64::sqrt( - (f64::powf(p2.x.max(p1.x) - p1.x.min(p2.x), 2.0) - + f64::powf(p2.y.max(p1.y) - p1.y.min(p2.y), 2.0)) as f64, + f64::powf(p2.x.max(p1.x) - p1.x.min(p2.x), 2.0) + + f64::powf(p2.y.max(p1.y) - p1.y.min(p2.y), 2.0), ) } diff --git a/src/render.rs b/src/render.rs index afa39fe..9d1b783 100644 --- a/src/render.rs +++ b/src/render.rs @@ -1,5 +1,5 @@ use crate::consts::*; -use crate::points::{Point2D, Point3D}; +use crate::points::Point2D; use crate::Scene; type Pixel = u32; @@ -53,7 +53,7 @@ pub fn render(scene: &Scene, buf: &mut [u32]) { } let m = (end.y - start.y) / (end.x - start.x); // m = rise/run - let c = start.y as f64 - m * start.x as f64; // c = y - mx + let c = start.y - m * start.x; // c = y - mx for x in (start.x.min(end.x) as usize)..=(end.x.max(start.x) as usize) { let x = x as f64; diff --git a/src/scene.rs b/src/scene.rs index 86b085a..3de545e 100644 --- a/src/scene.rs +++ b/src/scene.rs @@ -1,11 +1,9 @@ -use core::f64; use std::time::Duration; -use crate::points::Point3D; use crate::points::Scene; -pub fn set_scene(dt: Duration, scene: &mut Scene) { +pub fn set_scene(_dt: Duration, scene: &mut Scene) { for obj in scene { - for vertex in obj.vertices.iter_mut() { + for _vertex in obj.vertices.iter_mut() { // vertex.z += 1.0; }