pixi-effects 0.38.1 → 0.40.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +28 -0
- package/README.md +16 -30
- package/ai/chat-template.html +3 -3
- package/ai/tools/check.mjs +109 -13
- package/ai/tools/gltfProbe.mjs +122 -0
- package/ai/tools/media.mjs +129 -10
- package/ai/tools/pixi-effects.mjs +1 -1
- package/ai/tools/render.mjs +34 -8
- package/dist/{Base-BKKwxavW.d.cts → Base-DQWIJ6bJ.d.cts} +1 -1
- package/dist/{Base-ioh_AjLB.d.ts → Base-Jgkud1Aw.d.ts} +1 -1
- package/dist/Composition-C3UEVHQG.cjs +16 -0
- package/dist/{Composition-23KGIJX4.cjs.map → Composition-C3UEVHQG.cjs.map} +1 -1
- package/dist/Composition-KRWH72MA.js +7 -0
- package/dist/{Composition-5SQXSZNA.js.map → Composition-KRWH72MA.js.map} +1 -1
- package/dist/Controller.d.cts +2 -2
- package/dist/Controller.d.ts +2 -2
- package/dist/{Movie-BtwFI2ne.d.ts → Movie-CG6Jy1tx.d.ts} +6 -1
- package/dist/{Movie-CSWUTnMd.d.cts → Movie-CMq4KFmc.d.cts} +6 -1
- package/dist/{Spans-WJFPHMSQ.cjs → Spans-APNJHCYO.cjs} +9 -9
- package/dist/{Spans-WJFPHMSQ.cjs.map → Spans-APNJHCYO.cjs.map} +1 -1
- package/dist/{Spans-4IBQASGK.js → Spans-TWO4VN5H.js} +4 -4
- package/dist/{Spans-4IBQASGK.js.map → Spans-TWO4VN5H.js.map} +1 -1
- package/dist/{chunk-4CSL5QSL.js → chunk-26Z544SH.js} +24 -13
- package/dist/chunk-26Z544SH.js.map +1 -0
- package/dist/{chunk-FE42PKHP.cjs → chunk-27PYJ4JY.cjs} +83 -72
- package/dist/chunk-27PYJ4JY.cjs.map +1 -0
- package/dist/{chunk-7NXKBRT7.cjs → chunk-7EI2N7WO.cjs} +27 -7
- package/dist/{chunk-7NXKBRT7.cjs.map → chunk-7EI2N7WO.cjs.map} +1 -1
- package/dist/{chunk-XOCRS5MW.js → chunk-CT5CZVT5.js} +15 -8
- package/dist/chunk-CT5CZVT5.js.map +1 -0
- package/dist/{chunk-KNMDDUA3.cjs → chunk-LEL7UNYQ.cjs} +50 -43
- package/dist/chunk-LEL7UNYQ.cjs.map +1 -0
- package/dist/{chunk-UDTLYYGY.js → chunk-LMWXR5OC.js} +27 -7
- package/dist/{chunk-UDTLYYGY.js.map → chunk-LMWXR5OC.js.map} +1 -1
- package/dist/index.cjs +33 -33
- package/dist/index.d.cts +4 -4
- package/dist/index.d.ts +4 -4
- package/dist/index.js +3 -3
- package/dist/loader.css +1 -1
- package/dist/present.cjs +3 -3
- package/dist/present.d.cts +2 -2
- package/dist/present.d.ts +2 -2
- package/dist/present.js +3 -3
- package/dist/three.cjs +505 -12
- package/dist/three.cjs.map +1 -1
- package/dist/three.d.cts +139 -7
- package/dist/three.d.ts +139 -7
- package/dist/three.js +501 -10
- package/dist/three.js.map +1 -1
- package/dist/{types-BXi-0iZS.d.cts → types-DIh93lFb.d.cts} +82 -1
- package/dist/{types-BXi-0iZS.d.ts → types-DIh93lFb.d.ts} +82 -1
- package/docs/api.md +21 -11
- package/docs/dsl.md +73 -5
- package/docs/media.md +17 -2
- package/llms-full.txt +188 -23
- package/llms.txt +1 -1
- package/package.json +11 -12
- package/skills/pixi-effects/SKILL.md +5 -3
- package/skills/pixi-effects/reference/cheatsheet.md +2 -2
- package/skills/pixi-effects/reference/pitfalls.md +1 -0
- package/skills/pixi-effects/reference/recipes.md +69 -0
- package/skills/pixi-effects/template.html +9 -8
- package/dist/Composition-23KGIJX4.cjs +0 -16
- package/dist/Composition-5SQXSZNA.js +0 -7
- package/dist/chunk-4CSL5QSL.js.map +0 -1
- package/dist/chunk-FE42PKHP.cjs.map +0 -1
- package/dist/chunk-KNMDDUA3.cjs.map +0 -1
- package/dist/chunk-XOCRS5MW.js.map +0 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var chunk7EI2N7WO_cjs = require('./chunk-7EI2N7WO.cjs');
|
|
4
4
|
var chunkJN7JHNZR_cjs = require('./chunk-JN7JHNZR.cjs');
|
|
5
5
|
var chunk3SAS3ZE5_cjs = require('./chunk-3SAS3ZE5.cjs');
|
|
6
6
|
var chunkTWZNOUM7_cjs = require('./chunk-TWZNOUM7.cjs');
|
|
@@ -33,10 +33,10 @@ var KIND_ALIASES = {
|
|
|
33
33
|
fill: "ambient"
|
|
34
34
|
};
|
|
35
35
|
function lightKindProblem(kind) {
|
|
36
|
-
if (kind === void 0 || typeof kind === "string" &&
|
|
37
|
-
const guess = typeof kind === "string" ? KIND_ALIASES[kind.toLowerCase()] ?? chunkTWZNOUM7_cjs.suggestName(kind,
|
|
36
|
+
if (kind === void 0 || typeof kind === "string" && chunk7EI2N7WO_cjs.LIGHT_KINDS.includes(kind)) return null;
|
|
37
|
+
const guess = typeof kind === "string" ? KIND_ALIASES[kind.toLowerCase()] ?? chunkTWZNOUM7_cjs.suggestName(kind, chunk7EI2N7WO_cjs.LIGHT_KINDS) : null;
|
|
38
38
|
const shown = typeof kind === "string" ? `"${kind}"` : String(kind);
|
|
39
|
-
return `kind ${shown} is not a light kind${guess ? `; did you mean "${guess}"?` : ""} (use ${
|
|
39
|
+
return `kind ${shown} is not a light kind${guess ? `; did you mean "${guess}"?` : ""} (use ${chunk7EI2N7WO_cjs.LIGHT_KINDS.join(", ")}); point is used`;
|
|
40
40
|
}
|
|
41
41
|
var LIGHT_ALIASES = {
|
|
42
42
|
pointOfInterest: 'did you mean "lookAtX / lookAtY / lookAtZ"?',
|
|
@@ -61,24 +61,24 @@ function lightLayerProblems(spec) {
|
|
|
61
61
|
const raw = spec;
|
|
62
62
|
const kind = lightKindProblem(raw.kind);
|
|
63
63
|
if (kind) out.push(kind);
|
|
64
|
-
if (raw.falloff !== void 0 && !
|
|
65
|
-
const guess = typeof raw.falloff === "string" ? chunkTWZNOUM7_cjs.suggestName(raw.falloff,
|
|
66
|
-
out.push(`falloff ${JSON.stringify(raw.falloff)} is not supported${guess ? `; did you mean "${guess}"?` : ""} (use ${
|
|
64
|
+
if (raw.falloff !== void 0 && !chunk7EI2N7WO_cjs.FALLOFFS.includes(raw.falloff)) {
|
|
65
|
+
const guess = typeof raw.falloff === "string" ? chunkTWZNOUM7_cjs.suggestName(raw.falloff, chunk7EI2N7WO_cjs.FALLOFFS) : null;
|
|
66
|
+
out.push(`falloff ${JSON.stringify(raw.falloff)} is not supported${guess ? `; did you mean "${guess}"?` : ""} (use ${chunk7EI2N7WO_cjs.FALLOFFS.join(", ")}); none is used`);
|
|
67
67
|
}
|
|
68
68
|
for (const k of Object.keys(raw)) {
|
|
69
|
-
if (
|
|
69
|
+
if (chunk7EI2N7WO_cjs.LIGHT_PROPS.includes(k) || k === "intensity" || k === "shadowDarkness" || k === "shadowDiffusion") {
|
|
70
70
|
out.push(`"${k}" must go inside initial / keyframes, not on the light itself`);
|
|
71
71
|
} else if (LIGHT_ALIASES[k]) out.push(`"${k}" is not a property \u2014 ${LIGHT_ALIASES[k]}`);
|
|
72
72
|
}
|
|
73
73
|
const explained = new Set(Object.keys(LIGHT_ALIASES));
|
|
74
74
|
for (const k of chunk3SAS3ZE5_cjs.collectPropKeys(spec)) {
|
|
75
75
|
if (LIGHT_ALIASES[k]) out.push(`"${k}" is not a property \u2014 ${LIGHT_ALIASES[k]}`);
|
|
76
|
-
else if (!explained.has(k) && !
|
|
76
|
+
else if (!explained.has(k) && !chunk7EI2N7WO_cjs.LIGHT_PROPS.includes(k)) out.push(`"${k}" has no effect on a light (use ${chunk7EI2N7WO_cjs.LIGHT_PROPS.join(", ")})`);
|
|
77
77
|
}
|
|
78
78
|
if (numbersOf(spec, "coneFeather").some((v) => v > 1 || v < 0)) out.push("coneFeather is 0..1 (the soft part of the cone edge, as a fraction of the half angle); it is clamped");
|
|
79
79
|
const big = numbersOf(spec, "intensity").find((v) => v > 10);
|
|
80
80
|
if (big !== void 0) out.push(`intensity ${big} looks like a percentage: it is a multiplier (1 = full, 0.25 = a quarter); did you mean ${big / 100}?`);
|
|
81
|
-
const kindNow = typeof raw.kind === "string" &&
|
|
81
|
+
const kindNow = typeof raw.kind === "string" && chunk7EI2N7WO_cjs.LIGHT_KINDS.includes(raw.kind) ? raw.kind : "point";
|
|
82
82
|
const has = (...keys) => keys.filter((k) => bagsOf(spec).some((b) => b[k] !== void 0));
|
|
83
83
|
const falloffOn = raw.falloff === "smooth" || raw.falloff === "inverseSquare";
|
|
84
84
|
if (kindNow === "ambient" && raw.castsShadows) out.push("an ambient light has no direction, so it makes no shadow: castsShadows is ignored (put it on a point, spot or parallel light)");
|
|
@@ -106,17 +106,18 @@ function lightSetProblems(layers) {
|
|
|
106
106
|
out.push("there is no ambient light, so what no light reaches is black; add { type: 'light', kind: 'ambient', initial: { intensity: 0.25 } }");
|
|
107
107
|
}
|
|
108
108
|
const direct = lights.filter((l) => kindOf(l) !== "ambient");
|
|
109
|
-
if (direct.length >
|
|
110
|
-
const dropped = direct.slice(
|
|
111
|
-
out.push(`${direct.length} lights, but at most ${
|
|
109
|
+
if (direct.length > chunk7EI2N7WO_cjs.MAX_LIGHTS) {
|
|
110
|
+
const dropped = direct.slice(chunk7EI2N7WO_cjs.MAX_LIGHTS).map((l) => nameOf(l, layers.indexOf(l)));
|
|
111
|
+
out.push(`${direct.length} lights, but at most ${chunk7EI2N7WO_cjs.MAX_LIGHTS} are used (the first ${chunk7EI2N7WO_cjs.MAX_LIGHTS}, in layer order); ${dropped.join(", ")} and later are dropped. Use fewer lights`);
|
|
112
112
|
}
|
|
113
113
|
const lightsCast = lights.some((l) => kindOf(l) !== "ambient" && l.castsShadows);
|
|
114
114
|
const casters = layers.filter((l) => l.type !== "light" && l.castsShadows && l.threeD);
|
|
115
115
|
if (casters.length > 0 && !lightsCast) out.push(`${casters.length} layer${casters.length > 1 ? "s have" : " has"} castsShadows but no light has castsShadows: add castsShadows: true to the light that should make the shadows`);
|
|
116
|
-
|
|
117
|
-
if (lightsCast && casters.length
|
|
118
|
-
|
|
119
|
-
|
|
116
|
+
const hostsThree = layers.some((l) => l.type === "three" && l.followLights);
|
|
117
|
+
if (lightsCast && casters.length === 0 && !hostsThree) out.push("a light has castsShadows but no layer has castsShadows: add castsShadows: true to the threeD layers that should cast a shadow");
|
|
118
|
+
if (lightsCast && casters.length > chunk7EI2N7WO_cjs.MAX_CASTERS) {
|
|
119
|
+
const dropped = casters.slice(chunk7EI2N7WO_cjs.MAX_CASTERS).map((c) => nameOf(c, layers.indexOf(c)));
|
|
120
|
+
out.push(`${casters.length} layers cast shadows, but a layer receives shadows from at most ${chunk7EI2N7WO_cjs.MAX_CASTERS} (the first ${chunk7EI2N7WO_cjs.MAX_CASTERS}, in layer order); ${dropped.join(", ")} and later cast none`);
|
|
120
121
|
}
|
|
121
122
|
const softLights = lights.filter((l) => l.castsShadows && numbersOf(l, "shadowDiffusion").some((v) => v > 0));
|
|
122
123
|
if (softLights.length >= SOFT_LIGHTS) {
|
|
@@ -301,9 +302,9 @@ var roundPixelsBit = {
|
|
|
301
302
|
name: "round-pixels-bit",
|
|
302
303
|
vertex: { header: `fn roundPixels(position: vec2<f32>, targetSize: vec2<f32>) -> vec2<f32> { return (floor(((position * 0.5 + 0.5) * targetSize) + 0.5) / targetSize) * 2.0 - 1.0; }` }
|
|
303
304
|
};
|
|
304
|
-
var ML =
|
|
305
|
-
var MC =
|
|
306
|
-
var TAPS =
|
|
305
|
+
var ML = chunk7EI2N7WO_cjs.MAX_LIGHTS;
|
|
306
|
+
var MC = chunk7EI2N7WO_cjs.MAX_CASTERS;
|
|
307
|
+
var TAPS = chunk7EI2N7WO_cjs.SHADOW_TAPS;
|
|
307
308
|
var SHADOW_KEYS = Array.from({ length: MC }, (_, j) => `uShadow${j}`);
|
|
308
309
|
var WGSL_SHADOW_DECLS = SHADOW_KEYS.map((k, j) => ` @group(2) @binding(${4 + j}) var ${k}: texture_2d<f32>;`).join("\n");
|
|
309
310
|
var WGSL_SHADOW_PICK = SHADOW_KEYS.map((k, j) => (j === 0 ? "" : "else ") + `if (j == ${j}) { a = textureSampleLevel(${k}, uSampler, uv, 0.0).a; }`).join(" ");
|
|
@@ -663,8 +664,8 @@ function readLayerTransform(target) {
|
|
|
663
664
|
x: c.x,
|
|
664
665
|
y: c.y,
|
|
665
666
|
z: c.z ?? 0,
|
|
666
|
-
rotationX: (c.rotationX ?? 0) *
|
|
667
|
-
rotationY: (c.rotationY ?? 0) *
|
|
667
|
+
rotationX: (c.rotationX ?? 0) * chunk7EI2N7WO_cjs.DEG,
|
|
668
|
+
rotationY: (c.rotationY ?? 0) * chunk7EI2N7WO_cjs.DEG,
|
|
668
669
|
rotationZ: c.rotation,
|
|
669
670
|
scaleX: c.scale.x,
|
|
670
671
|
scaleY: c.scale.y,
|
|
@@ -727,20 +728,20 @@ var Layer3D = class {
|
|
|
727
728
|
if (!(needW >= 1 && needH >= 1) || !Number.isFinite(bounds.x) || !Number.isFinite(bounds.y)) return this.hide();
|
|
728
729
|
const size = this.sizeFor(needW, needH);
|
|
729
730
|
const frame = { x: bounds.x - pad, y: bounds.y - pad, width: size.w, height: size.h };
|
|
730
|
-
const projected =
|
|
731
|
+
const projected = chunk7EI2N7WO_cjs.projectLayer(readLayerTransform(target), frame, basis);
|
|
731
732
|
this.depth = projected.depth;
|
|
732
733
|
{
|
|
733
734
|
const lt = readLayerTransform(target);
|
|
734
|
-
const o =
|
|
735
|
-
const pu =
|
|
736
|
-
const pv =
|
|
735
|
+
const o = chunk7EI2N7WO_cjs.layerToWorld(lt, frame.x, frame.y);
|
|
736
|
+
const pu = chunk7EI2N7WO_cjs.layerToWorld(lt, frame.x + frame.width, frame.y);
|
|
737
|
+
const pv = chunk7EI2N7WO_cjs.layerToWorld(lt, frame.x, frame.y + frame.height);
|
|
737
738
|
this.world = { o, u: { x: pu.x - o.x, y: pu.y - o.y, z: pu.z - o.z }, v: { x: pv.x - o.x, y: pv.y - o.y, z: pv.z - o.z } };
|
|
738
739
|
}
|
|
739
740
|
if (!projected.visible) {
|
|
740
741
|
if (!this.warnedBehind) {
|
|
741
742
|
this.warnedBehind = true;
|
|
742
743
|
if (this.seq.spec.hideBehindCamera) return this.hide();
|
|
743
|
-
if (projected.depth >
|
|
744
|
+
if (projected.depth > chunk7EI2N7WO_cjs.NEAR) {
|
|
744
745
|
console.warn(
|
|
745
746
|
`pixi-effects: ${chunk3SAS3ZE5_cjs.describeLayer(this.seq.spec)}: part of it (a corner) reaches the camera plane (z = ${(target.z ?? 0).toFixed(0)}, rotationX ${(target.rotationX ?? 0).toFixed(0)}\xB0, rotationY ${(target.rotationY ?? 0).toFixed(0)}\xB0), and a layer is hidden whole when any corner is at or behind it. Tilt it less (rotationX / rotationY), make it smaller, or keep the camera further away from it (the default camera sits at z = (height/2)/tan(fov/2), about 989 for 720p at fov 40).`
|
|
746
747
|
);
|
|
@@ -771,7 +772,7 @@ var Layer3D = class {
|
|
|
771
772
|
*/
|
|
772
773
|
setBlur(radius) {
|
|
773
774
|
const d = this.display;
|
|
774
|
-
const r = radius >
|
|
775
|
+
const r = radius > chunk7EI2N7WO_cjs.MIN_BLUR ? Math.min(radius, chunk7EI2N7WO_cjs.MAX_BLUR) : 0;
|
|
775
776
|
this.blur = r;
|
|
776
777
|
if (r === 0) {
|
|
777
778
|
if (this.blurFilter) {
|
|
@@ -958,7 +959,7 @@ function lintSequence(spec, warn = defaultWarn) {
|
|
|
958
959
|
function lintFocus(camera, siblings, warn = defaultWarn) {
|
|
959
960
|
if (camera.type !== "camera") return;
|
|
960
961
|
const who = chunk3SAS3ZE5_cjs.describeLayer(camera);
|
|
961
|
-
for (const p of
|
|
962
|
+
for (const p of chunk7EI2N7WO_cjs.focusProblems(camera, siblings)) {
|
|
962
963
|
if (p.kind === "missing") {
|
|
963
964
|
warn(`pixi-effects: ${who}: focus: no layer named "${p.name}"${p.hint ? `; did you mean "${p.hint}"?` : ""} (the z = 0 plane is used). Write a threeD layer's name or a z number`);
|
|
964
965
|
} else if (p.kind === "not-threeD") {
|
|
@@ -1248,7 +1249,7 @@ var MatteSet = class {
|
|
|
1248
1249
|
};
|
|
1249
1250
|
|
|
1250
1251
|
// src/sequences/Composition.ts
|
|
1251
|
-
var CompositionSequence = class extends
|
|
1252
|
+
var CompositionSequence = class extends chunk7EI2N7WO_cjs.Sequence {
|
|
1252
1253
|
_innerContainer = null;
|
|
1253
1254
|
_compositionShape = null;
|
|
1254
1255
|
_children = [];
|
|
@@ -1315,11 +1316,11 @@ var CompositionSequence = class extends chunk7NXKBRT7_cjs.Sequence {
|
|
|
1315
1316
|
this.intrinsicWidth = width;
|
|
1316
1317
|
this.intrinsicHeight = height;
|
|
1317
1318
|
this._innerContainer = inner;
|
|
1318
|
-
const base =
|
|
1319
|
-
const span = base ?
|
|
1320
|
-
this._remap = base ?
|
|
1319
|
+
const base = chunk7EI2N7WO_cjs.timeRemapOf(this.spec);
|
|
1320
|
+
const span = base ? chunk7EI2N7WO_cjs.contentLength(base, this.duration) : this.duration;
|
|
1321
|
+
this._remap = base ? chunk7EI2N7WO_cjs.remapOf(this.spec, "time", span) : null;
|
|
1321
1322
|
this._contentSpan = span;
|
|
1322
|
-
this._compositionShape = { width, height, duration: span };
|
|
1323
|
+
this._compositionShape = { width, height, duration: span, spaceAt: (t) => this._spaceAt(t) };
|
|
1323
1324
|
const lateKeyframes = [];
|
|
1324
1325
|
for (const s of this.spec.sequences ?? []) {
|
|
1325
1326
|
lintSequence(s);
|
|
@@ -1334,7 +1335,7 @@ var CompositionSequence = class extends chunk7NXKBRT7_cjs.Sequence {
|
|
|
1334
1335
|
if (crowd >= chunkJN7JHNZR_cjs.MANY_ADVANCED) {
|
|
1335
1336
|
console.warn(`pixi-effects: ${chunk3SAS3ZE5_cjs.describeLayer(this.spec)}: ${crowd} layers with an advanced blendMode are on screen at once (a composition with one counts each layer inside it, since its children blend one by one); each is a full-frame pass (about 2 ms on WebGL). Put fewer layers in the blend (or draw the glow as one layer), or use add / screen / multiply`);
|
|
1336
1337
|
}
|
|
1337
|
-
this._children = await
|
|
1338
|
+
this._children = await chunk7EI2N7WO_cjs.buildSequenceTree(
|
|
1338
1339
|
this.spec.sequences ?? [],
|
|
1339
1340
|
this._compositionShape,
|
|
1340
1341
|
this.root
|
|
@@ -1345,22 +1346,22 @@ var CompositionSequence = class extends chunk7NXKBRT7_cjs.Sequence {
|
|
|
1345
1346
|
if (matteNames.size > 0) {
|
|
1346
1347
|
this._mattes = new MatteSet(inner, width, height);
|
|
1347
1348
|
for (const name of matteNames) {
|
|
1348
|
-
const source = this._children.find((c) => c.spec.name === name && !(c instanceof
|
|
1349
|
+
const source = this._children.find((c) => c.spec.name === name && !(c instanceof chunk7EI2N7WO_cjs.CameraSequence));
|
|
1349
1350
|
if (!source || !source.target || !canBeMatte(source.spec)) continue;
|
|
1350
1351
|
const chain = [];
|
|
1351
1352
|
for (let p = this._parentOf.get(source); p; p = this._parentOf.get(p)) chain.push(p);
|
|
1352
1353
|
this._mattes.add(name, source, chain);
|
|
1353
1354
|
}
|
|
1354
1355
|
}
|
|
1355
|
-
if (this._children.some((c) => c instanceof
|
|
1356
|
+
if (this._children.some((c) => c instanceof chunk7EI2N7WO_cjs.LightSequence)) {
|
|
1356
1357
|
for (const message of lightSetProblems(this.spec.sequences ?? [])) console.warn(`pixi-effects: ${chunk3SAS3ZE5_cjs.describeLayer(this.spec)}: ${message}`);
|
|
1357
1358
|
}
|
|
1358
1359
|
const layerNames = new Set(this._children.map((c) => c.spec.name).filter((n) => !!n));
|
|
1359
1360
|
for (const cam of this._children) {
|
|
1360
|
-
if (!(cam instanceof
|
|
1361
|
+
if (!(cam instanceof chunk7EI2N7WO_cjs.CameraSequence)) continue;
|
|
1361
1362
|
cam.resolveFocusNames((name) => {
|
|
1362
1363
|
const hit = this._children.find((c) => c.spec.name === name && c.spec.threeD);
|
|
1363
|
-
return hit ?
|
|
1364
|
+
return hit ? chunk7EI2N7WO_cjs.layerInitialZ(hit.spec, hit.scope()) : void 0;
|
|
1364
1365
|
}, layerNames);
|
|
1365
1366
|
}
|
|
1366
1367
|
const blendSaid = /* @__PURE__ */ new Map();
|
|
@@ -1370,11 +1371,11 @@ var CompositionSequence = class extends chunk7NXKBRT7_cjs.Sequence {
|
|
|
1370
1371
|
else blendSaid.set(message, { spec, n: 1 });
|
|
1371
1372
|
};
|
|
1372
1373
|
for (const child of this._children) {
|
|
1373
|
-
if (child instanceof
|
|
1374
|
+
if (child instanceof chunk7EI2N7WO_cjs.CameraSequence) {
|
|
1374
1375
|
this._cameras.push(child);
|
|
1375
1376
|
continue;
|
|
1376
1377
|
}
|
|
1377
|
-
if (child instanceof
|
|
1378
|
+
if (child instanceof chunk7EI2N7WO_cjs.LightSequence) {
|
|
1378
1379
|
this._lights.push(child);
|
|
1379
1380
|
continue;
|
|
1380
1381
|
}
|
|
@@ -1408,7 +1409,7 @@ var CompositionSequence = class extends chunk7NXKBRT7_cjs.Sequence {
|
|
|
1408
1409
|
if (maskSrc.kind === "inline") {
|
|
1409
1410
|
const maskSpec = maskSrc.spec;
|
|
1410
1411
|
const lifetime = maskSpec.at === void 0 ? { at: child.at, duration: maskSpec.duration ?? child.duration } : {};
|
|
1411
|
-
const built = await
|
|
1412
|
+
const built = await chunk7EI2N7WO_cjs.buildSequenceTree([{ ...maskSpec, ...lifetime }], this._compositionShape, this.root);
|
|
1412
1413
|
const maskSeq = built[0];
|
|
1413
1414
|
if (maskSeq?.target) {
|
|
1414
1415
|
child.maskSequence = maskSeq;
|
|
@@ -1447,10 +1448,10 @@ var CompositionSequence = class extends chunk7NXKBRT7_cjs.Sequence {
|
|
|
1447
1448
|
this._visual.forEach((v, i) => {
|
|
1448
1449
|
(v.layer?.display ?? v.seq.target).zIndex = i;
|
|
1449
1450
|
});
|
|
1450
|
-
} else if (this._cameras.length > 0) {
|
|
1451
|
-
console.warn("pixi-effects: camera has no effect: this composition has no threeD layers");
|
|
1451
|
+
} else if (this._cameras.length > 0 && !this._children.some((c) => c.spec.followCamera)) {
|
|
1452
|
+
console.warn("pixi-effects: camera has no effect: this composition has no threeD layers (a three layer with followCamera: true follows it)");
|
|
1452
1453
|
}
|
|
1453
|
-
if (this._layers3d.length === 0 && this._lights.length > 0) {
|
|
1454
|
+
if (this._layers3d.length === 0 && this._lights.length > 0 && !this._children.some((c) => c.spec.followLights)) {
|
|
1454
1455
|
console.warn(`pixi-effects: ${chunk3SAS3ZE5_cjs.describeLayer(this.spec)}: a light has no effect: this composition has no threeD layers (a light lights only the threeD layers of its own composition, not those of the compositions nested in it: put the light inside the composition that holds them)`);
|
|
1455
1456
|
}
|
|
1456
1457
|
this.buildFilters();
|
|
@@ -1464,9 +1465,9 @@ var CompositionSequence = class extends chunk7NXKBRT7_cjs.Sequence {
|
|
|
1464
1465
|
const remap = this._remap;
|
|
1465
1466
|
const childOffset = remap ? 0 : offset + this.at;
|
|
1466
1467
|
this._childBase = childOffset;
|
|
1467
|
-
const target = remap ?
|
|
1468
|
+
const target = remap ? chunk7EI2N7WO_cjs.createTimeline({ paused: true, defaults: { ease: "none" } }) : timeline;
|
|
1468
1469
|
for (const child of this._children) {
|
|
1469
|
-
const own =
|
|
1470
|
+
const own = chunk7EI2N7WO_cjs.createTimeline({ defaults: { ease: "none" } });
|
|
1470
1471
|
child.bindTimeline(own, childOffset);
|
|
1471
1472
|
child.maskSequence?.bindTimeline(own, childOffset);
|
|
1472
1473
|
target.add(own, 0);
|
|
@@ -1496,8 +1497,8 @@ var CompositionSequence = class extends chunk7NXKBRT7_cjs.Sequence {
|
|
|
1496
1497
|
this._clock = clock;
|
|
1497
1498
|
const scope = this.scope();
|
|
1498
1499
|
if (remap.start !== void 0 && remap.timeKfs.length === 0) clock.time = remap.start;
|
|
1499
|
-
|
|
1500
|
-
this._warnUnreachable(
|
|
1500
|
+
chunk7EI2N7WO_cjs.bindClock(timeline, clock, "time", remap, this.duration, offset + this.at, scope);
|
|
1501
|
+
this._warnUnreachable(chunk7EI2N7WO_cjs.clockTable(remap, "time", this.duration, offset + this.at, scope, offset + this.at + this.duration), offset + this.at, offset + this.at + this.duration);
|
|
1501
1502
|
}
|
|
1502
1503
|
/**
|
|
1503
1504
|
* A child the clock never dwells in is never visible: say so. Its `at` is in THIS composition's local time, so the usual mistake is
|
|
@@ -1535,7 +1536,7 @@ var CompositionSequence = class extends chunk7NXKBRT7_cjs.Sequence {
|
|
|
1535
1536
|
for (let p = this._parentOf.get(seq); p; p = this._parentOf.get(p)) out.push(p);
|
|
1536
1537
|
return out;
|
|
1537
1538
|
};
|
|
1538
|
-
return [...this._visual.map((v) => v.seq), ...this._nested].filter((seq) => !(seq instanceof
|
|
1539
|
+
return [...this._visual.map((v) => v.seq), ...this._nested].filter((seq) => !(seq instanceof chunk7EI2N7WO_cjs.NullSequence)).map((seq) => {
|
|
1539
1540
|
const layer = this._visual.find((v) => v.seq === seq)?.layer ?? null;
|
|
1540
1541
|
return {
|
|
1541
1542
|
seq,
|
|
@@ -1544,24 +1545,24 @@ var CompositionSequence = class extends chunk7NXKBRT7_cjs.Sequence {
|
|
|
1544
1545
|
carriers: carriersOf(seq),
|
|
1545
1546
|
depthBlur: layer?.blur ?? 0,
|
|
1546
1547
|
// how lit it is (threeD layers that receive the lights of the last frame only); computed here, not per frame
|
|
1547
|
-
light: layer && this._lighting && layer.world && layer.spec.lit !== false ?
|
|
1548
|
+
light: layer && this._lighting && layer.world && layer.spec.lit !== false ? chunk7EI2N7WO_cjs.lightLevel(layer.world, this._lighting.cam, this._lighting.states) : void 0
|
|
1548
1549
|
};
|
|
1549
1550
|
});
|
|
1550
1551
|
}
|
|
1551
1552
|
/** Match every `parent: 'name'` to a null layer; anything that cannot work is said out loud and drawn unparented. */
|
|
1552
1553
|
_resolveParents() {
|
|
1553
|
-
const nulls = this._children.filter((c) => c instanceof
|
|
1554
|
+
const nulls = this._children.filter((c) => c instanceof chunk7EI2N7WO_cjs.NullSequence);
|
|
1554
1555
|
const nullNames = nulls.map((n) => n.spec.name).filter((n) => !!n);
|
|
1555
1556
|
const warned = /* @__PURE__ */ new Set();
|
|
1556
1557
|
for (const child of this._children) {
|
|
1557
1558
|
const want = child.spec.parent;
|
|
1558
1559
|
if (want === void 0) continue;
|
|
1559
1560
|
const who = chunk3SAS3ZE5_cjs.describeLayer(child.spec);
|
|
1560
|
-
if (child instanceof
|
|
1561
|
+
if (child instanceof chunk7EI2N7WO_cjs.CameraSequence) {
|
|
1561
1562
|
console.warn(`pixi-effects: ${who}: a camera cannot have a parent; ignored`);
|
|
1562
1563
|
continue;
|
|
1563
1564
|
}
|
|
1564
|
-
if (child instanceof
|
|
1565
|
+
if (child instanceof chunk7EI2N7WO_cjs.LightSequence) {
|
|
1565
1566
|
console.warn(`pixi-effects: ${who}: a light cannot have a parent (parent "${want}" ignored: move the light with its own x / y / z keyframes)`);
|
|
1566
1567
|
continue;
|
|
1567
1568
|
}
|
|
@@ -1575,7 +1576,7 @@ var CompositionSequence = class extends chunk7NXKBRT7_cjs.Sequence {
|
|
|
1575
1576
|
console.warn(`pixi-effects: ${who}: parent "${want}": no layer with that name${hint ? `; did you mean "${hint}"?` : ""} (the layer is drawn without a parent)`);
|
|
1576
1577
|
continue;
|
|
1577
1578
|
}
|
|
1578
|
-
const holder = same.find((c) => c instanceof
|
|
1579
|
+
const holder = same.find((c) => c instanceof chunk7EI2N7WO_cjs.NullSequence);
|
|
1579
1580
|
if (!holder) {
|
|
1580
1581
|
console.warn(`pixi-effects: ${who}: parent "${want}" is a ${same[0].spec.type} layer; only { type: 'null' } layers can be parents (the layer is drawn without a parent)`);
|
|
1581
1582
|
continue;
|
|
@@ -1620,8 +1621,8 @@ var CompositionSequence = class extends chunk7NXKBRT7_cjs.Sequence {
|
|
|
1620
1621
|
childT,
|
|
1621
1622
|
compEnd
|
|
1622
1623
|
);
|
|
1623
|
-
const cam = active ? active.cam.state() :
|
|
1624
|
-
const basis =
|
|
1624
|
+
const cam = active ? active.cam.state() : chunk7EI2N7WO_cjs.homeCamera(width, height);
|
|
1625
|
+
const basis = chunk7EI2N7WO_cjs.cameraBasis(cam, width, height);
|
|
1625
1626
|
for (const layer of this._layers3d) layer.update(host, basis);
|
|
1626
1627
|
this._applyLighting(childT, compEnd, basis, active?.cam ?? null);
|
|
1627
1628
|
this._applyDepthOfField(cam, basis);
|
|
@@ -1632,6 +1633,20 @@ var CompositionSequence = class extends chunk7NXKBRT7_cjs.Sequence {
|
|
|
1632
1633
|
if (v.layer) v.layer.display.zIndex = order[i];
|
|
1633
1634
|
});
|
|
1634
1635
|
}
|
|
1636
|
+
/** The light layers alive at `t` (their own `at` and `duration`; one that runs to the end of the composition is alive at the last instant too). */
|
|
1637
|
+
_liveLights(t, compEnd) {
|
|
1638
|
+
return this._lights.filter((l) => {
|
|
1639
|
+
const w = l.window();
|
|
1640
|
+
return t >= w.start && (t < w.end || w.end >= compEnd && t <= w.end);
|
|
1641
|
+
});
|
|
1642
|
+
}
|
|
1643
|
+
/** What a `three` layer that follows the composition asks for: the camera and the lights alive at `t` on this composition's clock (the same pick `updateSpace` makes). */
|
|
1644
|
+
_spaceAt(t) {
|
|
1645
|
+
const { width, height } = this._compositionShape;
|
|
1646
|
+
const compEnd = this._childBase + (this.duration ?? 0);
|
|
1647
|
+
const active = pickActiveCamera(this._cameras.map((cam) => ({ cam, ...cam.window() })), t, compEnd);
|
|
1648
|
+
return { camera: active ? active.cam.state() : chunk7EI2N7WO_cjs.homeCamera(width, height), lights: this._liveLights(t, compEnd).map((l) => l.state()), fog: active?.cam.fogState() ?? null };
|
|
1649
|
+
}
|
|
1635
1650
|
/**
|
|
1636
1651
|
* Lights and fog: when the composition has a light layer or the camera writes fog, every threeD layer draws with the lit shader, fed with
|
|
1637
1652
|
* the lights alive NOW (a pure function of the lights, the camera and the layers; nothing is remembered between frames). With neither,
|
|
@@ -1641,12 +1656,8 @@ var CompositionSequence = class extends chunk7NXKBRT7_cjs.Sequence {
|
|
|
1641
1656
|
_applyLighting(t, compEnd, basis, cam) {
|
|
1642
1657
|
const fog = cam?.fogState() ?? null;
|
|
1643
1658
|
if (this._lights.length === 0 && !this._cameras.some((c) => c.fog)) return;
|
|
1644
|
-
const
|
|
1645
|
-
|
|
1646
|
-
return t >= w.start && (t < w.end || w.end >= compEnd && t <= w.end);
|
|
1647
|
-
});
|
|
1648
|
-
const states = live.map((l) => l.state());
|
|
1649
|
-
const packed = states.length > 0 ? chunk7NXKBRT7_cjs.packLights(states) : null;
|
|
1659
|
+
const states = this._liveLights(t, compEnd).map((l) => l.state());
|
|
1660
|
+
const packed = states.length > 0 ? chunk7EI2N7WO_cjs.packLights(states) : null;
|
|
1650
1661
|
this._lighting = states.length > 0 ? { states, cam: { x: basis.cx, y: basis.cy, z: basis.cz } } : null;
|
|
1651
1662
|
const shadowing = states.some((s) => s.castsShadows);
|
|
1652
1663
|
const casters = shadowing ? this._layers3d.filter((l) => l.spec.castsShadows && l.display.visible && l.world && l.source) : [];
|
|
@@ -1655,7 +1666,7 @@ var CompositionSequence = class extends chunk7NXKBRT7_cjs.Sequence {
|
|
|
1655
1666
|
const mat = l.setLit(true);
|
|
1656
1667
|
if (!mat || !l.world) continue;
|
|
1657
1668
|
const lit = l.spec.lit !== false;
|
|
1658
|
-
const mine = lit ? casters.filter((c) => c !== l).slice(0,
|
|
1669
|
+
const mine = lit ? casters.filter((c) => c !== l).slice(0, chunk7EI2N7WO_cjs.MAX_CASTERS).map((c) => ({ frame: c.world, source: c.source })) : [];
|
|
1659
1670
|
mat.update(l.world, camInfo, lit ? packed : null, fog, mine);
|
|
1660
1671
|
}
|
|
1661
1672
|
}
|
|
@@ -1666,8 +1677,8 @@ var CompositionSequence = class extends chunk7NXKBRT7_cjs.Sequence {
|
|
|
1666
1677
|
for (const l of this._layers3d) l.setBlur(0);
|
|
1667
1678
|
return;
|
|
1668
1679
|
}
|
|
1669
|
-
const focusDepth =
|
|
1670
|
-
if (!(focusDepth >
|
|
1680
|
+
const focusDepth = chunk7EI2N7WO_cjs.projectPoint(basis, { x: cam.lookAtX, y: cam.lookAtY, z: cam.focus ?? 0 }).depth;
|
|
1681
|
+
if (!(focusDepth > chunk7EI2N7WO_cjs.NEAR)) {
|
|
1671
1682
|
if (!this._dofSaid.behind) {
|
|
1672
1683
|
this._dofSaid.behind = true;
|
|
1673
1684
|
console.warn(`pixi-effects: ${chunk3SAS3ZE5_cjs.describeLayer(this.spec)}: the camera's focus (z = ${(cam.focus ?? 0).toFixed(0)}) is at or behind the camera, so nothing is blurred. Put focus in front of the camera (a z below the camera's z)`);
|
|
@@ -1677,12 +1688,12 @@ var CompositionSequence = class extends chunk7NXKBRT7_cjs.Sequence {
|
|
|
1677
1688
|
}
|
|
1678
1689
|
let blurred = 0;
|
|
1679
1690
|
for (const l of this._layers3d) {
|
|
1680
|
-
l.setBlur(l.display.visible ?
|
|
1691
|
+
l.setBlur(l.display.visible ? chunk7EI2N7WO_cjs.blurRadius(aperture, basis.focal, l.depth, focusDepth) : 0);
|
|
1681
1692
|
if (l.blur > 0) blurred++;
|
|
1682
1693
|
}
|
|
1683
|
-
if (blurred >=
|
|
1694
|
+
if (blurred >= chunk7EI2N7WO_cjs.MANY_BLURRED && !this._dofSaid.many) {
|
|
1684
1695
|
this._dofSaid.many = true;
|
|
1685
|
-
console.warn(`pixi-effects: ${chunk3SAS3ZE5_cjs.describeLayer(this.spec)}: ${blurred} layers are blurred by depth of field at once (it warns from ${
|
|
1696
|
+
console.warn(`pixi-effects: ${chunk3SAS3ZE5_cjs.describeLayer(this.spec)}: ${blurred} layers are blurred by depth of field at once (it warns from ${chunk7EI2N7WO_cjs.MANY_BLURRED}); each costs a filter pass per frame (WebGPU more). Merge the far layers or lower aperture`);
|
|
1686
1697
|
}
|
|
1687
1698
|
}
|
|
1688
1699
|
collectAudio(out, baseTime) {
|
|
@@ -1696,7 +1707,7 @@ var CompositionSequence = class extends chunk7NXKBRT7_cjs.Sequence {
|
|
|
1696
1707
|
const inner = [];
|
|
1697
1708
|
for (const child of this._children) child.collectAudio(inner, 0);
|
|
1698
1709
|
const lo = baseTime + this.at, hi = lo + this.duration;
|
|
1699
|
-
const table =
|
|
1710
|
+
const table = chunk7EI2N7WO_cjs.clockTable(remap, "time", this.duration, lo, this.scope(), hi);
|
|
1700
1711
|
for (const d of inner) {
|
|
1701
1712
|
const prev = d.warp;
|
|
1702
1713
|
out.push({ ...d, warp: (t) => t < lo || t > hi ? NaN : prev ? prev(table.at(t)) : table.at(t) });
|
|
@@ -1726,5 +1737,5 @@ function frameOf(child) {
|
|
|
1726
1737
|
|
|
1727
1738
|
exports.CompositionSequence = CompositionSequence;
|
|
1728
1739
|
exports.maskSourceOf = maskSourceOf;
|
|
1729
|
-
//# sourceMappingURL=chunk-
|
|
1730
|
-
//# sourceMappingURL=chunk-
|
|
1740
|
+
//# sourceMappingURL=chunk-27PYJ4JY.cjs.map
|
|
1741
|
+
//# sourceMappingURL=chunk-27PYJ4JY.cjs.map
|