diff --git a/src/net/torvald/terrarum/modulebasegame/TitleScreen.kt b/src/net/torvald/terrarum/modulebasegame/TitleScreen.kt index 5fbb755a3..91752a295 100644 --- a/src/net/torvald/terrarum/modulebasegame/TitleScreen.kt +++ b/src/net/torvald/terrarum/modulebasegame/TitleScreen.kt @@ -171,7 +171,7 @@ class TitleScreen(batch: FlippingSpriteBatch) : IngameInstance(batch) { } catch (e: IOException) { demoWorld = GameWorld(LandUtil.CHUNK_W, LandUtil.CHUNK_H, 0L, 0L) - demoWorld.worldTime.timeDelta = 60 + demoWorld.worldTime.timeDelta = 330 printdbg(this, "Demo world not found, using empty world") } @@ -286,15 +286,14 @@ class TitleScreen(batch: FlippingSpriteBatch) : IngameInstance(batch) { gameUpdateGovernor.update(Gdx.graphics.deltaTime, App.UPDATE_RATE, updateScreen, renderScreen) } - private val updateScreen = { delta: Float -> - // TODO: desynched weather and time-of-day change + private var timeflowCounter = 32880 // 9h08m + + private val updateScreen = { delta: Float -> - val forcedTime = 32880 // 9h08m demoWorld.globalLight = WeatherMixer.globalLightNow -// demoWorld.globalLight = WeatherMixer.getGlobalLightOfTimeOfNoon() demoWorld.updateWorldTime(delta) WeatherMixer.update(delta, cameraPlayer, demoWorld) - WeatherMixer.forceTimeAt = forcedTime + WeatherMixer.forceTimeAt = timeflowCounter cameraPlayer.update(delta) // worldcamera update AFTER cameraplayer in this case; the other way is just an exception for actual ingame SFX @@ -302,6 +301,11 @@ class TitleScreen(batch: FlippingSpriteBatch) : IngameInstance(batch) { // update UIs // uiContainer.forEach { it?.update(delta) } + + + // desynched weather and time-of-day change + timeflowCounter += 30 // must be divisible by demoWorld.worldTime.timeDelta + if (timeflowCounter >= WorldTime.DAY_LENGTH) timeflowCounter -= WorldTime.DAY_LENGTH } private val particles = CircularArray(16, true) diff --git a/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt b/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt index bf7248c33..78ba1318d 100644 --- a/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt +++ b/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt @@ -300,10 +300,9 @@ class BasicDebugInfoWindow : UICanvas() { if (ingame is TerrarumIngame) { App.fontSmallNumbers.draw(batch, "${ccM}Particles $ccG${(ingame as TerrarumIngame).particlesActive}$ccY/$ccG${(ingame as TerrarumIngame).PARTICLES_MAX}", TinyAlphNum.W * 2f, App.scr.height - TinyAlphNum.H * 4f) - App.fontSmallNumbers.draw(batch, "${ccM}Clouds $ccG${WeatherMixer.cloudsSpawned}$ccY/$ccG${WeatherMixer.cloudSpawnMax}", - TinyAlphNum.W * 2f + (18 * 8), App.scr.height - TinyAlphNum.H * 4f) - } + App.fontSmallNumbers.draw(batch, "${ccM}Clouds $ccG${WeatherMixer.cloudsSpawned}$ccY/$ccG${WeatherMixer.cloudSpawnMax}", + TinyAlphNum.W * 2f + (18 * 8), App.scr.height - TinyAlphNum.H * 4f) } App.fontSmallNumbers.draw(batch, "${ccY}Actors rendering $ccG${IngameRenderer.renderingActorsCount}",