aidan9382/strafe-client
1
Fork 0
forked from StrafesNET/strafe-client
Code Pull Requests Activity

parity depends on face only

Browse Source
This commit is contained in:
Quaternions 2023-11-21 18:37:13 -08:00
parent de4a2dc652
commit e4eaecee2c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/model_physics.rs
View File

@ -560,7 +560,7 @@ impl MeshQuery<MinkowskiFace,MinkowskiDirectedEdge,MinkowskiVert> for MinkowskiM
} }
best_edge.map_or( best_edge.map_or(
MinkowskiFace::VertFace(v0,edge_face_id1), MinkowskiFace::VertFace(v0,edge_face_id1),
|directed_edge_id0|MinkowskiFace::EdgeEdge(directed_edge_id0.as_undirected(),e1,directed_edge_id0.parity()^face_parity) |directed_edge_id0|MinkowskiFace::EdgeEdge(directed_edge_id0.as_undirected(),e1,face_parity)
) )
})) }))
}, },
@ -569,7 +569,7 @@ impl MeshQuery<MinkowskiFace,MinkowskiDirectedEdge,MinkowskiVert> for MinkowskiM
let mut i=0; let mut i=0;
let v1e=self.mesh1.vert_edges(v1); let v1e=self.mesh1.vert_edges(v1);
Cow::Owned(self.mesh0.edge_faces(e0).map(|edge_face_id0|{ Cow::Owned(self.mesh0.edge_faces(e0).map(|edge_face_id0|{
let face_parity=i==0; let face_parity=i==0;//always two edge faces
i+=1; i+=1;
let mut best_edge=None; let mut best_edge=None;
let mut best_d=Planar64::ZERO; let mut best_d=Planar64::ZERO;
@ -584,7 +584,7 @@ impl MeshQuery<MinkowskiFace,MinkowskiDirectedEdge,MinkowskiVert> for MinkowskiM
} }
best_edge.map_or( best_edge.map_or(
MinkowskiFace::FaceVert(edge_face_id0,v1), MinkowskiFace::FaceVert(edge_face_id0,v1),
|directed_edge_id1|MinkowskiFace::EdgeEdge(e0,directed_edge_id1.as_undirected(),directed_edge_id1.parity()^face_parity) |directed_edge_id1|MinkowskiFace::EdgeEdge(e0,directed_edge_id1.as_undirected(),face_parity)
) )
})) }))
}, },