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

3 screens impl of inventory UI wip

Browse Source
This commit is contained in:
minjaesong
2019-01-29 20:24:11 +09:00
parent 9373feff34
commit 69e9fa4b0f
8 changed files with 162 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,7 +234,7 @@ object Terrarum : Screen {
// setting environment as MOBILE precedes this code
if (environment != RunningEnvironment.MOBILE) {
//if (environment != RunningEnvironment.MOBILE) {
environment = try {
Controllers.getController(0) // test if controller exists
if (getConfigString("pcgamepadenv") == "console")
@@ -245,7 +245,7 @@ object Terrarum : Screen {
catch (e: IndexOutOfBoundsException) {
RunningEnvironment.PC
}
}
//}
}
@@ -270,11 +270,6 @@ object Terrarum : Screen {
val MINIMAL_GL_MAX_TEXTURE_SIZE = 4096
override fun show() {
if (environment != RunningEnvironment.MOBILE) {
Gdx.gl.glDisable(GL20.GL_DITHER)
}
assetManager = AssetManager()
@@ -634,7 +629,7 @@ object BlendMode {
}
enum class RunningEnvironment {
PC, CONSOLE, MOBILE
PC, CONSOLE//, MOBILE
}
infix fun Color.screen(other: Color) = Color(