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

issue #28

Browse Source
This commit is contained in:
minjaesong
2019-10-14 20:55:53 +09:00
parent 17c9d184b2
commit 33f74385bd
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/net/torvald/terrarum/gamecontroller/IngameController.kt
View File

@@ -58,8 +58,7 @@ class IngameController(val terrarumIngame: TerrarumIngame) : InputAdapter() {
// fire world click events; the event is defined as Ingame's (or any others') WorldClick event // fire world click events; the event is defined as Ingame's (or any others') WorldClick event
if (terrarumIngame.uiContainer.map { if ((it.isOpening || it.isOpened) && it.mouseUp) 1 else 0 }.sum() == 0) { // no UI on the mouse, right? if (terrarumIngame.uiContainer.map { if ((it.isOpening || it.isOpened) && it.mouseUp) 1 else 0 }.sum() == 0) { // no UI on the mouse, right?
if (Gdx.input.isButtonPressed(AppLoader.getConfigInt("mouseprimary")) || if (Gdx.input.isButtonPressed(AppLoader.getConfigInt("mouseprimary"))) {
Gdx.input.isButtonPressed(AppLoader.getConfigInt("mousesecondary"))) {
terrarumIngame.worldPrimaryClickStart(AppLoader.UPDATE_RATE) terrarumIngame.worldPrimaryClickStart(AppLoader.UPDATE_RATE)
} }
@@ -172,6 +171,11 @@ class IngameController(val terrarumIngame: TerrarumIngame) : InputAdapter() {
} }
} }
// pie menu
if (button == AppLoader.getConfigInt("mousesecondary")) {
terrarumIngame.uiPieMenu.setAsClose()
terrarumIngame.uiQuickBar.setAsOpen()
}
terrarumIngame.uiContainer.forEach { it.touchUp(screenX, screenY, pointer, button) } // for MouseControlled UIcanvases terrarumIngame.uiContainer.forEach { it.touchUp(screenX, screenY, pointer, button) } // for MouseControlled UIcanvases
@@ -200,7 +204,15 @@ class IngameController(val terrarumIngame: TerrarumIngame) : InputAdapter() {
override fun touchDown(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean { override fun touchDown(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean {
terrarumIngame.uiContainer.forEach { it.touchDown(screenX, screenY, pointer, button) } terrarumIngame.uiContainer.forEach { it.touchDown(screenX, screenY, pointer, button) }
// pie menu
if (button == AppLoader.getConfigInt("mousesecondary")) {
terrarumIngame.uiPieMenu.setAsOpen()
terrarumIngame.uiQuickBar.setAsClose()
}
return true return true
} }
} }