From 28a911ae6b3f609003132f67e3398a1b990723d9 Mon Sep 17 00:00:00 2001 From: iwubcode Date: Sun, 14 Feb 2021 20:47:00 -0600 Subject: [PATCH] InputCommon: Move DynamicInputTextureConfiguration to DynamicInputTextures::Configuration --- Source/Core/DolphinLib.props | 4 ++-- Source/Core/InputCommon/CMakeLists.txt | 4 ++-- .../DynamicInputTextureManager.cpp | 2 +- .../InputCommon/DynamicInputTextureManager.h | 7 +++++-- .../DITConfiguration.cpp} | 19 +++++++++---------- .../DITConfiguration.h} | 10 +++++----- 6 files changed, 24 insertions(+), 22 deletions(-) rename Source/Core/InputCommon/{DynamicInputTextureConfiguration.cpp => DynamicInputTextures/DITConfiguration.cpp} (94%) rename Source/Core/InputCommon/{DynamicInputTextureConfiguration.h => DynamicInputTextures/DITConfiguration.h} (85%) diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props index 61688eb7b1..e89d64c009 100644 --- a/Source/Core/DolphinLib.props +++ b/Source/Core/DolphinLib.props @@ -475,7 +475,7 @@ - + @@ -1041,7 +1041,7 @@ - + diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt index eb6c079f6b..693c6b8c28 100644 --- a/Source/Core/InputCommon/CMakeLists.txt +++ b/Source/Core/InputCommon/CMakeLists.txt @@ -1,6 +1,4 @@ add_library(inputcommon - DynamicInputTextureConfiguration.cpp - DynamicInputTextureConfiguration.h DynamicInputTextureManager.cpp DynamicInputTextureManager.h ImageOperations.cpp @@ -64,6 +62,8 @@ add_library(inputcommon ControlReference/ExpressionParser.h ControlReference/FunctionExpression.cpp ControlReference/FunctionExpression.h + DynamicInputTextures/DITConfiguration.cpp + DynamicInputTextures/DITConfiguration.h ) target_link_libraries(inputcommon diff --git a/Source/Core/InputCommon/DynamicInputTextureManager.cpp b/Source/Core/InputCommon/DynamicInputTextureManager.cpp index 31d0ee2aeb..602edc608d 100644 --- a/Source/Core/InputCommon/DynamicInputTextureManager.cpp +++ b/Source/Core/InputCommon/DynamicInputTextureManager.cpp @@ -12,7 +12,7 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" -#include "InputCommon/DynamicInputTextureConfiguration.h" +#include "InputCommon/DynamicInputTextures/DITConfiguration.h" #include "VideoCommon/HiresTextures.h" #include "VideoCommon/RenderBase.h" diff --git a/Source/Core/InputCommon/DynamicInputTextureManager.h b/Source/Core/InputCommon/DynamicInputTextureManager.h index cd07854928..debd82f83e 100644 --- a/Source/Core/InputCommon/DynamicInputTextureManager.h +++ b/Source/Core/InputCommon/DynamicInputTextureManager.h @@ -11,7 +11,10 @@ namespace InputCommon { -class DynamicInputTextureConfiguration; +namespace DynamicInputTextures +{ +class Configuration; +} class DynamicInputTextureManager { public: @@ -21,7 +24,7 @@ public: void GenerateTextures(const IniFile::Section* sec, const std::string& controller_name); private: - std::vector m_configuration; + std::vector m_configuration; std::string m_config_type; }; } // namespace InputCommon diff --git a/Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp similarity index 94% rename from Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp rename to Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp index d55099e856..4af1796ddc 100644 --- a/Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp +++ b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "InputCommon/DynamicInputTextureConfiguration.h" +#include "InputCommon/DynamicInputTextures/DITConfiguration.h" #include #include @@ -30,9 +30,9 @@ std::string GetStreamAsString(std::ifstream& stream) } } // namespace -namespace InputCommon +namespace InputCommon::DynamicInputTextures { -DynamicInputTextureConfiguration::DynamicInputTextureConfiguration(const std::string& json_file) +Configuration::Configuration(const std::string& json_file) { std::ifstream json_stream; File::OpenFStream(json_stream, json_file, std::ios_base::in); @@ -247,10 +247,10 @@ DynamicInputTextureConfiguration::DynamicInputTextureConfiguration(const std::st } } -DynamicInputTextureConfiguration::~DynamicInputTextureConfiguration() = default; +Configuration::~Configuration() = default; -bool DynamicInputTextureConfiguration::GenerateTextures(const IniFile::Section* sec, - const std::string& controller_name) const +bool Configuration::GenerateTextures(const IniFile::Section* sec, + const std::string& controller_name) const { bool any_dirty = false; for (const auto& texture_data : m_dynamic_input_textures) @@ -261,9 +261,8 @@ bool DynamicInputTextureConfiguration::GenerateTextures(const IniFile::Section* return any_dirty; } -bool DynamicInputTextureConfiguration::GenerateTexture( - const IniFile::Section* sec, const std::string& controller_name, - const DynamicInputTextureData& texture_data) const +bool Configuration::GenerateTexture(const IniFile::Section* sec, const std::string& controller_name, + const DynamicInputTextureData& texture_data) const { std::string device_name; if (!sec->Get("Device", &device_name)) @@ -381,4 +380,4 @@ bool DynamicInputTextureConfiguration::GenerateTexture( return false; } -} // namespace InputCommon +} // namespace InputCommon::DynamicInputTextures diff --git a/Source/Core/InputCommon/DynamicInputTextureConfiguration.h b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h similarity index 85% rename from Source/Core/InputCommon/DynamicInputTextureConfiguration.h rename to Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h index e5a4e722bf..5bf16168fa 100644 --- a/Source/Core/InputCommon/DynamicInputTextureConfiguration.h +++ b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h @@ -12,13 +12,13 @@ #include "Common/IniFile.h" #include "InputCommon/ImageOperations.h" -namespace InputCommon +namespace InputCommon::DynamicInputTextures { -class DynamicInputTextureConfiguration +class Configuration { public: - explicit DynamicInputTextureConfiguration(const std::string& json_file); - ~DynamicInputTextureConfiguration(); + explicit Configuration(const std::string& json_file); + ~Configuration(); bool GenerateTextures(const IniFile::Section* sec, const std::string& controller_name) const; private: @@ -43,4 +43,4 @@ private: std::string m_base_path; bool m_valid = true; }; -} // namespace InputCommon +} // namespace InputCommon::DynamicInputTextures