wip Roomscale: rotate player with HMD

Author: fholger

Code/Player.cpp

@@ -1013,6 +1013,17 @@ void CPlayer::Update(SEntityUpdateContext& ctx, int updateSlot)
 	UpdateSounds(ctx.fFrameTime);
 }
 
+void CPlayer::ProcessRoomscaleMovement()
+{
+	float hmdYaw = gVR->GetHmdYawOffset();
+	CMovementRequest mv;
+	mv.AddDeltaRotation(Ang3(0, 0, hmdYaw));
+	if (m_pMovementController->RequestMovement(mv))
+	{
+		gVR->UpdateReferenceYaw(hmdYaw);
+	}
+}
+
 void CPlayer::UpdateSounds(float fFrameTime)
 {
 	if(IsClient())
@@ -1311,6 +1322,9 @@ void CPlayer::PrePhysicsUpdate()
 				}		
 			}
 		}
+
+		if (m_linkStats.CanRotate() && g_pGameCVars->vr_enable_motion_controllers)
+			ProcessRoomscaleMovement();
   }
 
 	bool client(IsClient());

Code/Player.h

@@ -369,6 +369,7 @@ class CPlayer :
 	virtual void SetAuthority( bool auth );
 	virtual void SerializeXML( XmlNodeRef& node, bool bLoading );
 	virtual void Update(SEntityUpdateContext& ctx, int updateSlot);
+	void ProcessRoomscaleMovement();
 	virtual void PrePhysicsUpdate();
 	virtual void UpdateView(SViewParams &viewParams);
 	virtual void PostUpdateView(SViewParams &viewParams);

Code/PlayerMovement.cpp

@@ -10,6 +10,7 @@
 #include "PlayerInput.h"
 #include "GameActions.h"
 #include "NetInputChainDebug.h"
+#include "VR/VRManager.h"
 
 #undef CALL_PLAYER_EVENT_LISTENERS
 #define CALL_PLAYER_EVENT_LISTENERS(func) \

Code/VR/OpenXRRuntime.cpp

@@ -361,6 +361,13 @@ Matrix34 OpenXRRuntime::GetRenderEyeTransform(int eye) const
 	return OpenXRToCrysis(m_renderViews[eye].pose.orientation, m_renderViews[eye].pose.position);
 }
 
+Matrix44 OpenXRRuntime::GetHmdTransform() const
+{
+	Matrix44 hmdTransform = GetRenderEyeTransform(0);
+	hmdTransform = (hmdTransform + GetRenderEyeTransform(1)) * .5f;
+	return hmdTransform;
+}
+
 void OpenXRRuntime::GetFov(int eye, float& tanl, float& tanr, float& tant, float& tanb) const
 {
 	tanl = tanf(m_renderViews[eye].fov.angleLeft);

Code/VR/OpenXRRuntime.h

@@ -20,6 +20,7 @@ class OpenXRRuntime
 	void Update();
 
 	Matrix34 GetRenderEyeTransform(int eye) const;
+	Matrix44 GetHmdTransform() const;
 	void GetFov(int eye, float& tanl, float& tanr, float& tant, float& tanb) const;
 	Vec2i GetRecommendedRenderSize() const;
 

Code/VR/VRManager.cpp

@@ -245,6 +245,8 @@ void VRManager::ModifyViewCamera(int eye, CCamera& cam)
 		if (isCutscene)
 		{
 			maxDiff = g_pGameCVars->vr_cutscenes_angle_snap * g_PI / 180.f;
+			if (g_pGameCVars->vr_cutscenes_2d)
+				maxDiff = 0;
 			if (yawDiff > maxDiff || yawDiff < -maxDiff)
 				m_prevViewYaw = angles.z;
 		}
@@ -272,7 +274,7 @@ void VRManager::ModifyViewCamera(int eye, CCamera& cam)
 	Matrix34 viewMat;
 	viewMat.SetRotationXYZ(angles, position);
 
-	Matrix34 eyeMat = gXR->GetRenderEyeTransform(eye);
+	Matrix34 eyeMat = gVR->GetEyeTransform(eye);
 	viewMat = viewMat * eyeMat;
 
 	cam.SetMatrix(viewMat);
@@ -368,6 +370,46 @@ RectF VRManager::GetEffectiveRenderLimits(int eye)
 	return result;
 }
 
+Matrix33 VRManager::GetReferenceTransform() const
+{
+	Ang3 refAngles(0, 0, m_referenceYaw);
+	return Matrix33::CreateRotationXYZ(refAngles).GetTransposed();
+}
+
+Vec3 VRManager::GetHmdOffset() const
+{
+	Vec3 position = gXR->GetHmdTransform().GetTranslation();
+	return GetReferenceTransform() * (position - m_referencePosition);
+}
+
+float VRManager::GetHmdYawOffset() const
+{
+	Ang3 angles(gXR->GetHmdTransform());
+	return angles.z - m_referenceYaw;
+}
+
+void VRManager::UpdateReferenceOffset(const Vec3& offset)
+{
+	// added offset is in player space, convert back to raw HMD space
+	Vec3 rawOffset = GetReferenceTransform().GetTransposed() * offset;
+	rawOffset.z = 0;
+	m_referencePosition += rawOffset;
+}
+
+void VRManager::UpdateReferenceYaw(float yaw)
+{
+	m_referenceYaw += yaw;
+}
+
+Matrix34 VRManager::GetEyeTransform(int eye) const
+{
+	Matrix34 rawEye = gXR->GetRenderEyeTransform(eye);
+	Vec3 position = GetReferenceTransform() * (rawEye.GetTranslation() - m_referencePosition);
+	Ang3 angles(rawEye);
+	angles.z -= m_referenceYaw;
+	return Matrix34::CreateRotationXYZ(angles, position);
+}
+
 void VRManager::InitDevice(IDXGISwapChain* swapchain)
 {
 	m_hudTexture.Reset();

Code/VR/VRManager.h

@@ -39,6 +39,15 @@ class VRManager
 
 	RectF GetEffectiveRenderLimits(int eye);
 
+	Matrix33 GetReferenceTransform() const;
+	Vec3 GetHmdOffset() const;
+	float GetHmdYawOffset() const;
+
+	void UpdateReferenceOffset(const Vec3& offset);
+	void UpdateReferenceYaw(float yaw);
+
+	Matrix34 GetEyeTransform(int eye) const;
+
 private:
 	bool m_initialized = false;
 	ComPtr<ID3D10Device1> m_device;
@@ -59,6 +68,9 @@ class VRManager
 	void CreateHUDTexture();
 	void CreateSharedTexture(ComPtr<ID3D10Texture2D>& texture, ComPtr<ID3D11Texture2D>& texture11, int width, int height);
 	void CopyBackbufferToTexture(ID3D10Texture2D *target);
+
+	Vec3 m_referencePosition;
+	float m_referenceYaw = 0;
 };
 
 extern VRManager* gVR;