From 154d55bbb4081087541a536d0ad98060bcb32d13 Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Sun, 18 Dec 2016 03:09:20 +0900 Subject: [PATCH] working zoom out Former-commit-id: a53ed485163ef36cf5b59941eb657761cde166d5 Former-commit-id: a2b575150e128ceb7894d9ba4eb0db127d071bcb --- src/net/torvald/terrarum/StateInGame.kt | 4 ++-- src/net/torvald/terrarum/gameactors/ActorWithBody.kt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/net/torvald/terrarum/StateInGame.kt b/src/net/torvald/terrarum/StateInGame.kt index c946aac84..c235f171c 100644 --- a/src/net/torvald/terrarum/StateInGame.kt +++ b/src/net/torvald/terrarum/StateInGame.kt @@ -72,8 +72,8 @@ constructor() : BasicGameState() { val ZOOM_MAX = 2.0f val ZOOM_MIN = 0.5f - val tilesDrawFrameBuffer = Image(Terrarum.WIDTH, Terrarum.HEIGHT) - val actorsDrawFrameBuffer = Image(Terrarum.WIDTH, Terrarum.HEIGHT) + val tilesDrawFrameBuffer = Image(Terrarum.WIDTH.div(ZOOM_MIN).ceilInt(), Terrarum.HEIGHT.div(ZOOM_MIN).ceilInt()) + val actorsDrawFrameBuffer = Image(Terrarum.WIDTH.div(ZOOM_MIN).ceilInt(), Terrarum.HEIGHT.div(ZOOM_MIN).ceilInt()) val uisDrawFrameBuffer = Image(Terrarum.WIDTH, Terrarum.HEIGHT) //private lateinit var shader12BitCol: Shader // grab LibGDX if you want some shader diff --git a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt index 0cbc1a419..15528f8e2 100644 --- a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt +++ b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt @@ -1108,6 +1108,7 @@ open class ActorWithBody : Actor() { fun Double.floorInt() = Math.floor(this).toInt() fun Float.floorInt() = FastMath.floor(this).toInt() +fun Float.ceilInt() = FastMath.ceil(this).toInt() fun Double.round() = Math.round(this).toDouble() fun Double.floor() = Math.floor(this) fun Double.ceil() = this.floor() + 1.0