@remotion/effects 4.0.539 → 4.0.540

package/dist/esm/turbulent-displace.mjs

@@ -1,175 +1,25 @@
+import {
+  VALUE_NOISE_SHADER,
+  VALUE_NOISE_WEBGPU_SHADER
+} from "./index-4z6pt3ka.mjs";
+import {
+  assertOptionalFiniteNumber
+} from "./index-wxhvgv2s.mjs";
+import {
+  WEBGPU_SINGLE_PASS_VERTEX,
+  setupWebGpuSinglePass,
+  cleanupWebGpuSinglePass,
+  applyWebGpuSinglePass
+} from "./index-tvfexb7s.mjs";
+import {
+  assertEffectParamsObject,
+  assertRequiredFiniteNumber,
+  assertOptionalBoolean
+} from "./index-4fvp93ps.mjs";
+
 // src/turbulent-displace/index.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]];
-};
-
-// src/value-noise-shader.ts
-var VALUE_NOISE_SHADER = `
-float lattice(ivec3 point, uint seed) {
-  // Wrap lattice indices as well as coordinates so interpolation stays continuous
-  // across the period boundary, including negative coordinates.
-  uvec3 p = uvec3(point) & uvec3(65535u);
-  uint h = p.x * 0x27d4eb2du ^ p.y * 0x165667b1u ^ p.z * 0x9e3779b9u ^ seed * 0x85ebca6bu;
-  h ^= h >> 15;
-  h *= 0x2c1b3c6du;
-  h ^= h >> 12;
-  h *= 0x297a2d39u;
-  h ^= h >> 15;
-  return float(h & 65535u) / 65535.0;
-}
-
-float catmull(vec4 p, float t) {
-  return 0.5 * (2.0 * p.y + (p.z - p.x) * t
-    + (2.0 * p.x - 5.0 * p.y + 4.0 * p.z - p.w) * t * t
-    + (3.0 * p.y - p.x - 3.0 * p.z + p.w) * t * t * t);
-}
-
-vec3 bspline(float t) {
-  return vec3(0.5 * (1.0-t) * (1.0-t), 0.5 + t * (1.0-t), 0.5 * t * t);
-}
-
-float sliceNoise(ivec3 p, vec2 t, uint seed) {
-  if (uNoiseType == 0) return lattice(p, seed);
-  if (uNoiseType == 1) {
-    return mix(mix(lattice(p, seed), lattice(p + ivec3(1,0,0), seed), t.x),
-      mix(lattice(p + ivec3(0,1,0), seed), lattice(p + ivec3(1,1,0), seed), t.x), t.y);
-  }
-  if (uNoiseType == 2) {
-    vec3 wx = bspline(t.x);
-    vec3 wy = bspline(t.y);
-    float result = 0.0;
-    for (int y = 0; y < 3; y++) {
-      for (int x = 0; x < 3; x++) {
-        result += wx[x] * wy[y] * lattice(p + ivec3(x-1, y-1, 0), seed);
-      }
-    }
-    return result;
-  }
-  vec4 rows;
-  for (int y = 0; y < 4; y++) {
-    vec4 row;
-    for (int x = 0; x < 4; x++) {
-      row[x] = lattice(p + ivec3(x-1, y-1, 0), seed);
-    }
-    rows[y] = catmull(row, t.x);
-  }
-  return catmull(rows, t.y);
-}
-
-float valueNoise(vec3 point, uint seed) {
-  // A large period keeps conversion to integer coordinates defined at extreme scales.
-  vec3 p = mod(point + vec3(uNoiseType == 2 ? 0.5 : 0.0, uNoiseType == 2 ? 0.5 : 0.0, 0.0), 65536.0);
-  ivec3 cell = ivec3(floor(p));
-  vec3 t = fract(p);
-  float fz = t.z * t.z * t.z * (t.z * (t.z * 6.0 - 15.0) + 10.0);
-  float n = mix(sliceNoise(cell, t.xy, seed), sliceNoise(cell + ivec3(0,0,1), t.xy, seed), fz);
-  return uNoiseType == 2 ? 0.5 + (n - 0.5) * (181.0 / 231.0) / 0.55 : n;
-}
-`;
-
 // src/turbulent-displace/shader.ts
 var TURBULENT_DISPLACE_FRAGMENT_SHADER = `#version 300 es
 precision highp float;
@@ -279,10 +129,81 @@ void main() {
 }
 `;
 
