Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better pathfinding iteration cap

Browse Source
This commit is contained in:
Joshua Barretto 2020-01-24 10:40:52 +00:00
parent 7167320c92
commit 353a0f67be
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/path.rs
View File

@ -135,8 +135,8 @@ impl Chaser {
fn find_path<V>( fn find_path<V>(
astar: &mut Option<Astar<Vec3<i32>>>, astar: &mut Option<Astar<Vec3<i32>>>,
vol: &V, vol: &V,
start: Vec3<f32>, startf: Vec3<f32>,
end: Vec3<f32>, endf: Vec3<f32>,
) -> Path<Vec3<i32>> ) -> Path<Vec3<i32>>
where where
V: BaseVol<Vox = Block> + ReadVol, V: BaseVol<Vox = Block> + ReadVol,
@ -167,8 +167,8 @@ where
}; };
let (start, end) = match ( let (start, end) = match (
get_walkable_z(start.map(|e| e.floor() as i32)), get_walkable_z(startf.map(|e| e.floor() as i32)),
get_walkable_z(end.map(|e| e.floor() as i32)), get_walkable_z(endf.map(|e| e.floor() as i32)),
) { ) {
(Some(start), Some(end)) => (start, end), (Some(start), Some(end)) => (start, end),
_ => return Path::default(), _ => return Path::default(),
@ -206,8 +206,8 @@ where
let mut new_astar = match astar.take() { let mut new_astar = match astar.take() {
None => { None => {
let max_iters = ((Vec2::<f32>::from(start).distance(Vec2::from(end)) + 10.0).powf(2.0) let max_iters = ((Vec2::<f32>::from(startf).distance(Vec2::from(endf)) * 2.0 + 25.0)
as usize) .powf(2.0) as usize)
.min(25_000); .min(25_000);
Astar::new(max_iters, start, heuristic.clone()) Astar::new(max_iters, start, heuristic.clone())
} }

2
server/src/lib.rs
View File

@ -133,7 +133,7 @@ impl Server {
#[cfg(not(feature = "worldgen"))] #[cfg(not(feature = "worldgen"))]
let world = World::generate(settings.world_seed); let world = World::generate(settings.world_seed);
let map = Vec::new(); let map = vec![0];
#[cfg(feature = "worldgen")] #[cfg(feature = "worldgen")]
let spawn_point = { let spawn_point = {

5
server/src/test_world.rs
View File

@ -7,10 +7,7 @@ use rand::{prelude::*, rngs::SmallRng};
use std::time::Duration; use std::time::Duration;
use vek::*; use vek::*;
pub const WORLD_SIZE: Vec2<usize> = Vec2 { pub const WORLD_SIZE: Vec2<usize> = Vec2 { x: 1, y: 1 };
x: 1024 * 1,
y: 1024 * 1,
};
pub struct World; pub struct World;