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

Set z_min to 0 for terrain collision checks

Browse Source 
This allows us have different z_min for e2e checks
This commit is contained in:
juliancoffee
2021-09-16 21:59:52 +03:00
parent e5d69d153b
commit 19f0cf4ee5
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common/systems/src/phys.rs
View File

@ -821,7 +821,8 @@ impl<'a> PhysicsData<'a> {
// Additionally, multiply radius by 0.1 to make // Additionally, multiply radius by 0.1 to make
// the cylinder smaller to avoid lag. // the cylinder smaller to avoid lag.
let radius = collider.bounding_radius() * scale * 0.1; let radius = collider.bounding_radius() * scale * 0.1;
let (z_min, z_max) = collider.get_z_limits(scale); let (_, z_max) = collider.get_z_limits(scale);
let z_min = 0.0;
let mut cpos = *pos; let mut cpos = *pos;
let cylinder = (radius, z_min, z_max); let cylinder = (radius, z_min, z_max);
@ -844,7 +845,7 @@ impl<'a> PhysicsData<'a> {
tgt_pos = cpos.0; tgt_pos = cpos.0;
}, },
Collider::CapsulePrism { Collider::CapsulePrism {
z_min, z_min: _,
z_max, z_max,
p0: _, p0: _,
p1: _, p1: _,
@ -852,7 +853,7 @@ impl<'a> PhysicsData<'a> {
} => { } => {
// Scale collider // Scale collider
let radius = collider.bounding_radius().min(0.45) * scale; let radius = collider.bounding_radius().min(0.45) * scale;
let z_min = *z_min * scale; let z_min = 0.0;
let z_max = z_max.clamped(1.2, 1.95) * scale; let z_max = z_max.clamped(1.2, 1.95) * scale;
let cylinder = (radius, z_min, z_max); let cylinder = (radius, z_min, z_max);
@ -1045,10 +1046,10 @@ impl<'a> PhysicsData<'a> {
// TODO: extract point-terrain collision above to its own // TODO: extract point-terrain collision above to its own
// function // function
let radius = collider.bounding_radius(); let radius = collider.bounding_radius();
let (z_min, z_max) = collider.get_z_limits(1.0); let (_, z_max) = collider.get_z_limits(1.0);
let radius = radius.min(0.45) * scale; let radius = radius.min(0.45) * scale;
let z_min = z_min * scale; let z_min = 0.0;
let z_max = z_max.clamped(1.2, 1.95) * scale; let z_max = z_max.clamped(1.2, 1.95) * scale;
if let Some(voxel_collider) = if let Some(voxel_collider) =