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

UI: sub-UIs work?

Browse Source
This commit is contained in:
minjaesong
2017-07-25 17:21:02 +09:00
parent 07ee987411
commit 33da9777ea
31 changed files with 390 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,7 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
import org.lwjgl.input.Controllers
import java.io.File
import java.io.IOException
import java.lang.management.ManagementFactory
import java.util.*
/**
@@ -289,7 +290,7 @@ object Terrarum : Game() {
println("[Terrarum] os.arch = $systemArch") // debug info
if (is32BitJVM) {
println("32 Bit JVM detected")
System.err.println("[Terrarum] 32 Bit JVM detected")
}
joypadLabelStart = when (getConfigString("joypadlabelstyle")) {
@@ -325,9 +326,25 @@ object Terrarum : Game() {
val USE_VSYNC = getConfigBoolean("usevsync")
var VSYNC = USE_VSYNC
val VSYNC_TRIGGER_THRESHOLD = 56
val GL_VERSION: Int
get() = Gdx.graphics.glVersion.majorVersion * 100 +
Gdx.graphics.glVersion.minorVersion * 10 +
Gdx.graphics.glVersion.releaseVersion
val MINIMAL_GL_VERSION = 210
override fun create() {
println("[Terrarum] GL_VERSION = $GL_VERSION")
println("[Terrarum] GL info:\n${Gdx.graphics.glVersion.debugVersionString}") // debug info
if (GL_VERSION < MINIMAL_GL_VERSION) {
// TODO notify properly
throw Error("Graphics device not capable -- device's GL_VERSION: $GL_VERSION, required: $MINIMAL_GL_VERSION")
}
fullscreenQuad = Mesh(
true, 4, 6,
VertexAttribute.Position(),
@@ -409,16 +426,16 @@ object Terrarum : Game() {
// jump right into the ingame
ingame = Ingame(batch)
/*ingame = Ingame(batch)
ingame!!.gameLoadInfoPayload = Ingame.NewWorldParameters(2400, 800, HQRNG().nextLong())
ingame!!.gameLoadMode = Ingame.GameLoadMode.CREATE_NEW
LoadScreen.screenToLoad = ingame!!
super.setScreen(LoadScreen)
super.setScreen(LoadScreen)*/
// title screen
//super.setScreen(TitleScreen(batch))
super.setScreen(TitleScreen(batch))
}
internal fun changeScreen(screen: Screen) {