Merge pull request #136 from De-Panther/camerafollower

CameraFollower

Author: De-Panther

Build/Build/Build.data.unityweb

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- AudioListener in the WebXRCameraSet prefabs is now attached to CameraFollower.
 
 ## [0.8.0] - 2020-02-26
 ### Fixed

Build/Build/Build.wasm

@@ -158,7 +158,6 @@ GameObject:
   m_Component:
   - component: {fileID: 4414771795277364}
   - component: {fileID: 114243127810226890}
-  - component: {fileID: 81178167226133646}
   m_Layer: 0
   m_Name: Cameras
   m_TagString: Untagged
@@ -182,6 +181,7 @@ Transform:
   - {fileID: 4172172842306312}
   - {fileID: 849935389208116915}
   - {fileID: 1484378268851619093}
+  - {fileID: 4098080034801200690}
   m_Father: {fileID: 4545079059221816}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -202,14 +202,7 @@ MonoBehaviour:
   cameraR: {fileID: 20572450475250664}
   cameraARL: {fileID: 8992034749185188121}
   cameraARR: {fileID: 3431978019681743018}
---- !u!81 &81178167226133646
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1363028859183752}
-  m_Enabled: 1
+  cameraFollower: {fileID: 4098080034801200690}
 --- !u!1 &1611361787474004
 GameObject:
   m_ObjectHideFlags: 0
@@ -937,6 +930,45 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &5198446956910366709
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4098080034801200690}
+  - component: {fileID: 5982351567310310783}
+  m_Layer: 0
+  m_Name: CameraFollower
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4098080034801200690
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5198446956910366709}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4414771795277364}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!81 &5982351567310310783
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5198446956910366709}
+  m_Enabled: 1
 --- !u!1 &6032564905858711458
 GameObject:
   m_ObjectHideFlags: 0

Build/Build/Build.wasm.framework.unityweb

@@ -709,7 +709,6 @@ GameObject:
   m_Component:
   - component: {fileID: 4414771795277364}
   - component: {fileID: 114243127810226890}
-  - component: {fileID: 81178167226133646}
   m_Layer: 0
   m_Name: Cameras
   m_TagString: Untagged
@@ -733,6 +732,7 @@ Transform:
   - {fileID: 4172172842306312}
   - {fileID: 849935389208116915}
   - {fileID: 1484378268851619093}
+  - {fileID: 7928341879765250305}
   m_Father: {fileID: 4545079059221816}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -753,14 +753,7 @@ MonoBehaviour:
   cameraR: {fileID: 20572450475250664}
   cameraARL: {fileID: 8992034749185188121}
   cameraARR: {fileID: 3431978019681743018}
---- !u!81 &81178167226133646
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1363028859183752}
-  m_Enabled: 1
+  cameraFollower: {fileID: 7928341879765250305}
 --- !u!1 &1375127060900384
 GameObject:
   m_ObjectHideFlags: 0
@@ -2071,6 +2064,45 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
+--- !u!1 &3612796559000632551
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7928341879765250305}
+  - component: {fileID: 5913451601264154887}
+  m_Layer: 0
+  m_Name: CameraFollower
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7928341879765250305
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3612796559000632551}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4414771795277364}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!81 &5913451601264154887
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3612796559000632551}
+  m_Enabled: 1
 --- !u!1 &6032564905858711458
 GameObject:
   m_ObjectHideFlags: 0

Packages/webxr-interactions/CHANGELOG.md

@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- CameraFollower to WebXRCamera, for AudioListener to follow active cameras poses.
+
 ### Changed
 - Optimization for JavaScript to C# communication.
 

Packages/webxr-interactions/Runtime/Prefabs/WebXRCameraSet.prefab

@@ -15,6 +15,8 @@ public enum CameraID
 
     [SerializeField]
     private Camera cameraMain = null, cameraL = null, cameraR = null, cameraARL = null, cameraARR = null;
+    [SerializeField]
+    private Transform cameraFollower = null;
 
     private WebXRState xrState = WebXRState.NORMAL;
     private Rect leftRect, rightRect;
@@ -23,10 +25,13 @@ public enum CameraID
 
     private bool switched = false;
 
+    private bool hasFollower = false;
+
     void OnEnable()
     {
       WebXRManager.OnXRChange += OnXRChange;
       WebXRManager.OnHeadsetUpdate += OnHeadsetUpdate;
+      hasFollower = cameraFollower != null;
     }
 
     void OnDisable()
@@ -37,39 +42,65 @@ void OnDisable()
 
     void Update()
     {
-      if (switched)
+      if (!switched)
+      {
+        switched = true;
+        switch (xrState)
+        {
+          case WebXRState.AR:
+            cameraMain.enabled = false;
+            cameraL.enabled = false;
+            cameraR.enabled = false;
+            cameraARL.enabled = viewsCount > 0;
+            cameraARL.rect = leftRect;
+            cameraARR.enabled = viewsCount > 1;
+            cameraARR.rect = rightRect;
+            break;
+          case WebXRState.VR:
+            cameraMain.enabled = false;
+            cameraL.enabled = viewsCount > 0;
+            cameraL.rect = leftRect;
+            cameraR.enabled = viewsCount > 1;
+            cameraR.rect = rightRect;
+            cameraARL.enabled = false;
+            cameraARR.enabled = false;
+            break;
+          case WebXRState.NORMAL:
+            cameraMain.enabled = true;
+            cameraL.enabled = false;
+            cameraR.enabled = false;
+            cameraARL.enabled = false;
+            cameraARR.enabled = false;
+            break;
+        }
+      }
+      UpdateFollower();
+    }
+
+    private void UpdateFollower()
+    {
+      if (!hasFollower)
       {
         return;
       }
-      switched = true;
       switch (xrState)
       {
         case WebXRState.AR:
-          cameraMain.enabled = false;
-          cameraL.enabled = false;
-          cameraR.enabled = false;
-          cameraARL.enabled = viewsCount > 0;
-          cameraARL.rect = leftRect;
-          cameraARR.enabled = viewsCount > 1;
-          cameraARR.rect = rightRect;
-          break;
+          cameraFollower.localRotation = cameraARL.transform.localRotation;
+          if (viewsCount > 1)
+          {
+            cameraFollower.localPosition = (cameraARL.transform.localPosition + cameraARR.transform.localPosition) * 0.5f;
+            return;
+          }
+          cameraFollower.localPosition = cameraARL.transform.localPosition;
+          return;
         case WebXRState.VR:
-          cameraMain.enabled = false;
-          cameraL.enabled = viewsCount > 0;
-          cameraL.rect = leftRect;
-          cameraR.enabled = viewsCount > 1;
-          cameraR.rect = rightRect;
-          cameraARL.enabled = false;
-          cameraARR.enabled = false;
-          break;
-        case WebXRState.NORMAL:
-          cameraMain.enabled = true;
-          cameraL.enabled = false;
-          cameraR.enabled = false;
-          cameraARL.enabled = false;
-          cameraARR.enabled = false;
-          break;
+          cameraFollower.localRotation = cameraL.transform.localRotation;
+          cameraFollower.localPosition = (cameraL.transform.localPosition + cameraR.transform.localPosition) * 0.5f;
+          return;
       }
+      cameraFollower.localRotation = cameraMain.transform.localRotation;
+      cameraFollower.localPosition = cameraMain.transform.localPosition;
     }
 
     public Quaternion GetLocalRotation()