Native Oculus Pre-Updates (#213)

* Some pre updates for the native Oculus support: * Renamed existing OpenVR controller definitions to match other extensions * Added FixedUpdate and LateUpdate to services definitions * Finalising File renames Updated to 2019.1.7f1
XRTK · Jun 23, 2019 · 885f54f · 885f54f
1 parent e3df669
commit 885f54f
Show file tree

Hide file tree

Showing 18 changed files with 117 additions and 21 deletions.
diff --git a/Definitions/Controllers/OpenVR/OculusGoControllerMappingProfile.cs b/Definitions/Controllers/OpenVR/OculusGoControllerMappingProfile.cs
@@ -22,7 +22,7 @@ protected override void Awake()
             {
                 ControllerMappings = new[]
                 {
-                    new MixedRealityControllerMapping("Oculus Go Controller", typeof(OculusGoController), Handedness.Both),
+                    new MixedRealityControllerMapping("Oculus Go Controller", typeof(OculusGoOpenVRController), Handedness.Both),
                 };
             }
 

diff --git a/Definitions/Controllers/OpenVR/OculusRemoteControllerMappingProfile.cs b/Definitions/Controllers/OpenVR/OculusRemoteControllerMappingProfile.cs
@@ -21,7 +21,7 @@ protected override void Awake()
             {
                 ControllerMappings = new[]
                 {
-                    new MixedRealityControllerMapping("Oculus Remote Controller", typeof(OculusRemoteController)),
+                    new MixedRealityControllerMapping("Oculus Remote Controller", typeof(OculusRemoteOpenVRController)),
                 };
             }
 

diff --git a/Definitions/Controllers/OpenVR/OculusTouchControllerMappingProfile.cs b/Definitions/Controllers/OpenVR/OculusTouchControllerMappingProfile.cs
@@ -22,8 +22,8 @@ protected override void Awake()
             {
                 ControllerMappings = new[]
                 {
-                    new MixedRealityControllerMapping("Oculus Touch Controller Left", typeof(OculusTouchController), Handedness.Left),
-                    new MixedRealityControllerMapping("Oculus Touch Controller Right", typeof(OculusTouchController), Handedness.Right),
+                    new MixedRealityControllerMapping("Oculus Touch Controller Left", typeof(OculusTouchOpenVRController), Handedness.Left),
+                    new MixedRealityControllerMapping("Oculus Touch Controller Right", typeof(OculusTouchOpenVRController), Handedness.Right),
                 };
             }
 

diff --git a/Definitions/Controllers/OpenVR/ViveWandControllerMappingProfile.cs b/Definitions/Controllers/OpenVR/ViveWandControllerMappingProfile.cs
@@ -22,8 +22,8 @@ protected override void Awake()
             {
                 ControllerMappings = new[]
                 {
-                    new MixedRealityControllerMapping("Vive Wand Controller Left", typeof(ViveWandController), Handedness.Left),
-                    new MixedRealityControllerMapping("Vive Wand Controller Right", typeof(ViveWandController), Handedness.Right),
+                    new MixedRealityControllerMapping("Vive Wand Controller Left", typeof(ViveWandOpenVRController), Handedness.Left),
+                    new MixedRealityControllerMapping("Vive Wand Controller Right", typeof(ViveWandOpenVRController), Handedness.Right),
                 };
             }
 

diff --git a/Interfaces/IMixedRealityService.cs b/Interfaces/IMixedRealityService.cs
@@ -41,6 +41,16 @@ public interface IMixedRealityService : IDisposable
         /// </summary>
         void Update();
 
+        /// <summary>
+        /// Optional LateUpdate function to perform updates after the end of the last Update cycle.
+        /// </summary>
+        void LateUpdate();
+
+        /// <summary>
+        /// Optional FixedUpdate function to perform updates that are fixed to the Physics timestep.
+        /// </summary>
+        void FixedUpdate();
+
         /// <summary>
         /// Optional Disable function to pause the service.
         /// </summary>

diff --git a/.../Controllers/OpenVR/OculusGoController.cs → ...ollers/OpenVR/OculusGoOpenVRController.cs b/.../Controllers/OpenVR/OculusGoController.cs → ...ollers/OpenVR/OculusGoOpenVRController.cs
@@ -9,7 +9,7 @@
 
 namespace XRTK.Providers.Controllers.OpenVR
 {
-    public class OculusGoController : GenericOpenVRController
+    public class OculusGoOpenVRController : GenericOpenVRController
     {
         /// <summary>
         /// Constructor.
@@ -18,7 +18,7 @@ public class OculusGoController : GenericOpenVRController
         /// <param name="controllerHandedness"></param>
         /// <param name="inputSource"></param>
         /// <param name="interactions"></param>
-        public OculusGoController(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
+        public OculusGoOpenVRController(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
                 : base(trackingState, controllerHandedness, inputSource, interactions)
         {
         }

diff --git a/...rollers/OpenVR/OculusGoController.cs.meta → ...s/OpenVR/OculusGoOpenVRController.cs.meta b/...rollers/OpenVR/OculusGoController.cs.meta → ...s/OpenVR/OculusGoOpenVRController.cs.meta
diff --git a/...trollers/OpenVR/OculusRemoteController.cs → ...rs/OpenVR/OculusRemoteOpenVRController.cs b/...trollers/OpenVR/OculusRemoteController.cs → ...rs/OpenVR/OculusRemoteOpenVRController.cs
@@ -8,7 +8,7 @@
 
 namespace XRTK.Providers.Controllers.OpenVR
 {
-    public class OculusRemoteController : GenericOpenVRController
+    public class OculusRemoteOpenVRController : GenericOpenVRController
     {
         /// <summary>
         /// Constructor.
@@ -17,7 +17,7 @@ public class OculusRemoteController : GenericOpenVRController
         /// <param name="controllerHandedness"></param>
         /// <param name="inputSource"></param>
         /// <param name="interactions"></param>
-        public OculusRemoteController(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
+        public OculusRemoteOpenVRController(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
                 : base(trackingState, controllerHandedness, inputSource, interactions)
         {
         }

diff --git a/...ers/OpenVR/OculusRemoteController.cs.meta → ...enVR/OculusRemoteOpenVRController.cs.meta b/...ers/OpenVR/OculusRemoteController.cs.meta → ...enVR/OculusRemoteOpenVRController.cs.meta
diff --git a/...ntrollers/OpenVR/OculusTouchController.cs → ...ers/OpenVR/OculusTouchOpenVRController.cs b/...ntrollers/OpenVR/OculusTouchController.cs → ...ers/OpenVR/OculusTouchOpenVRController.cs
@@ -9,7 +9,7 @@
 
 namespace XRTK.Providers.Controllers.OpenVR
 {
-    public class OculusTouchController : GenericOpenVRController
+    public class OculusTouchOpenVRController : GenericOpenVRController
     {
         /// <summary>
         /// Constructor.
@@ -18,7 +18,7 @@ public class OculusTouchController : GenericOpenVRController
         /// <param name="controllerHandedness"></param>
         /// <param name="inputSource"></param>
         /// <param name="interactions"></param>
-        public OculusTouchController(TrackingState trackingState, Handedness controllerHandedness,
+        public OculusTouchOpenVRController(TrackingState trackingState, Handedness controllerHandedness,
             IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
             : base(trackingState, controllerHandedness, inputSource, interactions)
         {

diff --git a/...lers/OpenVR/OculusTouchController.cs.meta → ...penVR/OculusTouchOpenVRController.cs.meta b/...lers/OpenVR/OculusTouchController.cs.meta → ...penVR/OculusTouchOpenVRController.cs.meta
diff --git a/Providers/Controllers/OpenVR/OpenVRDataProvider.cs b/Providers/Controllers/OpenVR/OpenVRDataProvider.cs
@@ -63,19 +63,19 @@ protected override GenericJoystickController GetOrAddController(string joystickN
                     controllerType = typeof(GenericOpenVRController);
                     break;
                 case SupportedControllerType.ViveWand:
-                    controllerType = typeof(ViveWandController);
+                    controllerType = typeof(ViveWandOpenVRController);
                     break;
                 case SupportedControllerType.ViveKnuckles:
-                    controllerType = typeof(ViveKnucklesController);
+                    controllerType = typeof(ViveKnucklesOpenVRController);
                     break;
                 case SupportedControllerType.OculusTouch:
-                    controllerType = typeof(OculusTouchController);
+                    controllerType = typeof(OculusTouchOpenVRController);
                     break;
                 case SupportedControllerType.OculusRemote:
-                    controllerType = typeof(OculusRemoteController);
+                    controllerType = typeof(OculusRemoteOpenVRController);
                     break;
                 case SupportedControllerType.OculusGo:
-                    controllerType = typeof(OculusGoController);
+                    controllerType = typeof(OculusGoOpenVRController);
                     break;
                 case SupportedControllerType.WindowsMixedReality:
                     controllerType = typeof(WindowsMixedRealityOpenVRMotionController);

diff --git a/...trollers/OpenVR/ViveKnucklesController.cs → ...rs/OpenVR/ViveKnucklesOpenVRController.cs b/...trollers/OpenVR/ViveKnucklesController.cs → ...rs/OpenVR/ViveKnucklesOpenVRController.cs
@@ -9,7 +9,7 @@
 
 namespace XRTK.Providers.Controllers.OpenVR
 {
-    public class ViveKnucklesController : GenericOpenVRController
+    public class ViveKnucklesOpenVRController : GenericOpenVRController
     {
         /// <summary>
         /// Constructor.
@@ -18,7 +18,7 @@ public class ViveKnucklesController : GenericOpenVRController
         /// <param name="controllerHandedness"></param>
         /// <param name="inputSource"></param>
         /// <param name="interactions"></param>
-        public ViveKnucklesController(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
+        public ViveKnucklesOpenVRController(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
                 : base(trackingState, controllerHandedness, inputSource, interactions)
         {
         }

diff --git a/...ers/OpenVR/ViveKnucklesController.cs.meta → ...enVR/ViveKnucklesOpenVRController.cs.meta b/...ers/OpenVR/ViveKnucklesController.cs.meta → ...enVR/ViveKnucklesOpenVRController.cs.meta
diff --git a/.../Controllers/OpenVR/ViveWandController.cs → ...ollers/OpenVR/ViveWandOpenVRController.cs b/.../Controllers/OpenVR/ViveWandController.cs → ...ollers/OpenVR/ViveWandOpenVRController.cs
@@ -9,7 +9,7 @@
 
 namespace XRTK.Providers.Controllers.OpenVR
 {
-    public class ViveWandController : GenericOpenVRController
+    public class ViveWandOpenVRController : GenericOpenVRController
     {
         /// <summary>
         /// Constructor.
@@ -18,7 +18,7 @@ public class ViveWandController : GenericOpenVRController
         /// <param name="controllerHandedness"></param>
         /// <param name="inputSource"></param>
         /// <param name="interactions"></param>
-        public ViveWandController(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
+        public ViveWandOpenVRController(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
                 : base(trackingState, controllerHandedness, inputSource, interactions)
         {
         }

diff --git a/...rollers/OpenVR/ViveWandController.cs.meta → ...s/OpenVR/ViveWandOpenVRController.cs.meta b/...rollers/OpenVR/ViveWandController.cs.meta → ...s/OpenVR/ViveWandOpenVRController.cs.meta
diff --git a/Services/BaseService.cs b/Services/BaseService.cs
@@ -30,6 +30,12 @@ public virtual void Enable() { }
         /// <inheritdoc />
         public virtual void Update() { }
 
+        /// <inheritdoc />
+        public virtual void LateUpdate() { }
+
+        /// <inheritdoc />
+        public virtual void FixedUpdate() { }
+
         /// <inheritdoc />
         public virtual void Disable() { }
 

diff --git a/Services/MixedRealityToolkit.cs b/Services/MixedRealityToolkit.cs
@@ -706,6 +706,22 @@ private void Update()
             }
         }
 
+        private void LateUpdate()
+        {
+            if (Application.isPlaying)
+            {
+                LateUpdateAllServices();
+            }
+        }
+
+        private void FixedUpdate()
+        {
+            if (Application.isPlaying)
+            {
+                FixedUpdateAllServices();
+            }
+        }
+
         private void OnDisable()
         {
             if (Application.isPlaying)
@@ -1274,6 +1290,70 @@ private void UpdateAllServices()
             }
         }
 
+        private void LateUpdateAllServices()
+        {
+            // If the Mixed Reality Toolkit is not configured, stop.
+            if (activeProfile == null) { return; }
+
+            // Update all systems
+            foreach (var system in activeSystems)
+            {
+                try
+                {
+                    system.Value.LateUpdate();
+                }
+                catch (Exception e)
+                {
+                    Debug.LogError($"{e.Message}\n{e.StackTrace}");
+                }
+            }
+
+            // Update all registered runtime services
+            foreach (var service in registeredMixedRealityServices)
+            {
+                try
+                {
+                    service.Item2.LateUpdate();
+                }
+                catch (Exception e)
+                {
+                    Debug.LogError($"{e.Message}\n{e.StackTrace}");
+                }
+            }
+        }
+
+        private void FixedUpdateAllServices()
+        {
+            // If the Mixed Reality Toolkit is not configured, stop.
+            if (activeProfile == null) { return; }
+
+            // Update all systems
+            foreach (var system in activeSystems)
+            {
+                try
+                {
+                    system.Value.FixedUpdate();
+                }
+                catch (Exception e)
+                {
+                    Debug.LogError($"{e.Message}\n{e.StackTrace}");
+                }
+            }
+
+            // Update all registered runtime services
+            foreach (var service in registeredMixedRealityServices)
+            {
+                try
+                {
+                    service.Item2.FixedUpdate();
+                }
+                catch (Exception e)
+                {
+                    Debug.LogError($"{e.Message}\n{e.StackTrace}");
+                }
+            }
+        }
+
         private void DisableAllServices()
         {
             // If the Mixed Reality Toolkit is not configured, stop.
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ protected override void Awake() @@
                 {
                     ControllerMappings = new[]
                     {
-                        new MixedRealityControllerMapping("Oculus Go Controller", typeof(OculusGoController), Handedness.Both),
+                        new MixedRealityControllerMapping("Oculus Go Controller", typeof(OculusGoOpenVRController), Handedness.Both),
                     };
                 }
@@ Expand Down @@