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

former bug fixed; now we have ceiling-stair-clip bug

Browse Source
This commit is contained in:
minjaesong
2017-07-07 02:11:24 +09:00
parent 464d30a384
commit f2f5cd7daf
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -632,7 +632,7 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean
debug1("Collision type: $selfCollisionStatus") debug1("Collision type: $selfCollisionStatus")
affectingTiles.forEach { affectingTiles.forEach {
val tileCoord = LandUtil.resolveBlockAddr(it) val tileCoord = LandUtil.resolveBlockAddr(it)
debug1("affectign tile: ${tileCoord.first}, ${tileCoord.second}") debug2("affectign tile: ${tileCoord.first}, ${tileCoord.second}")
} }
when (selfCollisionStatus) { when (selfCollisionStatus) {
@@ -694,6 +694,9 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean
Vector2(offendingTileWorldX, offendingTileWorldY)).direction Vector2(offendingTileWorldX, offendingTileWorldY)).direction
debug1("vectorSum: $vectorSum, vectorDirRaw: ${vectorSum.direction / Math.PI}pi")
debug1("incidentAngle: ${angleOfIncidence / Math.PI}pi, threshold: ${angleThreshold / Math.PI}pi")
val displacementAbs = Vector2( val displacementAbs = Vector2(
(offendingTileWorldX - offendingHitboxPointX).abs(), (offendingTileWorldX - offendingHitboxPointX).abs(),
@@ -729,6 +732,9 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean
newHitbox.translate(finalDisplacement) newHitbox.translate(finalDisplacement)
debug1("displacement: $finalDisplacement")
// TODO: translate other axis proportionally to the incident vector // TODO: translate other axis proportionally to the incident vector
bounceX = angleOfIncidence == angleThreshold || displacementUnitVector.x != 0.0 bounceX = angleOfIncidence == angleThreshold || displacementUnitVector.x != 0.0
@@ -1438,9 +1444,9 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean
speedMultByTile * speedMultByTile *
scale.sqrt() scale.sqrt()
private fun Double.toPositiveRad() = // rad(0..2pi, -2pi..0) -> rad(0..4pi) private fun Double.toPositiveRad() = // rad(0..pi, -pi..0) -> rad(0..2pi)
if (this >= -2 * Math.PI && this < 0.0) if (-Math.PI <= this && this < 0.0)
4 * Math.PI - this this + 2 * Math.PI
else else
this this
} }