eden-emu
/
eden
mirror of https://git.eden-emu.dev/eden-emu/eden.git
1
0
Fork 0
Code Releases Wiki Activity
Browse Source

[qt] fix aspect ratio enum mismatch for framebuffer 

Signed-off-by: lizzie <lizzie@eden-emu.dev>
pull/2792/head
lizzie 5 months ago
parent
54d6283ac3
commit
5bc910e75f
No known key found for this signature in database GPG Key ID: 287378CADCAB13
4 changed files with 44 additions and 86 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 79
      src/core/frontend/framebuffer_layout.cpp
  2. 37
      src/core/frontend/framebuffer_layout.h
  3. 4
      src/yuzu/main.cpp
  4. 10
      src/yuzu_cmd/yuzu.cpp

79
src/core/frontend/framebuffer_layout.cpp
View File

@ -14,69 +14,54 @@
namespace Layout {
// Finds the largest size subrectangle contained in window area that is confined to the aspect ratio
template <class T>
static Common::Rectangle<T> MaxRectangle(Common::Rectangle<T> window_area,
float screen_aspect_ratio) {
const float scale = (std::min)(static_cast<float>(window_area.GetWidth()),
static_cast<float>(window_area.GetHeight()) / screen_aspect_ratio);
return Common::Rectangle<T>{0, 0, static_cast<T>(std::round(scale)),
static_cast<T>(std::round(scale * screen_aspect_ratio))};
static Common::Rectangle<u32> MaxRectangle(Common::Rectangle<u32> window_area, float screen_aspect_ratio) noexcept {
const float scale = (std::min)(float(window_area.GetWidth()), float(window_area.GetHeight()) / screen_aspect_ratio);
return Common::Rectangle<u32>{0, 0, u32(std::round(scale)), u32(std::round(scale * screen_aspect_ratio))};
}
FramebufferLayout DefaultFrameLayout(u32 width, u32 height) {
ASSERT(width > 0);
ASSERT(height > 0);
/// @brief Factory method for constructing a default FramebufferLayout
/// @param width Window framebuffer width in pixels
/// @param height Window framebuffer height in pixels
/// @return Newly created FramebufferLayout object with default screen regions initialized
FramebufferLayout DefaultFrameLayout(u32 width, u32 height) noexcept {
ASSERT(width > 0 && height > 0);
auto const window_aspect_ratio = float(height) / float(width);
auto const emulation_aspect_ratio = EmulationAspectRatio(Settings::values.aspect_ratio.GetValue(), window_aspect_ratio);
Common::Rectangle<u32> const screen_window_area{0, 0, width, height};
auto screen = MaxRectangle(screen_window_area, emulation_aspect_ratio);
if (window_aspect_ratio < emulation_aspect_ratio) {
screen = screen.TranslateX((screen_window_area.GetWidth() - screen.GetWidth()) / 2);
} else {
screen = screen.TranslateY((height - screen.GetHeight()) / 2);
}
// The drawing code needs at least somewhat valid values for both screens
// so just calculate them both even if the other isn't showing.
FramebufferLayout res{
return FramebufferLayout{
.width = width,
.height = height,
.screen = {},
.screen = screen,
.is_srgb = false,
};
const float window_aspect_ratio = static_cast<float>(height) / static_cast<float>(width);
const float emulation_aspect_ratio = EmulationAspectRatio(
static_cast<AspectRatio>(Settings::values.aspect_ratio.GetValue()), window_aspect_ratio);
const Common::Rectangle<u32> screen_window_area{0, 0, width, height};
Common::Rectangle<u32> screen = MaxRectangle(screen_window_area, emulation_aspect_ratio);
if (window_aspect_ratio < emulation_aspect_ratio) {
screen = screen.TranslateX((screen_window_area.GetWidth() - screen.GetWidth()) / 2);
} else {
screen = screen.TranslateY((height - screen.GetHeight()) / 2);
}
res.screen = screen;
return res;
}
FramebufferLayout FrameLayoutFromResolutionScale(f32 res_scale) {
const bool is_docked = Settings::IsDockedMode();
const u32 screen_width = is_docked ? ScreenDocked::Width : ScreenUndocked::Width;
const u32 screen_height = is_docked ? ScreenDocked::Height : ScreenUndocked::Height;
const u32 width = static_cast<u32>(static_cast<f32>(screen_width) * res_scale);
const u32 height = static_cast<u32>(static_cast<f32>(screen_height) * res_scale);
return DefaultFrameLayout(width, height);
}
float EmulationAspectRatio(AspectRatio aspect, float window_aspect_ratio) {
/// @brief Convenience method to determine emulation aspect ratio
/// @param aspect Represents the index of aspect ratio stored in Settings::values.aspect_ratio
/// @param window_aspect_ratio Current window aspect ratio
/// @return Emulation render window aspect ratio
float EmulationAspectRatio(Settings::AspectRatio aspect, float window_aspect_ratio) noexcept {
switch (aspect) {
case AspectRatio::Default:
return static_cast<float>(ScreenUndocked::Height) / ScreenUndocked::Width;
case AspectRatio::R4_3:
case Settings::AspectRatio::R16_9:
return 9.0f / 16.0f;
case Settings::AspectRatio::R4_3:
return 3.0f / 4.0f;
case AspectRatio::R21_9:
case Settings::AspectRatio::R21_9:
return 9.0f / 21.0f;
case AspectRatio::R16_10:
case Settings::AspectRatio::R16_10:
return 10.0f / 16.0f;
case AspectRatio::StretchToWindow:
case Settings::AspectRatio::Stretch:
return window_aspect_ratio;
default:
return static_cast<float>(ScreenUndocked::Height) / ScreenUndocked::Width;
return float(ScreenUndocked::Height) / ScreenUndocked::Width;
}
}

37
src/core/frontend/framebuffer_layout.h
View File

@ -6,6 +6,10 @@
#include "common/common_types.h"
#include "common/math_util.h"
namespace Settings {
enum class AspectRatio : u32;
}
namespace Layout {
namespace MinimumSize {
@ -23,15 +27,7 @@ constexpr u32 Width = 1920;
constexpr u32 Height = 1080;
} // namespace ScreenDocked
enum class AspectRatio {
Default,
R4_3,
R21_9,
R16_10,
StretchToWindow,
};
/// Describes the layout of the window framebuffer
/// @brief Describes the layout of the window framebuffer
struct FramebufferLayout {
u32 width{ScreenUndocked::Width};
u32 height{ScreenUndocked::Height};
@ -39,26 +35,7 @@ struct FramebufferLayout {
bool is_srgb{};
};
/**
* Factory method for constructing a default FramebufferLayout
* @param width Window framebuffer width in pixels
* @param height Window framebuffer height in pixels
* @return Newly created FramebufferLayout object with default screen regions initialized
*/
FramebufferLayout DefaultFrameLayout(u32 width, u32 height);
/**
* Convenience method to get frame layout by resolution scale
* @param res_scale resolution scale factor
*/
FramebufferLayout FrameLayoutFromResolutionScale(f32 res_scale);
/**
* Convenience method to determine emulation aspect ratio
* @param aspect Represents the index of aspect ratio stored in Settings::values.aspect_ratio
* @param window_aspect_ratio Current window aspect ratio
* @return Emulation render window aspect ratio
*/
float EmulationAspectRatio(AspectRatio aspect, float window_aspect_ratio);
FramebufferLayout DefaultFrameLayout(u32 width, u32 height) noexcept;
float EmulationAspectRatio(Settings::AspectRatio aspect, float window_aspect_ratio) noexcept;
} // namespace Layout

4
src/yuzu/main.cpp
View File

@ -3422,9 +3422,7 @@ void GMainWindow::ToggleWindowMode() {
}
void GMainWindow::ResetWindowSize(u32 width, u32 height) {
const auto aspect_ratio = Layout::EmulationAspectRatio(
static_cast<Layout::AspectRatio>(Settings::values.aspect_ratio.GetValue()),
static_cast<float>(height) / width);
const auto aspect_ratio = Layout::EmulationAspectRatio(Settings::values.aspect_ratio.GetValue(), float(height) / width);
if (!ui->action_Single_Window_Mode->isChecked()) {
render_window->resize(height / aspect_ratio, height);
} else {

10
src/yuzu_cmd/yuzu.cpp
View File

@ -235,9 +235,9 @@ int main(int argc, char** argv) {
while (optind < argc) {
int arg = getopt_long(argc, argv, "g:fhvp::c:u:d:", long_options, &option_index);
if (arg != -1) {
switch (static_cast<char>(arg)) {
switch (char(arg)) {
case 'd':
override_gdb_port = static_cast<uint16_t>(atoi(optarg));
override_gdb_port = uint16_t(atoi(optarg));
break;
case 'c':
config_path = optarg;
@ -249,11 +249,9 @@ int main(int argc, char** argv) {
case 'h':
PrintHelp(argv[0]);
return 0;
case 'g': {
const std::string str_arg(optarg);
filepath = str_arg;
case 'g':
filepath = std::string(optarg);
break;
}
case 'm': {
use_multiplayer = true;
const std::string str_arg(optarg);

Write Preview
Loading…
Cancel
Save