From 27960d8c2cfbe4188584f0186b56ea8806f9e223 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 15 Jan 2018 16:59:02 +0100 Subject: Update the internal resolution settings --- src/yuzu/configuration/configure_graphics.cpp | 30 -------------------- src/yuzu/configuration/configure_graphics.ui | 40 ++++----------------------- src/yuzu_cmd/default_ini.h | 4 +-- 3 files changed, 7 insertions(+), 67 deletions(-) (limited to 'src') diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index 5f91d5492..081819812 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp @@ -23,12 +23,6 @@ enum class Resolution : int { Scale2x, Scale3x, Scale4x, - Scale5x, - Scale6x, - Scale7x, - Scale8x, - Scale9x, - Scale10x, }; float ToResolutionFactor(Resolution option) { @@ -43,18 +37,6 @@ float ToResolutionFactor(Resolution option) { return 3.f; case Resolution::Scale4x: return 4.f; - case Resolution::Scale5x: - return 5.f; - case Resolution::Scale6x: - return 6.f; - case Resolution::Scale7x: - return 7.f; - case Resolution::Scale8x: - return 8.f; - case Resolution::Scale9x: - return 9.f; - case Resolution::Scale10x: - return 10.f; } return 0.f; } @@ -70,18 +52,6 @@ Resolution FromResolutionFactor(float factor) { return Resolution::Scale3x; } else if (factor == 4.f) { return Resolution::Scale4x; - } else if (factor == 5.f) { - return Resolution::Scale5x; - } else if (factor == 6.f) { - return Resolution::Scale6x; - } else if (factor == 7.f) { - return Resolution::Scale7x; - } else if (factor == 8.f) { - return Resolution::Scale8x; - } else if (factor == 9.f) { - return Resolution::Scale9x; - } else if (factor == 10.f) { - return Resolution::Scale10x; } return Resolution::Auto; } diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui index 489156805..366931a9a 100644 --- a/src/yuzu/configuration/configure_graphics.ui +++ b/src/yuzu/configuration/configure_graphics.ui @@ -34,7 +34,7 @@ - Internal Resolution: + Internal Resolution:(Currently does nothing.) @@ -47,52 +47,22 @@ - Native (400x240) + Native (1280x720) - 2x Native (800x480) + 2x Native (2560x1440) - 3x Native (1200x720) + 3x Native (3840x2160) - 4x Native (1600x960) - - - - - 5x Native (2000x1200) - - - - - 6x Native (2400x1440) - - - - - 7x Native (2800x1680) - - - - - 8x Native (3200x1920) - - - - - 9x Native (3600x2160) - - - - - 10x Native (4000x2400) + 4x Native (5120x2880) diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index e7941eceb..11ed1237a 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h @@ -81,8 +81,8 @@ use_hw_renderer = use_shader_jit = # Resolution scale factor -# 0: Auto (scales resolution to window size), 1: Native 3DS screen resolution, Otherwise a scale -# factor for the 3DS resolution +# 0: Auto (scales resolution to window size), 1: Native Switch screen resolution, Otherwise a scale +# factor for the Switch resolution resolution_factor = # Whether to enable V-Sync (caps the framerate at 60FPS) or not. -- cgit v1.2.3 From 58ee23f16d73e2284b656c93374f0f7add1d88bf Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 15 Jan 2018 17:15:10 +0100 Subject: Change default log level to info --- src/yuzu/configuration/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 4c713fcbc..047e347d1 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -86,7 +86,7 @@ void Config::ReadValues() { qt_config->endGroup(); qt_config->beginGroup("Miscellaneous"); - Settings::values.log_filter = qt_config->value("log_filter", "*:Trace").toString().toStdString(); + Settings::values.log_filter = qt_config->value("log_filter", "*:Info").toString().toStdString(); qt_config->endGroup(); qt_config->beginGroup("Debugging"); -- cgit v1.2.3 From 8d968780c19bed7fb260787c26ee908541c5934c Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 15 Jan 2018 17:55:16 +0100 Subject: Clang format --- src/yuzu/configuration/config.cpp | 13 ++++++++++--- src/yuzu/configuration/configure_graphics.cpp | 1 - 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 047e347d1..314fc2779 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -8,7 +8,6 @@ #include "yuzu/configuration/config.h" #include "yuzu/ui_settings.h" - Config::Config() { // TODO: Don't hardcode the path; let the frontend decide where to put the config files. qt_config_loc = FileUtil::GetUserPath(D_CONFIG_IDX) + "qt-config.ini"; @@ -25,10 +24,18 @@ const std::array Config::default_button const std::array, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{ { - Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right, Qt::Key_D, + Qt::Key_Up, + Qt::Key_Down, + Qt::Key_Left, + Qt::Key_Right, + Qt::Key_D, }, { - Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L, Qt::Key_D, + Qt::Key_I, + Qt::Key_K, + Qt::Key_J, + Qt::Key_L, + Qt::Key_D, }, }}; diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index 081819812..47b9b6e95 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp @@ -7,7 +7,6 @@ #include "ui_configure_graphics.h" #include "yuzu/configuration/configure_graphics.h" - ConfigureGraphics::ConfigureGraphics(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureGraphics) { -- cgit v1.2.3 From a4f5ccbf0a834fa231ff584ad333a58be71f058f Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 15 Jan 2018 18:20:53 +0100 Subject: Clanggit rebase -i fixes --- src/yuzu/configuration/config.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 314fc2779..6e33337c2 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -24,18 +24,10 @@ const std::array Config::default_button const std::array, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{ { - Qt::Key_Up, - Qt::Key_Down, - Qt::Key_Left, - Qt::Key_Right, - Qt::Key_D, + Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right, Qt::Key_D, }, { - Qt::Key_I, - Qt::Key_K, - Qt::Key_J, - Qt::Key_L, - Qt::Key_D, + Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L, Qt::Key_D, }, }}; -- cgit v1.2.3