pixi.js 7.2.2 → 7.2.3

package/dist/pixi.js

@@ -1,6 +1,6 @@
 /*!
- * pixi.js - v7.2.2
- * Compiled Tue, 21 Mar 2023 12:27:22 UTC
+ * pixi.js - v7.2.3
+ * Compiled Fri, 24 Mar 2023 19:53:04 UTC
  *
  * pixi.js is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
@@ -3477,16 +3477,14 @@ Deprecated since v${version}`);
       return this.toHex() + "00".substring(0, 2 - alphaString.length) + alphaString;
     }
     setAlpha(alpha) {
-      this._components[3] = alpha;
+      this._components[3] = this._clamp(alpha);
       return this;
     }
-    round(step) {
+    round(steps) {
       const [r, g, b] = this._components;
-      this._components.set([
-        Math.min(255, r / step * step),
-        Math.min(255, g / step * step),
-        Math.min(255, b / step * step)
-      ]);
+      this._components[0] = Math.round(r * steps) / steps;
+      this._components[1] = Math.round(g * steps) / steps;
+      this._components[2] = Math.round(b * steps) / steps;
       this.refreshInt();
       this._value = null;
       return this;
@@ -3510,10 +3508,12 @@ Deprecated since v${version}`);
           (int & 255) / 255,
           1
         ];
-      } else if ((Array.isArray(value) || value instanceof Float32Array) && value.length >= 3 && value.length <= 4 && value.every((v) => v <= 1 && v >= 0)) {
+      } else if ((Array.isArray(value) || value instanceof Float32Array) && value.length >= 3 && value.length <= 4) {
+        value = this._clamp(value);
         const [r, g, b, a = 1] = value;
         components = [r, g, b, a];
       } else if ((value instanceof Uint8Array || value instanceof Uint8ClampedArray) && value.length >= 3 && value.length <= 4) {
+        value = this._clamp(value, 0, 255);
         const [r, g, b, a = 255] = value;
         components = [r / 255, g / 255, b / 255, a / 255];
       } else if (typeof value === "string" || typeof value === "object") {
@@ -3537,10 +3537,19 @@ Deprecated since v${version}`);
       }
     }
     refreshInt() {
-      this._components.forEach((value, i) => this._components[i] = Math.min(Math.max(value, 0), 1));
+      this._clamp(this._components);
       const [r, g, b] = this._components;
       this._int = (r * 255 << 16) + (g * 255 << 8) + (b * 255 | 0);
     }
+    _clamp(value, min = 0, max = 1) {
+      if (typeof value === "number") {
+        return Math.min(Math.max(value, min), max);
+      }
+      value.forEach((v, i) => {
+        value[i] = Math.min(Math.max(v, min), max);
+      });
+      return value;
+    }
   };
   let Color = _Color;
   Color.shared = new _Color();
@@ -10391,7 +10400,7 @@ ${this.fragmentSrc}`;
       const { renderer } = this;
       renderer.runners.init.emit(renderer.options);
       if (options.hello) {
-        console.log(`PixiJS ${"7.2.2"} - ${renderer.rendererLogId} - https://pixijs.com`);
+        console.log(`PixiJS ${"7.2.3"} - ${renderer.rendererLogId} - https://pixijs.com`);
       }
       renderer.resize(renderer.screen.width, renderer.screen.height);
     }
@@ -12577,7 +12586,7 @@ ${this.fragmentSrc}`;
     }
   }
 
-  const VERSION = "7.2.2";
+  const VERSION = "7.2.3";
 
   class Bounds {
     constructor() {
@@ -15169,7 +15178,7 @@ ${this.fragmentSrc}`;
       this.eventPool = /* @__PURE__ */ new Map();
       this._allInteractiveElements = [];
       this._hitElements = [];
-      this._collectInteractiveElements = false;
+      this._isPointerMoveEvent = false;
       this.rootTarget = rootTarget;
       this.hitPruneFn = this.hitPruneFn.bind(this);
       this.hitTestFn = this.hitTestFn.bind(this);
@@ -15221,7 +15230,9 @@ ${this.fragmentSrc}`;
     }
     hitTest(x, y) {
       EventsTicker.pauseUpdate = true;
-      const invertedPath = this.hitTestRecursive(this.rootTarget, this.rootTarget.eventMode, tempHitLocation.set(x, y), this.hitTestFn, this.hitPruneFn);
+      const useMove = this._isPointerMoveEvent && this.enableGlobalMoveEvents;
+      const fn = useMove ? "hitTestMoveRecursive" : "hitTestRecursive";
+      const invertedPath = this[fn](this.rootTarget, this.rootTarget.eventMode, tempHitLocation.set(x, y), this.hitTestFn, this.hitPruneFn);
       return invertedPath && invertedPath[0];
     }
     propagate(e, type) {
@@ -15273,10 +15284,9 @@ ${this.fragmentSrc}`;
       propagationPath.reverse();
       return propagationPath;
     }
