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

control symbol for key setup ui

Browse Source
This commit is contained in:
minjaesong
2021-09-16 22:21:13 +09:00
parent d01f90ccd2
commit 61d269dcc3
2 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/graphics/gui/inventory/category.tga LFS
View File

Binary file not shown.

38
src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt
View File

@@ -5,6 +5,7 @@ import com.badlogic.gdx.Input
import com.badlogic.gdx.graphics.Camera import com.badlogic.gdx.graphics.Camera
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.g2d.SpriteBatch
import com.badlogic.gdx.graphics.g2d.TextureRegion
import net.torvald.terrarum.App import net.torvald.terrarum.App
import net.torvald.terrarum.CommonResourcePool import net.torvald.terrarum.CommonResourcePool
import net.torvald.terrarum.ui.Toolkit import net.torvald.terrarum.ui.Toolkit
@@ -25,6 +26,8 @@ class UIKeyboardControlPanel : UICanvas() {
CommonResourcePool.loadAll() CommonResourcePool.loadAll()
} }
private val labels = CommonResourcePool.getAsTextureRegionPack("inventory_category")
override var width = 600 override var width = 600
override var height = 600 override var height = 600
override var openCloseTime = 0f override var openCloseTime = 0f
@@ -115,8 +118,32 @@ class UIKeyboardControlPanel : UICanvas() {
// ... // ...
) )
private val symbolLeft = labels.get(0,2)
private val symbolUp = labels.get(1,2)
private val symbolRight = labels.get(2,2)
private val symbolDown = labels.get(3,2)
private val symbolJump = labels.get(4,2)
private val symbolZoom = labels.get(5,2)
private val symbolInventory = labels.get(9,0)
private val symbolGrapplingHook = labels.get(5,1)
private val symbolGamemenu = labels.get(6,2)
init { init {
keycaps.values.forEach { addUIitem(it) } keycaps.values.forEach { addUIitem(it) }
// read config and put icons
keycaps[App.getConfigInt("config_keyup")]?.symbolControl = symbolUp
keycaps[App.getConfigInt("config_keyleft")]?.symbolControl = symbolLeft
keycaps[App.getConfigInt("config_keydown")]?.symbolControl = symbolDown
keycaps[App.getConfigInt("config_keyright")]?.symbolControl = symbolRight
keycaps[App.getConfigInt("config_keyjump")]?.symbolControl = symbolJump
keycaps[App.getConfigInt("config_keyzoom")]?.symbolControl = symbolZoom
keycaps[App.getConfigInt("config_keyinventory")]?.symbolControl = symbolInventory
keycaps[App.getConfigInt("config_keymovementaux")]?.symbolControl = symbolGrapplingHook
keycaps[App.getConfigInt("config_keygamemenu")]?.symbolControl = symbolGamemenu
} }
override fun updateUI(delta: Float) { override fun updateUI(delta: Float) {
@@ -174,7 +201,7 @@ class UIItemKeycap(
private val s1 = if (symbolDefault.isNotBlank()) symbolDefault.split(',').map { it.toInt() } else null private val s1 = if (symbolDefault.isNotBlank()) symbolDefault.split(',').map { it.toInt() } else null
val symbolControl = "" var symbolControl: TextureRegion? = null
private val borderKeyForbidden = Color(0x000000C0) private val borderKeyForbidden = Color(0x000000C0)
private val borderKeyNormal = Color(0xFFFFFFAA.toInt()) private val borderKeyNormal = Color(0xFFFFFFAA.toInt())
@@ -184,6 +211,7 @@ class UIItemKeycap(
private val keycapFill = Color(0x404040_C0) private val keycapFill = Color(0x404040_C0)
private val keylabelCol = Color(0xFFFFFF40.toInt()) private val keylabelCol = Color(0xFFFFFF40.toInt())
private val configuredKeyCol = Color.WHITE
override fun update(delta: Float) { override fun update(delta: Float) {
super.update(delta) super.update(delta)
@@ -213,8 +241,12 @@ class UIItemKeycap(
Toolkit.fillArea(batch, posX, posY, width, height) Toolkit.fillArea(batch, posX, posY, width, height)
// default keycap // default keycap
batch.color = keylabelCol if (symbolControl != null) {
if (s1 != null) { batch.color = configuredKeyCol
batch.draw(symbolControl, (posX + (width - 20) / 2).toFloat(), posY + 4f)
}
else if (s1 != null) {
batch.color = keylabelCol
batch.draw(labels.get(s1[0], s1[1]), (posX + (width - 20) / 2).toFloat(), posY + 4f) batch.draw(labels.get(s1[0], s1[1]), (posX + (width - 20) / 2).toFloat(), posY + 4f)
} }
} }