Camera System Refactor (#54)

* updated references to camera system * Changed timing of initialization to prevent race condition * updated constructors for data providers * Removed head height settings in controllers * added initial platform definition for Oculus * removed * Added Oculus Camera Data Providers * updated icons * Updated platform check for Version and check headset connected for runtime. (#59) Tested on platform * Added platform overrides Co-authored-by: Simon (Darkside) Jackson <[email protected]>
XRTK · Apr 23, 2020 · 73f0086 · 73f0086
1 parent a83cabc
commit 73f0086
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 23 deletions.
diff --git a/Controllers/OculusControllerDataProvider.cs b/Controllers/OculusControllerDataProvider.cs
@@ -31,17 +31,6 @@ public OculusControllerDataProvider(string name, uint priority, BaseMixedReality
         private float deviceRefreshTimer;
         private OculusApi.Controller lastDeviceList;
 
-        /// <inheritdoc />
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            if (MixedRealityToolkit.CameraSystem != null)
-            {
-                MixedRealityToolkit.CameraSystem.HeadHeight = OculusApi.EyeHeight;
-            }
-        }
-
         /// <inheritdoc />
         public override void Update()
         {

diff --git a/Controllers/OculusHandControllerDataProvider.cs b/Controllers/OculusHandControllerDataProvider.cs
@@ -31,17 +31,12 @@ public OculusHandControllerDataProvider(string name, uint priority, OculusHandCo
         /// <summary>
         /// The minimum required tracking confidence for hands to be registered.
         /// </summary>
-        public OculusApi.TrackingConfidence MinConfidenceRequired { get; } = OculusApi.TrackingConfidence.Low;
+        public OculusApi.TrackingConfidence MinConfidenceRequired { get; }
 
         /// <inheritdoc />
-        public override void Initialize()
+        public override void Enable()
         {
-            base.Initialize();
-
-            if (MixedRealityToolkit.CameraSystem != null)
-            {
-                MixedRealityToolkit.CameraSystem.HeadHeight = OculusApi.EyeHeight;
-            }
+            base.Enable();
 
             OculusHandDataConverter.HandMeshingEnabled = HandMeshingEnabled;
         }

diff --git a/Runtime/OculusPlatform.cs.meta b/Runtime/OculusPlatform.cs.meta
diff --git a/Runtime/Providers.meta b/Runtime/Providers.meta
diff --git a/Runtime/Providers/OculusCameraDataProvider.cs b/Runtime/Providers/OculusCameraDataProvider.cs
@@ -0,0 +1,26 @@
+// Copyright (c) XRTK. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using XRTK.Definitions.CameraSystem;
+using XRTK.Interfaces.CameraSystem;
+using XRTK.Providers.CameraSystem;
+
+namespace XRTK.Oculus.Providers.CameraSystem
+{
+    public class OculusCameraDataProvider : BaseCameraDataProvider
+    {
+        /// <inheritdoc />
+        public OculusCameraDataProvider(string name, uint priority, BaseMixedRealityCameraDataProviderProfile profile, IMixedRealityCameraSystem parentService)
+            : base(name, priority, profile, parentService)
+        {
+        }
+
+        /// <inheritdoc />
+        protected override void ApplySettingsForDefaultHeadHeight()
+        {
+            HeadHeight = OculusApi.EyeHeight;
+            ResetRigTransforms();
+            SyncRigTransforms();
+        }
+    }
+}
diff --git a/Runtime/Providers/OculusCameraDataProvider.cs.meta b/Runtime/Providers/OculusCameraDataProvider.cs.meta