Merge pull request #7 from realitycollective/fix/path-finder

Fix path finder and clean up
realitycollective · May 11, 2024 · 61542f6 · 61542f6
2 parents dcc4731 + 4007c67
commit 61542f6
Show file tree

Hide file tree

Showing 30 changed files with 49 additions and 367 deletions.
diff --git a/.npmignore b/.npmignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1 +1,3 @@
-Placeholder to be replaced by root [changelog](../../../CHANGELOG.md) during build
+# Changelog
+
+Please refer to the package's [Releases GitHub Page](https://github.com/realitycollective/com.realitytoolkit.spatial-persistence.arfoundation/releases) for the changelog.
diff --git a/Documentation~/com.realitytoolkit.spatialpersistence.arfoundation.md b/Documentation~/com.realitytoolkit.spatialpersistence.arfoundation.md
diff --git a/Editor/AssemblyInfo.cs.meta b/Editor/AssemblyInfo.cs.meta
diff --git a/Editor/RealityToolkit.SpatialPersistence.ARFoundation.Editor.asmdef b/Editor/RealityToolkit.SpatialPersistence.ARFoundation.Editor.asmdef
@@ -8,7 +8,8 @@
         "GUID:9753fcbb5b1feaf459f435ac95e51baa",
         "GUID:b2d046948d6452a4b8485efc9ce0f88c",
         "GUID:2a3f0ca4e21332c44bfdce311ea8943e",
-        "GUID:c148ca4f0506aba4bb7c9e15a44bf2e3"
+        "GUID:c148ca4f0506aba4bb7c9e15a44bf2e3",
+        "GUID:4ddd23ea56a3a40f0aa0036d1624a53e"
     ],
     "includePlatforms": [
         "Editor"

diff --git a/Editor/SpatialPersistence_ARFoundationPackageInstaller.cs b/Editor/SpatialPersistence_ARFoundationPackageInstaller.cs
@@ -1,34 +1,35 @@
-// 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.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;
-using UnityEngine;
 
 namespace RealityToolkit.SpatialPersistence.ARFoundation.Editor
 {
     [InitializeOnLoad]
     internal static class SpatialPersistence_ARFoundationPackageInstaller
     {
-        private static readonly string destinationPath = Application.dataPath + "/RealityToolkit.Generated/SpatialPersistence_ARFoundation";
-        private static readonly string sourcePath = Path.GetFullPath($"{PathFinderUtility.ResolvePath<IPathFinder>(typeof(SpatialPersistence_ARFoundationPackagePathFinder)).ForwardSlashes()}{Path.DirectorySeparatorChar}{"Assets~"}");
+        private static readonly string destinationPath = Path.Combine(RealityToolkitEditorSettings.Instance.AssetImportPath, "SpatialPersistence_ARFoundation");
+        private static readonly string sourcePath = Path.GetFullPath($"{PathFinderUtility.ResolvePath<IPathFinder>(typeof(SpatialPersistence_ARFoundationPackagePathFinder)).ForwardSlashes()}{Path.DirectorySeparatorChar}{RealityToolkitPreferences.HIDDEN_PACKAGE_ASSETS_PATH}");
 
         static SpatialPersistence_ARFoundationPackageInstaller()
         {
             EditorApplication.delayCall += CheckPackage;
         }
 
-        [MenuItem(ServiceFrameworkPreferences.Editor_Menu_Keyword + "/Reality Toolkit/Packages/Install SpatialPersistence_ARFoundation Package Assets...", true)]
+        [MenuItem(RealityToolkitPreferences.Editor_Menu_Keyword + "/Packages / Install SpatialPersistence_ARFoundation Package Assets...", true)]
         private static bool ImportPackageAssetsValidation()
         {
             return !Directory.Exists($"{destinationPath}{Path.DirectorySeparatorChar}");
         }
 
-        [MenuItem(ServiceFrameworkPreferences.Editor_Menu_Keyword + "/Reality Toolkit/Packages/Install SpatialPersistence_ARFoundation Package Assets...")]
+        [MenuItem(RealityToolkitPreferences.Editor_Menu_Keyword + "/Packages / Install SpatialPersistence_ARFoundation Package Assets...")]
         private static void ImportPackageAssets()
         {
             EditorPreferences.Set($"{nameof(SpatialPersistence_ARFoundationPackageInstaller)}.Assets", false);

diff --git a/Editor/SpatialPersistence_ARFoundationPackageInstaller.cs.meta b/Editor/SpatialPersistence_ARFoundationPackageInstaller.cs.meta
diff --git a/Editor/SpatialPersistence_ARFoundationPackageModulesInstaller.cs.meta b/Editor/SpatialPersistence_ARFoundationPackageModulesInstaller.cs.meta
diff --git a/...tialPersistence_ARFoundationPathFinder.cs → ...sistence_ARFoundationPackagePathFinder.cs b/...tialPersistence_ARFoundationPathFinder.cs → ...sistence_ARFoundationPackagePathFinder.cs
diff --git a/...ersistence_ARFoundationPathFinder.cs.meta → ...nce_ARFoundationPackagePathFinder.cs.meta b/...ersistence_ARFoundationPathFinder.cs.meta → ...nce_ARFoundationPackagePathFinder.cs.meta
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Reality Collective
+Copyright (c) 2022-2024 Reality Collective
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Runtime/AssemblyInfo.cs.meta b/Runtime/AssemblyInfo.cs.meta
diff --git a/Tests.meta b/Tests.meta
diff --git a/Tests/Editor.meta b/Tests/Editor.meta
diff --git a/Tests/Editor/AssemblyInfo.cs b/Tests/Editor/AssemblyInfo.cs
diff --git a/Tests/Editor/AssemblyInfo.cs.meta b/Tests/Editor/AssemblyInfo.cs.meta
diff --git a/Tests/Editor/EditorExampleTest.cs b/Tests/Editor/EditorExampleTest.cs
diff --git a/Tests/Editor/EditorExampleTest.cs.meta b/Tests/Editor/EditorExampleTest.cs.meta
diff --git a/Tests/Editor/RealityToolkit.SpatialPersistence_ARFoundation.Editor.Tests.asmdef b/Tests/Editor/RealityToolkit.SpatialPersistence_ARFoundation.Editor.Tests.asmdef
diff --git a/Tests/Editor/RealityToolkit.SpatialPersistence_ARFoundation.Editor.Tests.asmdef.meta b/Tests/Editor/RealityToolkit.SpatialPersistence_ARFoundation.Editor.Tests.asmdef.meta
diff --git a/Tests/Runtime.meta b/Tests/Runtime.meta
diff --git a/Tests/Runtime/AssemblyInfo.cs b/Tests/Runtime/AssemblyInfo.cs
diff --git a/Tests/Runtime/AssemblyInfo.cs.meta b/Tests/Runtime/AssemblyInfo.cs.meta
diff --git a/Tests/Runtime/RealityToolkit.SpatialPersistence_ARFoundation.Tests.asmdef b/Tests/Runtime/RealityToolkit.SpatialPersistence_ARFoundation.Tests.asmdef
diff --git a/Tests/Runtime/RealityToolkit.SpatialPersistence_ARFoundation.Tests.asmdef.meta b/Tests/Runtime/RealityToolkit.SpatialPersistence_ARFoundation.Tests.asmdef.meta