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

minor fixes in UI with aliases

Browse Source 
Former-commit-id: 539604058bcf7e545de920b1c7a5958e30577a34
This commit is contained in:
Song Minjae
2017-03-10 21:23:51 +09:00
parent edb2f5ce11
commit a10134db2e
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,8 +167,6 @@ class StateInGame : BasicGameState() {
uiAliases[UI_QUICK_BAR] = UIHandler(UIQuickBar()) uiAliases[UI_QUICK_BAR] = UIHandler(UIQuickBar())
uiAliases[UI_QUICK_BAR]!!.isVisible = true uiAliases[UI_QUICK_BAR]!!.isVisible = true
uiAliases[UI_QUICK_BAR]!!.setPosition(0, 0) uiAliases[UI_QUICK_BAR]!!.setPosition(0, 0)
uiAliases[UI_QUICK_BAR]!!.UI.handler = uiAliases[UI_QUICK_BAR]
uiContainer.add(uiAliases[UI_QUICK_BAR]!!)
// pie menu // pie menu
uiAliases[UI_PIE_MENU] = UIHandler(UIPieMenu()) uiAliases[UI_PIE_MENU] = UIHandler(UIPieMenu())
@@ -176,13 +174,11 @@ class StateInGame : BasicGameState() {
(Terrarum.WIDTH - uiAliases[UI_PIE_MENU]!!.UI.width) / 2, (Terrarum.WIDTH - uiAliases[UI_PIE_MENU]!!.UI.width) / 2,
(Terrarum.HEIGHT - uiAliases[UI_PIE_MENU]!!.UI.height) / 2 (Terrarum.HEIGHT - uiAliases[UI_PIE_MENU]!!.UI.height) / 2
) )
uiAliases[UI_PIE_MENU]!!.UI.handler = uiAliases[UI_PIE_MENU]
uiContainer.add(uiAliases[UI_PIE_MENU]!!)
// vital metre // vital metre
// fill in getter functions by // fill in getter functions by
// (uiAliases[UI_QUICK_BAR]!!.UI as UIVitalMetre).vitalGetterMax = { some_function } // (uiAliases[UI_QUICK_BAR]!!.UI as UIVitalMetre).vitalGetterMax = { some_function }
uiAliases[UI_VITAL1] = UIHandler(UIVitalMetre(player, { null }, { null }, null, 0)) uiAliases[UI_VITAL1] = UIHandler(UIVitalMetre(player, { 80f }, { 100f }, Color.green, 0))
uiAliases[UI_VITAL1]!!.setAsAlwaysVisible() uiAliases[UI_VITAL1]!!.setAsAlwaysVisible()
uiAliases[UI_VITAL2] = UIHandler(UIVitalMetre(player, { null }, { null }, null, 1)) uiAliases[UI_VITAL2] = UIHandler(UIVitalMetre(player, { null }, { null }, null, 1))
uiAliases[UI_VITAL2]!!.setAsAlwaysVisible() uiAliases[UI_VITAL2]!!.setAsAlwaysVisible()
@@ -190,6 +186,13 @@ class StateInGame : BasicGameState() {
uiAliases[UI_VITAL3]!!.setAsAlwaysVisible() uiAliases[UI_VITAL3]!!.setAsAlwaysVisible()
// batch-process uiAliases
uiAliases.forEach { _, uiHandler ->
uiHandler.UI.handler = uiHandler // attach UIHandlers
uiContainer.add(uiHandler) // put them all to the UIContainer
}