worldgenloadscreen now makes transition

This commit is contained in:
minjaesong
2019-11-27 17:31:29 +09:00
parent 5255392bc0
commit 25c585e4c1
5 changed files with 15 additions and 4 deletions

View File

@@ -63,6 +63,10 @@ open class LoadScreenBase : ScreenAdapter(), Disposable {
}
override fun render(delta: Float) {
if (screenToLoad?.gameInitialised ?: false) {
doContextChange = true
}
if (doContextChange) {
Thread.sleep(80)
AppLoader.setScreen(screenToLoad!!)

View File

@@ -225,7 +225,12 @@ object SanicLoadScreen : LoadScreenBase() {
AppLoader.batch.flush()
}
super.render(delta)
// replaces super.render()
if (doContextChange) {
Thread.sleep(80)
AppLoader.setScreen(screenToLoad!!)
}
}
private fun getPulseEffCol(): Color {

View File

@@ -110,7 +110,9 @@ class WorldgenLoadScreen(screenToBeLoaded: IngameInstance, private val worldwidt
}
override fun dispose() {
previewPixmap.dispose()
if (!previewPixmap.isDisposed)
previewPixmap.dispose()
previewTexture.dispose()
}
}

View File

@@ -36,7 +36,7 @@ class UIProxyNewBuildingMaker : UICanvas() {
Terrarum.setCurrentIngameInstance(ingame)
SanicLoadScreen.screenToLoad = ingame
AppLoader.setScreen(SanicLoadScreen)
AppLoader.setLoadScreen(SanicLoadScreen)
}
override fun endClosing(delta: Float) {

View File

@@ -39,7 +39,7 @@ class UIProxyNewRandomGame : UICanvas() {
val ingame = TerrarumIngame(AppLoader.batch)
val worldParam = TerrarumIngame.NewWorldParameters(2400, 800, HQRNG().nextLong())
//val worldParam = Ingame.NewWorldParameters(8192, 2048, 0x51621DL)
//val worldParam = TerrarumIngame.NewWorldParameters(8192, 2048, 0x51621DL)
ingame.gameLoadInfoPayload = worldParam
ingame.gameLoadMode = TerrarumIngame.GameLoadMode.CREATE_NEW