framefields 2.8.0 → 2.9.0

package/dist/{renderer-DRLtfxdW.mjs → renderer-C41U1tK6.mjs}

@@ -1,14 +1,14 @@
 import "./chunk-BcJoO4Nm.mjs";
 import { It as getActiveMediaMetadata, _n as reportRenderDiagnostic, p as DEFAULT_DURATION_MS, rn as mediaSourceTime, vn as resolveBoolean, xn as resolveNumber } from "./dist-BlIrsfcn.mjs";
 import { l as solveHomography, n as defineRenderer, o as resolveFrameNumber, r as effectReach, t as audioRegistry } from "./renderer-mNSyac1V.mjs";
-import { B as jointMatrices, F as getPrimitiveGeometry, G as measureMaxCaptionHeight, M as fitSpansToText, N as generateExtrudedTextGeometry, Q as poseNodes, _t as Vector3Math, at as spansText, d as ScreenSpaceRelightPipeline, ht as Matrix4Math, l as Renderer3D, lt as resolveMediaSourceUrl, n as AudioLatentTrackCache, nt as sampleMorphWeights, ot as srtLoader, p as SlugFontCache, pt as Light3D, q as parseColor, tt as resolveTextSpans, ut as Camera3D } from "./dist-CnFcSau0.mjs";
-import { a as createFullscreenPipeline, l as fragmentBindGroupLayout, n as PREMULTIPLIED_BLEND, t as FULLSCREEN_QUAD_WGSL } from "./gpu-BoyykRdD.mjs";
-import { n as decodeAudioSource, o as resolveLayerDuration, p as measureText } from "./dist-C5eZw8ms.mjs";
+import { B as jointMatrices, F as getPrimitiveGeometry, G as measureMaxCaptionHeight, M as fitSpansToText, N as generateExtrudedTextGeometry, Q as poseNodes, _t as Vector3Math, at as spansText, d as ScreenSpaceRelightPipeline, ht as Matrix4Math, l as Renderer3D, lt as resolveMediaSourceUrl, n as AudioLatentTrackCache, nt as sampleMorphWeights, ot as srtLoader, p as SlugFontCache, pt as Light3D, q as parseColor, tt as resolveTextSpans, ut as Camera3D } from "./dist-C1cCW7Bt.mjs";
+import { a as createFullscreenPipeline, l as fragmentBindGroupLayout, n as PREMULTIPLIED_BLEND, t as FULLSCREEN_QUAD_WGSL } from "./gpu-CMaa63nz.mjs";
+import { n as decodeAudioSource, o as resolveLayerDuration, p as measureText } from "./dist-C8Xq3zgx.mjs";
 import { o as TemporalDeflickerPipeline } from "./dist-Buaaj-Ul.mjs";
-import { B as evaluateKeyframes, I as computeLayout, N as collectNodeOps, U as initLayout, V as evaluateTrackAtFrame } from "./program-CqQDWfSV.mjs";
+import { B as evaluateKeyframes, I as computeLayout, N as collectNodeOps, U as initLayout, V as evaluateTrackAtFrame } from "./program-CKpKkllV.mjs";
 import gsapModule from "gsap";
 
