framefields 2.9.0 → 2.9.2

package/dist/{renderer-B0piZg9r.mjs → renderer-B2P1vgb7.mjs}

@@ -191,7 +191,7 @@ const COCO_CLASSES = [
 ];
 
 //#endregion
-//#region ../vision/dist/src-Bfz8DtoR.mjs
+//#region ../vision/dist/src-Bnr8DUC-.mjs
 function computeIoU(boxA, boxB) {
 	const xA = Math.max(boxA.originX, boxB.originX);
 	const yA = Math.max(boxA.originY, boxB.originY);
@@ -3074,8 +3074,9 @@ function output(outputs, name, key) {
 /**
 * Where a render-time Vision effect finds subject masks someone already
 * computed for its clip (`comp.vision(clip)` in framefields), so a matte layer
-* reuses them instead of segmenting the frame again. Set on the Vision effect
-* instance under this key; the renderer reads it from the effect.
+* reuses them instead of segmenting the frame again, and a skeleton layer draws
+* the pose matched to that subject instead of the first person it detects. Set
+* on the Vision effect instance under this key; the renderer reads it from the effect.
 */
 const CLIP_SUBJECT = Symbol.for("framefields.vision.clipSubject");
 /**
@@ -4311,7 +4312,7 @@ var VisionNode = class VisionNode$1 {
 };
 
 //#endregion
-//#region ../../nodes/node-vision/dist/renderers-D1ixy3z3.mjs
+//#region ../../nodes/node-vision/dist/renderers-Ao0SpHQm.mjs
 let scratchValues = new Uint8Array(0);
 let scratchLengths = new Uint32Array(0);
 function encodeMask(mask, width, height) {
@@ -4996,7 +4997,8 @@ const VisionWebGPURenderer = async (args) => {
 	const wantsSelfie = op.enableMatte === true || isMatteMode && op.matteSource === "selfie";
 	const wantsPose = op.enablePose === true || mode === "skeleton";
 	const clipSubject = isMatteMode && !visionBundle && !wantsPose && !wantsSelfie && op.keyBackground !== true ? clipSubjectFor(effectKey, props.sourceTimeSec === void 0 ? frameIdx : props.sourceTimeSec * fps, fps, targetWidth, targetHeight) : void 0;
-	const fromClip = clipSubject !== void 0;
+	const clipPose = mode === "skeleton" && !visionBundle ? clipPoseFor(effectKey, props.sourceTimeSec === void 0 ? frameIdx : props.sourceTimeSec * fps, fps, targetWidth, targetHeight) : void 0;
+	const fromClip = clipSubject !== void 0 || clipPose !== void 0;
 	const cacheable = !fromClip && !wantsSelfie && !wantsPose && (wantsDetection || wantsSegmentation);
 	const source = cacheable ? cacheSource(nodeKeyStr, childMedia, op, targetWidth, targetHeight) : "";
 	const keyThresholdAt = (frame$1) => op.keyBackground === true ? backgroundKeyThreshold(op, compositionFrame - (frameIdx - frame$1), fps) : void 0;
@@ -5162,27 +5164,27 @@ const VisionWebGPURenderer = async (args) => {
 	}
 	if (mode === "skeleton") {
 		if (!sharedSkeletonRenderer) sharedSkeletonRenderer = new PoseSkeletonRenderer(ctx.device);
-		const person = (visionBundle?.getPoseResult(frameIdx) ?? currentPoseRes)?.people[0];
-		if (person && person.keypoints.length > 0) {
-			const skelTex = sharedSkeletonRenderer.renderToTexture(person.keypoints, {
+		const keypoints = clipPose !== void 0 ? clipPose : (visionBundle?.getPoseResult(frameIdx) ?? currentPoseRes)?.people[0]?.keypoints;
+		const skelPass = ctx.renderer.beginFrame(encoder$1, targetView, {
+			r: 0,
+			g: 0,
+			b: 0,
+			a: 0
+		}, targetWidth, targetHeight, "clear");
+		if (keypoints && keypoints.length > 0) {
+			const skelTex = sharedSkeletonRenderer.renderToTexture(keypoints, {
 				width: targetWidth,
 				height: targetHeight
 			});
-			const skelPass = ctx.renderer.beginFrame(encoder$1, targetView, {
-				r: 0,
-				g: 0,
-				b: 0,
-				a: 0
-			}, targetWidth, targetHeight, "clear");
 			ctx.renderer.drawTexture(skelPass, skelTex, {
 				x: 0,
 				y: 0,
 				width: targetWidth,
 				height: targetHeight
 			});
-			skelPass.end();
-			return;
 		}
+		skelPass.end();
+		return;
 	}
 	if (mode === "boxes" || mode === "tracking") {
 		const outPass$1 = ctx.renderer.beginFrame(encoder$1, targetView, {
@@ -5272,12 +5274,29 @@ const VisionWebGPURenderer = async (args) => {
 * uv, so it fits any target of the same aspect. Other shapes fall back.
 */
 function clipSubjectFor(effect, frame, fps, width, height) {
-	const source = effect?.[CLIP_SUBJECT];
+	const source = linkedClip(effect);
 	const subject = source?.subject(frame, fps);
-	if (!subject) return subject;
-	const aspect = subject.width / subject.height / (width / height);
-	if (Math.abs(aspect - 1) < .01) return subject;
-	if (source?.exact) throw new Error("A prompted clip matte requires the source aspect ratio. Apply layout cropping after the source matte.");
+	if (!subject || !source) return subject;
+	return fitsTarget(source, subject.width / subject.height, width / height) ? subject : void 0;
+}
+/**
+* The pose a linked `comp.vision` clip matched to its subject for a source
+* frame, normalized to the source; it fits targets of the same aspect.
+*/
+function clipPoseFor(effect, frame, fps, width, height) {
+	const source = linkedClip(effect);
+	const pose = source?.pose?.(frame, fps);
+	if (!pose || !source) return pose === null ? null : void 0;
+	return fitsTarget(source, pose.width / pose.height, width / height) ? pose.keypoints : void 0;
+}
+function linkedClip(effect) {
+	return effect?.[CLIP_SUBJECT];
+}
+/** Source results map onto a target of the same aspect; a prompted clip must not fall back. */
+function fitsTarget(source, sourceAspect, targetAspect) {
+	if (Math.abs(sourceAspect / targetAspect - 1) < .01) return true;
+	if (source.exact) throw new Error("A prompted clip matte requires the source aspect ratio. Apply layout cropping after the source matte.");
+	return false;
 }
 /** Adapts a Selfie Segmenter matte to the instance-mask shape the composite path takes. */
 function personMatteAsMask(matte) {
@@ -5297,4 +5316,4 @@ var renderers_default = defineRenderer({ WebGPURenderer: VisionWebGPURenderer })
 
 //#endregion
 export { pinNodeToObject as _, COCO17_KEYPOINT_NAMES as a, SpatialLandmarkTransformer as c, VisionNode as d, VisionRunner as f, pinNodeToLandmark as g, mergeSubjectMask as h, COCO17_KEYPOINTS as i, TemporalObjectTracker as l, maskObject as m, CLIP_SUBJECT as n, PoseSkeletonRenderer as o, analyzeSequence as p, COCO17_BONES as r, SegmentationTexturePool as s, renderers_default as t, VisionBundle as u, COCO_CLASSES as v };
-//# sourceMappingURL=renderer-B0piZg9r.mjs.map
+//# sourceMappingURL=renderer-B2P1vgb7.mjs.map