CHANGE: Removed timesliceEvents (#776)

Author: jechter

Assets/Tests/InputSystem/CoreTests_Actions.cs

@@ -183,8 +183,6 @@ public void Actions_CanDetermineIfMapIsUsableWithGivenDevice()
     [Category("Actions")]
     public void Actions_WhenDisabled_CancelAllStartedInteractions()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
         var action1 = new InputAction("action1", InputActionType.Button, binding: "<Gamepad>/buttonSouth", interactions: "Hold");
@@ -828,8 +826,6 @@ public void Actions_CanCreateActionsWithoutAnActionMap()
     [Category("Actions")]
     public void Actions_CanCreateActionAssetWithMultipleActionMaps()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
         var asset = ScriptableObject.CreateInstance<InputActionAsset>();
@@ -1172,8 +1168,6 @@ public void Actions_CanByPassControlActuationChecks_UsingPasshtroughAction()
     [Category("Actions")]
     public void Actions_WithMultipleBoundControls_DriveInteractionsFromControlWithGreatestActuation()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
         // We go through several permutations of the same behavior all in one test. Makes the
@@ -1502,8 +1496,6 @@ public void Actions_WithMultipleBoundControls_CanHandleInteractionsThatTriggerOn
     [Ignore("TODO")]
     public void TODO_Actions_WithMultipleActuationsFromSameState_()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var mouse = InputSystem.AddDevice<Mouse>();
         var action = new InputAction(binding: "<Mouse>/*button");
         action.Enable();
@@ -1669,8 +1661,6 @@ public void Actions_WhenTriggered_TriggerGlobalNotification()
     [Category("Actions")]
     public void Actions_CanRecordActions()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var action = new InputAction();
         action.AddBinding("<Gamepad>/leftStick");
         action.AddBinding("<Gamepad>/rightStick");
@@ -2588,8 +2578,6 @@ public void Actions_ChangingBindingMaskWhileEnabled_CancelsOngoingActions()
     [Category("Actions")]
     public void Actions_CanAddInteractionsToActions()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
         InputSystem.RegisterProcessor<ConstantVector2TestProcessor>();
@@ -2980,7 +2968,6 @@ public void Actions_WithoutInteraction_TriggerInResponseToMagnitude()
     [Category("Actions")]
     public void Actions_CanPerformHoldOnTrigger()
     {
-        InputSystem.settings.timesliceEvents = false;
         InputSystem.settings.defaultButtonPressPoint = 0.1f;
 
         var gamepad = InputSystem.AddDevice<Gamepad>();
@@ -3025,8 +3012,6 @@ public void Actions_CanPerformHoldOnTrigger()
     [Category("Actions")]
     public void Actions_CanDistinguishTapAndSlowTapOnSameAction()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         // Bindings can have more than one interaction. Depending on the interaction happening on the bound
         // controls one of the interactions may initiate a phase shift and which interaction initiated the
         // shift is visible on the callback.
@@ -3399,8 +3384,6 @@ public void TODO_Actions_ButtonTriggersActionOnlyAfterCrossingPressThreshold()
     [Category("Actions")]
     public void Actions_CanQueryStartAndPerformTime()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var gamepad = InputSystem.AddDevice("Gamepad");
 
         var action = new InputAction(binding: "/gamepad/leftTrigger", interactions: "slowTap");
@@ -5946,8 +5929,6 @@ public void Actions_CanIterateOverActionsInMap()
     [Category("Actions")]
     public void Actions_CanUseTouchWithActions()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var touchscreen = InputSystem.AddDevice<Touchscreen>();
 
         var primaryTouchAction = new InputAction("PrimaryTouch" , binding: "<Touchscreen>/primaryTouch/position");
@@ -6018,8 +5999,6 @@ public void Actions_CanUseTouchWithActions()
     [Category("Actions")]
     public void Actions_CanDrivePointerInputFromTouchPenAndMouse()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         // Give us known parameters for tap detection.
         InputSystem.settings.defaultTapTime = 0.5f;
         InputSystem.settings.tapRadius = 5;

Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs

@@ -143,8 +143,6 @@ public void Actions_CanPerformPressInteraction()
     [Category("Actions")]
     public void Actions_CanPerformHoldInteraction()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         const int timeOffset = 123;
         runtime.currentTimeOffsetToRealtimeSinceStartup = timeOffset;
         runtime.currentTime = 10 + timeOffset;
@@ -256,8 +254,6 @@ public void Actions_CanPerformHoldInteraction()
     [Category("Actions")]
     public void Actions_CanPerformTapInteraction()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
         var performedReceivedCalls = 0;
@@ -315,8 +311,6 @@ public void Actions_CanPerformTapInteraction()
     [Category("Actions")]
     public void Actions_CanPerformDoubleTapInteraction()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
         runtime.advanceTimeEachDynamicUpdate = 0;

Assets/Tests/InputSystem/CoreTests_Controls.cs

@@ -574,14 +574,15 @@ public void Controls_CanQueueValueChange()
     [Category("Controls")]
     public void Controls_CanQueueValueChange_InFuture()
     {
+        InputSystem.settings.updateMode = InputSettings.UpdateMode.ProcessEventsInFixedUpdate;
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
         gamepad.leftTrigger.QueueValueChange(0.123f, 0.5);
 
         InputSystem.Update();
         Assert.That(gamepad.leftTrigger.ReadValue(), Is.EqualTo(0).Within(0.00001));
 
-        runtime.currentTime = 1;
+        runtime.currentTimeForFixedUpdate = 1;
         InputSystem.Update();
         Assert.That(gamepad.leftTrigger.ReadValue(), Is.EqualTo(0.123).Within(0.00001));
     }

Assets/Tests/InputSystem/CoreTests_Devices.cs

@@ -1308,8 +1308,6 @@ public void TODO_Devices_WhenRemovedThroughEvent_AreReusedWhenReconnectedAndNotR
     [Category("Devices")]
     public void Devices_WhenRemoved_DoNotEmergeOnUnsupportedList()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         // Devices added directly via AddDevice() don't end up on the list of
         // available devices. Devices reported by the runtime do.
         runtime.ReportNewInputDevice(@"
@@ -1821,8 +1819,6 @@ public void Devices_CanCreateGenericJoystick()
     [Category("Devices")]
     public void Devices_PointerDeltasDoNotAccumulateFromPreviousFrame()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var pointer = InputSystem.AddDevice<Pointer>();
 
         InputSystem.QueueStateEvent(pointer, new PointerState { delta = new Vector2(0.5f, 0.5f) });
@@ -2201,8 +2197,6 @@ public void Devices_CanUsePenAsPointer()
     [Category("Devices")]
     public void Devices_CanUseTouchscreenAsPointer()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var device = InputSystem.AddDevice<Touchscreen>();
 
         // First finger goes down.
@@ -2416,8 +2410,6 @@ public void Devices_TouchesDoNotBecomeStationaryWhenNotMovedInFrame()
     [Category("Devices")]
     public void Devices_CanGetStartTimeOfTouches()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var touchscreen = InputSystem.AddDevice<Touchscreen>();
 
         BeginTouch(4, new Vector2(0.123f, 0.234f), time: 0.1);
@@ -2444,8 +2436,6 @@ public void Devices_CanGetStartTimeOfTouches()
     [Category("Devices")]
     public void Devices_CanDetectTouchTaps()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         // Give us known tap settings.
         InputSystem.settings.defaultTapTime = 0.5f;
         InputSystem.settings.tapRadius = 5;
@@ -2539,8 +2529,6 @@ public void Devices_CanDetectTouchTaps()
     [Category("Devices")]
     public void Devices_CanDetectTouchTaps_AndKeepTrackOfTapCounts()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         // Give us known tap settings.
         InputSystem.settings.defaultTapTime = 0.5f;
         InputSystem.settings.tapRadius = 5;
@@ -2666,8 +2654,6 @@ public void Devices_CanReadTouchStateFromTouchControl()
     [Category("Devices")]
     public void Devices_TouchTimestampsFromDifferentIdsDontAffectEachOther()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         // On iOS and probably Android, when you're touching the screen with two fingers. Touches with different ids can come in different order.
         // Here's an example, in what order OS sends us touches
         // NewInput: Touch Moved 2227.000000 x 1214.000000, id = 5, time = 24.478610

Assets/Tests/InputSystem/CoreTests_Events.cs

@@ -186,8 +186,6 @@ public void Events_UseCurrentTimeByDefault()
     [Category("Events")]
     public void Events_CanSwitchToFullyManualUpdates()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var mouse = InputSystem.AddDevice<Mouse>();
 
         var receivedOnChange = true;
@@ -216,8 +214,6 @@ public void Events_CanSwitchToFullyManualUpdates()
     [Category("Events")]
     public void Events_CanSwitchToProcessingInFixedUpdates()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var mouse = InputSystem.AddDevice<Mouse>();
 
         var receivedOnChange = true;
@@ -231,6 +227,7 @@ public void Events_CanSwitchToProcessingInFixedUpdates()
         Assert.That(InputSystem.s_Manager.updateMask & InputUpdateType.Dynamic, Is.EqualTo(InputUpdateType.None));
 
         InputSystem.QueueStateEvent(mouse, new MouseState().WithButton(MouseButton.Left));
+        runtime.currentTimeForFixedUpdate += Time.fixedDeltaTime;
         InputSystem.Update(InputUpdateType.Fixed);
 
         Assert.That(mouse.leftButton.isPressed, Is.True);
@@ -277,9 +274,9 @@ public unsafe void Events_AreTimeslicedByDefault()
             (eventPtr, _) => receivedEvents.Add(*eventPtr.data);
 
         // First fixed update should just take everything.
-        InputSystem.QueueStateEvent(gamepad, new GamepadState { leftTrigger = 0.1234f }, 1);
-        InputSystem.QueueStateEvent(gamepad, new GamepadState { leftTrigger = 0.2345f }, 2);
-        InputSystem.QueueStateEvent(gamepad, new GamepadState { leftTrigger = 0.3456f }, 2.9);
+        InputSystem.QueueStateEvent(gamepad, new GamepadState {leftTrigger = 0.1234f}, 1);
+        InputSystem.QueueStateEvent(gamepad, new GamepadState {leftTrigger = 0.2345f}, 2);
+        InputSystem.QueueStateEvent(gamepad, new GamepadState {leftTrigger = 0.3456f}, 2.9);
 
         runtime.currentTimeForFixedUpdate = 3;
 
@@ -298,10 +295,10 @@ public unsafe void Events_AreTimeslicedByDefault()
         runtime.currentTimeForFixedUpdate += 1 / 60.0f;
 
         // From now on, fixed updates should only take what falls in their slice.
-        InputSystem.QueueStateEvent(gamepad, new GamepadState { leftTrigger = 0.1234f }, 3 + 0.001);
-        InputSystem.QueueStateEvent(gamepad, new GamepadState { leftTrigger = 0.2345f }, 3 + 0.002);
-        InputSystem.QueueStateEvent(gamepad, new GamepadState { leftTrigger = 0.3456f }, 3 + 1.0 / 60 + 0.001);
-        InputSystem.QueueStateEvent(gamepad, new GamepadState { leftTrigger = 0.4567f }, 3 + 2 * (1.0 / 60) + 0.001);
+        InputSystem.QueueStateEvent(gamepad, new GamepadState {leftTrigger = 0.1234f}, 3 + 0.001);
+        InputSystem.QueueStateEvent(gamepad, new GamepadState {leftTrigger = 0.2345f}, 3 + 0.002);
+        InputSystem.QueueStateEvent(gamepad, new GamepadState {leftTrigger = 0.3456f}, 3 + 1.0 / 60 + 0.001);
+        InputSystem.QueueStateEvent(gamepad, new GamepadState {leftTrigger = 0.4567f}, 3 + 2 * (1.0 / 60) + 0.001);
 
         InputSystem.Update(InputUpdateType.Fixed);
 
@@ -348,49 +345,6 @@ public unsafe void Events_AreTimeslicedByDefault()
         Assert.That(InputUpdate.s_LastUpdateRetainedEventCount, Is.Zero);
     }
 
-    [Test]
-    [Category("Events")]
-    public unsafe void Events_TimeslicingCanBeTurnedOff()
-    {
-        InputSystem.settings.updateMode = InputSettings.UpdateMode.ProcessEventsInFixedUpdate;
-        InputSystem.settings.timesliceEvents = true;
-
-        // Get first update out of the way with timeslicing on. First fixed update will consume all
-        // input so we can't really tell the difference.
-        InputSystem.Update(InputUpdateType.Fixed);
-
-        var gamepad = InputSystem.AddDevice<Gamepad>();
-
-        var receivedEvents = new List<InputEvent>();
-        InputSystem.onEvent +=
-            (eventPtr, _) => receivedEvents.Add(*eventPtr.data);
-
-        bool? receivedOnSettingsChange = null;
-        InputSystem.onSettingsChange += () => receivedOnSettingsChange = true;
-
-        runtime.currentTime = 3;
-
-        InputSystem.settings.timesliceEvents = false;
-
-        Assert.That(receivedOnSettingsChange, Is.True);
-
-        InputSystem.QueueStateEvent(gamepad, new GamepadState { leftTrigger = 0.1234f }, 3 + 0.001);
-        InputSystem.QueueStateEvent(gamepad, new GamepadState { leftTrigger = 0.2345f }, 3 + 0.002);
-        InputSystem.QueueStateEvent(gamepad, new GamepadState { leftTrigger = 0.3456f }, 3 + 1.0 / 60 + 0.001);
-        InputSystem.QueueStateEvent(gamepad, new GamepadState { leftTrigger = 0.4567f }, 3 + 2 * (1.0 / 60) + 0.001);
-
-        InputSystem.Update(InputUpdateType.Fixed);
-
-        Assert.That(receivedEvents, Has.Count.EqualTo(4));
-        Assert.That(receivedEvents[0].time, Is.EqualTo(3 + 0.001).Within(0.00001));
-        Assert.That(receivedEvents[1].time, Is.EqualTo(3 + 0.002).Within(0.00001));
-        Assert.That(receivedEvents[2].time, Is.EqualTo(3 + 1.0 / 60 + 0.001).Within(0.00001));
-        Assert.That(receivedEvents[3].time, Is.EqualTo(3 + 2 * (1.0 / 60) + 0.001).Within(0.00001));
-        Assert.That(gamepad.leftTrigger.ReadValue(), Is.EqualTo(0.4567).Within(0.00001));
-
-        Assert.That(InputUpdate.s_LastUpdateRetainedEventCount, Is.Zero);
-    }
-
     [Test]
     [Category("Events")]
     public void Events_CanGetAverageEventLag()
@@ -471,8 +425,6 @@ public void Events_CanCreateDeltaStateEventFromControl()
     [Category("Events")]
     public void Events_SendingStateToDeviceWithoutBeforeRenderEnabled_DoesNothingInBeforeRenderUpdate()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         // We need one device that has before-render updates enabled for the update to enable
         // at all.
         const string deviceJson = @"
@@ -499,8 +451,6 @@ public void Events_SendingStateToDeviceWithoutBeforeRenderEnabled_DoesNothingInB
     [Category("Events")]
     public void Events_SendingStateToDeviceWithBeforeRenderEnabled_UpdatesDeviceInBeforeRender()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         const string deviceJson = @"
             {
                 ""name"" : ""CustomGamepad"",
@@ -556,8 +506,6 @@ public void TODO_Events_CanFindActiveControlsFromStateEvent()
     [Category("Events")]
     public void Events_AreProcessedInOrderTheyAreQueuedIn()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         const double kFirstTime = 0.5;
         const double kSecondTime = 1.5;
         const double kThirdTime = 2.5;
@@ -597,8 +545,6 @@ public void Events_AreProcessedInOrderTheyAreQueuedIn()
     [Category("Events")]
     public void Events_CanQueueAndReceiveEventsAgainstNonExistingDevices()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         // Device IDs are looked up only *after* the system shows the event to us.
 
         var receivedCalls = 0;
@@ -623,8 +569,6 @@ public void Events_CanQueueAndReceiveEventsAgainstNonExistingDevices()
     [Category("Events")]
     public void Events_HandledFlagIsResetWhenEventIsQueued()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var receivedCalls = 0;
         var wasHandled = true;
 
@@ -722,8 +666,6 @@ public unsafe void Events_CanHandleStateNotAlignedTo4ByteBoundary()
     [Category("Events")]
     public unsafe void Events_CanTraceEventsOfDevice()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var device = InputSystem.AddDevice<Gamepad>();
         var noise = InputSystem.AddDevice<Gamepad>();
 
@@ -767,8 +709,6 @@ public unsafe void Events_CanTraceEventsOfDevice()
     [Category("Events")]
     public void Events_WhenTraceIsFull_WillStartOverwritingOldEvents()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var device = InputSystem.AddDevice<Gamepad>();
         using (var trace =
                    new InputEventTrace(StateEvent.GetEventSizeWithPayload<GamepadState>() * 2) {deviceId = device.id})
@@ -848,8 +788,6 @@ public void Events_GetUniqueIds()
     [Category("Events")]
     public void Events_IfOldStateEventIsSentToDevice_IsIgnored()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
         InputSystem.QueueStateEvent(gamepad, new GamepadState {rightTrigger = 0.5f}, 2.0);
@@ -870,8 +808,6 @@ public void Events_IfOldStateEventIsSentToDevice_IsIgnored()
     [Category("Events")]
     public void Events_IfOldStateEventIsSentToDevice_IsIgnored_ExceptIfEventIsHandledByIInputStateCallbackReceiver()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var device = InputSystem.AddDevice<Touchscreen>();
 
         // Sanity check.