-//#region ../../nodes/node-compositor/dist/renderers-TAGGsAye.mjs
+//#region ../../nodes/node-compositor/dist/renderers-X4CI4wde.mjs
 /**
 * Solves a cubic bezier curve defined by control points (x1, y1) and (x2, y2)
 * for a given progress parameter t in [0, 1].
@@ -696,6 +696,37 @@ function shouldPaintContainerBackground(kind, background) {
 	if (!background) return false;
 	return kind === "flex" || kind === "block" || kind === "box";
 }
+const TRANSFORMS = new Set([
+	"position",
+	"rotation",
+	"scale",
+	"modelMatrix",
+	"normalMatrix",
+	"bounds"
+]);
+/** Compare material state without treating different GPU resources as equal. */
+function sameValue(a, b) {
+	if (a === b) return true;
+	if (Array.isArray(a) && Array.isArray(b)) return a.length === b.length && a.every((value, i) => sameValue(value, b[i]));
+	if (!a || !b || typeof a !== "object" || typeof b !== "object") return false;
+	if (Object.getPrototypeOf(a) !== Object.prototype || Object.getPrototypeOf(b) !== Object.prototype) return false;
+	const left = a;
+	const right = b;
+	const keys = Object.keys(left);
+	return keys.length === Object.keys(right).length && keys.every((key) => Object.hasOwn(right, key) && sameValue(left[key], right[key]));
+}
+function canInstanceMesh(item) {
+	const o = item.opts;
+	return !item.meshBuffers && !o.transparent && !o.instanceBuffer && (o.instanceCount ?? 1) === 1 && !o.firstInstance && !o.matrixInstances && !o.isSkinned && !o.skinningMatrices && !o.audioDeform && !o.morphWeights?.length && o.material !== "glass" && o.material !== "acrylic" && o.material !== "frosted" && (o.opacity ?? 1) >= 1 && (o.colorTint?.[3] ?? 1) >= 1;
+}
+function compatibleMeshDraws(a, b) {
+	if (!canInstanceMesh(a) || !canInstanceMesh(b) || a.mesh !== b.mesh || a.texture !== b.texture) return false;
+	const left = a.opts;
+	const right = b.opts;
+	const keys = new Set([...Object.keys(left), ...Object.keys(right)]);
+	for (const key of keys) if (!TRANSFORMS.has(key) && !sameValue(left[key], right[key])) return false;
+	return true;
+}
 function translate(tx, ty) {
 	return {
 		a: 1,
@@ -1856,9 +1887,12 @@ const CompositorWebGPURenderer = async (args) => {
 				linearDepthTex = r3d.getOrCreateLinearDepthTexture(nativeWidth, nativeHeight);
 				linearDepthView = linearDepthTex.createView();
 			}
-			let shadow = null;
-			const casterIndex = Light3D.shadowCasterIndex(sceneLights);
-			if (casterIndex >= 0) {
+			const shadow = [];
+			const shadowLights = sceneLights.filter((light) => (light.lightType ?? light.type) !== "ambient").map((light, index) => ({
+				light,
+				index
+			})).filter(({ light }) => light.castShadow && ((light.lightType ?? light.type) === "directional" || (light.lightType ?? light.type) === "spot"));
+			if (shadowLights.length > 0) {
 				const casters = [];
 				const receivers = [];
 				for (const item of pending3DItems) if (item.kind === "mesh") {
@@ -1879,8 +1913,14 @@ const CompositorWebGPURenderer = async (args) => {
 					receivers.push(r3d.worldBounds(caster));
 					if (item.opts.castShadow === true) casters.push(caster);
 				}
-				const shadowLight = sceneLights.filter((l) => (l.lightType ?? l.type) !== "ambient")[casterIndex];
-				if (shadowLight && casters.length > 0) shadow = r3d.renderShadowMap(encoder, shadowLight, casterIndex, casters, receivers, { mapSize: shadowMapSize });
+				if (casters.length > 0) for (const { light, index } of shadowLights) {
+					const result = r3d.renderShadowMap(encoder, light, index, casters, receivers, {
+						mapSize: shadowMapSize,
+						layer: shadow.length,
+						layerCount: shadowLights.length
+					});
+					if (result) shadow.push(result);
+				}
 			}
 			const isGlass = (item) => item.kind === "mesh" && (item.opts.material === "glass" || item.opts.material === "acrylic" || item.opts.material === "frosted");
 			const opaque = [];
@@ -1902,8 +1942,47 @@ const CompositorWebGPURenderer = async (args) => {
 				});
 			} else opaque.push(item);
 			transparent.sort((a, b) => b.depth - a.depth);
+			const batchedOpaque = [];
+			const maxInstances = Math.max(1, Math.floor(ctx.device.limits.maxStorageBufferBindingSize / 128));
+			for (let i = 0; i < opaque.length;) {
+				const first = opaque[i];
+				if (first.kind !== "mesh") {
+					batchedOpaque.push(first);
+					i++;
+					continue;
+				}
+				let end = i + 1;
+				while (end < opaque.length && end - i < maxInstances) {
+					const next = opaque[end];
+					if (next.kind !== "mesh" || !compatibleMeshDraws(first, next)) break;
+					end++;
+				}
+				if (end - i === 1) batchedOpaque.push(first);
+				else {
+					const data = new Float32Array((end - i) * 32);
+					for (let j = i; j < end; j++) {
+						const item = opaque[j];
+						if (item.kind !== "mesh") throw new Error("Invalid mesh batch");
+						const matrix = r3d.meshModelMatrix(item.opts);
+						data.set(matrix, (j - i) * 32);
+						data.set(item.opts.normalMatrix ?? Light3D.computeNormalMatrix(matrix), (j - i) * 32 + 16);
+					}
+					batchedOpaque.push({
+						...first,
+						opts: {
+							...first.opts,
+							modelMatrix: Matrix4Math.identity(),
+							normalMatrix: Matrix4Math.identity(),
+							instanceBuffer: r3d.uploadInstanceData(data),
+							instanceCount: end - i,
+							matrixInstances: true
+						}
+					});
+				}
+				i = end;
+			}
 			const ordered = [
-				...opaque,
+				...batchedOpaque,
 				...transparent.map(({ item }) => item),
 				...glass
 			];
@@ -1945,7 +2024,7 @@ const CompositorWebGPURenderer = async (args) => {
 				a: 0
 			}, linearDepthView, sceneLights, {
 				environment: sceneEnvironment,
-				shadow
+				shadow: shadow.length ? shadow : null
 			}, Boolean(sceneBloom));
 			if (floorSpec && blurredReflectionTex) r3d.drawFloor(pass3d, cameraBindGroup, lightsBindGroup, blurredReflectionTex, floorSpec, dofEnabled, Boolean(sceneBloom));
 			for (const item of ordered) if (item.kind === "quad") r3d.drawTextureQuad(pass3d, cameraBindGroup, lightsBindGroup, item.texture, item.opts, dofEnabled);
@@ -2913,9 +2992,9 @@ const CompositorWebGPURenderer = async (args) => {
 				if (!posed && clip && clip.duration > 0) {
 					const currentSec = clipSec;
 					if (model.skeleton && model.skeleton.bones.length > 0) {
-						const numBones = Math.min(128, model.skeleton.bones.length);
-						skinningMatrices = new Float32Array(2048);
-						for (let b = 0; b < 128; b++) {
+						const numBones = model.skeleton.bones.length;
+						skinningMatrices = new Float32Array(numBones * 16);
+						for (let b = 0; b < numBones; b++) {
 							skinningMatrices[b * 16] = 1;
 							skinningMatrices[b * 16 + 5] = 1;
 							skinningMatrices[b * 16 + 10] = 1;
@@ -4514,4 +4593,4 @@ var renderers_default = defineRenderer({ WebGPURenderer: CompositorWebGPURendere
 
 //#endregion
 export { Transform3DMath, renderers_default as default, has3DTransform };
-//# sourceMappingURL=renderer-DRLtfxdW.mjs.map
+//# sourceMappingURL=renderer-C41U1tK6.mjs.map