Rename remaining instances of EditorVR

MatthewMaker · Dec 9, 2019 · 3238920 · 3238920
1 parent d08b179
commit 3238920
Show file tree

Hide file tree

Showing 97 changed files with 107 additions and 107 deletions.
diff --git a/Runtime/Actions/Icons/CopyIcon.png.meta b/Runtime/Actions/Icons/CopyIcon.png.meta
diff --git a/Runtime/Actions/Icons/CutIcon.png.meta b/Runtime/Actions/Icons/CutIcon.png.meta
diff --git a/Runtime/Actions/Icons/DeleteIcon.png.meta b/Runtime/Actions/Icons/DeleteIcon.png.meta
diff --git a/Runtime/Actions/Icons/DuplicateIcon.png.meta b/Runtime/Actions/Icons/DuplicateIcon.png.meta
diff --git a/Runtime/Actions/Icons/EmptyActionIcon.png.meta b/Runtime/Actions/Icons/EmptyActionIcon.png.meta
diff --git a/Runtime/Actions/Icons/MissingIcon.png.meta b/Runtime/Actions/Icons/MissingIcon.png.meta
diff --git a/Runtime/Actions/Icons/OpenSceneIcon.png.meta b/Runtime/Actions/Icons/OpenSceneIcon.png.meta
diff --git a/Runtime/Actions/Icons/PasteIcon.png.meta b/Runtime/Actions/Icons/PasteIcon.png.meta
diff --git a/Runtime/Actions/Icons/PlayIcon.png.meta b/Runtime/Actions/Icons/PlayIcon.png.meta
diff --git a/Runtime/Actions/Icons/RedoIcon.png.meta b/Runtime/Actions/Icons/RedoIcon.png.meta
diff --git a/Runtime/Actions/Icons/SaveSceneIcon.png.meta b/Runtime/Actions/Icons/SaveSceneIcon.png.meta
diff --git a/Runtime/Actions/Icons/SelectParentIcon.png.meta b/Runtime/Actions/Icons/SelectParentIcon.png.meta
diff --git a/Runtime/Actions/Icons/SwitchModesIcon.png.meta b/Runtime/Actions/Icons/SwitchModesIcon.png.meta
diff --git a/Runtime/Actions/Icons/UndoIcon.png.meta b/Runtime/Actions/Icons/UndoIcon.png.meta
diff --git a/Runtime/Menus/MainMenu/Shaders/AngledVerticalGradientUIClip.shader b/Runtime/Menus/MainMenu/Shaders/AngledVerticalGradientUIClip.shader
@@ -1,4 +1,4 @@
-Shader "EditorVR/UI/Angled Vertical Gradient UI Clip"
+Shader "EditorXR/UI/Angled Vertical Gradient UI Clip"
 {
     Properties
     {

diff --git a/Runtime/Menus/MainMenu/Shaders/TransparentBlurVerticalFade.shader b/Runtime/Menus/MainMenu/Shaders/TransparentBlurVerticalFade.shader
@@ -1,4 +1,4 @@
-Shader "EditorVR/TransparentBlurVerticalFade"
+Shader "EditorXR/TransparentBlurVerticalFade"
 {
 	Properties{
 		_Color("Main Color", Color) = (1,1,1,1)

diff --git a/Runtime/Menus/MainMenu/Shaders/VerticalBorderGradient.shader b/Runtime/Menus/MainMenu/Shaders/VerticalBorderGradient.shader
@@ -1,4 +1,4 @@
-Shader "EditorVR/MainMenu/VerticalBorderGradient"
+Shader "EditorXR/MainMenu/VerticalBorderGradient"
 {
 	Properties
 	{

diff --git a/Runtime/Menus/RadialMenu/Shaders/RadialFacesRevealMask.shader b/Runtime/Menus/RadialMenu/Shaders/RadialFacesRevealMask.shader
@@ -1,4 +1,4 @@
-Shader "EditorVR/RadialMenu/RadialFacesRevealMask"
+Shader "EditorXR/RadialMenu/RadialFacesRevealMask"
 {
 	SubShader
 	{

diff --git a/Runtime/Menus/RadialMenu/Shaders/RadialFrame.shader b/Runtime/Menus/RadialMenu/Shaders/RadialFrame.shader
@@ -1,4 +1,4 @@
-Shader "EditorVR/RadialMenu/RadialFrame"
+Shader "EditorXR/RadialMenu/RadialFrame"
 {
     Properties
     {

diff --git a/Runtime/Menus/RadialMenu/Shaders/RadialMenuBorderGradient.shader b/Runtime/Menus/RadialMenu/Shaders/RadialMenuBorderGradient.shader
@@ -1,4 +1,4 @@
-Shader "EditorVR/RadialMenu/RadialMenuBorderGradient"
+Shader "EditorXR/RadialMenu/RadialMenuBorderGradient"
 {
 	Properties
 	{

diff --git a/Runtime/Menus/RadialMenu/Shaders/RadialMenuIcons.shader b/Runtime/Menus/RadialMenu/Shaders/RadialMenuIcons.shader
@@ -1,4 +1,4 @@
-Shader "EditorVR/RadialMenu/RadialMenuIcons"
+Shader "EditorXR/RadialMenu/RadialMenuIcons"
 {
 	Properties
 	{

diff --git a/Runtime/Menus/RadialMenu/Shaders/RadialMenuSlots.shader b/Runtime/Menus/RadialMenu/Shaders/RadialMenuSlots.shader
@@ -1,4 +1,4 @@
-Shader "EditorVR/RadialMenu/RadialMenuSlots"
+Shader "EditorXR/RadialMenu/RadialMenuSlots"
 {
 	Properties
 	{

diff --git a/Runtime/Menus/RadialMenu/Shaders/RadialMenuSlotsMask.shader b/Runtime/Menus/RadialMenu/Shaders/RadialMenuSlotsMask.shader
@@ -1,4 +1,4 @@
-Shader "EditorVR/RadialMenu/RadialMenuSlotMask"
+Shader "EditorXR/RadialMenu/RadialMenuSlotMask"
 {
     Properties
 	{

diff --git a/Runtime/Menus/SpatialUI/Shaders/SpatialUIBackground.shader b/Runtime/Menus/SpatialUI/Shaders/SpatialUIBackground.shader
@@ -1,4 +1,4 @@
-Shader "EditorVR/SpatialUI/SpatialUIBackground"
+Shader "EditorXR/SpatialUI/SpatialUIBackground"
 {
     Properties
     {

diff --git a/Runtime/Menus/SpatialUI/Shaders/SpatialUIBackgroundOverlayBlur.shader b/Runtime/Menus/SpatialUI/Shaders/SpatialUIBackgroundOverlayBlur.shader
@@ -1,4 +1,4 @@
-Shader "EditorVR/SpatialUI/BackgroundOverlayBlur"
+Shader "EditorXR/SpatialUI/BackgroundOverlayBlur"
 {
     Properties
     {

diff --git a/Runtime/Menus/SpatialUI/SpatialMenu/SpatialMenu.cs b/Runtime/Menus/SpatialUI/SpatialMenu/SpatialMenu.cs
@@ -16,7 +16,7 @@ namespace Unity.Labs.EditorXR
 {
     /// <summary>
     /// The SpatialMenu controller
-    /// A SpatialMenu controller is spawned in EditorVR.Tools SpawnDefaultTools() function, for each proxy/input-device
+    /// A SpatialMenu controller is spawned in EditorXR.Tools SpawnDefaultTools() function, for each proxy/input-device
     /// There is a single static SpatialUI(view) that all SpatialMenu controllers direct
     /// </summary>
     [ProcessInput(2)] // Process input after the ProxyAnimator, but before other IProcessInput implementors

diff --git a/Runtime/Menus/ToolsMenu/Textures/HintArrow.png.meta b/Runtime/Menus/ToolsMenu/Textures/HintArrow.png.meta
diff --git a/Runtime/Menus/ToolsMenu/Textures/MenuIcon.png.meta b/Runtime/Menus/ToolsMenu/Textures/MenuIcon.png.meta
diff --git a/Runtime/Menus/ToolsMenu/Textures/SecondaryHintArrow.png.meta b/Runtime/Menus/ToolsMenu/Textures/SecondaryHintArrow.png.meta
diff --git a/Runtime/Menus/ToolsMenu/ToolsMenu.cs b/Runtime/Menus/ToolsMenu/ToolsMenu.cs
@@ -124,7 +124,7 @@ void CreateToolsMenuUI()
         void CreateToolsMenuButton(Type toolType, Sprite buttonIcon)
         {
             // Verify first that the ToolsMenuUI exists
-            // This is called in EditorVR.Tools before the UI can be created herein in Awake
+            // This is called in EditorXR.Tools before the UI can be created herein in Awake
             // The SelectionTool & MainMenu buttons are created immediately after instantiating the ToolsMenu
             if (m_ToolsMenuUI == null)
                 CreateToolsMenuUI();

diff --git a/Runtime/Prefabs/Proxies/ProxyBody.shader b/Runtime/Prefabs/Proxies/ProxyBody.shader
@@ -1,4 +1,4 @@
-Shader "EditorVR/Proxies/ProxyBodyShader"
+Shader "EditorXR/Proxies/ProxyBodyShader"
 {
 	Properties
     {

diff --git a/Runtime/Scripts/Core/Contexts/EditingContextManager.cs b/Runtime/Scripts/Core/Contexts/EditingContextManager.cs
@@ -129,7 +129,7 @@ static void OnVRViewDisabled()
 
 #if UNITY_EDITOR
         [MenuItem("Window/EditorXR %e", false)]
-        internal static void ShowEditorVR()
+        internal static void ShowEditorXR()
         {
             if (EditorApplication.isPlayingOrWillChangePlaymode || Application.isPlaying)
                 return;
@@ -139,7 +139,7 @@ internal static void ShowEditorVR()
         }
 
         [MenuItem("Window/EditorXR %e", true)]
-        static bool ShouldShowEditorVR()
+        static bool ShouldShowEditorXR()
         {
             if (EditorApplication.isPlayingOrWillChangePlaymode || Application.isPlaying)
                 return false;
@@ -255,7 +255,7 @@ static void OpenIfUserPresent()
             if (EditorApplication.isCompiling || Application.isPlaying || EditorApplication.isPlayingOrWillChangePlaymode)
                 return;
 
-            if (!ShouldShowEditorVR())
+            if (!ShouldShowEditorXR())
                 return;
 
             if (!XRSettings.enabled)
@@ -280,7 +280,7 @@ static void OpenIfUserPresent()
             if (!s_UserWasPresent && userPresent && !view && !s_AutoOpened)
             {
                 s_AutoOpened = true;
-                EditorApplication.delayCall += ShowEditorVR;
+                EditorApplication.delayCall += ShowEditorXR;
             }
             else if (s_UserWasPresent && view && !userPresent && s_AutoOpened)
             {
@@ -292,7 +292,7 @@ static void OpenIfUserPresent()
         }
 
         // Life cycle management across playmode switches is an odd beast indeed, and there is a need to reliably relaunch
-        // EditorVR after we switch back out of playmode (assuming the view was visible before a playmode switch). So,
+        // EditorXR after we switch back out of playmode (assuming the view was visible before a playmode switch). So,
         // we watch until playmode is done and then relaunch.
         static void ReopenOnExitPlaymode()
         {
@@ -302,7 +302,7 @@ static void ReopenOnExitPlaymode()
                 EditorPrefs.DeleteKey(k_LaunchOnExitPlaymode);
                 EditorApplication.update -= ReopenOnExitPlaymode;
                 if (launch)
-                    EditorApplication.delayCall += ShowEditorVR;
+                    EditorApplication.delayCall += ShowEditorXR;
             }
         }
 #endif
@@ -611,7 +611,7 @@ static void InitializeInputManager()
             go.SetRunInEditModeRecursively(true);
             go.transform.SetParent(ModuleLoaderCore.instance.GetModuleParent().transform);
 
-            // These components were allocating memory every frame and aren't currently used in EditorVR
+            // These components were allocating memory every frame and aren't currently used in EditorXR
             UnityObjectUtils.Destroy(s_InputManager.GetComponent<JoystickInputToEvents>());
             UnityObjectUtils.Destroy(s_InputManager.GetComponent<MouseInputToEvents>());
             UnityObjectUtils.Destroy(s_InputManager.GetComponent<KeyboardInputToEvents>());

diff --git a/Runtime/Scripts/Core/Contexts/EditorVR.asset → Runtime/Scripts/Core/Contexts/EditorXR.asset b/Runtime/Scripts/Core/Contexts/EditorVR.asset → Runtime/Scripts/Core/Contexts/EditorXR.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 0bcb87ab5055bd3498c8b75ba8ccde1c, type: 3}
-  m_Name: EditorVR
+  m_Name: EditorXR
   m_EditorClassIdentifier: 
   m_RenderScale: 1
   m_CopyMainCameraSettings: 1

diff --git a/...Scripts/Core/Contexts/EditorVR.asset.meta → ...Scripts/Core/Contexts/EditorXR.asset.meta b/...Scripts/Core/Contexts/EditorVR.asset.meta → ...Scripts/Core/Contexts/EditorXR.asset.meta
diff --git a/Runtime/Scripts/Core/Contexts/EditorXRContext.cs b/Runtime/Scripts/Core/Contexts/EditorXRContext.cs
@@ -92,7 +92,7 @@ public void Setup()
             m_Instance = ModuleLoaderCore.instance.GetModule<EditorXR>();
             if (m_Instance == null)
             {
-                Debug.LogWarning("EditorVR Module not loaded");
+                Debug.LogWarning("EditorXR Module not loaded");
                 return;
             }
 

diff --git a/Runtime/Scripts/Core/EditorXR.cs b/Runtime/Scripts/Core/EditorXR.cs
@@ -19,7 +19,7 @@ namespace Unity.Labs.EditorXR.Core
 #if UNITY_EDITOR
     [RequiresTag(VRPlayerTag)]
 #endif
-    [ModuleOrder(ModuleOrders.EditorVRLoadOrder)]
+    [ModuleOrder(ModuleOrders.EditorXRLoadOrder)]
     sealed class EditorXR : IEditor, IModule, IUsesConnectInterfaces
     {
 #if UNITY_EDITOR
@@ -48,8 +48,8 @@ public string[] OnFilterAssemblies(BuildOptions buildOptions, string[] assemblie
 
         const HideFlags k_DefaultHideFlags = HideFlags.HideInHierarchy | HideFlags.DontSave;
         internal const string VRPlayerTag = "VRPlayer";
-        const string k_PreserveLayout = "EditorVR.PreserveLayout";
-        const string k_IncludeInBuilds = "EditorVR.IncludeInBuilds";
+        const string k_PreserveLayout = "EditorXR.PreserveLayout";
+        const string k_IncludeInBuilds = "EditorXR.IncludeInBuilds";
 
         static bool s_IsInitialized;
 

diff --git a/Runtime/Scripts/Core/EditorXRRayModule.cs b/Runtime/Scripts/Core/EditorXRRayModule.cs
@@ -531,7 +531,7 @@ public void AddRayVisibilitySettings(Transform rayOrigin, object caller, bool ra
 
         public void RemoveRayVisibilitySettings(Transform rayOrigin, object obj)
         {
-            if (!rayOrigin) // Prevent MissingReferenceException on closing m_EditorVR
+            if (!rayOrigin) // Prevent MissingReferenceException on closing m_EditorXR
                 return;
 
             var dpr = rayOrigin.GetComponentInChildren<DefaultProxyRay>();

diff --git a/Runtime/Scripts/Core/ModuleOrders.cs b/Runtime/Scripts/Core/ModuleOrders.cs
@@ -5,8 +5,8 @@ static class ModuleOrders
         const int k_DefaultEarlyOrder = int.MinValue / 2;
         const int k_DefaultLateOrder = int.MaxValue / 2;
 
-        public const int InterfaceModule = EditorVRLoadOrder - 1;
-        public const int EditorVRLoadOrder = k_DefaultEarlyOrder;
+        public const int InterfaceModule = EditorXRLoadOrder - 1;
+        public const int EditorXRLoadOrder = k_DefaultEarlyOrder;
         public const int DeviceInputModuleOrder = k_DefaultEarlyOrder;
         public const int MenuModuleLoadOrder = k_DefaultLateOrder;
         public const int SpatialHintModuleLoadOrder = k_DefaultLateOrder;

diff --git a/Runtime/Scripts/Core/VRView.cs b/Runtime/Scripts/Core/VRView.cs
@@ -243,7 +243,7 @@ public void OnEnable()
             m_ShowDeviceView = EditorPrefs.GetBool(k_ShowDeviceView, false);
             m_UseCustomPreviewCamera = EditorPrefs.GetBool(k_UseCustomPreviewCamera, false);
 
-            // Disable other views to increase rendering performance for EditorVR
+            // Disable other views to increase rendering performance for EditorXR
             SetOtherViewsEnabled(false);
 
             // VRSettings.enabled latches the reference pose for the current camera

diff --git a/Runtime/Scripts/Interfaces/Entity/IEditingContext.cs b/Runtime/Scripts/Interfaces/Entity/IEditingContext.cs
@@ -2,7 +2,7 @@ namespace Unity.Labs.EditorXR
 {
     /// <summary>
     /// Implement this interface to create an editing context. You can also specify your own custom
-    /// settings within the context to be applied to the specified VR editor (e.g. EditorVR).
+    /// settings within the context to be applied to the specified VR editor (e.g. EditorXR).
     /// </summary>
     public interface IEditingContext
     {
@@ -27,7 +27,7 @@ public interface IEditingContext
         bool copyMainCameraImageEffectsToPresentationCamera { get; }
 
         /// <summary>
-        /// Bool denotes that the EditorVR instance exists, having already been created in Setup()
+        /// Bool denotes that the EditorXR instance exists, having already been created in Setup()
         /// </summary>
         bool instanceExists { get; }
 

diff --git a/Runtime/Scripts/Interfaces/Entity/IEditor.cs b/Runtime/Scripts/Interfaces/Entity/IEditor.cs
@@ -1,7 +1,7 @@
 namespace Unity.Labs.EditorXR
 {
     /// <summary>
-    /// Implement this interface to create an editor (e.g. EditorVR) to be used in conjunction with an editing context.
+    /// Implement this interface to create an editor (e.g. EditorXR) to be used in conjunction with an editing context.
     /// </summary>
     public interface IEditor
     {