Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-26 23:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #608 from ggrtk/aspect-ratio-setting

Browse source 
Settings: Add 8:7 DAR and 1:1 PAR modes
This commit is contained in:
Connor McLaughlin 2020-07-14 01:25:39 +10:00 committed by GitHub
parent 5b5c7f200d 91f51c2833
commit 9a2f222da4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/host_display.cpp
View file

@ -61,6 +61,7 @@ void HostDisplay::CalculateDrawRect(s32 window_width, s32 window_height, s32* ou
s32* out_height, s32* out_left_padding, s32* out_top_padding, float* out_scale, s32* out_height, s32* out_left_padding, s32* out_top_padding, float* out_scale,
float* out_y_scale, bool apply_aspect_ratio) const float* out_y_scale, bool apply_aspect_ratio) const
{ {
apply_aspect_ratio = (m_display_aspect_ratio > 0) ? apply_aspect_ratio : false;
const float y_scale = const float y_scale =
apply_aspect_ratio ? apply_aspect_ratio ?
((static_cast<float>(m_display_width) / static_cast<float>(m_display_height)) / m_display_aspect_ratio) : ((static_cast<float>(m_display_width) / static_cast<float>(m_display_height)) / m_display_aspect_ratio) :
@ -263,6 +264,8 @@ bool HostDisplay::WriteDisplayTextureToFile(const char* filename, bool full_reso
if (!m_display_texture_handle) if (!m_display_texture_handle)
return false; return false;
apply_aspect_ratio = (m_display_aspect_ratio > 0) ? apply_aspect_ratio : false;
s32 resize_width = 0; s32 resize_width = 0;
s32 resize_height = 0; s32 resize_height = 0;
if (apply_aspect_ratio && full_resolution) if (apply_aspect_ratio && full_resolution)

6
src/core/settings.cpp
View file

@ -437,8 +437,10 @@ const char* Settings::GetDisplayCropModeDisplayName(DisplayCropMode crop_mode)
return s_display_crop_mode_display_names[static_cast<int>(crop_mode)]; return s_display_crop_mode_display_names[static_cast<int>(crop_mode)];
} }
static std::array<const char*, 4> s_display_aspect_ratio_names = {{"4:3", "16:9", "2:1 (VRAM 1:1)", "1:1"}}; static std::array<const char*, 6> s_display_aspect_ratio_names =
static constexpr std::array<float, 4> s_display_aspect_ratio_values = {{4.0f / 3.0f, 16.0f / 9.0f, 2.0f / 1.0f, 1.0f}}; {{"4:3", "16:9", "8:7", "2:1 (VRAM 1:1)", "1:1", "PAR 1:1"}};
static constexpr std::array<float, 6> s_display_aspect_ratio_values =
{{4.0f / 3.0f, 16.0f / 9.0f, 8.0f / 7.0f, 2.0f / 1.0f, 1.0f, -1.0f}};
std::optional<DisplayAspectRatio> Settings::ParseDisplayAspectRatio(const char* str) std::optional<DisplayAspectRatio> Settings::ParseDisplayAspectRatio(const char* str)
{ {

2
src/core/types.h
View file

@ -71,8 +71,10 @@ enum class DisplayAspectRatio : u8
{ {
R4_3, R4_3,
R16_9, R16_9,
R8_7,
R2_1, R2_1,
R1_1, R1_1,
PAR1_1,
Count Count
}; };

2
src/duckstation-sdl/sdl_host_interface.cpp
View file

@ -1225,7 +1225,7 @@ void SDLHostInterface::DrawSettingsWindow()
ImGui::SameLine(indent); ImGui::SameLine(indent);
int display_aspect_ratio = static_cast<int>(m_settings_copy.display_aspect_ratio); int display_aspect_ratio = static_cast<int>(m_settings_copy.display_aspect_ratio);
if (ImGui::Combo( if (ImGui::Combo(
"##display_pixel_aspect_ratio", &display_aspect_ratio, "##display_aspect_ratio", &display_aspect_ratio,
[](void*, int index, const char** out_text) { [](void*, int index, const char** out_text) {
*out_text = Settings::GetDisplayAspectRatioName(static_cast<DisplayAspectRatio>(index)); *out_text = Settings::GetDisplayAspectRatioName(static_cast<DisplayAspectRatio>(index));
return true; return true;