pixi-effects 0.3.0 → 0.4.0

package/dist/index.d.cts

@@ -1,7 +1,7 @@
-export { C as ContactSheetOptions, F as FrameEvent, I as InspectOptions, a as InspectReport, L as LayerInfo, M as Movie, b as MovieOptions, P as ProgressEvent, R as RenderOptions, S as SnapshotOptions } from './Movie-W8ISiEBB.cjs';
-import { S as Sequence } from './Base-BDw6dKRB.cjs';
-import { S as SequenceSpec, C as CompositionShape, I as ImageSequenceSpec, a as CameraSequenceSpec, b as SequenceCommon } from './types-3c8Vymgw.cjs';
-export { A as AssetSpec, c as AudioSequenceSpec, d as ChromaKeyFilterSpec, e as CircleShapeSpec, f as CompositionSequenceSpec, g as CompositionSpec, h as CrossfadeTransition, i as CustomFilterSpec, D as DipTransition, j as DissolveTransition, E as EllipseShapeSpec, k as Expr, F as FilterSpec, G as GradientSpec, l as IrisTransition, K as Keyframe, L as LineShapeSpec, P as PathShapeSpec, m as PolygonShapeSpec, n as PropValue, o as Props, R as RectShapeSpec, p as ShapeSequenceSpec, q as SlideTransition, T as TextSequenceSpec, r as TransitionCommon, s as TransitionSpec, V as VideoSequenceSpec, W as WipeTransition, Z as ZoomTransition } from './types-3c8Vymgw.cjs';
+export { C as ContactSheetOptions, F as FrameEvent, I as InspectOptions, a as InspectReport, L as LayerInfo, M as Movie, b as MovieOptions, P as ProgressEvent, R as RenderOptions, S as SnapshotOptions } from './Movie-CghFXprP.cjs';
+import { S as Sequence } from './Base-5R7C5pHR.cjs';
+import { S as SequenceSpec, C as CompositionShape, I as ImageSequenceSpec, a as CameraSequenceSpec, b as SequenceCommon } from './types-CRE9WKd4.cjs';
+export { A as AssetSpec, c as AudioSequenceSpec, d as ChromaKeyFilterSpec, e as CircleShapeSpec, f as CompositionSequenceSpec, g as CompositionSpec, h as CrossfadeTransition, i as CustomFilterSpec, D as DipTransition, j as DissolveTransition, E as EllipseShapeSpec, k as Expr, F as FilterSpec, G as GradientSpec, l as IrisTransition, K as Keyframe, L as LineShapeSpec, P as PathShapeSpec, m as PolygonShapeSpec, n as PropValue, o as Props, R as RectShapeSpec, p as ShapeSequenceSpec, q as SlideTransition, T as TextSequenceSpec, r as TransitionCommon, s as TransitionSpec, V as VideoSequenceSpec, W as WipeTransition, Z as ZoomTransition } from './types-CRE9WKd4.cjs';
 import 'pixi.js';
 import 'gsap';
 

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-export { C as ContactSheetOptions, F as FrameEvent, I as InspectOptions, a as InspectReport, L as LayerInfo, M as Movie, b as MovieOptions, P as ProgressEvent, R as RenderOptions, S as SnapshotOptions } from './Movie-DMpaT67V.js';
-import { S as Sequence } from './Base-Ba4Ta4ap.js';
-import { S as SequenceSpec, C as CompositionShape, I as ImageSequenceSpec, a as CameraSequenceSpec, b as SequenceCommon } from './types-3c8Vymgw.js';
-export { A as AssetSpec, c as AudioSequenceSpec, d as ChromaKeyFilterSpec, e as CircleShapeSpec, f as CompositionSequenceSpec, g as CompositionSpec, h as CrossfadeTransition, i as CustomFilterSpec, D as DipTransition, j as DissolveTransition, E as EllipseShapeSpec, k as Expr, F as FilterSpec, G as GradientSpec, l as IrisTransition, K as Keyframe, L as LineShapeSpec, P as PathShapeSpec, m as PolygonShapeSpec, n as PropValue, o as Props, R as RectShapeSpec, p as ShapeSequenceSpec, q as SlideTransition, T as TextSequenceSpec, r as TransitionCommon, s as TransitionSpec, V as VideoSequenceSpec, W as WipeTransition, Z as ZoomTransition } from './types-3c8Vymgw.js';
+export { C as ContactSheetOptions, F as FrameEvent, I as InspectOptions, a as InspectReport, L as LayerInfo, M as Movie, b as MovieOptions, P as ProgressEvent, R as RenderOptions, S as SnapshotOptions } from './Movie-DRZtIGU7.js';
+import { S as Sequence } from './Base-DhY9oMxr.js';
+import { S as SequenceSpec, C as CompositionShape, I as ImageSequenceSpec, a as CameraSequenceSpec, b as SequenceCommon } from './types-CRE9WKd4.js';
+export { A as AssetSpec, c as AudioSequenceSpec, d as ChromaKeyFilterSpec, e as CircleShapeSpec, f as CompositionSequenceSpec, g as CompositionSpec, h as CrossfadeTransition, i as CustomFilterSpec, D as DipTransition, j as DissolveTransition, E as EllipseShapeSpec, k as Expr, F as FilterSpec, G as GradientSpec, l as IrisTransition, K as Keyframe, L as LineShapeSpec, P as PathShapeSpec, m as PolygonShapeSpec, n as PropValue, o as Props, R as RectShapeSpec, p as ShapeSequenceSpec, q as SlideTransition, T as TextSequenceSpec, r as TransitionCommon, s as TransitionSpec, V as VideoSequenceSpec, W as WipeTransition, Z as ZoomTransition } from './types-CRE9WKd4.js';
 import 'pixi.js';
 import 'gsap';
 

