From d8c9187289e66397dd20f55b16240594fd67f37f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dino=20Fejzagi=C4=87?= Date: Thu, 20 Jun 2024 09:39:08 +0200 Subject: [PATCH] Restore core compatibility --- Assets~/Profiles/PlayerPackageInstallerProfile.asset | 2 +- Editor/PlayerPackageInstaller.cs | 4 ++-- Editor/RealityToolkit.Player.Editor.asmdef | 4 +++- package.json | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Assets~/Profiles/PlayerPackageInstallerProfile.asset b/Assets~/Profiles/PlayerPackageInstallerProfile.asset index 24205d9..64032a3 100644 --- a/Assets~/Profiles/PlayerPackageInstallerProfile.asset +++ b/Assets~/Profiles/PlayerPackageInstallerProfile.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: da64fb88269149f8a95f1fb969d6a0b4, type: 3} + m_Script: {fileID: 11500000, guid: ca58982aa11ed854eb65870ff37088c6, type: 3} m_Name: PlayerPackageInstallerProfile m_EditorClassIdentifier: platformEntries: diff --git a/Editor/PlayerPackageInstaller.cs b/Editor/PlayerPackageInstaller.cs index 132cdc9..8de2746 100644 --- a/Editor/PlayerPackageInstaller.cs +++ b/Editor/PlayerPackageInstaller.cs @@ -6,16 +6,16 @@ using RealityCollective.Utilities.Editor; using RealityCollective.Utilities.Extensions; using RealityToolkit.Editor; +using RealityToolkit.Editor.Settings; using System.IO; using UnityEditor; -using UnityEngine; namespace RealityToolkit.Player.Editor { [InitializeOnLoad] internal static class PlayerPackageInstaller { - private static readonly string destinationPath = Application.dataPath + "/RealityToolkit.Generated/Player"; + private static readonly string destinationPath = Path.Combine(RealityToolkitEditorSettings.Instance.AssetImportPath, "Player"); private static readonly string sourcePath = Path.GetFullPath($"{PathFinderUtility.ResolvePath(typeof(PlayerPackagePathFinder)).ForwardSlashes()}{Path.DirectorySeparatorChar}{"Assets~"}"); static PlayerPackageInstaller() diff --git a/Editor/RealityToolkit.Player.Editor.asmdef b/Editor/RealityToolkit.Player.Editor.asmdef index 8a0d72f..d6f3eab 100644 --- a/Editor/RealityToolkit.Player.Editor.asmdef +++ b/Editor/RealityToolkit.Player.Editor.asmdef @@ -8,7 +8,9 @@ "GUID:b2d046948d6452a4b8485efc9ce0f88c", "GUID:2a3f0ca4e21332c44bfdce311ea8943e", "GUID:9753fcbb5b1feaf459f435ac95e51baa", - "GUID:13703f41b24bb904cb2305abe6317e3d" + "GUID:13703f41b24bb904cb2305abe6317e3d", + "GUID:dc960734dc080426fa6612f1c5fe95f3", + "GUID:4ddd23ea56a3a40f0aa0036d1624a53e" ], "includePlatforms": [ "Editor" diff --git a/package.json b/package.json index 0cd77eb..26388e5 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "url": "https://github.com/realitycollective" }, "dependencies": { - "com.realitytoolkit.core": "1.0.0-pre.50", + "com.realitytoolkit.core": "1.0.0-pre.56", "com.unity.xr.legacyinputhelpers": "2.1.7" }, "assets": [ @@ -37,4 +37,4 @@ "path": "Assets~/" } ] -} +} \ No newline at end of file