Merge branch 'develop' into docs-processors

Author: ritamerkl

.github/codecov.yml

@@ -0,0 +1,34 @@
+codecov:
+  max_report_age: false
+  require_ci_to_pass: false
+  notify:
+    wait_for_ci: true
+
+coverage:
+  precision: 2
+  round: down
+  range: "50...70"
+  status:
+    patch: true
+    default_rules:
+      flag_coverage_not_uploaded_behavior: exclude
+    project:
+      default:
+        target: auto
+        threshold: 1%
+        base: auto 
+        if_ci_failed: success
+        informational: true
+        only_pulls: true
+
+comment:
+  layout: "diff,flags,files"
+  behavior: default
+  require_changes: false
+  require_base: true
+  require_head: true
+  after_n_builds: 1
+
+flag_management:
+  default_rules:
+    carryforward: true

.yamato/upm-ci.yml

@@ -26,8 +26,7 @@
     - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
     # Run upm-ci verification tests as well as tests contained in the package.
     - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u %EDITOR_VERSION%
-      {% if platform.name == "win" and category.name == "functional" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:@*,,Library/PackageCache,Packages" 
-      --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
+      {% if platform.name == "win" and category.name == "functional" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:@*,,Library/PackageCache,Packages" --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package --coverage-upload-options=\"reportsDir:upm-ci~/test-results/CodeCoverage/Package;name:{{platform.name}}_{{editor.version}}_pkg;flags:{{platform.name}}_{{editor.version}}_pkg\"" {% endif %}
     {% if platform.installscript %}
     - {{ unity_downloader_install }}
     - {{ platform.installscript }} %EDITOR_VERSION%
@@ -37,11 +36,9 @@
     - move /Y .\Packages\com.unity.inputsystem\Samples .\Assets
     - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets
     # Now run our full test suite that sits in Assets/Tests by running UTR on our project.
-    - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %} {% if platform.name == "win" and category.name == "functional" %}--enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
-    # Merge all the code coverage results into one report.
+    - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %} {% if platform.name == "win" and category.name == "functional" %}--enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project --coverage-upload-options="reportsDir:upm-ci~/test-results/CodeCoverage/Project;name:{{platform.name}}_{{editor.version}}_project;flags:{{platform.name}}_{{editor.version}}_project" {% endif %}
     {% if platform.name == "win" and category.name == "functional" %}
-    - '{{ yamato_source_dir_win }}/.Editor/Unity.exe -projectPath {{ yamato_source_dir_win }} -batchmode -debugCodeOptimization -enableCodeCoverage -coverageResultsPath {{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/ -coverageOptions "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_win }}/Packages/com.unity.inputsystem/" -quit' 
-    # Delete the Package and Project reports, only keep the final merged one to keep Aritfacts.zip smaller
+    # Delete the Package and Project reports & raw coverage data, to keep Artifacts.zip smaller
     - rmdir /s/q "{{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package"
     - rmdir /s/q "{{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project"   
     {% endif %}
@@ -52,6 +49,11 @@
     UTR_Output.zip:
       paths:
         - "upm-ci~/test-results/**/*"
+{% if platform.name == "win" and category.name == "functional" %}
+  triggers:
+      expression: push.branch eq "develop"
+      cancel_old_ci: true
+{% endif %}
 {% endfor %} # test_category
 {% endfor %} # platforms_win
 
@@ -77,7 +79,7 @@
     - mv ./Assets/Samples.meta ./Packages/com.unity.inputsystem
     - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
     # Run upm-ci verification tests as well as tests contained in the package.
