shaders 3.0.452 → 3.1.454

package/dist/core/{TriangularGrid-CUSkwEhh.js → TriangularGrid-C3DBCmaj.js}

@@ -1,9 +1,14 @@
-import { At as min, Bt as smoothstep, Ct as dot, Dt as fract, Et as floor, Ht as step, U as mixColorsLinear, W as mixColorsVariants, Wt as data_exports, b as vec4, cn as f32, gt as abs, kt as max, m as call, nn as vec2f, rt as std_exports, tt as src_default, ut as fwidth, xt as cos, zt as sin } from "./edges-Dm0I-Ud7.js";
-import { t as animatedTime } from "./porters-DnWlc17D.js";
-import { a as transformColor, o as transformColorSpace, r as transformAngle, t as colorSpaceOptions } from "./transformations-CsPUHppB.js";
-var DEG_TO_RAD = Math.PI / 180;
-var SQRT3 = Math.sqrt(3);
-var TWO_OVER_SQRT3 = 2 / Math.sqrt(3);
+import { At as max, Bt as sin, Dt as floor, G as mixColorsLinear, Gt as data_exports, K as mixColorsVariants, Ot as fract, St as cos, Ut as step, _t as abs, at as std_exports, ft as fwidth, h as call, jt as min, rn as vec2f, rt as src_default, un as f32, x as vec4 } from "./edges-CD7gCAto.js";
+import { t as DEG_TO_RAD$1 } from "./constants-DoOzbl5b.js";
+import { r as geom_exports } from "./geom-90G-d_hc.js";
+import { n as cells_exports } from "./cells-CM9mfnTr.js";
+import { t as aa_exports } from "./aa-C8WSqiNB.js";
+import { t as animatedTime } from "./porters-DUtQounc.js";
+import { a as transformColor, o as transformColorSpace, r as transformAngle, t as colorSpaceOptions } from "./transformations-B-zNWNdd.js";
+var DEG_TO_RAD = DEG_TO_RAD$1;
+var { aspectOf, rotateAboutCanvasCentre } = geom_exports;
+var { triLattice, cellHash, rowSpeedHash, rowSpeedMultiplier, variationFactor } = cells_exports;
+var { lineMaskFromField } = aa_exports;
 const triangularGridField = src_default.fn([
 	vec2f,
 	vec2f,
@@ -16,33 +21,21 @@ const triangularGridField = src_default.fn([
 	f32
 ], vec2f)(/* @__PURE__ */ (($) => (globalThis.__TYPEGPU_META__ ??= /* @__PURE__ */ new WeakMap()).set($.f = ((uv, viewport, cells, thickness, rotation, softness, variation, speedVariance, animTime) => {
 	"use gpu";
-	const aspect = __tsover_div(viewport.x, viewport.y);
+	const aspect = aspectOf(viewport);
 	const correctedUV = vec2f(__tsover_mul(uv.x, aspect), __tsover_sub(1, uv.y));
 	const ang = __tsover_mul(rotation, DEG_TO_RAD);
-	const cosR = cos(ang);
-	const sinR = sin(ang);
-	const centerX = __tsover_mul(aspect, .5);
-	const centerY = .5;
-	const cx = __tsover_sub(correctedUV.x, centerX);
-	const cy = __tsover_sub(correctedUV.y, centerY);
-	const p = vec2f(__tsover_add(__tsover_sub(__tsover_mul(cx, cosR), __tsover_mul(cy, sinR)), centerX), __tsover_add(__tsover_add(__tsover_mul(cx, sinR), __tsover_mul(cy, cosR)), centerY)).mul(cells);
-	const ps = vec2f(__tsover_sub(p.x, __tsover_div(p.y, SQRT3)), __tsover_mul(p.y, TWO_OVER_SQRT3));
-	const rowIndex = floor(ps.y);
-	const rowHash = fract(__tsover_mul(sin(__tsover_mul(rowIndex, 127.1)), 43758.5453));
-	const speedMod = __tsover_add(1, __tsover_mul(__tsover_mul(__tsover_sub(rowHash, .5), 4), speedVariance));
+	const ps = triLattice(rotateAboutCanvasCentre(correctedUV, aspect, cos(ang), sin(ang)).mul(cells));
+	const speedMod = rowSpeedMultiplier(rowSpeedHash(floor(ps.y)), speedVariance);
 	const drift = __tsover_mul(animTime, speedMod);
 	const psShifted = vec2f(__tsover_sub(ps.x, drift), ps.y);
 	const cell = floor(psShifted);
 	const f = fract(psShifted);
 	const upper = step(1, __tsover_add(f.x, f.y));
-	const q0 = fract(vec2f(__tsover_add(__tsover_mul(cell.x, 2), upper), cell.y).mul(vec2f(123.34, 345.45)));
-	const q1 = q0.add(dot(q0, q0.add(34.345)));
-	const rand = fract(__tsover_mul(q1.x, q1.y));
-	const variedFactor = max(__tsover_add(1, __tsover_mul(__tsover_mul(__tsover_sub(rand, .5), 2), variation)), 0);
+	const variedFactor = variationFactor(cellHash(vec2f(__tsover_add(__tsover_mul(cell.x, 2), upper), cell.y)), variation);
 	const dEdge = min(min(min(f.x, __tsover_sub(1, f.x)), min(f.y, __tsover_sub(1, f.y))), abs(__tsover_sub(__tsover_add(f.x, f.y), 1)));
 	const lineWidth = __tsover_mul(thickness, .02);
-	const aa = __tsover_add(max(fwidth(ps.x), fwidth(ps.y)), __tsover_mul(softness, .5));
-	return vec2f(__tsover_mul(__tsover_sub(1, smoothstep(__tsover_sub(lineWidth, aa), __tsover_add(lineWidth, aa), dEdge)), step(1e-4, lineWidth)), variedFactor);
+	const aaWidth = __tsover_add(max(fwidth(ps.x), fwidth(ps.y)), __tsover_mul(softness, .5));
+	return vec2f(lineMaskFromField(dEdge, lineWidth, __tsover_sub(lineWidth, aaWidth), __tsover_add(lineWidth, aaWidth)), variedFactor);
 }), {
 	v: 1,
 	name: void 0,
@@ -90,18 +83,9 @@ const triangularGridField = src_default.fn([
 				13,
 				"aspect",
 				[
-					1,
-					[
-						7,
-						"viewport",
-						"x"
-					],
-					"/",
-					[
-						7,
-						"viewport",
-						"y"
-					]
+					6,
+					"aspectOf",
+					["viewport"]
 				]
 			],
 			[
@@ -171,100 +155,18 @@ const triangularGridField = src_default.fn([
 					["ang"]
 				]
 			],
-			[
-				13,
-				"centerX",
-				[
-					1,
-					"aspect",
-					"*",
-					[5, "0.5"]
-				]
-			],
-			[
-				13,
-				"centerY",
-				[5, "0.5"]
-			],
-			[
-				13,
-				"cx",
-				[
-					1,
-					[
-						7,
-						"correctedUV",
-						"x"
-					],
-					"-",
-					"centerX"
-				]
-			],
-			[
-				13,
-				"cy",
-				[
-					1,
-					[
-						7,
-						"correctedUV",
-						"y"
-					],
-					"-",
-					"centerY"
-				]
-			],
 			[
 				13,
 				"rotatedUV",
 				[
 					6,
+					"rotateAboutCanvasCentre",
 					[
-						7,
-						"d",
-						"vec2f"
-					],
-					[[
-						1,
-						[
-							1,
-							[
-								1,
-								"cx",
-								"*",
-								"cosR"
-							],
-							"-",
-							[
-								1,
-								"cy",
-								"*",
-								"sinR"
-							]
-						],
-						"+",
-						"centerX"
-					], [
-						1,
-						[
-							1,
-							[
-								1,
-								"cx",
-								"*",
-								"sinR"
-							],
-							"+",
-							[
-								1,
-								"cy",
-								"*",
-								"cosR"
-							]
-						],
-						"+",
-						"centerY"
-					]]
+						"correctedUV",
+						"aspect",
+						"cosR",
+						"sinR"
+					]
 				]
 			],
 			[
@@ -285,39 +187,8 @@ const triangularGridField = src_default.fn([
 				"ps",
 				[
 					6,
-					[
-						7,
-						"d",
-						"vec2f"
-					],
-					[[
-						1,
-						[
-							7,
-							"p",
-							"x"
-						],
-						"-",
-						[
-							1,
-							[
-								7,
-								"p",
-								"y"
-							],
-							"/",
-							"SQRT3"
-						]
-					], [
-						1,
-						[
-							7,
-							"p",
-							"y"
-						],
-						"*",
-						"TWO_OVER_SQRT3"
-					]]
+					"triLattice",
+					["p"]
 				]
 			],
 			[
@@ -339,58 +210,15 @@ const triangularGridField = src_default.fn([
 			],
 			[
 				13,
-				"rowHash",
+				"speedMod",
 				[
 					6,
-					[
-						7,
-						"std",
-						"fract"
-					],
+					"rowSpeedMultiplier",
 					[[
-						1,
-						[
-							6,
-							[
-								7,
-								"std",
-								"sin"
-							],
-							[[
-								1,
-								"rowIndex",
-								"*",
-								[5, "127.1"]
-							]]
-						],
-						"*",
-						[5, "43758.5453"]
-					]]
-				]
-			],
-			[
-				13,
-				"speedMod",
-				[
-					1,
-					[5, "1"],
-					"+",
-					[
-						1,
-						[
-							1,
-							[
-								1,
-								"rowHash",
-								"-",
-								[5, "0.5"]
-							],
-							"*",
-							[5, "4"]
-						],
-						"*",
-						"speedVariance"
-					]
+						6,
+						"rowSpeedHash",
+						["rowIndex"]
+					], "speedVariance"]
 				]
 			],
 			[
@@ -512,88 +340,13 @@ const triangularGridField = src_default.fn([
 					]]
 				]
 			],
-			[
-				13,
-				"q0",
-				[
-					6,
-					[
-						7,
-						"std",
-						"fract"
-					],
-					[[
-						6,
-						[
-							7,
-							"triId",
-							"mul"
-						],
-						[[
-							6,
-							[
-								7,
-								"d",
-								"vec2f"
-							],
-							[[5, "123.34"], [5, "345.45"]]
-						]]
-					]]
-				]
-			],
-			[
-				13,
-				"q1",
-				[
-					6,
-					[
-						7,
-						"q0",
-						"add"
-					],
-					[[
-						6,
-						[
-							7,
-							"std",
-							"dot"
-						],
-						["q0", [
-							6,
-							[
-								7,
-								"q0",
-								"add"
-							],
-							[[5, "34.345"]]
-						]]
-					]]
-				]
-			],
 			[
 				13,
 				"rand",
 				[
 					6,
-					[
-						7,
-						"std",
-						"fract"
-					],
-					[[
-						1,
-						[
-							7,
-							"q1",
-							"x"
-						],
-						"*",
-						[
-							7,
-							"q1",
-							"y"
-						]
-					]]
+					"cellHash",
+					["triId"]
 				]
 			],
 			[
@@ -601,32 +354,8 @@ const triangularGridField = src_default.fn([
 				"variedFactor",
 				[
 					6,
-					[
-						7,
-						"std",
-						"max"
-					],
-					[[
-						1,
-						[5, "1"],
-						"+",
-						[
-							1,
-							[
-								1,
-								[
-									1,
-									"rand",
-									"-",
-									[5, "0.5"]
-								],
-								"*",
-								[5, "2"]
-							],
-							"*",
-							"variation"
-						]
-					], [5, "0"]]
+					"variationFactor",
+					["rand", "variation"]
 				]
 			],
 			[
@@ -730,7 +459,7 @@ const triangularGridField = src_default.fn([
 			],
 			[
 				13,
-				"aa",
+				"aaWidth",
 				[
 					1,
 					[
@@ -779,44 +508,23 @@ const triangularGridField = src_default.fn([
 				13,
 				"lineMask",
 				[
-					1,
-					[
-						1,
-						[5, "1"],
-						"-",
-						[
-							6,
-							[
-								7,
-								"std",
-								"smoothstep"
-							],
-							[
-								[
-									1,
-									"lineWidth",
-									"-",
-									"aa"
-								],
-								[
-									1,
-									"lineWidth",
-									"+",
-									"aa"
-								],
-								"dEdge"
-							]
-						]
-					],
-					"*",
+					6,
+					"lineMaskFromField",
 					[
-						6,
+						"dEdge",
+						"lineWidth",
 						[
-							7,
-							"std",
-							"step"
+							1,
+							"lineWidth",
+							"-",
+							"aaWidth"
 						],
-						[[5, "0.0001"], "lineWidth"]
+						[
+							1,
+							"lineWidth",
+							"+",
+							"aaWidth"
+						]
 					]
 				]
 			],
@@ -831,19 +539,31 @@ const triangularGridField = src_default.fn([
 			]]
 		]],
 		"externalNames": [
+			"aspectOf",
 			"d",
 			"DEG_TO_RAD",
 			"std",
-			"SQRT3",
-			"TWO_OVER_SQRT3"
+			"rotateAboutCanvasCentre",
+			"triLattice",
+			"rowSpeedMultiplier",
+			"rowSpeedHash",
+			"cellHash",
+			"variationFactor",
+			"lineMaskFromField"
 		]
 	},
 	externals: () => ({
+		aspectOf,
 		d: data_exports,
 		DEG_TO_RAD,
 		std: std_exports,
-		SQRT3,
-		TWO_OVER_SQRT3
+		rotateAboutCanvasCentre,
+		triLattice,
+		rowSpeedMultiplier,
+		rowSpeedHash,
+		cellHash,
+		variationFactor,
+		lineMaskFromField
 	})
 }) && $.f)({}));
 const componentDefinition = {

package/dist/core/{Tritone-0AbzRJ53.js → Tritone-DfULv51I.js}

@@ -1,5 +1,6 @@
-import { Bt as smoothstep, Ct as dot, U as mixColorsLinear, W as mixColorsVariants, Wt as data_exports, an as vec3f, b as vec4, cn as f32, d as ZERO, m as call, rt as std_exports, sn as vec4f, tt as src_default } from "./edges-Dm0I-Ud7.js";
-import { a as transformColor, o as transformColorSpace, t as colorSpaceOptions } from "./transformations-CsPUHppB.js";
+import { G as mixColorsLinear, Gt as data_exports, K as mixColorsVariants, Vt as smoothstep, at as std_exports, cn as vec4f, h as call, on as vec3f, rt as src_default, un as f32, wt as dot, x as vec4 } from "./edges-CD7gCAto.js";
+import { S as definePointwiseFilter } from "./porters-DUtQounc.js";
+import { a as transformColor, o as transformColorSpace, t as colorSpaceOptions } from "./transformations-B-zNWNdd.js";
 const tritoneFactors = src_default.fn([vec4f, f32], vec3f)(/* @__PURE__ */ (($) => (globalThis.__TYPEGPU_META__ ??= /* @__PURE__ */ new WeakMap()).set($.f = ((color, blendMid) => {
 	"use gpu";
 	const luminance = dot(color.xyz, vec3f(.299, .587, .114));
@@ -137,12 +138,11 @@ const tritoneFactors = src_default.fn([vec4f, f32], vec3f)(/* @__PURE__ */ (($)
 		d: data_exports
 	})
 }) && $.f)({}));
-const componentDefinition = {
+const componentDefinition = definePointwiseFilter({
 	name: "Tritone",
 	boundingBoxDeclaration: { aspectRatio: null },
 	category: "Adjustments",
 	description: "Map colors to three tones: shadows, midtones, highlights",
-	requiresChild: true,
 	props: {
 		colorA: {
 			default: "#ce1bea",
@@ -199,9 +199,12 @@ const componentDefinition = {
 			}
 		}
 	},
-	fragment: ({ uniforms, childNode, propValues }) => {
-		if (!childNode) return ZERO;
-		const factors = call(tritoneFactors, "tritoneFactors", [childNode, uniforms.blendMid]);
+	body: {
+		fn: tritoneFactors,
+		hint: "tritoneFactors"
+	},
+	args: ({ uniforms }) => [uniforms.blendMid],
+	compose: (factors, { uniforms, childNode, propValues }) => {
 		const shadowToMid = factors.member("x");
 		const midToHighlight = factors.member("y");
 		const finalT = factors.member("z");
@@ -220,6 +223,6 @@ const componentDefinition = {
 			finalT
 		]).member("rgb"), childNode.member("a"));
 	}
-};
+});
 var Tritone_default = componentDefinition;
 export { componentDefinition as n, tritoneFactors as r, Tritone_default as t };