simpler list

src/main.rs

@@ -1,6 +1,6 @@
 #![feature(gen_blocks)]
 
-use std::{error::Error, f32::consts::PI, sync::Arc};
+use std::{convert::identity, error::Error, f32::consts::PI, sync::Arc};
 
 use glam::{Mat4, vec3};
 use winit::{
@@ -48,7 +48,11 @@ pub fn new_tripod(device: &wgpu::Device) -> Mesh {
 	)
 }
 
-fn loop_list<T: Clone, U>(
+fn loop_list<T: Clone>(iter: impl IntoIterator<Item = T>) -> impl Iterator<Item = T> {
+	loop_list_ex(iter, identity, identity)
+}
+
+fn loop_list_ex<T: Clone, U>(
 	iter: impl IntoIterator<Item = T>,
 	mut fa: impl FnMut(T) -> U,
 	mut fb: impl FnMut(T) -> U,
@@ -139,18 +143,11 @@ impl MainWindow {
 			distance: 1.0,
 			diameter: 0.25,
 		};
-		let contour = source.contour(17);
-		let contour: Vec<Vertex> = loop_list(
-			contour,
-			|pos| Vertex {
-				pos,
-				color: vec3(1., 1., 0.),
-			},
-			|pos| Vertex {
+		let contour: Vec<Vertex> = loop_list(source.contour(17))
+			.map(|pos| Vertex {
 				pos,
 				color: vec3(1., 1., 1.),
-			},
-		)
+			})
 			.collect();
 		self.pipeline
 			.render(&mut pass, [&Mesh::new(&self.device, &contour)]);