AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-15 10:25:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

physics: abort entity movement if collisions would increase distance

Browse Source
This commit is contained in:
Lukas 2021-05-01 14:13:54 +02:00
parent aa20dc3441
commit 7236ad0bc8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt
View File

@ -243,8 +243,9 @@ abstract class Entity(
testDelta.y = STEP_HEIGHT testDelta.y = STEP_HEIGHT
val stepMovementY = collisionsToCheck.computeOffset(aabb + testDelta, -STEP_HEIGHT, Axes.Y) val stepMovementY = collisionsToCheck.computeOffset(aabb + testDelta, -STEP_HEIGHT, Axes.Y)
if (stepMovementY < 0 && stepMovementY >= -STEP_HEIGHT) { if (stepMovementY < 0 && stepMovementY >= -STEP_HEIGHT) {
delta.y = STEP_HEIGHT + stepMovementY testDelta.y = STEP_HEIGHT + stepMovementY
aabb.offsetAssign(0f, delta.y, 0f) aabb.offsetAssign(0f, testDelta.y, 0f)
delta.y += testDelta.y
} }
} }
val xPriority = delta.x > delta.z val xPriority = delta.x > delta.z
@ -268,6 +269,9 @@ abstract class Entity(
velocity.x = 0.0f velocity.x = 0.0f
} }
} }
if (delta.length() > deltaPosition.length() + STEP_HEIGHT) {
return Vec3() // abort all movement if the collision system would move the entity further than wanted
}
return delta return delta
} }