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

replaced quick and dirty fix into proper fix

Browse Source 
Former-commit-id: ee305ad1bb84716a0bb8c17e9aa873eafb0baa6e
Former-commit-id: a9d7e6495bbfdea42b253070f66a0978463a8814
This commit is contained in:
Song Minjae
2017-01-23 19:04:42 +09:00
parent 0717b883b4
commit e951a6285e
1 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/net/torvald/terrarum/gameactors/ActorWithSprite.kt
View File

@@ -1060,40 +1060,54 @@ open class ActorWithSprite(renderOrder: ActorOrder, physics: Boolean = true) : A
} }
if (!sprite!!.flippedHorizontal()) { if (!sprite!!.flippedHorizontal()) {
sprite!!.render(g, if (MapCamera.xCentre > halfWorldW && centrePosPoint.x < halfWorldW) {
(hitbox.posX - hitboxTranslateX * scale).toFloat(), // camera center neg, actor center pos
(hitbox.posY + hitboxTranslateY * scale).toFloat(), sprite!!.render(g,
(scale).toFloat() (hitbox.posX - hitboxTranslateX * scale).toFloat() + world.width * TILE_SIZE,
) (hitbox.posY + hitboxTranslateY * scale).toFloat(),
// Q&D fix for Roundworld anomaly (scale).toFloat()
sprite!!.render(g, )
(hitbox.posX - hitboxTranslateX * scale).toFloat() + world.width * TILE_SIZE, }
(hitbox.posY + hitboxTranslateY * scale).toFloat(), else if (MapCamera.xCentre < halfWorldW && centrePosPoint.x >= halfWorldW) {
(scale).toFloat() // camera center pos, actor center neg
) sprite!!.render(g,
sprite!!.render(g, (hitbox.posX - hitboxTranslateX * scale).toFloat() - world.width * TILE_SIZE,
(hitbox.posX - hitboxTranslateX * scale).toFloat() - world.width * TILE_SIZE, (hitbox.posY + hitboxTranslateY * scale).toFloat(),
(hitbox.posY + hitboxTranslateY * scale).toFloat(), (scale).toFloat()
(scale).toFloat() )
) }
else {
sprite!!.render(g,
(hitbox.posX - hitboxTranslateX * scale).toFloat(),
(hitbox.posY + hitboxTranslateY * scale).toFloat(),
(scale).toFloat()
)
}
} }
else { else {
sprite!!.render(g, if (MapCamera.xCentre > halfWorldW && centrePosPoint.x < halfWorldW) {
(hitbox.posX - scale).toFloat(), // camera center neg, actor center pos
(hitbox.posY + hitboxTranslateY * scale).toFloat(), sprite!!.render(g,
(scale).toFloat() (hitbox.posX - scale).toFloat() + world.width * TILE_SIZE,
) (hitbox.posY + hitboxTranslateY * scale).toFloat(),
// Q&D fix for Roundworld anomaly (scale).toFloat()
sprite!!.render(g, )
(hitbox.posX - scale).toFloat() + world.width * TILE_SIZE, }
(hitbox.posY + hitboxTranslateY * scale).toFloat(), else if (MapCamera.xCentre < halfWorldW && centrePosPoint.x >= halfWorldW) {
(scale).toFloat() // camera center pos, actor center neg
) sprite!!.render(g,
sprite!!.render(g, (hitbox.posX - scale).toFloat() - world.width * TILE_SIZE,
(hitbox.posX - scale).toFloat() - world.width * TILE_SIZE, (hitbox.posY + hitboxTranslateY * scale).toFloat(),
(hitbox.posY + hitboxTranslateY * scale).toFloat(), (scale).toFloat()
(scale).toFloat() )
) }
else {
sprite!!.render(g,
(hitbox.posX - scale).toFloat(),
(hitbox.posY + hitboxTranslateY * scale).toFloat(),
(scale).toFloat()
)
}
} }
} }
} }