shaders 3.0.452 → 3.1.454

package/dist/core/{Water-BvymB3Av.js → Water-DlvNrnrU.js}

@@ -1,14 +1,17 @@
-import { Bt as smoothstep, Ct as dot, Ft as reflect, It as refract, Mt as normalize, Nt as pow, Ot as length, Wt as data_exports, an as vec3f, b as vec4, bt as clamp, cn as f32, gt as abs, ht as select, jt as mix, kt as max, m as call, nn as vec2f, rt as std_exports, sn as vec4f, tt as src_default, v as floatE, wt as exp, xt as cos, zt as sin } from "./edges-Dm0I-Ud7.js";
-import { t as animatedTime } from "./porters-DnWlc17D.js";
-import { p as noise_exports, u as mxNoiseFloat2 } from "./noise-C_ZfgxTN.js";
-import { h as sdf_exports } from "./sdf-B5E-Vv1j.js";
-import { f as sdf3d_exports, n as shapeEffectBoundingBoxDeclaration, t as resolveShapeType } from "./shapeEffectBounds-CjOvQ3n3.js";
-import { n as glass_exports } from "./glass-ClmiwTb0.js";
-import { a as transformColor, c as transformPosition } from "./transformations-CsPUHppB.js";
+import { At as max, Bt as sin, Gt as data_exports, It as reflect, Lt as refract, Mt as mix, Nt as normalize, Pt as pow, St as cos, Tt as exp, Vt as smoothstep, _t as abs, at as std_exports, cn as vec4f, gt as select, h as call, kt as length, on as vec3f, rn as vec2f, rt as src_default, un as f32, wt as dot, x as vec4, xt as clamp, y as floatE } from "./edges-CD7gCAto.js";
+import { t as DEG_TO_RAD$1 } from "./constants-DoOzbl5b.js";
+import { t as animatedTime } from "./porters-DUtQounc.js";
+import { p as noise_exports, u as mxNoiseFloat2 } from "./noise-Bd6IGS0W.js";
+import { C as sdf_exports } from "./device-B0ZwBfOg.js";
+import { n as lighting_exports } from "./lighting-D3jc6qOc.js";
+import { i as shapeEffectBoundingBoxDeclaration, n as sdf3d_exports } from "./sdf3d-CP87OlsQ.js";
+import { n as glass_exports } from "./glass-D8xs_kIG.js";
+import { a as transformColor, c as transformPosition } from "./transformations-B-zNWNdd.js";
 var { sdfSpaceUV, offsetUV } = glass_exports;
