yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Address feedback

This commit is contained in:
Morph 2020-02-14 00:06:26 -05:00
parent 22f58cca5e
commit 20dc2e3622
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,22 +27,9 @@ FramebufferLayout DefaultFrameLayout(u32 width, u32 height) {
// so just calculate them both even if the other isn't showing. // so just calculate them both even if the other isn't showing.
FramebufferLayout res{width, height}; FramebufferLayout res{width, height};
const auto window_aspect_ratio = static_cast<float>(height) / width; const float window_aspect_ratio = static_cast<float>(height) / width;
float emulation_aspect_ratio; float emulation_aspect_ratio = EmulationAspectRatio(
static_cast<Aspect>(Settings::values.aspect_ratio), window_aspect_ratio);
switch (static_cast<Aspect>(Settings::values.aspect_ratio)) {
case Aspect::AspectDefault:
emulation_aspect_ratio = static_cast<float>(ScreenUndocked::Height) / ScreenUndocked::Width;
break;
case Aspect::Aspect21by9:
emulation_aspect_ratio = 9.f / 21;
break;
case Aspect::AspectStretch:
emulation_aspect_ratio = window_aspect_ratio;
break;
default:
emulation_aspect_ratio = static_cast<float>(ScreenUndocked::Height) / ScreenUndocked::Width;
}
const Common::Rectangle<u32> screen_window_area{0, 0, width, height}; const Common::Rectangle<u32> screen_window_area{0, 0, width, height};
Common::Rectangle<u32> screen = MaxRectangle(screen_window_area, emulation_aspect_ratio); Common::Rectangle<u32> screen = MaxRectangle(screen_window_area, emulation_aspect_ratio);
@ -71,4 +58,17 @@ FramebufferLayout FrameLayoutFromResolutionScale(u32 res_scale) {
return DefaultFrameLayout(width, height); return DefaultFrameLayout(width, height);
} }
float EmulationAspectRatio(Aspect aspect, float window_aspect_ratio) {
switch (aspect) {
case Aspect::Default:
return static_cast<float>(ScreenUndocked::Height) / ScreenUndocked::Width;
case Aspect::Aspect21by9:
return 9.0f / 21.0f;
case Aspect::StretchToWindow:
return window_aspect_ratio;
default:
return static_cast<float>(ScreenUndocked::Height) / ScreenUndocked::Width;
}
}
} // namespace Layout } // namespace Layout

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

@ -19,9 +19,9 @@ enum ScreenDocked : u32 {
}; };
enum class Aspect { enum class Aspect {
AspectDefault, Default,
Aspect21by9, Aspect21by9,
AspectStretch, StretchToWindow,
}; };
/// Describes the layout of the window framebuffer /// Describes the layout of the window framebuffer
@ -54,4 +54,12 @@ FramebufferLayout DefaultFrameLayout(u32 width, u32 height);
*/ */
FramebufferLayout FrameLayoutFromResolutionScale(u32 res_scale); FramebufferLayout FrameLayoutFromResolutionScale(u32 res_scale);
/**
* Convenience method to determine emulation aspect ratio
* @param aspect Represents the index of aspect ratio in Settings::values.aspect_ratio
* @param window_aspect_ratio Current window aspect ratio
* @return Emulation render window aspect ratio
*/
float EmulationAspectRatio(Aspect aspect, float window_aspect_ratio);
} // namespace Layout } // namespace Layout