diff --git a/README.md b/README.md index a6eee2b9..79543576 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Report problems as issues, following [CONTRIBUTING.md](CONTRIBUTING.md). - 60 fps by default; up to 144 fps or the monitor's refresh rate (experimental) - Custom resolutions (1080p, 2k...), supersampling and AMD FSR 1 upscaling - HDR10 output with peak, game and HUD brightness settings -- 16:10 (Steam Deck, handhelds), 21:9 and 32:9 (ultrawide) game resolutions, with the camera and the interface in that shape +- 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 - In-game settings menu (F1) and performance overlay (F10) - Setup and in-game menu in English, Russian, Brazilian Portuguese and Simplified Chinese diff --git a/docs/architecture.md b/docs/architecture.md index cddd6971..3849e025 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -99,8 +99,9 @@ Every guest thread is a host thread. TotK assumes Horizon's scheduler: three app RCAS) on the present. An `output_res` that is not 16:9 (more than 1% off, `res_is_16x9`) also switches on the `aspect` patch set, which hands the output's ratio to the camera, and `romfs.c` `overlay_init` loads the `romfs-patches-x` overlay for it when it exists (`tools/make_romfs_patches.py --aspect`, laid out by - `tools/ultrawide_layout.py`; the installer builds ten sizes: 21:9 2560x1080, 3440x1440, 3840x1600, 5120x2160, 32:9 - 3840x1080, 5120x1440 and 16:10 1280x800, 1680x1050, 1920x1200, 2560x1600). A wider layout moves the HUD to the + `tools/ultrawide_layout.py`; the installer builds fifteen sizes: 21:9 2560x1080, 3440x1440, 3840x1600, 5120x2160, + 32:9 3840x1080, 5120x1440, 16:10 1280x800, 1680x1050, 1920x1200, 2560x1600 and 3:2 1920x1280, 2160x1440, 2256x1504, + 2880x1920, 3000x2000). A wider layout moves the HUD to the screen's corners, a narrower one to its top and bottom edges. Other sizes get the camera of their shape and the 16:9 HUD stretched over it. The `aspect` setting (`fit`, the default; `stretch`) decides what the present does when the window's shape differs from the output's: `fit` letterboxes, where a 16:9 game in a wider window used to be diff --git a/installer/steps.py b/installer/steps.py index e9d6dff5..c95ef924 100644 --- a/installer/steps.py +++ b/installer/steps.py @@ -926,9 +926,11 @@ SKIPPED = re.compile(r'prepare-shaders: (\d+) variants skipped: the graphics dri # The game resolutions of another shape than 16:9 that runtime/ui/menu.cpp row_output_res lists: 21:9 and 32:9 monitors, -# and 16:10 screens (the Steam Deck's 1280x800, handhelds and laptops) +# 16:10 screens (the Steam Deck's 1280x800, handhelds and laptops) and 3:2 screens (Surface and Framework laptops and +# tablets) ASPECT_SIZES = ('2560x1080', '3440x1440', '3840x1600', '5120x2160', '3840x1080', '5120x1440', - '1280x800', '1680x1050', '1920x1200', '2560x1600') + '1280x800', '1680x1050', '1920x1200', '2560x1600', + '1920x1280', '2160x1440', '2256x1504', '2880x1920', '3000x2000') class Prepare(Step): diff --git a/runtime/ui/menu.cpp b/runtime/ui/menu.cpp index d2a3ac39..c27ed223 100644 --- a/runtime/ui/menu.cpp +++ b/runtime/ui/menu.cpp @@ -491,13 +491,15 @@ static void row_window_size(void) { } // The game resolution (resolution.c): 16:9 sizes from its smallest, 1280x720 (for weak GPUs), up, the common 21:9 and -// 32:9 monitor sizes and the 16:10 screens of the Steam Deck, handhelds and laptops (the camera and the HUD follow +// 32:9 monitor sizes, the 16:10 screens of the Steam Deck, handhelds and laptops and the 3:2 screens of laptops and +// tablets (Surface, Framework; the camera and the HUD follow // another shape, resolution.c res_init; the installer lays the HUD out for each, installer/steps.py ASPECT_SIZES), and // the current value when it is another size. static void row_output_res(void) { static const char *const vals[] = {"1280x720", "1600x900", "1920x1080", "2560x1440", "3200x1800", "3840x2160", "2560x1080", "3440x1440", "3840x1600", "5120x2160", "3840x1080", "5120x1440", - "1280x800", "1680x1050", "1920x1200", "2560x1600"}; + "1280x800", "1680x1050", "1920x1200", "2560x1600", + "1920x1280", "2160x1440", "2256x1504", "2880x1920", "3000x2000"}; enum { N = sizeof vals / sizeof *vals }; char shown[N][32]; const char *names[N]; diff --git a/runtime/ui_text.c b/runtime/ui_text.c index 03ca1186..cc39efa1 100644 --- a/runtime/ui_text.c +++ b/runtime/ui_text.c @@ -55,7 +55,7 @@ static const char *const text_en[UI_TEXT_COUNT] = { [UI_MENU_OUTPUT_RES] = "Game resolution", [UI_MENU_OUTPUT_RES_DESC] = "The size the game draws its picture and interface in. Above 1920 x 1080 the game needs " "more video memory and GPU time. A wider size (21:9) widens the camera's view and moves " - "the HUD to the screen's corners; a taller one (16:10, Steam Deck) moves it to the top " + "the HUD to the screen's corners; a taller one (16:10, 3:2) moves it to the top " "and bottom edges.", [UI_MENU_RENDER_SCALE] = "3D render scale", [UI_MENU_RENDER_SCALE_DESC] = "Size of the 3D scene relative to the game resolution; the game's FSR scales it to " @@ -483,7 +483,7 @@ static const char *const text_ru[UI_TEXT_COUNT] = { [UI_MENU_OUTPUT_RES] = "Разрешение игры", [UI_MENU_OUTPUT_RES_DESC] = "Размер, в котором игра рисует картинку и интерфейс. Выше 1920 × 1080 игре нужно больше " "видеопамяти и времени GPU. Более широкий размер (21:9) расширяет обзор камеры и " - "переносит интерфейс в углы экрана, более высокий (16:10, Steam Deck) переносит его к " + "переносит интерфейс в углы экрана, более высокий (16:10, 3:2) переносит его к " "верхнему и нижнему краям.", [UI_MENU_RENDER_SCALE] = "Масштаб 3D-отрисовки", [UI_MENU_RENDER_SCALE_DESC] = "Размер 3D-сцены относительно разрешения игры; FSR игры доводит её до этого размера. " @@ -945,7 +945,7 @@ static const char *const text_pt_br[UI_TEXT_COUNT] = { [UI_MENU_OUTPUT_RES] = "Resolução do jogo", [UI_MENU_OUTPUT_RES_DESC] = "O tamanho em que o jogo desenha a imagem e a interface. Acima de 1920 x 1080 o jogo " "precisa de mais memória de vídeo e tempo de GPU. Um tamanho mais largo (21:9) amplia a " - "visão da câmera e leva o HUD para os cantos da tela; um mais alto (16:10, Steam Deck) " + "visão da câmera e leva o HUD para os cantos da tela; um mais alto (16:10, 3:2) " "leva-o para as bordas de cima e de baixo.", [UI_MENU_RENDER_SCALE] = "Escala da renderização 3D", [UI_MENU_RENDER_SCALE_DESC] = "Tamanho da cena 3D em relação à resolução do jogo; o FSR do jogo a amplia até esse " @@ -1419,7 +1419,7 @@ static const char *const text_zh_hans[UI_TEXT_COUNT] = { [UI_MENU_OUTPUT_RES_DESC] = "游戏绘制画面和界面的尺寸。" "高于 1920 x 1080 会占用更多显存和 GPU 时间。" "更宽的尺寸(21:9)会扩大视野,并把界面移到屏幕四角;" - "更高的尺寸(16:10、Steam Deck)则移到上下边缘。", + "更高的尺寸(16:10、3:2)则移到上下边缘。", [UI_MENU_RENDER_SCALE] = "3D 渲染比例", [UI_MENU_RENDER_SCALE_DESC] = "3D 场景相对于游戏分辨率的尺寸;" "游戏的 FSR 会将其缩放到该尺寸。" diff --git a/totk.ini.example b/totk.ini.example index e22dbbee..6360fb3c 100644 --- a/totk.ini.example +++ b/totk.ini.example @@ -136,8 +136,9 @@ # Game resolution: the size the game draws its picture and interface in (1280x720 to 7680x4320). Above 1920x1080 the # game's texture heap and memory pool grow with it. Another shape than 16:9, such as 3440x1440 on a 21:9 monitor or # the Steam Deck's 1280x800 (16:10), gives the camera's view that shape and lays the HUD out for it. The installer -# prepares the UI layout for ten sizes: 2560x1080, 3440x1440, 3840x1600, 5120x2160 (21:9), 3840x1080, 5120x1440 (32:9), -# 1280x800, 1680x1050, 1920x1200 and 2560x1600 (16:10). Any other size +# prepares the UI layout for fifteen sizes: 2560x1080, 3440x1440, 3840x1600, 5120x2160 (21:9), 3840x1080, 5120x1440 +# (32:9), 1280x800, 1680x1050, 1920x1200, 2560x1600 (16:10), 1920x1280, 2160x1440, 2256x1504, 2880x1920 and 3000x2000 +# (3:2). Any other size # gets the camera's view but a 16:9 HUD, stretched over the picture, unless you build its layout with # tools/make_romfs_patches.py --aspect WxH. Read at start. # output_res = 1920x1080