From 9a744ab25bc89e5bb4309f225f8c4ee0a95d56b2 Mon Sep 17 00:00:00 2001 From: iwubcode Date: Fri, 12 Jun 2020 00:27:34 -0500 Subject: DolphinQt: Move Free Look out of Graphics/Hotkey and into its own configuration window. Launched from a new menu option - "Free Look Settings". The HotKeyScheduler still calls the Free Look functionality to reduce the total number of threads --- .../DolphinQt/Config/Graphics/AdvancedWidget.cpp | 38 ---------------------- 1 file changed, 38 deletions(-) (limited to 'Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp') diff --git a/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp index d91c7ee8c5..16ebd14dc9 100644 --- a/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp @@ -80,19 +80,6 @@ void AdvancedWidget::CreateWidgets() utility_layout->addWidget(m_dump_efb_target, 1, 1); - // Freelook - auto* freelook_box = new QGroupBox(tr("Free Look")); - auto* freelook_layout = new QGridLayout(); - freelook_box->setLayout(freelook_layout); - - m_enable_freelook = new GraphicsBool(tr("Enable"), Config::GFX_FREE_LOOK); - m_freelook_control_type = new GraphicsChoice({tr("Six Axis"), tr("First Person"), tr("Orbital")}, - Config::GFX_FREE_LOOK_CONTROL_TYPE); - - freelook_layout->addWidget(m_enable_freelook, 0, 0); - freelook_layout->addWidget(new QLabel(tr("Control Type:")), 1, 0); - freelook_layout->addWidget(m_freelook_control_type, 1, 1); - // Texture dumping auto* texture_dump_box = new QGroupBox(tr("Texture Dumping")); auto* texture_dump_layout = new QGridLayout(); @@ -155,7 +142,6 @@ void AdvancedWidget::CreateWidgets() main_layout->addWidget(debugging_box); main_layout->addWidget(utility_box); - main_layout->addWidget(freelook_box); main_layout->addWidget(texture_dump_box); main_layout->addWidget(dump_box); main_layout->addWidget(misc_box); @@ -170,7 +156,6 @@ void AdvancedWidget::ConnectWidgets() connect(m_load_custom_textures, &QCheckBox::toggled, this, &AdvancedWidget::SaveSettings); connect(m_dump_use_ffv1, &QCheckBox::toggled, this, &AdvancedWidget::SaveSettings); connect(m_enable_prog_scan, &QCheckBox::toggled, this, &AdvancedWidget::SaveSettings); - connect(m_enable_freelook, &QCheckBox::toggled, this, &AdvancedWidget::SaveSettings); connect(m_dump_textures, &QCheckBox::toggled, this, &AdvancedWidget::SaveSettings); } @@ -180,8 +165,6 @@ void AdvancedWidget::LoadSettings() m_dump_bitrate->setEnabled(!Config::Get(Config::GFX_USE_FFV1)); m_enable_prog_scan->setChecked(Config::Get(Config::SYSCONF_PROGRESSIVE_SCAN)); - - m_freelook_control_type->setEnabled(Config::Get(Config::GFX_FREE_LOOK)); m_dump_mip_textures->setEnabled(Config::Get(Config::GFX_DUMP_TEXTURES)); m_dump_base_textures->setEnabled(Config::Get(Config::GFX_DUMP_TEXTURES)); } @@ -192,8 +175,6 @@ void AdvancedWidget::SaveSettings() m_dump_bitrate->setEnabled(!Config::Get(Config::GFX_USE_FFV1)); Config::SetBase(Config::SYSCONF_PROGRESSIVE_SCAN, m_enable_prog_scan->isChecked()); - - m_freelook_control_type->setEnabled(Config::Get(Config::GFX_FREE_LOOK)); m_dump_mip_textures->setEnabled(Config::Get(Config::GFX_DUMP_TEXTURES)); m_dump_base_textures->setEnabled(Config::Get(Config::GFX_DUMP_TEXTURES)); } @@ -268,22 +249,6 @@ void AdvancedWidget::AddDescriptions() QT_TR_NOOP("Encodes frame dumps using the FFV1 codec.

If " "unsure, leave this unchecked."); #endif - static const char TR_FREE_LOOK_DESCRIPTION[] = QT_TR_NOOP( - "Allows manipulation of the in-game camera. Move the mouse while holding the right button " - "to pan or middle button to roll.

Use the WASD keys while holding SHIFT to move " - "the " - "camera. Press SHIFT+2 to increase speed or SHIFT+1 to decrease speed. Press SHIFT+R " - "to reset the camera or SHIFT+F to reset the speed.

If unsure, " - "leave this unchecked."); - static const char TR_FREE_LOOK_CONTROL_TYPE_DESCRIPTION[] = QT_TR_NOOP( - "Changes the in-game camera type during freelook.

" - "Six Axis: Offers full camera control on all axes, akin to moving a spacecraft in zero " - "gravity. This is the most powerful freelook option but is the most challenging to use.

" - "First Person: Controls the free camera similarly to a first person video game. The camera " - "can rotate and travel, but roll is impossible. Easy to use, but limiting.

" - "Orbital: Rotates the free camera around the original camera. Has no lateral movement, only " - "rotation and you may zoom up to the camera's origin point."); static const char TR_CROPPING_DESCRIPTION[] = QT_TR_NOOP( "Crops the picture from its native aspect ratio to 4:3 or " "16:9.

If unsure, leave this unchecked."); @@ -330,9 +295,6 @@ void AdvancedWidget::AddDescriptions() #endif m_enable_cropping->SetDescription(tr(TR_CROPPING_DESCRIPTION)); m_enable_prog_scan->SetDescription(tr(TR_PROGRESSIVE_SCAN_DESCRIPTION)); - m_enable_freelook->SetDescription(tr(TR_FREE_LOOK_DESCRIPTION)); - m_freelook_control_type->SetTitle(tr("Free Look Control Type")); - m_freelook_control_type->SetDescription(tr(TR_FREE_LOOK_CONTROL_TYPE_DESCRIPTION)); m_backend_multithreading->SetDescription(tr(TR_BACKEND_MULTITHREADING_DESCRIPTION)); #ifdef _WIN32 m_borderless_fullscreen->SetDescription(tr(TR_BORDERLESS_FULLSCREEN_DESCRIPTION)); -- cgit v1.2.3