From 52edadbfcf525f7ad78f9de992b16095f9f9bb63 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Mon, 4 May 2020 14:47:50 -0400 Subject: [PATCH 1/4] updated installation path --- .../com.xrtk.wmr/Editor/WindowsMixedRealityPackageInstaller.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/WindowsMixedRealityPackageInstaller.cs b/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/WindowsMixedRealityPackageInstaller.cs index 15c7759..6e85c62 100644 --- a/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/WindowsMixedRealityPackageInstaller.cs +++ b/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/WindowsMixedRealityPackageInstaller.cs @@ -19,7 +19,7 @@ static WindowsMixedRealityPackageInstaller() { if (!EditorPreferences.Get($"{nameof(WindowsMixedRealityPackageInstaller)}", false)) { - EditorPreferences.Set($"{nameof(WindowsMixedRealityPackageInstaller)}", PackageInstaller.TryInstallProfiles(HiddenPath, DefaultPath)); + EditorPreferences.Set($"{nameof(WindowsMixedRealityPackageInstaller)}", PackageInstaller.TryInstallAssets(HiddenPath, $"{DefaultPath}\\Profiles")); } } } From 2291ae5549db4f3c95c84a5d30cbe855b51af03e Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Mon, 4 May 2020 15:36:55 -0400 Subject: [PATCH 2/4] Added manual asset install menu item --- .../WindowsMixedRealityPackageInstaller.cs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/WindowsMixedRealityPackageInstaller.cs b/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/WindowsMixedRealityPackageInstaller.cs index 6e85c62..f183350 100644 --- a/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/WindowsMixedRealityPackageInstaller.cs +++ b/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/WindowsMixedRealityPackageInstaller.cs @@ -16,6 +16,24 @@ internal static class WindowsMixedRealityPackageInstaller private static readonly string HiddenPath = Path.GetFullPath($"{PathFinderUtility.ResolvePath(typeof(WindowsMixedRealityPathFinder)).ToForwardSlashes()}\\{MixedRealityPreferences.HIDDEN_PROFILES_PATH}"); static WindowsMixedRealityPackageInstaller() + { + EditorApplication.delayCall += CheckPackage; + } + + [MenuItem("Mixed Reality Toolkit/Packages/Install Windows Mixed Realty Package Assets...", true)] + private static bool ImportLuminPackageAssetsValidation() + { + return !Directory.Exists($"{DefaultPath}\\Profiles"); + } + + [MenuItem("Mixed Reality Toolkit/Packages/Install Windows Mixed Realty Package Assets...")] + private static void ImportLuminPackageAssets() + { + EditorPreferences.Set($"{nameof(WindowsMixedRealityPackageInstaller)}", false); + EditorApplication.delayCall += CheckPackage; + } + + private static void CheckPackage() { if (!EditorPreferences.Get($"{nameof(WindowsMixedRealityPackageInstaller)}", false)) { From 83f88f92dfdafe129aed2405244d4727dfac62d8 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Mon, 4 May 2020 15:42:37 -0400 Subject: [PATCH 3/4] added profiles suffix to editor pref key --- .../Editor/WindowsMixedRealityPackageInstaller.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/WindowsMixedRealityPackageInstaller.cs b/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/WindowsMixedRealityPackageInstaller.cs index f183350..415c909 100644 --- a/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/WindowsMixedRealityPackageInstaller.cs +++ b/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/WindowsMixedRealityPackageInstaller.cs @@ -29,15 +29,15 @@ private static bool ImportLuminPackageAssetsValidation() [MenuItem("Mixed Reality Toolkit/Packages/Install Windows Mixed Realty Package Assets...")] private static void ImportLuminPackageAssets() { - EditorPreferences.Set($"{nameof(WindowsMixedRealityPackageInstaller)}", false); + EditorPreferences.Set($"{nameof(WindowsMixedRealityPackageInstaller)}.Profiles", false); EditorApplication.delayCall += CheckPackage; } private static void CheckPackage() { - if (!EditorPreferences.Get($"{nameof(WindowsMixedRealityPackageInstaller)}", false)) + if (!EditorPreferences.Get($"{nameof(WindowsMixedRealityPackageInstaller)}.Profiles", false)) { - EditorPreferences.Set($"{nameof(WindowsMixedRealityPackageInstaller)}", PackageInstaller.TryInstallAssets(HiddenPath, $"{DefaultPath}\\Profiles")); + EditorPreferences.Set($"{nameof(WindowsMixedRealityPackageInstaller)}.Profiles", PackageInstaller.TryInstallAssets(HiddenPath, $"{DefaultPath}\\Profiles")); } } } From cb3fea2166ddc8c8d2eddc6f74da297c4e353fbd Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Mon, 4 May 2020 17:10:51 -0400 Subject: [PATCH 4/4] updated method name --- .../Editor/WindowsMixedRealityPackageInstaller.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/WindowsMixedRealityPackageInstaller.cs b/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/WindowsMixedRealityPackageInstaller.cs index 415c909..a40ce8c 100644 --- a/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/WindowsMixedRealityPackageInstaller.cs +++ b/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/WindowsMixedRealityPackageInstaller.cs @@ -21,13 +21,13 @@ static WindowsMixedRealityPackageInstaller() } [MenuItem("Mixed Reality Toolkit/Packages/Install Windows Mixed Realty Package Assets...", true)] - private static bool ImportLuminPackageAssetsValidation() + private static bool ImportPackageAssetsValidation() { return !Directory.Exists($"{DefaultPath}\\Profiles"); } [MenuItem("Mixed Reality Toolkit/Packages/Install Windows Mixed Realty Package Assets...")] - private static void ImportLuminPackageAssets() + private static void ImportPackageAssets() { EditorPreferences.Set($"{nameof(WindowsMixedRealityPackageInstaller)}.Profiles", false); EditorApplication.delayCall += CheckPackage;