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

font bug sorta fixed, new splash: warning health and safety

Browse Source 
Former-commit-id: f79503873f57e781480fa742ed1a058becb6c7a1
Former-commit-id: daeeed816b339958786746c3717670c724676a44
This commit is contained in:
Song Minjae
2016-08-05 01:59:43 +09:00
parent 17c39c1824
commit fa5e95a89d
38 changed files with 483 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/net/torvald/terrarum/Terrarum.kt
View File

@@ -73,9 +73,13 @@ constructor(gamename: String) : StateBasedGame(gamename) {
}
}
gc.graphics.clear() // clean up any 'dust' in the buffer
ingame = StateInGame()
//addState(ingame)
addState(StateMonitorCheck())
//addState(StateMonitorCheck())
//addState(StateFontTester())
addState(StateSplash())
}
companion object {
@@ -103,8 +107,8 @@ constructor(gamename: String) : StateBasedGame(gamename) {
lateinit var appgc: AppGameContainer
val WIDTH = 1072
val HEIGHT = 742 // IMAX ratio
var WIDTH = 1072
var HEIGHT = 742 // IMAX ratio
var VSYNC = true
val VSYNC_TRIGGER_THRESHOLD = 56
@@ -141,6 +145,7 @@ constructor(gamename: String) : StateBasedGame(gamename) {
// 0x0 - 0xF: Game-related
// 0x10 - 0x1F: Config
// 0x100 and onward: unit tests for dev
val SCENE_ID_SPLASH = 0x0
val SCENE_ID_HOME = 0x1
val SCENE_ID_GAME = 0x3
val SCENE_ID_CONFIG_CALIBRATE = 0x11
@@ -362,7 +367,7 @@ fun main(args: Array<String>) = Terrarum.main(args)
fun setBlendMul() {
GL11.glEnable(GL11.GL_BLEND)
GL11.glColorMask(true, true, true, true)
GL11.glColorMask(true, true, true, false)
GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_ONE_MINUS_SRC_ALPHA)
}