@remotion/effects 4.0.538 → 4.0.540

package/dist/esm/liquid-contours.mjs

@@ -1,110 +1,105 @@
+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/liquid-contours.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/liquid-contours-webgpu-shader.ts
+var LIQUID_CONTOURS_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,
+ noise: vec4f,
+ offset: vec4f,
+ first: vec4f,
+ second: vec4f,
+}
+fn sampleSource(uv: vec2f) -> vec4f {
+ return textureSampleLevel(sourceTexture, sourceSampler, vec2f(uv.x, 1.0 - uv.y), 0);
+}
 
-// 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 hash(p: vec2f) -> f32 {
+ var p3 = fract(p.xyx * 0.1031);
+ p3 += vec3f(dot(p3, p3.yzx + vec3f(33.33) + vec3f(params.noise.z * 0.013)));
+ return fract((p3.x + p3.y) * p3.z);
+}
+fn valueNoise(p: vec2f) -> f32 {
+ let i = floor(p);
+ let f = fract(p);
+ let u = f * f * f * (f * (f * 6.0 - vec2f(15.0)) + vec2f(10.0));
+ return mix(mix(hash(i), hash(i + vec2f(1, 0)), u.x), mix(hash(i + vec2f(0, 1)), hash(i + vec2f(1)), u.x), u.y);
+}
+
+fn fbm(position: vec2f) -> f32 {
+ var p = position;
+ var value = 0.0;
+ var amplitude = 0.5;
+ var total = 0.0;
+ let persistence = mix(0.2, 0.58, params.noise.x);
+ let rotate = mat2x2f(0.80, 0.60, -0.60, 0.80);
+ for (var i = 0; i < 5; i++) {
+  let octave = f32(i) / 4.0;
+  let detail = mix(0.45, 1.0, params.noise.x);
+  let octaveWeight = mix(1.0, 1.0 - smoothstep(0.4, 1.0, octave), 1.0 - detail);
+  value += amplitude * octaveWeight * valueNoise(p);
+  total += amplitude * octaveWeight;
+  p = rotate * p * 2.03 + vec2f(13.17, 7.31);
+  amplitude *= persistence;
+ }
+ return value / total;
+}
+
+fn waveAt(pixel: vec2f) -> f32 {
+ let position = pixel + params.offset.xy;
+ let p = position / max(params.geometry.w, 0.001) + vec2f(params.noise.z * 0.137, params.noise.z * 0.193);
+ let warp = vec2f(fbm(p + vec2f(5.2, 1.3)), fbm(p + vec2f(1.7, 9.2))) - vec2f(0.5);
+ let roundRotation = mat2x2f(0.7071, 0.7071, -0.7071, 0.7071);
+ let roundedField = mix(valueNoise(p * 0.9), valueNoise(roundRotation * p * 0.78 + vec2f(8.3, 2.7)), 0.45);
+ let detailedField = fbm(p + warp * mix(0.35, 1.8, params.noise.x));
+ let detailMix = smoothstep(0.0, 1.0, params.noise.x);
+ let field = mix(roundedField, detailedField, detailMix);
+ let levels = max(max(params.geometry.x, params.geometry.y) / max(params.geometry.z, 0.001), 1.0);
+ return sin((field * levels + params.noise.w) * 6.28318530718);
+
+}
+
+@fragment fn fragment(input: VertexOutput) -> @location(0) vec4f {
+ let vUv = vec2f(input.uv.x, 1.0 - input.uv.y);
+
+ let pixel = vec2f(input.position.x, params.geometry.y - input.position.y);
+ let wave = waveAt(pixel);
+ var derivative = fwidth(wave);
+ if (i32(params.geometry.y) % 2 != 0) {
+  // Match WebGL's bottom-origin derivative quads on odd-height targets.
+  let neighborY = select(-1.0, 1.0, i32(pixel.y) % 2 == 0);
+  derivative = abs(dpdx(wave)) + abs(waveAt(pixel + vec2f(0, neighborY)) - wave);
+ }
+ let edgeWidth = derivative * mix(0.15, 1.4, params.noise.y);
+ let selector = smoothstep(-edgeWidth, edgeWidth, wave);
+ let color = mix(params.first, params.second, selector);
+ return vec4f(color.rgb * color.a, color.a);
+
+}
+`;
 
 // src/liquid-contours.ts
 var { createEffect, createWebGL2ContextError } = Internals;
@@ -294,7 +289,7 @@ float fbm(vec2 p) {
 }
 
 void main() {
-	vec2 position = vUv * uResolution + uOffset;
+	vec2 position = gl_FragCoord.xy + uOffset;
 	vec2 p = position / max(uScale, 0.001) + vec2(uSeed * 0.137, uSeed * 0.193);
 	vec2 warp = vec2(fbm(p + vec2(5.2, 1.3)), fbm(p + vec2(1.7, 9.2))) - 0.5;
 	mat2 roundRotation = mat2(0.7071, 0.7071, -0.7071, 0.7071);
@@ -410,59 +405,103 @@ var liquidContours = createEffect({
   type: "dev.remotion.effects.liquidContours",
   label: "liquidContours()",
   documentationLink: "https://www.remotion.dev/docs/effects/liquid-contours",
-  backend: "webgl2",
   calculateKey: (params) => {
     const r = resolve(params);
     return `liquid-contours-${r.firstColor}-${r.secondColor}-${r.spacing}-${r.scale}-${r.complexity}-${r.smoothness}-${r.seed}-${r.offsetX}-${r.offsetY}-${r.phase}`;
   },
-  setup,
-  apply: ({ width, height, params, state }) => {
-    const r = resolve(params);
-    if (state.cachedFirstColor !== r.firstColor) {
-      state.cachedFirstColor = r.firstColor;
-      state.cachedFirstColorRgba = parseColorRgba(state.colorCtx, r.firstColor);
-    }
-    if (state.cachedSecondColor !== r.secondColor) {
-      state.cachedSecondColor = r.secondColor;
-      state.cachedSecondColorRgba = parseColorRgba(state.colorCtx, r.secondColor);
-    }
-    const first = normalized(state.cachedFirstColorRgba);
-    const second = normalized(state.cachedSecondColorRgba);
-    const { gl, program, vao, uniforms } = 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.useProgram(program);
-    if (uniforms.uResolution)
-      gl.uniform2f(uniforms.uResolution, width, height);
-    if (uniforms.uFirstColor)
-      gl.uniform4f(uniforms.uFirstColor, ...first);
-    if (uniforms.uSecondColor)
-      gl.uniform4f(uniforms.uSecondColor, ...second);
-    if (uniforms.uSpacing)
-      gl.uniform1f(uniforms.uSpacing, r.spacing);
-    if (uniforms.uScale)
-      gl.uniform1f(uniforms.uScale, r.scale);
-    if (uniforms.uComplexity)
-      gl.uniform1f(uniforms.uComplexity, r.complexity);
-    if (uniforms.uSmoothness)
-      gl.uniform1f(uniforms.uSmoothness, r.smoothness);
-    if (uniforms.uSeed)
-      gl.uniform1f(uniforms.uSeed, r.seed);
-    if (uniforms.uOffset)
-      gl.uniform2f(uniforms.uOffset, r.offsetX, r.offsetY);
-    if (uniforms.uPhase)
-      gl.uniform1f(uniforms.uPhase, r.phase);
-    gl.bindVertexArray(vao);
-    gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
-    gl.bindVertexArray(null);
-    gl.useProgram(null);
-  },
-  cleanup: ({ gl, program, vao, vbo }) => {
-    gl.deleteBuffer(vbo);
-    gl.deleteProgram(program);
-    gl.deleteVertexArray(vao);
+  implementations: {
+    webgpu: Internals.createEffectImplementation({
+      setup: (target) => setupWebGpuColors(target, "liquid-contours"),
+      apply: ({ source, width, height, params, state, gpuDevice }) => {
+        if (!gpuDevice)
+          throw new Error("A WebGPU device is required for the liquid-contours effect");
+        const r = resolve(params);
+        const colors = getWebGpuColors(state, [r.firstColor, r.secondColor]);
+        const uniformData = new Float32Array([
+          width,
+          height,
+          r.spacing,
+          r.scale,
+          r.complexity,
+          r.smoothness,
+          r.seed,
+          r.phase,
+          r.offsetX,
+          r.offsetY,
+          0,
+          0,
+          colors[0] / 255,
+          colors[1] / 255,
+          colors[2] / 255,
+          colors[3] / 255,
+          colors[4] / 255,
+          colors[5] / 255,
+          colors[6] / 255,
+          colors[7] / 255
+        ]);
+        applyWebGpuSinglePass({
+          state,
+          source,
+          width,
+          height,
+          device: gpuDevice,
+          shader: LIQUID_CONTOURS_WEBGPU_SHADER,
+          uniformData
+        });
+      },
+      cleanup: cleanupWebGpuSinglePass
+    }),
+    webgl2: Internals.createEffectImplementation({
+      setup,
+      apply: ({ width, height, params, state }) => {
+        const r = resolve(params);
+        if (state.cachedFirstColor !== r.firstColor) {
+          state.cachedFirstColor = r.firstColor;
+          state.cachedFirstColorRgba = parseColorRgba(state.colorCtx, r.firstColor);
+        }
+        if (state.cachedSecondColor !== r.secondColor) {
+          state.cachedSecondColor = r.secondColor;
+          state.cachedSecondColorRgba = parseColorRgba(state.colorCtx, r.secondColor);
+        }
+        const first = normalized(state.cachedFirstColorRgba);
+        const second = normalized(state.cachedSecondColorRgba);
+        const { gl, program, vao, uniforms } = 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.useProgram(program);
+        if (uniforms.uResolution)
+          gl.uniform2f(uniforms.uResolution, width, height);
+        if (uniforms.uFirstColor)
+          gl.uniform4f(uniforms.uFirstColor, ...first);
+        if (uniforms.uSecondColor)
+          gl.uniform4f(uniforms.uSecondColor, ...second);
+        if (uniforms.uSpacing)
+          gl.uniform1f(uniforms.uSpacing, r.spacing);
+        if (uniforms.uScale)
+          gl.uniform1f(uniforms.uScale, r.scale);
+        if (uniforms.uComplexity)
+          gl.uniform1f(uniforms.uComplexity, r.complexity);
+        if (uniforms.uSmoothness)
+          gl.uniform1f(uniforms.uSmoothness, r.smoothness);
+        if (uniforms.uSeed)
+          gl.uniform1f(uniforms.uSeed, r.seed);
+        if (uniforms.uOffset)
+          gl.uniform2f(uniforms.uOffset, r.offsetX, r.offsetY);
+        if (uniforms.uPhase)
+          gl.uniform1f(uniforms.uPhase, r.phase);
+        gl.bindVertexArray(vao);
+        gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
+        gl.bindVertexArray(null);
+        gl.useProgram(null);
+      },
+      cleanup: ({ gl, program, vao, vbo }) => {
+        gl.deleteBuffer(vbo);
+        gl.deleteProgram(program);
+        gl.deleteVertexArray(vao);
+      }
+    })
   },
   schema: liquidContoursSchema,
   validateParams: validateLiquidContoursParams