Merge pull request #9516 from iwubcode/dynamic_input_textures_improved

InputCommon: move some dynamic input texture logic and add specification option
dolphin-emu · Feb 19, 2021 · 9957d6c · 9957d6c
2 parents 34c9e0d + 55ba1c7
commit 9957d6c
Show file tree

Hide file tree

Showing 11 changed files with 516 additions and 437 deletions.
diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props
@@ -475,7 +475,9 @@
     <ClInclude Include="InputCommon\ControlReference\ControlReference.h" />
     <ClInclude Include="InputCommon\ControlReference\ExpressionParser.h" />
     <ClInclude Include="InputCommon\ControlReference\FunctionExpression.h" />
-    <ClInclude Include="InputCommon\DynamicInputTextureConfiguration.h" />
+    <ClInclude Include="InputCommon\DynamicInputTextures\DITConfiguration.h" />
+    <ClInclude Include="InputCommon\DynamicInputTextures\DITData.h" />
+    <ClInclude Include="InputCommon\DynamicInputTextures\DITSpecification.h" />
     <ClInclude Include="InputCommon\DynamicInputTextureManager.h" />
     <ClInclude Include="InputCommon\GCAdapter.h" />
     <ClInclude Include="InputCommon\GCPadStatus.h" />
@@ -1041,7 +1043,8 @@
     <ClCompile Include="InputCommon\ControlReference\ControlReference.cpp" />
     <ClCompile Include="InputCommon\ControlReference\ExpressionParser.cpp" />
     <ClCompile Include="InputCommon\ControlReference\FunctionExpression.cpp" />
-    <ClCompile Include="InputCommon\DynamicInputTextureConfiguration.cpp" />
+    <ClCompile Include="InputCommon\DynamicInputTextures\DITConfiguration.cpp" />
+    <ClCompile Include="InputCommon\DynamicInputTextures\DITSpecification.cpp" />
     <ClCompile Include="InputCommon\DynamicInputTextureManager.cpp" />
     <ClCompile Include="InputCommon\GCAdapter.cpp" />
     <ClCompile Include="InputCommon\ImageOperations.cpp" />

diff --git 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,11 @@ add_library(inputcommon
   ControlReference/ExpressionParser.h
   ControlReference/FunctionExpression.cpp
   ControlReference/FunctionExpression.h
+  DynamicInputTextures/DITConfiguration.cpp
+  DynamicInputTextures/DITConfiguration.h
+  DynamicInputTextures/DITData.h
+  DynamicInputTextures/DITSpecification.cpp
+  DynamicInputTextures/DITSpecification.h
 )
 
 target_link_libraries(inputcommon