-    hitTestRecursive(currentTarget, eventMode, location, testFn, pruneFn) {
-      if (pruneFn(currentTarget, location)) {
+    hitTestMoveRecursive(currentTarget, eventMode, location, testFn, pruneFn, ignore = false) {
+      if (this._interactivePrune(currentTarget))
         return null;
-      }
       if (currentTarget.eventMode === "dynamic" || eventMode === "dynamic") {
         EventsTicker.pauseUpdate = false;
       }
@@ -15284,34 +15294,58 @@ ${this.fragmentSrc}`;
         const children = currentTarget.children;
         for (let i = children.length - 1; i >= 0; i--) {
           const child = children[i];
-          const nestedHit = this.hitTestRecursive(child, this._isInteractive(eventMode) ? eventMode : child.eventMode, location, testFn, pruneFn);
+          const nestedHit = this.hitTestMoveRecursive(child, this._isInteractive(eventMode) ? eventMode : child.eventMode, location, testFn, pruneFn, pruneFn(currentTarget, location));
           if (nestedHit) {
             if (nestedHit.length > 0 && !nestedHit[nestedHit.length - 1].parent) {
               continue;
             }
             const isInteractive = currentTarget.isInteractive();
             if (nestedHit.length > 0 || isInteractive) {
-              if (this._collectInteractiveElements && isInteractive) {
+              if (isInteractive)
                 this._allInteractiveElements.push(currentTarget);
-              }
               nestedHit.push(currentTarget);
             }
-            if (this._collectInteractiveElements && this._hitElements.length === 0) {
+            if (this._hitElements.length === 0)
               this._hitElements = nestedHit;
-            }
-            if (!this._collectInteractiveElements)
-              return nestedHit;
           }
         }
       }
       const isInteractiveMode = this._isInteractive(eventMode);
       const isInteractiveTarget = currentTarget.isInteractive();
-      if (this._collectInteractiveElements) {
-        if (isInteractiveMode && isInteractiveTarget)
-          this._allInteractiveElements.push(currentTarget);
-        if (this._hitElements.length > 0)
-          return null;
+      if (isInteractiveTarget && isInteractiveTarget)
+        this._allInteractiveElements.push(currentTarget);
+      if (ignore || this._hitElements.length > 0)
+        return null;
+      if (isInteractiveMode && (!pruneFn(currentTarget, location) && testFn(currentTarget, location))) {
+        return isInteractiveTarget ? [currentTarget] : [];
+      }
+      return null;
+    }
+    hitTestRecursive(currentTarget, eventMode, location, testFn, pruneFn) {
+      if (this._interactivePrune(currentTarget) || pruneFn(currentTarget, location)) {
+        return null;
+      }
+      if (currentTarget.eventMode === "dynamic" || eventMode === "dynamic") {
+        EventsTicker.pauseUpdate = false;
+      }
+      if (currentTarget.interactiveChildren && currentTarget.children) {
+        const children = currentTarget.children;
+        for (let i = children.length - 1; i >= 0; i--) {
+          const child = children[i];
+          const nestedHit = this.hitTestRecursive(child, this._isInteractive(eventMode) ? eventMode : child.eventMode, location, testFn, pruneFn);
+          if (nestedHit) {
+            if (nestedHit.length > 0 && !nestedHit[nestedHit.length - 1].parent) {
+              continue;
+            }
+            const isInteractive = currentTarget.isInteractive();
+            if (nestedHit.length > 0 || isInteractive)
+              nestedHit.push(currentTarget);
+            return nestedHit;
+          }
+        }
       }
+      const isInteractiveMode = this._isInteractive(eventMode);
+      const isInteractiveTarget = currentTarget.isInteractive();
       if (isInteractiveMode && testFn(currentTarget, location)) {
         return isInteractiveTarget ? [currentTarget] : [];
       }
@@ -15320,7 +15354,7 @@ ${this.fragmentSrc}`;
     _isInteractive(int) {
       return int === "static" || int === "dynamic";
     }
-    hitPruneFn(displayObject, location) {
+    _interactivePrune(displayObject) {
       if (!displayObject || displayObject.isMask || !displayObject.visible || !displayObject.renderable) {
         return true;
       }
@@ -15333,8 +15367,9 @@ ${this.fragmentSrc}`;
       if (displayObject.isMask) {
         return true;
       }
-      if (this._collectInteractiveElements)
-        return false;
+      return false;
+    }
+    hitPruneFn(displayObject, location) {
       if (displayObject.hitArea) {
         displayObject.worldTransform.applyInverse(location, tempLocalMapping);
         if (!displayObject.hitArea.contains(tempLocalMapping.x, tempLocalMapping.y)) {
@@ -15395,9 +15430,9 @@ ${this.fragmentSrc}`;
       }
       this._allInteractiveElements.length = 0;
       this._hitElements.length = 0;
-      this._collectInteractiveElements = true;
+      this._isPointerMoveEvent = true;
       const e = this.createPointerEvent(from);
-      this._collectInteractiveElements = false;
+      this._isPointerMoveEvent = false;
       const isMouse = e.pointerType === "mouse" || e.pointerType === "pen";
       const trackingData = this.trackingData(from.pointerId);
       const outTarget = this.findMountedTarget(trackingData.overTargets);
@@ -20439,7 +20474,7 @@ ${e}`);
       const uniforms = shader.uniforms;
       const drawCalls = geometry.drawCalls;
       uniforms.translationMatrix = this.transform.worldTransform;
-      Color.shared.setValue(this._tintColor).multiply([worldAlpha, worldAlpha, worldAlpha]).setAlpha(worldAlpha).toArray(uniforms.tint);
+      Color.shared.setValue(this._tintColor).premultiply(worldAlpha).toArray(uniforms.tint);
       renderer.shader.bind(shader);
       renderer.geometry.bind(geometry, shader);
       renderer.state.set(this.state);