diff --git a/.github/workflows/development-buildandtestupmrelease.yml b/.github/workflows/development-buildandtestupmrelease.yml index fc6ac92..88f6233 100644 --- a/.github/workflows/development-buildandtestupmrelease.yml +++ b/.github/workflows/development-buildandtestupmrelease.yml @@ -39,3 +39,10 @@ jobs: unityversion: ${{ needs.Validate-Unity.outputs.unityeditorversion }} dependencies: '[{"development": "github.com/realitycollective/com.realitytoolkit.core.git"},{"development": "github.com/realitycollective/com.realitytoolkit.player.git"},{"development": "github.com/realitycollective/com.realitycollective.utilities.git"},{"development": "github.com/realitycollective/com.realitytoolkit.service-framework.git"},{"pico_dependencies": "github.com/realitycollective/com.realitytoolkit.pico.git"}]' secrets: inherit + + Build-Complete: + runs-on: ubuntu-latest + name: Build completion task + needs: Run-Unit-Tests + steps: + - run: echo "Build Complete" \ No newline at end of file diff --git a/Editor/AssemblyInfo.cs b/Editor/AssemblyInfo.cs new file mode 100644 index 0000000..c524785 --- /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.2")] +[assembly: AssemblyTitle("com.realitytoolkit.pico.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..3e9aac5 --- /dev/null +++ b/Editor/AssemblyInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2c537a67a0988a542be7c3c73d04d4d1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/PicoPackageInstaller.cs b/Editor/PicoPackageInstaller.cs index 37149c8..053d172 100644 --- a/Editor/PicoPackageInstaller.cs +++ b/Editor/PicoPackageInstaller.cs @@ -1,11 +1,12 @@ -// 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 RealityToolkit.Editor.Settings; using System.IO; using UnityEditor; @@ -14,7 +15,7 @@ namespace RealityToolkit.Pico.Editor [InitializeOnLoad] internal static class PicoPackageInstaller { - private static readonly string destinationPath = $"{RealityToolkitPreferences.ProfileGenerationPath}Pico"; + private static readonly string destinationPath = Path.Combine(RealityToolkitEditorSettings.Instance.AssetImportPath, "Pico"); private static readonly string sourcePath = Path.GetFullPath($"{PathFinderUtility.ResolvePath(typeof(PicoPackagePathFinder)).ForwardSlashes()}{Path.DirectorySeparatorChar}{RealityToolkitPreferences.HIDDEN_PACKAGE_ASSETS_PATH}"); static PicoPackageInstaller() diff --git a/Editor/RealityToolkit.Pico.Editor.asmdef b/Editor/RealityToolkit.Pico.Editor.asmdef index 8a66d06..f357021 100644 --- a/Editor/RealityToolkit.Pico.Editor.asmdef +++ b/Editor/RealityToolkit.Pico.Editor.asmdef @@ -7,7 +7,8 @@ "GUID:47edcdc3718357b4585cd9edf119e1e0", "GUID:b2d046948d6452a4b8485efc9ce0f88c", "GUID:2a3f0ca4e21332c44bfdce311ea8943e", - "GUID:9753fcbb5b1feaf459f435ac95e51baa" + "GUID:9753fcbb5b1feaf459f435ac95e51baa", + "GUID:4ddd23ea56a3a40f0aa0036d1624a53e" ], "includePlatforms": [ "Editor" diff --git a/Runtime/AssemblyInfo.cs b/Runtime/AssemblyInfo.cs new file mode 100644 index 0000000..3d3665c --- /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.2")] +[assembly: AssemblyTitle("com.realitytoolkit.pico")] +[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..9d7e050 --- /dev/null +++ b/Runtime/AssemblyInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e46fb28a6a387a844afce03bcb33177a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/Input/Controllers/Pico4Controller.cs b/Runtime/Input/Controllers/Pico4Controller.cs index 9b45462..09cb157 100644 --- a/Runtime/Input/Controllers/Pico4Controller.cs +++ b/Runtime/Input/Controllers/Pico4Controller.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 RealityCollective.Definitions.Utilities; using RealityToolkit.Definitions.Controllers; using RealityToolkit.Definitions.Devices; +using RealityToolkit.Input.Definitions; using RealityToolkit.Input.Interfaces.Modules; using System.Collections.Generic; using UnityEngine; diff --git a/Runtime/Input/Controllers/PicoController.cs b/Runtime/Input/Controllers/PicoController.cs index a5208df..958311a 100644 --- a/Runtime/Input/Controllers/PicoController.cs +++ b/Runtime/Input/Controllers/PicoController.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.Definitions.Utilities; using RealityToolkit.Definitions.Controllers; using RealityToolkit.Definitions.Devices; using RealityToolkit.Input.Controllers; +using RealityToolkit.Input.Definitions; using RealityToolkit.Input.Extensions; using RealityToolkit.Input.Interfaces.Modules; using System.Collections.Generic; diff --git a/Runtime/Input/Controllers/PicoControllerServiceModule.cs b/Runtime/Input/Controllers/PicoControllerServiceModule.cs index 273eab6..d2520be 100644 --- a/Runtime/Input/Controllers/PicoControllerServiceModule.cs +++ b/Runtime/Input/Controllers/PicoControllerServiceModule.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.Definitions.Utilities; using RealityCollective.ServiceFramework.Attributes; using RealityToolkit.Definitions.Devices; using RealityToolkit.Input.Controllers; +using RealityToolkit.Input.Definitions; using RealityToolkit.Input.Interfaces; using System; using System.Collections.Generic; diff --git a/Runtime/Input/Controllers/PicoControllerServiceModuleProfile.cs b/Runtime/Input/Controllers/PicoControllerServiceModuleProfile.cs index 4c52723..8130065 100644 --- a/Runtime/Input/Controllers/PicoControllerServiceModuleProfile.cs +++ b/Runtime/Input/Controllers/PicoControllerServiceModuleProfile.cs @@ -1,13 +1,13 @@ -// 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.Definitions.Utilities; using RealityToolkit.Definitions.Controllers; +using RealityToolkit.Input.Definitions; namespace RealityToolkit.Pico.Input.Controllers { /// - /// Configuration profile for . + /// Configuration profile for . /// public class PicoControllerServiceModuleProfile : BaseControllerServiceModuleProfile { diff --git a/Runtime/Input/Controllers/PicoNeo3Controller.cs b/Runtime/Input/Controllers/PicoNeo3Controller.cs index 7ef5c33..714d79b 100644 --- a/Runtime/Input/Controllers/PicoNeo3Controller.cs +++ b/Runtime/Input/Controllers/PicoNeo3Controller.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 RealityCollective.Definitions.Utilities; using RealityToolkit.Definitions.Controllers; using RealityToolkit.Definitions.Devices; +using RealityToolkit.Input.Definitions; using RealityToolkit.Input.Interfaces.Modules; using System.Collections.Generic; using UnityEngine; diff --git a/Runtime/PicoPlatform.cs b/Runtime/PicoPlatform.cs index 0e43a05..dfec0ad 100644 --- a/Runtime/PicoPlatform.cs +++ b/Runtime/PicoPlatform.cs @@ -1,7 +1,7 @@ -// 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.Extensions; +using RealityCollective.Utilities.Extensions; using RealityCollective.ServiceFramework.Definitions.Platforms; using RealityCollective.ServiceFramework.Interfaces; using System.Collections.Generic; diff --git a/Runtime/Player/Rigs.meta b/Runtime/Player/Rigs.meta new file mode 100644 index 0000000..6f8bca9 --- /dev/null +++ b/Runtime/Player/Rigs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 08a8d1e5c47024c4396fd267f187e994 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/Player/IPicoPlayerRigServiceModule.cs b/Runtime/Player/Rigs/IPicoPlayerRigServiceModule.cs similarity index 70% rename from Runtime/Player/IPicoPlayerRigServiceModule.cs rename to Runtime/Player/Rigs/IPicoPlayerRigServiceModule.cs index 0e0cb0a..b5cbbd5 100644 --- a/Runtime/Player/IPicoPlayerRigServiceModule.cs +++ b/Runtime/Player/Rigs/IPicoPlayerRigServiceModule.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.Player.Interfaces; +using RealityToolkit.Player.Rigs; -namespace RealityToolkit.Pico.Player +namespace RealityToolkit.Pico.Player.Rigs { /// /// Fully qualifies the specific implementation of . diff --git a/Runtime/Player/IPicoPlayerRigServiceModule.cs.meta b/Runtime/Player/Rigs/IPicoPlayerRigServiceModule.cs.meta similarity index 100% rename from Runtime/Player/IPicoPlayerRigServiceModule.cs.meta rename to Runtime/Player/Rigs/IPicoPlayerRigServiceModule.cs.meta diff --git a/Runtime/Player/PicoPlayerRigServiceModule.cs b/Runtime/Player/Rigs/PicoPlayerRigServiceModule.cs similarity index 90% rename from Runtime/Player/PicoPlayerRigServiceModule.cs rename to Runtime/Player/Rigs/PicoPlayerRigServiceModule.cs index 8ecc4ee..00062a8 100644 --- a/Runtime/Player/PicoPlayerRigServiceModule.cs +++ b/Runtime/Player/Rigs/PicoPlayerRigServiceModule.cs @@ -1,14 +1,14 @@ -// 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.ServiceFramework.Attributes; -using RealityToolkit.Player.Interfaces; -using RealityToolkit.Player.Modules; +using RealityToolkit.Player; +using RealityToolkit.Player.Rigs; using Unity.XR.PXR; using UnityEngine; using FoveatedRenderingMode = Unity.XR.PXR.FoveatedRenderingMode; -namespace RealityToolkit.Pico.Player +namespace RealityToolkit.Pico.Player.Rigs { /// /// service module used when running on the . diff --git a/Runtime/Player/PicoPlayerRigServiceModule.cs.meta b/Runtime/Player/Rigs/PicoPlayerRigServiceModule.cs.meta similarity index 100% rename from Runtime/Player/PicoPlayerRigServiceModule.cs.meta rename to Runtime/Player/Rigs/PicoPlayerRigServiceModule.cs.meta diff --git a/Runtime/Player/PicoPlayerRigServiceModuleProfile.cs b/Runtime/Player/Rigs/PicoPlayerRigServiceModuleProfile.cs similarity index 88% rename from Runtime/Player/PicoPlayerRigServiceModuleProfile.cs rename to Runtime/Player/Rigs/PicoPlayerRigServiceModuleProfile.cs index 551257c..48d72a4 100644 --- a/Runtime/Player/PicoPlayerRigServiceModuleProfile.cs +++ b/Runtime/Player/Rigs/PicoPlayerRigServiceModuleProfile.cs @@ -1,11 +1,11 @@ -// 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.Player.Definitions; +using RealityToolkit.Player.Rigs; using Unity.XR.PXR; using UnityEngine; -namespace RealityToolkit.Pico.Player +namespace RealityToolkit.Pico.Player.Rigs { /// /// Configuration profile for . diff --git a/Runtime/Player/PicoPlayerRigServiceModuleProfile.cs.meta b/Runtime/Player/Rigs/PicoPlayerRigServiceModuleProfile.cs.meta similarity index 100% rename from Runtime/Player/PicoPlayerRigServiceModuleProfile.cs.meta rename to Runtime/Player/Rigs/PicoPlayerRigServiceModuleProfile.cs.meta diff --git a/package.json b/package.json index 09088e5..01abf5d 100644 --- a/package.json +++ b/package.json @@ -2,17 +2,20 @@ "name": "com.realitytoolkit.pico", "displayName": "RealityToolkit.Pico", "description": "The PICO platform components for the Reality Toolkit. This package enables your Reality Toolkit based project to run on PICO devices.", + "version": "1.0.2-pre.8", + "documentationUrl": "https://realitytoolkit.io", + "changelogUrl": "https://github.com/realitycollective/com.realitytoolkit.pico/releases", + "licensesUrl": "https://github.com/realitycollective/com.realitytoolkit.pico/blob/main/LICENSE.md", "keywords": [ "VR", "AR", "XR", "Mixed Reality" ], - "version": "1.0.2-pre.8", - "unity": "2021.3", + "unity": "2022.3", "homepage": "https://github.com/realitycollective", "bugs": { - "url": "https://github.com/realitycollective/realitytoolkit.dev/issues" + "url": "https://github.com/realitycollective/com.realitytoolkit.pico/issues" }, "license": "MIT", "repository": { @@ -25,9 +28,12 @@ "url": "https://github.com/realitycollective" }, "dependencies": { - "com.realitytoolkit.core": "1.0.0-pre.37", - "com.realitytoolkit.player": "1.0.3-pre.1", - "com.unity.xr.picoxr": "2.3.4" + "com.realitytoolkit.core": "1.0.0-pre.48", + "com.realitytoolkit.player": "1.0.4", + "com.unity.xr.picoxr": "2.5.0" + }, + "publishConfig": { + "registry": "https://package.openupm.com" }, "assets": [ { @@ -35,4 +41,4 @@ "path": "Assets~/" } ] -} +} \ No newline at end of file