diff --git a/src/router/astar.rs b/src/router/astar.rs index 5886c7e..7246d9c 100644 --- a/src/router/astar.rs +++ b/src/router/astar.rs @@ -117,7 +117,7 @@ pub trait MakeEdgeRef: IntoEdgeReferences { fn edge_ref(&self, edge_id: Self::EdgeId) -> Self::EdgeRef; } -pub struct Astar +pub struct AstarStepper where G: GraphBase, G::NodeId: Eq + Ord, @@ -149,7 +149,7 @@ pub enum AstarError { NotFound, } -impl Astar +impl AstarStepper where G: GraphBase, G::NodeId: Eq + Ord, @@ -177,7 +177,7 @@ where } impl> Step, R), AstarContinueStatus> - for Astar + for AstarStepper where G: GraphBase, G::NodeId: Eq + Ord, diff --git a/src/router/route.rs b/src/router/route.rs index 3699ea5..d305888 100644 --- a/src/router/route.rs +++ b/src/router/route.rs @@ -13,7 +13,7 @@ use crate::{ geometry::primitive::PrimitiveShape, layout::LayoutEdit, router::{ - astar::{Astar, AstarError}, + astar::{AstarError, AstarStepper}, navcord::Navcord, navcorder::Navcorder, navmesh::{Navmesh, NavmeshError}, @@ -25,7 +25,7 @@ use crate::{ #[derive(Getters, Dissolve)] pub struct RouteStepper { #[getter(skip)] - astar: Astar, + astar: AstarStepper, navcord: Navcord, ghosts: Vec, obstacles: Vec, @@ -57,7 +57,7 @@ impl RouteStepper { let mut navcord = layout.start(recorder, source, source_navvertex, width); let mut strategy = RouterAstarStrategy::new(layout, &mut navcord, target); - let astar = Astar::new(navmesh, source_navvertex, &mut strategy); + let astar = AstarStepper::new(navmesh, source_navvertex, &mut strategy); let ghosts = vec![]; let obstacles = vec![];