Add Hands Interaction Demo sample dependency, correct logging in Pack…

…ageManagerHelper
UCL-VR · Apr 8, 2024 · 222d211 · 222d211
1 parent 14d4f60
commit 222d211
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/Unity/Assets/Ubiq/Editor/Packages/PackageManagerHelper.cs b/Unity/Assets/Ubiq/Editor/Packages/PackageManagerHelper.cs
@@ -180,14 +180,14 @@ private static IEnumerator ProcessSamples()
                 if (info.sample.Import(Sample.ImportOptions.OverridePreviousImports
                     | Sample.ImportOptions.HideImportWindow))
                 {
-                    Debug.Log($"Ubiq successfully imported sample" +
-                        "\"{info.sample}\" from package \"{info.package}\".");
+                    Debug.Log("Ubiq successfully imported sample" +
+                        $"\"{info.sample}\" from package \"{info.package}\".");
                     assetsDirty = true;
                 }
                 else
                 {
-                    Debug.LogWarning($"Ubiq failed to import sample" +
-                        "\"{info.sample}\" from package \"{info.package}\".");
+                    Debug.LogWarning("Ubiq failed to import sample" +
+                        $"\"{info.sample}\" from package \"{info.package}\".");
                 }
             }
         }
@@ -214,9 +214,9 @@ private static List<SampleInfo> GetRequiredSamples(List<SampleRequest> requests)
 
                 if (packageSamples == null)
                 {
-                    Debug.LogWarning($"Ubiq is trying to find a sample" +
+                    Debug.LogWarning("Ubiq is trying to find a sample" +
                         " for the package" +
-                        " \"{ request.package }\", but the package could not" +
+                        $" \"{ request.package }\", but the package could not" +
                         " be found.");
                     continue;
                 }
@@ -240,9 +240,9 @@ private static List<SampleInfo> GetRequiredSamples(List<SampleRequest> requests)
                     continue;
                 }
 
-                Debug.LogWarning($"Ubiq is trying to find the sample" +
-                    " \"{ request.sample }\" for the package" +
-                    " \"{ request.package }\", but the sample could not" +
+                Debug.LogWarning("Ubiq is trying to find the sample" +
+                    $" \"{ request.sample }\" for the package" +
+                    $" \"{ request.package }\", but the sample could not" +
                     " be found in the package.");
             }
             return samples;

diff --git a/Unity/Assets/Ubiq/Editor/XRI/ImportHelperXRI.cs b/Unity/Assets/Ubiq/Editor/XRI/ImportHelperXRI.cs
@@ -21,6 +21,7 @@ public static void Import()
 #else
             PackageManagerHelper.RequireSample("com.unity.xr.interaction.toolkit","Starter Assets");
             PackageManagerHelper.RequireSample("com.unity.xr.interaction.toolkit","XR Device Simulator");
+            PackageManagerHelper.RequireSample("com.unity.xr.interaction.toolkit","Hands Interaction Demo");
             PackageManagerHelper.RequireSample("com.unity.xr.hands","HandVisualizer");
 #endif
         }