diff --git a/Cargo.toml b/Cargo.toml index 0192fdd..91bf858 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ coord_2d = "0.3" derive_more = "0.99" futures-lite = "1" gilrs = "0.8" -mapgen = { git = "https://github.com/ndarilek/mapgen.rs" } +here_be_dragons = "0.1" maze_generator = "1" once_cell = "1" pathfinding = "3" diff --git a/src/core.rs b/src/core.rs index 772da13..eb2db6b 100644 --- a/src/core.rs +++ b/src/core.rs @@ -518,7 +518,7 @@ impl PointLike for &Coordinates { } } -impl PointLike for mapgen::geometry::Point { +impl PointLike for here_be_dragons::geometry::Point { fn x(&self) -> f32 { self.x as f32 } diff --git a/src/exploration.rs b/src/exploration.rs index 87991ae..de4038f 100644 --- a/src/exploration.rs +++ b/src/exploration.rs @@ -5,7 +5,7 @@ use bevy_input_actionmap::InputMap; use bevy_rapier2d::prelude::*; use bevy_tts::Tts; use derive_more::{Deref, DerefMut}; -use mapgen::Tile; +use here_be_dragons::Tile; use crate::{ core::{Coordinates, Player, PointLike}, diff --git a/src/lib.rs b/src/lib.rs index 282326c..ccfd1a6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -15,9 +15,9 @@ pub mod error; pub mod exploration; pub use futures_lite; pub use gilrs; +pub use here_be_dragons as mapgen; pub mod log; pub mod map; -pub use mapgen; pub mod navigation; pub mod pathfinding; pub mod pitch_shift; diff --git a/src/map.rs b/src/map.rs index 15bf8d1..10b12b4 100644 --- a/src/map.rs +++ b/src/map.rs @@ -6,8 +6,8 @@ use std::{ use bevy::prelude::*; use bevy_rapier2d::prelude::*; use derive_more::{Deref, DerefMut}; -pub use mapgen::Map as MapgenMap; -use mapgen::{geometry::Rect as MRect, MapFilter, Tile}; +pub use here_be_dragons::Map as MapgenMap; +use here_be_dragons::{geometry::Rect as MRect, MapFilter, Tile}; use maze_generator::{prelude::*, recursive_backtracking::RbGenerator}; use rand::prelude::StdRng; @@ -19,8 +19,8 @@ use crate::{ visibility::Visible, }; -impl From for Coordinates { - fn from(point: mapgen::geometry::Point) -> Self { +impl From for Coordinates { + fn from(point: here_be_dragons::geometry::Point) -> Self { Self((point.x as f32, point.y as f32)) } } @@ -215,11 +215,11 @@ impl MapFilter for GridBuilder { } } } - map.starting_point = Some(mapgen::geometry::Point::new( + map.starting_point = Some(here_be_dragons::geometry::Point::new( maze.start.x as usize + 1, maze.start.y as usize + 1, )); - map.exit_point = Some(mapgen::geometry::Point::new( + map.exit_point = Some(here_be_dragons::geometry::Point::new( (maze.goal.x as usize) * self.room_width + half_width, (maze.goal.y as usize) * self.room_height + half_height, )); diff --git a/src/pathfinding.rs b/src/pathfinding.rs index 9543d7e..a37a037 100644 --- a/src/pathfinding.rs +++ b/src/pathfinding.rs @@ -12,7 +12,7 @@ use bevy_rapier2d::{ }; use derive_more::{Deref, DerefMut}; use futures_lite::future; -use mapgen::Tile; +use here_be_dragons::Tile; use pathfinding::prelude::*; use crate::{