Merge pull request #320 from De-Panther/eventscamera_webxrcamera

Added an option for eventsCamera in WebXRCamera

Author: De-Panther

Packages/webxr-interactions/Samples~/XRInteractionToolkit/Prefabs/XR Origin (WebXR Rig).prefab

@@ -876,6 +876,7 @@ MonoBehaviour:
   cameraARL: {fileID: 469584278722724955}
   cameraARR: {fileID: 2113255073564658967}
   cameraFollower: {fileID: 5280121735958530868}
+  eventsCamera: {fileID: 5934003548109805725}
   updateCameraTag: 0
 --- !u!1 &1470279098769358944
 GameObject:

Packages/webxr/CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - WebXRHandData pointerPosition and pointerRotation (WebXR targetRaySpace for hands).
+- An option for eventsCamera in WebXRCamera.
 
 ### Changed
 - Enabled stencil buffer when creating the session XRWebGLLayer.

Packages/webxr/Runtime/Scripts/WebXRCamera.cs

@@ -22,12 +22,16 @@ public enum CameraID
     [SerializeField]
     private Transform cameraFollower = null;
 
+    [SerializeField]
+    private Camera eventsCamera = null;
+
     private WebXRState xrState = WebXRState.NORMAL;
     private Rect leftRect, rightRect;
 
     private int viewsCount = 1;
 
     private bool hasFollower = false;
+    private bool hasEventsCamera = false;
 
     [SerializeField]
     private bool updateCameraTag = false;
@@ -37,6 +41,7 @@ private void OnEnable()
       WebXRManager.OnXRChange += OnXRChange;
       WebXRManager.OnHeadsetUpdate += OnHeadsetUpdate;
       hasFollower = cameraFollower != null;
+      hasEventsCamera = eventsCamera != null;
       OnXRChange(WebXRManager.Instance.XRState,
                   WebXRManager.Instance.ViewsCount,
                   WebXRManager.Instance.ViewsLeftRect,
@@ -102,6 +107,10 @@ private void SwitchXRState()
           }
           break;
       }
+      if (hasEventsCamera)
+      {
+        eventsCamera.projectionMatrix = cameraMain.projectionMatrix;
+      }
     }
 
     private void UpdateFollower()
@@ -235,6 +244,10 @@ private void OnHeadsetUpdate(
         cameraARR.transform.localRotation = rightRotation;
 #endif
         cameraARR.projectionMatrix = rightProjectionMatrix;
+        if (hasEventsCamera && viewsCount == 1)
+        {
+          eventsCamera.projectionMatrix = leftProjectionMatrix;
+        }
       }
     }
   }