do not consume triangulation when creating navmesh

vleue · Aug 16, 2023 · bb51c85 · bb51c85
1 parent f12a9d2
commit bb51c85
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 17 deletions.
diff --git a/benches/triangulation.rs b/benches/triangulation.rs
@@ -142,7 +142,7 @@ fn triangulation(c: &mut Criterion) {
             triangulation.add_obstacle(ARENA_OBSTACLES[3].to_vec());
             triangulation.add_obstacle(ARENA_OBSTACLES[4].to_vec());
 
-            let mesh: Mesh = triangulation.into();
+            let mesh: Mesh = triangulation.as_navmesh();
             black_box(mesh);
         })
     });
@@ -161,7 +161,7 @@ fn triangulation_bulk(c: &mut Criterion) {
                 ARENA_OBSTACLES[3].to_vec(),
                 ARENA_OBSTACLES[4].to_vec(),
             ]);
-            let mesh: Mesh = triangulation.into();
+            let mesh: Mesh = triangulation.as_navmesh();
             black_box(mesh);
         })
     });
@@ -180,7 +180,7 @@ fn triangulation_overlapping(c: &mut Criterion) {
             triangulation.add_obstacle(ARENA_OBSTACLES[4].to_vec());
             triangulation.merge_overlapping_obstacles();
 
-            let mesh: Mesh = triangulation.into();
+            let mesh: Mesh = triangulation.as_navmesh();
             black_box(mesh);
         })
     });
@@ -219,7 +219,7 @@ fn triangulation_square(c: &mut Criterion) {
                 vec2(7.5, 7.5),
                 vec2(7.5, 5.01),
             ]);
-            let mesh: Mesh = triangulation.into();
+            let mesh: Mesh = triangulation.as_navmesh();
             black_box(mesh);
         })
     });
@@ -259,7 +259,7 @@ fn triangulation_square_overlapping(c: &mut Criterion) {
                 vec2(7.5, 4.0),
             ]);
             triangulation.merge_overlapping_obstacles();
-            let mesh: Mesh = triangulation.into();
+            let mesh: Mesh = triangulation.as_navmesh();
             black_box(mesh);
         })
     });
@@ -2083,7 +2083,7 @@ fn triangulation_many_overlapping(c: &mut Criterion) {
                 ],
             ]);
             triangulation.merge_overlapping_obstacles();
-            let mesh: Mesh = triangulation.into();
+            let mesh: Mesh = triangulation.as_navmesh();
             black_box(mesh);
         })
     });

diff --git a/src/input/triangulation.rs b/src/input/triangulation.rs
@@ -137,14 +137,13 @@ impl Triangulation {
             }
         }
     }
-}
 
-impl From<Triangulation> for Mesh {
-    fn from(value: Triangulation) -> Self {
+    /// Convert the triangulation into a [`Mesh`].
+    pub fn as_navmesh(&self) -> Mesh {
         let mut cdt = ConstrainedDelaunayTriangulation::<Point2<f32>>::new();
-        Triangulation::add_constraint_edges(&mut cdt, value.inner.exterior());
+        Triangulation::add_constraint_edges(&mut cdt, self.inner.exterior());
 
-        value.inner.interiors().iter().for_each(|obstacle| {
+        self.inner.interiors().iter().for_each(|obstacle| {
             Triangulation::add_constraint_edges(&mut cdt, obstacle);
         });
 
@@ -154,14 +153,14 @@ impl From<Triangulation> for Mesh {
             .filter_map(|face| {
                 let center = face.center();
                 let center = Coord::from((center.x, center.y));
-                value.inner.contains(&center).then(|| {
+                self.inner.contains(&center).then(|| {
                     face_to_polygon.insert(face.index(), face_to_polygon.len() as isize);
                     Polygon::new(
                         face.vertices()
                             .iter()
                             .map(|vertex| vertex.index() as u32)
                             .collect(),
-                        // TODO: can this be set to the correct value
+                        // TODO: can this be set to the correct value?
                         false,
                     )
                 })

diff --git a/tests/arena-triangulation.rs b/tests/arena-triangulation.rs
@@ -136,7 +136,7 @@ fn arena_mesh() -> Mesh {
         vec2(26., 7.),
         vec2(26., 10.),
     ]);
-    triangulation.into()
+    triangulation.as_navmesh()
 }
 
 #[test]

diff --git a/tests/triangulation.rs b/tests/triangulation.rs
@@ -15,7 +15,7 @@ fn is_in_mesh() {
         vec2(7.5, 7.5),
         vec2(7.5, 2.5),
     ]);
-    let mesh: Mesh = triangulation.into();
+    let mesh: Mesh = triangulation.as_navmesh();
     for i in 0..10 {
         for j in 0..10 {
             if i > 2 && i < 8 && j > 2 && j < 8 {
@@ -59,7 +59,7 @@ fn is_in_mesh_4_obstacles() {
         vec2(7.5, 7.5),
         vec2(7.5, 5.0),
     ]);
-    let mesh: Mesh = triangulation.into();
+    let mesh: Mesh = triangulation.as_navmesh();
     for i in 0..10 {
         for j in 0..10 {
             if i > 2 && i < 8 && j > 2 && j < 8 {
@@ -104,7 +104,7 @@ fn is_in_mesh_overlapping() {
         vec2(7.5, 4.0),
     ]);
     triangulation.merge_overlapping_obstacles();
-    let mesh: Mesh = triangulation.into();
+    let mesh: Mesh = triangulation.as_navmesh();
     for i in 0..10 {
         for j in 0..10 {
             if i > 2 && i < 8 && j > 2 && j < 8 {