shaders 3.0.453 → 3.1.455

package/dist/core/{BrushedMetal-Xq4jMVz1.js → BrushedMetal-BAgNgeo1.js}

@@ -1,16 +1,19 @@
-import { At as max, Bt as sin, Gt as data_exports, Ht as sqrt, It as reflect, Mt as mix, Nt as normalize, Pt as pow, St as cos, Tt as exp, Vt as smoothstep, _t as abs, b as vec4, cn as vec4f, gt as select, it as std_exports, jt as min, kt as length, ln as f32, m as call, nt as src_default, on as vec3f, qt as arrayOf, rn as vec2f, v as floatE, wt as dot, xt as clamp } from "./edges-B7Yet3LV.js";
-import { t as animatedTime } from "./porters-D_xmIPz2.js";
-import { p as noise_exports, u as mxNoiseFloat2 } from "./noise-B-PI7JUx.js";
-import { h as sdf_exports } from "./sdf-B8rPE1PG.js";
-import { f as sdf3d_exports, n as shapeEffectBoundingBoxDeclaration, t as resolveShapeType } from "./shapeEffectBounds-Svfd_R5a.js";
-import { t as bevel_exports } from "./bevel-BGAb1fb2.js";
-import { n as glass_exports } from "./glass-CNFJB2On.js";
-import { a as transformColor, c as transformPosition } from "./transformations-C7gn_5rF.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, qt as arrayOf, rn as vec2f, rt as src_default, un as f32, wt as dot, 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 { p as noise_exports, u as mxNoiseFloat2 } 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 { volumetricNormal, bevelledFlatNormal, fieldGradient, patternCoords, outsideShape, insideMask, perspectiveViewRay, wardAnisotropicSpecular, WardSpecularInput } = lighting_exports;
 var { bevelSin } = bevel_exports;
