diff --git a/README.md b/README.md index 38780dce..4c6d278a 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ Report problems as issues, following [CONTRIBUTING.md](CONTRIBUTING.md). - HDR10 output with peak, game and HUD brightness settings - 16:10 (Steam Deck, handhelds), 3:2 (Surface, Framework), 21:9 and 32:9 (ultrawide) game resolutions, with the camera and the interface in that shape - Anisotropic texture filtering up to 16x, for sharp ground into the distance +- Optional full model detail at any distance (1.2.1 and 1.4.3) - In-game settings menu (F1) and performance overlay (F10) - Play time across runs on the Game tab of the settings menu, kept in `playtime.txt` next to the saves - Discord Rich Presence ("Playing TotK Recomp" with the play time), off by default, own application id supported diff --git a/recomp/patches-v110.txt b/recomp/patches-v110.txt index 456b0475..8d631437 100644 --- a/recomp/patches-v110.txt +++ b/recomp/patches-v110.txt @@ -12,6 +12,9 @@ set output TOTK_PATCH_OUTPUT 0 set scene TOTK_PATCH_SCENE 0 set shadow TOTK_PATCH_SHADOW 0 set cascade TOTK_PATCH_CASCADE 0 +# Distant detail (patches-v121.txt explains both): no sites found in this version yet, so the switches do nothing. +set lod TOTK_LOD_DETAIL 0 +set steady TOTK_LOD_STEADY 0 # 60 fps: the adaptive present-interval controller (main+0x8f26c8, 1.0.0 0x8f6bec) gets the minimum interval 1. site fps60 main 90e978 6b08015f 7100055f # clamp: cmp w10, #1 (was cmp w10, w8 = minimum) diff --git a/recomp/patches-v121.txt b/recomp/patches-v121.txt index 738d605d..318e669d 100644 --- a/recomp/patches-v121.txt +++ b/recomp/patches-v121.txt @@ -143,6 +143,25 @@ set pooloff TOTK_POOL_OFFSET_PATCH 1 site pooloff main ad43f0 93407f22 2a1903e2 # sxtw x2, w25 -> mov w2, w25 (SetStorage offset) site pooloff main ad440c 8b39c101 8b394101 # add x1, x8, w25, sxtw -> add x1, x8, w25, uxtw (packaged data source) +# Distant detail, after the emulator mods "LOD Improvement v2" (theboy181, sweetmini) and "Disable LOD Quality +# Reduction" (main-1.2.1.pchtxt). Those turn a conditional branch into an unconditional one; the generator patches +# only plain instructions (recomp/gen.py, the emitter's patch), so these sites feed the branch instead. +# Model level of detail: the level picker main+0x27d225c (a virtual method, vtable slot at data 0x43723f0) returns the +# floor at its parameters' +0x28 when the distance term is past the threshold, and otherwise interpolates towards the +# coarsest level; a one-level model returns count - 1 (0) at once. Here every model takes that early return, with the +# floor in w0, so distant models keep the detail they have up close. Unlike the mod, a one-level model still returns 0: +# the floor is not checked against the level count, and an index past a one-level list would read past its end. +set lod TOTK_LOD_DETAIL 0 +# A site may use the flags only once, so the one-level case is a mask (all ones unless count - 1 is 0) on the floor. +site lod main 27d2264 71000520 5100052b 4b0b03ec 2a0b018c 131f7d8c b9402840 0a0c0000 6b00001f # subs w0, w9, #1 -> sub w11, w9, #1; neg w12, w11; orr w12, w12, w11; asr w12, w12, #31; ldr w0, [x2, #0x28]; and w0, w0, w12; cmp w0, w0 (b.eq taken) +# Load-dependent quality: the graphics settings setup (main+0xc7e9xx, it also reads the FSR and FXAA switches) walks a +# list at its +0x120 and passes three floats of each entry to virtual setters, which the mod describes as the drop of +# model and texture detail when the frame rate falls; it skips all of it, to the epilogue, when the value it reads at +# main+0xc7eb24 is above 8. Reading 9 there skips it as the mod does; w21 is not read again on that path (the epilogue +# restores it). +set steady TOTK_LOD_STEADY 0 +site steady main c7eb24 b9400815 52800135 # ldr w21, [x0, #8] -> mov w21, #9 (b.gt 0xc7ee4c taken) + # Direct mouse camera (runtime/mouse_direct.c; the same hooks as patches-v143.txt, mapped by enclosing function to the # 1.2.1 main, each original word checked). The camera input update (main+0xd18088, 1.4.3 0x874c1c) after its dead zone, # clamp and StickExponent keeps x in s11 (1.4.3 s9); the host callback performs the displaced store and adds raw mouse diff --git a/recomp/patches-v143.txt b/recomp/patches-v143.txt index 404a3b10..064aebb3 100644 --- a/recomp/patches-v143.txt +++ b/recomp/patches-v143.txt @@ -13,6 +13,16 @@ set scene TOTK_PATCH_SCENE 0 set shadow TOTK_PATCH_SHADOW 0 set cascade TOTK_PATCH_CASCADE 0 set grass TOTK_PATCH_GRASS 0 +# Distant detail (patches-v121.txt explains both). The level picker main+0x1ee8424 is 1.2.1's main+0x27d225c with the +# same first words, and its early b.eq goes straight to the ret, so the 1.2.1 site words fit as they are. +set lod TOTK_LOD_DETAIL 0 +site lod main 1ee842c 71000520 5100052b 4b0b03ec 2a0b018c 131f7d8c b9402840 0a0c0000 6b00001f # subs w0, w9, #1 -> the 1.2.1 words (one-level mask, floor in w0, cmp w0, w0: b.eq taken) +# The graphics settings setup (main+0x5868c4) inlines the three getters 1.2.1 calls: the value 1.2.1 reads at +# main+0xc7eb24 is the ldr w10, [x10, #0x38] at main+0x58692c, and the getters' slow paths (main+0x586bc8, 0x586c18, +# 0x586f44) come back before the compare. So the site is the compare, which every path reaches: w10 = 9 skips the +# list walk to the epilogue (main+0x58729c), which does not read w10. +set steady TOTK_LOD_STEADY 0 +site steady main 586954 7100215f 5280012a 7100215f # cmp w10, #8 -> mov w10, #9; cmp w10, #8 (b.gt 0x58729c taken) # 60 fps: the adaptive present-interval controller (main+0x2db174, 1.2.1 0x8f26c8) gets the minimum interval 1. site fps60 main 2db204 6b08015f 7100055f # clamp: cmp w10, #1 (was cmp w10, w8 = minimum) diff --git a/runtime/cfg.c b/runtime/cfg.c index bcbaadc3..a2b4ee1f 100644 --- a/runtime/cfg.c +++ b/runtime/cfg.c @@ -51,7 +51,7 @@ static const char *const known[] = { "GAMEPLAY_WEAPON_WHEEL", "GPL", "GPL_DRAW_BUILD", "GPU", "GPU_INDEX", "GPU_NAME", "GRASS_RANGE", "HDR", "HDR_GAME_NITS", "HDR_HUE", "HDR_PEAK_NITS", "HDR_UI_NITS", "HIGHFPS_FIX", "INPUT", "INPUT_RECORD", "INPUT_SCRIPT", "KSPIN_US", "LANG", "LIB_PREBUILD", - "LIB_PREBUILD_KEEP", "LIB_PREBUILD_THREADS", "LOCALE", "LOD_GUARD", "LSTICK_DEADZONE", "MAP_CLICK", "MEMORY", "MEMX", "MENU_LANG", "MENU_TEST", "MENU_FONT_FONTCONFIG", + "LIB_PREBUILD_KEEP", "LIB_PREBUILD_THREADS", "LOCALE", "LOD_DETAIL", "LOD_GUARD", "LOD_STEADY", "LSTICK_DEADZONE", "MAP_CLICK", "MEMORY", "MEMX", "MENU_LANG", "MENU_TEST", "MENU_FONT_FONTCONFIG", "MEM_RESERVE_MIB", "MENU_CURSOR", "MENU_CURSOR_LOG", "MENU_TEST_DIR", "MENU_TEST_SET", "MINIMAL_LAYOUT", "MIRROR_GAP", "MODS_DIR", "MODS_DISABLED", "MODS_ORDER", "MODS_REBUILD", "MOTION", "MOUSE_AIM_SCALE", "MOUSE_MODE", "MOUSE_DIRECT_PATCH", "MOUSE_SENS", "MOVIE_ASPECT", "MOVIE_HOST", "MOVIE_PACE", "MVOBJ_ALL", "MVOBJ_BANKS", "MVOBJ_EQUAL", "MVOBJ_EXACT", "MVOBJ_EXEC", "MVOBJ_NOC4", "MVOBJ_ONLY", "MVOBJ_TIMES", "MVPREV_CHECK", "MVPREV_GROW", "MVPREV_SKIP", "MVPREV_TRUST", "MV_CHECK", "MV_SURVEY", @@ -78,7 +78,7 @@ static const struct { const char *key, *section; } sections[] = { {"FULLSCREEN", "display"}, {"WINDOW_SIZE", "display"}, {"PERF_OVERLAY", "display"}, {"VK_PRESENT", "display"}, {"GPU_INDEX", "display"}, {"OUTPUT_RES", "display"}, {"RENDER_SCALE", "display"}, {"UPSCALER", "display"}, {"SHARPNESS", "display"}, {"DYNAMIC_RES", "display"}, {"ASPECT", "display"}, {"MOVIE_ASPECT", "display"}, {"FOV", "display"}, {"ANISO", "display"}, - {"COLOR_PRESET", "display"}, + {"LOD_DETAIL", "display"}, {"LOD_STEADY", "display"}, {"COLOR_PRESET", "display"}, {"COLOR_BRIGHTNESS", "display"}, {"COLOR_CONTRAST", "display"}, {"COLOR_SATURATION", "display"}, {"COLOR_GAMMA", "display"}, {"HDR", "display"}, {"HDR_PEAK_NITS", "display"}, {"HDR_GAME_NITS", "display"}, {"HDR_UI_NITS", "display"}, {"HDR_HUE", "display"}, {"SHADOW_RES", "display"}, @@ -138,6 +138,7 @@ static const CfgMeta metas[] = { {"DLAA", "0", "0|1", RESTART}, {"DLSS", "dlaa", "dlaa|quality|balanced|performance|ultra_performance", LIVE}, {"DLSS_PRESET", "default", "default|k|j", LIVE}, {"DLSS_CHAR_MASK", "65", "0|35|65|100", LIVE}, {"REFLEX", "off", "off|on|boost", RESTART}, {"FXAA", "1", "0|1", LIVE}, + {"LOD_DETAIL", "0", "0|1", RESTART}, {"LOD_STEADY", "0", "0|1", RESTART}, // patch sets lod and steady (1.2.1, 1.4.3) {"ASPECT", "fit", "fit|stretch", LIVE}, {"MOVIE_ASPECT", "keep", "keep|stretch", LIVE}, {"FOV", "100", "70..140", LIVE}, {"ANISO", "game", "game|2|4|8|16", RESTART}, // vk_texture.c sampler_features // colour adjustment (vk_color.c); the preset is the menu's, the four values are what the present uses diff --git a/runtime/ui/menu.cpp b/runtime/ui/menu.cpp index 44031fcd..2012813a 100644 --- a/runtime/ui/menu.cpp +++ b/runtime/ui/menu.cpp @@ -716,6 +716,8 @@ static void tab_screen(float scale) { static const char *const aniso[] = {"game", "2", "4", "8", "16"}; const char *aniso_names[] = {menu_text(UI_MENU_ANISO_GAME), "2x", "4x", "8x", "16x"}; opt_choice_list("TOTK_ANISO", UI_MENU_ANISO, aniso, aniso_names, 5, UI_MENU_ANISO_DESC); + opt_toggle("TOTK_LOD_DETAIL", UI_MENU_LOD_DETAIL, UI_MENU_LOD_DETAIL_DESC); + opt_toggle("TOTK_LOD_STEADY", UI_MENU_LOD_STEADY, UI_MENU_LOD_STEADY_DESC); row_shadow_scale(); row_shadow_range(); row_grass_range(); diff --git a/runtime/ui_text.c b/runtime/ui_text.c index 54a7b690..496d1546 100644 --- a/runtime/ui_text.c +++ b/runtime/ui_text.c @@ -96,6 +96,10 @@ static const char *const text_en[UI_TEXT_COUNT] = { [UI_MENU_ANISO] = "Texture filtering", [UI_MENU_ANISO_DESC] = "Anisotropic filtering of surface textures: ground, roads and walls seen at a shallow angle stay sharp into the distance instead of blurring. Game: the level the game asks for, as on the Switch.", [UI_MENU_ANISO_GAME] = "Game", + [UI_MENU_LOD_DETAIL] = "Distant model detail", + [UI_MENU_LOD_DETAIL_DESC] = "Distant models keep the detail they have up close instead of switching to simpler versions. Game versions 1.2.1 and 1.4.3.", + [UI_MENU_LOD_STEADY] = "Steady detail under load", + [UI_MENU_LOD_STEADY_DESC] = "Skips the game's setup for lowering model and texture detail when the frame rate drops, as the emulator mod Disable LOD Quality Reduction does. Game versions 1.2.1 and 1.4.3.", [UI_MENU_SHARPNESS] = "FSR sharpness", [UI_MENU_SHARPNESS_DESC] = "Sharpening after FSR scaling; 0 turns it off.", [UI_MENU_COLOR] = "Colour", @@ -629,6 +633,10 @@ static const char *const text_ru[UI_TEXT_COUNT] = { [UI_MENU_ANISO] = "Фильтрация текстур", [UI_MENU_ANISO_DESC] = "Анизотропная фильтрация текстур поверхностей: земля, дороги и стены под острым углом остаются чёткими вдали, а не размываются. Игра: уровень, который запрашивает игра, как на Switch.", [UI_MENU_ANISO_GAME] = "Игра", + [UI_MENU_LOD_DETAIL] = "Детализация дальних моделей", + [UI_MENU_LOD_DETAIL_DESC] = "Дальние модели сохраняют детализацию, как вблизи, а не переключаются на упрощённые версии. Только для версий игры 1.2.1 и 1.4.3.", + [UI_MENU_LOD_STEADY] = "Стабильная детализация под нагрузкой", + [UI_MENU_LOD_STEADY_DESC] = "Пропускает настройку игры, снижающую детализацию моделей и текстур при падении частоты кадров, как эмуляторный мод Disable LOD Quality Reduction. Только для версий игры 1.2.1 и 1.4.3.", [UI_MENU_SHARPNESS] = "Резкость FSR", [UI_MENU_SHARPNESS_DESC] = "Повышение резкости после масштабирования FSR; 0 выключает его.", [UI_MENU_COLOR] = "Цвет", @@ -1472,6 +1480,13 @@ static const char *const text_pt_br[UI_TEXT_COUNT] = { "ângulo raso continuam nítidos ao longe em vez de borrar. Jogo: o nível que o jogo pede, " "como no Switch.", [UI_MENU_ANISO_GAME] = "Jogo", + [UI_MENU_LOD_DETAIL] = "Detalhe de modelos distantes", + [UI_MENU_LOD_DETAIL_DESC] = "Modelos distantes mantêm o detalhe que têm de perto em vez de trocar por versões " + "mais simples. Só nas versões 1.2.1 e 1.4.3 do jogo.", + [UI_MENU_LOD_STEADY] = "Detalhe estável sob carga", + [UI_MENU_LOD_STEADY_DESC] = "Pula a configuração do jogo que reduz o detalhe de modelos e texturas quando a taxa " + "de quadros cai, como faz o mod de emulador Disable LOD Quality Reduction. Só nas " + "versões 1.2.1 e 1.4.3 do jogo.", [UI_MENU_COLOR] = "Cor", [UI_MENU_COLOR_PRESET] = "Perfil de cor", [UI_MENU_COLOR_PRESET_DESC] = "Define os quatro valores abaixo. Vívido: mais contraste e saturação, sombras um " @@ -2181,6 +2196,11 @@ static const char *const text_zh_hans[UI_TEXT_COUNT] = { [UI_MENU_ANISO] = "纹理过滤", [UI_MENU_ANISO_DESC] = "表面纹理的各向异性过滤:以小角度看到的地面、道路和墙壁在远处依然清晰,而不会模糊。游戏:使用游戏请求的级别,与 Switch 上相同。", [UI_MENU_ANISO_GAME] = "游戏", + [UI_MENU_LOD_DETAIL] = "远处模型细节", + [UI_MENU_LOD_DETAIL_DESC] = "远处的模型保持近处的细节,而不会切换为简化版本。仅适用于游戏版本 1.2.1 和 1.4.3。", + [UI_MENU_LOD_STEADY] = "负载下保持细节", + [UI_MENU_LOD_STEADY_DESC] = "跳过游戏在帧率下降时降低模型和纹理细节的设置,与模拟器模组 Disable LOD Quality " + "Reduction 的作用相同。仅适用于游戏版本 1.2.1 和 1.4.3。", [UI_MENU_HDR_GROUP] = "HDR", [UI_MENU_HDR] = "HDR 输出", [UI_MENU_HDR_DESC] = "在 HDR 显示器上呈现明亮的高光。需要在 Windows 中开启 HDR(“使用 HDR”),或使用带色彩管理的 Wayland 合成器;否则画面保持 " diff --git a/runtime/ui_text.h b/runtime/ui_text.h index 0c9ee4e6..d355c321 100644 --- a/runtime/ui_text.h +++ b/runtime/ui_text.h @@ -42,6 +42,7 @@ typedef enum { UI_MENU_FOV, UI_MENU_FOV_DESC, UI_MENU_SHADOW_RES, UI_MENU_SHADOW_RES_DESC, UI_MENU_SHADOW_RES_GAME, UI_MENU_ANISO, UI_MENU_ANISO_DESC, UI_MENU_ANISO_GAME, + UI_MENU_LOD_DETAIL, UI_MENU_LOD_DETAIL_DESC, UI_MENU_LOD_STEADY, UI_MENU_LOD_STEADY_DESC, UI_MENU_SHARPNESS, UI_MENU_SHARPNESS_DESC, UI_MENU_COLOR, // group heading over the colour rows UI_MENU_COLOR_PRESET, UI_MENU_COLOR_PRESET_DESC, UI_MENU_COLOR_DEFAULT, UI_MENU_COLOR_VIVID, UI_MENU_COLOR_CLARITY, diff --git a/totk.ini.example b/totk.ini.example index 255ecc0e..0ce0a216 100644 --- a/totk.ini.example +++ b/totk.ini.example @@ -222,6 +222,14 @@ # ground, roads and walls seen at a shallow angle sharp into the distance. Only filtered, mipmapped textures that tile # are raised; shadow maps, data maps and screen-sized buffers keep the game's setting. Read at start. # aniso = game +# Distant model detail: 1 keeps the detail models have up close at any distance, 0 (the default) lets the game switch +# to simpler versions as they recede (recomp/patches-v121.txt, set lod). Costs GPU time. Game versions 1.2.1 and +# 1.4.3. Read at start. +# lod_detail = 0 +# Steady detail under load: 1 skips the game's setup for lowering model and texture detail when the frame rate drops, +# as the emulator mod "Disable LOD Quality Reduction" does (set steady); 0 (the default) leaves it. Game versions +# 1.2.1 and 1.4.3. Read at start. +# lod_steady = 0 # Colour adjustment of the picture, HUD included, before it is scaled to the window: brightness (-30 to 30, added in %), # contrast and saturation (70 to 150 and 50 to 200 %), gamma (0.8 to 1.2, below 1 brightens dark tones). At 0, 100, # 100 and 1 nothing runs. color_preset is the menu's profile (default, vivid, clarity, custom), which sets the four.