+// src/turbulent-displace/webgpu-shader.ts
+var TURBULENT_DISPLACE_WEBGPU_SHADER = `
+${WEBGPU_SINGLE_PASS_VERTEX}
+@group(0) @binding(0) var source: texture_2d<f32>;
+@group(0) @binding(1) var sourceSampler: sampler;
+@group(0) @binding(2) var<uniform> params: Params;
+
+struct Params { size: vec2f, offset: vec2f, amount: f32, scale: f32, complexity: f32, evolution: f32, cycle: f32, seed: u32, displacement: f32, pinning: f32, cycleEvolution: f32, }
+fn noiseType() -> i32 { return 2; }
+${VALUE_NOISE_WEBGPU_SHADER}
+fn noiseLayer(p: vec2f,z: f32,seed: u32) -> f32 {
+  if(params.cycleEvolution==0.0) { return valueNoise(vec3f(p,params.evolution+z),seed); }
+  let t=params.evolution-floor(params.evolution/params.cycle)*params.cycle;
+  let weight=smoothstep(0.0,1.0,t/params.cycle);
+  return mix(valueNoise(vec3f(p,t+z),seed),valueNoise(vec3f(p,t-params.cycle+z),seed),weight);
+}
+fn turbulence(p: vec2f,channel: u32) -> f32 {
+  var sum=0.0; var norm=0.0; var amplitude=1.0; var frequency=1.0;
+  let falloff=select(0.5,0.3,params.displacement>=3.0 && params.displacement<=5.0);
+  for(var octave=0;octave<10;octave++) {
+    let weight=clamp(params.complexity-f32(octave),0.0,1.0);
+    if(weight==0.0) { break; }
+    let seed=(params.seed ^ 0x7d15u)+channel+u32(octave)*101u;
+    sum += noiseLayer(p*frequency,f32(octave)*5.17,seed)*amplitude*weight;
+    norm += amplitude*weight; amplitude *= falloff; frequency *= 2.0;
+  }
+  return sum/norm-0.5;
+}
+fn readPixel(p: vec2i) -> vec4f {
+  if(any(p<vec2i(0)) || any(p>=vec2i(params.size))) { return vec4f(0); }
+  let sourceSize=vec2i(textureDimensions(source));
+  let sourcePixel=p+vec2i(0,sourceSize.y-i32(params.size.y));
+  if(any(sourcePixel<vec2i(0)) || any(sourcePixel>=sourceSize)) { return vec4f(0); }
+  return textureLoad(source,sourcePixel,0);
+}
+fn sampleSource(p: vec2f) -> vec4f {
+  let base=vec2i(floor(p-vec2f(0.5))); let t=fract(p-vec2f(0.5));
+  return mix(mix(readPixel(base),readPixel(base+vec2i(1,0)),t.x),mix(readPixel(base+vec2i(0,1)),readPixel(base+vec2i(1,1)),t.x),t.y);
+}
+@fragment fn fragment(input: VertexOutput) -> @location(0) vec4f {
+  if(params.amount==0.0) { return textureSampleLevel(source,sourceSampler,input.uv,0); }
+  let pixel=input.uv*params.size;
+  let p=(pixel-params.offset*params.size)/params.scale;
+  let mode=i32(params.displacement);
+  var displacement: vec2f;
+  if(mode==1 || mode==2 || mode==4 || mode==5) {
+    let epsilon=0.05;
+    let gradient=vec2f(turbulence(p+vec2f(epsilon,0),0u)-turbulence(p-vec2f(epsilon,0),0u),turbulence(p+vec2f(0,epsilon),0u)-turbulence(p-vec2f(0,epsilon),0u))/(2.0*epsilon);
+    displacement=select(vec2f(-gradient.y,gradient.x),gradient,mode==1 || mode==4)*params.amount*0.25;
+  } else if(mode==6) { displacement=vec2f(0,turbulence(p,17u)*params.amount); }
+  else if(mode==7) { displacement=vec2f(turbulence(p,0u)*params.amount,0); }
+  else if(mode==8) { displacement=vec2f(turbulence(p,0u)*params.amount); }
+  else { displacement=vec2f(turbulence(p,0u),turbulence(p,17u))*params.amount; }
+  let locked=params.pinning>=8.0;
+  let pin=select(params.pinning,params.pinning-7.0,locked);
+  let edge=max(1.0,min(params.size.x,params.size.y)*select(0.1,0.25,locked));
+  let nearEdge=clamp((pixel-vec2f(0.5))/edge,vec2f(0),vec2f(1));
+  let farEdge=clamp((params.size-vec2f(0.5)-pixel)/edge,vec2f(0),vec2f(1));
+  let horizontal=min(nearEdge.x,farEdge.x); let vertical=min(nearEdge.y,farEdge.y);
+  var weight=1.0;
+  if(pin==1.0) { weight=min(horizontal,vertical); }
+  if(pin==2.0) { weight=vertical; } if(pin==3.0) { weight=horizontal; }
+  if(pin==4.0) { weight=nearEdge.x; } if(pin==5.0) { weight=nearEdge.y; }
+  if(pin==6.0) { weight=farEdge.x; } if(pin==7.0) { weight=farEdge.y; }
+  var sourcePixel=pixel+displacement*weight;
+  if(locked) { sourcePixel=clamp(sourcePixel,vec2f(0.5),params.size-vec2f(0.5)); }
+  return sampleSource(sourcePixel);
+}
+
+`;
+
 // src/turbulent-displace/index.ts
 var { createEffect, createWebGL2ContextError } = Internals;
 var DEFAULT_DISPLACEMENT = "turbulent";
