Clean up unused code and fix style; Fix UndoMenu visibility

Author: mtschoen-unity

Scripts/Core/EditorVR.Menus.cs

@@ -147,7 +147,7 @@ static void AddAlternateMenu(IAlternateMenu alternateMenu, Transform rayOrigin)
 
                     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;
 
@@ -247,7 +247,7 @@ internal void UpdateMenuVisibilities()
                     MenuHideData customMenuHideData = null;
 
                     var mainMenuVisible = mainMenu != null && menuHideData[mainMenu].hideFlags == 0;
-                    var mainMenuSupressed = mainMenu != null && ((menuHideData[mainMenu].hideFlags & MenuHideFlags.Occluded) != 0);
+                    var mainMenuSupressed = mainMenu != null && ((menuHideData[mainMenu].hideFlags & MenuHideFlags.Occluded) != 0);
 
                     var alternateMenuData = menuHideData[alternateMenu];
                     var alternateMenuVisible = alternateMenuData.hideFlags == 0;
@@ -350,7 +350,7 @@ internal void UpdateMenuVisibilities()
                 evr.GetModule<DeviceInputModule>().UpdatePlayerHandleMaps();
             }
 
-            void CheckDirectSelection(DeviceData deviceData, Dictionary<IMenu, MenuHideData> menuHideData, bool alternateMenuVisible)
+            static void CheckDirectSelection(DeviceData deviceData, Dictionary<IMenu, MenuHideData> menuHideData, bool alternateMenuVisible)
             {
                 var viewerScale = Viewer.GetViewerScale();
                 var directSelection = evr.GetNestedModule<DirectSelection>();

Scripts/Core/EditorVR.Tools.cs

@@ -138,6 +138,7 @@ 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);

Tools/AnnotationTool/AnnotationTool.cs

@@ -108,14 +108,12 @@ public float brushSize
         Vector3 m_OriginalAnnotationPointerLocalScale;
         Coroutine m_AnnotationPointerVisibilityCoroutine;
         bool m_WasOverUI;
-        bool m_WasDoingUndoRedo;
 
         GameObject m_ColorPickerActivator;
 
         Toggle m_TransformToggle;
         Toggle m_MeshToggle;
         bool m_BlockValueChangedListener;
-        MenuHideFlags m_MenuHideFlags = MenuHideFlags.Hidden;
 
         public bool primary { private get; set; }
         public Transform rayOrigin { get; set; }
@@ -132,27 +130,6 @@ public float brushSize
 
         public GameObject settingsMenuItemPrefab { get { return m_SettingsMenuItemPrefab; } }
 
-        public int menuPriority { get { return 2; } }
-
-        public MenuHideFlags menuHideFlags
-        {
-            get { return m_MenuHideFlags; }
-            set
-            {
-                if (m_MenuHideFlags != value)
-                {
-                    m_MenuHideFlags = value;
-                    var visible = m_MenuHideFlags == 0;
-
-                    if (m_BrushSizeUI)
-                        m_BrushSizeUI.gameObject.SetActive(visible);
-                }
-            }
-        }
-
-        public GameObject menuContent { get { return gameObject; } }
-        public Bounds localBounds { get; private set; }
-
         public GameObject settingsMenuItemInstance
         {
             set
@@ -345,8 +322,6 @@ void SetupBrushUI()
             transform.localRotation = Quaternion.Euler(-90, 0, 0);
             transform.localScale = scale;
 
-            localBounds = ObjectUtils.GetBounds(transform);
-
             m_BrushSizeUI.onValueChanged = value =>
             {
                 var sliderValue = Mathf.Lerp(MinBrushSize, MaxBrushSize, value);

Tools/AnnotationTool/UserInterface/ColorPickerActivator.cs

@@ -2,8 +2,6 @@
 using System;
 using System.Collections;
 using UnityEditor.Experimental.EditorVR.Extensions;
-using UnityEditor.Experimental.EditorVR.UI;
-using UnityEditor.Experimental.EditorVR.Utilities;
 using UnityEngine;
 using UnityEngine.EventSystems;
 

Tools/LocomotionTool/LocomotionTool.cs

@@ -597,6 +597,7 @@ bool DoTwoHandedScaling(ConsumeControlDelegate consumeControl)
                                 consumeControl(otherLocomotionInput.horizontal);
                                 consumeControl(otherLocomotionInput.vertical);
 
+                                // Pre-emptively consume thumbstick press to override UndoMenu
                                 consumeControl(m_LocomotionInput.scaleReset);
                                 consumeControl(otherLocomotionInput.scaleReset);
 

Tools/TransformTool/TransformTool.cs

@@ -601,9 +601,7 @@ public void Resume(Node node)
         public Transform[] GetHeldObjects(Node node)
         {
             var grabData = GrabDataForNode(node);
-            var heldObjects = grabData == null ? null : grabData.grabbedObjects;
-            Debug.Log(node + ", " +heldObjects.Length);
-            return heldObjects;
+            return grabData == null ? null : grabData.grabbedObjects;
         }
 
         public void TransferHeldObjects(Transform rayOrigin, Transform destRayOrigin, Vector3 deltaOffset = default(Vector3))