From 196df2cd3f481a4b9f3a9b30a301b1f0477f1aea Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Fri, 24 Feb 2023 14:03:13 +0100 Subject: [PATCH] Remove unused argument --- .../src/algorithms/intersect/face_face.rs | 4 +-- .../algorithms/intersect/surface_surface.rs | 30 +++++++------------ 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/crates/fj-kernel/src/algorithms/intersect/face_face.rs b/crates/fj-kernel/src/algorithms/intersect/face_face.rs index 7e6a23b80..9525ed985 100644 --- a/crates/fj-kernel/src/algorithms/intersect/face_face.rs +++ b/crates/fj-kernel/src/algorithms/intersect/face_face.rs @@ -30,12 +30,12 @@ impl FaceFaceIntersection { /// Compute the intersections between two faces pub fn compute( faces: [&Face; 2], - objects: &mut Service, + _: &mut Service, ) -> Option { let surfaces = faces.map(|face| face.surface().clone()); let intersection_curves = - match SurfaceSurfaceIntersection::compute(surfaces, objects) { + match SurfaceSurfaceIntersection::compute(surfaces) { Some(intersection) => intersection.intersection_curves, None => return None, }; diff --git a/crates/fj-kernel/src/algorithms/intersect/surface_surface.rs b/crates/fj-kernel/src/algorithms/intersect/surface_surface.rs index 4b71b2e1a..b6927ff1f 100644 --- a/crates/fj-kernel/src/algorithms/intersect/surface_surface.rs +++ b/crates/fj-kernel/src/algorithms/intersect/surface_surface.rs @@ -2,8 +2,7 @@ use fj_math::{Line, Plane, Point, Scalar}; use crate::{ geometry::path::{GlobalPath, SurfacePath}, - objects::{Objects, Surface}, - services::Service, + objects::Surface, storage::Handle, }; @@ -16,10 +15,7 @@ pub struct SurfaceSurfaceIntersection { impl SurfaceSurfaceIntersection { /// Compute the intersection between two surfaces - pub fn compute( - surfaces: [Handle; 2], - _: &mut Service, - ) -> Option { + pub fn compute(surfaces: [Handle; 2]) -> Option { // Algorithm from Real-Time Collision Detection by Christer Ericson. See // section 5.4.4, Intersection of Two Planes. // @@ -95,16 +91,13 @@ mod tests { // Coincident and parallel planes don't have an intersection curve. assert_eq!( - SurfaceSurfaceIntersection::compute( - [ - xy.clone(), - xy.clone().transform( - &Transform::translation([0., 0., 1.],), - &mut services.objects - ) - ], - &mut services.objects - ), + SurfaceSurfaceIntersection::compute([ + xy.clone(), + xy.clone().transform( + &Transform::translation([0., 0., 1.],), + &mut services.objects + ) + ],), None, ); @@ -112,10 +105,7 @@ mod tests { let expected_xz = SurfacePath::u_axis(); assert_eq!( - SurfaceSurfaceIntersection::compute( - [xy, xz], - &mut services.objects - ), + SurfaceSurfaceIntersection::compute([xy, xz],), Some(SurfaceSurfaceIntersection { intersection_curves: [expected_xy, expected_xz], })