-var { createSvgSdfSampler, createAnalyticSdfSampler, driveAnalyticSubProps, ANALYTIC_SDF_EXTRA_FIELDS } = sdf_exports;
-var { createVolumetricFieldComputeNode, buildVolumetricFieldSampler, VOLUMETRIC_FIELD_EXTRA_FIELDS, is3dShapeType, isVolumetricShapeType } = sdf3d_exports;
-var DEG_TO_RAD = .017453292519943295;
+var { ANALYTIC_SDF_EXTRA_FIELDS } = sdf_exports;
+var { createVolumetricFieldComputeNode, resolveShapeFieldSampler, VOLUMETRIC_FIELD_EXTRA_FIELDS } = sdf3d_exports;
+var DEG_TO_RAD = DEG_TO_RAD$1;
 var DEFAULT_SHAPE_CONFIG = JSON.stringify({
 	type: "circleSDF",
 	radius: .35
@@ -625,7 +628,7 @@ const brushedMetalComposite = src_default.fn([
 	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 lx = cos(__tsover_mul(lightAngle, DEG_TO_RAD));
 	const ly = sin(__tsover_mul(lightAngle, DEG_TO_RAD));
 	const btx = cos(__tsover_mul(brushAngle, DEG_TO_RAD));
@@ -633,14 +636,12 @@ const brushedMetalComposite = src_default.fn([
 	const envC = cos(__tsover_mul(envRotation, DEG_TO_RAD));
 	const envS = sin(__tsover_mul(envRotation, DEG_TO_RAD));
 	const EPS = .01;
-	const gradX = __tsover_div(__tsover_sub(surfX.x, sdfRaw), EPS);
-	const gradY = __tsover_div(__tsover_sub(surfY.x, sdfRaw), EPS);
-	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 glen = max(length(vec2f(gradX, gradY)), 1e-4);
-	const sB = min(bevelSin(clamp(__tsover_div(__tsover_mul(sdf, -1), max(p3.x, .003)), 0, 1), p3.y), .9995);
-	const nGeo = select(vec3f(__tsover_mul(__tsover_div(gradX, glen), sB), __tsover_mul(__tsover_div(gradY, glen), sB), __tsover_mul(sqrt(__tsover_sub(1, __tsover_mul(sB, sB))), -1)), nVol, volumetric > .5);
-	const pdx = select(__tsover_sub(sdfUV.x, .5), surf0.y, volumetric > .5);
-	const pdy = 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(p3.x, .003)), 0, 1);
+	const nGeo = select(bevelledFlatNormal(fieldGradient(surf0, surfX, surfY, EPS), bevelSin(rimT, p3.y)), nVol, volumetric > .5);
+	const pat = patternCoords(sdfUV, surf0, volumetric);
+	const pdx = pat.x;
+	const pdy = pat.y;
 	const bix = __tsover_mul(bty, -1);
 	const biy = btx;
 	const along = __tsover_add(__tsover_mul(pdx, btx), __tsover_mul(pdy, bty));
@@ -655,8 +656,7 @@ const brushedMetalComposite = src_default.fn([
 	const pAcross = __tsover_add(__tsover_mul(sheen0, sheenAmt), __tsover_mul(line0, lineAmt));
 	const pAlong = __tsover_mul(mxNoiseFloat2(vec2f(__tsover_add(__tsover_mul(__tsover_add(along, 11.7), 1.3), driftA), __tsover_mul(across, 6.5))), __tsover_mul(sheenAmt, .12));
 	const n = normalize(vec3f(__tsover_add(__tsover_add(nGeo.x, __tsover_mul(bix, pAcross)), __tsover_mul(btx, pAlong)), __tsover_add(__tsover_add(nGeo.y, __tsover_mul(biy, pAcross)), __tsover_mul(bty, pAlong)), nGeo.z));
-	const fov = .6;
-	const viewI = normalize(vec3f(__tsover_mul(__tsover_mul(__tsover_sub(uv.x, .5), aspect), fov), __tsover_mul(__tsover_sub(uv.y, .5), fov), 1));
+	const viewI = perspectiveViewRay(uv, aspect, .6);
 	const cosView = clamp(__tsover_mul(dot(n, viewI), -1), 0, 1);
 	const grazing = __tsover_sub(1, cosView);
 	const R = reflect(viewI, n);
@@ -671,21 +671,18 @@ const brushedMetalComposite = src_default.fn([
 		const off = __tsover_mul(step, __tsover_sub(f32(i), 4));
 		envLum = __tsover_add(envLum, __tsover_mul(brushedStudio(__tsover_add(R.x, __tsover_mul(btx, off)), __tsover_add(R.y, __tsover_mul(bty, off)), envC, envS, keyRad, drift, envStr), BRUSH_BLUR_W.$[i]));
 	}
-	const t0 = vec3f(btx, bty, 0);
-	const T3 = normalize(t0.sub(n.mul(dot(n, t0))));
-	const B3 = vec3f(__tsover_sub(__tsover_mul(n.y, T3.z), __tsover_mul(n.z, T3.y)), __tsover_sub(__tsover_mul(n.z, T3.x), __tsover_mul(n.x, T3.z)), __tsover_sub(__tsover_mul(n.x, T3.y), __tsover_mul(n.y, T3.x)));
-	const H = normalize(normalize(vec3f(lx, ly, -.7)).sub(viewI));
-	const hT = dot(H, T3);
-	const hB = dot(H, B3);
-	const hN = clamp(abs(dot(H, n)), 1e-4, 1);
 	const baseA = mix(.05, .45, rough);
-	const aAlong = __tsover_mul(baseA, __tsover_add(1, __tsover_mul(aniso, 7)));
-	const aAcross = max(__tsover_mul(baseA, __tsover_sub(1, __tsover_mul(aniso, .55))), .02);
-	const expo = __tsover_div(__tsover_add(__tsover_mul(__tsover_div(hT, aAlong), __tsover_div(hT, aAlong)), __tsover_mul(__tsover_div(hB, aAcross), __tsover_div(hB, aAcross))), __tsover_mul(__tsover_add(hN, 1), .5));
-	const spec = __tsover_mul(exp(__tsover_mul(expo, -1)), mix(.45, 1.1, __tsover_sub(1, rough)));
+	const spec = __tsover_mul(wardAnisotropicSpecular(WardSpecularInput({
+		normal: n,
+		tangent: vec3f(btx, bty, 0),
+		light: normalize(vec3f(lx, ly, -.7)),
+		view: viewI,
+		alphaAlong: __tsover_mul(baseA, __tsover_add(1, __tsover_mul(aniso, 7))),
+		alphaAcross: max(__tsover_mul(baseA, __tsover_sub(1, __tsover_mul(aniso, .55))), .02)
+	})), mix(.45, 1.1, __tsover_sub(1, rough)));
 	const fres = __tsover_add(1, __tsover_mul(pow(grazing, f32(3)), .6));
 	const rgb = mix(darkColor, lightColor, vec3f(clamp(__tsover_mul(__tsover_add(envLum, spec), fres), 0, 1.7)));
-	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,
@@ -922,15 +919,9 @@ const brushedMetalComposite = src_default.fn([
 			[
 				11,
 				[
-					1,
-					"sdf",
-					">",
-					[
-						1,
-						"pxH",
-						"*",
-						[5, "2"]
-					]
+					6,
+					"outsideShape",
+					["sdf", "pxH"]
 				],
 				[10, [
 					6,
@@ -1062,178 +1053,19 @@ const brushedMetalComposite = src_default.fn([
 			],
 			[
 				13,
-				"gradX",
-				[
-					1,
-					[
-						1,
-						[
-							7,
-							"surfX",
-							"x"
-						],
-						"-",
-						"sdfRaw"
-					],
-					"/",
-					"EPS"
-				]
-			],
-			[
-				13,
-				"gradY",
-				[
-					1,
-					[
-						1,
-						[
-							7,
-							"surfY",
-							"x"
-						],
-						"-",
-						"sdfRaw"
-					],
-					"/",
-					"EPS"
-				]
-			],
-			[
-				13,
-				"ddx",
-				[
-					6,
-					[
-						7,
-						"std",
-						"clamp"
-					],
-					[
-						[
-							1,
-							[
-								1,
-								[
-									7,
-									"surfX",
-									"w"
-								],
-								"-",
-								[
-									7,
-									"surf0",
-									"w"
-								]
-							],
-							"/",
-							"EPS"
-						],
-						[
-							4,
-							"-",
-							[5, "5"]
-						],
-						[5, "5"]
-					]
-				]
-			],
-			[
-				13,
-				"ddy",
+				"nVol",
 				[
 					6,
+					"volumetricNormal",
 					[
-						7,
-						"std",
-						"clamp"
-					],
-					[
-						[
-							1,
-							[
-								1,
-								[
-									7,
-									"surfY",
-									"w"
-								],
-								"-",
-								[
-									7,
-									"surf0",
-									"w"
-								]
-							],
-							"/",
-							"EPS"
-						],
-						[
-							4,
-							"-",
-							[5, "5"]
-						],
+						"surf0",
+						"surfX",
+						"surfY",
+						"EPS",
 						[5, "5"]
 					]
 				]
 			],
-			[
-				13,
-				"nVol",
-				[
-					6,
-					[
-						7,
-						"std",
-						"normalize"
-					],
-					[[
-						6,
-						[
-							7,
-							"d",
-							"vec3f"
-						],
-						[
-							"ddx",
-							"ddy",
-							[
-								4,
-								"-",
-								[5, "1"]
-							]
-						]
-					]]
-				]
-			],
-			[
-				13,
-				"glen",
-				[
-					6,
-					[
-						7,
-						"std",
-						"max"
-					],
-					[[
-						6,
-						[
-							7,
-							"std",
-							"length"
-						],
-						[[
-							6,
-							[
-								7,
-								"d",
-								"vec2f"
-							],
-							["gradX", "gradY"]
-						]]
-					], [5, "0.0001"]]
-				]
-			],
 			[
 				13,
 				"rimT",
@@ -1279,15 +1111,20 @@ const brushedMetalComposite = src_default.fn([
 			],
 			[
 				13,
-				"sB",
+				"nFlat",
 				[
 					6,
-					[
-						7,
-						"std",
-						"min"
-					],
+					"bevelledFlatNormal",
 					[[
+						6,
+						"fieldGradient",
+						[
+							"surf0",
+							"surfX",
+							"surfY",
+							"EPS"
+						]
+					], [
 						6,
 						"bevelSin",
 						["rimT", [
@@ -1295,71 +1132,7 @@ const brushedMetalComposite = src_default.fn([
 							"p3",
 							"y"
 						]]
-					], [5, "0.9995"]]
-				]
-			],
-			[
-				13,
-				"nFlat",
-				[
-					6,
-					[
-						7,
-						"d",
-						"vec3f"
-					],
-					[
-						[
-							1,
-							[
-								1,
-								"gradX",
-								"/",
-								"glen"
-							],
-							"*",
-							"sB"
-						],
-						[
-							1,
-							[
-								1,
-								"gradY",
-								"/",
-								"glen"
-							],
-							"*",
-							"sB"
-						],
-						[
-							1,
-							[
-								6,
-								[
-									7,
-									"std",
-									"sqrt"
-								],
-								[[
-									1,
-									[5, "1"],
-									"-",
-									[
-										1,
-										"sB",
-										"*",
-										"sB"
-									]
-								]]
-							],
-							"*",
-							[
-								4,
-								"-",
-								[5, "1"]
-							]
-						]
-					]
+					]]
 				]
 			],
 			[
@@ -1386,81 +1159,42 @@ const brushedMetalComposite = src_default.fn([
 			],
 			[
 				13,
-				"pdx",
+				"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,
+				"pdx",
+				[
+					7,
+					"pat",
+					"x"
+				]
+			],
 			[
 				13,
 				"pdy",
 				[
-					6,
-					[
-						7,
-						"std",
-						"select"
-					],
-					[
-						[
-							1,
-							[
-								7,
-								"sdfUV",
-								"y"
-							],
-							"-",
-							[5, "0.5"]
-						],
-						[
-							7,
-							"surf0",
-							"z"
-						],
-						[
-							1,
-							"volumetric",
-							">",
-							[5, "0.5"]
-						]
-					]
-				]
-			],
-			[
-				13,
-				"bix",
-				[
-					1,
-					"bty",
-					"*",
+					7,
+					"pat",
+					"y"
+				]
+			],
+			[
+				13,
+				"bix",
+				[
+					1,
+					"bty",
+					"*",
 					[
 						4,
 						"-",
@@ -1842,67 +1576,17 @@ const brushedMetalComposite = src_default.fn([
 					]]
 				]
 			],
-			[
-				13,
-				"fov",
-				[5, "0.6"]
-			],
 			[
 				13,
 				"viewI",
 				[
 					6,
+					"perspectiveViewRay",
 					[
-						7,
-						"std",
-						"normalize"
-					],
-					[[
-						6,
-						[
-							7,
-							"d",
-							"vec3f"
-						],
-						[
-							[
-								1,
-								[
-									1,
-									[
-										1,
-										[
-											7,
-											"uv",
-											"x"
-										],
-										"-",
-										[5, "0.5"]
-									],
-									"*",
-									"aspect"
-								],
-								"*",
-								"fov"
-							],
-							[
-								1,
-								[
-									1,
-									[
-										7,
-										"uv",
-										"y"
-									],
-									"-",
-									[5, "0.5"]
-								],
-								"*",
-								"fov"
-							],
-							[5, "1"]
-						]
-					]]
+						"uv",
+						"aspect",
+						[5, "0.6"]
+					]
 				]
 			],
 			[
@@ -2002,576 +1686,200 @@ const brushedMetalComposite = src_default.fn([
 							[5, "1"],
 							"-",
 							"rough"
-						]
-					]
-				]
-			],
-			[
-				13,
-				"drift",
-				[
-					1,
-					[
-						6,
-						[
-							7,
-							"std",
-							"sin"
-						],
-						[[
-							1,
-							"animTime",
-							"*",
-							[5, "0.07"]
-						]]
-					],
-					"*",
-					[5, "0.05"]
-				]
-			],
-			[
-				13,
-				"smear",
-				[
-					1,
-					[
-						1,
-						"aniso",
-						"*",
-						[
-							1,
-							[
-								1,
-								"rough",
-								"*",
-								[5, "0.6"]
-							],
-							"+",
-							[5, "0.25"]
-						]
-					],
-					"*",
-					[5, "0.42"]
-				]
-			],
-			[
-				13,
-				"step",
-				[
-					1,
-					"smear",
-					"/",
-					[5, "4"]
-				]
-			],
-			[
-				12,
-				"envLum",
-				[
-					6,
-					[
-						7,
-						"d",
-						"f32"
-					],
-					[[5, "0"]]
-				]
-			],
-			[
-				14,
-				[
-					12,
-					"i",
-					[5, "0"]
-				],
-				[
-					1,
-					"i",
-					"<",
-					[5, "9"]
-				],
-				[
-					102,
-					"++",
-					"i"
-				],
-				[0, [[
-					13,
-					"off",
-					[
-						1,
-						"step",
-						"*",
-						[
-							1,
-							[
-								6,
-								[
-									7,
-									"d",
-									"f32"
-								],
-								["i"]
-							],
-							"-",
-							[5, "4"]
-						]
-					]
-				], [
-					2,
-					"envLum",
-					"=",
-					[
-						1,
-						"envLum",
-						"+",
-						[
-							1,
-							[
-								6,
-								"brushedStudio",
-								[
-									[
-										1,
-										[
-											7,
-											"R",
-											"x"
-										],
-										"+",
-										[
-											1,
-											"btx",
-											"*",
-											"off"
-										]
-									],
-									[
-										1,
-										[
-											7,
-											"R",
-											"y"
-										],
-										"+",
-										[
-											1,
-											"bty",
-											"*",
-											"off"
-										]
-									],
-									"envC",
-									"envS",
-									"keyRad",
-									"drift",
-									"envStr"
-								]
-							],
-							"*",
-							[
-								8,
-								[
-									7,
-									"BRUSH_BLUR_W",
-									"$"
-								],
-								"i"
-							]
-						]
-					]
-				]]]
-			],
-			[
-				13,
-				"t0",
-				[
-					6,
-					[
-						7,
-						"d",
-						"vec3f"
-					],
-					[
-						"btx",
-						"bty",
-						[5, "0"]
-					]
-				]
-			],
-			[
-				13,
-				"T3",
-				[
-					6,
-					[
-						7,
-						"std",
-						"normalize"
-					],
-					[[
-						6,
-						[
-							7,
-							"t0",
-							"sub"
-						],
-						[[
-							6,
-							[
-								7,
-								"n",
-								"mul"
-							],
-							[[
-								6,
-								[
-									7,
-									"std",
-									"dot"
-								],
-								["n", "t0"]
-							]]
-						]]
-					]]
-				]
-			],
-			[
-				13,
-				"B3",
-				[
-					6,
-					[
-						7,
-						"d",
-						"vec3f"
-					],
-					[
-						[
-							1,
-							[
-								1,
-								[
-									7,
-									"n",
-									"y"
-								],
-								"*",
-								[
-									7,
-									"T3",
-									"z"
-								]
-							],
-							"-",
-							[
-								1,
-								[
-									7,
-									"n",
-									"z"
-								],
-								"*",
-								[
-									7,
-									"T3",
-									"y"
-								]
-							]
-						],
-						[
-							1,
-							[
-								1,
-								[
-									7,
-									"n",
-									"z"
-								],
-								"*",
-								[
-									7,
-									"T3",
-									"x"
-								]
-							],
-							"-",
-							[
-								1,
-								[
-									7,
-									"n",
-									"x"
-								],
-								"*",
-								[
-									7,
-									"T3",
-									"z"
-								]
-							]
-						],
-						[
-							1,
-							[
-								1,
-								[
-									7,
-									"n",
-									"x"
-								],
-								"*",
-								[
-									7,
-									"T3",
-									"y"
-								]
-							],
-							"-",
-							[
-								1,
-								[
-									7,
-									"n",
-									"y"
-								],
-								"*",
-								[
-									7,
-									"T3",
-									"x"
-								]
-							]
-						]
-					]
-				]
-			],
-			[
-				13,
-				"L",
-				[
-					6,
-					[
-						7,
-						"std",
-						"normalize"
-					],
-					[[
-						6,
-						[
-							7,
-							"d",
-							"vec3f"
-						],
-						[
-							"lx",
-							"ly",
-							[
-								4,
-								"-",
-								[5, "0.7"]
-							]
-						]
-					]]
-				]
-			],
-			[
-				13,
-				"H",
-				[
-					6,
-					[
-						7,
-						"std",
-						"normalize"
-					],
-					[[
-						6,
-						[
-							7,
-							"L",
-							"sub"
-						],
-						["viewI"]
-					]]
-				]
-			],
-			[
-				13,
-				"hT",
-				[
-					6,
-					[
-						7,
-						"std",
-						"dot"
-					],
-					["H", "T3"]
-				]
-			],
-			[
-				13,
-				"hB",
-				[
-					6,
-					[
-						7,
-						"std",
-						"dot"
-					],
-					["H", "B3"]
-				]
-			],
-			[
-				13,
-				"hN",
-				[
-					6,
-					[
-						7,
-						"std",
-						"clamp"
-					],
-					[
-						[
-							6,
-							[
-								7,
-								"std",
-								"abs"
-							],
-							[[
-								6,
-								[
-									7,
-									"std",
-									"dot"
-								],
-								["H", "n"]
-							]]
-						],
-						[5, "0.0001"],
-						[5, "1"]
-					]
-				]
-			],
-			[
-				13,
-				"baseA",
-				[
-					6,
-					[
-						7,
-						"std",
-						"mix"
-					],
-					[
-						[5, "0.05"],
-						[5, "0.45"],
-						"rough"
+						]
 					]
 				]
 			],
 			[
 				13,
-				"aAlong",
+				"drift",
 				[
 					1,
-					"baseA",
-					"*",
 					[
-						1,
-						[5, "1"],
-						"+",
+						6,
 						[
+							7,
+							"std",
+							"sin"
+						],
+						[[
 							1,
-							"aniso",
+							"animTime",
 							"*",
-							[5, "7"]
-						]
-					]
+							[5, "0.07"]
+						]]
+					],
+					"*",
+					[5, "0.05"]
 				]
 			],
 			[
 				13,
-				"aAcross",
+				"smear",
 				[
-					6,
+					1,
 					[
-						7,
-						"std",
-						"max"
-					],
-					[[
 						1,
-						"baseA",
+						"aniso",
 						"*",
 						[
 							1,
-							[5, "1"],
-							"-",
 							[
 								1,
-								"aniso",
+								"rough",
 								"*",
-								[5, "0.55"]
-							]
+								[5, "0.6"]
+							],
+							"+",
+							[5, "0.25"]
 						]
-					], [5, "0.02"]]
+					],
+					"*",
+					[5, "0.42"]
 				]
 			],
 			[
 				13,
-				"expo",
+				"step",
+				[
+					1,
+					"smear",
+					"/",
+					[5, "4"]
+				]
+			],
+			[
+				12,
+				"envLum",
+				[
+					6,
+					[
+						7,
+						"d",
+						"f32"
+					],
+					[[5, "0"]]
+				]
+			],
+			[
+				14,
+				[
+					12,
+					"i",
+					[5, "0"]
+				],
 				[
 					1,
+					"i",
+					"<",
+					[5, "9"]
+				],
+				[
+					102,
+					"++",
+					"i"
+				],
+				[0, [[
+					13,
+					"off",
 					[
 						1,
+						"step",
+						"*",
 						[
 							1,
 							[
-								1,
-								"hT",
-								"/",
-								"aAlong"
+								6,
+								[
+									7,
+									"d",
+									"f32"
+								],
+								["i"]
 							],
-							"*",
-							[
-								1,
-								"hT",
-								"/",
-								"aAlong"
-							]
-						],
+							"-",
+							[5, "4"]
+						]
+					]
+				], [
+					2,
+					"envLum",
+					"=",
+					[
+						1,
+						"envLum",
 						"+",
 						[
 							1,
 							[
-								1,
-								"hB",
-								"/",
-								"aAcross"
+								6,
+								"brushedStudio",
+								[
+									[
+										1,
+										[
+											7,
+											"R",
+											"x"
+										],
+										"+",
+										[
+											1,
+											"btx",
+											"*",
+											"off"
+										]
+									],
+									[
+										1,
+										[
+											7,
+											"R",
+											"y"
+										],
+										"+",
+										[
+											1,
+											"bty",
+											"*",
+											"off"
+										]
+									],
+									"envC",
+									"envS",
+									"keyRad",
+									"drift",
+									"envStr"
+								]
 							],
 							"*",
 							[
-								1,
-								"hB",
-								"/",
-								"aAcross"
+								8,
+								[
+									7,
+									"BRUSH_BLUR_W",
+									"$"
+								],
+								"i"
 							]
 						]
+					]
+				]]]
+			],
+			[
+				13,
+				"baseA",
+				[
+					6,
+					[
+						7,
+						"std",
+						"mix"
 					],
-					"/",
 					[
-						1,
-						[
-							1,
-							"hN",
-							"+",
-							[5, "1"]
-						],
-						"*",
-						[5, "0.5"]
+						[5, "0.05"],
+						[5, "0.45"],
+						"rough"
 					]
 				]
 			],
@@ -2582,20 +1890,92 @@ const brushedMetalComposite = src_default.fn([
 					1,
 					[
 						6,
-						[
-							7,
-							"std",
-							"exp"
-						],
+						"wardAnisotropicSpecular",
 						[[
-							1,
-							"expo",
-							"*",
-							[
-								4,
-								"-",
-								[5, "1"]
-							]
+							6,
+							"WardSpecularInput",
+							[[104, {
+								"normal": "n",
+								"tangent": [
+									6,
+									[
+										7,
+										"d",
+										"vec3f"
+									],
+									[
+										"btx",
+										"bty",
+										[5, "0"]
+									]
+								],
+								"light": [
+									6,
+									[
+										7,
+										"std",
+										"normalize"
+									],
+									[[
+										6,
+										[
+											7,
+											"d",
+											"vec3f"
+										],
+										[
+											"lx",
+											"ly",
+											[
+												4,
+												"-",
+												[5, "0.7"]
+											]
+										]
+									]]
+								],
+								"view": "viewI",
+								"alphaAlong": [
+									1,
+									"baseA",
+									"*",
+									[
+										1,
+										[5, "1"],
+										"+",
+										[
+											1,
+											"aniso",
+											"*",
+											[5, "7"]
+										]
+									]
+								],
+								"alphaAcross": [
+									6,
+									[
+										7,
+										"std",
+										"max"
+									],
+									[[
+										1,
+										"baseA",
+										"*",
+										[
+											1,
+											[5, "1"],
+											"-",
+											[
+												1,
+												"aniso",
+												"*",
+												[5, "0.55"]
+											]
+										]
+									], [5, "0.02"]]
+								]
+							}]]
 						]]
 					],
 					"*",
@@ -2717,34 +2097,12 @@ const brushedMetalComposite = 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"]
 							]
 						]
 					]
@@ -2779,22 +2137,40 @@ const brushedMetalComposite = src_default.fn([
 		]],
 		"externalNames": [
 			"std",
+			"outsideShape",
 			"d",
 			"DEG_TO_RAD",
+			"volumetricNormal",
+			"bevelledFlatNormal",
+			"fieldGradient",
 			"bevelSin",
+			"patternCoords",
 			"noise",
+			"perspectiveViewRay",
 			"brushedStudio",
-			"BRUSH_BLUR_W"
+			"BRUSH_BLUR_W",
+			"wardAnisotropicSpecular",
+			"WardSpecularInput",
+			"insideMask"
 		]
 	},
 	externals: () => ({
 		std: std_exports,
+		outsideShape,
 		d: data_exports,
 		DEG_TO_RAD,
+		volumetricNormal,
+		bevelledFlatNormal,
+		fieldGradient,
 		bevelSin,
+		patternCoords,
 		noise: noise_exports,
+		perspectiveViewRay,
 		brushedStudio,
-		BRUSH_BLUR_W
+		BRUSH_BLUR_W,
+		wardAnisotropicSpecular,
+		WardSpecularInput,
+		insideMask
 	})
 }) && $.f)({}));
 const componentDefinition = {
@@ -3039,45 +2415,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,