-var DEFAULT_AMOUNT2 = 50;
+var DEFAULT_AMOUNT = 50;
 var DEFAULT_SIZE = 100;
 var DEFAULT_OFFSET = [0.5, 0.5];
 var DEFAULT_COMPLEXITY = 1;
@@ -341,7 +262,7 @@ var turbulentDisplaceSchema = {
     min: -200,
     max: 200,
     step: 1,
-    default: DEFAULT_AMOUNT2,
+    default: DEFAULT_AMOUNT,
     description: "Amount",
     hiddenFromList: false
   },
@@ -425,7 +346,7 @@ var turbulentDisplaceSchema = {
 };
 var resolve = (params) => ({
   displacement: params.displacement ?? DEFAULT_DISPLACEMENT,
-  amount: params.amount ?? DEFAULT_AMOUNT2,
+  amount: params.amount ?? DEFAULT_AMOUNT,
   size: params.size ?? DEFAULT_SIZE,
   offset: params.offset ?? DEFAULT_OFFSET,
   complexity: params.complexity ?? DEFAULT_COMPLEXITY,
@@ -590,59 +511,99 @@ var turbulentDisplace = createEffect({
   type: "remotion/turbulent-displace",
   label: "turbulentDisplace()",
   documentationLink: "https://www.remotion.dev/docs/effects/turbulent-displace",
-  backend: "webgl2",
   calculateKey: (params) => {
     const r = resolve(params);
     return `turbulent-displace-${JSON.stringify(r)}`;
   },
-  setup: (target) => setupTurbulentDisplace(target),
-  apply: ({ source, width, height, params, state, flipSourceY }) => {
-    const r = resolve(params);
-    const { gl, program, texture, vao } = state;
-    gl.viewport(0, 0, width, height);
-    gl.bindFramebuffer(gl.FRAMEBUFFER, null);
-    gl.clearColor(0, 0, 0, 0);
-    gl.clear(gl.COLOR_BUFFER_BIT);
-    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);
-    gl.useProgram(program);
-    if (state.uSource)
-      gl.uniform1i(state.uSource, 0);
-    if (state.uResolution)
-      gl.uniform2f(state.uResolution, width, height);
-    if (state.uDisplacement)
-      gl.uniform1i(state.uDisplacement, DISPLACEMENT_MODES.indexOf(r.displacement));
-    if (state.uAmount)
-      gl.uniform1f(state.uAmount, r.amount);
-    if (state.uSize)
-      gl.uniform1f(state.uSize, r.size);
-    if (state.uOffset)
-      gl.uniform2f(state.uOffset, r.offset[0], r.offset[1]);
-    if (state.uComplexity)
-      gl.uniform1f(state.uComplexity, r.complexity);
-    if (state.uEvolution)
-      gl.uniform1f(state.uEvolution, r.evolution / 360);
-    if (state.uCycleEvolution)
-      gl.uniform1i(state.uCycleEvolution, r.cycleEvolution ? 1 : 0);
-    if (state.uCycle)
-      gl.uniform1f(state.uCycle, r.cycle);
-    if (state.uSeed)
-      gl.uniform1ui(state.uSeed, r.seed);
-    if (state.uPinning)
-      gl.uniform1i(state.uPinning, PINNING_MODES.indexOf(r.pinning));
-    gl.bindVertexArray(vao);
-    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) => setupWebGpuSinglePass(target, "index"),
+      apply: ({ source, width, height, params, state, gpuDevice }) => {
+        if (!gpuDevice)
+          throw new Error("A WebGPU device is required for the index effect");
+        const r = resolve(params);
+        const uniformData = new Float32Array([
+          width,
+          height,
+          r.offset[0],
+          r.offset[1],
+          r.amount,
+          r.size,
+          r.complexity,
+          r.evolution / 360,
+          r.cycle,
+          0,
+          DISPLACEMENT_MODES.indexOf(r.displacement),
+          PINNING_MODES.indexOf(r.pinning),
+          r.cycleEvolution ? 1 : 0,
+          0,
+          0,
+          0
+        ]);
+        new Uint32Array(uniformData.buffer)[9] = r.seed;
+        applyWebGpuSinglePass({
+          state,
+          source,
+          width,
+          height,
+          device: gpuDevice,
+          shader: TURBULENT_DISPLACE_WEBGPU_SHADER,
+          uniformData
+        });
+      },
+      cleanup: cleanupWebGpuSinglePass
+    }),
+    webgl2: Internals.createEffectImplementation({
+      setup: (target) => setupTurbulentDisplace(target),
+      apply: ({ source, width, height, params, state, flipSourceY }) => {
+        const r = resolve(params);
+        const { gl, program, texture, vao } = state;
+        gl.viewport(0, 0, width, height);
+        gl.bindFramebuffer(gl.FRAMEBUFFER, null);
+        gl.clearColor(0, 0, 0, 0);
+        gl.clear(gl.COLOR_BUFFER_BIT);
+        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);
+        gl.useProgram(program);
+        if (state.uSource)
+          gl.uniform1i(state.uSource, 0);
+        if (state.uResolution)
+          gl.uniform2f(state.uResolution, width, height);
+        if (state.uDisplacement)
+          gl.uniform1i(state.uDisplacement, DISPLACEMENT_MODES.indexOf(r.displacement));
+        if (state.uAmount)
+          gl.uniform1f(state.uAmount, r.amount);
+        if (state.uSize)
+          gl.uniform1f(state.uSize, r.size);
+        if (state.uOffset)
+          gl.uniform2f(state.uOffset, r.offset[0], r.offset[1]);
+        if (state.uComplexity)
+          gl.uniform1f(state.uComplexity, r.complexity);
+        if (state.uEvolution)
+          gl.uniform1f(state.uEvolution, r.evolution / 360);
+        if (state.uCycleEvolution)
+          gl.uniform1i(state.uCycleEvolution, r.cycleEvolution ? 1 : 0);
+        if (state.uCycle)
+          gl.uniform1f(state.uCycle, r.cycle);
+        if (state.uSeed)
+          gl.uniform1ui(state.uSeed, r.seed);
+        if (state.uPinning)
+          gl.uniform1i(state.uPinning, PINNING_MODES.indexOf(r.pinning));
+        gl.bindVertexArray(vao);
+        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: turbulentDisplaceSchema,
   validateParams: validateTurbulentDisplaceParams