mirror of
https://github.com/curioustorvald/Terrarum.git
synced 2026-03-07 12:21:52 +09:00
option to toggle the timepiece
This commit is contained in:
@@ -32,13 +32,14 @@
|
||||
"MENU_LABEL_STREAMING": "Livestreaming",
|
||||
"MENU_LABEL_SYSTEM_INFO": "System Info",
|
||||
"MENU_MODULES" : "Modules",
|
||||
"MENU_OPTIONS_ATLAS_TEXTURE_SIZE": "Atlas Texture Size",
|
||||
"MENU_OPTIONS_ALWAYS": "Always",
|
||||
"MENU_OPTIONS_AUDIO_BUFFER_SIZE": "Audio Buffer Size",
|
||||
"MENU_OPTIONS_AUTOSAVE": "Autosave",
|
||||
"MENU_OPTIONS_BLUR": "Blur",
|
||||
"MENU_OPTIONS_DEBUG_CONSOLE": "Debug Console",
|
||||
"MENU_OPTIONS_DITHER": "Dithering",
|
||||
"MENU_OPTIONS_ENABLE_SCRIPT_MODS": "Enable Script Mods",
|
||||
"MENU_OPTIONS_HIDE": "Hide",
|
||||
"MENU_OPTIONS_JVM_HEAP_MAX": "Max Heap Memory",
|
||||
"MENU_OPTIONS_LIGHT_UPDATE_PASSES": "Light Calculation Depth",
|
||||
"MENU_OPTIONS_MASTER_VOLUME": "Master Volume",
|
||||
@@ -49,6 +50,7 @@
|
||||
"MENU_OPTIONS_SAVEFORMAT": "Savegame Format",
|
||||
"MENU_OPTIONS_SAVEFORMAT_FAST": "Faster Load",
|
||||
"MENU_OPTIONS_SAVEFORMAT_SMALL": "Smaller Size",
|
||||
"MENU_OPTIONS_SHOW_TIMEPIECE": "Show Timepiece",
|
||||
"MENU_OPTIONS_SPEAKER_HEADPHONE": "Headphone",
|
||||
"MENU_OPTIONS_SPEAKER_SETUP": "Speaker Setup",
|
||||
"MENU_OPTIONS_SPEAKER_STEREO": "Stereo",
|
||||
|
||||
@@ -32,13 +32,14 @@
|
||||
"MENU_LABEL_STREAMING": "실시간 방송",
|
||||
"MENU_LABEL_SYSTEM_INFO": "시스템 정보",
|
||||
"MENU_MODULES" : "모듈",
|
||||
"MENU_OPTIONS_ATLAS_TEXTURE_SIZE": "아틀라스 텍스처 크기",
|
||||
"MENU_OPTIONS_ALWAYS": "항상",
|
||||
"MENU_OPTIONS_AUDIO_BUFFER_SIZE": "오디오 버퍼 크기",
|
||||
"MENU_OPTIONS_AUTOSAVE": "자동 저장",
|
||||
"MENU_OPTIONS_BLUR": "흐림",
|
||||
"MENU_OPTIONS_DEBUG_CONSOLE": "디버그 콘솔",
|
||||
"MENU_OPTIONS_DITHER": "디더링",
|
||||
"MENU_OPTIONS_ENABLE_SCRIPT_MODS": "스크립트 모드 활성화",
|
||||
"MENU_OPTIONS_HIDE": "숨기기",
|
||||
"MENU_OPTIONS_JVM_HEAP_MAX": "최대 힙 메모리",
|
||||
"MENU_OPTIONS_LIGHT_UPDATE_PASSES": "빛 계산 반복 횟수",
|
||||
"MENU_OPTIONS_MASTER_VOLUME": "마스터 음량",
|
||||
@@ -49,6 +50,7 @@
|
||||
"MENU_OPTIONS_SAVEFORMAT": "게임 저장 형식",
|
||||
"MENU_OPTIONS_SAVEFORMAT_FAST": "빠른 불러오기",
|
||||
"MENU_OPTIONS_SAVEFORMAT_SMALL": "작은 용량",
|
||||
"MENU_OPTIONS_SHOW_TIMEPIECE": "현재 시간 표시",
|
||||
"MENU_OPTIONS_SPEAKER_HEADPHONE": "헤드폰",
|
||||
"MENU_OPTIONS_SPEAKER_SETUP": "스피커 구성",
|
||||
"MENU_OPTIONS_SPEAKER_STEREO": "스테레오",
|
||||
|
||||
@@ -134,6 +134,8 @@ object DefaultConfig {
|
||||
|
||||
"enablescriptmods" to false,
|
||||
|
||||
"show_timepiece_overlay" to "fullscreen", // "hide", "fullscreen", "always"
|
||||
|
||||
|
||||
|
||||
// settings regarding debugger
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"),
|
||||
))
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user