diff --git a/assets/graphics/fonts/7x13_Tamzen7x14b.tga b/assets/graphics/fonts/7x13_Tamzen7x14b.tga index 778d86f74..51fc820fb 100644 --- a/assets/graphics/fonts/7x13_Tamzen7x14b.tga +++ b/assets/graphics/fonts/7x13_Tamzen7x14b.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9458daf7338a9f734a90cb3babdcb07249e2f1ab7997e93d05ef8eb64099254e +oid sha256:03f7ed27112037dfa6fe00ced94f2a21d639dea13c837e0d93a675c54aa5a27c size 93202 diff --git a/assets/graphics/gui/debug_window_background.tga b/assets/graphics/gui/debug_window_background.tga index 809eab39c..ee4896ed0 100644 --- a/assets/graphics/gui/debug_window_background.tga +++ b/assets/graphics/gui/debug_window_background.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44c1427bea7c50a2e6f86ef7f8de52d266e97c3ca147b11029f91a83e8b43b02 +oid sha256:ec40c159b9cf964b00099abbe566675b98cc316c48f7df22cf2a9571bf85eb34 size 214018 diff --git a/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt b/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt index cea21f8c4..b0ac1fea6 100644 --- a/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt +++ b/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt @@ -16,6 +16,7 @@ import net.torvald.terrarum.imagefont.TinyAlphNum import net.torvald.terrarum.modulebasegame.IngameRenderer import net.torvald.terrarum.modulebasegame.TerrarumIngame import net.torvald.terrarum.modulebasegame.ui.ItemSlotImageFactory +import net.torvald.terrarum.weather.WeatherMixer import net.torvald.terrarum.worlddrawer.LightmapRenderer import net.torvald.terrarum.worlddrawer.WorldCamera import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack @@ -60,6 +61,8 @@ class BasicDebugInfoWindow : UICanvas() { private val WALL = 0xD3.toChar() private val WIRE = 0xD4.toChar() private val MASS = 0xD5.toChar() + private val SOL = 0xD6.toChar() + private val TAU = 0xD7.toChar() private val HEIGHT = 0xC7.toChar() private val WIDTH = 0xCD.toChar() @@ -111,6 +114,7 @@ class BasicDebugInfoWindow : UICanvas() { private val cvX = 0; private val cvY = 2 private val evX = 14; private val evY = 2 private val mvX = 28; private val mvY = 2 + private val sol = 42; private val tileCursX = 0; private val tileCursY = 4 @@ -192,6 +196,14 @@ class BasicDebugInfoWindow : UICanvas() { App.fontSmallNumbers.draw(batch, "Y$ccG${WorldCamera.y.toString().padStart(7)}", gap + 7f*(cxyX + 3), line(cxyY+1)) + // sun and weather + val soldeg = world?.worldTime?.solarElevationDeg + val soldegStr = (soldeg ?: 0.0).toIntAndFrac(3,2) + val soldegNeg = ((soldeg ?: 0.0) >= 0.0).toInt() + val turbidity = WeatherMixer.turbidity + App.fontSmallNumbers.draw(batch, "$SOL $ccG$soldegStr", gap + 7f*(sol), line(mvY)) + App.fontSmallNumbers.draw(batch, "$TAU $ccG$turbidity", gap + 7f*(sol), line(mvY + 1)) + try { @@ -232,11 +244,12 @@ class BasicDebugInfoWindow : UICanvas() { ) } + // print time if (showTimers) { var dbgCnt = 10 App.debugTimers.forEach { t, u -> - printLine(batch, dbgCnt, "$ccO$t $ccG${formatNanoTime(u as? Long)}$ccY ns") + printLine(batch, dbgCnt, "$ccM$t $ccG${formatNanoTime(u as? Long)}$ccY ns") dbgCnt++ } } diff --git a/src/net/torvald/terrarum/weather/WeatherMixer.kt b/src/net/torvald/terrarum/weather/WeatherMixer.kt index 62537cb8b..1db89a388 100644 --- a/src/net/torvald/terrarum/weather/WeatherMixer.kt +++ b/src/net/torvald/terrarum/weather/WeatherMixer.kt @@ -147,7 +147,7 @@ internal object WeatherMixer : RNGConsumer { } - private var turbidity = 4.0 + var turbidity = 4.0; private set private var gH = 2f * App.scr.height private val HALF_DAY = DAY_LENGTH / 2