shaders 3.0.452 → 3.1.454

package/dist/core/{LiquidMetal-BRhwukdo.js → LiquidMetal-BbyxqZoO.js}

@@ -1,14 +1,19 @@
-import { Bt as smoothstep, Ft as reflect, Mt as normalize, Nt as pow, Ot as length, Wt as data_exports, an as vec3f, b as vec4, bt as clamp, cn as f32, ht as select, jt as mix, kt as max, m as call, nn as vec2f, rt as std_exports, sn as vec4f, tt as src_default, v as floatE, xt as cos, zt as sin } from "./edges-Dm0I-Ud7.js";
-import { t as animatedTime } from "./porters-DnWlc17D.js";
-import { h as perlin12d, p as noise_exports } from "./noise-C_ZfgxTN.js";
-import { h as sdf_exports } from "./sdf-B5E-Vv1j.js";
-import { f as sdf3d_exports, n as shapeEffectBoundingBoxDeclaration, t as resolveShapeType } from "./shapeEffectBounds-CjOvQ3n3.js";
-import { n as glass_exports } from "./glass-ClmiwTb0.js";
-import { a as transformColor, c as transformPosition } from "./transformations-CsPUHppB.js";
+import { At as max, Bt as sin, Gt as data_exports, It as reflect, Mt as mix, Nt as normalize, Pt as pow, St as cos, Vt as smoothstep, at as std_exports, cn as vec4f, gt as select, h as call, kt as length, on as vec3f, rn as vec2f, rt as src_default, un as f32, x as vec4, xt as clamp, y as floatE } from "./edges-CD7gCAto.js";
+import { t as DEG_TO_RAD$1 } from "./constants-DoOzbl5b.js";
+import { t as animatedTime } from "./porters-DUtQounc.js";
+import { h as perlin12d, p as noise_exports } from "./noise-Bd6IGS0W.js";
+import { C as sdf_exports } from "./device-B0ZwBfOg.js";
+import { n as lighting_exports } from "./lighting-D3jc6qOc.js";
+import { i as shapeEffectBoundingBoxDeclaration, n as sdf3d_exports } from "./sdf3d-CP87OlsQ.js";
+import { t as bevel_exports } from "./bevel-ogqjoZKV.js";
+import { n as glass_exports } from "./glass-D8xs_kIG.js";
+import { a as transformColor, c as transformPosition } from "./transformations-B-zNWNdd.js";
 var { sdfSpaceUV, offsetUV } = glass_exports;
