Removed obsolete editor code and simplified game manager

Author: ekcoh

Assets/Samples/RebindingUI/RebindActionUIEditor.cs

@@ -21,7 +21,6 @@ protected void OnEnable()
             m_BindingTextProperty = serializedObject.FindProperty("m_BindingText");
             m_RebindOverlayProperty = serializedObject.FindProperty("m_RebindOverlay");
             m_RebindTextProperty = serializedObject.FindProperty("m_RebindText");
-            m_DefaultInputActionsProperty = serializedObject.FindProperty("m_DefaultInputActions");
             m_UpdateBindingUIEventProperty = serializedObject.FindProperty("m_UpdateBindingUIEvent");
             m_RebindStartEventProperty = serializedObject.FindProperty("m_RebindStartEvent");
             m_RebindStopEventProperty = serializedObject.FindProperty("m_RebindStopEvent");
@@ -63,7 +62,6 @@ public override void OnInspectorGUI()
                 EditorGUILayout.PropertyField(m_BindingTextProperty);
                 EditorGUILayout.PropertyField(m_RebindOverlayProperty);
                 EditorGUILayout.PropertyField(m_RebindTextProperty);
-                EditorGUILayout.PropertyField(m_DefaultInputActionsProperty);
             }
 
             // Events section.
@@ -155,7 +153,6 @@ protected void RefreshBindingOptions()
         private SerializedProperty m_BindingIdProperty;
         private SerializedProperty m_ActionLabelProperty;
         private SerializedProperty m_BindingTextProperty;
-        private SerializedProperty m_DefaultInputActionsProperty;
         private SerializedProperty m_RebindOverlayProperty;
         private SerializedProperty m_RebindTextProperty;
         private SerializedProperty m_RebindStartEventProperty;

Assets/Samples/RebindingUI/RebindUIGameManager.cs

@@ -43,16 +43,32 @@ private enum GameState
         private GameState m_CurrentState = GameState.Initializing;
         private GameState m_NextState = GameState.Playing;
 
-        private void SetState(GameState newState)
+        private void OnToggleMenu(InputAction.CallbackContext obj)
+        {
+            ToggleMenu();
+        }
+
+        private void OnEnable()
+        {
+            toggleMenuAction.action.performed += OnToggleMenu;
+        }
+
+        private void OnDisable()
+        {
+            toggleMenuAction.action.performed -= OnToggleMenu;
+        }
+
+        private void Update()
         {
             // Abort if there is no change to state
-            if (newState == m_CurrentState)
+            if (m_CurrentState == m_NextState)
                 return;
 
             // Update current state
-            m_CurrentState = newState;
+            m_CurrentState = m_NextState;
 
-            switch (newState)
+            // Handle state transition
+            switch (m_NextState)
             {
                 // Entering game mode: enable in-game actions, show menu
                 case GameState.Playing:
@@ -70,29 +86,6 @@ private void SetState(GameState newState)
                         EventSystem.current.SetSelectedGameObject(EventSystem.current.firstSelectedGameObject);
                     break;
             }
-
-            Debug.Log(m_CurrentState);
-        }
-
-        private void OnToggleMenu(InputAction.CallbackContext obj)
-        {
-            ToggleMenu();
-        }
-
-        private void OnEnable()
-        {
-            toggleMenuAction.action.performed += OnToggleMenu;
-        }
-
-        private void OnDisable()
-        {
-            toggleMenuAction.action.performed -= OnToggleMenu;
-        }
-
-        private void Update()
-        {
-            if (m_CurrentState != m_NextState)
-                SetState(m_NextState);
         }
     }
 }