From a5ef0195e2ff71a401bea7d38b1559fa3643b6b3 Mon Sep 17 00:00:00 2001 From: Quaternions Date: Wed, 1 Nov 2023 18:03:11 -0700 Subject: [PATCH] tweak minkowski code + fix edge_verts --- src/model_physics.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/model_physics.rs b/src/model_physics.rs index b8e73b7..7690a6e 100644 --- a/src/model_physics.rs +++ b/src/model_physics.rs @@ -407,7 +407,7 @@ impl MeshQuery for MinkowskiMesh<'_>{ MinkowskiFace::EdgeEdge(e0,e1)=>{ let e0v=self.mesh0.edge_verts(e0); let e1v=self.mesh1.edge_verts(e1); - let [r0,r1]=e0v.map(|(vert_id0,face_id0)|{ + let [r0,r1]=e0v.map(|vert_id0|{ //sort e1 ends by e0 edge dir to get v1 //find face normal formulation without cross products let v1=if 0<(e0.v1-e0.v0).dot(e1.v1-e1.v0){ @@ -417,7 +417,7 @@ impl MeshQuery for MinkowskiMesh<'_>{ }; (MinkowskiEdge::VertEdge(vert_id0,e1),MinkowskiFace::FaceVert(face_id0,v1)) }); - let [r2,r3]=e1v.map(|(vert_id1,face_id1)|{ + let [r2,r3]=e1v.map(|vert_id1|{ //sort e0 ends by e1 edge dir to get v0 let v0=if 0<(e0.v1-e0.v0).dot(e1.v1-e1.v0){ e0.v0 @@ -452,13 +452,13 @@ impl MeshQuery for MinkowskiMesh<'_>{ fn edge_verts(&self,edge_id:MinkowskiEdge)->Cow<[MinkowskiVert;2]>{ match edge_id{ MinkowskiEdge::VertEdge(v0,e1)=>{ - Cow::Owned(self.mesh1.edge_verts(e1).map(|(vert_id1,face_id1)|{ - (MinkowskiVert::VertVert(v0,vert_id1),MinkowskiFace::VertFace(v0,face_id1)) + Cow::Owned(self.mesh1.edge_verts(e1).map(|vert_id1|{ + MinkowskiVert::VertVert(v0,vert_id1) })) }, MinkowskiEdge::EdgeVert(e0,v1)=>{ - Cow::Owned(self.mesh0.edge_verts(e0).map(|(vert_id0,face_id0)|{ - (MinkowskiVert::VertVert(vert_id0,v1),MinkowskiFace::FaceVert(face_id0,v1)) + Cow::Owned(self.mesh0.edge_verts(e0).map(|vert_id0|{ + MinkowskiVert::VertVert(vert_id0,v1) })) }, }