shaders 3.0.449 → 3.0.450

package/dist/core/{Watercolor-B343pgM-.js → Watercolor-BAShYSu7.js}

@@ -1,297 +1,6 @@
-import { $t as vec2f, Ct as floor, Dt as min, It as sin, N as unpremultiplyAlpha, Ot as mix, Vt as data_exports, _ as floatE, an as f32, bt as dot, d as ZERO, et as src_default, g as expr, in as vec4f, nn as vec3f, nt as std_exports, p as call, pt as select, wt as fract, y as vec4 } from "./edges-BXNBKxSN.js";
+import { At as mix, M as blend_exports, N as unpremultiplyAlpha, Ut as data_exports, _ as floatE, b as Expr, d as ZERO, et as src_default, g as expr, in as vec3f, kt as min, mt as select, nt as std_exports, on as vec4f, p as call, sn as f32, tn as vec2f, y as vec4 } from "./edges-BZUKQxSE.js";
+import { p as noise_exports, y as value12 } from "./noise-Cq0KUOSC.js";
 import { a as transformColor } from "./transformations-CsPUHppB.js";
-var hash21 = src_default.fn([vec2f], f32)(/* @__PURE__ */ (($) => (globalThis.__TYPEGPU_META__ ??= /* @__PURE__ */ new WeakMap()).set($.f = ((p) => {
-	"use gpu";
-	return fract(__tsover_mul(sin(dot(p, vec2f(12.9898, 78.233))), 43758.5453));
-}), {
-	v: 1,
-	name: void 0,
-	ast: {
-		"params": [{
-			"type": "i",
-			"name": "p"
-		}],
-		"body": [0, [[10, [
-			6,
-			[
-				7,
-				"std",
-				"fract"
-			],
-			[[
-				1,
-				[
-					6,
-					[
-						7,
-						"std",
-						"sin"
-					],
-					[[
-						6,
-						[
-							7,
-							"std",
-							"dot"
-						],
-						["p", [
-							6,
-							[
-								7,
-								"d",
-								"vec2f"
-							],
-							[[5, "12.9898"], [5, "78.233"]]
-						]]
-					]]
-				],
-				"*",
-				[5, "43758.5453"]
-			]]
-		]]]],
-		"externalNames": ["std", "d"]
-	},
-	externals: () => ({
-		std: std_exports,
-		d: data_exports
-	})
-}) && $.f)({}));
-var vnoise = src_default.fn([vec2f], f32)(/* @__PURE__ */ (($) => (globalThis.__TYPEGPU_META__ ??= /* @__PURE__ */ new WeakMap()).set($.f = ((p) => {
-	"use gpu";
-	const i = floor(p);
-	const f = fract(p);
-	const u = f.mul(f).mul(vec2f(3, 3).sub(f.mul(2)));
-	const a = hash21(i);
-	const b = hash21(i.add(vec2f(1, 0)));
-	const c = hash21(i.add(vec2f(0, 1)));
-	const dd = hash21(i.add(vec2f(1, 1)));
-	return mix(mix(a, b, u.x), mix(c, dd, u.x), u.y);
-}), {
-	v: 1,
-	name: void 0,
-	ast: {
-		"params": [{
-			"type": "i",
-			"name": "p"
-		}],
-		"body": [0, [
-			[
-				13,
-				"i",
-				[
-					6,
-					[
-						7,
-						"std",
-						"floor"
-					],
-					["p"]
-				]
-			],
-			[
-				13,
-				"f",
-				[
-					6,
-					[
-						7,
-						"std",
-						"fract"
-					],
-					["p"]
-				]
-			],
-			[
-				13,
-				"u",
-				[
-					6,
-					[
-						7,
-						[
-							6,
-							[
-								7,
-								"f",
-								"mul"
-							],
-							["f"]
-						],
-						"mul"
-					],
-					[[
-						6,
-						[
-							7,
-							[
-								6,
-								[
-									7,
-									"d",
-									"vec2f"
-								],
-								[[5, "3"], [5, "3"]]
-							],
-							"sub"
-						],
-						[[
-							6,
-							[
-								7,
-								"f",
-								"mul"
-							],
-							[[5, "2"]]
-						]]
-					]]
-				]
-			],
-			[
-				13,
-				"a",
-				[
-					6,
-					"hash21",
-					["i"]
-				]
-			],
-			[
-				13,
-				"b",
-				[
-					6,
-					"hash21",
-					[[
-						6,
-						[
-							7,
-							"i",
-							"add"
-						],
-						[[
-							6,
-							[
-								7,
-								"d",
-								"vec2f"
-							],
-							[[5, "1"], [5, "0"]]
-						]]
-					]]
-				]
-			],
-			[
-				13,
-				"c",
-				[
-					6,
-					"hash21",
-					[[
-						6,
-						[
-							7,
-							"i",
-							"add"
-						],
-						[[
-							6,
-							[
-								7,
-								"d",
-								"vec2f"
-							],
-							[[5, "0"], [5, "1"]]
-						]]
-					]]
-				]
-			],
-			[
-				13,
-				"dd",
-				[
-					6,
-					"hash21",
-					[[
-						6,
-						[
-							7,
-							"i",
-							"add"
-						],
-						[[
-							6,
-							[
-								7,
-								"d",
-								"vec2f"
-							],
-							[[5, "1"], [5, "1"]]
-						]]
-					]]
-				]
-			],
-			[10, [
-				6,
-				[
-					7,
-					"std",
-					"mix"
-				],
-				[
-					[
-						6,
-						[
-							7,
-							"std",
-							"mix"
-						],
-						[
-							"a",
-							"b",
-							[
-								7,
-								"u",
-								"x"
-							]
-						]
-					],
-					[
-						6,
-						[
-							7,
-							"std",
-							"mix"
-						],
-						[
-							"c",
-							"dd",
-							[
-								7,
-								"u",
-								"x"
-							]
-						]
-					],
-					[
-						7,
-						"u",
-						"y"
-					]
-				]
-			]]
-		]],
-		"externalNames": [
-			"std",
-			"d",
-			"hash21"
-		]
-	},
-	externals: () => ({
-		std: std_exports,
-		d: data_exports,
-		hash21
-	})
-}) && $.f)({}));
 const watercolorUvBase = src_default.fn([
 	vec2f,
 	vec2f,
@@ -300,7 +9,7 @@ const watercolorUvBase = src_default.fn([
 ], vec2f)(/* @__PURE__ */ (($) => (globalThis.__TYPEGPU_META__ ??= /* @__PURE__ */ new WeakMap()).set($.f = ((uv, viewport, bleed, time) => {
 	"use gpu";
 	const t = __tsover_mul(time, .03);
-	const wob = vec2f(vnoise(uv.mul(5).add(vec2f(t, t))), vnoise(uv.mul(5).add(vec2f(31.4, 31.4)).add(vec2f(t, t)))).sub(vec2f(.5, .5));
+	const wob = vec2f(value12(uv.mul(5).add(vec2f(t, t))), value12(uv.mul(5).add(vec2f(31.4, 31.4)).add(vec2f(t, t)))).sub(vec2f(.5, .5));
 	const texel = vec2f(__tsover_div(1, viewport.x), __tsover_div(1, viewport.y));
 	return uv.add(wob.mul(bleed).mul(texel).mul(8));
 }), {
@@ -352,7 +61,11 @@ const watercolorUvBase = src_default.fn([
 							],
 							[[
 								6,
-								"vnoise",
+								[
+									7,
+									"noise",
+									"value12"
+								],
 								[[
 									6,
 									[
@@ -380,7 +93,11 @@ const watercolorUvBase = src_default.fn([
 								]]
 							], [
 								6,
-								"vnoise",
+								[
+									7,
+									"noise",
+									"value12"
+								],
 								[[
 									6,
 									[
@@ -502,11 +219,11 @@ const watercolorUvBase = src_default.fn([
 				]]
 			]]
 		]],
-		"externalNames": ["d", "vnoise"]
+		"externalNames": ["d", "noise"]
 	},
 	externals: () => ({
 		d: data_exports,
-		vnoise
+		noise: noise_exports
 	})
 }) && $.f)({}));
 const watercolorTapUV = src_default.fn([
@@ -590,7 +307,7 @@ const watercolorTapUV = src_default.fn([
 }) && $.f)({}));
 const watercolorGrain = src_default.fn([vec2f, vec2f], f32)(/* @__PURE__ */ (($) => (globalThis.__TYPEGPU_META__ ??= /* @__PURE__ */ new WeakMap()).set($.f = ((uv, viewport) => {
 	"use gpu";
-	return vnoise(uv.mul(viewport).mul(.5));
+	return value12(uv.mul(viewport).mul(.5));
 }), {
 	v: 1,
 	name: void 0,
@@ -604,7 +321,11 @@ const watercolorGrain = src_default.fn([vec2f, vec2f], f32)(/* @__PURE__ */ (($)
 		}],
 		"body": [0, [[10, [
 			6,
-			"vnoise",
+			[
+				7,
+				"noise",
+				"value12"
+			],
 			[[
 				6,
 				[
@@ -623,15 +344,15 @@ const watercolorGrain = src_default.fn([vec2f, vec2f], f32)(/* @__PURE__ */ (($)
 				[[5, "0.5"]]
 			]]
 		]]]],
-		"externalNames": ["vnoise"]
+		"externalNames": ["noise"]
 	},
-	externals: () => ({ vnoise })
+	externals: () => ({ noise: noise_exports })
 }) && $.f)({}));
 const watercolorCompose = src_default.fn([
-	vec3f,
-	vec3f,
-	vec3f,
-	vec3f,
+	vec4f,
+	vec4f,
+	vec4f,
+	vec4f,
 	vec3f,
 	vec3f,
 	vec3f,
@@ -648,22 +369,28 @@ const watercolorCompose = src_default.fn([
 	const mean1 = sum1.mul(invN);
 	const mean2 = sum2.mul(invN);
 	const mean3 = sum3.mul(invN);
-	const var0 = sq0.mul(invN).sub(mean0.mul(mean0));
-	const var1 = sq1.mul(invN).sub(mean1.mul(mean1));
-	const var2 = sq2.mul(invN).sub(mean2.mul(mean2));
-	const var3 = sq3.mul(invN).sub(mean3.mul(mean3));
+	const rgb0 = vec3f(mean0.x, mean0.y, mean0.z);
+	const rgb1 = vec3f(mean1.x, mean1.y, mean1.z);
+	const rgb2 = vec3f(mean2.x, mean2.y, mean2.z);
+	const rgb3 = vec3f(mean3.x, mean3.y, mean3.z);
+	const var0 = sq0.mul(invN).sub(rgb0.mul(rgb0));
+	const var1 = sq1.mul(invN).sub(rgb1.mul(rgb1));
+	const var2 = sq2.mul(invN).sub(rgb2.mul(rgb2));
+	const var3 = sq3.mul(invN).sub(rgb3.mul(rgb3));
 	const sigma0 = __tsover_add(__tsover_add(var0.x, var0.y), var0.z);
 	const sigma1 = __tsover_add(__tsover_add(var1.x, var1.y), var1.z);
 	const sigma2 = __tsover_add(__tsover_add(var2.x, var2.y), var2.z);
 	const sigma3 = __tsover_add(__tsover_add(var3.x, var3.y), var3.z);
-	let result = vec3f(mean0.x, mean0.y, mean0.z);
+	let picked = vec4f(mean0.x, mean0.y, mean0.z, mean0.w);
 	let best = sigma0;
-	result = select(result, mean1, sigma1 < best);
+	picked = select(picked, mean1, sigma1 < best);
 	best = min(best, sigma1);
-	result = select(result, mean2, sigma2 < best);
+	picked = select(picked, mean2, sigma2 < best);
 	best = min(best, sigma2);
-	result = select(result, mean3, sigma3 < best);
+	picked = select(picked, mean3, sigma3 < best);
 	best = min(best, sigma3);
+	const straight = unpremultiplyAlpha(picked);
+	let result = vec3f(straight.x, straight.y, straight.z);
 	const paperMul = mix(1, grain, paper);
 	const paperTint = vec3f(paperColor.x, paperColor.y, paperColor.z);
 	result = mix(result.mul(paperMul), result.mul(paperTint), vec3f(__tsover_mul(paper, .4)));
@@ -783,6 +510,122 @@ const watercolorCompose = src_default.fn([
 					["invN"]
 				]
 			],
+			[
+				13,
+				"rgb0",
+				[
+					6,
+					[
+						7,
+						"d",
+						"vec3f"
+					],
+					[
+						[
+							7,
+							"mean0",
+							"x"
+						],
+						[
+							7,
+							"mean0",
+							"y"
+						],
+						[
+							7,
+							"mean0",
+							"z"
+						]
+					]
+				]
+			],
+			[
+				13,
+				"rgb1",
+				[
+					6,
+					[
+						7,
+						"d",
+						"vec3f"
+					],
+					[
+						[
+							7,
+							"mean1",
+							"x"
+						],
+						[
+							7,
+							"mean1",
+							"y"
+						],
+						[
+							7,
+							"mean1",
+							"z"
+						]
+					]
+				]
+			],
+			[
+				13,
+				"rgb2",
+				[
+					6,
+					[
+						7,
+						"d",
+						"vec3f"
+					],
+					[
+						[
+							7,
+							"mean2",
+							"x"
+						],
+						[
+							7,
+							"mean2",
+							"y"
+						],
+						[
+							7,
+							"mean2",
+							"z"
+						]
+					]
+				]
+			],
+			[
+				13,
+				"rgb3",
+				[
+					6,
+					[
+						7,
+						"d",
+						"vec3f"
+					],
+					[
+						[
+							7,
+							"mean3",
+							"x"
+						],
+						[
+							7,
+							"mean3",
+							"y"
+						],
+						[
+							7,
+							"mean3",
+							"z"
+						]
+					]
+				]
+			],
 			[
 				13,
 				"var0",
@@ -805,10 +648,10 @@ const watercolorCompose = src_default.fn([
 						6,
 						[
 							7,
-							"mean0",
+							"rgb0",
 							"mul"
 						],
-						["mean0"]
+						["rgb0"]
 					]]
 				]
 			],
@@ -834,10 +677,10 @@ const watercolorCompose = src_default.fn([
 						6,
 						[
 							7,
-							"mean1",
+							"rgb1",
 							"mul"
 						],
-						["mean1"]
+						["rgb1"]
 					]]
 				]
 			],
@@ -863,10 +706,10 @@ const watercolorCompose = src_default.fn([
 						6,
 						[
 							7,
-							"mean2",
+							"rgb2",
 							"mul"
 						],
-						["mean2"]
+						["rgb2"]
 					]]
 				]
 			],
@@ -892,10 +735,10 @@ const watercolorCompose = src_default.fn([
 						6,
 						[
 							7,
-							"mean3",
+							"rgb3",
 							"mul"
 						],
-						["mean3"]
+						["rgb3"]
 					]]
 				]
 			],
@@ -1009,13 +852,13 @@ const watercolorCompose = src_default.fn([
 			],
 			[
 				12,
-				"result",
+				"picked",
 				[
 					6,
 					[
 						7,
 						"d",
-						"vec3f"
+						"vec4f"
 					],
 					[
 						[
@@ -1032,6 +875,11 @@ const watercolorCompose = src_default.fn([
 							7,
 							"mean0",
 							"z"
+						],
+						[
+							7,
+							"mean0",
+							"w"
 						]
 					]
 				]
@@ -1043,7 +891,7 @@ const watercolorCompose = src_default.fn([
 			],
 			[
 				2,
-				"result",
+				"picked",
 				"=",
 				[
 					6,
@@ -1053,7 +901,7 @@ const watercolorCompose = src_default.fn([
 						"select"
 					],
 					[
-						"result",
+						"picked",
 						"mean1",
 						[
 							1,
@@ -1080,7 +928,7 @@ const watercolorCompose = src_default.fn([
 			],
 			[
 				2,
-				"result",
+				"picked",
 				"=",
 				[
 					6,
@@ -1090,7 +938,7 @@ const watercolorCompose = src_default.fn([
 						"select"
 					],
 					[
-						"result",
+						"picked",
 						"mean2",
 						[
 							1,
@@ -1117,7 +965,7 @@ const watercolorCompose = src_default.fn([
 			],
 			[
 				2,
-				"result",
+				"picked",
 				"=",
 				[
 					6,
@@ -1127,7 +975,7 @@ const watercolorCompose = src_default.fn([
 						"select"
 					],
 					[
-						"result",
+						"picked",
 						"mean3",
 						[
 							1,
@@ -1152,6 +1000,48 @@ const watercolorCompose = src_default.fn([
 					["best", "sigma3"]
 				]
 			],
+			[
+				13,
+				"straight",
+				[
+					6,
+					[
+						7,
+						"blend",
+						"unpremultiplyAlpha"
+					],
+					["picked"]
+				]
+			],
+			[
+				12,
+				"result",
+				[
+					6,
+					[
+						7,
+						"d",
+						"vec3f"
+					],
+					[
+						[
+							7,
+							"straight",
+							"x"
+						],
+						[
+							7,
+							"straight",
+							"y"
+						],
+						[
+							7,
+							"straight",
+							"z"
+						]
+					]
+				]
+			],
 			[
 				13,
 				"paperMul",
@@ -1301,13 +1191,19 @@ const watercolorCompose = src_default.fn([
 			],
 			[10, "finalRGB"]
 		]],
-		"externalNames": ["d", "std"]
+		"externalNames": [
+			"d",
+			"std",
+			"blend"
+		]
 	},
 	externals: () => ({
 		d: data_exports,
-		std: std_exports
+		std: std_exports,
+		blend: blend_exports
 	})
 }) && $.f)({}));
+var crossesZero = (previous, next) => previous === 0 !== (next === 0);
 const componentDefinition = {
 	name: "Watercolor",
 	boundingBoxDeclaration: { aspectRatio: null },
@@ -1332,6 +1228,7 @@ const componentDefinition = {
 		},
 		bleed: {
 			default: 1,
+			compileTimeWhen: crossesZero,
 			description: "Amount the pigment bleeds and wobbles past hard edges",
 			ui: {
 				type: ["range", "map"],
@@ -1344,6 +1241,7 @@ const componentDefinition = {
 		},
 		strength: {
 			default: 1,
+			compileTimeWhen: crossesZero,
 			description: "Blend between the original image (0) and the full watercolor effect (1)",
 			ui: {
 				type: ["range", "map"],
@@ -1356,6 +1254,7 @@ const componentDefinition = {
 		},
 		paper: {
 			default: .35,
+			compileTimeWhen: crossesZero,
 			description: "Strength of the paper grain the pigment settles into",
 			ui: {
 				type: ["range", "map"],
@@ -1381,27 +1280,46 @@ const componentDefinition = {
 		if (!childNode) return ZERO;
 		const texture = convertToTexture(childNode);
 		const vp = ctx.viewportSize;
-		const R = Math.max(1, Math.min(8, Math.round(propValues.radius ?? 4)));
-		const invN = 1 / ((R + 1) * (R + 1));
-		const uvBase = call(watercolorUvBase, "watercolorUvBase", [
+		const lvp = ctx.logicalViewportSize;
+		const asLocal = (e, hint) => {
+			const emitted = /* @__PURE__ */ new WeakMap();
+			return new Expr((ec) => {
+				const hit = emitted.get(ec);
+				if (hit !== void 0) return hit;
+				const name = ec.freshLocal(hint);
+				ec.statement(`let ${name} = ${e._emit(ec)};`);
+				emitted.set(ec, name);
+				return name;
+			});
+		};
+		const bleed = propValues.bleed ?? 0;
+		const strength = propValues.strength ?? 1;
+		const paper = propValues.paper ?? 0;
+		const uvBase = bleed === 0 ? ctx.uv : asLocal(call(watercolorUvBase, "watercolorUvBase", [
 			ctx.uv,
-			vp,
+			lvp,
 			uniforms.bleed,
 			ctx.time
-		]);
-		const unpremult = (uv) => call(unpremultiplyAlpha, "unpremultiplyAlpha", [texture.sample(uv)]).member("rgb");
+		]), "wcUvBase");
+		const originalBleed = asLocal(call(unpremultiplyAlpha, "unpremultiplyAlpha", [texture.sample(uvBase)]), "wcOriginal");
+		if (strength === 0) return originalBleed;
+		const R = Math.max(1, Math.min(8, Math.round(propValues.radius ?? 4)));
+		const taps = Math.max(2, Math.ceil((R + 1) / 2));
+		const invN = 1 / (taps * taps);
 		const quadrant = (dx, dy) => {
-			let sum = expr("vec3f(0.0, 0.0, 0.0)");
+			let sum = expr("vec4f(0.0, 0.0, 0.0, 0.0)");
 			let sq = expr("vec3f(0.0, 0.0, 0.0)");
-			for (let j = 0; j <= R; j++) for (let i = 0; i <= R; i++) {
-				const c = unpremult(call(watercolorTapUV, "watercolorTapUV", [
+			for (let j = 0; j < taps; j++) for (let i = 0; i < taps; i++) {
+				const uv = call(watercolorTapUV, "watercolorTapUV", [
 					uvBase,
-					vp,
-					floatE(i * dx),
-					floatE(j * dy)
-				]));
+					lvp,
+					floatE((2 * i + .5) * dx),
+					floatE((2 * j + .5) * dy)
+				]);
+				const c = asLocal(texture.sample(uv), "wcTap");
+				const rgb = c.member("rgb");
 				sum = sum.add(c);
-				sq = sq.add(c.mul(c));
+				sq = sq.add(rgb.mul(rgb));
 			}
 			return {
 				sum,
@@ -1412,8 +1330,7 @@ const componentDefinition = {
 		const q1 = quadrant(1, -1);
 		const q2 = quadrant(-1, 1);
 		const q3 = quadrant(1, 1);
-		const grain = call(watercolorGrain, "watercolorGrain", [ctx.uv, vp]);
-		const originalBleedSample = call(unpremultiplyAlpha, "unpremultiplyAlpha", [texture.sample(uvBase)]);
+		const grain = paper === 0 ? floatE(0) : call(watercolorGrain, "watercolorGrain", [ctx.uv, vp]);
 		return vec4(call(watercolorCompose, "watercolorCompose", [
 			q0.sum,
 			q1.sum,
@@ -1424,12 +1341,12 @@ const componentDefinition = {
 			q2.sq,
 			q3.sq,
 			floatE(invN),
-			originalBleedSample,
+			originalBleed,
 			uniforms.paperColor,
 			uniforms.paper,
 			uniforms.strength,
 			grain
-		]), originalBleedSample.member("a"));
+		]), originalBleed.member("a"));
 	}
 };
 var Watercolor_default = componentDefinition;