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

implementation of feature ROUNDWORLD

Browse Source 
Former-commit-id: b869816eceefc4d728919cd2028ea98cf4d0f505
Former-commit-id: 8dc1d95e49aef406899c8086f053ebb13d416884
This commit is contained in:
Song Minjae
2016-10-23 00:48:05 +09:00
parent 3160ecea16
commit 2b31bb962a
5 changed files with 69 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/net/torvald/terrarum/gameactors/ActorWithBody.kt
View File

@@ -39,8 +39,8 @@ open class ActorWithBody : Actor(), Visible {
* * Unit: pixel
* !! external class should not hitbox.set(); use setHitboxDimension() and setPosition()
*/
override val hitbox = Hitbox(0.0, 0.0, 0.0, 0.0)
@Transient val nextHitbox = Hitbox(0.0, 0.0, 0.0, 0.0)
override val hitbox = Hitbox(0.0, 0.0, 0.0, 0.0) // Hitbox is implemented using Double;
@Transient val nextHitbox = Hitbox(0.0, 0.0, 0.0, 0.0) // 52 mantissas ought to be enough for anybody...
/**
* Velocity vector for newtonian sim.
@@ -346,7 +346,7 @@ open class ActorWithBody : Actor(), Visible {
// apply our compensation to actual hitbox
updateHitbox()
// make sure the actor does not go out of the map
// make sure if the actor tries to go out of the map, loop back instead
clampHitbox()
}
@@ -862,8 +862,18 @@ open class ActorWithBody : Actor(), Visible {
}
private fun clampHitbox() {
val worldsizePxl = world.width.times(TSIZE)
hitbox.setPositionFromPoint(
clampW(hitbox.pointedX), clampH(hitbox.pointedY))
//clampW(hitbox.pointedX),
if (hitbox.pointedX < 0)
hitbox.pointedX + worldsizePxl
else if (hitbox.pointedX >= worldsizePxl)
hitbox.pointedX - worldsizePxl
else
hitbox.pointedX, // ROUNDWORLD impl
clampH(hitbox.pointedY)
)
}
private fun setNewNextHitbox() {