Merge pull request #353 from De-Panther/set_normal_camera_pose_on_return

Added an option in WebXRCameraSettings to set flat/normal mode camera pose when returning from XR mode

Author: De-Panther

MainProject/Assets/XR/Settings/Open XR Package Settings.asset

@@ -32,7 +32,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7de993716e042c6499d0c18eed3a773c, type: 3}
   m_Name: MockRuntime Standalone
   m_EditorClassIdentifier: 
-  m_enabled: 1
+  m_enabled: 0
   nameUi: Mock Runtime
   version: 0.0.2
   featureIdInternal: com.unity.openxr.feature.mockruntime

Packages/webxr/CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- An option in WebXRCameraSettings to set flat/normal mode camera pose when returning from XR mode.
+
 ### Changed
 - XR Hand pinch is now detected manually instead of relying on system select event, to support Apple Vision Pro.
 

Packages/webxr/Runtime/Scripts/WebXRCameraSettings.cs

@@ -7,6 +7,9 @@ public class WebXRCameraSettings : MonoBehaviour
     [SerializeField]
     private Camera m_camera;
 
+    [SerializeField]
+    private Transform m_transform;
+
     [SerializeField]
     private CameraClearFlags m_normalClearFlags;
 
@@ -34,6 +37,27 @@ public class WebXRCameraSettings : MonoBehaviour
     [SerializeField]
     private LayerMask m_arCullingMask;
 
+    [SerializeField]
+    private bool m_updateNormalFieldOfView = true;
+
+    [SerializeField]
+    private bool m_useNormalFieldOfViewFromAwake = true;
+
+    [SerializeField]
+    private float m_normalFieldOfView = 60f;
+
+    [SerializeField]
+    private bool m_updateNormalLocalPose = true;
+
+    [SerializeField]
+    private bool m_useNormalPoseFromAwake = true;
+
+    [SerializeField]
+    private Vector3 m_normalLocalPosition = Vector3.zero;
+
+    [SerializeField]
+    private Quaternion m_normalLocalRotation = Quaternion.identity;
+
     public Camera Camera
     {
       get { return m_camera; }
@@ -94,6 +118,66 @@ public LayerMask ARCullingMask
       set { m_arCullingMask = value; }
     }
 
+    public bool UpdateNormalFieldOfView
+    {
+      get { return m_updateNormalFieldOfView; }
+      set { m_updateNormalFieldOfView = value; }
+    }
+
+    public bool UseNormalFieldOfViewFromAwake
+    {
+      get { return m_useNormalFieldOfViewFromAwake; }
+      set { m_useNormalFieldOfViewFromAwake = value; }
+    }
+
+    public float NormalFieldOfView
+    {
+      get { return m_normalFieldOfView; }
+      set { m_normalFieldOfView = value; }
+    }
+
+    public bool UpdateNormalLocalPose
+    {
+      get { return m_updateNormalLocalPose; }
+      set { m_updateNormalLocalPose = value; }
+    }
+
+    public bool UseNormalPoseFromAwake
+    {
+      get { return m_useNormalPoseFromAwake; }
+      set { m_useNormalPoseFromAwake = value; }
+    }
+
+    public Vector3 NormalLocalPosition
+    {
+      get { return m_normalLocalPosition; }
+      set { m_normalLocalPosition = value; }
+    }
+
+    public Quaternion NormalLocalRotation
+    {
+      get { return m_normalLocalRotation; }
+      set { m_normalLocalRotation = value; }
+    }
+
+    private void Awake()
+    {
+      if (m_camera == null)
+      {
+        return;
+      }
+      m_transform = m_camera.transform;
+      if (m_useNormalFieldOfViewFromAwake)
+      {
+        m_normalFieldOfView = m_camera.fieldOfView;
+      }
+      if (m_useNormalPoseFromAwake)
+      {
+        m_normalLocalPosition = m_transform.localPosition;
+        m_normalLocalRotation = m_transform.localRotation;
+      }
+    }
+
     private void OnEnable()
     {
       WebXRManager.OnXRChange += OnXRChange;
@@ -120,6 +204,20 @@ private void OnXRChange(WebXRState state, int viewsCount, Rect leftRect, Rect ri
           m_camera.clearFlags = m_normalClearFlags;
           m_camera.backgroundColor = m_normalBackgroundColor;
           m_camera.cullingMask = m_normalCullingMask;
+          if (m_updateNormalFieldOfView)
+          {
+            m_camera.fieldOfView = m_normalFieldOfView;
+            m_camera.ResetProjectionMatrix();
+          }
+          if (m_updateNormalLocalPose)
+          {
+#if HAS_POSITION_AND_ROTATION
+            m_transform.SetLocalPositionAndRotation(m_normalLocalPosition, m_normalLocalRotation);
+#else
+            m_transform.localPosition = m_normalLocalPosition;
+            m_transform.localRotation = m_normalLocalRotation;
+#endif
+          }
           break;
         case WebXRState.VR:
           m_camera.clearFlags = m_vrClearFlags;