WIP: fix(widescreen): the HUD keeps 16:9 on screens narrower than 16:9 (4:3, 16:10, 5:4) #2015
Draft
NotRexed wants to merge 1 commit from
fix/narrow-screen-hud into main
pull from: fix/narrow-screen-hud
merge into: MagicBeanDev:main
MagicBeanDev:main
MagicBeanDev:github/pr/2893
MagicBeanDev:github/pr/2890
MagicBeanDev:github/pr/2887
MagicBeanDev:github/pr/2878
MagicBeanDev:github/pr/2875
MagicBeanDev:github/pr/2874
MagicBeanDev:github/pr/2873
MagicBeanDev:github/pr/2871
MagicBeanDev:github/pr/2756
MagicBeanDev:github/pr/2897
MagicBeanDev:github/pr/2896
MagicBeanDev:github/pr/2718
MagicBeanDev:github/pr/2842
MagicBeanDev:github/pr/2691
MagicBeanDev:github/pr/2895
MagicBeanDev:github/pr/2743
MagicBeanDev:github/pr/2765
MagicBeanDev:github/pr/2708
MagicBeanDev:github/pr/2732
MagicBeanDev:github/pr/2755
MagicBeanDev:github/pr/2817
MagicBeanDev:github/pr/2876
MagicBeanDev:release-please--branches--main
MagicBeanDev:release-please--branches--main--release-notes
MagicBeanDev:github/pr/2778
MagicBeanDev:github/pr/2888
MagicBeanDev:github/pr/2866
MagicBeanDev:github/pr/2877
MagicBeanDev:github/pr/2800
MagicBeanDev:github/pr/2829
MagicBeanDev:github/pr/2850
MagicBeanDev:github/pr/2889
MagicBeanDev:github/pr/2882
MagicBeanDev:github/pr/2860
MagicBeanDev:github/pr/2849
MagicBeanDev:github/pr/2886
MagicBeanDev:github/pr/2794
MagicBeanDev:github/pr/2840
MagicBeanDev:github/pr/2830
MagicBeanDev:github/pr/2834
MagicBeanDev:github/pr/2719
MagicBeanDev:github/pr/2742
MagicBeanDev:github/pr/2741
MagicBeanDev:github/pr/2820
MagicBeanDev:github/pr/2771
MagicBeanDev:github/pr/2859
MagicBeanDev:github/pr/2858
MagicBeanDev:github/pr/2823
MagicBeanDev:github/pr/2757
MagicBeanDev:github/pr/2769
MagicBeanDev:github/pr/2844
MagicBeanDev:github/pr/2843
MagicBeanDev:github/pr/2673
MagicBeanDev:github/pr/2855
MagicBeanDev:github/pr/2739
MagicBeanDev:github/pr/2807
MagicBeanDev:github/pr/2851
MagicBeanDev:github/pr/2789
MagicBeanDev:github/pr/2814
MagicBeanDev:github/pr/2818
MagicBeanDev:github/pr/2774
MagicBeanDev:github/pr/2772
MagicBeanDev:github/pr/2750
MagicBeanDev:github/pr/2786
MagicBeanDev:github/pr/2785
MagicBeanDev:github/pr/2782
MagicBeanDev:github/pr/2779
MagicBeanDev:github/pr/2775
MagicBeanDev:github/pr/2706
MagicBeanDev:github/pr/2766
MagicBeanDev:github/pr/2747
MagicBeanDev:github/pr/2759
MagicBeanDev:github/pr/2745
MagicBeanDev:github/pr/2740
MagicBeanDev:github/pr/2733
MagicBeanDev:github/pr/2725
MagicBeanDev:github/pr/2727
MagicBeanDev:github/pr/2728
MagicBeanDev:github/pr/2729
MagicBeanDev:github/pr/2721
MagicBeanDev:github/pr/2722
MagicBeanDev:github/pr/2715
MagicBeanDev:github/pr/2714
MagicBeanDev:github/pr/2707
MagicBeanDev:github/pr/2703
MagicBeanDev:github/pr/2705
MagicBeanDev:github/pr/2697
MagicBeanDev:github/pr/2679
MagicBeanDev:github/pr/2676
MagicBeanDev:github/pr/2669
MagicBeanDev:docs/what-hookshot-connects-to
MagicBeanDev:fix/hdr-encode-test
MagicBeanDev:fix/main-tests
MagicBeanDev:fix/play-cache-files
MagicBeanDev:perf/game-barrier-order
MagicBeanDev:feat/heap-lazy
MagicBeanDev:feat/texture-detail
MagicBeanDev:perf/astc-opaque-bc1
MagicBeanDev:fix/fs-dir-lock
MagicBeanDev:fix/framegen-native-kept
MagicBeanDev:fix/update-no-downgrade
MagicBeanDev:port/k10-gcn-f16-mirrors
MagicBeanDev:fix/framegen-mult-cap
MagicBeanDev:chore/release-as-2.1.1
MagicBeanDev:perf/pcache-load-switch
MagicBeanDev:fix/prepare-progress-log
MagicBeanDev:fix/update-closes-stale-game
MagicBeanDev:fix/hdr-scaled-sampled
MagicBeanDev:perf/first-start-preset
MagicBeanDev:perf/zero-upload
MagicBeanDev:fix/vcore-escape-2s
MagicBeanDev:test/fake-gh-atomic
MagicBeanDev:perf/batch-idle-flush
MagicBeanDev:test/finish-stub-a
MagicBeanDev:chore/record-2.1.0
MagicBeanDev:fix/main-red-tests
MagicBeanDev:fix/test-display-startup-driver-cache
MagicBeanDev:feat/mesh-shader-mode
MagicBeanDev:fix/menu-probes-at-startup
MagicBeanDev:fix/fps-counter-classic
MagicBeanDev:fix/test-log-batch-flake
MagicBeanDev:ci/prereleases
MagicBeanDev:release/v2.0.15
MagicBeanDev:hotfix/v2.0.15
MagicBeanDev:fix/present-ahead-replay
MagicBeanDev:release/v2.0.13
MagicBeanDev:fix/bracket-paths-2013
MagicBeanDev:fix/hdr-overlays-2013
MagicBeanDev:fix/fps-counter-scale-2013
MagicBeanDev:fix/stick-seen-at-rest
MagicBeanDev:hotfix/menu-fits-screen
MagicBeanDev:fix/f1-always-opens-menu
MagicBeanDev:fix/ini-keep-lines
MagicBeanDev:claude/cranky-pike-7cf247
MagicBeanDev:perf/texture-answer-flat
MagicBeanDev:fix/stamp-test-modules
MagicBeanDev:fix/appimage-fonts
MagicBeanDev:fix/display-awake
MagicBeanDev:release/v2.0.12
MagicBeanDev:fix/discord-windows
MagicBeanDev:rc/v2.0.12-tests
MagicBeanDev:fix/dlss-keep-feature
MagicBeanDev:rc/v2.0.12
MagicBeanDev:button-icons
No reviewers
Labels
Clear labels
accessibility
Barrier affecting people with disabilities
autorelease: pending
autorelease: tagged
bug
Something isn't working
dependencies
Pull requests that update a dependency file
documentation
Improvements or additions to documentation
duplicate
This issue or pull request already exists
enhancement
New feature or request
github_actions
Pull requests that update GitHub Actions code
good first issue
Good for newcomers
help wanted
Extra attention is needed
invalid
This doesn't seem right
question
Further information is requested
testing wanted
wontfix
This will not be worked on
No labels
accessibility
autorelease: pending
autorelease: tagged
bug
dependencies
documentation
duplicate
enhancement
github_actions
good first issue
help wanted
invalid
question
testing wanted
wontfix
Milestone
Clear milestone
No items
No milestone
Assignees
Clear assignees
No assignees
1 participant
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".
No due date set.
Dependencies
No dependencies set
Reference
MagicBeanDev/Hookshot!2015
Loading…
Reference in a new issue
No description provided.
Delete branch "fix/narrow-screen-hud"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
The one part of mimic-wasm's fork (https://github.com/mimic-wasm/Hookshot) taken in, credited to them in the commit.
Before: with Ultrawide on, a screen wider than 16:9 already squeezed the HUD horizontally into the middle 16:9 (
hos_wide_squeeze). A narrower screen (4:3, 16:10, 5:4) gave the HUD the whole width at the full height, so it came out stretched.Now:
hos_wide_vertical_squeeze(the screen ratio over 16:9, and 1.0 on wider screens) scales the HUD's rows vertically on narrower screens (nx2/oot_wide.py's HUD patch). The tests are updated (test_widescreen_shapes.py), andtest_widescreen_hud.pyis new.Left out of the fork, on purpose:
loader.bat, and ahookshot_env.txtwithRX_VK_NOOPT=1.Draft until it's checked in game in a 4:3 and a 16:10 window: the HUD should be its normal shape, centred, with nothing cut off. Wider screens shouldn't change (their vertical scale is 1.0).
🤖 Generated with Claude Code
Thanks for taking on the narrow-screen HUD stretch. I've been playing with two related ideas on top of v2.0.14 and wanted to check whether either is welcome before sending anything.
1. HUD at the screen edges (opt-in). A Graphics row, HUD position: Centred 16:9 / Screen edges. With Screen edges, the gameplay HUD (hearts and magic, minimap, button guide) docks to the real corners on wide and tall screens; menus, dialogue, fades and movies keep their current placement. It follows live window resizes, and each element keeps its size.
2. Vert+ on narrow screens (opt-in). Instead of cropping the sides, a 4:3 or taller window keeps the 16:9 horizontal view and shows more above and below, with the camera's culling angle adjusted to match. Left to right: 16:9, 4:3, 2448x1848.
Would you want either as a small, separate follow-up once #2015 lands? I'd rebase just the part you want onto main and keep it off by default. Not suggesting either goes into this PR.
Tested on Linux, RX 7900 XT (RADV), in Kokiri Forest at 1920x1080, 2560x1080, 3440x1440, 1600x1200 and 2448x1848. Horse gauge, item wheel and dialogue placement aren't checked yet. Work in progress lives on my fork (
korri-v2014-fill,korri-v2014-hud-edges).There is one bug in the narrow-screen branch of the HUD patch in nx2/oot_wide.py. The instruction at this patch site (0xad401041) is
ldp q1, q4, [x2]. So the projection's x row is q1, and its y row is all of q4, with m11 in lane 1. The new branch copies 16 bytes starting at(uint8_t *)c->vreg[4] + 4. Since vreg isuint64_t[32][2], that scales lanes 1-3 of q4 plus lane 0 of q5, a register this instruction never loaded, and leaves lane 0 of q4 alone. It should scale c->vreg[4] from offset 0, the same way the wide branch scales all of c->vreg[1].tests/test_widescreen_hud.py writes its y row at the same
+ 4offset, so it can't catch this. Putting y at c->vreg[4] and a sentinel value in c->vreg[5] would.The branch also conflicts with #2120 in host/hos_main.c and tests/test_widescreen_shapes.py. The Windows failure is tests/test_log_batch.py's timing check and doesn't look related.