Update base and add meta files

Editor/OpenXRPackageInstaller.cs

@@ -3,9 +3,9 @@
 
 using RealityCollective.Editor.Utilities;
 using RealityCollective.Extensions;
-using RealityCollective.ServiceFramework;
 using RealityCollective.ServiceFramework.Editor;
 using RealityCollective.ServiceFramework.Editor.Packages;
+using RealityToolkit.Editor;
 using System.IO;
 using UnityEditor;
 using UnityEngine;

Editor/OpenXRPackageModulesInstaller.cs

@@ -4,8 +4,6 @@
 using RealityCollective.ServiceFramework.Definitions;
 using RealityCollective.ServiceFramework.Editor.Packages;
 using RealityCollective.ServiceFramework.Services;
-using RealityToolkit.OpenXR.Definitions;
-using RealityToolkit.OpenXR.Interfaces;
 using System.Linq;
 using UnityEditor;
 
@@ -39,6 +37,7 @@ static OpenXRPackageModulesInstaller()
         /// <inheritdoc/>
         public bool Install(ServiceConfiguration serviceConfiguration)
         {
+            /*
             if (!typeof(IOpenXRModule).IsAssignableFrom(serviceConfiguration.InstancedType.Type))
             {
                 // This module installer does not accept the configuration type.
@@ -76,8 +75,8 @@ public bool Install(ServiceConfiguration serviceConfiguration)
             {
                 UnityEngine.Debug.Log($"Skipped installing the {serviceConfiguration.InstancedType.Type.Name} to {OpenXRProfile.name}. Already installed.");
             }
-
+            */
             return true;
         }
     }
-}
+}

Runtime/InputService/IOpenXRControllerServiceModule.cs

@@ -0,0 +1,12 @@
+// Copyright (c) Reality Collective. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using RealityToolkit.Input.Interfaces.Modules;
+
+namespace RealityToolkit.OpenXR
+{
+    /// <summary>
+    /// Fully qualifies the <see cref="OpenXRPlatform"/> specific implementation of <see cref="IControllerServiceModule"/>.
+    /// </summary>
+    public interface IOpenXRControllerServiceModule : IControllerServiceModule { }
+}

Runtime/InputService/IOpenXRHandControllerServiceModule.cs

@@ -0,0 +1,12 @@
+// Copyright (c) Reality Collective. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using RealityToolkit.Input.Hands;
+
+namespace RealityToolkit.OpenXR
+{
+    /// <summary>
+    /// Fully qualifies the <see cref="OpenXRPlatform"/> specific implementation of <see cref="IHandControllerServiceModule"/>.
+    /// </summary>
+    public interface IOpenXRHandControllerServiceModule : IHandControllerServiceModule { }
+}

Runtime/InputService/OpenXRControllerServiceModule.cs

@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace RealityToolkit.OpenXR
+{
+    public class OpenXRControllerServiceModule : MonoBehaviour
+    {
+        // Start is called before the first frame update
+        void Start()
+        {
+
+        }
+
+        // Update is called once per frame
+        void Update()
+        {
+
+        }
+    }
+}

Runtime/InputService/OpenXRHandControllerServiceModule.cs

@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace RealityToolkit.OpenXR
+{
+    public class OpenXRHandControllerServiceModule : MonoBehaviour
+    {
+        // Start is called before the first frame update
+        void Start()
+        {
+
+        }
+
+        // Update is called once per frame
+        void Update()
+        {
+
+        }
+    }
+}

Runtime/OpenXRPlatform.cs

@@ -1,11 +1,11 @@
 // Copyright (c) Reality Collective. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using RealityCollective.ServiceFramework.Definitions.Platforms;
+using RealityCollective.ServiceFramework.Interfaces;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.XR;
-using XRTK.Definitions.Platforms;
-using XRTK.Interfaces;
 
 namespace RealityToolkit.OpenXR
 {
@@ -15,39 +15,21 @@ namespace RealityToolkit.OpenXR
     [System.Runtime.InteropServices.Guid("72c2e15b-d4ae-4e10-83bd-6e670b37efdd")]
     public class OpenXRPlatform : BasePlatform
     {
-        private const string xrDisplaySubsystemDescriptorId = "OpenXR Display";
-        private const string xrInputSubsystemDescriptorId = "OpenXR Input";
-
         /// <inheritdoc />
-        public override IMixedRealityPlatform[] PlatformOverrides { get; } =
+        public override IPlatform[] PlatformOverrides { get; } =
         {
-            //new AndroidPlatform()
-            //new WindowsStandalonePlatform()
+            new AndroidPlatform(),
+            new WindowsStandalonePlatform()
 		};
-/*		
-		Choose a path for Is Platform available at runtime
-        /// <inheritdoc />
-        public override bool IsAvailable =>
-            !Application.isEditor && OpenXRApi.Version > NoVersion && OpenXRApi.Initialized;		
-*/
+
         /// <inheritdoc />
         public override bool IsAvailable
         {
             get
             {
                 var displaySubsystems = new List<XRDisplaySubsystem>();
                 SubsystemManager.GetSubsystems(displaySubsystems);
-                var xrDisplaySubsystemDescriptorFound = false;
-
-                for (var i = 0; i < displaySubsystems.Count; i++)
-                {
-                    var displaySubsystem = displaySubsystems[i];
-                    if (displaySubsystem.SubsystemDescriptor.id.Equals(xrDisplaySubsystemDescriptorId) &&
-                        displaySubsystem.running)
-                    {
-                        xrDisplaySubsystemDescriptorFound = true;
-                    }
-                }
+                var xrDisplaySubsystemDescriptorFound = displaySubsystems.Count > 0;
 
                 // The XR Display Subsystem is not available / running,
                 // the platform doesn't seem to be available.
@@ -63,15 +45,14 @@ public override bool IsAvailable
                 for (var i = 0; i < inputSubsystems.Count; i++)
                 {
                     var inputSubsystem = inputSubsystems[i];
-                    if (inputSubsystem.SubsystemDescriptor.id.Equals(xrInputSubsystemDescriptorId) &&
-                        inputSubsystem.running)
+                    if (!xrInputSubsystemDescriptorFound)
                     {
-                        xrInputSubsystemDescriptorFound = true;
+                        xrInputSubsystemDescriptorFound = inputSubsystem.running;
                     }
                 }
 
-                // The XR Input Subsystem is not available / running,
-                // the platform doesn't seem to be available.
+                // The No XR Input Subsystem found / running,
+                // no platforms are available.
                 if (!xrInputSubsystemDescriptorFound)
                 {
                     return false;