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

Fix bug with zero-pushback for bigger colliders

Browse Source
This commit is contained in:
juliancoffee
2021-09-16 16:53:29 +03:00
parent c069a3523d
commit fdb4b7111a
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1942,14 +1942,13 @@ fn projection_between(c0: ColliderContext, c1: ColliderContext) -> (Vec2<f32>, f
// of motion from our target collider to our collider. // of motion from our target collider to our collider.
// //
// TODO: can code beloew be deduplicated? :think: // TODO: can code beloew be deduplicated? :think:
let we = c0.pos.xy();
let other = c1.pos.xy();
if c0.previous_cache.scaled_radius > c1.previous_cache.scaled_radius { if c0.previous_cache.scaled_radius > c1.previous_cache.scaled_radius {
let our_radius = c0.previous_cache.neighborhood_radius; let our_radius = c0.previous_cache.neighborhood_radius;
let their_radius = c1.previous_cache.scaled_radius; let their_radius = c1.previous_cache.scaled_radius;
let collision_dist = our_radius + their_radius; let collision_dist = our_radius + their_radius;
let we = c0.pos.xy();
let other = c1.pos.xy();
let (p0_offset, p1_offset) = match c0.previous_cache.origins { let (p0_offset, p1_offset) = match c0.previous_cache.origins {
Some(origins) => origins, Some(origins) => origins,
None => return (we - other, collision_dist), None => return (we - other, collision_dist),
@ -1959,7 +1958,7 @@ fn projection_between(c0: ColliderContext, c1: ColliderContext) -> (Vec2<f32>, f
end: we + p1_offset, end: we + p1_offset,
}; };
let projection = other - segment.projected_point(other) - other; let projection = segment.projected_point(other) - other;
(projection, collision_dist) (projection, collision_dist)
} else { } else {
@ -1967,9 +1966,6 @@ fn projection_between(c0: ColliderContext, c1: ColliderContext) -> (Vec2<f32>, f
let their_radius = c1.previous_cache.neighborhood_radius; let their_radius = c1.previous_cache.neighborhood_radius;
let collision_dist = our_radius + their_radius; let collision_dist = our_radius + their_radius;
let we = c0.pos.xy();
let other = c1.pos.xy();
let (p0_offset_other, p1_offset_other) = match c1.previous_cache.origins { let (p0_offset_other, p1_offset_other) = match c1.previous_cache.origins {
Some(origins) => origins, Some(origins) => origins,
None => return (we - other, collision_dist), None => return (we - other, collision_dist),