curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-14 12:34:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

now works for both LR but actor sticks to left cliff but not right

Browse Source
This commit is contained in:
minjaesong
2017-05-25 22:30:36 +09:00
parent 95f00edd71
commit e24d492239
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/net/torvald/terrarum/gameactors/ActorWithPhysics.kt
View File

@@ -837,6 +837,7 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean
//println("endX modDelta: ${simulationHitbox.endX.modTileDelta()}") //println("endX modDelta: ${simulationHitbox.endX.modTileDelta()}")
//println("startX modDelta: ${simulationHitbox.startX.modTileDelta()}")
//println("touching_right_extra: ${isTouchingSide(simulationHitbox, COLLIDING_RIGHT_EXTRA)}") //println("touching_right_extra: ${isTouchingSide(simulationHitbox, COLLIDING_RIGHT_EXTRA)}")
@@ -859,12 +860,18 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean
}*/ }*/
// --> X-Axis // --> X-Axis
if (simulationHitbox.endX.modTileDelta() >= 15.99999) { if (vectorSum.x > 0 && simulationHitbox.endX.modTileDelta() >= 15.99999) {
val target = simulationHitbox.endX.div(TILE_SIZE).floorInt().plus(1).times(TILE_SIZE).toDouble() val target = simulationHitbox.endX.div(TILE_SIZE).floorInt().plus(1).times(TILE_SIZE).toDouble()
val delta = target - simulationHitbox.endX val delta = target - simulationHitbox.endX
debug2("xR target: $target, delta: $delta") debug2("xR target: $target, delta: $delta")
simulationHitbox.translatePosX(delta) simulationHitbox.translatePosX(delta)
} }
else if (vectorSum.x < 0 && simulationHitbox.startX.modTileDelta() >= 0.99999 && simulationHitbox.startX.modTileDelta() < 1.0) {
val target = simulationHitbox.startX.div(TILE_SIZE).floorInt().times(TILE_SIZE).toDouble()
val delta = target - simulationHitbox.startX
debug2("xL target: $target, delta: $delta")
simulationHitbox.translatePosX(delta)
}