Merge branch 'dev-2.0' into fix/usampler-user-shader-override

Author: BHARATH0153

src/events/pointer.js

@@ -9,6 +9,7 @@ function pointer(p5, fn, lifecycles){
     const events = [
       'pointerdown',
       'pointerup',
+      'pointercancel',
       'pointermove',
       'dragend',
       'dragover',
@@ -1394,6 +1395,16 @@ function pointer(p5, fn, lifecycles){
   fn._ondragend = fn._onpointerup;
   fn._ondragover = fn._onpointermove;
 
+  fn._onpointercancel = function(e) {
+    this._activePointers.delete(e.pointerId);
+    this._setMouseButton(e);
+    this._updatePointerCoords(e);
+
+    if (this._activePointers.size === 0) {
+      this.mouseIsPressed = false;
+    }
+  };
+
   /**
    * A function that's called once after a mouse button is pressed and released.
    *

src/shape/attributes.js

@@ -513,8 +513,9 @@ function attributes(p5, fn){
    * Sets the width of the stroke used for points, lines, and the outlines of
    * shapes.
    *
-   * Note: `strokeWeight()` is affected by transformations, especially calls to
-   * <a href="#/p5/scale">scale()</a>.
+   * Note: In 2D mode, `strokeWeight()` is affected by transformations,
+   * especially calls to <a href="#/p5/scale">scale()</a>. It isn't affected by
+   * transformations in WebGL and WebGPU modes.
    * 
    * Calling `strokeWeight()` without an argument returns the current stroke weight as a number.
    *

test/unit/events/touch.js

@@ -32,6 +32,13 @@ suite('Touch Events', function() {
     myp5.remove();
   });
 
+  beforeEach(function() {
+    // Reset pointer state so tests don't leak active pointers into each other.
+    myp5._activePointers.clear();
+    myp5.touches = [];
+    myp5.mouseIsPressed = false;
+  });
+
   suite('p5.prototype.touches', function() {
     test('should be an empty array', function() {
       assert.deepEqual(myp5.touches, []);
@@ -44,7 +51,45 @@ suite('Touch Events', function() {
     });
 
     test('should contain the touch registered', function() {
+      window.dispatchEvent(touchEvent1);
       assert.strictEqual(myp5.touches[0].id, 1);
     });
   });
+
+  suite('p5.prototype._onpointercancel', function() {
+    test('should remove the cancelled touch from touches', function() {
+      window.dispatchEvent(touchEvent1);
+      window.dispatchEvent(touchEvent2);
+      assert.strictEqual(myp5.touches.length, 2);
+
+      // A cancelled pointer must be cleaned up even though no
+      // 'pointerup' event is dispatched.
+      const cancelEvent = new PointerEvent('pointercancel', {
+        pointerId: 1,
+        clientX: 100,
+        clientY: 100,
+        pointerType: 'touch'
+      });
+      window.dispatchEvent(cancelEvent);
+
+      assert.strictEqual(myp5.touches.length, 1);
+      assert.strictEqual(myp5.touches[0].id, 2);
+    });
+
+    test('should reset mouseIsPressed once all pointers are cancelled', function() {
+      window.dispatchEvent(touchEvent1);
+      assert.strictEqual(myp5.mouseIsPressed, true);
+
+      const cancelEvent = new PointerEvent('pointercancel', {
+        pointerId: 1,
+        clientX: 100,
+        clientY: 100,
+        pointerType: 'touch'
+      });
+      window.dispatchEvent(cancelEvent);
+
+      assert.strictEqual(myp5.touches.length, 0);
+      assert.strictEqual(myp5.mouseIsPressed, false);
+    });
+  });
 });