From 36e472c771b44bf0a54410a26ec16937ec77f9f2 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Thu, 23 Jan 2025 21:51:34 +0100 Subject: [PATCH] Simplify function parameters --- experiments/2024-12-09/src/model.rs | 8 +++++--- experiments/2024-12-09/src/topology/face.rs | 9 +++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/experiments/2024-12-09/src/model.rs b/experiments/2024-12-09/src/model.rs index 738ee6bdb..6dd41db55 100644 --- a/experiments/2024-12-09/src/model.rs +++ b/experiments/2024-12-09/src/model.rs @@ -24,9 +24,11 @@ pub fn model() -> AnyOp { sketch.to_face(surface, &mut stores.vertices) }; - let bottom = top - .flip(&mut stores.surfaces) - .translate([0., 0., -1.], &mut stores); + let bottom = top.flip(&mut stores.surfaces).translate( + [0., 0., -1.], + &mut stores.surfaces, + &mut stores.vertices, + ); let [a, b, c, d] = bottom.vertices().collect_array().unwrap(); let [e, f, g, h] = top.vertices().collect_array().unwrap(); diff --git a/experiments/2024-12-09/src/topology/face.rs b/experiments/2024-12-09/src/topology/face.rs index 2d0c9485f..431793833 100644 --- a/experiments/2024-12-09/src/topology/face.rs +++ b/experiments/2024-12-09/src/topology/face.rs @@ -3,7 +3,7 @@ use spade::Triangulation; use crate::{ geometry::{AnyOp, Handle, Operation, TriMesh, Triangle}, math::{Plane, Point, Vector}, - storage::{Store, Stores}, + storage::Store, }; use super::Vertex; @@ -39,16 +39,17 @@ impl Face { pub fn translate( &self, offset: impl Into>, - stores: &mut Stores, + surfaces: &mut Store, + vertices: &mut Store, ) -> Self { let offset = offset.into(); Self { - surface: stores.surfaces.insert(self.surface.translate(offset)), + surface: surfaces.insert(self.surface.translate(offset)), vertices: self .vertices .iter() - .map(|vertex| stores.vertices.insert(vertex.translate(offset))) + .map(|vertex| vertices.insert(vertex.translate(offset))) .collect(), } }