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

Used velocity bias for collision correction

Browse Source
This commit is contained in:
Joshua Barretto
2019-06-26 10:55:08 +01:00
parent 6258035a4d
commit 5decd48db6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/lib.rs
View File

@ -1,4 +1,4 @@
#![type_length_limit="1615607"] #![type_length_limit="1652471"]
#![feature( #![feature(
euclidean_division, euclidean_division,
duration_float, duration_float,

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

@ -221,7 +221,7 @@ impl<'a> System<'a> for Sys {
.get(*block_pos) .get(*block_pos)
.map(|vox| !vox.is_empty()) .map(|vox| !vox.is_empty())
.unwrap_or(false)) .unwrap_or(false))
.max_by_key(|(_, block_aabb)| ((player_aabb.collision_vector_with_aabb(*block_aabb) * Vec3::new(1.0, 1.0, 10.0)).map(|e| e.abs()).reduce_partial_min() * 200.0) as i32) .max_by_key(|(_, block_aabb)| ((player_aabb.collision_vector_with_aabb(*block_aabb) / vel.0).map(|e| e.abs()).reduce_partial_min() * 1000.0) as i32)
.expect("Collision detected, but no colliding blocks found!"); .expect("Collision detected, but no colliding blocks found!");
let dir = player_aabb.collision_vector_with_aabb(block_aabb); let dir = player_aabb.collision_vector_with_aabb(block_aabb);