Refactor XRI classes in core

UCL-VR · Mar 27, 2024 · 3488f9e · 3488f9e
1 parent 7a56afb
commit 3488f9e
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 10 deletions.
diff --git a/...Assets/Ubiq/Editor/XRI/XRIImportHelper.cs → ...Assets/Ubiq/Editor/XRI/ImportHelperXRI.cs b/...Assets/Ubiq/Editor/XRI/XRIImportHelper.cs → ...Assets/Ubiq/Editor/XRI/ImportHelperXRI.cs
@@ -1,6 +1,6 @@
 namespace Ubiq.Editor.XRI
 {
-    public static class XRIImportHelper
+    public static class ImportHelperXRI
     {
         public static void Import()
         {

diff --git a/...s/Ubiq/Editor/XRI/XRIImportHelper.cs.meta → ...s/Ubiq/Editor/XRI/ImportHelperXRI.cs.meta b/...s/Ubiq/Editor/XRI/XRIImportHelper.cs.meta → ...s/Ubiq/Editor/XRI/ImportHelperXRI.cs.meta
diff --git a/...Ubiq/Runtime/XRI/XRIAvatarHintProvider.cs → ...Ubiq/Runtime/XRI/AvatarHintProviderXRI.cs b/...Ubiq/Runtime/XRI/XRIAvatarHintProvider.cs → ...Ubiq/Runtime/XRI/AvatarHintProviderXRI.cs
@@ -1,15 +1,12 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using Ubiq.Avatars;
 #if XRI_2_5_2_OR_NEWER
-using UnityEngine.XR.Interaction.Toolkit;
 using UnityEngine.XR.Interaction.Toolkit.Inputs;
 #endif
 
 namespace Ubiq.XRI
 {
-    public class XRIAvatarHintProvider : AvatarHintProvider
+    public class AvatarHintProviderXRI : AvatarHintProvider
     {
         [Tooltip("The AvatarManager to provide hints for. If null, will try to find an AvatarManager in the scene at start.")]
         [SerializeField] private AvatarManager avatarManager;

diff --git a/...Runtime/XRI/XRIAvatarHintProvider.cs.meta → ...Runtime/XRI/AvatarHintProviderXRI.cs.meta b/...Runtime/XRI/XRIAvatarHintProvider.cs.meta → ...Runtime/XRI/AvatarHintProviderXRI.cs.meta
diff --git a/...Assets/Ubiq/Runtime/XRI/XRIMenuAdapter.cs → ...Assets/Ubiq/Runtime/XRI/MenuAdapterXRI.cs b/...Assets/Ubiq/Runtime/XRI/XRIMenuAdapter.cs → ...Assets/Ubiq/Runtime/XRI/MenuAdapterXRI.cs
@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 #if XRI_2_5_2_OR_NEWER
 using UnityEngine.XR.Interaction.Toolkit;
@@ -8,7 +6,7 @@
 
 namespace Ubiq.XRI
 {
-    public class XRIMenuAdapter : MonoBehaviour
+    public class MenuAdapterXRI : MonoBehaviour
     {
 #if XRI_2_5_2_OR_NEWER
         private void Start()

diff --git a/...s/Ubiq/Runtime/XRI/XRIMenuAdapter.cs.meta → ...s/Ubiq/Runtime/XRI/MenuAdapterXRI.cs.meta b/...s/Ubiq/Runtime/XRI/XRIMenuAdapter.cs.meta → ...s/Ubiq/Runtime/XRI/MenuAdapterXRI.cs.meta
diff --git a/Unity/Assets/Ubiq/Samples/Demo (XRI)/Assets/Scripts/Editor/AddPackageXRI.cs b/Unity/Assets/Ubiq/Samples/Demo (XRI)/Assets/Scripts/Editor/AddPackageXRI.cs
@@ -14,7 +14,7 @@ static AddPackageXRI()
 
         static void Update()
         {
-            XRIImportHelper.Import();
+            ImportHelperXRI.Import();
             EditorApplication.update -= Update;
         }
     }

diff --git a/Unity/Assets/Ubiq/Samples/Player (XRI + WebXR)/Scripts/Editor/AddPackagesWebXR.cs b/Unity/Assets/Ubiq/Samples/Player (XRI + WebXR)/Scripts/Editor/AddPackagesWebXR.cs
@@ -48,7 +48,7 @@ static void Update()
 #if WEBXRINTERACTIONS_0_22_0_OR_NEWER
             PackageManagerHelper.RequireSample("com.de-panther.webxr-interactions","XR Interaction Toolkit Sample");
 #endif
-            XRIImportHelper.Import();
+            ImportHelperXRI.Import();
 
             EditorApplication.update -= Update;
         }