Basic melee VR attacks working

Author: fholger

Code/Melee.cpp

@@ -24,7 +24,9 @@ Copyright (C), Crytek Studios, 2001-2006.
 
 
 #include "IRenderer.h"
-#include "IRenderAuxGeom.h"	
+#include "IRenderAuxGeom.h"
+#include "VR/OpenXRRuntime.h"
+#include "VR/VRManager.h"
 
 
 //std::vector<Vec3> g_points;
@@ -106,16 +108,37 @@ void CMelee::Update(float frameTime, uint frameId)
 					}
 				}
 
-				SMovementState info;
-				pMC->GetMovementState(info);
-				pos = info.eyePosition;
-				dir = info.eyeDirection;
-				if (!PerformRayTest(pos, dir, strength, false))
-					if(!PerformCylinderTest(pos, dir, strength, false))
-						ApplyCameraShake(false);
-
-				m_ignoredEntity = 0;
-				m_meleeScale = 1.0f;
+				if (pActor->IsClient())
+				{
+					for (int i = 0; i < 2; ++i)
+					{
+						Vec3 velocity = gVR->GetControllerWorldVelocity(i);
+						if (velocity.GetLength() < 1.5f)
+							continue;
+
+						pos = gVR->GetWorldControllerTransform(i).GetTranslation();
+						dir = velocity.GetNormalized();
+						pos -= dir * 0.15f; // bit more wiggle room for hits
+						if (PerformRayTest(pos, dir, strength, false) || PerformCylinderTest(pos, dir, strength, false))
+						{
+							gXR->GetInput()->SendHapticEvent(i == 0 ? LEFT_HAND : RIGHT_HAND, 0.15f, 0.6f);
+							break;
+						}
+					}
+				}
+				else
+				{
+					SMovementState info;
+					pMC->GetMovementState(info);
+					pos = info.eyePosition;
+					dir = info.eyeDirection;
+					if (!PerformRayTest(pos, dir, strength, false))
+						if(!PerformCylinderTest(pos, dir, strength, false))
+							ApplyCameraShake(false);
+
+					m_ignoredEntity = 0;
+					m_meleeScale = 1.0f;
+				}
 
 				m_pWeapon->RequestMeleeAttack(m_pWeapon->GetMeleeFireMode()==this, pos, dir, m_pWeapon->GetShootSeqN());
 			}

Code/NanoSuit.cpp

@@ -1102,9 +1102,9 @@ void CNanoSuit::PlaySound(ENanoSound sound, float param, bool stopSound)
 	case STRENGTH_MELEE_SOUND:
 		soundName = "Sounds/interface:suit:suit_strength_punch";
 		eSemantic = eSoundSemantic_NanoSuit;
-		if(m_pOwner->IsClient())
+		//if(m_pOwner->IsClient())
 			//if (gEnv->pInput && !stopSound) gEnv->pInput->ForceFeedbackEvent( SFFOutputEvent(eDI_XI, eFF_Rumble_Basic, 0.05f, 1.0f*param, 0.5f*param) );
-			if (!stopSound) gXR->GetInput()->SendHapticEvent(0.05f, 1.0f * param);
+			//if (!stopSound) gXR->GetInput()->SendHapticEvent(0.05f, 1.0f * param);
 		setParam = true;
 		break;
 	case ARMOR_SOUND:

Code/Player.cpp

@@ -5421,7 +5421,7 @@ void CPlayer::PlaySound(EPlayerSounds sound, bool play, bool param /*= false*/,
 		soundName = "Sounds/physics:player_foley:melee_feedback";
 		soundSemantic = eSoundSemantic_Player_Foley_Voice;
 		//if (gEnv->pInput && play) gEnv->pInput->ForceFeedbackEvent( SFFOutputEvent(eDI_XI, eFF_Rumble_Basic, 0.15f, 0.6f, 0.2f) );
-		if (play) gXR->GetInput()->SendHapticEvent(0.15f, 0.6f);
+		//if (play) gXR->GetInput()->SendHapticEvent(0.15f, 0.6f);
 		break;
 	case ESound_Fear:
 		soundName = "Sounds/physics:player_foley:alien_feedback";

Code/VR/OpenXRInput.cpp

@@ -515,9 +515,8 @@ void OpenXRInput::UpdateMeleeAttacks()
 	for (int i = 0; i < 2; ++i)
 	{
 		Vec3 controllerVelocity = GetControllerVelocity(i);
-		if (controllerVelocity.GetLength() > 2.f && controllerVelocity.Dot(hmdForward) > 0.f)
+		if (controllerVelocity.GetLength() > 1.5f && controllerVelocity.Dot(hmdForward) > 0.f)
 		{
-			CryLogAlways("Potential melee attack triggered");
 			weapon->MeleeAttack();
 			break;
 		}