diff --git a/src/query/epa/epa2.rs b/src/query/epa/epa2.rs index b5d5045e..2ceb89c3 100644 --- a/src/query/epa/epa2.rs +++ b/src/query/epa/epa2.rs @@ -8,6 +8,7 @@ use num::Bounded; use crate::math::{Isometry, Point, Real, Vector}; use crate::query::gjk::{self, CSOPoint, ConstantOrigin, VoronoiSimplex}; +use crate::query::FaceDegenerate; use crate::shape::SupportMap; use crate::utils; @@ -49,14 +50,10 @@ impl Ord for FaceId { } } -/// Represents a degenerate [`Face`] normal. -#[derive(Clone, Debug, PartialEq, Eq)] -pub struct Degenerate; - #[derive(Clone, Debug)] struct Face { pts: [usize; 2], - normal: Result>, Degenerate>, + normal: Result>, FaceDegenerate>, proj: Point, bcoords: [Real; 2], deleted: bool, @@ -90,7 +87,7 @@ impl Face { normal = Ok(n); deleted = false; } else { - normal = Err(Degenerate); + normal = Err(FaceDegenerate); deleted = true; } @@ -165,7 +162,7 @@ impl EPA { ) -> Option<( Point, Point, - Result>, Degenerate>, + Result>, FaceDegenerate>, )> where G1: ?Sized + SupportMap,