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

issue #7 implemented

Browse Source 
Former-commit-id: e63de56e81e19c842c519c77019b9750d751851e
Former-commit-id: 6b018d6ac3bb471d5997c1eece4485f967f82ded
This commit is contained in:
Song Minjae
2016-12-30 18:07:36 +09:00
parent f367b35892
commit 4837962ff5
1 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/net/torvald/terrarum/StateInGame.kt
View File

@@ -80,8 +80,6 @@ constructor() : BasicGameState() {
private val useShader: Boolean = false private val useShader: Boolean = false
private val shaderProgram = 0 private val shaderProgram = 0
private val CORES = ThreadPool.POOL_SIZE
val KEY_LIGHTMAP_RENDER = Key.F7 val KEY_LIGHTMAP_RENDER = Key.F7
val KEY_LIGHTMAP_SMOOTH = Key.F8 val KEY_LIGHTMAP_SMOOTH = Key.F8
@@ -94,6 +92,9 @@ constructor() : BasicGameState() {
private val UI_INVENTORY_PLAYER = "uiInventoryPlayer" private val UI_INVENTORY_PLAYER = "uiInventoryPlayer"
private val UI_INVENTORY_ANON = "uiInventoryAnon" private val UI_INVENTORY_ANON = "uiInventoryAnon"
val paused: Boolean
get() = consoleHandler.isOpened
@Throws(SlickException::class) @Throws(SlickException::class)
override fun init(gameContainer: GameContainer, stateBasedGame: StateBasedGame) { override fun init(gameContainer: GameContainer, stateBasedGame: StateBasedGame) {
// state init code. Executed before the game goes into any "state" in states in StateBasedGame.java // state init code. Executed before the game goes into any "state" in states in StateBasedGame.java
@@ -175,6 +176,8 @@ constructor() : BasicGameState() {
setAppTitle() setAppTitle()
if (!paused) {
/////////////////////////// ///////////////////////////
// world-related updates // // world-related updates //
/////////////////////////// ///////////////////////////
@@ -217,6 +220,7 @@ constructor() : BasicGameState() {
updateActors(gc, delta) updateActors(gc, delta)
// TODO thread pool(?) // TODO thread pool(?)
CollisionSolver.process() CollisionSolver.process()
}
//////////////////////// ////////////////////////