@remotion/effects 4.0.539 → 4.0.541

package/dist/esm/brightness.mjs

@@ -1,112 +1,20 @@
-// src/brightness.ts
-import { Internals } from "remotion";
-
-// src/validate-effect-param.ts
-var assertEffectParamsObject = (params, effectLabel) => {
-  if (params === null || typeof params !== "object") {
-    throw new TypeError(`${effectLabel} effect requires a parameters object, but got ${JSON.stringify(params)}`);
-  }
-};
-var assertRequiredFiniteNumber = (value, name) => {
-  if (typeof value !== "number" || !Number.isFinite(value)) {
-    throw new TypeError(`"${name}" must be a finite number, but got ${JSON.stringify(value)}`);
-  }
-};
-var assertRequiredColor = (value, name) => {
-  if (typeof value !== "string" || value.length === 0) {
-    throw new TypeError(`"${name}" must be a non-empty string, but got ${JSON.stringify(value)}`);
-  }
-};
-var assertOptionalColor = (value, name) => {
-  if (value === undefined) {
-    return;
-  }
-  assertRequiredColor(value, name);
-};
-var assertOptionalBoolean = (value, name) => {
-  if (value === undefined) {
-    return;
-  }
-  if (typeof value !== "boolean") {
-    throw new TypeError(`"${name}" must be a boolean, but got ${JSON.stringify(value)}`);
-  }
-};
-
-// src/color-utils.ts
-var DEFAULT_AMOUNT = 1;
-var DEFAULT_BRIGHTNESS_AMOUNT = 0;
-var DEFAULT_HUE_DEGREES = 0;
-var colorAmountSchema = {
-  type: "number",
-  min: 0,
-  max: 1,
-  step: 0.01,
-  default: DEFAULT_AMOUNT,
-  description: "Amount",
-  hiddenFromList: false
-};
-var colorMultiplierSchema = {
-  type: "number",
-  min: 0,
-  step: 0.01,
-  default: DEFAULT_AMOUNT,
-  description: "Amount",
-  hiddenFromList: false
-};
-var brightnessAmountSchema = {
-  type: "number",
-  min: -1,
-  max: 1,
-  step: 0.01,
-  default: DEFAULT_BRIGHTNESS_AMOUNT,
-  description: "Amount",
-  hiddenFromList: false
-};
-var hueDegreesSchema = {
-  type: "rotation-degrees",
-  step: 1,
-  default: DEFAULT_HUE_DEGREES,
-  description: "Degrees"
-};
-var assertOptionalFiniteNumber = (value, name) => {
-  if (value === undefined) {
-    return;
-  }
-  assertRequiredFiniteNumber(value, name);
-};
-var validateUnitInterval = (value, name) => {
-  if (value < 0) {
-    throw new TypeError(`"${name}" must be >= 0, but got ${JSON.stringify(value)}`);
-  }
-  if (value > 1) {
-    throw new TypeError(`"${name}" must be <= 1, but got ${JSON.stringify(value)}`);
-  }
-};
-var validateNonNegative = (value, name) => {
-  if (value < 0) {
-    throw new TypeError(`"${name}" must be >= 0, but got ${JSON.stringify(value)}`);
-  }
-};
-var validateSignedUnitInterval = (value, name) => {
-  if (value < -1) {
-    throw new TypeError(`"${name}" must be >= -1, but got ${JSON.stringify(value)}`);
-  }
-  if (value > 1) {
-    throw new TypeError(`"${name}" must be <= 1, but got ${JSON.stringify(value)}`);
-  }
-};
-var clampColorChannel = (value) => {
-  return Math.max(0, Math.min(255, value));
-};
-var parseColorRgba = (ctx, color) => {
-  ctx.clearRect(0, 0, 1, 1);
-  ctx.fillStyle = color;
-  ctx.fillRect(0, 0, 1, 1);
-  const { data } = ctx.getImageData(0, 0, 1, 1);
-  return [data[0], data[1], data[2], data[3]];
-};
+import"./index-8p04sssx.mjs";
+import {
+  createColorMatrixImplementations
+} from "./index-cdp7tr8x.mjs";
+import {
+  DEFAULT_BRIGHTNESS_AMOUNT,
+  brightnessAmountSchema,
+  assertOptionalFiniteNumber,
+  validateSignedUnitInterval,
+  clampColorChannel
+} from "./index-wxhvgv2s.mjs";
+import {
+  assertEffectParamsObject
+} from "./index-4fvp93ps.mjs";
 
 // src/brightness.ts
