diff --git a/src/net/torvald/terrarum/AppLoader.java b/src/net/torvald/terrarum/AppLoader.java index 490568e66..ba1825e51 100644 --- a/src/net/torvald/terrarum/AppLoader.java +++ b/src/net/torvald/terrarum/AppLoader.java @@ -1114,12 +1114,14 @@ public class AppLoader implements ApplicationListener { public static void printdbgerr(Object obj, Object message) { if (IS_DEVELOPMENT_BUILD) { - System.err.println("[" + obj.getClass().getSimpleName() + "] " + message.toString()); + String out = (obj instanceof String) ? (String) obj : obj.getClass().getSimpleName(); + System.err.println("[" + out + "] " + message.toString()); } } public static void printmsg(Object obj, Object message) { - System.out.println("[" + obj.getClass().getSimpleName() + "] " + message.toString()); + String out = (obj instanceof String) ? (String) obj : obj.getClass().getSimpleName(); + System.out.println("[" + out + "] " + message.toString()); } public static ShaderProgram loadShader(String vert, String frag) { diff --git a/src/net/torvald/terrarum/TitleScreen.kt b/src/net/torvald/terrarum/TitleScreen.kt index 7f84cf9ea..9c4686c3f 100644 --- a/src/net/torvald/terrarum/TitleScreen.kt +++ b/src/net/torvald/terrarum/TitleScreen.kt @@ -193,7 +193,14 @@ class TitleScreen(batch: SpriteBatch) : IngameInstance(batch) { private var introUncoverDeltaCounter = 0f private var updateAkku = 0.0 + private var fucklatch = false + override fun render(updateRate: Float) { + if (!fucklatch) { + printdbg(this, "render start") + fucklatch = true + } + // async update and render val dt = Gdx.graphics.rawDeltaTime diff --git a/src/net/torvald/terrarum/gamecontroller/KeyToggler.kt b/src/net/torvald/terrarum/gamecontroller/KeyToggler.kt index a9e19050c..c4a0934dd 100644 --- a/src/net/torvald/terrarum/gamecontroller/KeyToggler.kt +++ b/src/net/torvald/terrarum/gamecontroller/KeyToggler.kt @@ -2,7 +2,6 @@ package net.torvald.terrarum.gamecontroller import com.badlogic.gdx.Gdx import com.badlogic.gdx.Input -import net.torvald.terrarum.AppLoader.printdbg import net.torvald.util.sortedArrayListOf import java.util.* @@ -36,9 +35,6 @@ object KeyToggler { fun update(toggleGameKeys: Boolean) { for (it in 0..255) { if (!toggleGameKeys && gameKeys.contains(it)) { - if (Gdx.input.isKeyPressed(it)) - printdbg(this, "Disallowed key: $it") - continue } diff --git a/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt b/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt index d1f98cfb1..11b51385e 100644 --- a/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt +++ b/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt @@ -381,8 +381,10 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) { consoleHandler, uiCheatMotherfuckerNootNoot ) - uiAliasesPausing.forEach { addUI(it) } // put them all to the UIContainer + // UIFixture is handled "dirtily" (calling directly from the render/update code) because it's dynamic + // Therefore, console window will be drawn behind of the thing uiAliases.forEach { addUI(it) } // put them all to the UIContainer + uiAliasesPausing.forEach { addUI(it) } // put them all to the UIContainer diff --git a/src/net/torvald/terrarum/modulebasegame/console/JavaIMTest.kt b/src/net/torvald/terrarum/modulebasegame/console/JavaIMTest.kt index 6840a643b..f4ca72446 100644 --- a/src/net/torvald/terrarum/modulebasegame/console/JavaIMTest.kt +++ b/src/net/torvald/terrarum/modulebasegame/console/JavaIMTest.kt @@ -25,7 +25,7 @@ internal object JavaIMTest : ConsoleCommand { Echo("[TextInputText] (input canceled)") } } - Gdx.input.getTextInput(inputListener, "TextInputTest", "Testing the text input", "type anything!") + Gdx.input.getTextInput(inputListener, "TextInputTest", "", "type anything!") } override fun printUsage() {