Use enumeration instead of magic numbers

This commit is contained in:
Morph 2020-02-13 23:13:23 -05:00
parent 27e19f87c6
commit 22f58cca5e
2 changed files with 11 additions and 5 deletions

View file

@ -30,17 +30,17 @@ FramebufferLayout DefaultFrameLayout(u32 width, u32 height) {
const auto window_aspect_ratio = static_cast<float>(height) / width; const auto window_aspect_ratio = static_cast<float>(height) / width;
float emulation_aspect_ratio; float emulation_aspect_ratio;
switch (Settings::values.aspect_ratio) { switch (static_cast<Aspect>(Settings::values.aspect_ratio)) {
case 0: // 16:9 (Default) case Aspect::AspectDefault:
emulation_aspect_ratio = static_cast<float>(ScreenUndocked::Height) / ScreenUndocked::Width; emulation_aspect_ratio = static_cast<float>(ScreenUndocked::Height) / ScreenUndocked::Width;
break; break;
case 1: // 21:9 case Aspect::Aspect21by9:
emulation_aspect_ratio = 9.f / 21; emulation_aspect_ratio = 9.f / 21;
break; break;
case 2: // Stretch to Window case Aspect::AspectStretch:
emulation_aspect_ratio = window_aspect_ratio; emulation_aspect_ratio = window_aspect_ratio;
break; break;
default: // 16:9 default:
emulation_aspect_ratio = static_cast<float>(ScreenUndocked::Height) / ScreenUndocked::Width; emulation_aspect_ratio = static_cast<float>(ScreenUndocked::Height) / ScreenUndocked::Width;
} }

View file

@ -18,6 +18,12 @@ enum ScreenDocked : u32 {
HeightDocked = 1080, HeightDocked = 1080,
}; };
enum class Aspect {
AspectDefault,
Aspect21by9,
AspectStretch,
};
/// Describes the layout of the window framebuffer /// Describes the layout of the window framebuffer
struct FramebufferLayout { struct FramebufferLayout {
u32 width{ScreenUndocked::Width}; u32 width{ScreenUndocked::Width};