shaders 3.0.452 → 3.1.454

package/dist/core/{BokehBlur-CXBx5wog.js → BokehBlur-CWQm00ut.js}

@@ -1,10 +1,11 @@
-import { $t as struct, Bt as smoothstep, Ct as dot, Jt as textureStorage2d, Kt as arrayOf, Lt as round, Nt as pow, P as unpremultiplyAlpha, Wt as data_exports, an as vec3f, at as textureLoad, bt as clamp, cn as f32, d as ZERO, in as vec2u, jt as mix, kt as max, ln as i32, m as call, nn as vec2f, qt as texture2d, rt as std_exports, sn as vec4f, st as textureStore, tt as src_default, un as u32 } from "./edges-Dm0I-Ud7.js";
-import { n as createGuardedCompute } from "./compute-DYJOCqJI.js";
-import { n as DEFAULT_COMPUTE_HEIGHT, r as DEFAULT_COMPUTE_WIDTH } from "./blur-BAqURXkj.js";
-import { r as transformAngle } from "./transformations-CsPUHppB.js";
+import { At as max, Gt as data_exports, I as unpremultiplyAlpha, Jt as texture2d, Rt as round, Vt as smoothstep, Yt as textureStorage2d, an as vec2u, at as std_exports, cn as vec4f, dn as i32, en as struct, f as ZERO, fn as u32, h as call, lt as textureStore, on as vec3f, qt as arrayOf, rn as vec2f, rt as src_default, st as textureLoad, un as f32, wt as dot, xt as clamp } from "./edges-CD7gCAto.js";
+import { s as TWO_PI$1, t as DEG_TO_RAD$1 } from "./constants-DoOzbl5b.js";
+import { M as createGuardedCompute } from "./device-B0ZwBfOg.js";
+import { a as REMAP_WINDOW_FIELDS, i as MAP_SOURCE_DIM_FIELDS, n as DEFAULT_COMPUTE_HEIGHT, o as applyRemapWindow, p as mapSourceScalar, r as DEFAULT_COMPUTE_WIDTH, s as blur_exports } from "./blur-CZuIxzX6.js";
+import { r as transformAngle } from "./transformations-B-zNWNdd.js";
 var GOLDEN_ANGLE = Math.PI * (3 - Math.sqrt(5));
-var TWO_PI = Math.PI * 2;
-var DEG_TO_RAD = Math.PI / 180;
+var TWO_PI = TWO_PI$1;
+var DEG_TO_RAD = DEG_TO_RAD$1;
 const RADIUS_SCALE = .8;
 const radiusToPixels = (radius) => radius * RADIUS_SCALE;
 var HIGHLIGHT_KNEE = .35;
