pixi-effects 0.35.0 → 0.36.0

package/dist/{chunk-Y253JQOH.js → chunk-G3DX65HO.js}

@@ -1,4 +1,4 @@
-import { describeLayer, collectPropKeys } from './chunk-ITDYFBB6.js';
+import { describeLayer, collectPropKeys } from './chunk-2JFFKHXO.js';
 import { suggestName, warnUnknownOptions } from './chunk-BXOCEZ4U.js';
 import * as PIXI from 'pixi.js';
 import { Rectangle, Container, FillGradient, Text, Color, GraphicsPath, Sprite, Texture, Graphics, Assets, Filter, GlProgram, defaultFilterVert, GpuProgram, UniformGroup, TextStyle, CanvasTextMetrics } from 'pixi.js';
@@ -2326,6 +2326,11 @@ function createFilter(spec) {
     return named;
   }
   const { type, name, ...given } = spec;
+  const unset = Object.keys(given).filter((k) => given[k] === void 0);
+  if (unset.length > 0) {
+    console.warn(`pixi-effects: the "${type}" filter has ${unset.map((k) => `"${k}"`).join(", ")} set to undefined (a misspelt variable or a missing field?): the filter's default is used instead.`);
+    for (const k of unset) delete given[k];
+  }
   const params = copyPlain(given);
   const Cls = registry[type];
   const inst = Cls ? new Cls(params) : createNamedFilter(type, params);
@@ -2841,7 +2846,37 @@ var TEXT_STYLE_DEFAULTS = {
 };
 
 // src/sequences/Text.ts
