diff --git a/src/net/torvald/terrarum/AppLoader.java b/src/net/torvald/terrarum/AppLoader.java index 601f57692..4e07cb2bb 100644 --- a/src/net/torvald/terrarum/AppLoader.java +++ b/src/net/torvald/terrarum/AppLoader.java @@ -4,6 +4,7 @@ import com.badlogic.gdx.ApplicationListener; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; import com.badlogic.gdx.Screen; +import com.badlogic.gdx.assets.AssetManager; import com.badlogic.gdx.audio.AudioDevice; import com.badlogic.gdx.backends.lwjgl.LwjglApplication; import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; @@ -22,6 +23,8 @@ import net.torvald.terrarum.imagefont.TinyAlphNum; import net.torvald.terrarum.modulebasegame.IngameRenderer; import net.torvald.terrarum.utils.JsonFetcher; import net.torvald.terrarum.utils.JsonWriter; +import net.torvald.terrarum.worlddrawer.BlocksDrawer; +import net.torvald.terrarum.worlddrawer.LightmapRenderer; import net.torvald.terrarumsansbitmap.gdx.GameFontBase; import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack; import org.lwjgl.input.Controller; @@ -248,8 +251,12 @@ public class AppLoader implements ApplicationListener { private FrameBuffer renderFBO; + public static AssetManager assetManager; + @Override public void create() { + assetManager = new AssetManager(); + // set basis of draw logoBatch = new SpriteBatch(); camera = new OrthographicCamera(((float) appConfig.width), ((float) appConfig.height)); @@ -288,6 +295,9 @@ public class AppLoader implements ApplicationListener { printdbg(this, e); } + + // make loading list + } /** @@ -437,6 +447,13 @@ public class AppLoader implements ApplicationListener { Terrarum.INSTANCE.dispose(); + shaderBayerSkyboxFill.dispose(); + shaderHicolour.dispose(); + shaderColLUT.dispose(); + + assetManager.dispose(); + fullscreenQuad.dispose(); + fontGame.dispose(); fontSmallNumbers.dispose(); @@ -492,6 +509,10 @@ public class AppLoader implements ApplicationListener { } + BlocksDrawer.INSTANCE.getWorld(); // will initialize the BlocksDrawer by calling dummy method + LightmapRenderer.INSTANCE.hdr(0f); + + printdbg(this, "PostInit done"); } diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt b/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt index cd101bbed..5f07c632f 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt @@ -26,11 +26,10 @@ object UITitleRemoConYaml { - MENU_CONTROLS_GAMEPAD - MENU_LABEL_RETURN - MENU_OPTIONS_SOUND + - MENU_LABEL_LANGUAGE : net.torvald.terrarum.modulebasegame.ui.UITitleLanguage - MENU_LABEL_RETURN - MENU_MODULES : net.torvald.terrarum.modulebasegame.ui.UITitleModules - MENU_LABEL_RETURN - - MENU_LABEL_LANGUAGE : net.torvald.terrarum.modulebasegame.ui.UITitleLanguage - - MENU_LABEL_RETURN - MENU_LABEL_CREDITS : net.torvald.terrarum.modulebasegame.ui.UITitleCredits - MENU_LABEL_CREDITS : net.torvald.terrarum.modulebasegame.ui.UITitleCredits - MENU_CREDIT_GPL_DNT : net.torvald.terrarum.modulebasegame.ui.UITitleGPL3