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

Integrate forces *after* velocity is applied

Browse Source
This commit is contained in:
Louis Pearson 2019-06-04 12:14:10 -06:00
parent 84ac965240
commit 4cf13cc588
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/src/sys/phys.rs
View File

@ -54,21 +54,20 @@ impl<'a> System<'a> for Sys {
continue;
}
// Handle held-down control
let on_ground = terrain
.get((pos.0 - Vec3::unit_z() * 0.1).map(|e| e.floor() as i32))
.map(|vox| !vox.is_empty())
.unwrap_or(false)
&& vel.0.z <= 0.0;
// Movement
pos.0 += vel.0 * dt.0;
// Integrate forces
// Friction is assumed to be a constant dependent on location
let friction = 50.0 * if on_ground { FRIC_GROUND } else { FRIC_AIR };
vel.0 = integrate_forces(dt.0, vel.0, friction);
// Movement
pos.0 += vel.0 * dt.0;
// Basic collision with terrain
let mut i = 0.0;
while terrain