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

lazily calculate magnitude in goto and add comments

Browse Source
This commit is contained in:
Isse 2023-04-14 14:02:35 +02:00
parent 60b626d3ee
commit b987bfccb4
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rtsim/src/rule/npc_ai.rs
View File

@ -283,9 +283,6 @@ fn goto(wpos: Vec3<f32>, speed_factor: f32, goal_dist: f32) -> impl Action {
let mut waypoint = None; let mut waypoint = None;
just(move |ctx| { just(move |ctx| {
let rpos = wpos - ctx.npc.wpos;
let len = rpos.magnitude();
// If we're close to the next waypoint, complete it // If we're close to the next waypoint, complete it
if waypoint.map_or(false, |waypoint: Vec3<f32>| { if waypoint.map_or(false, |waypoint: Vec3<f32>| {
ctx.npc.wpos.xy().distance_squared(waypoint.xy()) < WAYPOINT_DIST.powi(2) ctx.npc.wpos.xy().distance_squared(waypoint.xy()) < WAYPOINT_DIST.powi(2)
@ -295,6 +292,8 @@ fn goto(wpos: Vec3<f32>, speed_factor: f32, goal_dist: f32) -> impl Action {
// Get the next waypoint on the route toward the goal // Get the next waypoint on the route toward the goal
let waypoint = waypoint.get_or_insert_with(|| { let waypoint = waypoint.get_or_insert_with(|| {
let rpos = wpos - ctx.npc.wpos;
let len = rpos.magnitude();
let wpos = ctx.npc.wpos + (rpos / len) * len.min(STEP_DIST); let wpos = ctx.npc.wpos + (rpos / len) * len.min(STEP_DIST);
wpos.with_z( wpos.with_z(
@ -313,6 +312,8 @@ fn goto(wpos: Vec3<f32>, speed_factor: f32, goal_dist: f32) -> impl Action {
.map(|_| {}) .map(|_| {})
} }
/// Try to walk fly a 3D position following the terrain altitude at an offset
/// without caring for obstacles.
fn goto_flying( fn goto_flying(
wpos: Vec3<f32>, wpos: Vec3<f32>,
speed_factor: f32, speed_factor: f32,
@ -324,9 +325,6 @@ fn goto_flying(
let mut waypoint = None; let mut waypoint = None;
just(move |ctx| { just(move |ctx| {
let rpos = wpos - ctx.npc.wpos;
let len = rpos.magnitude();
// If we're close to the next waypoint, complete it // If we're close to the next waypoint, complete it
if waypoint.map_or(false, |waypoint: Vec3<f32>| { if waypoint.map_or(false, |waypoint: Vec3<f32>| {
ctx.npc.wpos.distance_squared(waypoint) < waypoint_dist.powi(2) ctx.npc.wpos.distance_squared(waypoint) < waypoint_dist.powi(2)
@ -336,6 +334,8 @@ fn goto_flying(
// Get the next waypoint on the route toward the goal // Get the next waypoint on the route toward the goal
let waypoint = waypoint.get_or_insert_with(|| { let waypoint = waypoint.get_or_insert_with(|| {
let rpos = wpos - ctx.npc.wpos;
let len = rpos.magnitude();
let wpos = ctx.npc.wpos + (rpos / len) * len.min(step_dist); let wpos = ctx.npc.wpos + (rpos / len) * len.min(step_dist);
wpos.with_z( wpos.with_z(
@ -364,6 +364,8 @@ fn goto_2d(wpos2d: Vec2<f32>, speed_factor: f32, goal_dist: f32) -> impl Action
}) })
} }
/// Try to fly toward a 2D position following the terrain altitude at an offset
/// without caring for obstacles.
fn goto_2d_flying( fn goto_2d_flying(
wpos2d: Vec2<f32>, wpos2d: Vec2<f32>,
speed_factor: f32, speed_factor: f32,