diff --git a/assets/graphics/gui/debug_window_background.tga b/assets/graphics/gui/debug_window_background.tga new file mode 100644 index 000000000..1060009bb --- /dev/null +++ b/assets/graphics/gui/debug_window_background.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16b2d89295592597e9a3912deb1f27e22f4b75e34c8d2824a4813cb9800e1202 +size 179342 diff --git a/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt b/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt index cfa90a4d6..b5537d3f7 100644 --- a/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt +++ b/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt @@ -3,6 +3,7 @@ package net.torvald.terrarum.ui import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.Camera import com.badlogic.gdx.graphics.Color +import com.badlogic.gdx.graphics.Texture import com.badlogic.gdx.graphics.g2d.SpriteBatch import net.torvald.terrarum.* import net.torvald.terrarum.Terrarum.mouseTileX @@ -43,7 +44,7 @@ class BasicDebugInfoWindow : UICanvas() { get() = Terrarum.ingame?.world private val icons = TextureRegionPack(Gdx.files.internal("assets/graphics/gui/debug_window_symbols.tga"), 21, 26) - + private val back = Texture(Gdx.files.internal("assets/graphics/gui/debug_window_background.tga")) private val ARROW_RIGHT = 0xC0.toChar() private val ARROW_LEFT = 0xC1.toChar() @@ -104,16 +105,22 @@ class BasicDebugInfoWindow : UICanvas() { override fun renderUI(batch: SpriteBatch, camera: Camera) { val player = ingame?.actorNowPlaying - batch.color = Color(0xFFEE88FF.toInt()) val hitbox = player?.hitbox val updateCount = maxOf(1L, (App.debugTimers["Ingame.UpdateCounter"] ?: 1L) as Long) /** - * First column + * Top Left */ + batch.color = Color(1f, 1f, 1f, 0.65f) + batch.draw(back, gap - 5f, gap - 5f) + + + + batch.color = Color(0xFFEE88FF.toInt()) + player?.let { player -> hitbox?.let { hitbox -> val (pxInt, pxFrac) = hitbox.canonicalX.toIntAndFrac(7) @@ -214,9 +221,9 @@ class BasicDebugInfoWindow : UICanvas() { } // print time - var dbgCnt = 9 + var dbgCnt = 10 App.debugTimers.forEach { t, u -> - printLine(batch, dbgCnt, "$ccO$t $ccG${formatNanoTime(u as? Long)}$ccY ns") +// printLine(batch, dbgCnt, "$ccO$t $ccG${formatNanoTime(u as? Long)}$ccY ns") dbgCnt++ } @@ -391,5 +398,6 @@ class BasicDebugInfoWindow : UICanvas() { override fun dispose() { icons.dispose() + back.dispose() } } \ No newline at end of file