Controller deadzone and smoothing exposed

mc2hook/mc2hook/age/input/input.cpp

@@ -1,4 +1,21 @@
 #include "input.h"
 
 declfield(ioInput::bUseJoystick)(0x679674);
-declfield(ioInput::bUseKeyboard)(0x679675);
+declfield(ioInput::bUseKeyboard)(0x679675);
+
+float ioInput::ioAddDeadZone(float originalValue, float deadZone)
+{
+	float val;
+
+	if (originalValue > deadZone) {
+		val = (originalValue - deadZone) / (1.0f - deadZone);
+	}
+	else if (originalValue < -deadZone) {
+		val = (originalValue + deadZone) / (1.0f - deadZone);
+	}
+	else {
+		val = 0.0f;
+	}
+
+	return val;
+}

mc2hook/mc2hook/age/input/input.h

@@ -6,4 +6,6 @@ class ioInput
 public:
     static hook::Type<bool> bUseKeyboard;
     static hook::Type<bool> bUseJoystick;
-};
+
+    static float ioAddDeadZone(float originalValue, float deadZone);
+};

mc2hook/mc2hook/handlers/DeadZoneHandler.cpp

@@ -0,0 +1,25 @@
+#include "DeadZoneHandler.h"
+#include <age/input/input.h>
+
+float deadZoneMultiplier;
+
+float DeadZoneHandler::ioAddDeadZone(float originalValue, float deadZone)
+{
+    originalValue *= deadZoneMultiplier;
+    return ioInput::ioAddDeadZone(originalValue, deadZone);
+}
+
+void DeadZoneHandler::Install()
+{
+    deadZoneMultiplier = HookConfig::GetFloat("Input", "DeadZoneMultiplier", 1.0f);
+
+    InstallCallback("Deadzone Handler", "ioAddDeadZone",
+        &ioAddDeadZone, {
+            cb::call(0x426603),
+            cb::call(0x46752D),
+            cb::call(0x561D77),
+            cb::call(0x561D95),
+            cb::call(0x5689E0),
+            cb::call(0x60492A),
+        });
+}

mc2hook/mc2hook/handlers/DeadZoneHandler.h

@@ -0,0 +1,9 @@
+#pragma once
+#include <mc2hook\mc2hook.h>
+
+class DeadZoneHandler
+{
+public:
+    static float ioAddDeadZone(float originalValue, float deadZone);
+    static void Install();
+};

mc2hook/mc2hook/handlers/SteeringSmootherHandler.cpp

@@ -9,6 +9,8 @@ static float steerValue = 0.0f;
 static float steerSpeed = 4.0f;
 static float steerSpeedOut = 6.0f;
 
+float controllerSteerSpeed;
+
 void SteeringSmootherHandler::Update()
 {
     hook::Thunk<0x46B330>::Call<void>(this); // call original
@@ -43,4 +45,8 @@ void SteeringSmootherHandler::Install()
     if (datArgParser::Get("smoothsteer")) {
         InstallVTableHook("Input Update", &Update, { 0x63D0C4 });
     }
+
+    // Exposing controller speed value
+    controllerSteerSpeed = HookConfig::GetFloat("Input", "ControllerSteerSpeed", 10.0f);
+    mem::write(0x46B28E + 3, static_cast<float>(controllerSteerSpeed));
 }

mc2hook/mc2hook/handlers/handlers.h

@@ -17,6 +17,7 @@
 #include <handlers\InputHandler.h>
 #include <handlers\BorderlessHandler.h>
 #include <handlers\ReflectionFidelityHandler.h>
+#include <handlers/DeadZoneHandler.h>
 
 #include <handlers\StateResearchHook.h>
 
@@ -50,6 +51,7 @@ static void InstallMainHandlers()
     InstallHandler<ChatHandler>("Chat Handler");
     InstallHandler<InitHandler>("Game Init Handler");
     InstallHandler<ReflectionFidelityHandler>("Reflection Fidelity Handller");
+    InstallHandler<DeadZoneHandler>("Dead Zone Handler");
 
     InstallHandler<StateResearchHook>("SRH");
 }

mc2hook/mc2hook/mc2hook.vcxproj

@@ -191,6 +191,7 @@
     <ClInclude Include="handlers\ChatHandler.h" />
     <ClInclude Include="handlers\CustomExceptionHandler.h" />
     <ClInclude Include="handlers\CustomVehicleHandler.h" />
+    <ClInclude Include="handlers\DeadZoneHandler.h" />
     <ClInclude Include="handlers\FontCrashFixHandler.h" />
     <ClInclude Include="handlers\handlers.h" />
     <ClInclude Include="handlers\HybridFileMethodsHandler.h" />
@@ -244,6 +245,7 @@
     <ClCompile Include="handlers\ChatHandler.cpp" />
     <ClCompile Include="handlers\CustomExceptionHandler.cpp" />
     <ClCompile Include="handlers\CustomVehicleHandler.cpp" />
+    <ClCompile Include="handlers\DeadZoneHandler.cpp" />
     <ClCompile Include="handlers\FontCrashFixHandler.cpp" />
     <ClCompile Include="handlers\HybridFileMethodsHandler.cpp" />
     <ClCompile Include="handlers\InputHandler.cpp" />