-    - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u $EDITOR_VERSION {% if category.name == "functional" and platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:@*,,Library/PackageCache,Packages" --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
+    - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u $EDITOR_VERSION {% if category.name == "functional" and platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:@*,,Library/PackageCache,Packages" --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Package --coverage-upload-options=\"reportsDir:upm-ci~/test-results/CodeCoverage/Package;name:{{platform.name}}_{{editor.version}}_pkg;flags:{{platform.name}}_{{editor.version}}_pkg\"" {% endif %}
     {% if platform.installscript %}
     - {{ unity_downloader_install }}
     - {{ platform.installscript }} $EDITOR_VERSION
@@ -87,24 +89,24 @@
     - mv ./Packages/com.unity.inputsystem/Samples ./Assets
     - mv ./Packages/com.unity.inputsystem/Samples.meta ./Assets
     # Now run our full test suite that sits in Assets/Tests by running UTR on our project.
-    - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "mac" or platform.name == "linux"%} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %} {% if category.name == "functional" and platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
-    # Merge all the code coverage results into one report.
-    {% if platform.name == "mac" and category.name == "functional" %}
-    - '{{ yamato_source_dir_nix }}/.Editor/Unity.app/Contents/MacOS/Unity -projectPath {{ yamato_source_dir_nix }} -batchmode -debugCodeOptimization -enableCodeCoverage -coverageResultsPath {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/ -coverageOptions "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_nix }}/Packages/com.unity.inputsystem/" -quit' 
-    {% endif %}
-    {% if platform.name == "linux" and category.name == "functional" %}
-    - '{{ yamato_source_dir_nix }}/.Editor/Unity -projectPath {{ yamato_source_dir_nix }} -batchmode -debugCodeOptimization -enableCodeCoverage -coverageResultsPath {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/ -coverageOptions "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_nix }}/Packages/com.unity.inputsystem/" -quit' 
-    {% endif %}
-    # Delete the Package and Project reports, only keep the final merged one to keep Aritfacts.zip smaller
+    - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "mac" or platform.name == "linux"%} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %} {% if category.name == "functional" and platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Project --coverage-upload-options="reportsDir:upm-ci~/test-results/CodeCoverage/Project;name:{{platform.name}}_{{editor.version}}_project;flags:{{platform.name}}_{{editor.version}}_project" {% endif %}
+    {% if category.name == "functional" and platform.name == "mac" or platform.name == "linux"%}
+    # Delete the Package and Project reports & raw coverage data, to keep Artifacts.zip smaller
     - rm -rf {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Package
-    - rm -rf {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Project  
+    - rm -rf {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Project 
+    {% endif %} 
   after:
     - {{ instabilities_install_nix }}
     - {{ platform.instabilities_run }}
   artifacts:
     UTR_Output.zip:
       paths:
         - "upm-ci~/test-results/**/*"
+{% if category.name == "functional" and platform.name == "mac" or platform.name == "linux"%}
+  triggers:
+      expression: push.branch eq "develop"
+      cancel_old_ci: true
+{% endif %}
 {% endfor %} # test_category
 {% endfor %} # platforms_nix
 {% endfor %} # editors

Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs

@@ -669,6 +669,78 @@ public void Actions_CanPerformTapInteraction()
         Assert.That(action.phase, Is.EqualTo(InputActionPhase.Waiting));
     }
 
+    [Test]
+    [Category("Actions")]
+    public void Actions_CanPerformTapInteractionWithAnalogControls()
+    {
+        ResetTime();
+
+        var gamepad = InputSystem.AddDevice<Gamepad>();
+
+        var action = new InputAction(binding: "<Gamepad>/leftTrigger", type: InputActionType.Button,
+            interactions: "tap(duration=0.2)");
+
+        // This is the default value, which makes the release point to be 0.75 * 0.5 = 0.375.
+        InputSystem.settings.defaultButtonPressPoint = 0.5f;
+
+        action.Enable();
+
+        currentTime = 0f;
+
+        using (var trace = new InputActionTrace())
+        {
+            trace.SubscribeTo(action);
+
+            currentTime = 0.1f;
+            Set(gamepad.leftTrigger, 0.3f);
+            currentTime = 0.2f;
+            Set(gamepad.leftTrigger, 0.54f);
+
+            Assert.That(trace,
+                Started<TapInteraction>(action, value: 0.54f, time: 0.2f));
+            trace.Clear();
+
+            // Assert that a timeout will ocurr and a canceled event will be triggered.
+            currentTime = 0.5f;
+            Set(gamepad.leftTrigger, 0.9f);
+            Assert.That(trace,
+                Canceled<TapInteraction>(action));
+            trace.Clear();
+
+            // Maintain a value above the press point for a while to assess that a start event is not triggered.
+            // This was the case where the tap interaction was previously re-starting.
+            currentTime = 1.2f;
+            Set(gamepad.leftTrigger, 0.52f);
+
+            Assert.That(trace, Is.Empty);
+
+            // Go below the release point so check that no cancel event is triggered, since it didn't start.
+            // This was the case where the tap interaction was previously re-starting and then would cancel after
+            // timeout.
+            currentTime = 1.5f;
+            Set(gamepad.leftTrigger, 0.2f);
+
+            Assert.That(trace, Is.Empty);
+
+            // Go above the press point again and check that a start event is triggered.
+            currentTime = 2.0f;
+            Set(gamepad.leftTrigger, 0.6f);
+
+            Assert.That(trace,
+                Started<TapInteraction>(action));
+            trace.Clear();
+
+            currentTime = 2.10f;
+            Set(gamepad.leftTrigger, 0.4f);
+
+            // Check that the tap is performed.
+            currentTime = 2.15f;
+            Set(gamepad.leftTrigger, 0.2f);
+            Assert.That(trace,
+                Performed<TapInteraction>(action));
+        }
+    }
+
     [Test]
     [Category("Actions")]
     public void Actions_CanPerformDoubleTapInteraction()

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -22,8 +22,10 @@ however, it has to be formatted properly to pass verification tests.
 - Fixed Inspector Window being refreshed all the time when a PlayerInput component is present with Invoke Unity Events nofication mode chosen [ISXB-1448](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1448)
 - Fixed an issue where an action with a name containing a slash "/" could not be found via `InputActionAsset.FindAction(string,bool)`. [ISXB-1306](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1306).
 - Fixed Gamepad stick up/down inputs that were not recognized in WebGL. [ISXB-1090](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1090)
+- Fixed reenabling the VirtualMouseInput component may sometimes lead to NullReferenceException. [ISXB-1096](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1096)
 - Fixed PlayerInput component automatically switching away from the default ActionMap set to 'None'.
 - Fixed a console error being shown when targeting visionOS builds in 2022.3.
+- Fixed a Tap Interaction issue with analog controls. The Tap interaction would keep re-starting after timeout. [ISXB-627](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-627)
 
 ## [1.14.0] - 2025-03-20
 

Packages/com.unity.inputsystem/Documentation~/Concepts.md

@@ -5,7 +5,7 @@ uid: basic-concepts
 
 This page introduces the basic concepts that relate to working with the Input System. They relate to the steps in the sequence of events that occur when a user sends input to your game or app. The Input System provides features which implement these steps, or you can choose to implement some of them yourself.
 
-![](Images/ConceptsOverview.png)
+![A flowchart showing the general workflow of the Input System, with icons representing the different concepts. It starts with the User icon, which then leads into the Input Device and its Controls icon. This then leads into the Action Map and Actions concept. The Input Device and Action Map and Actions icons are collectively grouped under the Binding header. This leads into the final icon representing your action code.](Images/ConceptsOverview.png)
 
 |Concept|Description|
 |-------|-----------|

Packages/com.unity.inputsystem/Documentation~/Images/Workflow-Actions.png

@@ -18,25 +18,22 @@ Unless you have specific project requirements that require more than one Action
 To create and assign the current project-wide actions, go to **Edit** > **Project Settings** > **Input System Package**.
 
 If you don't yet have an Action Asset assigned as project-wide in your project, the Input System Package settings window displays an empty field for you to assign your action asset, and a button allowing you to create and assign one.
-![image alt text](./Images/InputSettingsNoProjectWideAsset.png)</br>
-*The Input System Package Project Settings with no project-wide actions assigned*
+
+![Screenshot of the Project Settings window, with Input System Package selected. Its settings are displayed on the right of the window. The Project-wide Actions field is empty, and an information box explaining you can assign an Action Asset as project-wide by selecting it in this field or creating it in this window is shown. A button to automatically create and assign the default project-wide Action Asset is displayed under the information box.](./Images/InputSettingsNoProjectWideAsset.png)</br>
+*The Input System Package Project Settings with no project-wide actions assigned displays a button to create and assign a default project-wide Action Asset.*
 
 > **Note:** If you already have an Action Asset assigned, this button is not displayed, and instead the Actions Editor is displayed, allowing you to edit the project-wide actions.
 
 To create an Action Asset with default actions pre-configured, click  **"Create a new project-wide Action Asset"**. The asset is created in your project, and automatically assigned as the **project-wide actions**.
 
 The Action Asset appears in your Project view, and is named "InputSystem_Actions". This is where your new configuration of actions is saved, including any changes you make to it.
 
-![](images/InputSystemActionsAsset.png)<br/>
-*The new Actions Asset in your Project window*
+![](images/InputSystemActionsAsset.png)
 
 ## Edit project-wide actions
 
 Once you have created and assigned project-wide actions, the Input System Package page in Project Settings displays the **Actions Editor** interface. Read more about how to use the [Actions Editor](ActionsEditor.md) to configure your actions.
 
-![image alt text](./Images/ProjectSettingsInputActionsSimpleShot.png)
-*The Input System Package Project Settings after creating and assigning the default actions*
-
 ## The default actions
 
 When you create and assign default project-wide actions using the method described above, the Action Asset comes pre-configured with some default Actions such as "Move", "Jump", and more, which suit many common app and game scenarios. They are configured to read input from the most common types of input controller such as Keyboard, Mouse, Gamepad, Touchscreen and XR.
@@ -47,7 +44,7 @@ If you’d like to delete all the default actions so that you can start from an
 
 You can also delete all action maps, or reset all the actions back to the default values from the **more** (⋮) menu at the top right of the Input Actions section of the settings window, below the Project Settings window search field.
 
-![The Input Actions **more** menu as displayed in the Project Settings window](images/InputActionsSettingsMoreMenu.png)
+![](images/InputActionsSettingsMoreMenu.png)
 
 > **Note:** this **more** (⋮) menu is not available when the Actions Editor is open in a separate window, it is only present in the Project Settings window.