UI testing env and working text buttons

Former-commit-id: b8fd27c7f71f9bc8da259ae132badcbc9ce117ac
This commit is contained in:
Song Minjae
2017-03-13 21:40:50 +09:00
parent 0113ca5d09
commit bc4fd8866a
73 changed files with 688 additions and 264 deletions

View File

@@ -66,8 +66,8 @@ object Terrarum : StateBasedGame(GAME_NAME) {
var gameStarted = false
lateinit var ingame: StateInGame
lateinit var gameConfig: GameConfig
var ingame: StateInGame? = null
private val gameConfig = GameConfig()
val OSName = System.getProperty("os.name")
val OSVersion = System.getProperty("os.version")
@@ -133,6 +133,7 @@ object Terrarum : StateBasedGame(GAME_NAME) {
val STATE_ID_TEST_TTY = 0x102
val STATE_ID_TEST_BLUR = 0x103
val STATE_ID_TEST_SHADER = 0x104
val STATE_ID_TEST_UI = 0x105
val STATE_ID_TOOL_NOISEGEN = 0x200
@@ -187,8 +188,6 @@ object Terrarum : StateBasedGame(GAME_NAME) {
println("Java is running in 32 Bit")
}
gameConfig = GameConfig()
joypadLabelStart = when (getConfigString("joypadlabelstyle")) {
"nwii" -> 0xE04B.toChar() // + mark
"logitech" -> 0xE05A.toChar() // number 10
@@ -282,9 +281,10 @@ object Terrarum : StateBasedGame(GAME_NAME) {
//addState(StateBlurTest())
//addState(StateShaderTest())
//addState(StateNoiseTester())
addState(StateUITest())
ingame = StateInGame()
addState(ingame)
//ingame = StateInGame()
//addState(ingame)
// foolproof
@@ -435,6 +435,10 @@ object Terrarum : StateBasedGame(GAME_NAME) {
return cfg!!
}
fun setConfig(key: String, value: Any) {
gameConfig[key] = value
}
val currentSaveDir: File
get() {
val file = File(defaultSaveDir + "/test")