-var { createSvgSdfSampler, createAnalyticSdfSampler, driveAnalyticSubProps, ANALYTIC_SDF_EXTRA_FIELDS } = sdf_exports;
-var { createVolumetricFieldComputeNode, buildVolumetricFieldSampler, VOLUMETRIC_FIELD_EXTRA_FIELDS, is3dShapeType, isVolumetricShapeType, isMobileGpuViewport } = sdf3d_exports;
-var DEG_TO_RAD = .017453292519943295;
+var { bevelSin } = bevel_exports;
+var { volumetricNormal, bevelledFlatNormal, fieldGradient, patternCoords, outsideShape, insideMask, perspectiveViewRay } = lighting_exports;
+var { ANALYTIC_SDF_EXTRA_FIELDS } = sdf_exports;
+var { createVolumetricFieldComputeNode, resolveShapeFieldSampler, VOLUMETRIC_FIELD_EXTRA_FIELDS, isMobileGpuViewport } = sdf3d_exports;
+var DEG_TO_RAD = DEG_TO_RAD$1;
 var DEFAULT_SHAPE_CONFIG = JSON.stringify({
 	type: "circleSDF",
 	radius: .35
@@ -431,13 +436,14 @@ const liquidMetalComposite = src_default.fn([
 	vec4f,
 	vec2f,
 	vec2f,
+	vec2f,
 	vec3f,
 	vec3f,
 	vec4f,
 	vec4f,
 	vec4f,
 	vec4f
-], vec4f)(/* @__PURE__ */ (($) => (globalThis.__TYPEGPU_META__ ??= /* @__PURE__ */ new WeakMap()).set($.f = ((surf0, surfX, surfY, sdfUV, viewportSize, lightColor, darkColor, p0, p1, p2, p3) => {
+], vec4f)(/* @__PURE__ */ (($) => (globalThis.__TYPEGPU_META__ ??= /* @__PURE__ */ new WeakMap()).set($.f = ((surf0, surfX, surfY, sdfUV, uv, viewportSize, lightColor, darkColor, p0, p1, p2, p3) => {
 	"use gpu";
 	const scl = p0.x;
 	const edgeSoftness = p0.y;
@@ -452,20 +458,21 @@ const liquidMetalComposite = src_default.fn([
 	const animTime = p2.z;
 	const volumetric = p2.w;
 	const mobile = p3.x;
+	const bevelWidth = p3.y;
+	const bevelShape = p3.z;
+	const aspect = __tsover_div(viewportSize.x, viewportSize.y);
 	const sharpEdge = max(__tsover_mul(edgeSoftness, .5), .001);
 	const pxH = __tsover_div(1, viewportSize.y);
 	const sdfRaw = surf0.x;
 	const sdf = __tsover_div(sdfRaw, scl);
-	if (sdf > __tsover_mul(pxH, 2)) return vec4f(0, 0, 0, 0);
+	if (outsideShape(sdf, pxH)) return vec4f(0, 0, 0, 0);
 	const EPS = .01;
-	const nVol = normalize(vec3f(clamp(__tsover_div(__tsover_sub(surfX.w, surf0.w), EPS), -5, 5), clamp(__tsover_div(__tsover_sub(surfY.w, surf0.w), EPS), -5, 5), -1));
-	const gradX = __tsover_div(__tsover_sub(surfX.x, sdfRaw), EPS);
-	const gradY = __tsover_div(__tsover_sub(surfY.x, sdfRaw), EPS);
-	const rimT = clamp(__tsover_div(__tsover_mul(sdf, -1), .05), 0, 1);
-	const rimBevel = __tsover_mul(__tsover_sub(1, rimT), 1.6);
-	const nGeo = select(normalize(vec3f(__tsover_mul(gradX, rimBevel), __tsover_mul(gradY, rimBevel), -1)), nVol, volumetric > .5);
-	const fx = select(__tsover_sub(sdfUV.x, .5), surf0.y, volumetric > .5);
-	const fy = select(__tsover_sub(sdfUV.y, .5), surf0.z, volumetric > .5);
+	const nVol = volumetricNormal(surf0, surfX, surfY, EPS, 5);
+	const rimT = clamp(__tsover_div(__tsover_mul(sdf, -1), max(bevelWidth, .003)), 0, 1);
+	const nGeo = select(bevelledFlatNormal(fieldGradient(surf0, surfX, surfY, EPS), bevelSin(rimT, bevelShape)), nVol, volumetric > .5);
+	const pat = patternCoords(sdfUV, surf0, volumetric);
+	const fx = pat.x;
+	const fy = pat.y;
 	const freq = __tsover_mul(ripple, 2.6);
 	const flowT = __tsover_mul(animTime, .12);
 	const q = vec2f(__tsover_mul(fx, freq), __tsover_mul(fy, freq));
@@ -481,7 +488,7 @@ const liquidMetalComposite = src_default.fn([
 	const hy = clamp(__tsover_mul(nd.z, reliefGrad), __tsover_mul(gMax, -1), gMax);
 	const relief = __tsover_mul(turbulence, .5);
 	const n = normalize(vec3f(__tsover_sub(nGeo.x, __tsover_mul(hx, relief)), __tsover_sub(nGeo.y, __tsover_mul(hy, relief)), nGeo.z));
-	const R = reflect(vec3f(0, 0, 1), n);
+	const R = reflect(perspectiveViewRay(uv, aspect, .6), n);
 	const envStr = environment;
 	const sharp = clamp(sharpness, 0, 1);
 	const keyRad = mix(.5, .18, sharp);
@@ -500,7 +507,7 @@ const liquidMetalComposite = src_default.fn([
 	const lumB = select(lumBoffset, lumG, mobile > .5);
 	const lumR = select(__tsover_sub(__tsover_mul(lumG, 2), lumBoffset), lumG, mobile > .5);
 	const rgb = vec3f(mix(darkColor.x, lightColor.x, clamp(lumR, 0, 1.8)), mix(darkColor.y, lightColor.y, clamp(lumG, 0, 1.8)), mix(darkColor.z, lightColor.z, clamp(lumB, 0, 1.8)));
-	const transition = smoothstep(0, 1, clamp(__tsover_mul(__tsover_div(__tsover_mul(sdf, -1), sharpEdge), 32), 0, 1));
+	const transition = smoothstep(0, 1, insideMask(sdf, sharpEdge, pxH, 1.5));
 	return vec4f(rgb.x, rgb.y, rgb.z, transition);
 }), {
 	v: 1,
@@ -523,6 +530,10 @@ const liquidMetalComposite = src_default.fn([
 				"type": "i",
 				"name": "sdfUV"
 			},
+			{
+				"type": "i",
+				"name": "uv"
+			},
 			{
 				"type": "i",
 				"name": "viewportSize"
@@ -670,6 +681,42 @@ const liquidMetalComposite = src_default.fn([
 					"x"
 				]
 			],
+			[
+				13,
+				"bevelWidth",
+				[
+					7,
+					"p3",
+					"y"
+				]
+			],
+			[
+				13,
+				"bevelShape",
+				[
+					7,
+					"p3",
+					"z"
+				]
+			],
+			[
+				13,
+				"aspect",
+				[
+					1,
+					[
+						7,
+						"viewportSize",
+						"x"
+					],
+					"/",
+					[
+						7,
+						"viewportSize",
+						"y"
+					]
+				]
+			],
 			[
 				13,
 				"sharpEdge",
@@ -724,15 +771,9 @@ const liquidMetalComposite = src_default.fn([
 			[
 				11,
 				[
-					1,
-					"sdf",
-					">",
-					[
-						1,
-						"pxH",
-						"*",
-						[5, "2"]
-					]
+					6,
+					"outsideShape",
+					["sdf", "pxH"]
 				],
 				[10, [
 					6,
@@ -756,149 +797,19 @@ const liquidMetalComposite = src_default.fn([
 			],
 			[
 				13,
-				"ddx",
+				"nVol",
 				[
 					6,
+					"volumetricNormal",
 					[
-						7,
-						"std",
-						"clamp"
-					],
-					[
-						[
-							1,
-							[
-								1,
-								[
-									7,
-									"surfX",
-									"w"
-								],
-								"-",
-								[
-									7,
-									"surf0",
-									"w"
-								]
-							],
-							"/",
-							"EPS"
-						],
-						[
-							4,
-							"-",
-							[5, "5"]
-						],
+						"surf0",
+						"surfX",
+						"surfY",
+						"EPS",
 						[5, "5"]
 					]
 				]
 			],
-			[
-				13,
-				"ddy",
-				[
-					6,
-					[
-						7,
-						"std",
-						"clamp"
-					],
-					[
-						[
-							1,
-							[
-								1,
-								[
-									7,
-									"surfY",
-									"w"
-								],
-								"-",
-								[
-									7,
-									"surf0",
-									"w"
-								]
-							],
-							"/",
-							"EPS"
-						],
-						[
-							4,
-							"-",
-							[5, "5"]
-						],
-						[5, "5"]
-					]
-				]
-			],
-			[
-				13,
-				"nVol",
-				[
-					6,
-					[
-						7,
-						"std",
-						"normalize"
-					],
-					[[
-						6,
-						[
-							7,
-							"d",
-							"vec3f"
-						],
-						[
-							"ddx",
-							"ddy",
-							[
-								4,
-								"-",
-								[5, "1"]
-							]
-						]
-					]]
-				]
-			],
-			[
-				13,
-				"gradX",
-				[
-					1,
-					[
-						1,
-						[
-							7,
-							"surfX",
-							"x"
-						],
-						"-",
-						"sdfRaw"
-					],
-					"/",
-					"EPS"
-				]
-			],
-			[
-				13,
-				"gradY",
-				[
-					1,
-					[
-						1,
-						[
-							7,
-							"surfY",
-							"x"
-						],
-						"-",
-						"sdfRaw"
-					],
-					"/",
-					"EPS"
-				]
-			],
 			[
 				13,
 				"rimT",
@@ -923,64 +834,40 @@ const liquidMetalComposite = src_default.fn([
 								]
 							],
 							"/",
-							[5, "0.05"]
+							[
+								6,
+								[
+									7,
+									"std",
+									"max"
+								],
+								["bevelWidth", [5, "0.003"]]
+							]
 						],
 						[5, "0"],
 						[5, "1"]
 					]
 				]
 			],
-			[
-				13,
-				"rimBevel",
-				[
-					1,
-					[
-						1,
-						[5, "1"],
-						"-",
-						"rimT"
-					],
-					"*",
-					[5, "1.6"]
-				]
-			],
 			[
 				13,
 				"nFlat",
 				[
 					6,
-					[
-						7,
-						"std",
-						"normalize"
-					],
+					"bevelledFlatNormal",
 					[[
 						6,
+						"fieldGradient",
 						[
-							7,
-							"d",
-							"vec3f"
-						],
-						[
-							[
-								1,
-								"gradX",
-								"*",
-								"rimBevel"
-							],
-							[
-								1,
-								"gradY",
-								"*",
-								"rimBevel"
-							],
-							[
-								4,
-								"-",
-								[5, "1"]
-							]
+							"surf0",
+							"surfX",
+							"surfY",
+							"EPS"
 						]
+					], [
+						6,
+						"bevelSin",
+						["rimT", "bevelShape"]
 					]]
 				]
 			],
@@ -1008,72 +895,33 @@ const liquidMetalComposite = src_default.fn([
 			],
 			[
 				13,
-				"fx",
+				"pat",
 				[
 					6,
+					"patternCoords",
 					[
-						7,
-						"std",
-						"select"
-					],
-					[
-						[
-							1,
-							[
-								7,
-								"sdfUV",
-								"x"
-							],
-							"-",
-							[5, "0.5"]
-						],
-						[
-							7,
-							"surf0",
-							"y"
-						],
-						[
-							1,
-							"volumetric",
-							">",
-							[5, "0.5"]
-						]
+						"sdfUV",
+						"surf0",
+						"volumetric"
 					]
 				]
 			],
+			[
+				13,
+				"fx",
+				[
+					7,
+					"pat",
+					"x"
+				]
+			],
 			[
 				13,
 				"fy",
 				[
-					6,
-					[
-						7,
-						"std",
-						"select"
-					],
-					[
-						[
-							1,
-							[
-								7,
-								"sdfUV",
-								"y"
-							],
-							"-",
-							[5, "0.5"]
-						],
-						[
-							7,
-							"surf0",
-							"z"
-						],
-						[
-							1,
-							"volumetric",
-							">",
-							[5, "0.5"]
-						]
-					]
+					7,
+					"pat",
+					"y"
 				]
 			],
 			[
@@ -1487,6 +1335,19 @@ const liquidMetalComposite = src_default.fn([
 					]]
 				]
 			],
+			[
+				13,
+				"viewI",
+				[
+					6,
+					"perspectiveViewRay",
+					[
+						"uv",
+						"aspect",
+						[5, "0.6"]
+					]
+				]
+			],
 			[
 				13,
 				"R",
@@ -1497,19 +1358,7 @@ const liquidMetalComposite = src_default.fn([
 						"std",
 						"reflect"
 					],
-					[[
-						6,
-						[
-							7,
-							"d",
-							"vec3f"
-						],
-						[
-							[5, "0"],
-							[5, "0"],
-							[5, "1"]
-						]
-					], "n"]
+					["viewI", "n"]
 				]
 			],
 			[
@@ -2171,34 +2020,12 @@ const liquidMetalComposite = src_default.fn([
 						[5, "1"],
 						[
 							6,
+							"insideMask",
 							[
-								7,
-								"std",
-								"clamp"
-							],
-							[
-								[
-									1,
-									[
-										1,
-										[
-											1,
-											"sdf",
-											"*",
-											[
-												4,
-												"-",
-												[5, "1"]
-											]
-										],
-										"/",
-										"sharpEdge"
-									],
-									"*",
-									[5, "32"]
-								],
-								[5, "0"],
-								[5, "1"]
+								"sdf",
+								"sharpEdge",
+								"pxH",
+								[5, "1.5"]
 							]
 						]
 					]
@@ -2233,18 +2060,34 @@ const liquidMetalComposite = src_default.fn([
 		]],
 		"externalNames": [
 			"std",
+			"outsideShape",
 			"d",
+			"volumetricNormal",
+			"bevelledFlatNormal",
+			"fieldGradient",
+			"bevelSin",
+			"patternCoords",
 			"noise",
+			"perspectiveViewRay",
 			"DEG_TO_RAD",
-			"liquidStudio"
+			"liquidStudio",
+			"insideMask"
 		]
 	},
 	externals: () => ({
 		std: std_exports,
+		outsideShape,
 		d: data_exports,
+		volumetricNormal,
+		bevelledFlatNormal,
+		fieldGradient,
+		bevelSin,
+		patternCoords,
 		noise: noise_exports,
+		perspectiveViewRay,
 		DEG_TO_RAD,
-		liquidStudio
+		liquidStudio,
+		insideMask
 	})
 }) && $.f)({}));
 const componentDefinition = {
@@ -2433,6 +2276,30 @@ const componentDefinition = {
 				group: "Surface"
 			}
 		},
+		bevelWidth: {
+			default: .05,
+			description: "Width of the edge bevel, relative to the shape — thin for machined jewellery edges, wide for soft pillowed metal",
+			ui: {
+				type: ["range", "map"],
+				min: .005,
+				max: .2,
+				step: .001,
+				label: "Bevel Width",
+				group: "Surface"
+			}
+		},
+		bevelShape: {
+			default: 0,
+			description: "Bevel profile — 0 = one smooth round fillet, 1 = machined: a steep outer fillet, a chamfer plateau and an inner knee, each catching its own line of light",
+			ui: {
+				type: ["range", "map"],
+				min: 0,
+				max: 1,
+				step: .01,
+				label: "Bevel Profile",
+				group: "Surface"
+			}
+		},
 		edgeSoftness: {
 			default: .05,
 			description: "Softness of the shape boundary edge",
@@ -2465,45 +2332,10 @@ const componentDefinition = {
 			description: "Active SDF shape type"
 		}
 	},
-	compute: (params) => {
-		const vf = createVolumetricFieldComputeNode(params, () => params.getCpuValue("shape"), "raw");
-		return vf ? {
-			outputs: vf.outputs,
-			getComputeNodes: (fp) => vf.getComputeNodes(fp)
-		} : null;
-	},
+	compute: (params) => createVolumetricFieldComputeNode(params, () => params.getCpuValue("shape"), "raw"),
 	fragment: (params) => {
-		const { computeOutputs, uniforms, propValues, ctx, getCpuValue } = params;
-		let sampler;
-		let gradSampler;
-		let volumetric = false;
-		const fieldTex = computeOutputs?.volumetricFieldTexture;
-		if (fieldTex) {
-			const s = buildVolumetricFieldSampler(fieldTex, {
-				originX: uniforms._vfOriginX,
-				originY: uniforms._vfOriginY,
-				spanX: uniforms._vfSpanX,
-				spanY: uniforms._vfSpanY,
-				activeResF: uniforms._vfActiveRes,
-				rBound: uniforms._vfRBound
-			});
-			sampler = s.volumetricFieldSampler;
-			gradSampler = s.volumetricFieldSamplerFast;
-			volumetric = true;
-		} else {
-			const shapeSdfUrl = propValues.shapeSdfUrl || "";
-			const shapeType = propValues.shapeType || "";
-			if (shapeSdfUrl) {
-				sampler = createSvgSdfSampler(params, shapeSdfUrl);
-				gradSampler = sampler;
-				volumetric = isVolumetricShapeType(shapeType);
-			} else {
-				const st = resolveShapeType(shapeType, getCpuValue("shape"));
-				sampler = createAnalyticSdfSampler(st, driveAnalyticSubProps(params, () => getCpuValue("shape")), "raw");
-				gradSampler = sampler;
-				volumetric = is3dShapeType(st);
-			}
-		}
+		const { uniforms, ctx } = params;
+		const { sampler, gradSampler, volumetric } = resolveShapeFieldSampler(params, { patternMode: "raw" });
 		const sdfUV = call(sdfSpaceUV, "sdfSpaceUV", [
 			uniforms.center,
 			uniforms.scale,
@@ -2528,12 +2360,13 @@ const componentDefinition = {
 		const p0 = vec4(uniforms.scale, uniforms.edgeSoftness, uniforms.ripple, uniforms.warp);
 		const p1 = vec4(uniforms.turbulence, uniforms.environment, uniforms.envRotation, uniforms.sharpness);
 		const p2 = vec4(uniforms.dispersion, uniforms.lightAngle, t, volFlag);
-		const p3 = vec4(mobileFlag, floatE(0), floatE(0), floatE(0));
+		const p3 = vec4(mobileFlag, uniforms.bevelWidth, uniforms.bevelShape, floatE(0));
 		return call(liquidMetalComposite, "liquidMetalComposite", [
 			surf0,
 			surfX,
 			surfY,
 			sdfUV,
+			ctx.uv,
 			ctx.viewportSize,
 			uniforms.lightColor.member("rgb"),
 			uniforms.darkColor.member("rgb"),