-var { createSvgSdfSampler, createAnalyticSdfSampler, driveAnalyticSubProps, ANALYTIC_SDF_EXTRA_FIELDS } = sdf_exports;
-var { createVolumetricFieldComputeNode, buildVolumetricFieldSampler, VOLUMETRIC_FIELD_EXTRA_FIELDS, is3dShapeType, isVolumetricShapeType } = sdf3d_exports;
-var DEG_TO_RAD = .017453292519943295;
+var { volumetricNormal, fieldGradient, patternCoords, outsideShape, insideMask } = lighting_exports;
+var { ANALYTIC_SDF_EXTRA_FIELDS } = sdf_exports;
+var { createVolumetricFieldComputeNode, resolveShapeFieldSampler, VOLUMETRIC_FIELD_EXTRA_FIELDS } = sdf3d_exports;
+var DEG_TO_RAD = DEG_TO_RAD$1;
 var DEFAULT_SHAPE_CONFIG = JSON.stringify({
 	type: "circleSDF",
 	radius: .35
@@ -606,20 +609,22 @@ const waterComposite = src_default.fn([
 	const pxH = __tsover_div(1, viewportSize.y);
 	const sdfRaw = surf0.x;
 	const sdf = __tsover_div(sdfRaw, scl);
-	if (sdf > __tsover_mul(pxH, 2)) return vec4f(0, 0, 0, 0);
+	if (outsideShape(sdf, pxH)) return vec4f(0, 0, 0, 0);
 	const lx = cos(__tsover_mul(lightAngle, DEG_TO_RAD));
 	const ly = sin(__tsover_mul(lightAngle, DEG_TO_RAD));
 	const envC = cos(__tsover_mul(envRotation, DEG_TO_RAD));
 	const envS = sin(__tsover_mul(envRotation, DEG_TO_RAD));
 	const EPS = .01;
-	const gradX = __tsover_div(__tsover_sub(surfX.x, sdfRaw), EPS);
-	const gradY = __tsover_div(__tsover_sub(surfY.x, sdfRaw), EPS);
-	const nVol = normalize(vec3f(clamp(__tsover_div(__tsover_sub(surfX.w, surf0.w), EPS), -5, 5), clamp(__tsover_div(__tsover_sub(surfY.w, surf0.w), EPS), -5, 5), -1));
+	const grad = fieldGradient(surf0, surfX, surfY, EPS);
+	const gradX = grad.x;
+	const gradY = grad.y;
+	const nVol = volumetricNormal(surf0, surfX, surfY, EPS, 5);
 	const rimT = clamp(__tsover_div(__tsover_mul(sdf, -1), .05), 0, 1);
 	const rimBevel = __tsover_mul(__tsover_sub(1, rimT), 1.6);
 	const nGeo = select(normalize(vec3f(__tsover_mul(gradX, rimBevel), __tsover_mul(gradY, rimBevel), -1)), nVol, volumetric > .5);
-	const fx = select(__tsover_sub(sdfUV.x, .5), surf0.y, volumetric > .5);
-	const fy = select(__tsover_sub(sdfUV.y, .5), surf0.z, volumetric > .5);
+	const pat = patternCoords(sdfUV, surf0, volumetric);
+	const fx = pat.x;
+	const fy = pat.y;
 	const freq = __tsover_mul(waveScale, 2.4);
 	const flowT = __tsover_mul(animTime, .2);
 	const q = vec2f(__tsover_mul(__tsover_mul(fx, freq), .8), __tsover_mul(__tsover_mul(fy, freq), 1.25));
@@ -681,7 +686,7 @@ const waterComposite = src_default.fn([
 	const shore = __tsover_sub(1, smoothstep(0, .045, __tsover_mul(sdf, -1)));
 	const foamMask = __tsover_mul(clamp(__tsover_add(crest, __tsover_mul(shore, .7)), 0, 1), foam);
 	surface = mix(surface, vec3f(1, 1, 1), vec3f(__tsover_mul(foamMask, .85)));
-	const transition = smoothstep(0, 1, clamp(__tsover_mul(__tsover_div(__tsover_mul(sdf, -1), sharpEdge), 32), 0, 1));
+	const transition = smoothstep(0, 1, insideMask(sdf, sharpEdge, pxH, 1.5));
 	return vec4f(surface.x, surface.y, surface.z, transition);
 }), {
 	v: 1,
@@ -941,15 +946,9 @@ const waterComposite = src_default.fn([
 			[
 				11,
 				[
-					1,
-					"sdf",
-					">",
-					[
-						1,
-						"pxH",
-						"*",
-						[5, "2"]
-					]
+					6,
+					"outsideShape",
+					["sdf", "pxH"]
 				],
 				[10, [
 					6,
@@ -1045,149 +1044,51 @@ const waterComposite = src_default.fn([
 			],
 			[
 				13,
-				"gradX",
+				"grad",
 				[
-					1,
+					6,
+					"fieldGradient",
 					[
-						1,
-						[
-							7,
-							"surfX",
-							"x"
-						],
-						"-",
-						"sdfRaw"
-					],
-					"/",
-					"EPS"
+						"surf0",
+						"surfX",
+						"surfY",
+						"EPS"
+					]
 				]
 			],
 			[
 				13,
-				"gradY",
+				"gradX",
 				[
-					1,
-					[
-						1,
-						[
-							7,
-							"surfY",
-							"x"
-						],
-						"-",
-						"sdfRaw"
-					],
-					"/",
-					"EPS"
+					7,
+					"grad",
+					"x"
 				]
 			],
 			[
 				13,
-				"ddx",
+				"gradY",
 				[
-					6,
-					[
-						7,
-						"std",
-						"clamp"
-					],
-					[
-						[
-							1,
-							[
-								1,
-								[
-									7,
-									"surfX",
-									"w"
-								],
-								"-",
-								[
-									7,
-									"surf0",
-									"w"
-								]
-							],
-							"/",
-							"EPS"
-						],
-						[
-							4,
-							"-",
-							[5, "5"]
-						],
-						[5, "5"]
-					]
+					7,
+					"grad",
+					"y"
 				]
 			],
 			[
 				13,
-				"ddy",
+				"nVol",
 				[
 					6,
+					"volumetricNormal",
 					[
-						7,
-						"std",
-						"clamp"
-					],
-					[
-						[
-							1,
-							[
-								1,
-								[
-									7,
-									"surfY",
-									"w"
-								],
-								"-",
-								[
-									7,
-									"surf0",
-									"w"
-								]
-							],
-							"/",
-							"EPS"
-						],
-						[
-							4,
-							"-",
-							[5, "5"]
-						],
+						"surf0",
+						"surfX",
+						"surfY",
+						"EPS",
 						[5, "5"]
 					]
 				]
 			],
-			[
-				13,
-				"nVol",
-				[
-					6,
-					[
-						7,
-						"std",
-						"normalize"
-					],
-					[[
-						6,
-						[
-							7,
-							"d",
-							"vec3f"
-						],
-						[
-							"ddx",
-							"ddy",
-							[
-								4,
-								"-",
-								[5, "1"]
-							]
-						]
-					]]
-				]
-			],
 			[
 				13,
 				"rimT",
@@ -1297,72 +1198,33 @@ const waterComposite = src_default.fn([
 			],
 			[
 				13,
-				"fx",
+				"pat",
 				[
 					6,
+					"patternCoords",
 					[
-						7,
-						"std",
-						"select"
-					],
-					[
-						[
-							1,
-							[
-								7,
-								"sdfUV",
-								"x"
-							],
-							"-",
-							[5, "0.5"]
-						],
-						[
-							7,
-							"surf0",
-							"y"
-						],
-						[
-							1,
-							"volumetric",
-							">",
-							[5, "0.5"]
-						]
+						"sdfUV",
+						"surf0",
+						"volumetric"
 					]
 				]
 			],
+			[
+				13,
+				"fx",
+				[
+					7,
+					"pat",
+					"x"
+				]
+			],
 			[
 				13,
 				"fy",
 				[
-					6,
-					[
-						7,
-						"std",
-						"select"
-					],
-					[
-						[
-							1,
-							[
-								7,
-								"sdfUV",
-								"y"
-							],
-							"-",
-							[5, "0.5"]
-						],
-						[
-							7,
-							"surf0",
-							"z"
-						],
-						[
-							1,
-							"volumetric",
-							">",
-							[5, "0.5"]
-						]
-					]
+					7,
+					"pat",
+					"y"
 				]
 			],
 			[
@@ -3516,34 +3378,12 @@ const waterComposite = src_default.fn([
 						[5, "1"],
 						[
 							6,
+							"insideMask",
 							[
-								7,
-								"std",
-								"clamp"
-							],
-							[
-								[
-									1,
-									[
-										1,
-										[
-											1,
-											"sdf",
-											"*",
-											[
-												4,
-												"-",
-												[5, "1"]
-											]
-										],
-										"/",
-										"sharpEdge"
-									],
-									"*",
-									[5, "32"]
-								],
-								[5, "0"],
-								[5, "1"]
+								"sdf",
+								"sharpEdge",
+								"pxH",
+								[5, "1.5"]
 							]
 						]
 					]
@@ -3578,20 +3418,30 @@ const waterComposite = src_default.fn([
 		]],
 		"externalNames": [
 			"std",
+			"outsideShape",
 			"d",
 			"DEG_TO_RAD",
+			"fieldGradient",
+			"volumetricNormal",
+			"patternCoords",
 			"waterFbm",
 			"waterNoise1",
-			"waterSky"
+			"waterSky",
+			"insideMask"
 		]
 	},
 	externals: () => ({
 		std: std_exports,
+		outsideShape,
 		d: data_exports,
 		DEG_TO_RAD,
+		fieldGradient,
+		volumetricNormal,
+		patternCoords,
 		waterFbm,
 		waterNoise1,
-		waterSky
+		waterSky,
+		insideMask
 	})
 }) && $.f)({}));
 const componentDefinition = {
@@ -3862,45 +3712,10 @@ const componentDefinition = {
 			description: "Active SDF shape type"
 		}
 	},
-	compute: (params) => {
-		const vf = createVolumetricFieldComputeNode(params, () => params.getCpuValue("shape"), "raw");
-		return vf ? {
-			outputs: vf.outputs,
-			getComputeNodes: (fp) => vf.getComputeNodes(fp)
-		} : null;
-	},
+	compute: (params) => createVolumetricFieldComputeNode(params, () => params.getCpuValue("shape"), "raw"),
 	fragment: (params) => {
-		const { computeOutputs, uniforms, propValues, ctx, getCpuValue } = params;
-		let sampler;
-		let gradSampler;
-		let volumetric = false;
-		const fieldTex = computeOutputs?.volumetricFieldTexture;
-		if (fieldTex) {
-			const s = buildVolumetricFieldSampler(fieldTex, {
-				originX: uniforms._vfOriginX,
-				originY: uniforms._vfOriginY,
-				spanX: uniforms._vfSpanX,
-				spanY: uniforms._vfSpanY,
-				activeResF: uniforms._vfActiveRes,
-				rBound: uniforms._vfRBound
-			});
-			sampler = s.volumetricFieldSampler;
-			gradSampler = s.volumetricFieldSamplerFast;
-			volumetric = true;
-		} else {
-			const shapeSdfUrl = propValues.shapeSdfUrl || "";
-			const shapeType = propValues.shapeType || "";
-			if (shapeSdfUrl) {
-				sampler = createSvgSdfSampler(params, shapeSdfUrl);
-				gradSampler = sampler;
-				volumetric = isVolumetricShapeType(shapeType);
-			} else {
-				const st = resolveShapeType(shapeType, getCpuValue("shape"));
-				sampler = createAnalyticSdfSampler(st, driveAnalyticSubProps(params, () => getCpuValue("shape")), "raw");
-				gradSampler = sampler;
-				volumetric = is3dShapeType(st);
-			}
-		}
+		const { uniforms, ctx } = params;
+		const { sampler, gradSampler, volumetric } = resolveShapeFieldSampler(params, { patternMode: "raw" });
 		const sdfUV = call(sdfSpaceUV, "sdfSpaceUV", [
 			uniforms.center,
 			uniforms.scale,

package/dist/core/{Watercolor-C7vDF39A.js → Watercolor-BWx4xdwk.js}

@@ -1,6 +1,6 @@
-import { At as min, N as blend_exports, P as unpremultiplyAlpha, Wt as data_exports, _ as expr, an as vec3f, b as vec4, cn as f32, d as ZERO, ht as select, jt as mix, m as call, nn as vec2f, rt as std_exports, sn as vec4f, tt as src_default, v as floatE, x as Expr } from "./edges-Dm0I-Ud7.js";
-import { p as noise_exports, y as value12 } from "./noise-C_ZfgxTN.js";
-import { a as transformColor } from "./transformations-CsPUHppB.js";
+import { F as blend_exports, Gt as data_exports, I as unpremultiplyAlpha, Mt as mix, S as Expr, at as std_exports, cn as vec4f, f as ZERO, gt as select, h as call, jt as min, on as vec3f, rn as vec2f, rt as src_default, un as f32, v as expr, x as vec4, y as floatE } from "./edges-CD7gCAto.js";
+import { p as noise_exports, y as value12 } from "./noise-Bd6IGS0W.js";
+import { a as transformColor } from "./transformations-B-zNWNdd.js";
 const watercolorUvBase = src_default.fn([
 	vec2f,
 	vec2f,

package/dist/core/{WaveDistortion-DMfhW-zm.js → WaveDistortion-CRQzZDLP.js}

@@ -1,8 +1,9 @@
-import { Dt as fract, Ht as step, P as unpremultiplyAlpha, Wt as data_exports, c as sampleRemappedExpr, cn as f32, d as ZERO, gt as abs, m as call, n as composeEdgeRemapExpr, nn as vec2f, rt as std_exports, tt as src_default, xt as cos, zt as sin } from "./edges-Dm0I-Ud7.js";
-import { t as animatedTime } from "./porters-DnWlc17D.js";
-import { s as transformEdges } from "./transformations-CsPUHppB.js";
-var DEG_TO_RAD = Math.PI / 180;
-var TAU = Math.PI * 2;
+import { Bt as sin, Gt as data_exports, Ot as fract, St as cos, Ut as step, _t as abs, at as std_exports, h as call, rn as vec2f, rt as src_default, un as f32 } from "./edges-CD7gCAto.js";
+import { o as TAU$1, t as DEG_TO_RAD$1 } from "./constants-DoOzbl5b.js";
+import { E as uvRemapShader, t as animatedTime } from "./porters-DUtQounc.js";
+import { n as edgesPropConfig } from "./propConfigs-k3hs8KYL.js";
+var DEG_TO_RAD = DEG_TO_RAD$1;
+var TAU = TAU$1;
 const wavePhase = src_default.fn([
 	vec2f,
 	f32,
@@ -1054,70 +1055,21 @@ const componentDefinition = {
 				group: "Effect"
 			}
 		},
-		edges: {
-			default: "stretch",
-			description: "How to handle edges when distortion pushes content out of bounds",
-			transform: transformEdges,
-			compileTime: true,
-			ui: {
-				type: "select",
-				options: [
-					{
-						label: "Stretch",
-						value: "stretch"
-					},
-					{
-						label: "Transparent",
-						value: "transparent"
-					},
-					{
-						label: "Mirror",
-						value: "mirror"
-					},
-					{
-						label: "Wrap",
-						value: "wrap"
-					}
-				],
-				label: "Edges",
-				group: "Effect"
-			}
-		}
+		edges: edgesPropConfig("stretch", "How to handle edges when distortion pushes content out of bounds")
 	},
-	fragment: (params) => {
-		const { uniforms, childNode, ctx, propValues, convertToTexture } = params;
-		if (!childNode) {
-			console.error("You must pass a child component into the WaveDistortion shader.");
-			return ZERO;
-		}
-		const texture = convertToTexture(childNode);
-		const edgeMode = propValues.edges ?? 0;
-		const waveType = waveTypeMode(propValues.waveType);
+	...uvRemapShader((params) => {
+		const { fn, hint } = waveBodyFor(waveTypeMode(params.propValues.waveType));
 		const t = animatedTime(params).mul(.5);
-		const { fn, hint } = waveBodyFor(waveType);
-		return call(unpremultiplyAlpha, "unpremultiplyAlpha", [sampleRemappedExpr(texture, call(fn, hint, [
-			ctx.uv,
-			ctx.aspect,
-			uniforms.angle,
-			uniforms.frequency,
-			uniforms.strength,
-			t
-		]), edgeMode)]);
-	},
-	uvRemap: (ctx) => {
-		const edgeMode = ctx.propValues.edges ?? 0;
-		const waveType = waveTypeMode(ctx.propValues.waveType);
-		const t = animatedTime(ctx).mul(.5);
-		const { fn, hint } = waveBodyFor(waveType);
-		return composeEdgeRemapExpr(call(fn, hint, [
-			ctx.uv,
-			ctx.aspect,
-			ctx.uniforms.angle,
-			ctx.uniforms.frequency,
-			ctx.uniforms.strength,
+		const u = params.uniforms;
+		return { map: (uv, aspect) => call(fn, hint, [
+			uv,
+			aspect,
+			u.angle,
+			u.frequency,
+			u.strength,
 			t
-		]), ctx.mask, edgeMode);
-	}
+		]) };
+	}, { requireChildMessage: "You must pass a child component into the WaveDistortion shader." })
 };
 var WaveDistortion_default = componentDefinition;
 export { waveDistortSawtooth as a, waveDistortTriangle as c, waveDistortBounce as i, wavePhase as l, componentDefinition as n, waveDistortSine as o, waveApply as r, waveDistortSquare as s, WaveDistortion_default as t };