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

debugpanel: solar altitude and atmos turbidity

Browse Source
This commit is contained in:
minjaesong
2023-07-11 12:01:08 +09:00
parent 22191bd377
commit c033260ec5
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/graphics/fonts/7x13_Tamzen7x14b.tga LFS
View File

Binary file not shown.

BIN
assets/graphics/gui/debug_window_background.tga LFS
View File

Binary file not shown.

15
src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt
View File

@@ -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++
}
}

2
src/net/torvald/terrarum/weather/WeatherMixer.kt
View File

@@ -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