DDGoController: Rewrite to support axis input

And add virtual buttons for each of the possible states.
stenzek · Feb 12, 2025 · 7bc18c8 · 7bc18c8
1 parent a25d5dc
commit 7bc18c8
Show file tree

Hide file tree

Showing 10 changed files with 532 additions and 40 deletions.
diff --git a/data/resources/gamedb.yaml b/data/resources/gamedb.yaml
@@ -36447,6 +36447,7 @@ SCPS-45166:
   name: "Densha De Go! (aka Densha De Go! / Densya De Go! - Let's Go by Train!)"
   controllers:
     - DigitalController
+    - DDGoController
   metadata:
     publisher: "Taito"
     developer: "Taito"
@@ -36465,6 +36466,7 @@ SCPS-45167:
   name: "Densha De Go! (aka Densha De Go! / Densya De Go! - Let's Go by Train!)"
   controllers:
     - DigitalController
+    - DDGoController
   metadata:
     publisher: "Taito"
     developer: "Taito"
@@ -36483,6 +36485,7 @@ SLPS-01150:
   name: "Densha de Go! (Japan)"
   controllers:
     - DigitalController
+    - DDGoController
   metadata:
     publisher: "Taito"
     developer: "Taito"
@@ -36499,12 +36502,16 @@ SLPS-01150:
     linkCable: false
 SLPM-80166:
   name: "Densha de Go! (Japan) (Demo)"
+  controllers:
+    - DigitalController
+    - DDGoController
   metadata:
     genre: "** DEMO **"
 SLPM-86263:
   name: "Densha de Go! (Japan) (PlayStation the Best)"
   controllers:
     - DigitalController
+    - DDGoController
   metadata:
     publisher: "Taito"
     developer: "Taito"
@@ -36524,6 +36531,7 @@ SLPM-86142:
   controllers:
     - AnalogController
     - DigitalController
+    - DDGoController
   metadata:
     publisher: "Taito"
     developer: "Taito"
@@ -36540,17 +36548,26 @@ SLPM-86142:
     linkCable: false
 SLPM-80346:
   name: "Densha de Go! 2 (Japan) (Demo 1)"
+  controllers:
+    - AnalogController
+    - DigitalController
+    - DDGoController
   metadata:
     genre: "** DEMO **"
 SLPM-80406:
   name: "Densha de Go! 2 (Japan) (Demo 2)"
+  controllers:
+    - AnalogController
+    - DigitalController
+    - DDGoController
   metadata:
     genre: "** DEMO **"
 SLPM-86615:
   name: "Densha de Go! 2 (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
+    - DDGoController
   metadata:
     publisher: "Taito"
     developer: "Taito"
@@ -36570,6 +36587,7 @@ SLPM-86141:
   controllers:
     - AnalogController
     - DigitalController
+    - DDGoController
   metadata:
     publisher: "Taito"
     developer: "Taito"
@@ -36589,6 +36607,7 @@ SLPM-86424:
   controllers:
     - AnalogController
     - DigitalController
+    - DDGoController
   metadata:
     publisher: "Taito"
     developer: "Taito"
@@ -36605,13 +36624,18 @@ SLPM-86424:
     linkCable: false
 SLPM-80521:
   name: "Densha de Go! Nagoya Tetsudou-hen (Japan) (Demo)"
+  controllers:
+    - AnalogController
+    - DigitalController
+    - DDGoController
   metadata:
     genre: "** DEMO **"
 SLPM-86378:
   name: "Densha de Go! Professional Shiyou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
+    - DDGoController
   codes:
     - SLPM-86378
     - SLPM-86705
@@ -36631,6 +36655,10 @@ SLPM-86378:
     linkCable: false
 SLPM-80511:
   name: "Densha de Go! Professional Shiyou (Japan) (Taikenban)"
+  controllers:
+    - AnalogController
+    - DigitalController
+    - DDGoController
 SCPS-18003:
   name: "Depth (Japan)"
   controllers:

diff --git a/src/common/bitutils.h b/src/common/bitutils.h
@@ -109,6 +109,10 @@ ALWAYS_INLINE static constexpr u64 BoolToUInt64(bool value)
 {
   return static_cast<u64>(value);
 }
+ALWAYS_INLINE static constexpr float BoolToFloat(bool value)
+{
+  return static_cast<float>(value);
+}
 
 // Integer to boolean
 template<typename TValue>

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -32,6 +32,8 @@ add_library(core
   cpu_pgxp.h
   cpu_types.cpp
   cpu_types.h
+  ddgo_controller.cpp
+  ddgo_controller.h
   digital_controller.cpp
   digital_controller.h
   dma.cpp

diff --git a/src/core/controller.cpp b/src/core/controller.cpp
@@ -1,9 +1,10 @@
-// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
+// SPDX-FileCopyrightText: 2019-2025 Connor McLaughlin <stenzek@gmail.com>
 // SPDX-License-Identifier: CC-BY-NC-ND-4.0
 
 #include "controller.h"
 #include "analog_controller.h"
 #include "analog_joystick.h"
+#include "ddgo_controller.h"
 #include "digital_controller.h"
 #include "game_database.h"
 #include "guncon.h"
@@ -35,7 +36,7 @@ static constexpr std::array<const Controller::ControllerInfo*, static_cast<size_
     &NeGconRumble::INFO,
     &Justifier::INFO,
     &DigitalController::INFO_POPN,
-    &DigitalController::INFO_DDGO,
+    &DDGoController::INFO,
     &JogCon::INFO,
   }};
 
@@ -120,7 +121,6 @@ std::unique_ptr<Controller> Controller::Create(ControllerType type, u32 index)
   {
     case ControllerType::DigitalController:
     case ControllerType::PopnController:
-    case ControllerType::DDGoController:
       return DigitalController::Create(index, type);
 
     case ControllerType::AnalogController:
@@ -144,6 +144,9 @@ std::unique_ptr<Controller> Controller::Create(ControllerType type, u32 index)
     case ControllerType::NeGconRumble:
       return NeGconRumble::Create(index);
 
+    case ControllerType::DDGoController:
+      return DDGoController::Create(index);
+
     case ControllerType::JogCon:
       return JogCon::Create(index);
 

diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
@@ -28,6 +28,7 @@
       <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="cpu_types.cpp" />
+    <ClCompile Include="ddgo_controller.cpp" />
     <ClCompile Include="digital_controller.cpp" />
     <ClCompile Include="fullscreen_ui.cpp" />
     <ClCompile Include="game_database.cpp" />
@@ -108,6 +109,7 @@
     <ClInclude Include="cpu_recompiler_x64.h">
       <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="ddgo_controller.h" />
     <ClInclude Include="digital_controller.h" />
     <ClInclude Include="fullscreen_ui.h" />
     <ClInclude Include="game_database.h" />

diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters
@@ -67,6 +67,7 @@
     <ClCompile Include="pio.cpp" />
     <ClCompile Include="gpu_thread.cpp" />
     <ClCompile Include="gpu_presenter.cpp" />
+    <ClCompile Include="ddgo_controller.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="types.h" />
@@ -144,6 +145,7 @@
     <ClInclude Include="gpu_thread.h" />
     <ClInclude Include="gpu_thread_commands.h" />
     <ClInclude Include="gpu_presenter.h" />
+    <ClInclude Include="ddgo_controller.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="gpu_sw_rasterizer.inl" />