+import { Internals } from "remotion";
 var { createEffect } = Internals;
 var brightnessSchema = {
   amount: brightnessAmountSchema
@@ -124,35 +32,60 @@ var brightness = createEffect({
   type: "dev.remotion.effects.brightness",
   label: "brightness()",
   documentationLink: "https://www.remotion.dev/docs/effects/brightness",
-  backend: "2d",
   calculateKey: (params) => {
     const r = resolve(params);
     return `brightness-${r.amount}`;
   },
-  setup: () => null,
-  apply: ({ source, target, width, height, params }) => {
-    const ctx = target.getContext("2d");
-    if (!ctx) {
-      throw new Error("Failed to acquire 2D context for brightness effect. The canvas may have been assigned a different context type.");
-    }
-    const r = resolve(params);
-    ctx.clearRect(0, 0, width, height);
-    ctx.drawImage(source, 0, 0, width, height);
-    if (r.amount === 0) {
-      return;
-    }
-    const imageData = ctx.getImageData(0, 0, width, height);
-    const delta = Math.round(r.amount * 255);
-    const { data } = imageData;
-    for (let i = 0;i < data.length; i += 4) {
-      data[i] = clampColorChannel(data[i] + delta);
-      data[i + 1] = clampColorChannel(data[i + 1] + delta);
-      data[i + 2] = clampColorChannel(data[i + 2] + delta);
-    }
-    ctx.putImageData(imageData, 0, 0);
-  },
-  cleanup: () => {
-    return;
+  implementations: {
+    ...createColorMatrixImplementations("brightness", (params) => {
+      const { amount } = resolve(params);
+      const offset = Math.round(amount * 255);
+      return new Float32Array([
+        1,
+        0,
+        0,
+        offset,
+        0,
+        1,
+        0,
+        offset,
+        0,
+        0,
+        1,
+        offset,
+        1,
+        1,
+        amount === 0 ? 1 : 0,
+        0
+      ]);
+    }),
+    "2d": Internals.createEffectImplementation({
+      setup: () => null,
+      apply: ({ source, target, width, height, params }) => {
+        const ctx = target.getContext("2d");
+        if (!ctx) {
+          throw new Error("Failed to acquire 2D context for brightness effect. The canvas may have been assigned a different context type.");
+        }
+        const r = resolve(params);
+        ctx.clearRect(0, 0, width, height);
+        ctx.drawImage(source, 0, 0, width, height);
+        if (r.amount === 0) {
+          return;
+        }
+        const imageData = ctx.getImageData(0, 0, width, height);
+        const delta = Math.round(r.amount * 255);
+        const { data } = imageData;
+        for (let i = 0;i < data.length; i += 4) {
+          data[i] = clampColorChannel(data[i] + delta);
+          data[i + 1] = clampColorChannel(data[i + 1] + delta);
+          data[i + 2] = clampColorChannel(data[i + 2] + delta);
+        }
+        ctx.putImageData(imageData, 0, 0);
+      },
+      cleanup: () => {
+        return;
+      }
+    })
   },
   schema: brightnessSchema,
   validateParams: validateBrightnessParams

package/dist/esm/burlap.mjs

@@ -1,114 +1,104 @@
+import {
+  setupWebGpuColors,
+  getWebGpuColors
+} from "./index-8jx11jyn.mjs";
+import {
+  assertOptionalFiniteNumber,
+  validateUnitInterval,
+  parseColorRgba
+} from "./index-wxhvgv2s.mjs";
+import {
+  WEBGPU_SINGLE_PASS_VERTEX,
+  cleanupWebGpuSinglePass,
+  applyWebGpuSinglePass
+} from "./index-tvfexb7s.mjs";
+import {
+  assertEffectParamsObject,
+  assertOptionalColor
+} from "./index-4fvp93ps.mjs";
+
 // src/burlap.ts
 import { Internals } from "remotion";
 
-// src/validate-effect-param.ts
-var assertEffectParamsObject = (params, effectLabel) => {
-  if (params === null || typeof params !== "object") {
-    throw new TypeError(`${effectLabel} effect requires a parameters object, but got ${JSON.stringify(params)}`);
-  }
-};
-var assertRequiredFiniteNumber = (value, name) => {
-  if (typeof value !== "number" || !Number.isFinite(value)) {
-    throw new TypeError(`"${name}" must be a finite number, but got ${JSON.stringify(value)}`);
-  }
-};
-var assertRequiredColor = (value, name) => {
-  if (typeof value !== "string" || value.length === 0) {
-    throw new TypeError(`"${name}" must be a non-empty string, but got ${JSON.stringify(value)}`);
-  }
-};
-var assertOptionalColor = (value, name) => {
-  if (value === undefined) {
-    return;
-  }
-  assertRequiredColor(value, name);
-};
-var assertOptionalBoolean = (value, name) => {
-  if (value === undefined) {
-    return;
-  }
-  if (typeof value !== "boolean") {
-    throw new TypeError(`"${name}" must be a boolean, but got ${JSON.stringify(value)}`);
-  }
-};
+// src/burlap-webgpu-shader.ts
+var BURLAP_WEBGPU_SHADER = `
+${WEBGPU_SINGLE_PASS_VERTEX}
+@group(0) @binding(0) var sourceTexture: texture_2d<f32>;
+@group(0) @binding(1) var sourceSampler: sampler;
+@group(0) @binding(2) var<uniform> params: Params;
+struct Params {
+ geometry: vec4f,
+ values: vec4f,
+ color: vec4f,
+}
+fn sampleSource(uv: vec2f) -> vec4f {
+ return textureSampleLevel(sourceTexture, sourceSampler, vec2f(uv.x, 1.0 - uv.y), 0);
+}
+fn glslModulo(value: f32, divisor: f32) -> f32 { return value - divisor * floor(value / divisor); }
 
-// src/color-utils.ts
-var DEFAULT_AMOUNT = 1;
-var DEFAULT_BRIGHTNESS_AMOUNT = 0;
-var DEFAULT_HUE_DEGREES = 0;
-var colorAmountSchema = {
-  type: "number",
-  min: 0,
-  max: 1,
-  step: 0.01,
-  default: DEFAULT_AMOUNT,
-  description: "Amount",
-  hiddenFromList: false
-};
-var colorMultiplierSchema = {
-  type: "number",
-  min: 0,
-  step: 0.01,
-  default: DEFAULT_AMOUNT,
-  description: "Amount",
-  hiddenFromList: false
-};
-var brightnessAmountSchema = {
-  type: "number",
-  min: -1,
-  max: 1,
-  step: 0.01,
-  default: DEFAULT_BRIGHTNESS_AMOUNT,
-  description: "Amount",
-  hiddenFromList: false
-};
-var hueDegreesSchema = {
-  type: "rotation-degrees",
-  step: 1,
-  default: DEFAULT_HUE_DEGREES,
-  description: "Degrees"
-};
-var assertOptionalFiniteNumber = (value, name) => {
-  if (value === undefined) {
-    return;
-  }
-  assertRequiredFiniteNumber(value, name);
-};
-var validateUnitInterval = (value, name) => {
-  if (value < 0) {
-    throw new TypeError(`"${name}" must be >= 0, but got ${JSON.stringify(value)}`);
-  }
-  if (value > 1) {
-    throw new TypeError(`"${name}" must be <= 1, but got ${JSON.stringify(value)}`);
-  }
-};
-var validateNonNegative = (value, name) => {
-  if (value < 0) {
-    throw new TypeError(`"${name}" must be >= 0, but got ${JSON.stringify(value)}`);
-  }
-};
-var validateSignedUnitInterval = (value, name) => {
-  if (value < -1) {
-    throw new TypeError(`"${name}" must be >= -1, but got ${JSON.stringify(value)}`);
-  }
-  if (value > 1) {
-    throw new TypeError(`"${name}" must be <= 1, but got ${JSON.stringify(value)}`);
-  }
-};
-var clampColorChannel = (value) => {
-  return Math.max(0, Math.min(255, value));
-};
-var parseColorRgba = (ctx, color) => {
-  ctx.clearRect(0, 0, 1, 1);
-  ctx.fillStyle = color;
-  ctx.fillRect(0, 0, 1, 1);
-  const { data } = ctx.getImageData(0, 0, 1, 1);
-  return [data[0], data[1], data[2], data[3]];
-};
+fn hash21(p: vec2f) -> f32 {
+ var p3 = fract(p.xyx * vec3f(443.8975, 397.2973, 491.1871));
+ p3 += vec3f(dot(p3, p3.yzx + vec3f(19.19) + vec3f(params.values.y * 0.137)));
+ return fract((p3.x + p3.y) * p3.z);
+}
+fn valueNoise(p: vec2f) -> f32 {
+ let i = floor(p);
+ var f = fract(p);
+ f = f * f * (vec2f(3.0) - 2.0 * f);
+ let a = hash21(i);
+ let b = hash21(i + vec2f(1, 0));
+ let c = hash21(i + vec2f(0, 1));
+ let d = hash21(i + vec2f(1, 1));
+ return mix(mix(a, b, f.x), mix(c, d, f.x), f.y);
+}
+fn strand(value: f32) -> f32 {
+ let centered = abs(fract(value) - 0.5);
+ return 1.0 - smoothstep(0.2, 0.5, centered);
+}
+@fragment fn fragment(input: VertexOutput) -> @location(0) vec4f {
+ let vUv = vec2f(input.uv.x, 1.0 - input.uv.y);
+
+ let texColor = sampleSource(vUv);
+ let alpha = texColor.a;
+ if (alpha <= 0.001) { return vec4f(0); }
+ if (params.geometry.z <= 0.0) { return texColor; }
+ // Match WebGL pixel centers without interpolated-UV rounding.
+ let fragPos = vec2f(input.position.x, params.geometry.y - input.position.y);
+ let strandSize = max(params.geometry.w, 0.001);
+ let weave = fragPos / strandSize;
+ let roughness = params.values.x;
+ let seed = params.values.y;
+ let rowJitter = (hash21(vec2f(floor(weave.y), 13.17)) - 0.5) * roughness * 0.28;
+ let columnJitter = (hash21(vec2f(71.43, floor(weave.x))) - 0.5) * roughness * 0.28;
+ let vertical = strand(weave.x + rowJitter);
+ let horizontal = strand(weave.y + columnJitter);
+ let cellParity = glslModulo(floor(weave.x) + floor(weave.y), 2.0);
+ let overUnder = mix(vertical, horizontal, cellParity);
+ let ridge = max(max(vertical, horizontal) * 0.45, overUnder * 0.75);
+ let gaps = (1.0 - vertical) * (1.0 - horizontal);
+ let coarse = valueNoise(fragPos / (strandSize * 7.0) + vec2f(seed * 1.7, seed * 0.6));
+ let fine = valueNoise(fragPos / max(strandSize * 0.55, 0.5) + vec2f(seed * 3.1, 4.7));
+ let dashH = smoothstep(0.64, 0.98, hash21(floor(vec2f(weave.x * 2.0, weave.y)) + vec2f(23.9))) * horizontal;
+ let dashV = smoothstep(0.64, 0.98, hash21(floor(vec2f(weave.x, weave.y * 2.0)) + vec2f(91.4))) * vertical;
+ var texture = 0.0;
+ texture += (ridge - 0.42) * 0.22;
+ texture -= gaps * 0.18;
+ texture += (coarse - 0.5) * 0.18 * roughness;
+ texture += (fine - 0.5) * 0.16 * roughness;
+ texture -= (dashH + dashV) * 0.08 * roughness;
+ var rgb = texColor.rgb / alpha;
+ let darkFiber = clamp(-texture * 3.2 + gaps * 0.12 + (dashH + dashV) * 0.18, 0.0, 1.0);
+ let shaded = mix(rgb, params.color.rgb, darkFiber * params.color.a);
+ let textured = clamp(shaded * (1.0 + max(texture, 0.0) * 0.45), vec3f(0), vec3f(1));
+ rgb = mix(rgb, textured, params.geometry.z);
+ return vec4f(rgb * alpha, alpha);
+
+}
+`;
 
 // src/burlap.ts
 var { createEffect, createWebGL2ContextError } = Internals;
-var DEFAULT_AMOUNT2 = 0.55;
+var DEFAULT_AMOUNT = 0.55;
 var DEFAULT_SIZE = 5;
 var DEFAULT_ROUGHNESS = 0.7;
 var DEFAULT_SEED = 0;
@@ -119,7 +109,7 @@ var burlapSchema = {
     min: 0,
     max: 1,
     step: 0.01,
-    default: DEFAULT_AMOUNT2,
+    default: DEFAULT_AMOUNT,
     description: "Amount",
     hiddenFromList: false
   },
@@ -155,7 +145,7 @@ var burlapSchema = {
   }
 };
 var resolve = (p) => ({
-  amount: p.amount ?? DEFAULT_AMOUNT2,
+  amount: p.amount ?? DEFAULT_AMOUNT,
   size: p.size ?? DEFAULT_SIZE,
   roughness: p.roughness ?? DEFAULT_ROUGHNESS,
   seed: p.seed ?? DEFAULT_SEED,
@@ -240,7 +230,8 @@ void main() {
 		return;
 	}
 
-	vec2 fragPos = vUv * uResolution;
+	// Use pixel centers so weave-cell boundaries do not depend on UV interpolation.
+	vec2 fragPos = gl_FragCoord.xy;
 	float strandSize = max(uSize, 0.001);
 	vec2 weave = fragPos / strandSize;
 
@@ -397,54 +388,90 @@ var burlap = createEffect({
   type: "dev.remotion.effects.burlap",
   label: "burlap()",
   documentationLink: "https://www.remotion.dev/docs/effects/burlap",
-  backend: "webgl2",
   calculateKey: (params) => {
     const r = resolve(params);
     return `burlap-${r.amount}-${r.size}-${r.roughness}-${r.seed}-${r.color}`;
   },
-  setup: (target) => setupBurlap(target),
-  apply: ({ source, width, height, params, state, flipSourceY }) => {
-    const r = resolve(params);
-    const { gl, program, vao, texture } = state;
-    if (state.cachedColor !== r.color) {
-      state.cachedColor = r.color;
-      state.cachedColorRgba = parseColorRgba(state.colorCtx, r.color);
-    }
-    const [red, green, blue, alpha] = normalizedRgba(state.cachedColorRgba);
-    gl.viewport(0, 0, width, height);
-    gl.bindFramebuffer(gl.FRAMEBUFFER, null);
-    gl.clearColor(0, 0, 0, 0);
-    gl.clear(gl.COLOR_BUFFER_BIT);
-    gl.useProgram(program);
-    gl.bindVertexArray(vao);
-    gl.activeTexture(gl.TEXTURE0);
-    gl.bindTexture(gl.TEXTURE_2D, texture);
-    gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, flipSourceY);
-    gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, source);
-    if (state.uSource)
-      gl.uniform1i(state.uSource, 0);
-    if (state.uResolution)
-      gl.uniform2f(state.uResolution, width, height);
-    if (state.uAmount)
-      gl.uniform1f(state.uAmount, r.amount);
-    if (state.uSize)
-      gl.uniform1f(state.uSize, r.size);
-    if (state.uRoughness)
-      gl.uniform1f(state.uRoughness, r.roughness);
-    if (state.uSeed)
-      gl.uniform1f(state.uSeed, r.seed);
-    if (state.uColor)
-      gl.uniform4f(state.uColor, red, green, blue, alpha);
-    gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
-    gl.bindVertexArray(null);
-    gl.bindTexture(gl.TEXTURE_2D, null);
-    gl.useProgram(null);
-  },
-  cleanup: ({ gl, program, vao, vbo, texture }) => {
-    gl.deleteTexture(texture);
-    gl.deleteBuffer(vbo);
-    gl.deleteProgram(program);
-    gl.deleteVertexArray(vao);
+  implementations: {
+    webgpu: Internals.createEffectImplementation({
+      setup: (target) => setupWebGpuColors(target, "burlap"),
+      apply: ({ source, width, height, params, state, gpuDevice }) => {
+        if (!gpuDevice)
+          throw new Error("A WebGPU device is required for the burlap effect");
+        const r = resolve(params);
+        const colors = getWebGpuColors(state, [r.color]);
+        const uniformData = new Float32Array([
+          width,
+          height,
+          r.amount,
+          r.size,
+          r.roughness,
+          r.seed,
+          0,
+          0,
+          colors[0] / 255,
+          colors[1] / 255,
+          colors[2] / 255,
+          colors[3] / 255
+        ]);
+        applyWebGpuSinglePass({
+          state,
+          source,
+          width,
+          height,
+          device: gpuDevice,
+          shader: BURLAP_WEBGPU_SHADER,
+          uniformData
+        });
+      },
+      cleanup: cleanupWebGpuSinglePass
+    }),
+    webgl2: Internals.createEffectImplementation({
+      setup: (target) => setupBurlap(target),
+      apply: ({ source, width, height, params, state, flipSourceY }) => {
+        const r = resolve(params);
+        const { gl, program, vao, texture } = state;
+        if (state.cachedColor !== r.color) {
+          state.cachedColor = r.color;
+          state.cachedColorRgba = parseColorRgba(state.colorCtx, r.color);
+        }
+        const [red, green, blue, alpha] = normalizedRgba(state.cachedColorRgba);
+        gl.viewport(0, 0, width, height);
+        gl.bindFramebuffer(gl.FRAMEBUFFER, null);
+        gl.clearColor(0, 0, 0, 0);
+        gl.clear(gl.COLOR_BUFFER_BIT);
+        gl.useProgram(program);
+        gl.bindVertexArray(vao);
+        gl.activeTexture(gl.TEXTURE0);
+        gl.bindTexture(gl.TEXTURE_2D, texture);
+        gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, flipSourceY);
+        gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, source);
+        if (state.uSource)
+          gl.uniform1i(state.uSource, 0);
+        if (state.uResolution)
+          gl.uniform2f(state.uResolution, width, height);
+        if (state.uAmount)
+          gl.uniform1f(state.uAmount, r.amount);
+        if (state.uSize)
+          gl.uniform1f(state.uSize, r.size);
+        if (state.uRoughness)
+          gl.uniform1f(state.uRoughness, r.roughness);
+        if (state.uSeed)
+          gl.uniform1f(state.uSeed, r.seed);
+        if (state.uColor)
+          gl.uniform4f(state.uColor, red, green, blue, alpha);
+        gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
+        gl.bindVertexArray(null);
+        gl.bindTexture(gl.TEXTURE_2D, null);
+        gl.useProgram(null);
+      },
+      cleanup: ({ gl, program, vao, vbo, texture }) => {
+        gl.deleteTexture(texture);
+        gl.deleteBuffer(vbo);
+        gl.deleteProgram(program);
+        gl.deleteVertexArray(vao);
+      }
+    })
   },
   schema: burlapSchema,
   validateParams: validateBurlapParams