-function formatValue(v, f) {
+var TIME_PATTERNS = ["hh:mm:ss", "h:mm:ss", "hh:mm", "mm:ss", "m:ss"];
+function formatTime(v, pattern, warned2) {
+  if (!TIME_PATTERNS.includes(pattern)) {
+    if (!warned2.has(pattern)) {
+      warned2.add(pattern);
+      console.warn(`pixi-effects: format.time "${pattern}" is not one of ${TIME_PATTERNS.map((p) => `"${p}"`).join(", ")}: the value is printed as a number`);
+    }
+    return null;
+  }
+  const total = Math.floor(Math.abs(v));
+  const h = Math.floor(total / 3600), m = Math.floor(total % 3600 / 60), sec = total % 60;
+  const two = (n) => String(n).padStart(2, "0");
+  const sign = v < 0 && total > 0 ? "-" : "";
+  switch (pattern) {
+    case "hh:mm:ss":
+      return `${sign}${two(h)}:${two(m)}:${two(sec)}`;
+    case "h:mm:ss":
+      return `${sign}${h}:${two(m)}:${two(sec)}`;
+    case "hh:mm":
+      return `${sign}${two(h)}:${two(m)}`;
+    case "mm:ss":
+      return `${sign}${two(Math.floor(total / 60))}:${two(sec)}`;
+    default:
+      return `${sign}${Math.floor(total / 60)}:${two(sec)}`;
+  }
+}
+function formatValue(v, f, warned2 = /* @__PURE__ */ new Set()) {
+  if (f?.time !== void 0) {
+    const t = formatTime(v, String(f.time), warned2);
+    if (t !== null) return t;
+  }
   const fixed = v.toFixed(Math.max(0, Math.floor(f?.decimals ?? 0)));
   const pad = Math.max(0, Math.floor(f?.pad ?? 0));
   if (!f?.grouping && !pad) return fixed;
@@ -2860,6 +2895,8 @@ var TextSequence = class extends Sequence {
   /** `visibleChars` is in play (initial or animated): otherwise the whole text shows. */
   _typed = false;
   _lastText = "";
+  /** The `format.time` patterns already said to be wrong on this layer. */
+  _timeWarned = /* @__PURE__ */ new Set();
   /** A gradient fill for the text (`fillGradient`, static or animated): rebuilt as a FillGradient on each change (the text is re-rasterised). */
   _grad = null;
   _fillGradient = null;
@@ -2886,7 +2923,7 @@ var TextSequence = class extends Sequence {
   }
   /** Rewrite the displayed string from the template, the current `value` and `visibleChars`. */
   _refreshText() {
-    let next = this._template.includes("{value}") ? this._template.split("{value}").join(formatValue(this._counters.value, this.spec.format)) : this._template;
+    let next = this._template.includes("{value}") ? this._template.split("{value}").join(formatValue(this._counters.value, this.spec.format, this._timeWarned)) : this._template;
     if (this._typed) next = Array.from(next).slice(0, Math.max(0, Math.floor(this._counters.visibleChars))).join("");
     if (next === this._lastText) return;
     this._lastText = next;
@@ -2902,6 +2939,11 @@ var TextSequence = class extends Sequence {
       label: this.spec.name
     });
     text.cullable = true;
+    if (this.spec.resolution !== void 0) {
+      const r = this.spec.resolution;
+      if (typeof r === "number" && r >= 1 && r <= 8) text.resolution = r;
+      else console.warn(`pixi-effects: ${describeLayer(this.spec)}: resolution must be a number from 1 to 8 (the text is drawn at that many times the pixels), got ${JSON.stringify(r)}: ignored`);
+    }
     this.target = text;
     this.intrinsicWidth = text.width;
     this.intrinsicHeight = text.height;
@@ -2926,6 +2968,8 @@ var TextSequence = class extends Sequence {
       this.intrinsicWidth = text.width;
       this.intrinsicHeight = text.height;
     }
+    const startFill = initialProps.fill;
+    if (typeof startFill === "string" || typeof startFill === "number") text.style.fill = startFill;
     validateGradientKeyframes(this.spec, describeLayer(this.spec), void 0, "text");
     const gradientSpec = this.spec.fillGradient ?? initialProps.fillGradient;
     if (gradientSpec) {
@@ -3730,7 +3774,7 @@ function resolveSpansStyle(style, scope, who, warn = defaultWarn) {
   }
   return out;
 }
-var TEXT_ONLY = ["type", "spans", "text", "style", "format", "colorSpace", "fillGradient", "initial", "keyframes"];
+var TEXT_ONLY = ["type", "spans", "text", "style", "format", "colorSpace", "fillGradient", "initial", "keyframes", "resolution"];
 var NOT_FOR_A_GROUP = ["fill", "text", "value", "fillGradient"];
 function expandSpans(spec, warn = defaultWarn, scope) {
   const who = describeLayer(spec);
@@ -3775,7 +3819,9 @@ function expandSpans(spec, warn = defaultWarn, scope) {
     name: `${baseName}.${i}`,
     text: p.text,
     style: { ...style, ...p.style },
-    initial: { x: p.x, y: p.y, ...typed ? { visibleChars: p.length } : {} }
+    initial: { x: p.x, y: p.y, ...typed ? { visibleChars: p.length } : {} },
+    ...s.resolution !== void 0 ? { resolution: s.resolution } : {}
+    // the pieces are what is drawn
   }));
   const rest = {};
   for (const [k, v] of Object.entries(s)) if (!TEXT_ONLY.includes(k)) rest[k] = v;
@@ -3783,9 +3829,15 @@ function expandSpans(spec, warn = defaultWarn, scope) {
   spansMeta.set(group, { typed, pieces: drawn.map((p) => ({ start: p.start, length: p.length })), preview: layout.pieces.map((p, i) => (i > 0 && p.line !== layout.pieces[i - 1].line ? " " : "") + p.text).join("") });
   return group;
 }
+var ORIGINAL_SCALE_MODE = /* @__PURE__ */ new WeakMap();
 var ImageSequence = class extends Sequence {
   async build() {
     const texture = await Assets.get(this.spec.asset);
+    const source = texture.source;
+    if (source && !ORIGINAL_SCALE_MODE.has(source)) ORIGINAL_SCALE_MODE.set(source, source.scaleMode);
+    const mode = this.spec.scaleMode;
+    if (mode !== void 0 && mode !== "nearest" && mode !== "linear") console.warn(`pixi-effects: ${describeLayer(this.spec)}: scaleMode "${String(mode)}" is not "nearest" or "linear": ignored`);
+    if (source) source.scaleMode = mode === "nearest" || mode === "linear" ? mode : ORIGINAL_SCALE_MODE.get(source);
     const sprite = new Sprite({ texture, label: this.spec.name });
     sprite.cullable = true;
     this.target = sprite;
@@ -4642,6 +4694,21 @@ function slice(line, a, b) {
   }
   return out;
 }
+function splitEvenOdd(d) {
+  const parts = d.split(/(?=[Mm])/).map((x) => x.trim()).filter(Boolean);
+  if (parts.length < 2) return { main: d.trim(), holes: [] };
+  const area = (sub2) => flattenSvgPath(sub2).reduce((sum, line) => {
+    let a = 0;
+    for (let i = 0; i < line.pts.length; i += 2) {
+      const j = (i + 2) % line.pts.length;
+      a += line.pts[i] * line.pts[j + 1] - line.pts[j] * line.pts[i + 1];
+    }
+    return sum + Math.abs(a) / 2;
+  }, 0);
+  const areas = parts.map(area);
+  const big = areas.indexOf(Math.max(...areas));
+  return { main: parts[big], holes: parts.filter((_, i) => i !== big) };
+}
 
 // src/sequences/morphPath.ts
 function resample(line, n) {
@@ -4704,6 +4771,11 @@ function buildMorph(from, to, n = 128) {
   for (let i = 0; i < count; i++) {
     const fa = from[i], fb = to[i];
     const closed = (fa?.closed ?? fb.closed) && (fb?.closed ?? fa.closed);
+    if (fa && fb && fa.closed === fb.closed && fa.pts.length === fb.pts.length && fa.pts.length >= 6) {
+      const a2 = [...fa.pts];
+      pairs.push({ a: a2, b: closed ? align(a2, [...fb.pts]) : [...fb.pts], closed });
+      continue;
+    }
     const a = fa ? resample({ pts: fa.pts, closed }, n) : collapsed(resample({ pts: fb.pts, closed }, n));
     let b = fb ? resample({ pts: fb.pts, closed }, n) : collapsed(a);
     if (closed && fa && fb) b = align(a, b);
@@ -4787,6 +4859,8 @@ var ShapeSequence = class extends Sequence {
     const morph = this._setupMorph();
     this._drawGeometry = makeDrawGeometry(this.spec, scope, this._state, morph);
     this._outline = makeOutline(this.spec, scope, this._state, morph);
+    const eo = this.spec.shape === "path" && this.spec.fillRule === "evenodd" && !morph ? splitEvenOdd(this.spec.d) : null;
+    this._evenOdd = eo && eo.holes.length > 0 ? eo : null;
     const { trimStart, trimEnd } = this._state;
     this._state.trimStart = 0;
     this._state.trimEnd = 1;
@@ -4852,6 +4926,27 @@ var ShapeSequence = class extends Sequence {
   _painter = null;
   _gradDirty = false;
   _outline = null;
+  /** fillRule 'evenodd' on a path: the shape and the sub-paths cut out of it after it is filled (null: not used). */
+  _evenOdd = null;
+  /**
+   * fillRule 'evenodd': the shape is filled, each hole is cut out of that fill, and the stroke goes round the shape and every hole. (PIXI's `cut()` only reaches the
+   * LAST instruction, so it has to come between the fill and the stroke.)
+   */
+  _fillWithHoles(g) {
+    const s = this._state, { main, holes } = this._evenOdd;
+    applyFill(g, s);
+    for (const hole of holes) {
+      g.beginPath();
+      g.path(new GraphicsPath(hole));
+      g.cut();
+    }
+    if (s.strokeColor !== void 0 && s.strokeWidth > 0) {
+      g.beginPath();
+      g.path(new GraphicsPath(main));
+      for (const hole of holes) g.path(new GraphicsPath(hole));
+      applyStroke(g, s);
+    }
+  }
   _redraw() {
     const graphics = this.target;
     const s = this._state;
@@ -4863,6 +4958,10 @@ var ShapeSequence = class extends Sequence {
     const trimmed = (s.trimStart ?? 0) > 0 || (s.trimEnd ?? 1) < 1;
     if (!trimmed || !this._outline || !(s.strokeColor !== void 0 && s.strokeWidth > 0)) {
       this._drawGeometry(graphics);
+      if (this._evenOdd) {
+        this._fillWithHoles(graphics);
+        return;
+      }
       applyState(graphics, s);
       return;
     }
@@ -5086,8 +5185,9 @@ function makePolygonDraw(spec, scope) {
   };
 }
 function makePathDraw(spec) {
+  const d = spec.fillRule === "evenodd" ? splitEvenOdd(spec.d).main : spec.d;
   return (g) => {
-    g.path(new GraphicsPath(spec.d));
+    g.path(new GraphicsPath(d));
   };
 }
 var STATE_DRAWERS = {
@@ -5623,13 +5723,13 @@ function resolveDim(v, scope) {
 var _CompositionSequence = null;
 async function getCompositionSequence() {
   if (!_CompositionSequence) {
-    _CompositionSequence = (await import('./Composition-NDXKQHB4.js')).CompositionSequence;
+    _CompositionSequence = (await import('./Composition-BMRCE5FH.js')).CompositionSequence;
   }
   return _CompositionSequence;
 }
 var _SpansSequence = null;
 async function getSpansSequence() {
-  if (!_SpansSequence) _SpansSequence = (await import('./Spans-QHHWC2PB.js')).SpansSequence;
+  if (!_SpansSequence) _SpansSequence = (await import('./Spans-MWP2FX3T.js')).SpansSequence;
   return _SpansSequence;
 }
 var staticTypes = {
@@ -5675,5 +5775,5 @@ async function buildSequenceTree(specs, parent, root) {
 }
 
 export { CameraSequence, DEFAULT_FOV, DEG3 as DEG, EXPRESSION_NAMES, FALLOFFS, LIGHT_KINDS, LIGHT_PROPS, LightSequence, MANY_BLURRED, MAX_BLUR, MAX_CASTERS, MAX_LIGHTS, MIN_BLUR, NEAR, NullSequence, SHADOW_TAPS, Sequence, TextSequence, bindClock, bindCounterKeyframes, blurRadius, buildScope, buildSequenceTree, cameraBasis, checkEase, clockTable, contentLength, createTimeline, ensureFilterLibrary, evaluateExpr, flattenSvgPath, focusProblems, homeCamera, homeDistance, layerInitialZ, layerToWorld, lengthen, lightLevel, noise, packLights, parseEase, parseSpring, projectLayer, projectPoint, rand, random, registerSequenceType, remapOf, resolveAt, resolveNumber, spansMeta, springDuration, timeRemapOf };
-//# sourceMappingURL=chunk-Y253JQOH.js.map
-//# sourceMappingURL=chunk-Y253JQOH.js.map
+//# sourceMappingURL=chunk-G3DX65HO.js.map
+//# sourceMappingURL=chunk-G3DX65HO.js.map