Fix scaling on HiDPI screens with Wayland #171
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The game expects getWidth and getHeight to return framebuffer coordinates rather than screen-space coordinates (as shown by the calls to glViewport). This was broken on scaling factors greater than 1 but also masked by GL_SCALE_FRAMEBUFFER. Additionally, the game's mouse code *also* expects framebuffer coordinates to be returned. This fixes that by converting to and from screen-space during calls to mouse code. Disable GLFW_COCOA_RETINA_FRAMEBUFFER for now, it seems to not play nice on non-MacOS systems. At least for me it makes the title screen larger than the window when playing in fullscreen
I think their framebuffer implementation is buggy? I don't really want to touch this since I don't have a Mac to test on I think their GPUs are weak anyways and probably can't handle rendering GTNH at 260 DPI or whatever Retina does
|
Decided to mark this as a draft until it can be tested on Mac/with controllers/etc I think I also need to put in a fix to properly set the window size. Right now it's setting the window size rather than the framebuffer size, I think the intended behavior is to set the framebuffer -- EDIT -- upon further inspection, it appears this behavior matches that of modern vanilla, even if not matching up perfectly with X. At worst it's a minor annoyance, so I'll leave it be. |
kappa-maintainer
added a commit
to CleanroomMC/Cleanroom
that referenced
this pull request
Aug 26, 2024
|
Tested and appears to work as normal on Mac. Definitely improved Linux experience. |
|
I think there might be a bug in the implementation of |
Previous implementation was broken on hidpi platforms where the size of the framebuffer and the size of the window correlate 1:1. This manifested in the mouse code thinking the mouse was in a different location than it actually was. New implementation explicitly calculates the ratio between the framebuffer size and the window size, rather than relying on glfwGetWindowContentScale. Remove GLFW_SCALE_FRAMEBUFFER/GLFW_COCOA_RETINA_FRAMEBUFFER, it appears that it is not needed.
|
Ready for review again |
eigenraven
approved these changes
Sep 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The game expects
getWidthandgetHeightto return framebuffer coordinates rather than screen-space coordinates (as shown by the calls toglViewport). This was broken on scaling factors greater than 1 but also masked byGL_SCALE_FRAMEBUFFER.Additionally, the game's mouse code also expects framebuffer coordinates to be returned. This fixes that by converting to and from screen-space during calls to mouse code.
Disable
GLFW_COCOA_RETINA_FRAMEBUFFERfor now, it seems to not play nice on non-MacOS systems. At least for me it makes the title screen much larger than the window when playing in fullscreen.Screenshot before the change:
Screenshot after the change:
Before is marginally fuzzier (and obviously doesn't work with the title screen)