Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Core module compatibility #42

Merged
merged 5 commits into from
May 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/development-buildandtestupmrelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
9 changes: 9 additions & 0 deletions Editor/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -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.")]
11 changes: 11 additions & 0 deletions Editor/AssemblyInfo.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions Editor/PicoPackageInstaller.cs
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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<IPathFinder>(typeof(PicoPackagePathFinder)).ForwardSlashes()}{Path.DirectorySeparatorChar}{RealityToolkitPreferences.HIDDEN_PACKAGE_ASSETS_PATH}");

static PicoPackageInstaller()
Expand Down
3 changes: 2 additions & 1 deletion Editor/RealityToolkit.Pico.Editor.asmdef
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"GUID:47edcdc3718357b4585cd9edf119e1e0",
"GUID:b2d046948d6452a4b8485efc9ce0f88c",
"GUID:2a3f0ca4e21332c44bfdce311ea8943e",
"GUID:9753fcbb5b1feaf459f435ac95e51baa"
"GUID:9753fcbb5b1feaf459f435ac95e51baa",
"GUID:4ddd23ea56a3a40f0aa0036d1624a53e"
],
"includePlatforms": [
"Editor"
Expand Down
9 changes: 9 additions & 0 deletions Runtime/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -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.")]
11 changes: 11 additions & 0 deletions Runtime/AssemblyInfo.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Runtime/Input/Controllers/Pico4Controller.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Input/Controllers/PicoController.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Input/Controllers/PicoControllerServiceModule.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
/// <summary>
/// Configuration profile for <see cref="InputService.PicoControllerServiceModule"/>.
/// Configuration profile for <see cref="PicoControllerServiceModule"/>.
/// </summary>
public class PicoControllerServiceModuleProfile : BaseControllerServiceModuleProfile
{
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Input/Controllers/PicoNeo3Controller.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/PicoPlatform.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 8 additions & 0 deletions Runtime/Player/Rigs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -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
{
/// <summary>
/// Fully qualifies the <see cref="PicoPlatform"/> specific implementation of <see cref="IPlayerRigServiceModule"/>.
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
/// <summary>
/// <see cref="IPlayerSystem"/> service module used when running on the <see cref="PicoPlatform"/>.
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
/// <summary>
/// Configuration profile for <see cref="PicoPlayerRigServiceModule"/>.
Expand Down
20 changes: 13 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -25,14 +28,17 @@
"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": [
{
"displayName": "Default Assets",
"path": "Assets~/"
}
]
}
}