From 66ecdafb0e54c4334cf2442a175894c327627647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dino=20Fejzagi=C4=87?= Date: Wed, 8 May 2024 08:36:31 +0200 Subject: [PATCH] Update manifest --- Editor/AssemblyInfo.cs | 9 ++++++++ Editor/AssemblyInfo.cs.meta | 11 ++++++++++ Runtime/AssemblyInfo.cs | 9 ++++++++ Runtime/AssemblyInfo.cs.meta | 11 ++++++++++ Runtime/{InputService.meta => Input.meta} | 0 Runtime/Input/Controllers.meta | 8 +++++++ .../IOpenXRControllerServiceModule.cs | 4 ++-- .../IOpenXRControllerServiceModule.cs.meta | 0 .../OpenXRControllerServiceModule.cs | 19 +++++++++++++++++ .../OpenXRControllerServiceModule.cs.meta | 0 .../OpenXRControllerServiceModuleProfile.cs | 19 +++++++++++++++++ ...enXRControllerServiceModuleProfile.cs.meta | 11 ++++++++++ .../OpenXRControllerServiceModule.cs | 21 ------------------- Runtime/OpenXRPlatform.cs.meta | 2 +- package.json | 16 +++++++++----- 15 files changed, 111 insertions(+), 29 deletions(-) create mode 100644 Editor/AssemblyInfo.cs create mode 100644 Editor/AssemblyInfo.cs.meta create mode 100644 Runtime/AssemblyInfo.cs create mode 100644 Runtime/AssemblyInfo.cs.meta rename Runtime/{InputService.meta => Input.meta} (100%) create mode 100644 Runtime/Input/Controllers.meta rename Runtime/{InputService => Input/Controllers}/IOpenXRControllerServiceModule.cs (77%) rename Runtime/{InputService => Input/Controllers}/IOpenXRControllerServiceModule.cs.meta (100%) create mode 100644 Runtime/Input/Controllers/OpenXRControllerServiceModule.cs rename Runtime/{InputService => Input/Controllers}/OpenXRControllerServiceModule.cs.meta (100%) create mode 100644 Runtime/Input/Controllers/OpenXRControllerServiceModuleProfile.cs create mode 100644 Runtime/Input/Controllers/OpenXRControllerServiceModuleProfile.cs.meta delete mode 100644 Runtime/InputService/OpenXRControllerServiceModule.cs diff --git a/Editor/AssemblyInfo.cs b/Editor/AssemblyInfo.cs new file mode 100644 index 0000000..4542897 --- /dev/null +++ b/Editor/AssemblyInfo.cs @@ -0,0 +1,9 @@ +// Copyright (c) Reality Collective. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using System.Reflection; + +[assembly: AssemblyVersion("1.0.0")] +[assembly: AssemblyTitle("com.realitytoolkit.openxr.editor")] +[assembly: AssemblyCompany("Reality Collective")] +[assembly: AssemblyCopyright("Copyright (c) Reality Collective. All rights reserved.")] diff --git a/Editor/AssemblyInfo.cs.meta b/Editor/AssemblyInfo.cs.meta new file mode 100644 index 0000000..96de6f7 --- /dev/null +++ b/Editor/AssemblyInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 28508fb482e4b5a42abcafed7e27e2f1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/AssemblyInfo.cs b/Runtime/AssemblyInfo.cs new file mode 100644 index 0000000..915e808 --- /dev/null +++ b/Runtime/AssemblyInfo.cs @@ -0,0 +1,9 @@ +// Copyright (c) Reality Collective. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using System.Reflection; + +[assembly: AssemblyVersion("1.0.0")] +[assembly: AssemblyTitle("com.realitytoolkit.openxr")] +[assembly: AssemblyCompany("Reality Collective")] +[assembly: AssemblyCopyright("Copyright (c) Reality Collective. All rights reserved.")] diff --git a/Runtime/AssemblyInfo.cs.meta b/Runtime/AssemblyInfo.cs.meta new file mode 100644 index 0000000..8ad7fa7 --- /dev/null +++ b/Runtime/AssemblyInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a61ea5de5a107824680caaa268f11fd4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/InputService.meta b/Runtime/Input.meta similarity index 100% rename from Runtime/InputService.meta rename to Runtime/Input.meta diff --git a/Runtime/Input/Controllers.meta b/Runtime/Input/Controllers.meta new file mode 100644 index 0000000..896f5d8 --- /dev/null +++ b/Runtime/Input/Controllers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1904428cd8cd2ec4eaef78e04bc7691c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/InputService/IOpenXRControllerServiceModule.cs b/Runtime/Input/Controllers/IOpenXRControllerServiceModule.cs similarity index 77% rename from Runtime/InputService/IOpenXRControllerServiceModule.cs rename to Runtime/Input/Controllers/IOpenXRControllerServiceModule.cs index b441b21..5c402d7 100644 --- a/Runtime/InputService/IOpenXRControllerServiceModule.cs +++ b/Runtime/Input/Controllers/IOpenXRControllerServiceModule.cs @@ -1,9 +1,9 @@ -// Copyright (c) Reality Collective. All rights reserved. +// 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 +namespace RealityToolkit.OpenXR.Input.Controllers { /// /// Fully qualifies the specific implementation of . diff --git a/Runtime/InputService/IOpenXRControllerServiceModule.cs.meta b/Runtime/Input/Controllers/IOpenXRControllerServiceModule.cs.meta similarity index 100% rename from Runtime/InputService/IOpenXRControllerServiceModule.cs.meta rename to Runtime/Input/Controllers/IOpenXRControllerServiceModule.cs.meta diff --git a/Runtime/Input/Controllers/OpenXRControllerServiceModule.cs b/Runtime/Input/Controllers/OpenXRControllerServiceModule.cs new file mode 100644 index 0000000..03dd594 --- /dev/null +++ b/Runtime/Input/Controllers/OpenXRControllerServiceModule.cs @@ -0,0 +1,19 @@ +// Copyright (c) Reality Collective. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using RealityCollective.ServiceFramework.Attributes; +using RealityToolkit.Input.Controllers; +using RealityToolkit.Input.Interfaces; +using UnityEngine; + +namespace RealityToolkit.OpenXR.Input.Controllers +{ + [RuntimePlatform(typeof(OpenXRPlatform))] + [System.Runtime.InteropServices.Guid("a5099f91-b390-4155-894a-309fbd73febb")] + public class OpenXRControllerServiceModule : BaseControllerServiceModule, IOpenXRControllerServiceModule + { + /// + public OpenXRControllerServiceModule(string name, uint priority, OpenXRControllerServiceModuleProfile profile, IInputService parentService) + : base(name, priority, profile, parentService) { } + } +} diff --git a/Runtime/InputService/OpenXRControllerServiceModule.cs.meta b/Runtime/Input/Controllers/OpenXRControllerServiceModule.cs.meta similarity index 100% rename from Runtime/InputService/OpenXRControllerServiceModule.cs.meta rename to Runtime/Input/Controllers/OpenXRControllerServiceModule.cs.meta diff --git a/Runtime/Input/Controllers/OpenXRControllerServiceModuleProfile.cs b/Runtime/Input/Controllers/OpenXRControllerServiceModuleProfile.cs new file mode 100644 index 0000000..950c21c --- /dev/null +++ b/Runtime/Input/Controllers/OpenXRControllerServiceModuleProfile.cs @@ -0,0 +1,19 @@ +// Copyright (c) Reality Collective. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using RealityToolkit.Definitions.Controllers; + +namespace RealityToolkit.OpenXR.Input.Controllers +{ + /// + /// Configuration profile for . + /// + public class OpenXRControllerServiceModuleProfile : BaseControllerServiceModuleProfile + { + /// + public override ControllerDefinition[] GetDefaultControllerOptions() + { + return null; + } + } +} diff --git a/Runtime/Input/Controllers/OpenXRControllerServiceModuleProfile.cs.meta b/Runtime/Input/Controllers/OpenXRControllerServiceModuleProfile.cs.meta new file mode 100644 index 0000000..1a420ac --- /dev/null +++ b/Runtime/Input/Controllers/OpenXRControllerServiceModuleProfile.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 35a225d8a925ebf40818581acdcf345d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/InputService/OpenXRControllerServiceModule.cs b/Runtime/InputService/OpenXRControllerServiceModule.cs deleted file mode 100644 index 2736e1a..0000000 --- a/Runtime/InputService/OpenXRControllerServiceModule.cs +++ /dev/null @@ -1,21 +0,0 @@ -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/OpenXRPlatform.cs.meta b/Runtime/OpenXRPlatform.cs.meta index a80a0a6..68c6484 100644 --- a/Runtime/OpenXRPlatform.cs.meta +++ b/Runtime/OpenXRPlatform.cs.meta @@ -5,7 +5,7 @@ MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 - icon: {instanceID: 0} + icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} userData: assetBundleName: assetBundleVariant: diff --git a/package.json b/package.json index f2fca62..f0cba45 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,19 @@ { "name": "com.realitytoolkit.openxr", "displayName": "RealityToolkit.OpenXR", - "description": "The openxr framework of the Reality Toolkit by the Reality Collective", + "description": "The openxr framework of the Reality Toolkit by the Reality Collective.", + "version": "1.0.0-pre.0", + "documentationUrl": "https://realitytoolkit.io", + "changelogUrl": "https://github.com/realitycollective/com.realitytoolkit.openxr/releases", + "licensesUrl": "https://github.com/realitycollective/com.realitytoolkit.openxr/blob/main/LICENSE.md", "keywords": [ "VR", "AR", "XR", "Mixed Reality" ], - "version": "1.0.0-pre.0", - "unity": "2021.3", - "homepage": "https://github.com/realitycollective", + "unity": "2022.3", + "homepage": "https://realitytoolkit.io", "bugs": { "url": "https://github.com/realitycollective/com.realitytoolkit.openxr/issues" }, @@ -24,8 +27,11 @@ "email": "realitycollectivedev@gmail.com", "url": "https://github.com/realitycollective" }, + "publishConfig": { + "registry": "https://package.openupm.com" + }, "dependencies": { - "com.realitytoolkit.core": "1.0.0-pre.39", + "com.realitytoolkit.core": "1.0.0-pre.48", "com.unity.xr.openxr": "1.10.0" }, "assets": [