Integrate ProTube events for weapon firing

Author: fholger

Code/Shotgun.cpp

@@ -379,6 +379,7 @@ bool CShotgun::Shoot(bool resetAnimation, bool autoreload/* =true */, bool noSou
 			//	gEnv->pInput->ForceFeedbackEvent( SFFOutputEvent(eDI_XI, eFF_Rumble_Basic, 0.15f, 0.0f, fabsf(m_recoilparams.back_impulse)*3.0f) );
 			gXR->GetInput()->SendHapticEvent(WEAPON_HAND, 0.15f, fabsf(m_recoilparams.back_impulse)*3.0f);
 			gHaptics->TriggerBHapticsEffectForSide(WEAPON_HAND, "shotgun_l_vest", "shotgun_r_vest", 0.4f);
+			gHaptics->TriggerProtubeEffectWeapon(0.8f, 0.8f, 0.5f);
 			if (gVR->IsOffHandGrabbingWeapon())
 				gXR->GetInput()->SendHapticEvent(OFF_HAND, 0.15f, fabsf(m_recoilparams.back_impulse)*3.0f);
 		}

Code/Single.cpp

@@ -2972,6 +2972,8 @@ void CSingle::RecoilImpulse(const Vec3& firingPos, const Vec3& firingDir)
 			{
 				gXR->GetInput()->SendHapticEvent(m_pWeapon->IsDualWieldMaster() ? RIGHT_HAND : LEFT_HAND, 0.05f, max(0.35f, fabsf(m_recoilparams.back_impulse) * 2.0f));
 				gHaptics->TriggerBHapticsEffectForSide(m_pWeapon->IsDualWieldMaster() ? RIGHT_HAND : LEFT_HAND, "shoot_l_vest", "shoot_r_vest", 0.2f * max(0.35f, fabsf(m_recoilparams.back_impulse) * 2.0f));
+				bool protubeOffHand = g_pGameCVars->vr_weapon_hand == 1 ? m_pWeapon->IsDualWieldSlave() : m_pWeapon->IsDualWieldMaster();
+				gHaptics->TriggerProtubeEffect(0.3f, 0.f, 0.f, protubeOffHand);
 			}
 			else
 			{
@@ -2987,22 +2989,27 @@ void CSingle::RecoilImpulse(const Vec3& firingPos, const Vec3& firingDir)
 				else if (strcmp(weaponClass, "GaussRifle") == 0)
 				{
 					gHaptics->TriggerBHapticsEffectForSide(WEAPON_HAND, "shotgun_l_vest", "shotgun_r_vest", 0.3f);
+					gHaptics->TriggerProtubeEffectWeapon(0.6f, 0.5f, 0.5f);
 				}
 				else if (strcmp(weaponClass, "DSG1") == 0)
 				{
 					gHaptics->TriggerBHapticsEffectForSide(WEAPON_HAND, "shotgun_l_vest", "shotgun_r_vest", 0.3f);
+					gHaptics->TriggerProtubeEffectWeapon(0.6f, 0.5f, 0.5f);
 				}
 				else if (strcmp(weaponClass, "LAW") == 0)
 				{
 					gHaptics->TriggerBHapticsEffectForSide(WEAPON_HAND, "rpg_l_vest", "rpg_r_vest", 0.5f);
+					gHaptics->TriggerProtubeEffectWeapon(1.f, 1.f, 1.f);
 				}
 				else if (strcmp(weaponClass, "TACGun") == 0 || strcmp(weaponClass, "TACGun_Fleet") == 0)
 				{
 					gHaptics->TriggerBHapticsEffectForSide(WEAPON_HAND, "rpg_l_vest", "rpg_r_vest", 0.5f);
+					gHaptics->TriggerProtubeEffectWeapon(1.f, 1.f, 1.f);
 				}
 				else
 				{
 					gHaptics->TriggerBHapticsEffectForSide(WEAPON_HAND, "shoot_l_vest", "shoot_r_vest", 0.15f * max(0.35f, fabsf(m_recoilparams.back_impulse) * 2.0f));
+					gHaptics->TriggerProtubeEffectWeapon(0.4f, 0.0f, 0.0f);
 				}
 			}
 		}

Code/ThirdParty/ForceTubeVR/bin/ForceTubeVR_API_x32.lib

