From 3969bf6d1c83acb7e3699bcd3c2715d5b85e2ea0 Mon Sep 17 00:00:00 2001 From: iwubcode Date: Fri, 13 Apr 2018 23:51:32 -0500 Subject: Input: Add hotkey to cycle the wiimote profile forward or backward Co-authored-by: Barath Kannan --- Source/Core/InputCommon/CMakeLists.txt | 1 + Source/Core/InputCommon/InputCommon.vcxproj | 2 + .../Core/InputCommon/InputCommon.vcxproj.filters | 2 + Source/Core/InputCommon/InputConfig.cpp | 5 ++ Source/Core/InputCommon/InputConfig.h | 1 + Source/Core/InputCommon/InputProfile.cpp | 100 +++++++++++++++++++++ Source/Core/InputCommon/InputProfile.h | 39 ++++++++ 7 files changed, 150 insertions(+) create mode 100644 Source/Core/InputCommon/InputProfile.cpp create mode 100644 Source/Core/InputCommon/InputProfile.h (limited to 'Source/Core/InputCommon') diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt index 99cf2f9679..a3ef2722d8 100644 --- a/Source/Core/InputCommon/CMakeLists.txt +++ b/Source/Core/InputCommon/CMakeLists.txt @@ -1,5 +1,6 @@ add_library(inputcommon InputConfig.cpp + InputProfile.cpp ControllerEmu/ControllerEmu.cpp ControllerEmu/Control/Control.cpp ControllerEmu/Control/Input.cpp diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj index 84ad406de1..6d0efb2c91 100644 --- a/Source/Core/InputCommon/InputCommon.vcxproj +++ b/Source/Core/InputCommon/InputCommon.vcxproj @@ -71,6 +71,7 @@ 4200;%(DisableSpecificWarnings) + @@ -105,6 +106,7 @@ + diff --git a/Source/Core/InputCommon/InputCommon.vcxproj.filters b/Source/Core/InputCommon/InputCommon.vcxproj.filters index 600a77727d..c67333497c 100644 --- a/Source/Core/InputCommon/InputCommon.vcxproj.filters +++ b/Source/Core/InputCommon/InputCommon.vcxproj.filters @@ -110,6 +110,7 @@ ControllerInterface + @@ -202,6 +203,7 @@ ControllerInterface + diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp index 2a5766fbbe..989c1bdce9 100644 --- a/Source/Core/InputCommon/InputConfig.cpp +++ b/Source/Core/InputCommon/InputConfig.cpp @@ -128,6 +128,11 @@ bool InputConfig::ControllersNeedToBeCreated() const return m_controllers.empty(); } +std::size_t InputConfig::GetControllerCount() const +{ + return m_controllers.size(); +} + bool InputConfig::IsControllerControlledByGamepadDevice(int index) const { if (static_cast(index) >= m_controllers.size()) diff --git a/Source/Core/InputCommon/InputConfig.h b/Source/Core/InputCommon/InputConfig.h index a993a412b1..004e4be8bb 100644 --- a/Source/Core/InputCommon/InputConfig.h +++ b/Source/Core/InputCommon/InputConfig.h @@ -38,6 +38,7 @@ public: std::string GetGUIName() const { return m_gui_name; } std::string GetProfileName() const { return m_profile_name; } + std::size_t GetControllerCount() const; private: std::vector> m_controllers; diff --git a/Source/Core/InputCommon/InputProfile.cpp b/Source/Core/InputCommon/InputProfile.cpp new file mode 100644 index 0000000000..87d8c5bcab --- /dev/null +++ b/Source/Core/InputCommon/InputProfile.cpp @@ -0,0 +1,100 @@ +// Copyright 2018 Dolphin Emulator Project +// Licensed under GPLv2+ +// Refer to the license.txt file included. + +#include "Common/FileSearch.h" +#include "Common/FileUtil.h" + +#include "Core/Core.h" +#include "Core/HW/Wiimote.h" +#include "Core/HotkeyManager.h" + +#include "InputCommon/ControllerInterface/ControllerInterface.h" +#include "InputCommon/InputConfig.h" +#include "InputCommon/InputProfile.h" + +namespace InputProfile +{ + + namespace + { + constexpr int display_message_ms = 3000; + } + + std::vector ProfileCycler::GetProfilesForDevice(InputConfig* device_configuration) + { + const std::string device_profile_root_location(File::GetUserPath(D_CONFIG_IDX) + "Profiles/" + device_configuration->GetProfileName()); + return Common::DoFileSearch({ device_profile_root_location }, { ".ini" }); + } + + std::string ProfileCycler::GetProfile(CycleDirection cycle_direction, int& profile_index, const std::vector& profiles) + { + // update the index and bind it to the number of available strings + auto positive_modulo = [](int& i, int n) {i = (i % n + n) % n;}; + profile_index += static_cast(cycle_direction); + positive_modulo(profile_index, static_cast(profiles.size())); + + return profiles[profile_index]; + } + + void ProfileCycler::UpdateToProfile(const std::string& profile_filename, const std::vector& controllers) + { + std::string base; + SplitPath(profile_filename, nullptr, &base, nullptr); + + IniFile ini_file; + if (ini_file.Load(profile_filename)) + { + Core::DisplayMessage("Loading input profile: " + base, display_message_ms); + + for (auto* controller : controllers) + { + controller->LoadConfig(ini_file.GetOrCreateSection("Profile")); + controller->UpdateReferences(g_controller_interface); + } + } + else + { + Core::DisplayMessage("Unable to load input profile: " + base, display_message_ms); + } + } + + std::vector ProfileCycler::GetControllersForDevice(InputConfig* device_configuration) + { + const std::size_t size = device_configuration->GetControllerCount(); + + std::vector result(size); + + for (int i = 0; i < static_cast(size); i++) + { + result[i] = device_configuration->GetController(i); + } + + return result; + } + + void ProfileCycler::CycleProfile(CycleDirection cycle_direction, + InputConfig* device_configuration, int& profile_index) + { + const auto& profiles = GetProfilesForDevice(device_configuration); + if (profiles.empty()) + { + Core::DisplayMessage("No input profiles found", display_message_ms); + return; + } + const std::string profile = GetProfile(cycle_direction, profile_index, profiles); + + const auto& controllers = GetControllersForDevice(device_configuration); + UpdateToProfile(profile, controllers); + } + + void ProfileCycler::NextWiimoteProfile() + { + CycleProfile(CycleDirection::Forward, Wiimote::GetConfig(), m_wiimote_profile_index); + } + + void ProfileCycler::PreviousWiimoteProfile() + { + CycleProfile(CycleDirection::Backward, Wiimote::GetConfig(), m_wiimote_profile_index); + } +} diff --git a/Source/Core/InputCommon/InputProfile.h b/Source/Core/InputCommon/InputProfile.h new file mode 100644 index 0000000000..09b617c398 --- /dev/null +++ b/Source/Core/InputCommon/InputProfile.h @@ -0,0 +1,39 @@ +// Copyright 2018 Dolphin Emulator Project +// Licensed under GPLv2+ +// Refer to the license.txt file included. + +#pragma once + +class InputConfig; + +namespace ControllerEmu +{ + class EmulatedController; +} + +#include +#include + +namespace InputProfile +{ + enum class CycleDirection : int + { + Forward = 1, + Backward = -1 + }; + + class ProfileCycler + { + public: + void NextWiimoteProfile(); + void PreviousWiimoteProfile(); + private: + void CycleProfile(CycleDirection cycle_direction, InputConfig* device_configuration, int& profile_index); + std::vector GetProfilesForDevice(InputConfig* device_configuration); + std::string GetProfile(CycleDirection cycle_direction, int& profile_index, const std::vector& profiles); + void UpdateToProfile(const std::string& profile_filename, const std::vector& controllers); + std::vector GetControllersForDevice(InputConfig* device_configuration); + + int m_wiimote_profile_index = 0; + }; +} -- cgit v1.2.3