From af9cbeba61dc23b1bec46dde3b3feda9ab6a0fee Mon Sep 17 00:00:00 2001 From: Mikolaj Wielgus Date: Wed, 29 May 2024 16:44:46 +0200 Subject: [PATCH] router: don't assume start dot to have a net --- src/router/navmesh.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/router/navmesh.rs b/src/router/navmesh.rs index d782d71..4e89d0a 100644 --- a/src/router/navmesh.rs +++ b/src/router/navmesh.rs @@ -101,13 +101,13 @@ impl Navmesh { .resize(layout.drawing().geometry().graph().node_bound(), None); let layer = layout.drawing().primitive(from).layer(); - let net = layout.drawing().primitive(from).maybe_net().unwrap(); + let maybe_net = layout.drawing().primitive(from).maybe_net(); for node in layout.drawing().layer_primitive_nodes(layer) { let primitive = node.primitive(layout.drawing()); if let Some(primitive_net) = primitive.maybe_net() { - if node == from.into() || node == to.into() || primitive_net != net { + if node == from.into() || node == to.into() || Some(primitive_net) != maybe_net { match node { PrimitiveIndex::FixedDot(dot) => { this.triangulation.add_vertex(TriangulationVertexWeight { @@ -147,7 +147,7 @@ impl Navmesh { Ok(this) } - pub fn triangulation_vertex(&self, vertex: VertexIndex) -> TriangulationVertexIndex { + fn triangulation_vertex(&self, vertex: VertexIndex) -> TriangulationVertexIndex { match vertex { VertexIndex::FixedDot(dot) => TriangulationVertexIndex::FixedDot(dot), VertexIndex::FixedBend(bend) => TriangulationVertexIndex::FixedBend(bend),