Stabilize weapon scope view

fholger · Jan 11, 2025 · 3a75ff6 · 3a75ff6
1 parent 6949ccd
commit 3a75ff6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/Code/HUD/HUD.cpp b/Code/HUD/HUD.cpp
@@ -3314,6 +3314,7 @@ void CHUD::OnPostUpdate(float frameTime)
 
 			float x = vScreenSpace.x*width*0.01f;
 			float y = vScreenSpace.y*height*0.01f;
+			x = y = 0;
 
 			//gEnv->pRenderer->Draw2dLabel(100,125,2,color,false,"%f, %f",x,y);
 

diff --git a/Code/VR/VRManager.cpp b/Code/VR/VRManager.cpp
@@ -405,6 +405,16 @@ void VRManager::ModifyCameraFor2D(CCamera& cam)
 	cam.SetMatrix(weaponView);
 }
 
+inline float GetAngleDifference360( float a1, float a2 )
+{
+	float res = a1-a2;
+	if (res > gf_PI)
+		res = res - gf_PI2;
+	else if (res < -gf_PI)
+		res = gf_PI2 + res;
+	return res;
+}
+
 void VRManager::ModifyWeaponPosition(CPlayer* player, Ang3& weaponAngles, Vec3& weaponPosition, bool slave)
 {
 	if (!g_pGameCVars->vr_enable_motion_controllers
@@ -447,7 +457,19 @@ void VRManager::ModifyWeaponPosition(CPlayer* player, Ang3& weaponAngles, Vec3&
 	weaponAngles = Ang3(trackedTransform);
 
 	if (weapon->IsZoomed())
+	{
 		weaponAngles.y = 0;
+		// smooth weapon orientation with exponential decay, since otherwise zoom is extremely unstable
+		IZoomMode* zm = weapon->GetZoomMode(weapon->GetCurrentZoomMode());
+		float factor = 0.03f * cry_powf(1.f / zm->GetZoomFoVScale(zm->GetCurrentStep()), 1.5f);
+		Ang3 smoothedAngles = weaponAngles;
+		float yawPitchDecay = powf(2.f, -gEnv->pSystem->GetITimer()->GetFrameTime() / factor);
+		smoothedAngles.z = weaponAngles.z + GetAngleDifference360(m_smoothedWeaponAngles.z, weaponAngles.z) * yawPitchDecay;
+		smoothedAngles.x = weaponAngles.x + GetAngleDifference360(m_smoothedWeaponAngles.x, weaponAngles.x) * yawPitchDecay;
+		weaponAngles = smoothedAngles;
+	}
+
+	m_smoothedWeaponAngles = weaponAngles;
 }
 
 Matrix34 VRManager::GetControllerTransform(int side)

diff --git a/Code/VR/VRManager.h b/Code/VR/VRManager.h
@@ -109,6 +109,8 @@ class VRManager
 	void ReleaseTextureSync(ID3D10Texture2D* target, int key);
 	void ReleaseTextureSync(ID3D11Texture2D* target, int key);
 
+	Ang3 m_smoothedWeaponAngles;
+
 	Vec3 m_referencePosition;
 	float m_referenceYaw = 0;
 	Matrix34 m_fixedHudTransform;