Commit Graph
20 Commits
Author SHA1 Message Date
vangel76 7f13d1baed Merge upstream/main into Ball Grid branch 2026-11-12 12:47:55 +01:00
Dylan M. Taylor 70a05be71a Simulations: cap the steps a layer time can ask for and bound checkpoints as they are made (#2942)
* Simulations: cap the steps a layer time can ask for and bound checkpoints as they are made

* address review: keep the requested sim state when trimming checkpoints

* address review: drop only the excess sim checkpoints when trimming
2026-11-11 14:38:53 -05:00
vangel76 b0730f0cb4 Merge upstream/main into cc-ball-action-params-3197 2026-11-09 19:19:43 +01:00
FredApps 9893eb0d8d Naming: descriptive names for the CC effects, Lumetri, Mocha, Keylight and Mercury (#3327)
Related to #1365. Display labels only; effect, command, parameter, panel and serialized ids and the AEP/script match-name tables are unchanged.

- 69 Cycore CC effects, Key Light, Mocha shape, Lumetri Color/Scopes and the Mercury renderer labels get descriptive names; the old names stay case-insensitive lookup and search aliases.
- Backend::parse accepts the new renderer labels, so reported settings round-trip.
- Display names are unique per language in every effect catalog (new test).
- Warp Stabilizer and Roto Brush keep their names until RFC-0029 settles.
- Mapping in docs/feature-naming.md.
2026-11-09 04:51:10 +01:00
vangel76 26dc7b3a5e CC Ball Action: add Coloring, Shading, Scatter Motion, Displace and Displace Property (#3197)
After Effects 24.2 reworked CC Ball Action's controls. EffectCraft now lists
them in After Effects' order with its defaults: Grid Spacing (5), Ball Size
(100), Coloring (Medium), Shading (-75), Scatter, Scatter Motion, Displace,
Displace Property (Brightness), Twist Angle, Twist Property, Rotation Axis,
Rotation. Grid Spacing and Ball Size used to default to 4 and 40; saved
projects keep their values.

- Shading scales the balls' light and shine. -75 is the lit sphere as before,
  0 draws flat balls in the layer's colour, larger magnitudes shade more, and
  the sign mirrors the light's direction. The value is clamped to -100..100
  (an assumed range) so huge values stay finite on the GPU. Values other than
  -75 and 0 use a new sprite shape (Shape::Ball), drawn the same way on the
  CPU and the GPU.
- Coloring is an approximation: Crisp takes the nearest pixel, Medium keeps
  EffectCraft's earlier smooth sample (for compatibility), Smooth averages 16
  samples over the ball's cell.
- Scatter Motion is treated as the renamed Instability State, since 24.2
  shows no Instability State. Old projects are upgraded through
  PARAM_ID_ALIASES.
- Displace and Displace Property (Red, Green, Blue, Brightness, Saturation,
  RGB, Radius, Diamond, Spherize) move each ball towards or away from the
  camera. The scale, direction, pivot and range, and what Radius, Diamond and
  Spherize compute, are EffectCraft's own choice pending a comparison with
  After Effects. Displace is clamped to -1000..1000.

With the old Grid Spacing and Ball Size, every CC Ball Action golden hash is
unchanged, so the new controls at their defaults draw what was drawn before.
Only the golden cases that use the default Grid Spacing and Ball Size were
reblessed. CC Ball Action has no .aep mapping yet.

Sources (behaviour and public descriptions only):
- After Effects February 2024 (24.2) feature summary: "Ball Action:
  Rearranged effect controls with new controls, such as Displacement,
  Shading, and Coloring"
  https://helpx.adobe.com/ae_en/after-effects/using/whats-new/2024-2.html
- The After Effects screenshot in #3197: control order and defaults.
- 163.com, "Ae 效果详解:CC Ball Action": option lists, defaults, and that
  Shading 0 is flat
  https://www.163.com/dy/article/JOICG6E10536FE6V.html
- Adobe community, "CC Ball Action is broken in update 24.4": the Coloring
  options Crisp, Medium and Smooth
- Mike Murphy, "How To Use CC Ball Action": Shading 0 with Displace on
  Brightness
  https://mikemurphy.ai/tutorials/ccballaction/

Fixes #3197
2026-11-07 12:40:04 +01:00
bflatasticandClaude Opus 5.5 05841f5cc6 Merge main into #1610; no conflicts
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 09:23:38 +07:00
Marco Arnulfo efd6ab97dc fix(effects): cover Particle World's Texture Layer buffer before sampling it
Text and shape layers hand over a buffer that spans only their content;
the clamped sampling then stretched its edge pixels across the squares.
2026-10-30 00:52:10 +01:00
Marco Arnulfo a76c65bd00 fix(effects): keep Particle World on the GPU unless Textured Square draws the Texture Layer
A Texture Layer left set with another Particle Type forced the CPU for
nothing. gpu_supported now asks the same predicate the CPU path uses.
2026-10-30 00:52:10 +01:00
Marco Arnulfo 2a5e9066e5 fix(effects): draw Particle World's Texture Layer in the motion-trail samples too
With the shutter open the textured squares fell back to the particle
colour. Both branches now draw through the same sprite closure, and the
sharp frame goes through plan.post like the trails.
2026-10-30 00:52:10 +01:00
Marco Arnulfo 0c35a7a889 fix(effects): let CC Particle World's Textured Square use a Texture Layer (fixes #1465) 2026-10-30 00:52:10 +01:00
becauseno7 0ca3f72ac2 CC Bubbles: bubbles refract the layer's edge pixels on padded buffers too (#2024)
Refraction samples are clamped to the layer rectangle instead of the buffer, so a sample past the
layer's edge in a buffer with transparent padding (a half-resolution preview's, a text or shape
layer's) repeats the layer's edge pixels rather than reaching the pale colour that stands in for
transparent ones. Transparent pixels inside the layer still show it. Same bounds on the GPU path.

Re-pins the four half-resolution CC Bubbles golden hashes (aarch64 macOS); the full-resolution
ones are unchanged. Adds a CPU test and a GPU-vs-CPU parity test on padded buffers.
2026-10-30 04:34:30 +06:00
bflatasticandClaude Opus 5.5 65130dbcee Particles: particle_fx no longer imports params_key after the strict-clippy import list (#2496)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 00:27:28 +07:00
bflatastic 89fcd892eb Merge remote-tracking branch 'origin/main' into HEAD 2026-10-30 00:27:26 +07:00
Dylan M. Taylor d01871516a Refactor effects for strict Clippy checks 2026-10-28 06:09:21 +00:00
tylerjenningsw 8d008e53da Merge branch 'fix/particle-birth-history' into fix/particle-birth-history-ps2-mercury
# Conflicts:
#	crates/effects/src/sim.rs
2026-10-27 16:59:26 -04:00
tylerjenningsw cedc727da9 Merge remote-tracking branch 'origin/main' into fix/particle-birth-history
# Conflicts:
#	crates/effects/src/sim.rs
#	crates/render/src/lib.rs
2026-10-27 14:57:00 -04:00
aiongg b7b75ed37a style: cargo fmt on the moved files 2026-10-26 21:54:30 +00:00
aiongg 13fe6e5c03 refactor(effects): split sim.rs into sim/*.rs 2026-10-26 21:49:12 +00:00
aiongg 111767f196 refactor(effects): move src/sim.rs tests to src/sim/tests.rs 2026-10-26 21:49:11 +00:00
Shuvra Basak fa32010f67 CC Bubbles: bubbles at the layer's edges refract its edge pixels, not a pale fill (#2024)
Near the borders a bubble's refraction (liquid) or reflection (metal) sample
lands outside the layer. sample_bilinear returns transparent there, so the
pale stand-in colour for transparent pixels showed through, a band of washed-out
bubbles along every edge. Sample with edge pixels repeated instead, on the CPU
and in the GPU kernel; the pale colour stays for genuinely transparent pixels.

The CC Bubbles golden hashes are re-pinned (the half-resolution cases pad the
buffer with transparent pixels and are unchanged).
2026-10-24 22:22:48 +00:00