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

phys: wip staircasing modification is still compatible with old code

Browse Source
This commit is contained in:
minjaesong
2020-07-20 21:24:22 +09:00
parent 4d46a44c51
commit 64e9d3c0e4
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -733,14 +733,20 @@ open class ActorWithBody(renderOrder: RenderOrder, val physProp: PhysProperties)
val newHitbox = hitbox.reassign(sixteenStep[collidingStep!!]) val newHitbox = hitbox.reassign(sixteenStep[collidingStep!!])
var selfCollisionStatus = 0 //var selfCollisionStatus = 0
var collisionStatus = (0..3).map { isWalledStairs(newHitbox, it) } var collisionStatus = (0..3).map { isWalledStairs(newHitbox, it) }
if (isWalled(newHitbox, COLLIDING_LEFT)) selfCollisionStatus += COLL_LEFTSIDE // 1 // made compatible with old variable and its usage
if (isWalled(newHitbox, COLLIDING_BOTTOM)) selfCollisionStatus += COLL_BOTTOMSIDE // 2 var selfCollisionStatus = collisionStatus.foldIndexed(0) { index, acc, b -> acc or (b.shr(1) shl index) }
if (isWalled(newHitbox, COLLIDING_RIGHT)) selfCollisionStatus += COLL_RIGHTSIDE // 4
if (isWalled(newHitbox, COLLIDING_TOP)) selfCollisionStatus += COLL_TOPSIDE // 8 // TODO when player bonks to the ceiling, don't just reset veloY to zero -- add some head elasticity!
// superseded by isWalledStairs-related codes
//if (isWalled(newHitbox, COLLIDING_LEFT)) selfCollisionStatus += COLL_LEFTSIDE // 1
//if (isWalled(newHitbox, COLLIDING_BOTTOM)) selfCollisionStatus += COLL_BOTTOMSIDE // 2
//if (isWalled(newHitbox, COLLIDING_RIGHT)) selfCollisionStatus += COLL_RIGHTSIDE // 4
//if (isWalled(newHitbox, COLLIDING_TOP)) selfCollisionStatus += COLL_TOPSIDE // 8
// fixme UP and RIGHT && LEFT and DOWN bug // fixme UP and RIGHT && LEFT and DOWN bug
@@ -1156,6 +1162,11 @@ open class ActorWithBody(renderOrder: RenderOrder, val physProp: PhysProperties)
return false return false
} }
private val AUTO_CLIMB_STRIDE: Int
get() = (8 * scale).toInt() // number inspired by SM64
//private val AUTO_CLIMB_RATE: Int // we'll just climb stairs instantly to make things work wo worrying about the details
// get() = Math.min(TILE_SIZE / 8 * Math.sqrt(scale), TILE_SIZE.toDouble()).toInt()
/** /**
* @return 0 - no collision, 1 - stair, 2 - "bonk" to the wall * @return 0 - no collision, 1 - stair, 2 - "bonk" to the wall
*/ */
@@ -1643,9 +1654,6 @@ open class ActorWithBody(renderOrder: RenderOrder, val physProp: PhysProperties)
} }
} }
private val AUTO_CLIMB_RATE: Int
get() = Math.min(TILE_SIZE / 8 * Math.sqrt(scale), TILE_SIZE.toDouble()).toInt()
private fun assertInit() { private fun assertInit() {
// errors // errors
if (baseHitboxW == 0 || baseHitboxH == 0) if (baseHitboxW == 0 || baseHitboxH == 0)