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

fix: non-pausing UIs AND the ingame control are both getting input processed

Browse Source
This commit is contained in:
minjaesong
2024-01-03 15:46:52 +09:00
parent 38ecf8d19c
commit ccd36ffdbd
18 changed files with 63 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/modulebasegame/ui/UIQuickslotBar.kt
View File

@@ -11,6 +11,7 @@ import net.torvald.terrarum.gameworld.fmod
import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes.toItemCountText
import net.torvald.terrarum.ui.UICanvas
import net.torvald.terrarum.ui.UINotControllable
import kotlin.math.roundToInt
/**
@@ -18,6 +19,7 @@ import kotlin.math.roundToInt
*
* Created by minjaesong on 2016-07-20.
*/
@UINotControllable
class UIQuickslotBar : UICanvas() {
init {

2
src/net/torvald/terrarum/modulebasegame/ui/UIQuickslotPie.kt
View File

@@ -13,6 +13,7 @@ import net.torvald.terrarum.modulebasegame.ui.UIQuickslotBar.Companion.COMMON_OP
import net.torvald.terrarum.modulebasegame.ui.UIQuickslotBar.Companion.SLOT_COUNT
import net.torvald.terrarum.ui.Toolkit
import net.torvald.terrarum.ui.UICanvas
import net.torvald.terrarum.ui.UINotControllable
import org.dyn4j.geometry.Vector2
import kotlin.math.roundToInt
@@ -21,6 +22,7 @@ import kotlin.math.roundToInt
*
* Created by minjaesong on 2016-07-20.
*/
@UINotControllable
class UIQuickslotPie : UICanvas() {
init {

2
src/net/torvald/terrarum/modulebasegame/ui/UIScreenZoom.kt
View File

@@ -10,6 +10,7 @@ import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.modulebasegame.ui.UIQuickslotBar.Companion.COMMON_OPEN_CLOSE
import net.torvald.terrarum.ui.Movement
import net.torvald.terrarum.ui.UICanvas
import net.torvald.terrarum.ui.UINotControllable
import net.torvald.unicode.EMDASH
import net.torvald.unicode.getKeycapPC
import kotlin.math.roundToInt
@@ -19,6 +20,7 @@ import kotlin.math.roundToInt
*
* Created by minjaesong on 2019-08-11.
*/
@UINotControllable
class UIScreenZoom : UICanvas(
"control_key_zoom"
) {

2
src/net/torvald/terrarum/modulebasegame/ui/UITooltip.kt
View File

@@ -9,10 +9,12 @@ import net.torvald.terrarum.Second
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.ui.Toolkit
import net.torvald.terrarum.ui.UICanvas
import net.torvald.terrarum.ui.UINotControllable
/**
* Created by minjaesong on 2017-11-25.
*/
@UINotControllable
class UITooltip : UICanvas() {
init {

2
src/net/torvald/terrarum/modulebasegame/ui/UIWatchLargeAnalogue.kt
View File

@@ -10,6 +10,7 @@ import net.torvald.terrarum.gameworld.WorldTime
import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.ui.Toolkit
import net.torvald.terrarum.ui.UICanvas
import net.torvald.terrarum.ui.UINotControllable
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
import kotlin.math.cos
import kotlin.math.roundToInt
@@ -18,6 +19,7 @@ import kotlin.math.sin
/**
* Created by minjaesong on 2023-09-09.
*/
@UINotControllable
class UIWatchLargeAnalogue() : UICanvas() {
override var width = 76

2
src/net/torvald/terrarum/modulebasegame/ui/UIWatchLargeDigital.kt
View File

@@ -10,12 +10,14 @@ import net.torvald.terrarum.*
import net.torvald.terrarum.gameworld.WorldTime
import net.torvald.terrarum.modulebasegame.imagefont.WatchFont
import net.torvald.terrarum.ui.UICanvas
import net.torvald.terrarum.ui.UINotControllable
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
import kotlin.math.roundToInt
/**
* Created by minjaesong on 2017-06-11.
*/
@UINotControllable
class UIWatchLargeDigital() : UICanvas() {
override var width = 162
override var height = 25