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

at least message shows on loadscreen

Browse Source 
does the transition works?
This commit is contained in:
minjaesong
2019-11-27 15:53:09 +09:00
parent f715ba9a6e
commit c13aebd3ba
12 changed files with 70 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/torvald/terrarum/modulebasegame/ui/UIProxyNewBuildingMaker.kt
View File

@@ -3,7 +3,7 @@ package net.torvald.terrarum.modulebasegame.ui
import com.badlogic.gdx.graphics.Camera
import com.badlogic.gdx.graphics.g2d.SpriteBatch
import net.torvald.terrarum.AppLoader
import net.torvald.terrarum.LoadScreen
import net.torvald.terrarum.SanicLoadScreen
import net.torvald.terrarum.Second
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.modulebasegame.BuildingMaker
@@ -35,8 +35,8 @@ class UIProxyNewBuildingMaker : UICanvas() {
val ingame = BuildingMaker(AppLoader.batch)
Terrarum.setCurrentIngameInstance(ingame)
LoadScreen.screenToLoad = ingame
AppLoader.setScreen(LoadScreen)
SanicLoadScreen.screenToLoad = ingame
AppLoader.setScreen(SanicLoadScreen)
}
override fun endClosing(delta: Float) {

3
src/net/torvald/terrarum/modulebasegame/ui/UIProxyNewRandomGame.kt
View File

@@ -5,7 +5,6 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch
import net.torvald.random.HQRNG
import net.torvald.terrarum.AppLoader
import net.torvald.terrarum.AppLoader.printdbg
import net.torvald.terrarum.LoadScreen
import net.torvald.terrarum.Second
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.modulebasegame.TerrarumIngame
@@ -48,7 +47,7 @@ class UIProxyNewRandomGame : UICanvas() {
//LoadScreen.screenToLoad = ingame
//AppLoader.setScreen(LoadScreen)
val loadScreen = WorldgenLoadScreen(ingame, worldParam.width, worldParam.height)
AppLoader.setScreen(loadScreen)
AppLoader.setLoadScreen(loadScreen)
}
override fun endClosing(delta: Float) {