Commenting code

Author: josepmariapujol-unity

Packages/com.unity.inputsystem/InputSystem.meta

@@ -21,7 +21,7 @@
 #endif
 
 #if UNITY_EDITOR
-using UnityEngine.InputSystem.Editor;
+//using UnityEngine.InputSystem.Editor;
 using CustomBindingPathValidator = System.Func<string, System.Action>;
 #endif
 
@@ -1915,7 +1915,7 @@ public void Update(InputUpdateType updateType)
         private void InitializeActions()
         {
 #if UNITY_EDITOR
-            m_Actions = ProjectWideActionsBuildProvider.actionsToIncludeInPlayerBuild;
+            //m_Actions = ProjectWideActionsBuildProvider.actionsToIncludeInPlayerBuild;
 #else
             m_Actions = null;
             var candidates = Resources.FindObjectsOfTypeAll<InputActionAsset>();
@@ -2375,9 +2375,9 @@ internal struct AvailableDevice
         private bool m_HaveSentStartupAnalytics;
         #endif
 
-        private IInputRuntime m_Runtime;
+        internal IInputRuntime m_Runtime;
         private InputMetrics m_Metrics;
-        private InputSettings m_Settings;
+        internal InputSettings m_Settings;
 
         // Extract as booleans (from m_Settings) because feature check is in the hot path
 

Packages/com.unity.inputsystem/Runtime/InputManager.cs

@@ -18,6 +18,8 @@
 using UnityEngine.Networking.PlayerConnection;
 
 using System.Linq;
+using UnityEditor;
+using EditorHelpers = UnityEngine.Rendering.VirtualTexturing.EditorHelpers;
 
 #if UNITY_EDITOR
 using CustomBindingPathValidator = System.Func<string, System.Action>;
@@ -855,7 +857,7 @@ public static bool IsFirstLayoutBasedOnSecond(string firstLayoutName, string sec
         /// <seealso cref="InputBinding.processors"/>
         /// <seealso cref="InputAction.processors"/>
         /// <seealso cref="InputControlLayout.ControlItem.processors"/>
-        /// <seealso cref="UnityEngine.InputSystem.Editor.InputParameterEditor{TObject}"/>
+        /// <seealso cref="Editor.InputParameterEditor{TObject}"/>
         public static void RegisterProcessor(Type type, string name = null)
         {
             s_Manager.RegisterProcessor(type, name);
@@ -964,7 +966,7 @@ public static void RegisterProcessor(Type type, string name = null)
         /// <seealso cref="InputBinding.processors"/>
         /// <seealso cref="InputAction.processors"/>
         /// <seealso cref="InputControlLayout.ControlItem.processors"/>
-        /// <seealso cref="UnityEngine.InputSystem.Editor.InputParameterEditor{TObject}"/>
+        /// <seealso cref="Editor.InputParameterEditor{TObject}"/>
         public static void RegisterProcessor<T>(string name = null)
         {
             RegisterProcessor(typeof(T), name);
@@ -3064,7 +3066,7 @@ public static InputActionAsset actions
 
                 // Track reference to enable including it in built Players, note that it will discard any non-persisted
                 // object reference
-                ProjectWideActionsBuildProvider.actionsToIncludeInPlayerBuild = value;
+                //ProjectWideActionsBuildProvider.actionsToIncludeInPlayerBuild = value;
                 #endif // UNITY_EDITOR
 
                 // Update underlying value
@@ -3377,7 +3379,7 @@ public static bool runInBackground
         internal static InputRemoting s_Remote;
 
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
-        private static RemoteInputPlayerConnection s_RemoteConnection;
+        internal static RemoteInputPlayerConnection s_RemoteConnection;
         internal static RemoteInputPlayerConnection remoteConnection => s_RemoteConnection;
 
         internal static void SetUpRemoting()
@@ -3511,7 +3513,7 @@ internal static void InitializeInEditor(bool calledFromCtor, IInputRuntime runti
                 s_Manager.runtime.onPlayModeChanged = OnPlayModeChange;
                 s_Manager.runtime.onProjectChange = OnProjectChange;
 
-                InputEditorUserSettings.s_Settings = new InputEditorUserSettings.SerializedState();
+                //InputEditorUserSettings.s_Settings = new InputEditorUserSettings.SerializedState();
 
                 #if !UNITY_DISABLE_DEFAULT_INPUT_PLUGIN_INITIALIZATION
                 InputSystem.PerformDefaultPluginInitialization();
@@ -3531,7 +3533,7 @@ internal static void InitializeInEditor(bool calledFromCtor, IInputRuntime runti
 
                     s_DomainStateManager = existingSystemStateManagers[0];
                     s_Manager.RestoreStateWithoutDevices(s_DomainStateManager.systemState.managerState);
-                    InputDebuggerWindow.ReviveAfterDomainReload();
+                    //InputDebuggerWindow.ReviveAfterDomainReload();
 
                     // Restore remoting state.
                     s_RemoteConnection = s_DomainStateManager.systemState.remoteConnection;
@@ -3544,7 +3546,7 @@ internal static void InitializeInEditor(bool calledFromCtor, IInputRuntime runti
                     s_Manager.m_SavedAvailableDevices = s_DomainStateManager.systemState.managerState.availableDevices;
 
                     // Restore editor settings.
-                    InputEditorUserSettings.s_Settings = s_DomainStateManager.systemState.userSettings;
+                    //InputEditorUserSettings.s_Settings = s_DomainStateManager.systemState.userSettings;
 
                     // Get rid of saved state.
                     s_DomainStateManager.systemState = new InputSystemState();
@@ -3556,17 +3558,17 @@ internal static void InitializeInEditor(bool calledFromCtor, IInputRuntime runti
                 s_DomainStateManager.hideFlags = HideFlags.HideAndDontSave;
 
                 // See if we have a remembered settings object.
-                if (EditorBuildSettings.TryGetConfigObject(InputSettingsProvider.kEditorBuildSettingsConfigKey, out InputSettings settingsAsset))
+                /*if (EditorBuildSettings.TryGetConfigObject(InputSettingsProvider.kEditorBuildSettingsConfigKey, out InputSettings settingsAsset))
                 {
-                    s_Manager.settings = settingsAsset;
+                     s_Manager.settings = settingsAsset;
                 }
 
                 // See if we have a saved actions object
                 var savedActions = ProjectWideActionsBuildProvider.actionsToIncludeInPlayerBuild;
-                if (savedActions != null)
-                    s_Manager.actions = savedActions;
+                 if (savedActions != null)
+                     s_Manager.actions = savedActions;
 
-                InputEditorUserSettings.Load();
+                InputEditorUserSettings.Load();*/
 
                 SetUpRemoting();
             }
@@ -3581,7 +3583,7 @@ internal static void InitializeInEditor(bool calledFromCtor, IInputRuntime runti
             // this would cancel the import of large assets that are dependent on the InputSystem package and import it as a dependency.
             EditorApplication.delayCall += ShowRestartWarning;
 
-            RunInitialUpdate();
+            //RunInitialUpdate();
 
             EnableActions();
 
@@ -3591,7 +3593,7 @@ internal static void InitializeInEditor(bool calledFromCtor, IInputRuntime runti
         private static void ShowRestartWarning()
         {
             if (!s_DomainStateManager.newInputBackendsCheckedAsEnabled &&
-                !EditorPlayerSettingHelpers.newSystemBackendsEnabled &&
+                //!EditorPlayerSettingHelpers.newSystemBackendsEnabled &&
                 !Application.isBatchMode)
             {
                 const string dialogText = "The new Input System Package is installed, but not configured to enable native device input, such as keyboard, mouse, or gamepad actions. " +
@@ -3616,8 +3618,8 @@ private static void ShowRestartWarning()
 #endif
                 if (userChoseEnableAndRestart)
                 {
-                    EditorPlayerSettingHelpers.newSystemBackendsEnabled = true;
-                    EditorHelpers.RestartEditorAndRecompileScripts();
+                    /*EditorPlayerSettingHelpers.newSystemBackendsEnabled = true;
+                    EditorHelpers.RestartEditorAndRecompileScripts();*/
                 }
             }
             s_DomainStateManager.newInputBackendsCheckedAsEnabled = true;
@@ -3692,7 +3694,7 @@ internal static void OnProjectChange()
             ////TODO: use dirty count to find whether settings have actually changed
             // May have added, removed, moved, or renamed settings asset. Force a refresh
             // of the UI.
-            InputSettingsProvider.ForceReload();
+            //InputSettingsProvider.ForceReload();
 
             // Also, if the asset holding our current settings got deleted, switch back to a
             // temporary settings object.
@@ -3732,6 +3734,8 @@ internal static void InitializeInPlayer(IInputRuntime runtime, bool loadSettings
             EnableActions();
         }
 
+#endif
+
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
         internal static void InitializeInPlayer(IInputRuntime runtime, InputSettings settings)
         {
@@ -3749,7 +3753,7 @@ internal static void InitializeInPlayer(IInputRuntime runtime, InputSettings set
             EnableActions();
         }
 
-#endif
+#endif //DEVELOPMENT_BUILD || UNITY_EDITOR
 
 #if UNITY_INCLUDE_TESTS
         //
@@ -3775,7 +3779,7 @@ internal static void TestHook_EnableActions()
 #endif // UNITY_INCLUDE_TESTS
 
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
-        private static void RunInitialUpdate()
+        internal static void RunInitialUpdate()
         {
             // Request an initial Update so that user methods such as Start and Awake
             // can access the input devices.
@@ -3920,7 +3924,7 @@ internal static void Destroy()
             // NOTE: Does not destroy InputSystemObject. We want to destroy input system
             //       state repeatedly during tests but we want to not create InputSystemObject
             //       over and over.
-            s_Manager.Destroy();
+            //s_Manager.Destroy();
             if (s_RemoteConnection != null)
                 Object.DestroyImmediate(s_RemoteConnection);
             s_Manager = null;

Packages/com.unity.inputsystem/Runtime/InputSystem.cs

@@ -1,9 +1,6 @@
 using System;
 using UnityEngine.InputSystem;
 using UnityEngine;
-#if UNITY_EDITOR
-using UnityEngine.InputSystem.Editor;
-#endif
 using UnityEngine.InputSystem.Utilities;
 
 namespace UnityEngine.InputSystem
@@ -24,7 +21,7 @@ internal struct InputSystemState
         [SerializeField] public InputManager.SerializedState managerState;
         [SerializeField] public InputRemoting.SerializedState remotingState;
 #if UNITY_EDITOR
-        [SerializeField] public InputEditorUserSettings.SerializedState userSettings;
+        //[SerializeField] public InputEditorUserSettings.SerializedState userSettings;
         [SerializeField] public string systemObject;
 #endif
         ////TODO: make these saved states capable of surviving domain reloads
@@ -95,7 +92,7 @@ public void OnBeforeSerialize()
             }
 
             systemState.remoteConnection = InputSystem.remoteConnection;
-            systemState.userSettings = InputEditorUserSettings.s_Settings;
+            //systemState.userSettings = InputEditorUserSettings.s_Settings;
         }
 
         public void OnAfterDeserialize()

Packages/com.unity.inputsystem/Runtime/InputSystemStateManager.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 #if UNITY_EDITOR
-using UnityEngine.InputSystem.Editor;
+//using UnityEngine.InputSystem.Editor;
 #endif
 using UnityEngine.InputSystem.LowLevel;
 
@@ -22,7 +22,7 @@ internal static void TestHook_InitializeForPlayModeTests(bool enableRemoting, II
             s_Manager.runtime.onPlayModeChanged = InputSystem.OnPlayModeChange;
             s_Manager.runtime.onProjectChange = InputSystem.OnProjectChange;
 
-            InputEditorUserSettings.s_Settings = new InputEditorUserSettings.SerializedState();
+            //InputEditorUserSettings.s_Settings = new InputEditorUserSettings.SerializedState();
 
             if (enableRemoting)
                 InputSystem.SetUpRemoting();
@@ -71,9 +71,9 @@ internal static void TestHook_DestroyAndReset()
                 Object.DestroyImmediate(InputSystem.s_RemoteConnection);
 
 #if UNITY_EDITOR
-            EditorInputControlLayoutCache.Clear();
+            /*EditorInputControlLayoutCache.Clear();
             InputDeviceDebuggerWindow.s_OnToolbarGUIActions.Clear();
-            InputEditorUserSettings.s_Settings = new InputEditorUserSettings.SerializedState();
+            InputEditorUserSettings.s_Settings = new InputEditorUserSettings.SerializedState();*/
 #endif
 
             InputSystem.s_Manager = null;

Packages/com.unity.inputsystem/Runtime/InputSystemTestHooks.cs

@@ -49,7 +49,7 @@ public void SaveAndReset(bool enableRemoting, IInputRuntime runtime)
                 managerState = InputSystem.manager.SaveState(),
                 remotingState = InputSystem.remoting?.SaveState() ?? new InputRemoting.SerializedState(),
 #if UNITY_EDITOR
-                userSettings = InputEditorUserSettings.s_Settings,
+                //userSettings = InputEditorUserSettings.s_Settings,
                 systemObject = JsonUtility.ToJson(InputSystem.domainStateManager),
 #endif
                 inputActionState = InputActionState.SaveAndResetState(),
@@ -138,7 +138,7 @@ public void Restore()
             else InputSystem.manager.ApplySettings();
 
 #if UNITY_EDITOR
-            InputEditorUserSettings.s_Settings = state.userSettings;
+            //InputEditorUserSettings.s_Settings = state.userSettings;
             JsonUtility.FromJsonOverwrite(state.systemObject, InputSystem.domainStateManager);
 #endif