Add 4:3 aspect ratio and address feedback
This commit is contained in:
parent
20dc2e3622
commit
c3d0a0d627
|
@ -28,8 +28,8 @@ FramebufferLayout DefaultFrameLayout(u32 width, u32 height) {
|
||||||
FramebufferLayout res{width, height};
|
FramebufferLayout res{width, height};
|
||||||
|
|
||||||
const float window_aspect_ratio = static_cast<float>(height) / width;
|
const float window_aspect_ratio = static_cast<float>(height) / width;
|
||||||
float emulation_aspect_ratio = EmulationAspectRatio(
|
const float emulation_aspect_ratio = EmulationAspectRatio(
|
||||||
static_cast<Aspect>(Settings::values.aspect_ratio), window_aspect_ratio);
|
static_cast<AspectRatio>(Settings::values.aspect_ratio), window_aspect_ratio);
|
||||||
|
|
||||||
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);
|
||||||
|
@ -58,13 +58,15 @@ FramebufferLayout FrameLayoutFromResolutionScale(u32 res_scale) {
|
||||||
return DefaultFrameLayout(width, height);
|
return DefaultFrameLayout(width, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
float EmulationAspectRatio(Aspect aspect, float window_aspect_ratio) {
|
float EmulationAspectRatio(AspectRatio aspect, float window_aspect_ratio) {
|
||||||
switch (aspect) {
|
switch (aspect) {
|
||||||
case Aspect::Default:
|
case AspectRatio::Default:
|
||||||
return static_cast<float>(ScreenUndocked::Height) / ScreenUndocked::Width;
|
return static_cast<float>(ScreenUndocked::Height) / ScreenUndocked::Width;
|
||||||
case Aspect::Aspect21by9:
|
case AspectRatio::R4_3:
|
||||||
|
return 3.0f / 4.0f;
|
||||||
|
case AspectRatio::R21_9:
|
||||||
return 9.0f / 21.0f;
|
return 9.0f / 21.0f;
|
||||||
case Aspect::StretchToWindow:
|
case AspectRatio::StretchToWindow:
|
||||||
return window_aspect_ratio;
|
return window_aspect_ratio;
|
||||||
default:
|
default:
|
||||||
return static_cast<float>(ScreenUndocked::Height) / ScreenUndocked::Width;
|
return static_cast<float>(ScreenUndocked::Height) / ScreenUndocked::Width;
|
||||||
|
|
|
@ -18,9 +18,10 @@ enum ScreenDocked : u32 {
|
||||||
HeightDocked = 1080,
|
HeightDocked = 1080,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum class Aspect {
|
enum class AspectRatio {
|
||||||
Default,
|
Default,
|
||||||
Aspect21by9,
|
R4_3,
|
||||||
|
R21_9,
|
||||||
StretchToWindow,
|
StretchToWindow,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -56,10 +57,10 @@ FramebufferLayout FrameLayoutFromResolutionScale(u32 res_scale);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convenience method to determine emulation aspect ratio
|
* Convenience method to determine emulation aspect ratio
|
||||||
* @param aspect Represents the index of aspect ratio in Settings::values.aspect_ratio
|
* @param aspect Represents the index of aspect ratio stored in Settings::values.aspect_ratio
|
||||||
* @param window_aspect_ratio Current window aspect ratio
|
* @param window_aspect_ratio Current window aspect ratio
|
||||||
* @return Emulation render window aspect ratio
|
* @return Emulation render window aspect ratio
|
||||||
*/
|
*/
|
||||||
float EmulationAspectRatio(Aspect aspect, float window_aspect_ratio);
|
float EmulationAspectRatio(AspectRatio aspect, float window_aspect_ratio);
|
||||||
|
|
||||||
} // namespace Layout
|
} // namespace Layout
|
||||||
|
|
|
@ -154,6 +154,11 @@
|
||||||
<string>Default (16:9)</string>
|
<string>Default (16:9)</string>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>Force 4:3</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Force 21:9</string>
|
<string>Force 21:9</string>
|
||||||
|
|
|
@ -123,7 +123,7 @@ use_shader_jit =
|
||||||
resolution_factor =
|
resolution_factor =
|
||||||
|
|
||||||
# Aspect ratio
|
# Aspect ratio
|
||||||
# 0: Default (16:9), 1: Force 21:9, 2: Stretch to Window
|
# 0: Default (16:9), 1: Force 4:3, 2: Force 21:9, 3: Stretch to Window
|
||||||
aspect_ratio =
|
aspect_ratio =
|
||||||
|
|
||||||
# Whether to enable V-Sync (caps the framerate at 60FPS) or not.
|
# Whether to enable V-Sync (caps the framerate at 60FPS) or not.
|
||||||
|
|
|
@ -27,7 +27,7 @@ use_shader_jit =
|
||||||
resolution_factor =
|
resolution_factor =
|
||||||
|
|
||||||
# Aspect ratio
|
# Aspect ratio
|
||||||
# 0: Default (16:9), 1: Force 21:9, 2: Stretch to Window
|
# 0: Default (16:9), 1: Force 4:3, 2: Force 21:9, 3: Stretch to Window
|
||||||
aspect_ratio =
|
aspect_ratio =
|
||||||
|
|
||||||
# Whether to enable V-Sync (caps the framerate at 60FPS) or not.
|
# Whether to enable V-Sync (caps the framerate at 60FPS) or not.
|
||||||
|
|
Reference in New Issue