shaders 3.2.464 → 3.2.465

package/dist/core/{shapePaints-G_Ap8xID.js → shapePaints-CRpPT5Z5.js}

@@ -1,66 +1,23 @@
-import { $n as vec4f, Bn as reflect, Cn as atan2, En as cos, Fn as min, Gn as sqrt, In as mix, Jn as vec2f, Ln as normalize, Nn as length, On as dot, Pn as max, Rn as pow, Tn as clamp, Un as sin, Wn as smoothstep, Xt as aspectOf, Zn as vec3f, bn as select, hr as f32, in as DEG_TO_RAD, jn as floor, kn as exp, ln as TAU, mn as typegpu_default, sr as struct, xn as abs } from "./lower-z2vuXP8M.js";
-import { t as luma601Dot } from "./tone-BA0D_veZ.js";
-import { a as chromaticRingBand, l as radialGaussianFalloff, t as angularCosineSpikes } from "./lightfields-BjzpZvFy.js";
+import { $n as clamp, An as DEG_TO_RAD, Br as f32, Jn as select, Nr as struct, Pn as TAU, Qt as aspectCorrectedUV, Tr as vec4f, Xt as aspectCenteredDelta, Yn as abs, Zn as atan2, Zt as aspectCentrePosition, _r as smoothstep, an as rotate2, ar as floor, cr as max, en as aspectOf, er as cos, gr as sin, lr as min, rr as exp, sr as length, ur as mix, vr as sqrt, wr as vec3f, xr as vec2f, zn as typegpu_default } from "./lower-DSk_KxOY.js";
+import { t as luma601Dot } from "./tone-Ax72n2WU.js";
+import { a as chromaticRingBand, l as radialGaussianFalloff, t as angularCosineSpikes } from "./lightfields-D5lW4WSp.js";
 var EPS = 1e-5;
