Fix view flickering when exiting binoculars

fholger · Aug 28, 2023 · 5de90aa · 5de90aa
1 parent ec1b2a6
commit 5de90aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Sources/CryGame C++/Solution1/CryGame/VRManager.cpp b/Sources/CryGame C++/Solution1/CryGame/VRManager.cpp
@@ -405,6 +405,8 @@ void VRManager::FinishFrame()
 		IDirect3DTexture9 *tex = eye == 2 ? m_d3d->hudTexture.Get() : m_d3d->eyeTextures[eye].Get();
 		dxvkTransitionImageLayout(m_d3d->device.Get(), tex, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, origLayout[eye]);
 	}
+
+	m_wasBinocular = m_pGame->AreBinocularsActive();
 }
 
 vector2di VRManager::GetRenderSize() const
@@ -438,7 +440,7 @@ void VRManager::ModifyViewCamera(int eye, CCamera& cam)
 		return;
 	}
 
-	if (m_pGame->AreBinocularsActive())
+	if (m_pGame->AreBinocularsActive() || m_wasBinocular)
 	{
 		cam = m_binocularOriginalPlayerCam;
 	}

diff --git a/Sources/CryGame C++/Solution1/CryGame/VRManager.h b/Sources/CryGame C++/Solution1/CryGame/VRManager.h
@@ -145,6 +145,7 @@ class VRManager
 	Ang3 m_curBinocularAngles;
 	Vec3 m_curBinocularPos;
 	CCamera m_binocularOriginalPlayerCam;
+	bool m_wasBinocular = false;
 
 	void UpdateHmdTransform();
 	void ProcessRoomscale();