@@ -169,13 +170,8 @@ function bokehMapParams() {
 		rotCos: f32,
 		rotSin: f32,
 		chromaticFringe: f32,
-		inputWidth: f32,
-		inputHeight: f32,
-		inputMin: f32,
-		inputMax: f32,
-		outputMin: f32,
-		outputMax: f32,
-		curve: f32
+		...MAP_SOURCE_DIM_FIELDS,
+		...REMAP_WINDOW_FIELDS
 	});
 }
 function buildBokehGraph(computeWidth, computeHeight, tapCount) {
@@ -1494,6 +1490,7 @@ function buildBokehMapGraph(computeWidth, computeHeight, tapCount, channel) {
 	const TAPS = tapCount;
 	const Params = bokehMapParams();
 	const TapArray = arrayOf(vec4f, TAPS);
+	const channelScalar = mapSourceScalar(channel);
 	const layout = /* @__PURE__ */ (globalThis.__TYPEGPU_AUTONAME__ ?? ((a) => a))(src_default.bindGroupLayout({
 		input: { texture: texture2d(f32) },
 		source: { texture: texture2d(f32) },
@@ -1514,11 +1511,8 @@ function buildBokehMapGraph(computeWidth, computeHeight, tapCount, channel) {
 			const v = __tsover_div(__tsover_add(f32(cy), .5), computeHeight);
 			const srcX = clamp(i32(round(__tsover_mul(u, p.inputWidth))), 0, inputWm1);
 			const srcY = clamp(i32(round(__tsover_mul(v, p.inputHeight))), 0, inputHm1);
-			const mapSample = textureLoad(layout.$.source, vec2u(u32(srcX), u32(srcY)), 0);
-			const raw = channel === "alpha" ? mapSample.w : channel === "alphaInverted" ? __tsover_sub(1, mapSample.w) : channel === "luminanceInverted" ? __tsover_sub(1, dot(mapSample.xyz, vec3f(.2126, .7152, .0722))) : dot(mapSample.xyz, vec3f(.2126, .7152, .0722));
-			const inputRange = max(__tsover_sub(p.inputMax, p.inputMin), 1e-4);
-			const eased = pow(clamp(__tsover_div(__tsover_sub(raw, p.inputMin), inputRange), 0, 1), pow(2, __tsover_mul(-p.curve, 2)));
-			const radius = __tsover_mul(mix(p.outputMin, p.outputMax, eased), .8);
+			const remapped = applyRemapWindow(channelScalar(textureLoad(layout.$.source, vec2u(u32(srcX), u32(srcY)), 0)), p.inputMin, p.inputMax, p.outputMin, p.outputMax, p.curve);
+			const radius = __tsover_mul(remapped, .8);
 			if (radius < PASSTHROUGH_RADIUS) {
 				const sx = clamp(i32(round(inputCx)), 0, inputWm1);
 				const sy = clamp(i32(round(inputCy)), 0, inputHm1);
@@ -1888,199 +1882,46 @@ function buildBokehMapGraph(computeWidth, computeHeight, tapCount, channel) {
 					],
 					[
 						13,
-						"raw",
+						"remapped",
 						[
-							105,
-							[
-								1,
-								"channel",
-								"===",
-								[103, "alpha"]
-							],
+							6,
 							[
 								7,
-								"mapSample",
-								"w"
+								"blur",
+								"applyRemapWindow"
 							],
 							[
-								105,
 								[
-									1,
-									"channel",
-									"===",
-									[103, "alphaInverted"]
+									6,
+									"channelScalar",
+									["mapSample"]
 								],
 								[
-									1,
-									[5, "1"],
-									"-",
-									[
-										7,
-										"mapSample",
-										"w"
-									]
+									7,
+									"p",
+									"inputMin"
 								],
-								[
-									105,
-									[
-										1,
-										"channel",
-										"===",
-										[103, "luminanceInverted"]
-									],
-									[
-										1,
-										[5, "1"],
-										"-",
-										[
-											6,
-											[
-												7,
-												"std",
-												"dot"
-											],
-											[[
-												7,
-												"mapSample",
-												"xyz"
-											], [
-												6,
-												[
-													7,
-													"d",
-													"vec3f"
-												],
-												[
-													[5, "0.2126"],
-													[5, "0.7152"],
-													[5, "0.0722"]
-												]
-											]]
-										]
-									],
-									[
-										6,
-										[
-											7,
-											"std",
-											"dot"
-										],
-										[[
-											7,
-											"mapSample",
-											"xyz"
-										], [
-											6,
-											[
-												7,
-												"d",
-												"vec3f"
-											],
-											[
-												[5, "0.2126"],
-												[5, "0.7152"],
-												[5, "0.0722"]
-											]
-										]]
-									]
-								]
-							]
-						]
-					],
-					[
-						13,
-						"inputRange",
-						[
-							6,
-							[
-								7,
-								"std",
-								"max"
-							],
-							[[
-								1,
 								[
 									7,
 									"p",
 									"inputMax"
 								],
-								"-",
 								[
 									7,
 									"p",
-									"inputMin"
-								]
-							], [5, "0.0001"]]
-						]
-					],
-					[
-						13,
-						"normalised",
-						[
-							6,
-							[
-								7,
-								"std",
-								"clamp"
-							],
-							[
-								[
-									1,
-									[
-										1,
-										"raw",
-										"-",
-										[
-											7,
-											"p",
-											"inputMin"
-										]
-									],
-									"/",
-									"inputRange"
+									"outputMin"
 								],
-								[5, "0"],
-								[5, "1"]
-							]
-						]
-					],
-					[
-						13,
-						"exponent",
-						[
-							6,
-							[
-								7,
-								"std",
-								"pow"
-							],
-							[[5, "2"], [
-								1,
 								[
-									4,
-									"-",
-									[
-										7,
-										"p",
-										"curve"
-									]
+									7,
+									"p",
+									"outputMax"
 								],
-								"*",
-								[5, "2"]
-							]]
-						]
-					],
-					[
-						13,
-						"eased",
-						[
-							6,
-							[
-								7,
-								"std",
-								"pow"
-							],
-							["normalised", "exponent"]
+								[
+									7,
+									"p",
+									"curve"
+								]
+							]
 						]
 					],
 					[
@@ -2088,27 +1929,7 @@ function buildBokehMapGraph(computeWidth, computeHeight, tapCount, channel) {
 						"radius",
 						[
 							1,
-							[
-								6,
-								[
-									7,
-									"std",
-									"mix"
-								],
-								[
-									[
-										7,
-										"p",
-										"outputMin"
-									],
-									[
-										7,
-										"p",
-										"outputMax"
-									],
-									"eased"
-								]
-							],
+							"remapped",
 							"*",
 							"RADIUS_SCALE"
 						]
@@ -3188,7 +3009,8 @@ function buildBokehMapGraph(computeWidth, computeHeight, tapCount, channel) {
 					"computeWidth",
 					"computeHeight",
 					"std",
-					"channel",
+					"blur",
+					"channelScalar",
 					"RADIUS_SCALE",
 					"PASSTHROUGH_RADIUS",
 					"TAPS",
@@ -3201,7 +3023,8 @@ function buildBokehMapGraph(computeWidth, computeHeight, tapCount, channel) {
 				computeWidth,
 				computeHeight,
 				std: std_exports,
-				channel,
+				blur: blur_exports,
+				channelScalar,
 				RADIUS_SCALE: .8,
 				PASSTHROUGH_RADIUS,
 				TAPS,