-const lineMask = typegpu_default.fn([
-	vec2f,
+const segmentArcPerp = typegpu_default.fn([
 	vec2f,
 	vec2f,
-	vec2f,
-	f32,
-	f32,
-	f32,
-	f32,
-	f32,
-	f32
-], f32)(/* @__PURE__ */ (($) => (globalThis.__TYPEGPU_META__ ??= /* @__PURE__ */ new WeakMap()).set($.f = ((uv, viewport, pointA, pointB, thickness, style, dashLength, gapLength, capStart, capEnd) => {
+	vec2f
+], vec3f)(/* @__PURE__ */ (($) => (globalThis.__TYPEGPU_META__ ??= /* @__PURE__ */ new WeakMap()).set($.f = ((p, a, b) => {
 	"use gpu";
-	const aspect = __tsover_div(viewport.x, viewport.y);
-	const px = __tsover_mul(uv.x, aspect);
-	const ax = __tsover_mul(pointA.x, aspect);
-	const ay = __tsover_sub(1, pointA.y);
-	const bx = __tsover_mul(pointB.x, aspect);
-	const by = __tsover_sub(1, pointB.y);
-	const pax = __tsover_sub(px, ax);
-	const pay = __tsover_sub(uv.y, ay);
-	const bax = __tsover_sub(bx, ax);
-	const bay = __tsover_sub(by, ay);
+	const pax = __tsover_sub(p.x, a.x);
+	const pay = __tsover_sub(p.y, a.y);
+	const bax = __tsover_sub(b.x, a.x);
+	const bay = __tsover_sub(b.y, a.y);
 	const len = max(length(vec2f(bax, bay)), f32(EPS));
 	const t = __tsover_div(__tsover_add(__tsover_mul(pax, bax), __tsover_mul(pay, bay)), len);
 	const overshoot = max(max(-t, __tsover_sub(t, len)), f32(0));
 	const h = clamp(__tsover_div(t, len), f32(0), f32(1));
 	const dSeg = length(vec2f(__tsover_sub(pax, __tsover_mul(bax, h)), __tsover_sub(pay, __tsover_mul(bay, h))));
-	const perp = sqrt(max(__tsover_sub(__tsover_mul(dSeg, dSeg), __tsover_mul(overshoot, overshoot)), f32(0)));
-	const halfT = __tsover_mul(thickness, .5);
-	const cSolid = __tsover_sub(t, __tsover_mul(len, .5));
-	const axSolid = __tsover_mul(len, .5);
-	const rawDash = max(dashLength, f32(EPS));
-	const rawPeriod = __tsover_add(rawDash, gapLength);
-	const nDash = max(floor(__tsover_add(__tsover_div(__tsover_add(len, gapLength), rawPeriod), .5)), f32(1));
-	const scale = __tsover_div(len, max(__tsover_add(__tsover_mul(nDash, rawDash), __tsover_mul(__tsover_sub(nDash, 1), gapLength)), f32(EPS)));
-	const dashL = __tsover_mul(rawDash, scale);
-	const period = __tsover_mul(rawPeriod, scale);
-	const kDash = clamp(floor(__tsover_div(t, period)), f32(0), __tsover_sub(nDash, 1));
-	const cDash = __tsover_sub(t, __tsover_add(__tsover_mul(kDash, period), __tsover_mul(dashL, .5)));
-	const axDashRound = max(__tsover_sub(__tsover_mul(dashL, .5), halfT), f32(0));
-	const axDashSquare = __tsover_mul(dashL, .5);
-	const rawDotPeriod = max(__tsover_add(thickness, gapLength), f32(EPS));
-	const nDot = max(floor(__tsover_add(__tsover_div(len, rawDotPeriod), .5)), f32(1));
-	const dotPeriod = __tsover_div(len, nDot);
-	const kDot = clamp(floor(__tsover_add(__tsover_div(t, dotPeriod), .5)), f32(0), nDot);
-	const cDot = __tsover_sub(t, __tsover_mul(kDot, dotPeriod));
-	const isPattern = style >= .5;
-	const isDotted = style >= 1.5;
-	const c = select(cSolid, select(cDash, cDot, isDotted), isPattern);
-	const axRound = select(axSolid, select(axDashRound, f32(0), isDotted), isPattern);
-	const axSquare = select(axSolid, select(axDashSquare, halfT, isDotted), isPattern);
-	const capHere = select(capStart, capEnd, c > 0);
-	const sdRound = __tsover_sub(length(vec2f(max(__tsover_sub(abs(c), axRound), f32(0)), perp)), halfT);
-	const qx = __tsover_sub(abs(c), axSquare);
-	const qy = __tsover_sub(perp, halfT);
-	const sd = select(__tsover_add(length(vec2f(max(qx, f32(0)), max(qy, f32(0)))), min(max(qx, qy), f32(0))), sdRound, capHere >= .5);
-	const feather = __tsover_div(1, viewport.y);
-	return __tsover_sub(1, smoothstep(-feather, feather, sd));
+	return vec3f(t, sqrt(max(__tsover_sub(__tsover_mul(dSeg, dSeg), __tsover_mul(overshoot, overshoot)), f32(0))), len);
 }), {
 	v: 2,
 	name: void 0,
@@ -68,176 +25,88 @@ const lineMask = typegpu_default.fn([
 		"params": [
 			{
 				"type": "i",
-				"name": "uv"
-			},
-			{
-				"type": "i",
-				"name": "viewport"
-			},
-			{
-				"type": "i",
-				"name": "pointA"
-			},
-			{
-				"type": "i",
-				"name": "pointB"
-			},
-			{
-				"type": "i",
-				"name": "thickness"
-			},
-			{
-				"type": "i",
-				"name": "style"
-			},
-			{
-				"type": "i",
-				"name": "dashLength"
-			},
-			{
-				"type": "i",
-				"name": "gapLength"
+				"name": "p"
 			},
 			{
 				"type": "i",
-				"name": "capStart"
+				"name": "a"
 			},
 			{
 				"type": "i",
-				"name": "capEnd"
+				"name": "b"
 			}
 		],
 		"body": [0, [
 			[
 				13,
-				"aspect",
+				"pax",
 				[
 					1,
 					[
 						7,
-						"viewport",
+						"p",
 						"x"
 					],
-					"/",
-					[
-						7,
-						"viewport",
-						"y"
-					]
-				]
-			],
-			[
-				13,
-				"px",
-				[
-					1,
+					"-",
 					[
 						7,
-						"uv",
+						"a",
 						"x"
-					],
-					"*",
-					"aspect"
+					]
 				]
 			],
 			[
 				13,
-				"ax",
+				"pay",
 				[
 					1,
 					[
 						7,
-						"pointA",
-						"x"
+						"p",
+						"y"
 					],
-					"*",
-					"aspect"
-				]
-			],
-			[
-				13,
-				"ay",
-				[
-					1,
-					[5, "1"],
 					"-",
 					[
 						7,
-						"pointA",
+						"a",
 						"y"
 					]
 				]
 			],
 			[
 				13,
-				"bx",
+				"bax",
 				[
 					1,
 					[
 						7,
-						"pointB",
+						"b",
 						"x"
 					],
-					"*",
-					"aspect"
-				]
-			],
-			[
-				13,
-				"by",
-				[
-					1,
-					[5, "1"],
 					"-",
 					[
 						7,
-						"pointB",
-						"y"
+						"a",
+						"x"
 					]
 				]
 			],
 			[
 				13,
-				"pax",
-				[
-					1,
-					"px",
-					"-",
-					"ax"
-				]
-			],
-			[
-				13,
-				"pay",
+				"bay",
 				[
 					1,
 					[
 						7,
-						"uv",
+						"b",
 						"y"
 					],
 					"-",
-					"ay"
-				]
-			],
-			[
-				13,
-				"bax",
-				[
-					1,
-					"bx",
-					"-",
-					"ax"
-				]
-			],
-			[
-				13,
-				"bay",
-				[
-					1,
-					"by",
-					"-",
-					"ay"
+					[
+						7,
+						"a",
+						"y"
+					]
 				]
 			],
 			[
@@ -403,1437 +272,76 @@ const lineMask = typegpu_default.fn([
 					]]
 				]
 			],
-			[
-				13,
-				"halfT",
-				[
-					1,
-					"thickness",
-					"*",
-					[5, "0.5"]
-				]
-			],
-			[
-				13,
-				"cSolid",
+			[10, [
+				6,
+				"d.vec3f",
 				[
-					1,
 					"t",
-					"-",
-					[
-						1,
-						"len",
-						"*",
-						[5, "0.5"]
-					]
-				]
-			],
-			[
-				13,
-				"axSolid",
-				[
-					1,
-					"len",
-					"*",
-					[5, "0.5"]
-				]
-			],
-			[
-				13,
-				"rawDash",
-				[
-					6,
-					"std.max",
-					["dashLength", [
-						6,
-						"d.f32",
-						["EPS"]
-					]]
-				]
-			],
-			[
-				13,
-				"rawPeriod",
-				[
-					1,
-					"rawDash",
-					"+",
-					"gapLength"
-				]
-			],
-			[
-				13,
-				"nDash",
-				[
-					6,
-					"std.max",
-					[[
-						6,
-						"std.floor",
-						[[
-							1,
-							[
-								1,
-								[
-									1,
-									"len",
-									"+",
-									"gapLength"
-								],
-								"/",
-								"rawPeriod"
-							],
-							"+",
-							[5, "0.5"]
-						]]
-					], [
-						6,
-						"d.f32",
-						[[5, "1"]]
-					]]
-				]
-			],
-			[
-				13,
-				"scale",
-				[
-					1,
-					"len",
-					"/",
-					[
-						6,
-						"std.max",
-						[[
-							1,
-							[
-								1,
-								"nDash",
-								"*",
-								"rawDash"
-							],
-							"+",
-							[
-								1,
-								[
-									1,
-									"nDash",
-									"-",
-									[5, "1"]
-								],
-								"*",
-								"gapLength"
-							]
-						], [
-							6,
-							"d.f32",
-							["EPS"]
-						]]
-					]
-				]
-			],
-			[
-				13,
-				"dashL",
-				[
-					1,
-					"rawDash",
-					"*",
-					"scale"
-				]
-			],
-			[
-				13,
-				"period",
-				[
-					1,
-					"rawPeriod",
-					"*",
-					"scale"
-				]
-			],
-			[
-				13,
-				"kDash",
-				[
-					6,
-					"std.clamp",
-					[
-						[
-							6,
-							"std.floor",
-							[[
-								1,
-								"t",
-								"/",
-								"period"
-							]]
-						],
-						[
-							6,
-							"d.f32",
-							[[5, "0"]]
-						],
-						[
-							1,
-							"nDash",
-							"-",
-							[5, "1"]
-						]
-					]
-				]
-			],
-			[
-				13,
-				"cDash",
-				[
-					1,
-					"t",
-					"-",
-					[
-						1,
-						[
-							1,
-							"kDash",
-							"*",
-							"period"
-						],
-						"+",
-						[
-							1,
-							"dashL",
-							"*",
-							[5, "0.5"]
-						]
-					]
-				]
-			],
-			[
-				13,
-				"axDashRound",
-				[
-					6,
-					"std.max",
-					[[
-						1,
-						[
-							1,
-							"dashL",
-							"*",
-							[5, "0.5"]
-						],
-						"-",
-						"halfT"
-					], [
-						6,
-						"d.f32",
-						[[5, "0"]]
-					]]
-				]
-			],
-			[
-				13,
-				"axDashSquare",
-				[
-					1,
-					"dashL",
-					"*",
-					[5, "0.5"]
-				]
-			],
-			[
-				13,
-				"rawDotPeriod",
-				[
-					6,
-					"std.max",
-					[[
-						1,
-						"thickness",
-						"+",
-						"gapLength"
-					], [
-						6,
-						"d.f32",
-						["EPS"]
-					]]
-				]
-			],
-			[
-				13,
-				"nDot",
-				[
-					6,
-					"std.max",
-					[[
-						6,
-						"std.floor",
-						[[
-							1,
-							[
-								1,
-								"len",
-								"/",
-								"rawDotPeriod"
-							],
-							"+",
-							[5, "0.5"]
-						]]
-					], [
-						6,
-						"d.f32",
-						[[5, "1"]]
-					]]
-				]
-			],
-			[
-				13,
-				"dotPeriod",
-				[
-					1,
-					"len",
-					"/",
-					"nDot"
-				]
-			],
-			[
-				13,
-				"kDot",
-				[
-					6,
-					"std.clamp",
-					[
-						[
-							6,
-							"std.floor",
-							[[
-								1,
-								[
-									1,
-									"t",
-									"/",
-									"dotPeriod"
-								],
-								"+",
-								[5, "0.5"]
-							]]
-						],
-						[
-							6,
-							"d.f32",
-							[[5, "0"]]
-						],
-						"nDot"
-					]
-				]
-			],
-			[
-				13,
-				"cDot",
-				[
-					1,
-					"t",
-					"-",
-					[
-						1,
-						"kDot",
-						"*",
-						"dotPeriod"
-					]
-				]
-			],
-			[
-				13,
-				"isPattern",
-				[
-					1,
-					"style",
-					">=",
-					[5, "0.5"]
-				]
-			],
-			[
-				13,
-				"isDotted",
-				[
-					1,
-					"style",
-					">=",
-					[5, "1.5"]
-				]
-			],
-			[
-				13,
-				"c",
-				[
-					6,
-					"std.select",
-					[
-						"cSolid",
-						[
-							6,
-							"std.select",
-							[
-								"cDash",
-								"cDot",
-								"isDotted"
-							]
-						],
-						"isPattern"
-					]
-				]
-			],
-			[
-				13,
-				"axRound",
-				[
-					6,
-					"std.select",
-					[
-						"axSolid",
-						[
-							6,
-							"std.select",
-							[
-								"axDashRound",
-								[
-									6,
-									"d.f32",
-									[[5, "0"]]
-								],
-								"isDotted"
-							]
-						],
-						"isPattern"
-					]
-				]
-			],
-			[
-				13,
-				"axSquare",
-				[
-					6,
-					"std.select",
-					[
-						"axSolid",
-						[
-							6,
-							"std.select",
-							[
-								"axDashSquare",
-								"halfT",
-								"isDotted"
-							]
-						],
-						"isPattern"
-					]
-				]
-			],
-			[
-				13,
-				"capHere",
-				[
-					6,
-					"std.select",
-					[
-						"capStart",
-						"capEnd",
-						[
-							1,
-							"c",
-							">",
-							[5, "0"]
-						]
-					]
-				]
-			],
-			[
-				13,
-				"sdRound",
-				[
-					1,
-					[
-						6,
-						"std.length",
-						[[
-							6,
-							"d.vec2f",
-							[[
-								6,
-								"std.max",
-								[[
-									1,
-									[
-										6,
-										"std.abs",
-										["c"]
-									],
-									"-",
-									"axRound"
-								], [
-									6,
-									"d.f32",
-									[[5, "0"]]
-								]]
-							], "perp"]
-						]]
-					],
-					"-",
-					"halfT"
-				]
-			],
-			[
-				13,
-				"qx",
-				[
-					1,
-					[
-						6,
-						"std.abs",
-						["c"]
-					],
-					"-",
-					"axSquare"
-				]
-			],
-			[
-				13,
-				"qy",
-				[
-					1,
-					"perp",
-					"-",
-					"halfT"
-				]
-			],
-			[
-				13,
-				"sdSquare",
-				[
-					1,
-					[
-						6,
-						"std.length",
-						[[
-							6,
-							"d.vec2f",
-							[[
-								6,
-								"std.max",
-								["qx", [
-									6,
-									"d.f32",
-									[[5, "0"]]
-								]]
-							], [
-								6,
-								"std.max",
-								["qy", [
-									6,
-									"d.f32",
-									[[5, "0"]]
-								]]
-							]]
-						]]
-					],
-					"+",
-					[
-						6,
-						"std.min",
-						[[
-							6,
-							"std.max",
-							["qx", "qy"]
-						], [
-							6,
-							"d.f32",
-							[[5, "0"]]
-						]]
-					]
-				]
-			],
-			[
-				13,
-				"sd",
-				[
-					6,
-					"std.select",
-					[
-						"sdSquare",
-						"sdRound",
-						[
-							1,
-							"capHere",
-							">=",
-							[5, "0.5"]
-						]
-					]
-				]
-			],
-			[
-				13,
-				"feather",
-				[
-					1,
-					[5, "1"],
-					"/",
-					[
-						7,
-						"viewport",
-						"y"
-					]
-				]
-			],
-			[10, [
-				1,
-				[5, "1"],
-				"-",
-				[
-					6,
-					"std.smoothstep",
-					[
-						[
-							4,
-							"-",
-							"feather"
-						],
-						"feather",
-						"sd"
-					]
-				]
-			]]
-		]]
-	},
-	externals: {
-		"std.max": () => max,
-		"std.length": () => length,
-		"d.vec2f": () => vec2f,
-		"d.f32": () => f32,
-		"EPS": () => EPS,
-		"std.clamp": () => clamp,
-		"std.sqrt": () => sqrt,
-		"std.floor": () => floor,
-		"std.select": () => select,
-		"std.abs": () => abs,
-		"std.min": () => min,
-		"std.smoothstep": () => smoothstep
-	}
-}) && $.f)({}));
-const sineWaveMask = typegpu_default.fn([
-	vec2f,
-	vec2f,
-	f32,
-	vec2f,
-	f32,
-	f32,
-	f32,
-	f32,
-	f32
-], f32)(/* @__PURE__ */ (($) => (globalThis.__TYPEGPU_META__ ??= /* @__PURE__ */ new WeakMap()).set($.f = ((uv, viewport, angle, position, frequency, amplitude, thickness, softness, animTime) => {
-	"use gpu";
-	const aspect = __tsover_div(viewport.x, viewport.y);
-	const aspectCorrectedX = __tsover_mul(uv.x, aspect);
-	const centerX = __tsover_mul(position.x, aspect);
-	const centerY = __tsover_sub(1, position.y);
-	const centeredX = __tsover_sub(aspectCorrectedX, centerX);
-	const centeredY = __tsover_sub(uv.y, centerY);
-	const angleRad = __tsover_mul(angle, DEG_TO_RAD);
-	const cosAngle = cos(angleRad);
-	const sinAngle = sin(angleRad);
-	const rotatedX = __tsover_sub(__tsover_mul(centeredX, cosAngle), __tsover_mul(centeredY, sinAngle));
-	const rotatedY = __tsover_add(__tsover_mul(centeredX, sinAngle), __tsover_mul(centeredY, cosAngle));
-	const waveInput = __tsover_add(__tsover_mul(__tsover_mul(rotatedX, frequency), TAU), animTime);
-	const sineWave = __tsover_mul(sin(waveInput), amplitude);
-	const distanceFromWave = abs(__tsover_sub(rotatedY, sineWave));
-	const halfThickness = __tsover_mul(thickness, .5);
-	const halfSoftness = __tsover_mul(softness, .5);
-	return __tsover_sub(1, smoothstep(__tsover_sub(halfThickness, halfSoftness), __tsover_add(halfThickness, halfSoftness), distanceFromWave));
-}), {
-	v: 2,
-	name: void 0,
-	ast: {
-		"params": [
-			{
-				"type": "i",
-				"name": "uv"
-			},
-			{
-				"type": "i",
-				"name": "viewport"
-			},
-			{
-				"type": "i",
-				"name": "angle"
-			},
-			{
-				"type": "i",
-				"name": "position"
-			},
-			{
-				"type": "i",
-				"name": "frequency"
-			},
-			{
-				"type": "i",
-				"name": "amplitude"
-			},
-			{
-				"type": "i",
-				"name": "thickness"
-			},
-			{
-				"type": "i",
-				"name": "softness"
-			},
-			{
-				"type": "i",
-				"name": "animTime"
-			}
-		],
-		"body": [0, [
-			[
-				13,
-				"aspect",
-				[
-					1,
-					[
-						7,
-						"viewport",
-						"x"
-					],
-					"/",
-					[
-						7,
-						"viewport",
-						"y"
-					]
-				]
-			],
-			[
-				13,
-				"aspectCorrectedX",
-				[
-					1,
-					[
-						7,
-						"uv",
-						"x"
-					],
-					"*",
-					"aspect"
-				]
-			],
-			[
-				13,
-				"centerX",
-				[
-					1,
-					[
-						7,
-						"position",
-						"x"
-					],
-					"*",
-					"aspect"
-				]
-			],
-			[
-				13,
-				"centerY",
-				[
-					1,
-					[5, "1"],
-					"-",
-					[
-						7,
-						"position",
-						"y"
-					]
-				]
-			],
-			[
-				13,
-				"centeredX",
-				[
-					1,
-					"aspectCorrectedX",
-					"-",
-					"centerX"
-				]
-			],
-			[
-				13,
-				"centeredY",
-				[
-					1,
-					[
-						7,
-						"uv",
-						"y"
-					],
-					"-",
-					"centerY"
-				]
-			],
-			[
-				13,
-				"angleRad",
-				[
-					1,
-					"angle",
-					"*",
-					"DEG_TO_RAD"
-				]
-			],
-			[
-				13,
-				"cosAngle",
-				[
-					6,
-					"std.cos",
-					["angleRad"]
-				]
-			],
-			[
-				13,
-				"sinAngle",
-				[
-					6,
-					"std.sin",
-					["angleRad"]
-				]
-			],
-			[
-				13,
-				"rotatedX",
-				[
-					1,
-					[
-						1,
-						"centeredX",
-						"*",
-						"cosAngle"
-					],
-					"-",
-					[
-						1,
-						"centeredY",
-						"*",
-						"sinAngle"
-					]
-				]
-			],
-			[
-				13,
-				"rotatedY",
-				[
-					1,
-					[
-						1,
-						"centeredX",
-						"*",
-						"sinAngle"
-					],
-					"+",
-					[
-						1,
-						"centeredY",
-						"*",
-						"cosAngle"
-					]
-				]
-			],
-			[
-				13,
-				"waveInput",
-				[
-					1,
-					[
-						1,
-						[
-							1,
-							"rotatedX",
-							"*",
-							"frequency"
-						],
-						"*",
-						"TAU"
-					],
-					"+",
-					"animTime"
-				]
-			],
-			[
-				13,
-				"sineWave",
-				[
-					1,
-					[
-						6,
-						"std.sin",
-						["waveInput"]
-					],
-					"*",
-					"amplitude"
-				]
-			],
-			[
-				13,
-				"distanceFromWave",
-				[
-					6,
-					"std.abs",
-					[[
-						1,
-						"rotatedY",
-						"-",
-						"sineWave"
-					]]
-				]
-			],
-			[
-				13,
-				"halfThickness",
-				[
-					1,
-					"thickness",
-					"*",
-					[5, "0.5"]
-				]
-			],
-			[
-				13,
-				"halfSoftness",
-				[
-					1,
-					"softness",
-					"*",
-					[5, "0.5"]
-				]
-			],
-			[10, [
-				1,
-				[5, "1"],
-				"-",
-				[
-					6,
-					"std.smoothstep",
-					[
-						[
-							1,
-							"halfThickness",
-							"-",
-							"halfSoftness"
-						],
-						[
-							1,
-							"halfThickness",
-							"+",
-							"halfSoftness"
-						],
-						"distanceFromWave"
-					]
-				]
-			]]
-		]]
-	},
-	externals: {
-		"DEG_TO_RAD": () => DEG_TO_RAD,
-		"std.cos": () => cos,
-		"std.sin": () => sin,
-		"TAU": () => TAU,
-		"std.abs": () => abs,
-		"std.smoothstep": () => smoothstep
-	}
-}) && $.f)({}));
-const blobOrganicRadius = typegpu_default.fn([
-	vec2f,
-	f32,
-	f32,
-	f32
-], f32)(/* @__PURE__ */ (($) => (globalThis.__TYPEGPU_META__ ??= /* @__PURE__ */ new WeakMap()).set($.f = ((uv, size, deformation, animTime) => {
-	"use gpu";
-	const ns = f32(4);
-	const at = animTime;
-	const noise1 = __tsover_mul(__tsover_mul(__tsover_add(__tsover_mul(sin(__tsover_add(__tsover_mul(uv.x, __tsover_mul(ns, .8)), __tsover_mul(at, .8))), sin(__tsover_add(__tsover_mul(uv.y, __tsover_mul(ns, .7)), __tsover_mul(at, .6)))), sin(__tsover_sub(__tsover_mul(uv.x, __tsover_mul(ns, 1.2)), __tsover_add(__tsover_mul(uv.y, __tsover_mul(ns, .9)), __tsover_mul(at, .4))))), .15), deformation);
-	const noise2 = __tsover_mul(__tsover_mul(__tsover_mul(sin(__tsover_sub(__tsover_mul(uv.x, __tsover_mul(ns, 1.4)), __tsover_mul(at, .5))), sin(__tsover_add(__tsover_mul(uv.y, __tsover_mul(ns, 1.1)), __tsover_mul(at, .7)))), .12), deformation);
-	const noise3 = __tsover_mul(__tsover_mul(__tsover_add(sin(__tsover_add(__tsover_mul(uv.x, __tsover_mul(ns, 1.8)), __tsover_add(__tsover_mul(uv.y, __tsover_mul(ns, 1.6)), __tsover_mul(at, .3)))), sin(__tsover_sub(__tsover_mul(uv.x, __tsover_mul(ns, .6)), __tsover_mul(at, .9)))), .1), deformation);
-	const noise4 = __tsover_mul(__tsover_mul(__tsover_mul(sin(__tsover_add(__tsover_mul(uv.x, __tsover_mul(ns, 2.2)), __tsover_mul(at, .2))), sin(__tsover_sub(__tsover_mul(uv.y, __tsover_mul(ns, 1.9)), __tsover_mul(at, .8)))), .04), deformation);
-	return __tsover_add(size, __tsover_add(__tsover_add(__tsover_add(noise1, noise2), noise3), noise4));
-}), {
-	v: 2,
-	name: void 0,
-	ast: {
-		"params": [
-			{
-				"type": "i",
-				"name": "uv"
-			},
-			{
-				"type": "i",
-				"name": "size"
-			},
-			{
-				"type": "i",
-				"name": "deformation"
-			},
-			{
-				"type": "i",
-				"name": "animTime"
-			}
-		],
-		"body": [0, [
-			[
-				13,
-				"ns",
-				[
-					6,
-					"d.f32",
-					[[5, "4"]]
-				]
-			],
-			[
-				13,
-				"at",
-				"animTime"
-			],
-			[
-				13,
-				"noise1",
-				[
-					1,
-					[
-						1,
-						[
-							1,
-							[
-								1,
-								[
-									6,
-									"std.sin",
-									[[
-										1,
-										[
-											1,
-											[
-												7,
-												"uv",
-												"x"
-											],
-											"*",
-											[
-												1,
-												"ns",
-												"*",
-												[5, "0.8"]
-											]
-										],
-										"+",
-										[
-											1,
-											"at",
-											"*",
-											[5, "0.8"]
-										]
-									]]
-								],
-								"*",
-								[
-									6,
-									"std.sin",
-									[[
-										1,
-										[
-											1,
-											[
-												7,
-												"uv",
-												"y"
-											],
-											"*",
-											[
-												1,
-												"ns",
-												"*",
-												[5, "0.7"]
-											]
-										],
-										"+",
-										[
-											1,
-											"at",
-											"*",
-											[5, "0.6"]
-										]
-									]]
-								]
-							],
-							"+",
-							[
-								6,
-								"std.sin",
-								[[
-									1,
-									[
-										1,
-										[
-											7,
-											"uv",
-											"x"
-										],
-										"*",
-										[
-											1,
-											"ns",
-											"*",
-											[5, "1.2"]
-										]
-									],
-									"-",
-									[
-										1,
-										[
-											1,
-											[
-												7,
-												"uv",
-												"y"
-											],
-											"*",
-											[
-												1,
-												"ns",
-												"*",
-												[5, "0.9"]
-											]
-										],
-										"+",
-										[
-											1,
-											"at",
-											"*",
-											[5, "0.4"]
-										]
-									]
-								]]
-							]
-						],
-						"*",
-						[5, "0.15"]
-					],
-					"*",
-					"deformation"
-				]
-			],
-			[
-				13,
-				"noise2",
-				[
-					1,
-					[
-						1,
-						[
-							1,
-							[
-								6,
-								"std.sin",
-								[[
-									1,
-									[
-										1,
-										[
-											7,
-											"uv",
-											"x"
-										],
-										"*",
-										[
-											1,
-											"ns",
-											"*",
-											[5, "1.4"]
-										]
-									],
-									"-",
-									[
-										1,
-										"at",
-										"*",
-										[5, "0.5"]
-									]
-								]]
-							],
-							"*",
-							[
-								6,
-								"std.sin",
-								[[
-									1,
-									[
-										1,
-										[
-											7,
-											"uv",
-											"y"
-										],
-										"*",
-										[
-											1,
-											"ns",
-											"*",
-											[5, "1.1"]
-										]
-									],
-									"+",
-									[
-										1,
-										"at",
-										"*",
-										[5, "0.7"]
-									]
-								]]
-							]
-						],
-						"*",
-						[5, "0.12"]
-					],
-					"*",
-					"deformation"
-				]
-			],
-			[
-				13,
-				"noise3",
-				[
-					1,
-					[
-						1,
-						[
-							1,
-							[
-								6,
-								"std.sin",
-								[[
-									1,
-									[
-										1,
-										[
-											7,
-											"uv",
-											"x"
-										],
-										"*",
-										[
-											1,
-											"ns",
-											"*",
-											[5, "1.8"]
-										]
-									],
-									"+",
-									[
-										1,
-										[
-											1,
-											[
-												7,
-												"uv",
-												"y"
-											],
-											"*",
-											[
-												1,
-												"ns",
-												"*",
-												[5, "1.6"]
-											]
-										],
-										"+",
-										[
-											1,
-											"at",
-											"*",
-											[5, "0.3"]
-										]
-									]
-								]]
-							],
-							"+",
-							[
-								6,
-								"std.sin",
-								[[
-									1,
-									[
-										1,
-										[
-											7,
-											"uv",
-											"x"
-										],
-										"*",
-										[
-											1,
-											"ns",
-											"*",
-											[5, "0.6"]
-										]
-									],
-									"-",
-									[
-										1,
-										"at",
-										"*",
-										[5, "0.9"]
-									]
-								]]
-							]
-						],
-						"*",
-						[5, "0.1"]
-					],
-					"*",
-					"deformation"
-				]
-			],
-			[
-				13,
-				"noise4",
-				[
-					1,
-					[
-						1,
-						[
-							1,
-							[
-								6,
-								"std.sin",
-								[[
-									1,
-									[
-										1,
-										[
-											7,
-											"uv",
-											"x"
-										],
-										"*",
-										[
-											1,
-											"ns",
-											"*",
-											[5, "2.2"]
-										]
-									],
-									"+",
-									[
-										1,
-										"at",
-										"*",
-										[5, "0.2"]
-									]
-								]]
-							],
-							"*",
-							[
-								6,
-								"std.sin",
-								[[
-									1,
-									[
-										1,
-										[
-											7,
-											"uv",
-											"y"
-										],
-										"*",
-										[
-											1,
-											"ns",
-											"*",
-											[5, "1.9"]
-										]
-									],
-									"-",
-									[
-										1,
-										"at",
-										"*",
-										[5, "0.8"]
-									]
-								]]
-							]
-						],
-						"*",
-						[5, "0.04"]
-					],
-					"*",
-					"deformation"
-				]
-			],
-			[10, [
-				1,
-				"size",
-				"+",
-				[
-					1,
-					[
-						1,
-						[
-							1,
-							"noise1",
-							"+",
-							"noise2"
-						],
-						"+",
-						"noise3"
-					],
-					"+",
-					"noise4"
+					"perp",
+					"len"
 				]
 			]]
 		]]
 	},
 	externals: {
+		"std.max": () => max,
+		"std.length": () => length,
+		"d.vec2f": () => vec2f,
 		"d.f32": () => f32,
-		"std.sin": () => sin
+		"EPS": () => EPS,
+		"std.clamp": () => clamp,
+		"std.sqrt": () => sqrt,
+		"d.vec3f": () => vec3f
 	}
 }) && $.f)({}));
-const blobField = typegpu_default.fn([
+const lineMask = typegpu_default.fn([
+	vec2f,
 	vec2f,
 	vec2f,
 	vec2f,
-	f32,
-	f32,
 	f32,
 	f32,
 	f32,
 	f32,
 	f32,
 	f32
-], vec3f)(/* @__PURE__ */ (($) => (globalThis.__TYPEGPU_META__ ??= /* @__PURE__ */ new WeakMap()).set($.f = ((baseUV, viewport, center, size, deformation, softness, highlightIntensity, normLx, normLy, normLz, animTime) => {
+], f32)(/* @__PURE__ */ (($) => (globalThis.__TYPEGPU_META__ ??= /* @__PURE__ */ new WeakMap()).set($.f = ((uv, viewport, pointA, pointB, thickness, style, dashLength, gapLength, capStart, capEnd) => {
 	"use gpu";
-	const edgeWidth = __tsover_mul(softness, .3);
-	const edgeCurve = __tsover_add(__tsover_mul(softness, 2), .5);
-	const aspect = __tsover_div(viewport.x, viewport.y);
-	const uv = vec2f(__tsover_sub(__tsover_mul(baseUV.x, aspect), __tsover_mul(center.x, aspect)), __tsover_sub(baseUV.y, __tsover_sub(1, center.y)));
-	const dist = length(uv);
-	const organicRadius = blobOrganicRadius(uv, size, deformation, animTime);
-	const blobMask = pow(__tsover_sub(1, smoothstep(__tsover_sub(organicRadius, edgeWidth), __tsover_add(organicRadius, edgeWidth), dist)), edgeCurve);
-	const normalTilt = smoothstep(0, organicRadius, dist);
-	const fakeZ = __tsover_sub(1, __tsover_mul(normalTilt, .1));
-	const tilted = __tsover_add(normalTilt, .2);
-	const surfaceNormal = normalize(vec3f(__tsover_mul(uv.x, tilted), __tsover_mul(uv.y, tilted), fakeZ));
-	const lightDir = vec3f(normLx, normLy, normLz);
-	const viewDir = vec3f(0, 0, 1);
-	const specular = pow(max(0, dot(reflect(lightDir.mul(-1), surfaceNormal), viewDir)), 32);
-	const curvatureBoost = __tsover_add(__tsover_mul(normalTilt, .5), .5);
-	const finalHighlight = __tsover_mul(__tsover_mul(__tsover_mul(specular, curvatureBoost), highlightIntensity), blobMask);
-	const posX = __tsover_mul(uv.x, 3);
-	const posY = __tsover_mul(uv.y, 3);
-	const colorNoise1 = __tsover_add(__tsover_mul(__tsover_add(__tsover_mul(sin(__tsover_add(posX, __tsover_mul(animTime, .4))), sin(__tsover_add(posY, __tsover_mul(animTime, .3)))), sin(__tsover_add(__tsover_add(__tsover_mul(posX, .7), __tsover_mul(posY, .8)), __tsover_mul(animTime, .2)))), .5), .5);
-	const colorNoise2 = __tsover_add(__tsover_mul(__tsover_add(__tsover_mul(sin(__tsover_sub(__tsover_mul(posX, 1.3), __tsover_mul(animTime, .5))), sin(__tsover_add(__tsover_mul(posY, 1.1), __tsover_mul(animTime, .6)))), sin(__tsover_sub(__tsover_mul(posX, .5), __tsover_sub(__tsover_mul(posY, .6), __tsover_mul(animTime, .3))))), .5), .5);
-	return vec3f(smoothstep(.1, .9, __tsover_add(__tsover_mul(colorNoise1, .6), __tsover_mul(colorNoise2, .4))), finalHighlight, blobMask);
+	const aspect = aspectOf(viewport);
+	const seg = segmentArcPerp(aspectCorrectedUV(uv, viewport), aspectCentrePosition(pointA, aspect), aspectCentrePosition(pointB, aspect));
+	const t = seg.x;
+	const perp = seg.y;
+	const len = seg.z;
+	const halfT = __tsover_mul(thickness, .5);
+	const cSolid = __tsover_sub(t, __tsover_mul(len, .5));
+	const axSolid = __tsover_mul(len, .5);
+	const rawDash = max(dashLength, f32(EPS));
+	const rawPeriod = __tsover_add(rawDash, gapLength);
+	const nDash = max(floor(__tsover_add(__tsover_div(__tsover_add(len, gapLength), rawPeriod), .5)), f32(1));
+	const scale = __tsover_div(len, max(__tsover_add(__tsover_mul(nDash, rawDash), __tsover_mul(__tsover_sub(nDash, 1), gapLength)), f32(EPS)));
+	const dashL = __tsover_mul(rawDash, scale);
+	const period = __tsover_mul(rawPeriod, scale);
+	const kDash = clamp(floor(__tsover_div(t, period)), f32(0), __tsover_sub(nDash, 1));
+	const cDash = __tsover_sub(t, __tsover_add(__tsover_mul(kDash, period), __tsover_mul(dashL, .5)));
+	const axDashRound = max(__tsover_sub(__tsover_mul(dashL, .5), halfT), f32(0));
+	const axDashSquare = __tsover_mul(dashL, .5);
+	const rawDotPeriod = max(__tsover_add(thickness, gapLength), f32(EPS));
+	const nDot = max(floor(__tsover_add(__tsover_div(len, rawDotPeriod), .5)), f32(1));
+	const dotPeriod = __tsover_div(len, nDot);
+	const kDot = clamp(floor(__tsover_add(__tsover_div(t, dotPeriod), .5)), f32(0), nDot);
+	const cDot = __tsover_sub(t, __tsover_mul(kDot, dotPeriod));
+	const isPattern = style >= .5;
+	const isDotted = style >= 1.5;
+	const c = select(cSolid, select(cDash, cDot, isDotted), isPattern);
+	const axRound = select(axSolid, select(axDashRound, f32(0), isDotted), isPattern);
+	const axSquare = select(axSolid, select(axDashSquare, halfT, isDotted), isPattern);
+	const capHere = select(capStart, capEnd, c > 0);
+	const sdRound = __tsover_sub(length(vec2f(max(__tsover_sub(abs(c), axRound), f32(0)), perp)), halfT);
+	const qx = __tsover_sub(abs(c), axSquare);
+	const qy = __tsover_sub(perp, halfT);
+	const sd = select(__tsover_add(length(vec2f(max(qx, f32(0)), max(qy, f32(0)))), min(max(qx, qy), f32(0))), sdRound, capHere >= .5);
+	const feather = __tsover_div(1, viewport.y);
+	return __tsover_sub(1, smoothstep(-feather, feather, sd));
 }), {
 	v: 2,
 	name: void 0,
@@ -1841,7 +349,7 @@ const blobField = typegpu_default.fn([
 		"params": [
 			{
 				"type": "i",
-				"name": "baseUV"
+				"name": "uv"
 			},
 			{
 				"type": "i",
@@ -1849,642 +357,753 @@ const blobField = typegpu_default.fn([
 			},
 			{
 				"type": "i",
-				"name": "center"
-			},
-			{
-				"type": "i",
-				"name": "size"
+				"name": "pointA"
 			},
 			{
 				"type": "i",
-				"name": "deformation"
+				"name": "pointB"
 			},
 			{
 				"type": "i",
-				"name": "softness"
+				"name": "thickness"
 			},
 			{
 				"type": "i",
-				"name": "highlightIntensity"
+				"name": "style"
 			},
 			{
 				"type": "i",
-				"name": "normLx"
+				"name": "dashLength"
 			},
 			{
 				"type": "i",
-				"name": "normLy"
+				"name": "gapLength"
 			},
 			{
 				"type": "i",
-				"name": "normLz"
+				"name": "capStart"
 			},
 			{
 				"type": "i",
-				"name": "animTime"
+				"name": "capEnd"
 			}
 		],
 		"body": [0, [
 			[
 				13,
-				"edgeWidth",
+				"aspect",
+				[
+					6,
+					"geom.aspectOf",
+					["viewport"]
+				]
+			],
+			[
+				13,
+				"p",
+				[
+					6,
+					"geom.aspectCorrectedUV",
+					["uv", "viewport"]
+				]
+			],
+			[
+				13,
+				"a",
+				[
+					6,
+					"geom.aspectCentrePosition",
+					["pointA", "aspect"]
+				]
+			],
+			[
+				13,
+				"b",
+				[
+					6,
+					"geom.aspectCentrePosition",
+					["pointB", "aspect"]
+				]
+			],
+			[
+				13,
+				"seg",
+				[
+					6,
+					"segmentArcPerp",
+					[
+						"p",
+						"a",
+						"b"
+					]
+				]
+			],
+			[
+				13,
+				"t",
+				[
+					7,
+					"seg",
+					"x"
+				]
+			],
+			[
+				13,
+				"perp",
+				[
+					7,
+					"seg",
+					"y"
+				]
+			],
+			[
+				13,
+				"len",
+				[
+					7,
+					"seg",
+					"z"
+				]
+			],
+			[
+				13,
+				"halfT",
+				[
+					1,
+					"thickness",
+					"*",
+					[5, "0.5"]
+				]
+			],
+			[
+				13,
+				"cSolid",
+				[
+					1,
+					"t",
+					"-",
+					[
+						1,
+						"len",
+						"*",
+						[5, "0.5"]
+					]
+				]
+			],
+			[
+				13,
+				"axSolid",
+				[
+					1,
+					"len",
+					"*",
+					[5, "0.5"]
+				]
+			],
+			[
+				13,
+				"rawDash",
+				[
+					6,
+					"std.max",
+					["dashLength", [
+						6,
+						"d.f32",
+						["EPS"]
+					]]
+				]
+			],
+			[
+				13,
+				"rawPeriod",
+				[
+					1,
+					"rawDash",
+					"+",
+					"gapLength"
+				]
+			],
+			[
+				13,
+				"nDash",
+				[
+					6,
+					"std.max",
+					[[
+						6,
+						"std.floor",
+						[[
+							1,
+							[
+								1,
+								[
+									1,
+									"len",
+									"+",
+									"gapLength"
+								],
+								"/",
+								"rawPeriod"
+							],
+							"+",
+							[5, "0.5"]
+						]]
+					], [
+						6,
+						"d.f32",
+						[[5, "1"]]
+					]]
+				]
+			],
+			[
+				13,
+				"scale",
+				[
+					1,
+					"len",
+					"/",
+					[
+						6,
+						"std.max",
+						[[
+							1,
+							[
+								1,
+								"nDash",
+								"*",
+								"rawDash"
+							],
+							"+",
+							[
+								1,
+								[
+									1,
+									"nDash",
+									"-",
+									[5, "1"]
+								],
+								"*",
+								"gapLength"
+							]
+						], [
+							6,
+							"d.f32",
+							["EPS"]
+						]]
+					]
+				]
+			],
+			[
+				13,
+				"dashL",
 				[
 					1,
-					"softness",
+					"rawDash",
 					"*",
-					[5, "0.3"]
+					"scale"
 				]
 			],
 			[
 				13,
-				"edgeCurve",
+				"period",
 				[
 					1,
-					[
-						1,
-						"softness",
-						"*",
-						[5, "2"]
-					],
-					"+",
-					[5, "0.5"]
+					"rawPeriod",
+					"*",
+					"scale"
 				]
 			],
 			[
 				13,
-				"aspect",
+				"kDash",
 				[
-					1,
-					[
-						7,
-						"viewport",
-						"x"
-					],
-					"/",
+					6,
+					"std.clamp",
 					[
-						7,
-						"viewport",
-						"y"
+						[
+							6,
+							"std.floor",
+							[[
+								1,
+								"t",
+								"/",
+								"period"
+							]]
+						],
+						[
+							6,
+							"d.f32",
+							[[5, "0"]]
+						],
+						[
+							1,
+							"nDash",
+							"-",
+							[5, "1"]
+						]
 					]
 				]
 			],
 			[
 				13,
-				"uv",
+				"cDash",
 				[
-					6,
-					"d.vec2f",
-					[[
+					1,
+					"t",
+					"-",
+					[
 						1,
 						[
 							1,
-							[
-								7,
-								"baseUV",
-								"x"
-							],
+							"kDash",
 							"*",
-							"aspect"
+							"period"
 						],
-						"-",
+						"+",
 						[
 							1,
-							[
-								7,
-								"center",
-								"x"
-							],
+							"dashL",
 							"*",
-							"aspect"
+							[5, "0.5"]
 						]
-					], [
+					]
+				]
+			],
+			[
+				13,
+				"axDashRound",
+				[
+					6,
+					"std.max",
+					[[
 						1,
 						[
-							7,
-							"baseUV",
-							"y"
+							1,
+							"dashL",
+							"*",
+							[5, "0.5"]
 						],
 						"-",
-						[
-							1,
-							[5, "1"],
-							"-",
-							[
-								7,
-								"center",
-								"y"
-							]
-						]
+						"halfT"
+					], [
+						6,
+						"d.f32",
+						[[5, "0"]]
 					]]
 				]
 			],
 			[
 				13,
-				"dist",
+				"axDashSquare",
 				[
-					6,
-					"std.length",
-					["uv"]
+					1,
+					"dashL",
+					"*",
+					[5, "0.5"]
 				]
 			],
 			[
 				13,
-				"organicRadius",
+				"rawDotPeriod",
 				[
 					6,
-					"blobOrganicRadius",
-					[
-						"uv",
-						"size",
-						"deformation",
-						"animTime"
-					]
+					"std.max",
+					[[
+						1,
+						"thickness",
+						"+",
+						"gapLength"
+					], [
+						6,
+						"d.f32",
+						["EPS"]
+					]]
 				]
 			],
 			[
 				13,
-				"linearMask",
+				"nDot",
 				[
-					1,
-					[5, "1"],
-					"-",
-					[
+					6,
+					"std.max",
+					[[
 						6,
-						"std.smoothstep",
-						[
-							[
-								1,
-								"organicRadius",
-								"-",
-								"edgeWidth"
-							],
+						"std.floor",
+						[[
+							1,
 							[
 								1,
-								"organicRadius",
-								"+",
-								"edgeWidth"
+								"len",
+								"/",
+								"rawDotPeriod"
 							],
-							"dist"
-						]
-					]
+							"+",
+							[5, "0.5"]
+						]]
+					], [
+						6,
+						"d.f32",
+						[[5, "1"]]
+					]]
 				]
 			],
 			[
 				13,
-				"blobMask",
+				"dotPeriod",
 				[
-					6,
-					"std.pow",
-					["linearMask", "edgeCurve"]
+					1,
+					"len",
+					"/",
+					"nDot"
 				]
 			],
 			[
 				13,
-				"normalTilt",
+				"kDot",
 				[
 					6,
-					"std.smoothstep",
+					"std.clamp",
 					[
-						[5, "0"],
-						"organicRadius",
-						"dist"
+						[
+							6,
+							"std.floor",
+							[[
+								1,
+								[
+									1,
+									"t",
+									"/",
+									"dotPeriod"
+								],
+								"+",
+								[5, "0.5"]
+							]]
+						],
+						[
+							6,
+							"d.f32",
+							[[5, "0"]]
+						],
+						"nDot"
 					]
 				]
 			],
 			[
 				13,
-				"fakeZ",
+				"cDot",
 				[
 					1,
-					[5, "1"],
+					"t",
 					"-",
 					[
-						1,
-						"normalTilt",
-						"*",
-						[5, "0.1"]
-					]
-				]
-			],
-			[
-				13,
-				"tilted",
-				[
-					1,
-					"normalTilt",
-					"+",
-					[5, "0.2"]
-				]
-			],
-			[
-				13,
-				"surfaceNormal",
-				[
-					6,
-					"std.normalize",
-					[[
-						6,
-						"d.vec3f",
-						[
-							[
-								1,
-								[
-									7,
-									"uv",
-									"x"
-								],
-								"*",
-								"tilted"
-							],
-							[
-								1,
-								[
-									7,
-									"uv",
-									"y"
-								],
-								"*",
-								"tilted"
-							],
-							"fakeZ"
-						]
-					]]
+						1,
+						"kDot",
+						"*",
+						"dotPeriod"
+					]
 				]
 			],
 			[
 				13,
-				"lightDir",
+				"isPattern",
 				[
-					6,
-					"d.vec3f",
-					[
-						"normLx",
-						"normLy",
-						"normLz"
-					]
+					1,
+					"style",
+					">=",
+					[5, "0.5"]
 				]
 			],
 			[
 				13,
-				"viewDir",
+				"isDotted",
 				[
-					6,
-					"d.vec3f",
-					[
-						[5, "0"],
-						[5, "0"],
-						[5, "1"]
-					]
+					1,
+					"style",
+					">=",
+					[5, "1.5"]
 				]
 			],
 			[
 				13,
-				"reflectDir",
+				"c",
 				[
 					6,
-					"std.reflect",
-					[[
-						6,
+					"std.select",
+					[
+						"cSolid",
 						[
-							7,
-							"lightDir",
-							"mul"
+							6,
+							"std.select",
+							[
+								"cDash",
+								"cDot",
+								"isDotted"
+							]
 						],
-						[[
-							4,
-							"-",
-							[5, "1"]
-						]]
-					], "surfaceNormal"]
+						"isPattern"
+					]
 				]
 			],
 			[
 				13,
-				"specDot",
+				"axRound",
 				[
 					6,
-					"std.max",
-					[[5, "0"], [
-						6,
-						"std.dot",
-						["reflectDir", "viewDir"]
-					]]
+					"std.select",
+					[
+						"axSolid",
+						[
+							6,
+							"std.select",
+							[
+								"axDashRound",
+								[
+									6,
+									"d.f32",
+									[[5, "0"]]
+								],
+								"isDotted"
+							]
+						],
+						"isPattern"
+					]
 				]
 			],
 			[
 				13,
-				"specular",
+				"axSquare",
 				[
 					6,
-					"std.pow",
-					["specDot", [5, "32"]]
-				]
-			],
-			[
-				13,
-				"curvatureBoost",
-				[
-					1,
+					"std.select",
 					[
-						1,
-						"normalTilt",
-						"*",
-						[5, "0.5"]
-					],
-					"+",
-					[5, "0.5"]
+						"axSolid",
+						[
+							6,
+							"std.select",
+							[
+								"axDashSquare",
+								"halfT",
+								"isDotted"
+							]
+						],
+						"isPattern"
+					]
 				]
 			],
 			[
 				13,
-				"finalHighlight",
+				"capHere",
 				[
-					1,
+					6,
+					"std.select",
 					[
-						1,
+						"capStart",
+						"capEnd",
 						[
 							1,
-							"specular",
-							"*",
-							"curvatureBoost"
-						],
-						"*",
-						"highlightIntensity"
-					],
-					"*",
-					"blobMask"
+							"c",
+							">",
+							[5, "0"]
+						]
+					]
 				]
 			],
 			[
 				13,
-				"posX",
+				"sdRound",
 				[
 					1,
 					[
-						7,
-						"uv",
-						"x"
+						6,
+						"std.length",
+						[[
+							6,
+							"d.vec2f",
+							[[
+								6,
+								"std.max",
+								[[
+									1,
+									[
+										6,
+										"std.abs",
+										["c"]
+									],
+									"-",
+									"axRound"
+								], [
+									6,
+									"d.f32",
+									[[5, "0"]]
+								]]
+							], "perp"]
+						]]
 					],
-					"*",
-					[5, "3"]
+					"-",
+					"halfT"
 				]
 			],
 			[
 				13,
-				"posY",
+				"qx",
 				[
 					1,
 					[
-						7,
-						"uv",
-						"y"
+						6,
+						"std.abs",
+						["c"]
 					],
-					"*",
-					[5, "3"]
+					"-",
+					"axSquare"
 				]
 			],
 			[
 				13,
-				"colorNoise1",
+				"qy",
 				[
 					1,
-					[
-						1,
-						[
-							1,
-							[
-								1,
-								[
-									6,
-									"std.sin",
-									[[
-										1,
-										"posX",
-										"+",
-										[
-											1,
-											"animTime",
-											"*",
-											[5, "0.4"]
-										]
-									]]
-								],
-								"*",
-								[
-									6,
-									"std.sin",
-									[[
-										1,
-										"posY",
-										"+",
-										[
-											1,
-											"animTime",
-											"*",
-											[5, "0.3"]
-										]
-									]]
-								]
-							],
-							"+",
-							[
-								6,
-								"std.sin",
-								[[
-									1,
-									[
-										1,
-										[
-											1,
-											"posX",
-											"*",
-											[5, "0.7"]
-										],
-										"+",
-										[
-											1,
-											"posY",
-											"*",
-											[5, "0.8"]
-										]
-									],
-									"+",
-									[
-										1,
-										"animTime",
-										"*",
-										[5, "0.2"]
-									]
-								]]
-							]
-						],
-						"*",
-						[5, "0.5"]
-					],
-					"+",
-					[5, "0.5"]
+					"perp",
+					"-",
+					"halfT"
 				]
 			],
 			[
 				13,
-				"colorNoise2",
+				"sdSquare",
 				[
 					1,
 					[
-						1,
-						[
-							1,
-							[
-								1,
-								[
-									6,
-									"std.sin",
-									[[
-										1,
-										[
-											1,
-											"posX",
-											"*",
-											[5, "1.3"]
-										],
-										"-",
-										[
-											1,
-											"animTime",
-											"*",
-											[5, "0.5"]
-										]
-									]]
-								],
-								"*",
-								[
-									6,
-									"std.sin",
-									[[
-										1,
-										[
-											1,
-											"posY",
-											"*",
-											[5, "1.1"]
-										],
-										"+",
-										[
-											1,
-											"animTime",
-											"*",
-											[5, "0.6"]
-										]
-									]]
-								]
-							],
-							"+",
-							[
+						6,
+						"std.length",
+						[[
+							6,
+							"d.vec2f",
+							[[
 								6,
-								"std.sin",
-								[[
-									1,
-									[
-										1,
-										"posX",
-										"*",
-										[5, "0.5"]
-									],
-									"-",
-									[
-										1,
-										[
-											1,
-											"posY",
-											"*",
-											[5, "0.6"]
-										],
-										"-",
-										[
-											1,
-											"animTime",
-											"*",
-											[5, "0.3"]
-										]
-									]
+								"std.max",
+								["qx", [
+									6,
+									"d.f32",
+									[[5, "0"]]
 								]]
-							]
-						],
-						"*",
-						[5, "0.5"]
+							], [
+								6,
+								"std.max",
+								["qy", [
+									6,
+									"d.f32",
+									[[5, "0"]]
+								]]
+							]]
+						]]
 					],
 					"+",
-					[5, "0.5"]
+					[
+						6,
+						"std.min",
+						[[
+							6,
+							"std.max",
+							["qx", "qy"]
+						], [
+							6,
+							"d.f32",
+							[[5, "0"]]
+						]]
+					]
 				]
 			],
 			[
 				13,
-				"combinedNoise",
+				"sd",
 				[
-					1,
-					[
-						1,
-						"colorNoise1",
-						"*",
-						[5, "0.6"]
-					],
-					"+",
+					6,
+					"std.select",
 					[
-						1,
-						"colorNoise2",
-						"*",
-						[5, "0.4"]
+						"sdSquare",
+						"sdRound",
+						[
+							1,
+							"capHere",
+							">=",
+							[5, "0.5"]
+						]
 					]
 				]
 			],
 			[
 				13,
-				"mixFactor",
+				"feather",
 				[
-					6,
-					"std.smoothstep",
+					1,
+					[5, "1"],
+					"/",
 					[
-						[5, "0.1"],
-						[5, "0.9"],
-						"combinedNoise"
+						7,
+						"viewport",
+						"y"
 					]
 				]
 			],
 			[10, [
-				6,
-				"d.vec3f",
+				1,
+				[5, "1"],
+				"-",
 				[
-					"mixFactor",
-					"finalHighlight",
-					"blobMask"
+					6,
+					"std.smoothstep",
+					[
+						[
+							4,
+							"-",
+							"feather"
+						],
+						"feather",
+						"sd"
+					]
 				]
 			]]
 		]]
 	},
 	externals: {
-		"d.vec2f": () => vec2f,
-		"std.length": () => length,
-		"blobOrganicRadius": () => blobOrganicRadius,
-		"std.smoothstep": () => smoothstep,
-		"std.pow": () => pow,
-		"std.normalize": () => normalize,
-		"d.vec3f": () => vec3f,
-		"std.reflect": () => reflect,
+		"geom.aspectOf": () => aspectOf,
+		"geom.aspectCorrectedUV": () => aspectCorrectedUV,
+		"geom.aspectCentrePosition": () => aspectCentrePosition,
+		"segmentArcPerp": () => segmentArcPerp,
 		"std.max": () => max,
-		"std.dot": () => dot,
-		"std.sin": () => sin
+		"d.f32": () => f32,
+		"EPS": () => EPS,
+		"std.floor": () => floor,
+		"std.clamp": () => clamp,
+		"std.select": () => select,
+		"std.length": () => length,
+		"d.vec2f": () => vec2f,
+		"std.abs": () => abs,
+		"std.min": () => min,
+		"std.smoothstep": () => smoothstep
 	}
 }) && $.f)({}));
-const blobCompose = typegpu_default.fn([
-	vec4f,
-	vec4f,
+const sineWaveMask = typegpu_default.fn([
+	vec2f,
+	vec2f,
+	f32,
+	vec2f,
+	f32,
+	f32,
 	f32,
 	f32,
 	f32
-], vec4f)(/* @__PURE__ */ (($) => (globalThis.__TYPEGPU_META__ ??= /* @__PURE__ */ new WeakMap()).set($.f = ((colorMix, highlightColor, finalHighlight, avgAlpha, blobMask) => {
+], f32)(/* @__PURE__ */ (($) => (globalThis.__TYPEGPU_META__ ??= /* @__PURE__ */ new WeakMap()).set($.f = ((uv, viewport, angle, position, frequency, amplitude, thickness, softness, animTime) => {
 	"use gpu";
-	const highlightContribution = highlightColor.xyz.mul(finalHighlight);
-	return vec4f(colorMix.xyz.add(highlightContribution), __tsover_mul(avgAlpha, blobMask));
+	const centered = aspectCenteredDelta(uv, position, viewport);
+	const angleRad = __tsover_mul(angle, DEG_TO_RAD);
+	const rotated = rotate2(centered, cos(angleRad), sin(angleRad));
+	const waveInput = __tsover_add(__tsover_mul(__tsover_mul(rotated.x, frequency), TAU), animTime);
+	const sineWave = __tsover_mul(sin(waveInput), amplitude);
+	const distanceFromWave = abs(__tsover_sub(rotated.y, sineWave));
+	const halfThickness = __tsover_mul(thickness, .5);
+	const halfSoftness = __tsover_mul(softness, .5);
+	return __tsover_sub(1, smoothstep(__tsover_sub(halfThickness, halfSoftness), __tsover_add(halfThickness, halfSoftness), distanceFromWave));
 }), {
 	v: 2,
 	name: void 0,
@@ -2492,73 +1111,208 @@ const blobCompose = typegpu_default.fn([
 		"params": [
 			{
 				"type": "i",
-				"name": "colorMix"
+				"name": "uv"
+			},
+			{
+				"type": "i",
+				"name": "viewport"
+			},
+			{
+				"type": "i",
+				"name": "angle"
+			},
+			{
+				"type": "i",
+				"name": "position"
+			},
+			{
+				"type": "i",
+				"name": "frequency"
 			},
 			{
 				"type": "i",
-				"name": "highlightColor"
+				"name": "amplitude"
 			},
 			{
 				"type": "i",
-				"name": "finalHighlight"
+				"name": "thickness"
 			},
 			{
 				"type": "i",
-				"name": "avgAlpha"
+				"name": "softness"
 			},
 			{
 				"type": "i",
-				"name": "blobMask"
+				"name": "animTime"
 			}
 		],
 		"body": [0, [
 			[
 				13,
-				"highlightContribution",
+				"centered",
 				[
 					6,
+					"geom.aspectCenteredDelta",
 					[
-						7,
+						"uv",
+						"position",
+						"viewport"
+					]
+				]
+			],
+			[
+				13,
+				"angleRad",
+				[
+					1,
+					"angle",
+					"*",
+					"DEG_TO_RAD"
+				]
+			],
+			[
+				13,
+				"cosAngle",
+				[
+					6,
+					"std.cos",
+					["angleRad"]
+				]
+			],
+			[
+				13,
+				"sinAngle",
+				[
+					6,
+					"std.sin",
+					["angleRad"]
+				]
+			],
+			[
+				13,
+				"rotated",
+				[
+					6,
+					"geom.rotate2",
+					[
+						"centered",
+						"cosAngle",
+						"sinAngle"
+					]
+				]
+			],
+			[
+				13,
+				"waveInput",
+				[
+					1,
+					[
+						1,
 						[
-							7,
-							"highlightColor",
-							"xyz"
+							1,
+							[
+								7,
+								"rotated",
+								"x"
+							],
+							"*",
+							"frequency"
 						],
-						"mul"
+						"*",
+						"TAU"
 					],
-					["finalHighlight"]
+					"+",
+					"animTime"
 				]
 			],
 			[
 				13,
-				"rgb",
+				"sineWave",
 				[
-					6,
+					1,
 					[
-						7,
+						6,
+						"std.sin",
+						["waveInput"]
+					],
+					"*",
+					"amplitude"
+				]
+			],
+			[
+				13,
+				"distanceFromWave",
+				[
+					6,
+					"std.abs",
+					[[
+						1,
 						[
 							7,
-							"colorMix",
-							"xyz"
+							"rotated",
+							"y"
 						],
-						"add"
-					],
-					["highlightContribution"]
+						"-",
+						"sineWave"
+					]]
 				]
 			],
-			[10, [
-				6,
-				"d.vec4f",
-				["rgb", [
+			[
+				13,
+				"halfThickness",
+				[
 					1,
-					"avgAlpha",
+					"thickness",
 					"*",
-					"blobMask"
-				]]
+					[5, "0.5"]
+				]
+			],
+			[
+				13,
+				"halfSoftness",
+				[
+					1,
+					"softness",
+					"*",
+					[5, "0.5"]
+				]
+			],
+			[10, [
+				1,
+				[5, "1"],
+				"-",
+				[
+					6,
+					"std.smoothstep",
+					[
+						[
+							1,
+							"halfThickness",
+							"-",
+							"halfSoftness"
+						],
+						[
+							1,
+							"halfThickness",
+							"+",
+							"halfSoftness"
+						],
+						"distanceFromWave"
+					]
+				]
 			]]
 		]]
 	},
-	externals: { "d.vec4f": () => vec4f }
+	externals: {
+		"geom.aspectCenteredDelta": () => aspectCenteredDelta,
+		"DEG_TO_RAD": () => DEG_TO_RAD,
+		"std.cos": () => cos,
+		"std.sin": () => sin,
+		"geom.rotate2": () => rotate2,
+		"TAU": () => TAU,
+		"std.abs": () => abs,
+		"std.smoothstep": () => smoothstep
+	}
 }) && $.f)({}));
 var lensFlareSpectral = typegpu_default.fn([f32], vec3f)(/* @__PURE__ */ (($) => (globalThis.__TYPEGPU_META__ ??= /* @__PURE__ */ new WeakMap()).set($.f = ((t) => {
 	"use gpu";
@@ -4597,4 +3351,4 @@ const flareComposite = typegpu_default.fn([vec3f, f32], vec4f)(/* @__PURE__ */ (
 		"d.vec4f": () => vec4f
 	}
 }) && $.f)({}));
-export { flareFrame as a, flareStarburst as c, lineMask as d, sineWaveMask as f, flareCore as i, flareStreak as l, blobField as n, flareGlare as o, flareComposite as r, flareHalo as s, blobCompose as t, lensFlareGhost as u };
+export { flareHalo as a, lensFlareGhost as c, flareGlare as i, lineMask as l, flareCore as n, flareStarburst as o, flareFrame as r, flareStreak as s, flareComposite as t, sineWaveMask as u };