diff --git a/README.md b/README.md index 94c803bb..f78e785e 100644 --- a/README.md +++ b/README.md @@ -25,7 +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) +- Optional full model detail at any distance (1.2.1 and 1.4.3) - In-game settings menu (F1) and performance overlay (F10) - Discord Rich Presence ("Playing TotK Recomp" with the play time), off by default, own application id supported - Setup and in-game menu in English, Russian, Brazilian Portuguese and Simplified Chinese diff --git a/recomp/patches-v143.txt b/recomp/patches-v143.txt index 13f045df..15183444 100644 --- a/recomp/patches-v143.txt +++ b/recomp/patches-v143.txt @@ -12,9 +12,16 @@ 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. +# 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 fa4a2436..4da94e49 100644 --- a/runtime/cfg.c +++ b/runtime/cfg.c @@ -121,7 +121,7 @@ static const CfgMeta metas[] = { {"DLSS_CHAR_MASK", "65", "0|35|65|100", LIVE}, {"FXAA", "1", "0|1", LIVE}, {"ASPECT", "fit", "fit|stretch", LIVE}, {"FOV", "100", "70..140", LIVE}, {"ANISO", "game", "game|2|4|8|16", RESTART}, // vk_texture.c sampler_features - {"LOD_DETAIL", "0", "0|1", RESTART}, {"LOD_STEADY", "0", "0|1", RESTART}, // patch sets lod and steady (1.2.1) + {"LOD_DETAIL", "0", "0|1", RESTART}, {"LOD_STEADY", "0", "0|1", RESTART}, // patch sets lod and steady (1.2.1, 1.4.3) // colour adjustment (vk_color.c); the preset is the menu's, the four values are what the present uses {"COLOR_PRESET", "default", "default|vivid|clarity|custom", LIVE}, {"COLOR_BRIGHTNESS", "0", "-30..30", LIVE}, {"COLOR_CONTRAST", "100", "70..150", LIVE}, {"COLOR_SATURATION", "100", "50..200", LIVE}, diff --git a/runtime/ui_text.c b/runtime/ui_text.c index 6a220031..f1b6d015 100644 --- a/runtime/ui_text.c +++ b/runtime/ui_text.c @@ -91,9 +91,9 @@ static const char *const text_en[UI_TEXT_COUNT] = { [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 version 1.2.1 only.", + [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 version 1.2.1 only.", + [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", @@ -558,9 +558,9 @@ static const char *const text_ru[UI_TEXT_COUNT] = { [UI_MENU_ANISO_DESC] = "Анизотропная фильтрация текстур поверхностей: земля, дороги и стены под острым углом остаются чёткими вдали, а не размываются. Игра: уровень, который запрашивает игра, как на Switch.", [UI_MENU_ANISO_GAME] = "Игра", [UI_MENU_LOD_DETAIL] = "Детализация дальних моделей", - [UI_MENU_LOD_DETAIL_DESC] = "Дальние модели сохраняют детализацию, как вблизи, а не переключаются на упрощённые версии. Только для версии игры 1.2.1.", + [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.", + [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] = "Цвет", @@ -1314,11 +1314,11 @@ static const char *const text_pt_br[UI_TEXT_COUNT] = { [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ó na versão 1.2.1 do jogo.", + "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ó na " - "versão 1.2.1 do jogo.", + "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 " @@ -1952,10 +1952,10 @@ static const char *const text_zh_hans[UI_TEXT_COUNT] = { [UI_MENU_ANISO_DESC] = "表面纹理的各向异性过滤:以小角度看到的地面、道路和墙壁在远处依然清晰,而不会模糊。游戏:使用游戏请求的级别,与 Switch 上相同。", [UI_MENU_ANISO_GAME] = "游戏", [UI_MENU_LOD_DETAIL] = "远处模型细节", - [UI_MENU_LOD_DETAIL_DESC] = "远处的模型保持近处的细节,而不会切换为简化版本。仅适用于游戏版本 1.2.1。", + [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。", + "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/totk.ini.example b/totk.ini.example index d8be5c2d..74820aef 100644 --- a/totk.ini.example +++ b/totk.ini.example @@ -166,12 +166,12 @@ # 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 version 1.2.1 only. -# Read at start. +# 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 version 1.2.1 -# only. Read at start. +# 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,