pixi-effects 0.3.0 → 0.4.0

package/dist/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunkZL262ZRM_cjs = require('./chunk-ZL262ZRM.cjs');
-var chunkSIRVULFF_cjs = require('./chunk-SIRVULFF.cjs');
+var chunkQGBOC5YL_cjs = require('./chunk-QGBOC5YL.cjs');
+var chunk6BQ6IEW2_cjs = require('./chunk-6BQ6IEW2.cjs');
 var PIXI = require('pixi.js');
 var gsap = require('gsap');
 var PixiPlugin = require('gsap/PixiPlugin');
@@ -521,6 +521,15 @@ var TransitionMaskFilter = class extends PIXI.Filter {
 };
 
 // src/core/Transitions.ts
+var windows = /* @__PURE__ */ new WeakMap();
+function transitionWindowsOf(spec) {
+  return windows.get(spec) ?? [];
+}
+function carryTransitionWindows(from, to) {
+  const w = windows.get(from);
+  if (w) windows.set(to, w);
+  return to;
+}
 function expandTransitions(spec) {
   const out = {
     ...spec,
@@ -617,20 +626,23 @@ function expandTransitions(spec) {
     if (toUses > 1) {
       throw new Error(`pixi-effects: ${tag} sequence "${t.to}" is used as \`to\` in more than one transition`);
     }
-    const tStart = chunkSIRVULFF_cjs.resolveAt(t.at, parentDuration);
+    const tStart = chunk6BQ6IEW2_cjs.resolveAt(t.at, parentDuration);
     const tEnd = tStart + t.duration;
     const fromSeq = fromEntry.seq;
-    const fromStart = chunkSIRVULFF_cjs.resolveAt(fromSeq.at, parentDuration);
+    const fromStart = chunk6BQ6IEW2_cjs.resolveAt(fromSeq.at, parentDuration);
     const fromEnd = fromStart + (fromSeq.duration ?? parentDuration);
     if (tStart < fromStart || tEnd > fromEnd) {
       throw new Error(`pixi-effects: ${tag} window [${tStart}, ${tEnd}] is not covered by \`from\` "${t.from}" (lives [${fromStart}, ${fromEnd}], so it ends at ${fromEnd})`);
     }
     const toSeq = toEntry.seq;
-    const toStart = chunkSIRVULFF_cjs.resolveAt(toSeq.at, parentDuration);
+    const toStart = chunk6BQ6IEW2_cjs.resolveAt(toSeq.at, parentDuration);
     const toEnd = toStart + (toSeq.duration ?? parentDuration);
     if (tStart < toStart || tEnd > toEnd) {
       throw new Error(`pixi-effects: ${tag} window [${tStart}, ${tEnd}] is not covered by \`to\` "${t.to}" (lives [${toStart}, ${toEnd}], so it starts at ${toStart})`);
     }
+    const record = windows.get(out) ?? [];
+    record.push({ from: t.from, to: t.to, start: tStart, end: tEnd });
+    windows.set(out, record);
     const abs = { ...t, at: tStart };
     const nFrom = keyframeCount(fromEntry.seq);
     const nTo = keyframeCount(toEntry.seq);
@@ -924,10 +936,25 @@ var intersection = (a, b) => {
   const h = Math.min(a.y + a.height, b.y + b.height) - Math.max(a.y, b.y);
   return w > 0 && h > 0 ? w * h : 0;
 };
+var clip = (a, b) => {
+  const x = Math.max(a.x, b.x), y = Math.max(a.y, b.y);
+  const w = Math.min(a.x + a.width, b.x + b.width) - x, h = Math.min(a.y + a.height, b.y + b.height) - y;
+  return w > 0 && h > 0 ? { x, y, width: w, height: h } : null;
+};
 function inspectScene(root, frame, time, canvas, opts = {}) {
   const layers = [];
   const view = { x: 0, y: 0, width: canvas.width, height: canvas.height };
-  const walk = (comp, prefix, insideThreeD, parentVisible) => {
+  const seen = /* @__PURE__ */ new Map();
+  const scene = /* @__PURE__ */ new Map();
+  const walk = (comp, prefix, insideThreeD, parentVisible, parentScene) => {
+    const blending = /* @__PURE__ */ new Set();
+    for (const w of transitionWindowsOf(comp.spec)) {
+      const start = (comp.absoluteStart ?? 0) + w.start, end = (comp.absoluteStart ?? 0) + w.end;
+      if (time >= start - 1e-9 && time <= end + 1e-9) {
+        blending.add(w.from);
+        blending.add(w.to);
+      }
+    }
     comp.layers().forEach(({ seq, display, threeD }, i) => {
       const t = seq.target;
       const name = seq.spec.name;
@@ -947,10 +974,20 @@ function inspectScene(root, frame, time, canvas, opts = {}) {
         onCanvas = inter === 0 && area > 0 ? "none" : inter >= area - 1e-6 ? "full" : "partial";
         if (area === 0) onCanvas = "none";
       }
-      const keys = chunkSIRVULFF_cjs.collectPropKeys(seq.spec);
+      const keys = chunk6BQ6IEW2_cjs.collectPropKeys(seq.spec);
       const moving = (seq.spec.keyframes ?? []).length > 0 && (keys.has("x") || keys.has("y"));
-      layers.push({ path: prefix + label, name, type: seq.spec.type, threeD, visible, alpha, moving, bounds, onCanvas });
-      if (seq instanceof chunkZL262ZRM_cjs.CompositionSequence) walk(seq, prefix + label + "/", insideThreeD || threeD, visible);
+      const info = { path: prefix + label, name, type: seq.spec.type, threeD, visible, alpha, moving, bounds, onCanvas };
+      layers.push(info);
+      let shown = bounds ? clip(bounds, view) : null;
+      const maskTarget = seq.maskSequence?.target;
+      if (shown && maskTarget && !seq.spec.maskInverted) {
+        const m = maskTarget.getBounds();
+        shown = clip(shown, { x: m.x, y: m.y, width: m.width, height: m.height });
+      }
+      seen.set(info, shown);
+      const group = parentScene ?? (name !== void 0 && blending.has(name) ? name : void 0);
+      if (group) scene.set(info, group);
+      if (seq instanceof chunkQGBOC5YL_cjs.CompositionSequence) walk(seq, prefix + label + "/", insideThreeD || threeD, visible, group);
     });
   };
   walk(root, "", false, true);
@@ -961,7 +998,7 @@ function inspectScene(root, frame, time, canvas, opts = {}) {
     const who = `text layer "${l.path}"`;
     if (b.width < 1 || b.height < 1) {
       issues.push(`${who} has no size (empty text, or not drawn yet)`);
-    } else if (l.moving) ; else if (l.onCanvas === "none") {
+    } else if (l.moving || scene.has(l)) ; else if (l.onCanvas === "none") {
       issues.push(`${who} is entirely outside the canvas (at ${Math.round(b.x)},${Math.round(b.y)}, ${Math.round(b.width)}\xD7${Math.round(b.height)})`);
     } else if (l.onCanvas === "partial") {
       const over = [];
@@ -974,7 +1011,10 @@ function inspectScene(root, frame, time, canvas, opts = {}) {
   }
   for (let i = 0; i < texts.length; i++) {
     for (let j = i + 1; j < texts.length; j++) {
-      const a = texts[i].bounds, b = texts[j].bounds;
+      const a = seen.get(texts[i]), b = seen.get(texts[j]);
+      if (!a || !b) continue;
+      const sa = scene.get(texts[i]), sb = scene.get(texts[j]);
+      if (sa && sb && sa !== sb) continue;
       const smaller = Math.min(a.width * a.height, b.width * b.height);
       if (smaller <= 0) continue;
       const share = intersection(a, b) / smaller;
@@ -1174,7 +1214,8 @@ var Movie = class {
         duration: this.duration,
         ...userComposition
       };
-      const composition = new chunkZL262ZRM_cjs.CompositionSequence(rootSeqSpec, null, rootShape);
+      if (userComposition) carryTransitionWindows(userComposition, rootSeqSpec);
+      const composition = new chunkQGBOC5YL_cjs.CompositionSequence(rootSeqSpec, null, rootShape);
       await composition.build();
       this._rootSequence = composition;
       if (composition.target) root.addChild(composition.target);
@@ -1281,6 +1322,7 @@ var Movie = class {
   _renderNow() {
     const app = this.app;
     if (!app?.renderer) return;
+    this._rootSequence?.syncFrame();
     PIXI.Culler.shared.cull(app.stage, app.renderer.screen, false);
     app.renderer.render({ container: app.stage });
   }
@@ -1549,17 +1591,17 @@ function orbit(opts) {
     throw new Error("pixi-effects: orbit() cannot combine `radius` with `dollyZoom` \u2014 the radius follows the animated fov");
   }
   const [cx, cy] = opts.center ?? [width / 2, height / 2];
-  const fixedR = opts.radius ?? chunkSIRVULFF_cjs.homeDistance(height, fov ?? chunkSIRVULFF_cjs.DEFAULT_FOV);
+  const fixedR = opts.radius ?? chunk6BQ6IEW2_cjs.homeDistance(height, fov ?? chunk6BQ6IEW2_cjs.DEFAULT_FOV);
   const start = opts.start ?? -degrees / 2;
   const steps = Math.max(1, Math.round(duration * stepsPerSecond));
   const easeFn = parseEase(ease);
   const dollyEase = dolly ? parseEase(dolly.ease ?? ease) : null;
   const pos = (i) => {
     const p = i / steps;
-    const a = (start + degrees * easeFn(p)) * chunkSIRVULFF_cjs.DEG;
+    const a = (start + degrees * easeFn(p)) * chunk6BQ6IEW2_cjs.DEG;
     if (!dolly) return { x: cx + fixedR * Math.sin(a), z: fixedR * Math.cos(a) };
     const f = dolly.from + (dolly.to - dolly.from) * dollyEase(p);
-    const R = chunkSIRVULFF_cjs.homeDistance(height, f);
+    const R = chunk6BQ6IEW2_cjs.homeDistance(height, f);
     return { x: cx + R * Math.sin(a), z: R * Math.cos(a), fov: f };
   };
   const keyframes = [];
@@ -1608,7 +1650,7 @@ function withFade(spec, opts) {
 
 Object.defineProperty(exports, "registerSequenceType", {
   enumerable: true,
-  get: function () { return chunkSIRVULFF_cjs.registerSequenceType; }
+  get: function () { return chunk6BQ6IEW2_cjs.registerSequenceType; }
 });
 exports.Movie = Movie;
 exports.kenBurns = kenBurns;