package/dist/index.js

@@ -1,6 +1,6 @@
-import { CompositionSequence } from './chunk-DIJG2RSF.js';
-import { homeDistance, DEFAULT_FOV, DEG, resolveAt, collectPropKeys } from './chunk-PN5A6QA7.js';
-export { registerSequenceType } from './chunk-PN5A6QA7.js';
+import { CompositionSequence } from './chunk-A574IA4F.js';
+import { homeDistance, DEFAULT_FOV, DEG, resolveAt, collectPropKeys } from './chunk-ZQX7WIYL.js';
+export { registerSequenceType } from './chunk-ZQX7WIYL.js';
 import * as PIXI from 'pixi.js';
 import { extensions, CullerPlugin, Application, Container, Rectangle, Culler, Assets, ExtensionType, Filter, UniformGroup, GpuProgram, GlProgram, defaultFilterVert } from 'pixi.js';
 import { gsap } from 'gsap';
@@ -501,6 +501,15 @@ var TransitionMaskFilter = class extends 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,
@@ -611,6 +620,9 @@ function expandTransitions(spec) {
     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);
@@ -904,10 +916,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;
@@ -929,8 +956,18 @@ function inspectScene(root, frame, time, canvas, opts = {}) {
       }
       const keys = 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 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 CompositionSequence) walk(seq, prefix + label + "/", insideThreeD || threeD, visible, group);
     });
   };
   walk(root, "", false, true);
@@ -941,7 +978,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 = [];
@@ -954,7 +991,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;
@@ -1154,6 +1194,7 @@ var Movie = class {
         duration: this.duration,
         ...userComposition
       };
+      if (userComposition) carryTransitionWindows(userComposition, rootSeqSpec);
       const composition = new CompositionSequence(rootSeqSpec, null, rootShape);
       await composition.build();
       this._rootSequence = composition;
@@ -1261,6 +1302,7 @@ var Movie = class {
   _renderNow() {
     const app = this.app;
     if (!app?.renderer) return;
+    this._rootSequence?.syncFrame();
     Culler.shared.cull(app.stage, app.renderer.screen, false);
     app.renderer.render({ container: app.stage });
   }