@@ -3,6 +3,7 @@
 #include "VRHaptics.h"
 #include "VRManager.h"
 #include <HapticLibrary.h>
+#include <protubevr.h>
 
 #include "GameCVars.h"
 #include "OpenXRRuntime.h"
@@ -18,6 +19,7 @@ VRHaptics* gHaptics = &haptics;
 void VRHaptics::Init()
 {
 	InitialiseSync("crysisvr", "Crysis VR");
+	InitRifle();
 	InitEffects();
 	CryLogAlways("Initialised bHaptics support");
 }
@@ -104,6 +106,28 @@ void VRHaptics::StopBHapticsEffect(const char* key)
 	TurnOffKey(key);
 }
 
+void VRHaptics::TriggerProtubeEffect(float kickPower, float rumblePower, float rumbleSeconds, bool offHand)
+{
+	if (kickPower > 0)
+	{
+		if (rumblePower > 0 && rumbleSeconds > 0)
+			ProtubeShot(kickPower, rumblePower, rumbleSeconds, offHand);
+		else
+			ProtubeKick(kickPower, offHand);
+	}
+	else if (rumblePower > 0 && rumbleSeconds > 0)
+	{
+		ProtubeRumble(rumblePower, rumbleSeconds, offHand);
+	}
+}
+
+void VRHaptics::TriggerProtubeEffectWeapon(float kickPower, float rumblePower, float rumbleSeconds)
+{
+	TriggerProtubeEffect(kickPower, rumblePower, rumbleSeconds);
+	if (gVR->IsOffHandGrabbingWeapon())
+		TriggerProtubeEffect(kickPower, rumblePower, rumbleSeconds, true);
+}
+
 void VRHaptics::InitEffects()
 {
 	RegisterBHapticsEffect("jump_vest", "bhaptics/vest/Jumping.tact");
@@ -130,3 +154,25 @@ void VRHaptics::InitEffects()
 	RegisterBHapticsEffect("speedsprintwater_vest", "bhaptics/vest/SpeedSprintWater.tact");
 	RegisterBHapticsEffect("vehicle_vest", "bhaptics/vest/VehicleRumble.tact");
 }
+
+void VRHaptics::ProtubeKick(float power, bool offHand)
+{
+	uint8 pw = clamp_tpl(power, 0.f, 1.f) * 255;
+	ForceTubeVRChannel channel = offHand ? rifleBolt : rifleButt;
+	KickChannel(pw, channel);
+}
+
+void VRHaptics::ProtubeRumble(float power, float seconds, bool offHand)
+{
+	uint8 pw = clamp_tpl(power, 0.f, 1.f) * 255;
+	ForceTubeVRChannel channel = offHand ? rifleBolt : rifleButt;
+	RumbleChannel(pw, seconds, channel);
+}
+
+void VRHaptics::ProtubeShot(float kickPower, float rumblePower, float rumbleSeconds, bool offHand)
+{
+	uint8 kpw = clamp_tpl(kickPower, 0.f, 1.f) * 255;
+	uint8 rpw = clamp_tpl(rumblePower, 0.f, 1.f) * 255;
+	ForceTubeVRChannel channel = offHand ? rifleBolt : rifleButt;
+	ShotChannel(kpw, rpw, rumbleSeconds, channel);
+}

Code/ThirdParty/ForceTubeVR/bin/ForceTubeVR_API_x64.lib

@@ -14,9 +14,14 @@ class VRHaptics
 	void TriggerBHapticsEffectForSide(EVRHand hand, const char* keyLeft, const char* keyRight, float intensity = 1.0f);
 	bool IsBHapticsEffectPlaying(const char* key) const;
 	void StopBHapticsEffect(const char* key);
+	void TriggerProtubeEffect(float kickPower, float rumblePower, float rumbleSeconds, bool offHand = false);
+	void TriggerProtubeEffectWeapon(float kickPower, float rumblePower, float rumbleSeconds);
 
 private:
 	void InitEffects();
+	void ProtubeKick(float power, bool offHand = false);
+	void ProtubeRumble(float power, float seconds, bool offHand = false);
+	void ProtubeShot(float kickPower, float rumblePower, float rumbleSeconds, bool offHand = false);
 };
 
 extern VRHaptics* gHaptics;