strips/voxelotl-engine
2
0
Fork 0
mirror of https://github.com/GayPizzaSpecifications/voxelotl-engine.git synced 2025-11-04 02:59:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

reorder collision response so zipping up is prioritised over left if player gets stuck in a block

Browse Source
This commit is contained in:
a dinosaur
2024-08-22 03:52:21 +10:00
parent 7eb880f0b7
commit 6a57a8580e
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Sources/Voxelotl/Player.swift
View File

@ -113,6 +113,19 @@ struct Player {
} }
return nil return nil
} }
self._position.y += self._velocity.y * deltaTime
if let aabb = checkCollision(self._velocity.y > 0 ? self._position + .down * Self.epsilon : self.position) {
if self._velocity.y < 0 {
self._position.y = aabb.top + Self.epsilon
self._onGround = true
} else {
self._position.y = aabb.bottom - Self.height - Self.epsilon
self._onGround = false
}
self._velocity.y = 0
} else {
self._onGround = false
}
self._position.x += self._velocity.x * deltaTime self._position.x += self._velocity.x * deltaTime
if let aabb = checkCollision(self._position) { if let aabb = checkCollision(self._position) {
if self._velocity.x < 0 { if self._velocity.x < 0 {
@ -131,19 +144,6 @@ struct Player {
} }
self._velocity.z = 0 self._velocity.z = 0
} }
self._position.y += self._velocity.y * deltaTime
if let aabb = checkCollision(self._velocity.y > 0 ? self._position + .down * Self.epsilon : self.position) {
if self._velocity.y < 0 {
self._position.y = aabb.top + Self.epsilon
self._onGround = true
} else {
self._position.y = aabb.bottom - Self.height - Self.epsilon
self._onGround = false
}
self._velocity.y = 0
} else {
self._onGround = false
}
// Ground friction // Ground friction
if self._onGround { if self._onGround {