diff --git a/src/bin/topola-sdl2-demo/main.rs b/src/bin/topola-sdl2-demo/main.rs index ad6457c..15c395b 100644 --- a/src/bin/topola-sdl2-demo/main.rs +++ b/src/bin/topola-sdl2-demo/main.rs @@ -51,7 +51,7 @@ use std::sync::{Arc, Mutex}; use std::time::Duration; use topola::math::Circle; -use topola::router::Router; +use topola::router::Route; struct SimpleRules { net_clearances: HashMap<(usize, usize), f64>, @@ -83,7 +83,7 @@ impl RulesTrait for SimpleRules { // Clunky enum to work around borrow checker. enum RouterOrLayout<'a, R: RulesTrait> { - Router(&'a mut Router<'a, R>), + Router(&'a mut Route<'a, R>), Layout(&'a Layout), } diff --git a/src/board/board.rs b/src/board/board.rs index 3899a34..b906efe 100644 --- a/src/board/board.rs +++ b/src/board/board.rs @@ -15,7 +15,7 @@ use crate::{ Layout, NodeIndex, }, math::Circle, - router::{navmesh::Navmesh, Router, RouterError}, + router::{navmesh::Navmesh, Route, RouterError}, }; #[derive(Debug)] @@ -129,7 +129,7 @@ impl Board { .unwrap() .to_string(); - let mut router = Router::new_from_navmesh(self.layout_mut(), navmesh, 100.0); + let mut router = Route::new_from_navmesh(self.layout_mut(), navmesh, 100.0); let result = router.route_band(self.layout_mut(), 100.0); if let Ok(band) = result { diff --git a/src/router/mod.rs b/src/router/mod.rs index 7be38f9..063932a 100644 --- a/src/router/mod.rs +++ b/src/router/mod.rs @@ -1,8 +1,8 @@ pub mod astar; pub mod draw; pub mod navmesh; -mod router; +pub mod route; pub mod trace; pub mod tracer; -pub use router::*; +//pub use router::*; diff --git a/src/router/router.rs b/src/router/route.rs similarity index 99% rename from src/router/router.rs rename to src/router/route.rs index a4834bb..b067faa 100644 --- a/src/router/router.rs +++ b/src/router/route.rs @@ -37,7 +37,7 @@ pub enum RouterError { Astar(#[from] AstarError), } -pub struct Router { +pub struct Route { astar: Astar, trace: Trace, } @@ -149,7 +149,7 @@ impl<'a, R: RulesTrait> AstarStrategy } } -impl Router { +impl Route { pub fn new( layout: &mut Layout, from: FixedDotIndex,