EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Make Fractal Noise evolution progress linearly
NetterSilver26636bfb1841
diff --git a/crates/effects/src/noise3.rs b/crates/effects/src/noise3.rsindex 88a5c01d5..39980dd80 100644--- a/crates/effects/src/noise3.rs+++ b/crates/effects/src/noise3.rs@@ -17,7 +17,7 @@ use effectcraft_keyframe::Value;use effectcraft_project::ParamUi;use rayon::prelude::*;-use crate::generate::{fade, lattice};+use crate::generate::lattice;use crate::{Buf, EffectCtx, EffectSpec, ParamSpec, num, p, popup, slider};/// Fractal Type options (shared by both effects).@@ -139,7 +139,7 @@ fn bspline(t: f32) -> [f32; 3] {}/// 3D value noise in about 0..1 with the given [`NOISE_TYPES`] interpolation in x and y (the-/// evolution axis z always fades smoothly).+/// evolution axis z always interpolates linearly, so evolution moves at a constant rate).////// Soft Linear is linear interpolation softened by a one-cell box filter, which is the quadratic/// B-spline: smooth like Spline from 9 lattice values instead of 16. A fade between two values@@ -149,7 +149,7 @@ pub fn typed_noise(x: f32, y: f32, z: f32, seed: u32, noise_type: u32) -> f32 {// Soft Linear's taps are centred on the nearest lattice point, the others start at the cell's.let h = if noise_type == NOISE_SOFT_LINEAR { 0.5 } else { 0.0 };let (x0, y0, z0) = ((x + h).floor(), (y + h).floor(), z.floor());- let (tx, ty, fz) = (x + h - x0, y + h - y0, fade(z - z0));+ let (tx, ty, fz) = (x + h - x0, y + h - y0, z - z0);let (ix, iy, iz) = (x0 as i32, y0 as i32, z0 as i32);let l = |a: f32, b: f32, t: f32| a + (b - a) * t;let slice = |dz: i32| -> f32 {@@ -476,6 +476,20 @@ mod tests {run_fx(id, vals, Image::filled(40, 24, [0.2, 0.4, 0.6, 1.0]), 0.0, EffectEnv::default()).img}+ /// Evolution moves the noise at a constant rate: no ease in or out within a revolution.+ #[test]+ fn evolution_is_linear() {+ for noise_type in [0, 1, 2, 3] {+ let a = typed_noise(0.3, 0.7, 0.0, 5, noise_type);+ let b = typed_noise(0.3, 0.7, 1.0, 5, noise_type);+ for z in [0.25, 0.5, 0.75] {+ let want = a + (b - a) * z;+ let got = typed_noise(0.3, 0.7, z, 5, noise_type);+ assert!((got - want).abs() < 1e-4, "type {noise_type} z {z}: {got} vs {want}");+ }+ }+ }+/// A Fractal Noise saved before the twirl-downs existed: flat ids move into their groups and/// the new controls take values that keep the old look.#[test]diff --git a/crates/gpu/src/shaders/fx_noise.wgsl b/crates/gpu/src/shaders/fx_noise.wgslindex 1f62d4429..5e68e10c1 100644--- a/crates/gpu/src/shaders/fx_noise.wgsl+++ b/crates/gpu/src/shaders/fx_noise.wgsl@@ -538,7 +538,7 @@ fn fxn_typed_noise(x: f32, y: f32, z: f32, seed: u32, nt: u32) -> f32 {let z0 = floor(z);let tx = x - x0;let ty = y - y0;- let fz = fade(z - z0);+ let fz = z - z0;let a = fxn_slice(i32(x0), i32(y0), i32(z0), tx, ty, seed, nt);let b = fxn_slice(i32(x0), i32(y0), i32(z0) + 1, tx, ty, seed, nt);return a + (b - a) * fz;diff --git a/crates/gpu/src/shaders/kernels.wgsl b/crates/gpu/src/shaders/kernels.wgslindex defbb5bf4..85ae25476 100644--- a/crates/gpu/src/shaders/kernels.wgsl+++ b/crates/gpu/src/shaders/kernels.wgsl@@ -561,7 +561,7 @@ fn soft_linear_noise(x: f32, y: f32, z: f32, seed: u32) -> f32 {let wy = bspline(y + 0.5 - y0);let a = soft_linear_slice(i32(x0), i32(y0), i32(z0), wx, wy, seed);let b = soft_linear_slice(i32(x0), i32(y0), i32(z0) + 1, wx, wy, seed);- let n = a + (b - a) * fade(z - z0);+ let n = a + (b - a) * (z - z0);return 0.5 + (n - 0.5) * SOFT_LINEAR_GAIN;}