Merge pull request #1 from realitycollective/feature/init

Init package and update to latest core
realitycollective · May 8, 2024 · 7e132fb · 7e132fb
2 parents 618c1f7 + 444510b
commit 7e132fb
Show file tree

Hide file tree

Showing 36 changed files with 138 additions and 480 deletions.
diff --git a/.github/workflows/development-buildandtestupmrelease.yml b/.github/workflows/development-buildandtestupmrelease.yml
@@ -37,5 +37,13 @@ jobs:
     uses: realitycollective/reusableworkflows/.github/workflows/rununityUPMbuild.yml@v2
     with:
       unityversion: ${{ needs.Validate-Unity.outputs.unityeditorversion }}
-      dependencies: '{"development": "github.com/realitycollective/com.realitycollective.buildtools.git"},{"development": "github.com/realitycollective/com.realitytoolkit.core.git"},{"development": "github.com/realitycollective/com.realitycollective.utilities.git"},{"development": "github.com/realitycollective/com.realitycollective.service-framework.git"},{"development": "github.com/realitycollective/com.realitytoolkit.player.git"},{"development": "github.com/realitycollective/com.realitytoolkit.boundary.git"}'
-    secrets: inherit
+      dependencies: '[{"development": "github.com/realitycollective/com.realitycollective.buildtools.git"},{"development": "github.com/realitycollective/com.realitytoolkit.core.git"},{"development": "github.com/realitycollective/com.realitycollective.utilities.git"},{"development": "github.com/realitycollective/com.realitycollective.service-framework.git"},{"development": "github.com/realitycollective/com.realitytoolkit.player.git"},{"development": "github.com/realitycollective/com.realitytoolkit.boundary.git"}]'
+    secrets: inherit
+
+  Build-Complete:
+    runs-on: ubuntu-latest
+    name: Build completion task
+    needs: Run-Unit-Tests
+    steps: 
+      - run: echo "Build Complete"
+
diff --git a/Editor/AssemblyInfo.cs 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/...OpenXRHandControllerServiceModule.cs.meta → Editor/AssemblyInfo.cs.meta b/...OpenXRHandControllerServiceModule.cs.meta → Editor/AssemblyInfo.cs.meta
diff --git a/Editor/OpenXRPackageInstaller.cs b/Editor/OpenXRPackageInstaller.cs
@@ -1,10 +1,10 @@
-// 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 RealityCollective.Editor.Utilities;
-using RealityCollective.Extensions;
 using RealityCollective.ServiceFramework.Editor;
 using RealityCollective.ServiceFramework.Editor.Packages;
+using RealityCollective.Utilities.Editor;
+using RealityCollective.Utilities.Extensions;
 using RealityToolkit.Editor;
 using System.IO;
 using UnityEditor;

diff --git a/Editor/OpenXRPackageInstaller.cs.meta b/Editor/OpenXRPackageInstaller.cs.meta
diff --git a/Editor/OpenXRPackageModulesInstaller.cs b/Editor/OpenXRPackageModulesInstaller.cs
diff --git a/Editor/OpenXRPathFinder.cs.meta b/Editor/OpenXRPathFinder.cs.meta
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
-# Reality Toolkit - openxr
+# Reality Toolkit - OpenXR
 
 ![com.realitytoolkit.openxr](https://github.com/realitycollective/realitycollective.logo/blob/main/RealityToolkit/RepoBanners/com.realitytoolkit.openxr.png?raw=true)
 
-The openxr module for the [Reality Toolkit](https://www.realitytoolkit.io/).
+The OpenXR module for the [Reality Toolkit](https://www.realitytoolkit.io/).
 
 [![openupm](https://img.shields.io/npm/v/com.realitytoolkit.openxr?label=openupm&registry_uri=https://package.openupm.com)](https://openupm.com/packages/com.realitytoolkit.openxr/) [![Discord](https://img.shields.io/discord/597064584980987924.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/hF7TtRCFmB)
 [![Publish main branch and increment version](https://github.com/realitycollective/com.realitytoolkit.openxr/actions/workflows/main-publish.yml/badge.svg)](https://github.com/realitycollective/com.realitytoolkit.openxr/actions/workflows/main-publish.yml)

diff --git a/Runtime/AssemblyInfo.cs 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/Editor/OpenXRPackageModulesInstaller.cs.meta → Runtime/AssemblyInfo.cs.meta b/Editor/OpenXRPackageModulesInstaller.cs.meta → Runtime/AssemblyInfo.cs.meta
diff --git a/Runtime/InputService.meta → Runtime/Input.meta b/Runtime/InputService.meta → Runtime/Input.meta
diff --git a/Tests.meta → Runtime/Input/Controllers.meta b/Tests.meta → Runtime/Input/Controllers.meta
diff --git a/...Service/IOpenXRControllerServiceModule.cs → ...rollers/IOpenXRControllerServiceModule.cs b/...Service/IOpenXRControllerServiceModule.cs → ...rollers/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
 {
     /// <summary>
     /// Fully qualifies the <see cref="OpenXRPlatform"/> specific implementation of <see cref="IControllerServiceModule"/>.

diff --git a/...ce/IOpenXRControllerServiceModule.cs.meta → ...rs/IOpenXRControllerServiceModule.cs.meta b/...ce/IOpenXRControllerServiceModule.cs.meta → ...rs/IOpenXRControllerServiceModule.cs.meta
diff --git a/Runtime/Input/Controllers/OpenXRControllerServiceModule.cs 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
+    {
+        /// <inheritdoc />
+        public OpenXRControllerServiceModule(string name, uint priority, OpenXRControllerServiceModuleProfile profile, IInputService parentService)
+            : base(name, priority, profile, parentService) { }
+    }
+}
diff --git a/...ice/OpenXRControllerServiceModule.cs.meta → ...ers/OpenXRControllerServiceModule.cs.meta b/...ice/OpenXRControllerServiceModule.cs.meta → ...ers/OpenXRControllerServiceModule.cs.meta
diff --git a/Runtime/Input/Controllers/OpenXRControllerServiceModuleProfile.cs 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
+{
+    /// <summary>
+    /// Configuration profile for <see cref="OpenXRControllerServiceModule"/>.
+    /// </summary>
+    public class OpenXRControllerServiceModuleProfile : BaseControllerServiceModuleProfile
+    {
+        /// <inheritdoc />
+        public override ControllerDefinition[] GetDefaultControllerOptions()
+        {
+            return null;
+        }
+    }
+}
diff --git a/Runtime/Input/Controllers/OpenXRControllerServiceModuleProfile.cs.meta b/Runtime/Input/Controllers/OpenXRControllerServiceModuleProfile.cs.meta
diff --git a/Runtime/InputService/IOpenXRHandControllerServiceModule.cs b/Runtime/InputService/IOpenXRHandControllerServiceModule.cs
diff --git a/Runtime/InputService/OpenXRControllerServiceModule.cs b/Runtime/InputService/OpenXRControllerServiceModule.cs
diff --git a/Runtime/InputService/OpenXRHandControllerServiceModule.cs b/Runtime/InputService/OpenXRHandControllerServiceModule.cs
diff --git a/Runtime/InputService/OpenXRHandControllerServiceModule.cs.meta b/Runtime/InputService/OpenXRHandControllerServiceModule.cs.meta