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

Update to latest core #4

Merged
merged 1 commit into from
May 7, 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
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.0")]
[assembly: AssemblyTitle("com.realitytoolkit.boundary.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/BoundaryPackageInstaller.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.Boundary.Editor
[InitializeOnLoad]
internal static class BoundaryPackageInstaller
{
private static readonly string destinationPath = $"{RealityToolkitPreferences.ProfileGenerationPath}Boundary";
private static readonly string destinationPath = Path.Combine(RealityToolkitEditorSettings.Instance.AssetImportPath, "Boundary");
private static readonly string sourcePath = Path.GetFullPath($"{PathFinderUtility.ResolvePath<IPathFinder>(typeof(BoundaryPackagePathFinder)).ForwardSlashes()}{Path.DirectorySeparatorChar}{RealityToolkitPreferences.HIDDEN_PACKAGE_ASSETS_PATH}");

static BoundaryPackageInstaller()
Expand Down
3 changes: 2 additions & 1 deletion Editor/RealityToolkit.Boundary.Editor.asmdef
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"GUID:9753fcbb5b1feaf459f435ac95e51baa",
"GUID:b2d046948d6452a4b8485efc9ce0f88c",
"GUID:2a3f0ca4e21332c44bfdce311ea8943e",
"GUID:bdb4a7e54aeda2e47aac136b6f424728"
"GUID:bdb4a7e54aeda2e47aac136b6f424728",
"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.0")]
[assembly: AssemblyTitle("com.realitytoolkit.boundary")]
[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.

2 changes: 1 addition & 1 deletion Runtime/BoundaryService.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// 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.ServiceFramework.Attributes;
using RealityCollective.ServiceFramework.Definitions.Platforms;
using RealityCollective.ServiceFramework.Services;
using RealityCollective.Utilities.Extensions;
using RealityToolkit.Boundary.Definitions;
using RealityToolkit.Boundary.Utilities;
using RealityToolkit.Utilities;
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Definitions/BoundaryServiceProfile.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright (c) Reality Collective. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

using RealityCollective.Attributes;
using RealityCollective.ServiceFramework.Definitions;
using RealityCollective.Utilities.Attributes;
using UnityEngine;

namespace RealityToolkit.Boundary.Definitions
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Definitions/BoundaryVisibility.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 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.

namespace RealityToolkit.Boundary.Definitions
Expand All @@ -11,7 +11,7 @@ public enum BoundaryVisibility
{
/// <summary>
/// The boundaries visibility status is unknown. Platform boundaries visibility
/// may be unknown e.g. when the platform does not provide an API for XRTK to query
/// may be unknown e.g. when the platform does not provide an API for Reality Toolkit to query
/// boundary visibility state.
/// </summary>
Unknown = 0,
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Definitions/InscribedRectangle.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// 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 RealityToolkit.Boundary.Utilities;
using RealityToolkit.Utilities;
using System;
Expand Down
16 changes: 11 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,21 @@
"name": "com.realitytoolkit.boundary",
"displayName": "RealityToolkit.Boundary",
"description": "A boundary system for use with the Reality Toolkit.",
"version": "1.0.0-pre.2",
"documentationUrl": "https://realitytoolkit.io",
"changelogUrl": "https://github.com/realitycollective/com.realitytoolkit.boundary/releases",
"licensesUrl": "https://github.com/realitycollective/com.realitytoolkit.boundary/blob/main/LICENSE.md",
"keywords": [
"VR",
"AR",
"XR",
"Mixed Reality",
"Boundary"
],
"version": "1.0.0-pre.2",
"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.boundary/issues"
},
"license": "MIT",
"repository": {
Expand All @@ -25,13 +28,16 @@
"email": "[email protected]",
"url": "https://github.com/realitycollective"
},
"publishConfig": {
"registry": "https://package.openupm.com"
},
"dependencies": {
"com.realitytoolkit.core": "1.0.0-pre.37"
"com.realitytoolkit.core": "1.0.0-pre.48"
},
"assets": [
{
"displayName": "Default Assets",
"path": "Assets~/"
}
]
}
}
Loading