shaders 3.0.453 → 3.1.455

package/dist/core/{CarbonFiber-Dg-XleHg.js → CarbonFiber-mK6eHIpy.js}

@@ -1,16 +1,19 @@
-import { At as max, Bt as sin, Dt as floor, Gt as data_exports, Ht as sqrt, It as reflect, Mt as mix, Nt as normalize, Ot as fract, 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, rn as vec2f, v as floatE, wt as dot, xt as clamp } from "./edges-B7Yet3LV.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, Dt as floor, Gt as data_exports, It as reflect, Mt as mix, Nt as normalize, Ot as fract, Pt as pow, St as cos, Vt as smoothstep, _t as abs, at as std_exports, cn as vec4f, gt as select, h as call, jt as min, kt as length, on as vec3f, 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 { i as PI$1, t as DEG_TO_RAD$1 } from "./constants-DoOzbl5b.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 PI = Math.PI;
+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 PI = PI$1;
 var TWO_PI_SEVEN = 2 * Math.PI * 7;
 var DEFAULT_SHAPE_CONFIG = JSON.stringify({
 	type: "circleSDF",
@@ -49,7 +52,7 @@ function buildCarbonFiberComposite(weaveStyle) {
 		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 wtx = cos(__tsover_mul(weaveAngle, DEG_TO_RAD));
@@ -57,14 +60,12 @@ function buildCarbonFiberComposite(weaveStyle) {
 		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 wbx = __tsover_mul(wty, -1);
 		const wby = wtx;
 		const warp = __tsover_add(__tsover_mul(pdx, wtx), __tsover_mul(pdy, wty));
@@ -98,25 +99,21 @@ function buildCarbonFiberComposite(weaveStyle) {
 		const crossTilt = __tsover_add(bulge, filament);
 		const n = normalize(vec3f(__tsover_add(nGeo.x, __tsover_mul(crossX, crossTilt)), __tsover_add(nGeo.y, __tsover_mul(crossY, crossTilt)), nGeo.z));
 		const ao = mix(.5, 1, smoothstep(0, .05, min(__tsover_sub(.5, abs(fA)), __tsover_sub(.5, abs(fB)))));
-		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);
 		const rough = clamp(roughness, 0, 1);
-		const t0 = vec3f(fiberX, fiberY, 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 L = normalize(vec3f(lx, ly, -.7));
-		const Hh = normalize(L.sub(viewI));
-		const hT = dot(Hh, T3);
-		const hB = dot(Hh, B3);
-		const hN = clamp(abs(dot(Hh, n)), 1e-4, 1);
 		const baseA = mix(.06, .5, rough);
-		const aAlong = __tsover_mul(baseA, 6);
-		const aAcross = baseA;
-		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 sheen = __tsover_mul(exp(__tsover_mul(expo, -1)), fiberSheen);
+		const sheen = __tsover_mul(wardAnisotropicSpecular(WardSpecularInput({
+			normal: n,
+			tangent: vec3f(fiberX, fiberY, 0),
+			light: L,
+			view: viewI,
+			alphaAlong: __tsover_mul(baseA, 6),
+			alphaAcross: baseA
+		})), fiberSheen);
 		const ndl = clamp(__tsover_add(__tsover_mul(dot(n, L), .5), .5), 0, 1);
 		const body = mix(darkColor, lightColor, vec3f(clamp(__tsover_add(__tsover_add(.035, __tsover_mul(ndl, .1)), sheen), 0, 1.3))).mul(ao);
 		const envStr = environment;
@@ -139,7 +136,7 @@ function buildCarbonFiberComposite(weaveStyle) {
 		const coatF = __tsover_add(.05, __tsover_mul(pow(grazing, f32(5)), .95));
 		const coat = __tsover_mul(__tsover_mul(coatLum, coatF), clearcoat);
 		const rgb = body.add(vec3f(coat, coat, coat));
-		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,
@@ -376,15 +373,9 @@ function buildCarbonFiberComposite(weaveStyle) {
 				[
 					11,
 					[
-						1,
-						"sdf",
-						">",
-						[
-							1,
-							"pxH",
-							"*",
-							[5, "2"]
-						]
+						6,
+						"outsideShape",
+						["sdf", "pxH"]
 					],
 					[10, [
 						6,
@@ -516,178 +507,19 @@ function buildCarbonFiberComposite(weaveStyle) {
 				],
 				[
 					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",
@@ -733,15 +565,20 @@ function buildCarbonFiberComposite(weaveStyle) {
 				],
 				[
 					13,
-					"sB",
+					"nFlat",
 					[
 						6,
-						[
-							7,
-							"std",
-							"min"
-						],
+						"bevelledFlatNormal",
 						[[
+							6,
+							"fieldGradient",
+							[
+								"surf0",
+								"surfX",
+								"surfY",
+								"EPS"
+							]
+						], [
 							6,
 							"bevelSin",
 							["rimT", [
@@ -749,71 +586,7 @@ function buildCarbonFiberComposite(weaveStyle) {
 								"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"]
-								]
-							]
-						]
+						]]
 					]
 				],
 				[
@@ -840,72 +613,33 @@ function buildCarbonFiberComposite(weaveStyle) {
 				],
 				[
 					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"]
-							]
-						]
+						7,
+						"pat",
+						"y"
 					]
 				],
 				[
@@ -1401,441 +1135,15 @@ function buildCarbonFiberComposite(weaveStyle) {
 					13,
 					"crossTilt",
 					[
-						1,
-						"bulge",
-						"+",
-						"filament"
-					]
-				],
-				[
-					13,
-					"n",
-					[
-						6,
-						[
-							7,
-							"std",
-							"normalize"
-						],
-						[[
-							6,
-							[
-								7,
-								"d",
-								"vec3f"
-							],
-							[
-								[
-									1,
-									[
-										7,
-										"nGeo",
-										"x"
-									],
-									"+",
-									[
-										1,
-										"crossX",
-										"*",
-										"crossTilt"
-									]
-								],
-								[
-									1,
-									[
-										7,
-										"nGeo",
-										"y"
-									],
-									"+",
-									[
-										1,
-										"crossY",
-										"*",
-										"crossTilt"
-									]
-								],
-								[
-									7,
-									"nGeo",
-									"z"
-								]
-							]
-						]]
-					]
-				],
-				[
-					13,
-					"edge",
-					[
-						6,
-						[
-							7,
-							"std",
-							"min"
-						],
-						[[
-							1,
-							[5, "0.5"],
-							"-",
-							[
-								6,
-								[
-									7,
-									"std",
-									"abs"
-								],
-								["fA"]
-							]
-						], [
-							1,
-							[5, "0.5"],
-							"-",
-							[
-								6,
-								[
-									7,
-									"std",
-									"abs"
-								],
-								["fB"]
-							]
-						]]
-					]
-				],
-				[
-					13,
-					"ao",
-					[
-						6,
-						[
-							7,
-							"std",
-							"mix"
-						],
-						[
-							[5, "0.5"],
-							[5, "1"],
-							[
-								6,
-								[
-									7,
-									"std",
-									"smoothstep"
-								],
-								[
-									[5, "0"],
-									[5, "0.05"],
-									"edge"
-								]
-							]
-						]
-					]
-				],
-				[
-					13,
-					"fov",
-					[5, "0.6"]
-				],
-				[
-					13,
-					"viewI",
-					[
-						6,
-						[
-							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"]
-							]
-						]]
-					]
-				],
-				[
-					13,
-					"cosView",
-					[
-						6,
-						[
-							7,
-							"std",
-							"clamp"
-						],
-						[
-							[
-								1,
-								[
-									6,
-									[
-										7,
-										"std",
-										"dot"
-									],
-									["n", "viewI"]
-								],
-								"*",
-								[
-									4,
-									"-",
-									[5, "1"]
-								]
-							],
-							[5, "0"],
-							[5, "1"]
-						]
-					]
-				],
-				[
-					13,
-					"grazing",
-					[
-						1,
-						[5, "1"],
-						"-",
-						"cosView"
-					]
-				],
-				[
-					13,
-					"R",
-					[
-						6,
-						[
-							7,
-							"std",
-							"reflect"
-						],
-						["viewI", "n"]
-					]
-				],
-				[
-					13,
-					"rough",
-					[
-						6,
-						[
-							7,
-							"std",
-							"clamp"
-						],
-						[
-							"roughness",
-							[5, "0"],
-							[5, "1"]
-						]
-					]
-				],
-				[
-					13,
-					"t0",
-					[
-						6,
-						[
-							7,
-							"d",
-							"vec3f"
-						],
-						[
-							"fiberX",
-							"fiberY",
-							[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"
-									]
-								]
-							]
-						]
+						1,
+						"bulge",
+						"+",
+						"filament"
 					]
 				],
 				[
 					13,
-					"L",
+					"n",
 					[
 						6,
 						[
@@ -1851,12 +1159,40 @@ function buildCarbonFiberComposite(weaveStyle) {
 								"vec3f"
 							],
 							[
-								"lx",
-								"ly",
 								[
-									4,
-									"-",
-									[5, "0.7"]
+									1,
+									[
+										7,
+										"nGeo",
+										"x"
+									],
+									"+",
+									[
+										1,
+										"crossX",
+										"*",
+										"crossTilt"
+									]
+								],
+								[
+									1,
+									[
+										7,
+										"nGeo",
+										"y"
+									],
+									"+",
+									[
+										1,
+										"crossY",
+										"*",
+										"crossTilt"
+									]
+								],
+								[
+									7,
+									"nGeo",
+									"z"
 								]
 							]
 						]]
@@ -1864,54 +1200,88 @@ function buildCarbonFiberComposite(weaveStyle) {
 				],
 				[
 					13,
-					"Hh",
+					"edge",
 					[
 						6,
 						[
 							7,
 							"std",
-							"normalize"
+							"min"
 						],
 						[[
-							6,
+							1,
+							[5, "0.5"],
+							"-",
 							[
-								7,
-								"L",
-								"sub"
-							],
-							["viewI"]
+								6,
+								[
+									7,
+									"std",
+									"abs"
+								],
+								["fA"]
+							]
+						], [
+							1,
+							[5, "0.5"],
+							"-",
+							[
+								6,
+								[
+									7,
+									"std",
+									"abs"
+								],
+								["fB"]
+							]
 						]]
 					]
 				],
 				[
 					13,
-					"hT",
+					"ao",
 					[
 						6,
 						[
 							7,
 							"std",
-							"dot"
+							"mix"
 						],
-						["Hh", "T3"]
+						[
+							[5, "0.5"],
+							[5, "1"],
+							[
+								6,
+								[
+									7,
+									"std",
+									"smoothstep"
+								],
+								[
+									[5, "0"],
+									[5, "0.05"],
+									"edge"
+								]
+							]
+						]
 					]
 				],
 				[
 					13,
-					"hB",
+					"viewI",
 					[
 						6,
+						"perspectiveViewRay",
 						[
-							7,
-							"std",
-							"dot"
-						],
-						["Hh", "B3"]
+							"uv",
+							"aspect",
+							[5, "0.6"]
+						]
 					]
 				],
 				[
 					13,
-					"hN",
+					"cosView",
 					[
 						6,
 						[
@@ -1921,111 +1291,111 @@ function buildCarbonFiberComposite(weaveStyle) {
 						],
 						[
 							[
-								6,
+								1,
 								[
-									7,
-									"std",
-									"abs"
-								],
-								[[
 									6,
 									[
 										7,
 										"std",
 										"dot"
 									],
-									["Hh", "n"]
-								]]
+									["n", "viewI"]
+								],
+								"*",
+								[
+									4,
+									"-",
+									[5, "1"]
+								]
 							],
-							[5, "0.0001"],
+							[5, "0"],
 							[5, "1"]
 						]
 					]
 				],
 				[
 					13,
-					"baseA",
+					"grazing",
+					[
+						1,
+						[5, "1"],
+						"-",
+						"cosView"
+					]
+				],
+				[
+					13,
+					"R",
 					[
 						6,
 						[
 							7,
 							"std",
-							"mix"
+							"reflect"
 						],
-						[
-							[5, "0.06"],
-							[5, "0.5"],
-							"rough"
-						]
+						["viewI", "n"]
 					]
 				],
 				[
 					13,
-					"aAlong",
+					"rough",
 					[
-						1,
-						"baseA",
-						"*",
-						[5, "6"]
+						6,
+						[
+							7,
+							"std",
+							"clamp"
+						],
+						[
+							"roughness",
+							[5, "0"],
+							[5, "1"]
+						]
 					]
 				],
 				[
 					13,
-					"aAcross",
-					"baseA"
-				],
-				[
-					13,
-					"expo",
+					"L",
 					[
-						1,
+						6,
 						[
-							1,
+							7,
+							"std",
+							"normalize"
+						],
+						[[
+							6,
 							[
-								1,
-								[
-									1,
-									"hT",
-									"/",
-									"aAlong"
-								],
-								"*",
-								[
-									1,
-									"hT",
-									"/",
-									"aAlong"
-								]
+								7,
+								"d",
+								"vec3f"
 							],
-							"+",
 							[
-								1,
-								[
-									1,
-									"hB",
-									"/",
-									"aAcross"
-								],
-								"*",
+								"lx",
+								"ly",
 								[
-									1,
-									"hB",
-									"/",
-									"aAcross"
+									4,
+									"-",
+									[5, "0.7"]
 								]
 							]
+						]]
+					]
+				],
+				[
+					13,
+					"baseA",
+					[
+						6,
+						[
+							7,
+							"std",
+							"mix"
 						],
-						"/",
 						[
-							1,
-							[
-								1,
-								"hN",
-								"+",
-								[5, "1"]
-							],
-							"*",
-							[5, "0.5"]
+							[5, "0.06"],
+							[5, "0.5"],
+							"rough"
 						]
 					]
 				],
@@ -2036,20 +1406,35 @@ function buildCarbonFiberComposite(weaveStyle) {
 						1,
 						[
 							6,
-							[
-								7,
-								"std",
-								"exp"
-							],
+							"wardAnisotropicSpecular",
 							[[
-								1,
-								"expo",
-								"*",
-								[
-									4,
-									"-",
-									[5, "1"]
-								]
+								6,
+								"WardSpecularInput",
+								[[104, {
+									"normal": "n",
+									"tangent": [
+										6,
+										[
+											7,
+											"d",
+											"vec3f"
+										],
+										[
+											"fiberX",
+											"fiberY",
+											[5, "0"]
+										]
+									],
+									"light": "L",
+									"view": "viewI",
+									"alphaAlong": [
+										1,
+										"baseA",
+										"*",
+										[5, "6"]
+									],
+									"alphaAcross": "baseA"
+								}]]
 							]]
 						],
 						"*",
@@ -2741,34 +2126,12 @@ function buildCarbonFiberComposite(weaveStyle) {
 							[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"]
 								]
 							]
 						]
@@ -2803,24 +2166,42 @@ function buildCarbonFiberComposite(weaveStyle) {
 			]],
 			"externalNames": [
 				"std",
+				"outsideShape",
 				"d",
 				"DEG_TO_RAD",
+				"volumetricNormal",
+				"bevelledFlatNormal",
+				"fieldGradient",
 				"bevelSin",
+				"patternCoords",
 				"weaveStyle",
 				"PI",
 				"noise",
-				"TWO_PI_SEVEN"
+				"TWO_PI_SEVEN",
+				"perspectiveViewRay",
+				"wardAnisotropicSpecular",
+				"WardSpecularInput",
+				"insideMask"
 			]
 		},
 		externals: () => ({
 			std: std_exports,
+			outsideShape,
 			d: data_exports,
 			DEG_TO_RAD,
+			volumetricNormal,
+			bevelledFlatNormal,
+			fieldGradient,
 			bevelSin,
+			patternCoords,
 			weaveStyle,
 			PI,
 			noise: noise_exports,
-			TWO_PI_SEVEN
+			TWO_PI_SEVEN,
+			perspectiveViewRay,
+			wardAnisotropicSpecular,
+			WardSpecularInput,
+			insideMask
 		})
 	}) && $.f)({})).$name(`carbonFiberComposite_${weaveStyle}`);
 }
@@ -3082,45 +2463,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, propValues, ctx } = params;
+		const { sampler, gradSampler, volumetric } = resolveShapeFieldSampler(params, { patternMode: "raw" });
 		const weaveStyle = (propValues.weaveStyle || "twill") === "plain" ? "plain" : "twill";
 		const composite = buildCarbonFiberComposite(weaveStyle);
 		const sdfUV = call(sdfSpaceUV, "sdfSpaceUV", [