diff --git a/CHANGELOG.md.meta b/CHANGELOG.md.meta new file mode 100644 index 0000000..3ce511f --- /dev/null +++ b/CHANGELOG.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9aed3fbadf0a41a438c0ee5f31b07074 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor.meta b/Editor.meta new file mode 100644 index 0000000..f2ea55e --- /dev/null +++ b/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 46f3dd97cb3546c46b3be6c00fff1e50 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/OpenXRPackageInstaller.cs b/Editor/OpenXRPackageInstaller.cs index 1ad5f14..1b002f5 100644 --- a/Editor/OpenXRPackageInstaller.cs +++ b/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; diff --git a/Editor/OpenXRPackageInstaller.cs.meta b/Editor/OpenXRPackageInstaller.cs.meta new file mode 100644 index 0000000..8aac677 --- /dev/null +++ b/Editor/OpenXRPackageInstaller.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d337f4c6730eeed4ba23604f4bbf7ec9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/OpenXRPackageModulesInstaller.cs b/Editor/OpenXRPackageModulesInstaller.cs index 4872135..16f355c 100644 --- a/Editor/OpenXRPackageModulesInstaller.cs +++ b/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() /// 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; } } -} +} \ No newline at end of file diff --git a/Editor/OpenXRPackageModulesInstaller.cs.meta b/Editor/OpenXRPackageModulesInstaller.cs.meta new file mode 100644 index 0000000..15aa2eb --- /dev/null +++ b/Editor/OpenXRPackageModulesInstaller.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cb105912ec87c844c9ed7dc80be393c4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/OpenXRPathFinder.cs.meta b/Editor/OpenXRPathFinder.cs.meta new file mode 100644 index 0000000..3e3a8fc --- /dev/null +++ b/Editor/OpenXRPathFinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7312648c5a413044baa70e23c0698dde +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/RealityToolkit.OpenXR.Editor.asmdef.meta b/Editor/RealityToolkit.OpenXR.Editor.asmdef.meta new file mode 100644 index 0000000..cf26a27 --- /dev/null +++ b/Editor/RealityToolkit.OpenXR.Editor.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1d851b6ee50f0fd4e992c7e20ccc85ca +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/LICENSE.md.meta b/LICENSE.md.meta new file mode 100644 index 0000000..da31e03 --- /dev/null +++ b/LICENSE.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8125d021e605de34f82fcd12afe0b529 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/README.md.meta b/README.md.meta new file mode 100644 index 0000000..38b1058 --- /dev/null +++ b/README.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ceeac1d03bd47784d8f5a74728f77dba +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime.meta b/Runtime.meta new file mode 100644 index 0000000..64e53f6 --- /dev/null +++ b/Runtime.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 581bfa3eaad5fe249ba17f8635cf2941 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/InputService.meta b/Runtime/InputService.meta new file mode 100644 index 0000000..ab94aa7 --- /dev/null +++ b/Runtime/InputService.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 48cd493dc6fc3e9428dd5863a6c69b7c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/InputService/IOpenXRControllerServiceModule.cs b/Runtime/InputService/IOpenXRControllerServiceModule.cs new file mode 100644 index 0000000..b441b21 --- /dev/null +++ b/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 +{ + /// + /// Fully qualifies the specific implementation of . + /// + public interface IOpenXRControllerServiceModule : IControllerServiceModule { } +} \ No newline at end of file diff --git a/Runtime/InputService/IOpenXRControllerServiceModule.cs.meta b/Runtime/InputService/IOpenXRControllerServiceModule.cs.meta new file mode 100644 index 0000000..379ea24 --- /dev/null +++ b/Runtime/InputService/IOpenXRControllerServiceModule.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3ee9d3bed4734e14c9db99bdb8565346 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/InputService/IOpenXRHandControllerServiceModule.cs b/Runtime/InputService/IOpenXRHandControllerServiceModule.cs new file mode 100644 index 0000000..1a67c21 --- /dev/null +++ b/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 +{ + /// + /// Fully qualifies the specific implementation of . + /// + public interface IOpenXRHandControllerServiceModule : IHandControllerServiceModule { } +} diff --git a/Runtime/InputService/IOpenXRHandControllerServiceModule.cs.meta b/Runtime/InputService/IOpenXRHandControllerServiceModule.cs.meta new file mode 100644 index 0000000..bd5aa5a --- /dev/null +++ b/Runtime/InputService/IOpenXRHandControllerServiceModule.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0e7f87624a399414a9f0437d22581a30 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/InputService/OpenXRControllerServiceModule.cs b/Runtime/InputService/OpenXRControllerServiceModule.cs new file mode 100644 index 0000000..2736e1a --- /dev/null +++ b/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() + { + + } + } +} diff --git a/Runtime/InputService/OpenXRControllerServiceModule.cs.meta b/Runtime/InputService/OpenXRControllerServiceModule.cs.meta new file mode 100644 index 0000000..505fd53 --- /dev/null +++ b/Runtime/InputService/OpenXRControllerServiceModule.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6ac4e9071e690674cae196eea707b8a6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/InputService/OpenXRHandControllerServiceModule.cs b/Runtime/InputService/OpenXRHandControllerServiceModule.cs new file mode 100644 index 0000000..be71916 --- /dev/null +++ b/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() + { + + } + } +} diff --git a/Runtime/InputService/OpenXRHandControllerServiceModule.cs.meta b/Runtime/InputService/OpenXRHandControllerServiceModule.cs.meta new file mode 100644 index 0000000..c8846ea --- /dev/null +++ b/Runtime/InputService/OpenXRHandControllerServiceModule.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 73d89d68d24766742931e6c7cb074bed +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/OpenXRPlatform.cs b/Runtime/OpenXRPlatform.cs index 1c316e9..74d4275 100644 --- a/Runtime/OpenXRPlatform.cs +++ b/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,21 +15,13 @@ 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"; - /// - 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 - /// - public override bool IsAvailable => - !Application.isEditor && OpenXRApi.Version > NoVersion && OpenXRApi.Initialized; -*/ + /// public override bool IsAvailable { @@ -37,17 +29,7 @@ public override bool IsAvailable { var displaySubsystems = new List(); 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; diff --git a/Runtime/OpenXRPlatform.cs.meta b/Runtime/OpenXRPlatform.cs.meta new file mode 100644 index 0000000..a80a0a6 --- /dev/null +++ b/Runtime/OpenXRPlatform.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f2ef6a1041a79e7429153cf665549e74 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/RealityToolkit.OpenXR.asmdef.meta b/Runtime/RealityToolkit.OpenXR.asmdef.meta new file mode 100644 index 0000000..462abde --- /dev/null +++ b/Runtime/RealityToolkit.OpenXR.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3d8e9f257e6b6fa4683a817d19440da7 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Tests.meta b/Tests.meta new file mode 100644 index 0000000..27bfeb1 --- /dev/null +++ b/Tests.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8501733ba963c464db1a46d1db645150 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Tests/Editor.meta b/Tests/Editor.meta new file mode 100644 index 0000000..b5fc829 --- /dev/null +++ b/Tests/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ce83ff8ae4873e748a04be8a435a7710 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Tests/Editor/EditorExampleTest.cs.meta b/Tests/Editor/EditorExampleTest.cs.meta new file mode 100644 index 0000000..68dc70f --- /dev/null +++ b/Tests/Editor/EditorExampleTest.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5313292bcfa0aa44bad60a3d033ebe5f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Tests/Editor/RealityToolkit.OpenXR.Editor.Tests.asmdef.meta b/Tests/Editor/RealityToolkit.OpenXR.Editor.Tests.asmdef.meta new file mode 100644 index 0000000..0ee343c --- /dev/null +++ b/Tests/Editor/RealityToolkit.OpenXR.Editor.Tests.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a81abc9ac0c07f24a9e346ce67081f5b +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Tests/Runtime.meta b/Tests/Runtime.meta new file mode 100644 index 0000000..473210b --- /dev/null +++ b/Tests/Runtime.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 75461ce6059fd3f478fe482d9a6e2487 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Tests/Runtime/RealityToolkit.OpenXR.Tests.asmdef.meta b/Tests/Runtime/RealityToolkit.OpenXR.Tests.asmdef.meta new file mode 100644 index 0000000..869bf79 --- /dev/null +++ b/Tests/Runtime/RealityToolkit.OpenXR.Tests.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 48a7b6b02d513b944ac987b28b2fb571 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Tests/Runtime/RuntimeExampleTest.cs.meta b/Tests/Runtime/RuntimeExampleTest.cs.meta new file mode 100644 index 0000000..156ba2b --- /dev/null +++ b/Tests/Runtime/RuntimeExampleTest.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0fcb4da98352d154db280a93477a56c5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Third Party Notices.md.meta b/Third Party Notices.md.meta new file mode 100644 index 0000000..3958f8f --- /dev/null +++ b/Third Party Notices.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 162c2041fdaccb84093de1ed636fd9a5 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/package.json.meta b/package.json.meta new file mode 100644 index 0000000..80dd4db --- /dev/null +++ b/package.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b275786ecb3cdde489c03df7cb90c033 +PackageManifestImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: