Code cleanup and style changes

Author: mtschoen-unity

Menus/UndoMenu/Scripts/UndoMenuUI.cs

@@ -25,6 +25,9 @@ sealed class UndoMenuUI : MonoBehaviour, IConnectInterfaces
         Coroutine m_EngageCoroutine;
         Coroutine m_UndoPerformedCoroutine;
 
+        bool m_Engaged;
+        bool m_Visible;
+
         public Transform alternateMenuOrigin
         {
             get { return m_AlternateMenuOrigin; }
@@ -55,8 +58,6 @@ public bool engaged
             }
         }
 
-        bool m_Engaged;
-
         public bool visible
         {
             get { return m_Visible; }
@@ -72,8 +73,6 @@ public bool visible
             }
         }
 
-        bool m_Visible;
-
         void Awake()
         {
             m_UndoButtonMaterial = MaterialUtils.GetMaterialClone(m_UndoButtonMeshRenderer);
@@ -116,9 +115,7 @@ public void StartPerformedAnimation(bool undo)
 
         IEnumerator AnimateUndoPerformed(bool undo)
         {
-            var targetMaterial = undo
-                ? m_UndoButtonMaterial
-                : m_RedoButtonMaterial;
+            var targetMaterial = undo ? m_UndoButtonMaterial : m_RedoButtonMaterial;
             var startingColor = m_UndoButtonMaterial.GetColor(k_MaterialColorProperty);
             var targetColor = startingColor;
             targetColor.a = k_UndoPerformedAlpha;

Menus/UndoMenu/UndoMenu.cs

@@ -1,5 +1,4 @@
 #if UNITY_EDITOR
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEditor.Experimental.EditorVR.Core;
@@ -30,7 +29,6 @@ sealed class UndoMenu : MonoBehaviour, IInstantiateUI, IUsesMenuOrigins, ICustom
         HapticPulse m_UndoPulse;
 
         UndoMenuUI m_UndoMenuUI;
-        List<ActionMenuData> m_MenuActions;
         Transform m_AlternateMenuOrigin;
         MenuHideFlags m_MenuHideFlags = MenuHideFlags.Hidden;
         float m_PrevNavigateX;
@@ -107,16 +105,18 @@ public void ProcessInput(ActionMapInput input, ConsumeControlDelegate consumeCon
                 return;
             }
 
-            if (undoMenuInput.engage.wasJustReleased && !m_TrackpadController)
+            var engage = undoMenuInput.engage;
+            if (engage.wasJustReleased && !m_TrackpadController)
                 this.RestartCoroutine(ref m_StillEngagedAfterStickReleasedCoroutine, AcceptInputAfterStickReleased());
 
-            if (!(undoMenuInput.engage.wasJustPressed || !m_TrackpadController && (undoMenuInput.engage.isHeld || m_StillEngagedAfterStickRelease)))
+            if (!(engage.wasJustPressed || !m_TrackpadController && (engage.isHeld || m_StillEngagedAfterStickRelease)))
                 return;
 
-            consumeControl(undoMenuInput.engage);
+            consumeControl(engage);
             m_UndoMenuUI.engaged = true;
 
-            var navigateX = undoMenuInput.navigateX.value;
+            var navigateXControl = undoMenuInput.navigateX;
+            var navigateX = navigateXControl.value;
             var undoRedoPerformed = false;
             if (navigateX < -k_UndoRedoThreshold && (m_TrackpadController || m_PrevNavigateX > -k_UndoRedoThreshold))
             {
@@ -137,7 +137,7 @@ public void ProcessInput(ActionMapInput input, ConsumeControlDelegate consumeCon
 
             if (undoRedoPerformed)
             {
-                consumeControl(undoMenuInput.navigateX);
+                consumeControl(navigateXControl);
                 this.StopCoroutine(ref m_StillEngagedAfterStickReleasedCoroutine);
                 this.Pulse(node, m_UndoPulse);
             }

Scripts/Core/EditorVR.Menus.cs

@@ -135,7 +135,7 @@ public void DisconnectInterface(object target, object userData = null)
 
                 var customAlternateMenu = target as IAlternateMenu;
                 if (customAlternateMenu != null)
-                    RemoveCustomAlternateMenu(customAlternateMenu, rayOrigin);
+                    RemoveCustomAlternateMenu(customAlternateMenu);
             }
 
             static void AddCustomAlternateMenu(IAlternateMenu alternateMenu, Transform rayOrigin)
@@ -147,14 +147,15 @@ static void AddCustomAlternateMenu(IAlternateMenu alternateMenu, Transform rayOr
 
                     device.alternateMenus.Add(alternateMenu);
                     var menuHideData = new MenuHideData();
-                    device.menuHideData[alternateMenu] = menuHideData;
+                    device.menuHideData[alternateMenu] = menuHideData;
+                    // Alternate menus must be visible the first frame or they are ignored in the priority list
                     menuHideData.hideFlags = 0;
 
                     break;
                 }
             }
 
-            static void RemoveCustomAlternateMenu(IAlternateMenu customAlternateMenu, Transform rayOrigin)
+            static void RemoveCustomAlternateMenu(IAlternateMenu customAlternateMenu)
             {
                 foreach (var device in evr.m_DeviceData)
                 {

Scripts/Core/EditorVR.Tools.cs

@@ -138,7 +138,6 @@ internal void SpawnDefaultTools(IProxy proxy)
                     var undoMenu = menus.SpawnMenu<UndoMenu>(rayOrigin);
                     var hideData = new Menus.MenuHideData();
                     menuHideData[undoMenu] = hideData;
-                    hideData.hideFlags = 0;
 
                     // Setup ToolsMenu
                     var toolsMenu = ObjectUtils.AddComponent<Experimental.EditorVR.Menus.ToolsMenu>(evr.gameObject);