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

option to toggle the timepiece

Browse Source
This commit is contained in:
minjaesong
2024-07-20 16:12:58 +09:00
parent 3cf636629e
commit ca4c0d0d03
5 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/DefaultConfig.kt
View File

@@ -134,6 +134,8 @@ object DefaultConfig {
"enablescriptmods" to false,
"show_timepiece_overlay" to "fullscreen", // "hide", "fullscreen", "always"
// settings regarding debugger

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

@@ -94,6 +94,13 @@ object TerrarumPostProcessor : Disposable {
fun draw(frameDelta: Float, projMat: Matrix4, fbo: FrameBuffer): FrameBuffer {
val showTimepieceOption = App.getConfigString("show_timepiece_overlay")
val showTimepiece = when (showTimepieceOption) {
"hide" -> false
"always" -> true
else -> App.scr.isFullscreen
}
// init
if (!init) {
init = true
@@ -175,9 +182,9 @@ object TerrarumPostProcessor : Disposable {
if (!debugUI.isClosed && !debugUI.isClosing) debugUI.setAsClose()
}
// if (App.scr.isFullscreen) {
if (showTimepiece) {
drawFullscreenComplications()
// }
}
// draw dev build notifiers
// omitting this screws up HQ2X render for some reason

3
src/net/torvald/terrarum/modulebasegame/ui/UIGraphicsControlPanel.kt
View File

@@ -39,8 +39,9 @@ class UIGraphicsControlPanel(remoCon: UIRemoCon?) : UICanvas() {
arrayOf("fullscreen", { Lang["MENU_OPTIONS_FULLSCREEN", true] }, "toggle"),
arrayOf("screenmagnifying", { Lang["GAME_ACTION_ZOOM", true] }, "spinnerd,1.0,2.0,0.05"),
arrayOf("screenmagnifyingfilter", { Lang["MENU_OPTIONS_FILTERING_MODE", true] }, "textsel,none=MENU_OPTIONS_NONE,bilinear=MENU_OPTIONS_FILTERING_BILINEAR,hq2x=MENU_OPTIONS_FILTERING_HQ2X_DNT"),
arrayOf("", { Lang["MENU_LABEL_STREAMING", true] }, "h1"),
arrayOf("", { Lang["GAME_GENRE_MISC", true] }, "h1"),
arrayOf("fx_streamerslayout", { Lang["MENU_OPTIONS_STREAMERS_LAYOUT", true] }, "toggle"),
arrayOf("show_timepiece_overlay", { Lang["MENU_OPTIONS_SHOW_TIMEPIECE", true] }, "textsel,hide=MENU_OPTIONS_HIDE,fullscreen=MENU_OPTIONS_FULLSCREEN,always=MENU_OPTIONS_ALWAYS"),
))
}