Force activated weapon scopes to render in 2D to make them usable

fholger · Apr 13, 2023 · 3c6e48f · 3c6e48f
1 parent 9560d48
commit 3c6e48f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/Code/HUD/HUD.cpp b/Code/HUD/HUD.cpp
@@ -3277,8 +3277,11 @@ void CHUD::OnPostUpdate(float frameTime)
 			int zoommode = m_pHUDScopes->m_iZoomLevel;
 
 			Vec3 vWorldPos;
-			if(!pCurrentWeapon->GetScopePosition(vWorldPos))
-				vWorldPos = gEnv->pRenderer->GetCamera().GetPosition();
+			if (!pCurrentWeapon->GetScopePosition(vWorldPos))
+			{
+				//vWorldPos = gEnv->pRenderer->GetCamera().GetPosition();
+				vWorldPos = gVRRenderer->GetCurrentViewCamera().GetPosition();
+			}
 
 			//float color[] = {1,1,1,0.5f};
 			//gEnv->pRenderer->Draw2dLabel(100,100,2,color,false,"%f, %f, %f",vWorldPos.x,vWorldPos.y,vWorldPos.z);

diff --git a/Code/Single.cpp b/Code/Single.cpp
@@ -1231,7 +1231,8 @@ bool CSingle::CrosshairAssistAiming(const Vec3& firingPos, Vec3& firingDir, ray_
   if (pEntity && m_pWeapon->IsValidAssistTarget(pEntity, pSelf, false))
     return false;
 
-  const CCamera& cam = gEnv->pRenderer->GetCamera();
+  //const CCamera& cam = gEnv->pRenderer->GetCamera();
+  const CCamera& cam = gVRRenderer->GetCurrentViewCamera();
   Lineseg lineseg(cam.GetPosition(), cam.GetPosition()+m_fireparams.crosshair_assist_range*cam.GetViewdir());  
 
   float t = 0.f;  

diff --git a/Code/VR/VRRenderer.cpp b/Code/VR/VRRenderer.cpp
@@ -6,6 +6,7 @@
 #include "GameCVars.h"
 #include "Hooks.h"
 #include "IRenderAuxGeom.h"
+#include "IronSight.h"
 #include "IVehicleSystem.h"
 #include "OpenXRManager.h"
 #include "Player.h"
@@ -185,6 +186,20 @@ bool VRRenderer::ShouldRenderVR() const
 	if (g_pGameCVars->vr_cutscenes_2d && g_pGame->GetIGameFramework()->GetIViewSystem()->IsPlayingCutScene())
 		return false;
 
+	CPlayer *pPlayer = static_cast<CPlayer *>(gEnv->pGame->GetIGameFramework()->GetClientActor());
+	if (pPlayer)
+	{
+		if (CWeapon* weapon = pPlayer->GetWeapon(pPlayer->GetCurrentItemId(true)))
+		{
+			IZoomMode* zoom = weapon->GetZoomMode(weapon->GetCurrentZoomMode());
+			if (CIronSight *sight = dynamic_cast<CIronSight*>(zoom))
+			{
+				if (sight->IsScope() && (sight->IsZoomed() || sight->IsZooming()))
+					return false;
+			}
+		}
+	}
+
 	return !m_binocularsActive;
 }