shaders 3.0.453 → 3.1.455

package/dist/core/{HexGrid-B6UygS6q.js → HexGrid-LGx240mZ.js}

@@ -1,117 +1,16 @@
-import { At as max, Bt as sin, Dt as floor, G as mixColorsVariants, Gt as data_exports, Ot as fract, Rt as round, St as cos, Ut as step, Vt as smoothstep, W as mixColorsLinear, _t as abs, b as vec4, dt as fwidth, gt as select, it as std_exports, ln as f32, m as call, nt as src_default, rn as vec2f, wt as dot } from "./edges-B7Yet3LV.js";
-import { a as transformColor, o as transformColorSpace, r as transformAngle, t as colorSpaceOptions } from "./transformations-C7gn_5rF.js";
-var DEG_TO_RAD = Math.PI / 180;
-var SQRT3 = Math.sqrt(3);
+import { At as max, Bt as sin, G as mixColorsLinear, Gt as data_exports, K as mixColorsVariants, Rt as round, St as cos, _t as abs, at as std_exports, ft as fwidth, h as call, rn as vec2f, rt as src_default, un as f32, wt as dot, x as vec4 } from "./edges-CD7gCAto.js";
+import { a as SQRT3$1, 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 { 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 SQRT3 = SQRT3$1;
 var INV_SQRT3_2 = 2 / Math.sqrt(3);
 var SQRT3_2 = Math.sqrt(3) / 2;
-var flooredMod2 = src_default.fn([vec2f, vec2f], vec2f)(/* @__PURE__ */ (($) => (globalThis.__TYPEGPU_META__ ??= /* @__PURE__ */ new WeakMap()).set($.f = ((p, m) => {
-	"use gpu";
-	return vec2f(__tsover_sub(p.x, __tsover_mul(m.x, floor(__tsover_div(p.x, m.x)))), __tsover_sub(p.y, __tsover_mul(m.y, floor(__tsover_div(p.y, m.y)))));
-}), {
-	v: 1,
-	name: void 0,
-	ast: {
-		"params": [{
-			"type": "i",
-			"name": "p"
-		}, {
-			"type": "i",
-			"name": "m"
-		}],
-		"body": [0, [[10, [
-			6,
-			[
-				7,
-				"d",
-				"vec2f"
-			],
-			[[
-				1,
-				[
-					7,
-					"p",
-					"x"
-				],
-				"-",
-				[
-					1,
-					[
-						7,
-						"m",
-						"x"
-					],
-					"*",
-					[
-						6,
-						[
-							7,
-							"std",
-							"floor"
-						],
-						[[
-							1,
-							[
-								7,
-								"p",
-								"x"
-							],
-							"/",
-							[
-								7,
-								"m",
-								"x"
-							]
-						]]
-					]
-				]
-			], [
-				1,
-				[
-					7,
-					"p",
-					"y"
-				],
-				"-",
-				[
-					1,
-					[
-						7,
-						"m",
-						"y"
-					],
-					"*",
-					[
-						6,
-						[
-							7,
-							"std",
-							"floor"
-						],
-						[[
-							1,
-							[
-								7,
-								"p",
-								"y"
-							],
-							"/",
-							[
-								7,
-								"m",
-								"y"
-							]
-						]]
-					]
-				]
-			]]
-		]]]],
-		"externalNames": ["d", "std"]
-	},
-	externals: () => ({
-		d: data_exports,
-		std: std_exports
-	})
-}) && $.f)({}));
+var { aspectOf, rotateAboutCanvasCentre } = geom_exports;
+var { hexTiling, cellHash, variationFactor } = cells_exports;
+var { lineMaskFromField } = aa_exports;
 const hexGridField = src_default.fn([
 	vec2f,
 	vec2f,
@@ -122,35 +21,19 @@ const hexGridField = src_default.fn([
 	f32
 ], vec2f)(/* @__PURE__ */ (($) => (globalThis.__TYPEGPU_META__ ??= /* @__PURE__ */ new WeakMap()).set($.f = ((uv, viewport, cells, thickness, rotation, softness, variation) => {
 	"use gpu";
-	const aspect = __tsover_div(viewport.x, viewport.y);
+	const aspect = aspectOf(viewport);
 	const correctedUV = vec2f(__tsover_mul(uv.x, aspect), 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 scaledUV = 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 s = vec2f(SQRT3, 1);
-	const sh = s.mul(.5);
-	const a = flooredMod2(scaledUV, s).sub(sh);
-	const b = flooredMod2(scaledUV.sub(sh), s).sub(sh);
-	const gv = select(b, a, dot(a, a) < dot(b, b));
-	const cellId = scaledUV.sub(gv);
-	const q0 = fract(vec2f(round(__tsover_mul(cellId.x, INV_SQRT3_2)), round(__tsover_mul(cellId.y, 2))).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 pAbs = vec2f(abs(gv.x), abs(gv.y));
+	const scaledUV = rotateAboutCanvasCentre(correctedUV, aspect, cos(ang), sin(ang)).mul(cells);
+	const hex = hexTiling(scaledUV, vec2f(SQRT3, 1));
+	const variedFactor = variationFactor(cellHash(vec2f(round(__tsover_mul(hex.id.x, INV_SQRT3_2)), round(__tsover_mul(hex.id.y, 2)))), variation);
+	const pAbs = vec2f(abs(hex.gv.x), abs(hex.gv.y));
 	const hexDist = max(dot(pAbs, vec2f(SQRT3_2, .5)), pAbs.y);
 	const edgeDist = __tsover_sub(.5, hexDist);
 	const lineWidth = __tsover_mul(thickness, .01);
 	const pixel = __tsover_mul(fwidth(scaledUV.x), .5);
 	const soft = __tsover_mul(softness, .5);
-	const lo = max(__tsover_sub(lineWidth, soft), 0);
-	const hi = __tsover_add(__tsover_add(lineWidth, pixel), soft);
-	return vec2f(__tsover_mul(__tsover_sub(1, smoothstep(lo, hi, edgeDist)), step(1e-4, lineWidth)), variedFactor);
+	return vec2f(lineMaskFromField(edgeDist, lineWidth, max(__tsover_sub(lineWidth, soft), 0), __tsover_add(__tsover_add(lineWidth, pixel), soft)), variedFactor);
 }), {
 	v: 1,
 	name: void 0,
@@ -190,18 +73,9 @@ const hexGridField = src_default.fn([
 				13,
 				"aspect",
 				[
-					1,
-					[
-						7,
-						"viewport",
-						"x"
-					],
-					"/",
-					[
-						7,
-						"viewport",
-						"y"
-					]
+					6,
+					"aspectOf",
+					["viewport"]
 				]
 			],
 			[
@@ -270,100 +144,18 @@ const hexGridField = 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"
+					]
 				]
 			],
 			[
@@ -381,121 +173,19 @@ const hexGridField = src_default.fn([
 			],
 			[
 				13,
-				"s",
+				"hex",
 				[
 					6,
-					[
-						7,
-						"d",
-						"vec2f"
-					],
-					["SQRT3", [5, "1"]]
-				]
-			],
-			[
-				13,
-				"sh",
-				[
-					6,
-					[
-						7,
-						"s",
-						"mul"
-					],
-					[[5, "0.5"]]
-				]
-			],
-			[
-				13,
-				"a",
-				[
-					6,
-					[
-						7,
-						[
-							6,
-							"flooredMod2",
-							["scaledUV", "s"]
-						],
-						"sub"
-					],
-					["sh"]
-				]
-			],
-			[
-				13,
-				"b",
-				[
-					6,
-					[
-						7,
+					"hexTiling",
+					["scaledUV", [
+						6,
 						[
-							6,
-							"flooredMod2",
-							[[
-								6,
-								[
-									7,
-									"scaledUV",
-									"sub"
-								],
-								["sh"]
-							], "s"]
+							7,
+							"d",
+							"vec2f"
 						],
-						"sub"
-					],
-					["sh"]
-				]
-			],
-			[
-				13,
-				"gv",
-				[
-					6,
-					[
-						7,
-						"std",
-						"select"
-					],
-					[
-						"b",
-						"a",
-						[
-							1,
-							[
-								6,
-								[
-									7,
-									"std",
-									"dot"
-								],
-								["a", "a"]
-							],
-							"<",
-							[
-								6,
-								[
-									7,
-									"std",
-									"dot"
-								],
-								["b", "b"]
-							]
-						]
-					]
-				]
-			],
-			[
-				13,
-				"cellId",
-				[
-					6,
-					[
-						7,
-						"scaledUV",
-						"sub"
-					],
-					["gv"]
+						["SQRT3", [5, "1"]]
+					]]
 				]
 			],
 			[
@@ -512,7 +202,11 @@ const hexGridField = src_default.fn([
 						1,
 						[
 							7,
-							"cellId",
+							[
+								7,
+								"hex",
+								"id"
+							],
 							"x"
 						],
 						"*",
@@ -532,79 +226,17 @@ const hexGridField = src_default.fn([
 					],
 					[[
 						1,
-						[
-							7,
-							"cellId",
-							"y"
-						],
-						"*",
-						[5, "2"]
-					]]
-				]
-			],
-			[
-				13,
-				"q0",
-				[
-					6,
-					[
-						7,
-						"std",
-						"fract"
-					],
-					[[
-						6,
 						[
 							7,
-							[
-								6,
-								[
-									7,
-									"d",
-									"vec2f"
-								],
-								["ix", "iy"]
-							],
-							"mul"
-						],
-						[[
-							6,
 							[
 								7,
-								"d",
-								"vec2f"
+								"hex",
+								"id"
 							],
-							[[5, "123.34"], [5, "345.45"]]
-						]]
-					]]
-				]
-			],
-			[
-				13,
-				"q1",
-				[
-					6,
-					[
-						7,
-						"q0",
-						"add"
-					],
-					[[
-						6,
-						[
-							7,
-							"std",
-							"dot"
+							"y"
 						],
-						["q0", [
-							6,
-							[
-								7,
-								"q0",
-								"add"
-							],
-							[[5, "34.345"]]
-						]]
+						"*",
+						[5, "2"]
 					]]
 				]
 			],
@@ -613,24 +245,15 @@ const hexGridField = src_default.fn([
 				"rand",
 				[
 					6,
-					[
-						7,
-						"std",
-						"fract"
-					],
+					"cellHash",
 					[[
-						1,
+						6,
 						[
 							7,
-							"q1",
-							"x"
+							"d",
+							"vec2f"
 						],
-						"*",
-						[
-							7,
-							"q1",
-							"y"
-						]
+						["ix", "iy"]
 					]]
 				]
 			],
@@ -639,32 +262,8 @@ const hexGridField = 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"]
 				]
 			],
 			[
@@ -686,7 +285,11 @@ const hexGridField = src_default.fn([
 						],
 						[[
 							7,
-							"gv",
+							[
+								7,
+								"hex",
+								"gv"
+							],
 							"x"
 						]]
 					], [
@@ -698,7 +301,11 @@ const hexGridField = src_default.fn([
 						],
 						[[
 							7,
-							"gv",
+							[
+								7,
+								"hex",
+								"gv"
+							],
 							"y"
 						]]
 					]]
@@ -826,34 +433,13 @@ const hexGridField = src_default.fn([
 				13,
 				"lineMask",
 				[
-					1,
-					[
-						1,
-						[5, "1"],
-						"-",
-						[
-							6,
-							[
-								7,
-								"std",
-								"smoothstep"
-							],
-							[
-								"lo",
-								"hi",
-								"edgeDist"
-							]
-						]
-					],
-					"*",
+					6,
+					"lineMaskFromField",
 					[
-						6,
-						[
-							7,
-							"std",
-							"step"
-						],
-						[[5, "0.0001"], "lineWidth"]
+						"edgeDist",
+						"lineWidth",
+						"lo",
+						"hi"
 					]
 				]
 			],
@@ -868,23 +454,33 @@ const hexGridField = src_default.fn([
 			]]
 		]],
 		"externalNames": [
+			"aspectOf",
 			"d",
 			"DEG_TO_RAD",
 			"std",
+			"rotateAboutCanvasCentre",
+			"hexTiling",
 			"SQRT3",
-			"flooredMod2",
 			"INV_SQRT3_2",
-			"SQRT3_2"
+			"cellHash",
+			"variationFactor",
+			"SQRT3_2",
+			"lineMaskFromField"
 		]
 	},
 	externals: () => ({
+		aspectOf,
 		d: data_exports,
 		DEG_TO_RAD,
 		std: std_exports,
+		rotateAboutCanvasCentre,
+		hexTiling,
 		SQRT3,
-		flooredMod2,
 		INV_SQRT3_2,
-		SQRT3_2
+		cellHash,
+		variationFactor,
+		SQRT3_2,
+		lineMaskFromField
 	})
 }) && $.f)({}));
 const componentDefinition = {