diff --git a/experiments/2024-10-30/src/export.rs b/experiments/2024-10-30/src/export.rs index 1af4dfce1..ee47aa020 100644 --- a/experiments/2024-10-30/src/export.rs +++ b/experiments/2024-10-30/src/export.rs @@ -1,15 +1,16 @@ use std::fs::File; -pub fn export( - vertices: impl IntoIterator, - triangles: impl IntoIterator, -) -> anyhow::Result<()> { - let vertices = vertices +use crate::mesh::Mesh; + +pub fn export(mesh: Mesh) -> anyhow::Result<()> { + let vertices = mesh + .vertices .into_iter() .map(|[x, y, z]| threemf::model::Vertex { x, y, z }) .collect(); - let triangles = triangles + let triangles = mesh + .triangles .into_iter() .map(|[v1, v2, v3]| threemf::model::Triangle { v1, v2, v3 }) .collect(); diff --git a/experiments/2024-10-30/src/main.rs b/experiments/2024-10-30/src/main.rs index 4764a13b6..beed10cdf 100644 --- a/experiments/2024-10-30/src/main.rs +++ b/experiments/2024-10-30/src/main.rs @@ -4,6 +4,6 @@ mod model; fn main() -> anyhow::Result<()> { let mesh = model::model()?; - export::export(mesh.vertices, mesh.triangles)?; + export::export(mesh)?; Ok(()) }