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

something's fixed but have no idea what

Browse Source
This commit is contained in:
minjaesong
2023-08-11 12:35:36 +09:00
parent fd7b88307c
commit d1b4ce3404
1 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -837,7 +837,7 @@ open class ActorWithBody : Actor {
stairHeightRight = it.second.toDouble() stairHeightRight = it.second.toDouble()
} }
} }
acc or (state * isWalledStairs(newHitbox, state, state == COLLIDING_BOTTOM && goingDown && !downDown).first.coerceAtMost(1)) // TODO reverse gravity adaptation? acc or (state * isWalledStairs(newHitbox, state, state == COLLIDING_BOTTOM).first.coerceAtMost(1)) // TODO reverse gravity adaptation?
} }
} }
@@ -1160,9 +1160,8 @@ open class ActorWithBody : Actor {
if (isNoCollideWorld) return false if (isNoCollideWorld) return false
// detectors are inside of the bounding box // detectors are inside of the bounding box
// CONFIRMED val x1 = hitbox.startX + PHYS_EPSILON_DIST
val x1 = hitbox.startX val y1 = hitbox.startY + PHYS_EPSILON_DIST
val y1 = hitbox.startY
val x2 = hitbox.endX - PHYS_EPSILON_DIST val x2 = hitbox.endX - PHYS_EPSILON_DIST
val y2 = hitbox.endY - PHYS_EPSILON_DIST val y2 = hitbox.endY - PHYS_EPSILON_DIST
// this commands and the commands on isWalled WILL NOT match (1 px gap on endX/Y). THIS IS INTENTIONAL! // this commands and the commands on isWalled WILL NOT match (1 px gap on endX/Y). THIS IS INTENTIONAL!
@@ -1197,30 +1196,29 @@ open class ActorWithBody : Actor {
IMPORTANT AF NOTE: things are ASYMMETRIC! IMPORTANT AF NOTE: things are ASYMMETRIC!
*/ */
// AT LEAST THESE ARE CONFIRMED
if (option == COLLIDING_TOP) { if (option == COLLIDING_TOP) {
x1 = hitbox.startX x1 = hitbox.startX + PHYS_EPSILON_DIST
x2 = hitbox.endX - PHYS_EPSILON_DIST - A_PIXEL x2 = hitbox.endX - PHYS_EPSILON_DIST
y1 = hitbox.startY - A_PIXEL y1 = hitbox.startY
y2 = y1 y2 = y1
} }
else if (option == COLLIDING_BOTTOM) { else if (option == COLLIDING_BOTTOM) {
x1 = hitbox.startX x1 = hitbox.startX + PHYS_EPSILON_DIST
x2 = hitbox.endX - PHYS_EPSILON_DIST - A_PIXEL x2 = hitbox.endX - PHYS_EPSILON_DIST
y1 = hitbox.endY - PHYS_EPSILON_DIST + A_PIXEL y1 = hitbox.endY - PHYS_EPSILON_DIST
y2 = y1 y2 = y1
} }
else if (option == COLLIDING_LEFT) { else if (option == COLLIDING_LEFT) {
x1 = hitbox.startX - A_PIXEL x1 = hitbox.startX + PHYS_EPSILON_DIST
x2 = x1 x2 = x1
y1 = hitbox.startY y1 = hitbox.startY + PHYS_EPSILON_DIST
y2 = hitbox.endY - PHYS_EPSILON_DIST - A_PIXEL y2 = hitbox.endY - PHYS_EPSILON_DIST
} }
else if (option == COLLIDING_RIGHT) { else if (option == COLLIDING_RIGHT) {
x1 = hitbox.endX - PHYS_EPSILON_DIST + A_PIXEL x1 = hitbox.endX - PHYS_EPSILON_DIST
x2 = x1 x2 = x1
y1 = hitbox.startY y1 = hitbox.startY + PHYS_EPSILON_DIST
y2 = hitbox.endY - PHYS_EPSILON_DIST - A_PIXEL y2 = hitbox.endY - PHYS_EPSILON_DIST
} }
else if (option == COLLIDING_ALLSIDE) { else if (option == COLLIDING_ALLSIDE) {
return isWalled(hitbox, COLLIDING_LEFT) || isWalled(hitbox, COLLIDING_RIGHT) || return isWalled(hitbox, COLLIDING_LEFT) || isWalled(hitbox, COLLIDING_RIGHT) ||
@@ -1264,30 +1262,29 @@ open class ActorWithBody : Actor {
IMPORTANT AF NOTE: things are ASYMMETRIC! IMPORTANT AF NOTE: things are ASYMMETRIC!
*/ */
// AT LEAST THESE ARE CONFIRMED
if (option == COLLIDING_TOP) { if (option == COLLIDING_TOP) {
x1 = hitbox.startX x1 = hitbox.startX + PHYS_EPSILON_DIST
x2 = hitbox.endX - PHYS_EPSILON_DIST - A_PIXEL x2 = hitbox.endX - PHYS_EPSILON_DIST
y1 = hitbox.startY - A_PIXEL y1 = hitbox.startY
y2 = y1 y2 = y1
} }
else if (option == COLLIDING_BOTTOM) { else if (option == COLLIDING_BOTTOM) {
x1 = hitbox.startX x1 = hitbox.startX + PHYS_EPSILON_DIST
x2 = hitbox.endX - PHYS_EPSILON_DIST - A_PIXEL x2 = hitbox.endX - PHYS_EPSILON_DIST
y1 = hitbox.endY - PHYS_EPSILON_DIST + A_PIXEL y1 = hitbox.endY - PHYS_EPSILON_DIST
y2 = y1 y2 = y1
} }
else if (option == COLLIDING_LEFT) { else if (option == COLLIDING_LEFT) {
x1 = hitbox.startX - A_PIXEL x1 = hitbox.startX + PHYS_EPSILON_DIST
x2 = x1 x2 = x1
y1 = hitbox.startY y1 = hitbox.startY + PHYS_EPSILON_DIST
y2 = hitbox.endY - PHYS_EPSILON_DIST - A_PIXEL y2 = hitbox.endY - PHYS_EPSILON_DIST
} }
else if (option == COLLIDING_RIGHT) { else if (option == COLLIDING_RIGHT) {
x1 = hitbox.endX - PHYS_EPSILON_DIST + A_PIXEL x1 = hitbox.endX - PHYS_EPSILON_DIST
x2 = x1 x2 = x1
y1 = hitbox.startY y1 = hitbox.startY + PHYS_EPSILON_DIST
y2 = hitbox.endY - PHYS_EPSILON_DIST - A_PIXEL y2 = hitbox.endY - PHYS_EPSILON_DIST
} }
else if (option == COLLIDING_ALLSIDE) { else if (option == COLLIDING_ALLSIDE) {
return max(max(isWalledStairs(hitbox, COLLIDING_LEFT, usePlatformDetection).first, return max(max(isWalledStairs(hitbox, COLLIDING_LEFT, usePlatformDetection).first,
@@ -1778,8 +1775,8 @@ open class ActorWithBody : Actor {
if (KeyToggler.isOn(Input.Keys.F9)) { if (KeyToggler.isOn(Input.Keys.F9)) {
val blockMark = CommonResourcePool.getAsTextureRegionPack("blockmarkings_common").get(0, 0) val blockMark = CommonResourcePool.getAsTextureRegionPack("blockmarkings_common").get(0, 0)
for (y in 0..intTilewiseHitbox.height.toInt() + 1) { for (y in 0..intTilewiseHitbox.height.toInt()) {
batch.color = if (y == intTilewiseHitbox.height.toInt() + 1) Color.LIME else HITBOX_COLOURS0 batch.color = if (y == intTilewiseHitbox.height.toInt()) Color.LIME else HITBOX_COLOURS0
for (x in 0..intTilewiseHitbox.width.toInt()) { for (x in 0..intTilewiseHitbox.width.toInt()) {
batch.draw(blockMark, batch.draw(blockMark,
(intTilewiseHitbox.startX.toFloat() + x) * TILE_SIZEF, (intTilewiseHitbox.startX.toFloat() + x) * TILE_SIZEF,
@@ -1951,7 +1948,7 @@ open class ActorWithBody : Actor {
val tiles = ArrayList<ItemID?>() val tiles = ArrayList<ItemID?>()
// offset 1 pixel to the down so that friction would work // offset 1 pixel to the down so that friction would work
val y = intTilewiseHitbox.height.toInt() + 1 val y = intTilewiseHitbox.height.toInt()
for (x in 0..intTilewiseHitbox.width.toInt()) { for (x in 0..intTilewiseHitbox.width.toInt()) {
tiles.add(world!!.getTileFromTerrain(x + intTilewiseHitbox.startX.toInt(), y + intTilewiseHitbox.startY.toInt())) tiles.add(world!!.getTileFromTerrain(x + intTilewiseHitbox.startX.toInt(), y + intTilewiseHitbox.startY.toInt()))
@@ -1968,7 +1965,7 @@ open class ActorWithBody : Actor {
// offset 1 pixel to the down so that friction would work // offset 1 pixel to the down so that friction would work
// val y = hitbox.endY.plus(1.0).div(TILE_SIZE).floorToInt() // val y = hitbox.endY.plus(1.0).div(TILE_SIZE).floorToInt()
val y = intTilewiseHitbox.height.toInt() + 1 val y = intTilewiseHitbox.height.toInt()
for (x in 0..intTilewiseHitbox.width.toInt()) { for (x in 0..intTilewiseHitbox.width.toInt()) {
tileProps.add(BlockCodex[world!!.getTileFromTerrain(x + intTilewiseHitbox.startX.toInt(), y + intTilewiseHitbox.startY.toInt())]) tileProps.add(BlockCodex[world!!.getTileFromTerrain(x + intTilewiseHitbox.startX.toInt(), y + intTilewiseHitbox.startY.toInt())])