Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port "Advanced Resolution" editor window from Shipwright #595

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from

Conversation

sheepytina
Copy link
Contributor

@sheepytina sheepytina commented May 29, 2024

Adds an editor window for advanced resolution controls. Based on HarbourMasters/Shipwright#3130

I will need some assistance in making this match 2ship UI style.

Build Artifacts

Copy files from Shipwright.
Bare minimum UIWidgets fixes to successfully build.
Add window and button.
Update CVar names to match current project.
And some fixes.
Typo fixes.
Mirror MSAA slider with other PR.
Formatting.
TODOs squashed. Other TODOs added for the remaining region-based disable logic.
@garrettjoecox garrettjoecox added the enhancement New feature or request label Jun 2, 2024
@sheepytina sheepytina marked this pull request as ready for review June 3, 2024 05:23
@garrettjoecox garrettjoecox mentioned this pull request Jun 4, 2024
31 tasks
mm/2s2h/BenGui/BenMenuBar.cpp Outdated Show resolved Hide resolved
mm/2s2h/Enhancements/ResolutionEditor/ResolutionEditor.cpp Outdated Show resolved Hide resolved
mm/2s2h/Enhancements/ResolutionEditor/ResolutionEditor.cpp Outdated Show resolved Hide resolved
mm/2s2h/Enhancements/ResolutionEditor/ResolutionEditor.cpp Outdated Show resolved Hide resolved
Comment on lines +365 to +374
if (CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IgnoreAspectCorrection", 0)) {
// This setting is intentionally not exposed on PC platforms,
// but may be accidentally activated for varying reasons.
// Having this button should hopefully prevent support headaches.
ImGui::TextColored(messageColor[MESSAGE_QUESTION], ICON_FA_QUESTION_CIRCLE
" If the image is stretched and you don't know why, click this.");
if (UIWidgets::Button("Click to reenable aspect correction.")) {
CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IgnoreAspectCorrection", 0);
CVarSave();
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we just force set the variable rather that giving them the button?

mckinlee pushed a commit to mckinlee/2ship2harkinian that referenced this pull request Sep 23, 2024
@Archez
Copy link
Contributor

Archez commented Oct 7, 2024

To give an update regarding this PR: outside of prepping this window for the new Modern Menu and tweaking some of the UI widgets, this PR will be blocked until a fix with LUS is made to improve framebuffer clear handling.

Currently, the "black bars" regions will retain any previous frame buffer data in those areas, causing a strobing effect between the swap buffers. The LUS issue is not caused by this PR, just calling out that this PR will expose this bad behavior as it is currently.

@garrettjoecox garrettjoecox mentioned this pull request Nov 10, 2024
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
do not merge enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants