Allow unbinding vehicle accelerate/brake to just use the stick for dr…

…iving
fholger · Aug 26, 2023 · b55f90c · b55f90c
1 parent 4f44292
commit b55f90c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/Sources/CryGame C++/Solution1/CryGame/VRInput.cpp b/Sources/CryGame C++/Solution1/CryGame/VRInput.cpp
@@ -190,10 +190,15 @@ void VRInput::ProcessInputInVehicles()
 		HandleBooleanAction(m_vehiclesAttack, &CXClient::TriggerFire0);
 
 		// combine accelerate/brake to movement value
-		float accel = GetFloatValue(m_vehiclesAccelerate);
-		float brake = GetFloatValue(m_vehiclesBrake);
+		bool isAccelActive = false, isBrakeActive = false;
+		float accel = GetFloatValue(m_vehiclesAccelerate, 0, &isAccelActive);
+		float brake = GetFloatValue(m_vehiclesBrake, 0, &isBrakeActive);
 		float move = accel - brake;
-		m_pGame->GetClient()->TriggerMoveFB(move, XActivationEvent());
+
+		if (isAccelActive && isBrakeActive)
+			m_pGame->GetClient()->TriggerMoveFB(move, XActivationEvent());
+		else
+			HandleAnalogAction(m_vehiclesSteer, 1, &CXClient::TriggerMoveFB);
 	}
 	else
 	{
@@ -264,10 +269,12 @@ void VRInput::HandleAnalogAction(vr::VRActionHandle_t actionHandle, int axis, Tr
 	(m_pGame->GetClient()->*trigger)(value, XActivationEvent());
 }
 
-float VRInput::GetFloatValue(vr::VRActionHandle_t actionHandle, int axis)
+float VRInput::GetFloatValue(vr::VRActionHandle_t actionHandle, int axis, bool* isActive)
 {
 	vr::InputAnalogActionData_t actionData;
 	vr::VRInput()->GetAnalogActionData(actionHandle, &actionData, sizeof(vr::InputAnalogActionData_t), vr::k_ulInvalidInputValueHandle);
+	if (isActive != nullptr)
+		*isActive = actionData.bActive;
 	if (!actionData.bActive)
 		return 0.f;
 

diff --git a/Sources/CryGame C++/Solution1/CryGame/VRInput.h b/Sources/CryGame C++/Solution1/CryGame/VRInput.h
@@ -68,7 +68,7 @@ class VRInput
 
 	void HandleBooleanAction(vr::VRActionHandle_t actionHandle, TriggerFn trigger, bool continuous = true);
 	void HandleAnalogAction(vr::VRActionHandle_t actionHandle, int axis, TriggerFn trigger);
-	float GetFloatValue(vr::VRActionHandle_t actionHandle, int axis = 0);
+	float GetFloatValue(vr::VRActionHandle_t actionHandle, int axis = 0, bool *isActive = nullptr);
 
 	void InitDoubleBindAction(DoubleBindAction& action, const char* actionName);
 	void HandleDoubleBindAction(DoubleBindAction& action, TriggerFn shortPressTrigger, TriggerFn longPressTrigger, bool longContinuous = true);