From 061c15d241400f28a15c28bdc756a38cbc1b4185 Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Fri, 30 Dec 2016 02:22:10 +0900 Subject: [PATCH] skybox will now scaled properly according to screen zoom Former-commit-id: 619bfcad7bd14313d8f94c291350ddb5bb9684b4 Former-commit-id: c42d41c7e32a2c44cffc7d1450fa550d7d5c32f7 --- src/net/torvald/terrarum/StateInGame.kt | 1 - src/net/torvald/terrarum/weather/WeatherMixer.kt | 11 +++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/net/torvald/terrarum/StateInGame.kt b/src/net/torvald/terrarum/StateInGame.kt index bc4cec24c..5d53563a0 100644 --- a/src/net/torvald/terrarum/StateInGame.kt +++ b/src/net/torvald/terrarum/StateInGame.kt @@ -283,7 +283,6 @@ constructor() : BasicGameState() { blendNormal() - // FIXME skybox is not scaled at all drawSkybox(worldDrawFrameBuffer.graphics) diff --git a/src/net/torvald/terrarum/weather/WeatherMixer.kt b/src/net/torvald/terrarum/weather/WeatherMixer.kt index 6a187af22..45acf169a 100644 --- a/src/net/torvald/terrarum/weather/WeatherMixer.kt +++ b/src/net/torvald/terrarum/weather/WeatherMixer.kt @@ -29,8 +29,6 @@ object WeatherMixer { lateinit var mixedWeather: BaseModularWeather - private var skyBoxCurrent = Rectangle(0f, 0f, Terrarum.WIDTH.toFloat(), Terrarum.HEIGHT.toFloat()) - private var skyBoxNext = Rectangle(0f, 0f, Terrarum.WIDTH.toFloat(), Terrarum.HEIGHT.toFloat()) val globalLightNow = Color(0) // Weather indices @@ -84,10 +82,15 @@ object WeatherMixer { val skyColourFill = GradientFill( 0f, 0f, getGradientColour(skyboxColourMap, 0, timeNow), - 0f, Terrarum.HEIGHT.toFloat(), + 0f, Terrarum.HEIGHT / Terrarum.ingame.screenZoom, getGradientColour(skyboxColourMap, 1, timeNow) ) - g.fill(skyBoxCurrent, skyColourFill) + g.fill(Rectangle( + 0f, 0f, + Terrarum.WIDTH / Terrarum.ingame.screenZoom, + Terrarum.HEIGHT / Terrarum.ingame.screenZoom), + skyColourFill + ) // calculate global light val gradCol = getGradientColour(lightColourMap, 0, timeNow)