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

Rudimentary load screen works (only with Ingame screen)

Browse Source
This commit is contained in:
minjaesong
2017-07-13 19:10:11 +09:00
parent 9a935c2e15
commit 70236f42ff
6 changed files with 181 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/net/torvald/terrarum/Ingame.kt
View File

@@ -144,8 +144,9 @@ class Ingame(val batch: SpriteBatch) : Screen {
//private val ingameDrawThread: ThreadIngameDraw // draw must be on the main thread
private var gameFullyLoaded = false
var gameFullyLoaded = false
private set
private var postInitDone = false
//////////////
@@ -196,7 +197,7 @@ class Ingame(val batch: SpriteBatch) : Screen {
}
override fun show() {
initViewPort(Terrarum.WIDTH, Terrarum.HEIGHT)
//initViewPort(Terrarum.WIDTH, Terrarum.HEIGHT)
// gameLoadMode and gameLoadInfoPayload must be set beforehand!!
@@ -225,54 +226,65 @@ class Ingame(val batch: SpriteBatch) : Screen {
*/
private fun enter(gameSaveData: GameSaveData) {
if (gameFullyLoaded) {
Error("You are doing horribly wrong, fucknugget.")
println("[Ingame] loaded successfully.")
}
else {
LoadScreen.addMessage("Loading world from save")
world = gameSaveData.world
historicalFigureIDBucket = gameSaveData.historicalFigureIDBucket
playableActorDelegate = PlayableActorDelegate(gameSaveData.realGamePlayer)
addNewActor(player!!)
world = gameSaveData.world
historicalFigureIDBucket = gameSaveData.historicalFigureIDBucket
playableActorDelegate = PlayableActorDelegate(gameSaveData.realGamePlayer)
addNewActor(player!!)
initGame()
//initGame()
gameFullyLoaded = true
gameFullyLoaded = true
}
}
/**
* Init instance by creating new world
*/
private fun enter(worldParams: NewWorldParameters) {
// init map as chosen size
world = GameWorld(worldParams.width, worldParams.height)
// generate terrain for the map
WorldGenerator.attachMap(world)
WorldGenerator.SEED = worldParams.worldGenSeed
WorldGenerator.generateMap()
if (gameFullyLoaded) {
println("[Ingame] loaded successfully.")
}
else {
LoadScreen.addMessage("Creating new world")
historicalFigureIDBucket = ArrayList<Int>()
// init map as chosen size
world = GameWorld(worldParams.width, worldParams.height)
// generate terrain for the map
WorldGenerator.attachMap(world)
WorldGenerator.SEED = worldParams.worldGenSeed
WorldGenerator.generateMap()
RoguelikeRandomiser.seed = HQRNG().nextLong()
historicalFigureIDBucket = ArrayList<Int>()
// add new player and put it to actorContainer
playableActorDelegate = PlayableActorDelegate(PlayerBuilderSigrid())
//playableActorDelegate = PlayableActorDelegate(PlayerBuilderTestSubject1())
addNewActor(player!!)
RoguelikeRandomiser.seed = HQRNG().nextLong()
// test actor
//addNewActor(PlayerBuilderCynthia())
// add new player and put it to actorContainer
//playableActorDelegate = PlayableActorDelegate(PlayerBuilderSigrid())
//playableActorDelegate = PlayableActorDelegate(PlayerBuilderTestSubject1())
//addNewActor(player!!)
// test actor
//addNewActor(PlayerBuilderCynthia())
initGame()
//initGame()
gameFullyLoaded = true
}
}
fun initGame() {
@@ -394,6 +406,23 @@ class Ingame(val batch: SpriteBatch) : Screen {
}
override fun render(delta: Float) {
if (!postInitDone) { // Q&D solution for LoadScreen and Ingame, where while LoadScreen is working, Ingame now no longer has GL Context
if (gameLoadMode == GameLoadMode.CREATE_NEW) {
playableActorDelegate = PlayableActorDelegate(PlayerBuilderSigrid())
addNewActor(player!!)
}
initGame()
postInitDone = true
}
Gdx.graphics.setTitle(GAME_NAME +
" — F: ${Gdx.graphics.framesPerSecond} (${Terrarum.TARGET_INTERNAL_FPS})" +
" — M: ${Terrarum.memInUse}M / ${Terrarum.memTotal}M / ${Terrarum.memXmx}M"