Commit Graph
1128 Commits
Author SHA1 Message Date
vangel76 6bea5fa6ae Merge upstream/main into cache-defaults-3298 2026-11-19 10:21:55 +01:00
arnav-hiwarkar c07dbf32ca Merge remote-tracking branch 'upstream/main' into fix/3464-drop-shadow-softness-range 2026-11-17 20:54:02 +05:30
arnav-hiwarkar eb14583749 Merge remote-tracking branch 'upstream/main' into fix/3467-radial-blur-amount-range
# Conflicts:
#	crates/aep/src/export/fx_defs.rs
#	crates/engine/src/tests/effect_ranges.rs
#	docs/effects-parity.md
2026-11-17 18:34:15 +05:30
arnav-hiwarkar 7f14df8355 Merge upstream main into fix/3460-gaussian-blur-range
Keeps the Gaussian Blur (#3460) and Sharpen (#3466) tests in
crates/effects/src/misc.rs; Sharpen's code is as main has it.
2026-11-17 18:08:30 +05:30
ash a188867a42 Merge pull request #3810 from arnav-hiwarkar/fix/3466-sharpen-amount-range
Sharpen: Amount takes After Effects' 0..4000 range (#3466)
2026-11-17 18:06:39 +05:30
arnav-hiwarkar ff9584fa64 Merge remote-tracking branch 'upstream/main' into fix/3467-radial-blur-amount-range
# Conflicts:
#	crates/engine/src/tests/effect_ranges.rs
#	docs/effects-parity.md
2026-11-17 17:57:33 +05:30
arnav-hiwarkar 69666e68c7 Merge upstream main into fix/3460-gaussian-blur-range
Keeps the Gaussian Blur (#3460) and Turbulent Displace (#3469) rows in
the engine range test and the effects parity log.
2026-11-17 17:57:21 +05:30
arnav-hiwarkar 95685d8d41 Merge remote-tracking branch 'upstream/main' into fix/3469-turbulent-displace-amount-range
# Conflicts:
#	docs/effects-parity.md
2026-11-17 17:26:50 +05:30
arnav-hiwarkar 83285272e3 Merge upstream main into fix/3460-gaussian-blur-range
Keeps the Gaussian Blur (#3460), Fractal Noise (#3486) and CC Power Pin
(#3492) rows in the effects parity log.
2026-11-17 17:25:22 +05:30
arnav-hiwarkar ffdcdb507d Merge remote-tracking branch 'upstream/main' into fix/3464-drop-shadow-softness-range 2026-11-17 17:25:13 +05:30
arnav-hiwarkar cebe224d85 Merge remote-tracking branch 'upstream/main' into fix/3467-radial-blur-amount-range
# Conflicts:
#	docs/effects-parity.md
2026-11-17 17:24:34 +05:30
arnav-hiwarkar 5adc96bfbf Merge remote-tracking branch 'upstream/main' into fix/3466-sharpen-amount-range
# Conflicts:
#	crates/engine/src/tests/effect_ranges.rs
2026-11-17 17:24:31 +05:30
arnav-hiwarkar 9bb0db0207 Merge upstream main into fix/3460-gaussian-blur-range
Keeps both the Gaussian Blur (#3460) and CC Power Pin (#3492) rows in
the engine range test and the effects parity log.
2026-11-17 16:55:18 +05:30
arnav-hiwarkar 8fe42b29c6 Merge remote-tracking branch 'upstream/main' into fix/3464-drop-shadow-softness-range 2026-11-17 16:49:21 +05:30
arnav-hiwarkar 79d4be499d Merge remote-tracking branch 'upstream/main' into fix/3466-sharpen-amount-range
# Conflicts:
#	crates/engine/src/tests/effect_ranges.rs
#	docs/effects-parity.md
2026-11-17 16:48:30 +05:30
arnav-hiwarkar 63ec0033d1 #3486: merge main (CC Power Pin range rows in the shared tables) 2026-11-17 16:48:19 +05:30
arnav-hiwarkar a3ab20e9f7 Merge remote-tracking branch 'upstream/main' into fix/3469-turbulent-displace-amount-range
# Conflicts:
#	crates/engine/src/tests/effect_ranges.rs
#	docs/effects-parity.md
2026-11-17 16:46:35 +05:30
arnav-hiwarkar 8420bb9f4d Merge remote-tracking branch 'upstream/main' into fix/3467-radial-blur-amount-range
# Conflicts:
#	crates/engine/src/tests/effect_ranges.rs
#	docs/effects-parity.md
2026-11-17 16:46:29 +05:30
arnav-hiwarkar cec04744f3 #3464: Drop Shadow: test a huge Softness; say what the GPU test checks
A Softness far past the range (an expression can set one) overflowed
the padding's u32 before drop_shadow_pad saturated it; the new test
panicked there in a debug build and renders a finite shadow now. The
GPU test's comment and the parity row now say that a cut margin renders
on the CPU, and the CPU test quotes the measured 0.11 at Softness 8000.
2026-11-17 16:24:22 +05:30
arnav-hiwarkar f149b65c57 #3464: Drop Shadow: Softness takes After Effects' range
Softness took 0..1000, so prop.set and the value editors clamped values
After Effects accepts: its recorded definition for ADBE Drop Shadow
allows 0..30000 in the same pixels (the .aep mapping is plain). The hard
range is now 0..30000; the default (0) and the slider (0..250) are
unchanged. Projects saved with the old range take the new one on open.

The .aep range guard loses its allow-list row, and the engine test sets
both ends through prop.set, undo / redo, save / reopen and an old
project. Keyframe text keeps no unit for it (only 0..100 sliders read
as percent).
2026-11-17 16:24:22 +05:30
arnav-hiwarkar a62564b567 #3469: locked pinning clamps without f64::clamp
The sub-pixel bounds lx + ix and lx + lw - ix round separately, so at third
resolution they can still cross by an ulp and f64::clamp panics; a NaN
layer size panicked too. max/min equals clamp whenever the bounds are
ordered and cannot panic. The test now covers half and third resolution at
fractional offsets and a NaN layer size. The parity note says Amount, not
the displacement, is bounded to 2^24 px.
2026-11-17 16:19:44 +05:30
arnav-hiwarkar d5e74c880f #3467: Radial Blur docs say the wide Zoom shape is unmeasured
The spin helper's name gives its unit (degrees), the zoom helper's doc
uses |amount| as the code does, and the parity row and tests say what
is and is not checked against After Effects.
2026-11-17 16:15:51 +05:30
arnav-hiwarkar 4cf7741340 #3469: Turbulent Displace locked pinning on a sub-pixel layer
Locked pinning clamped samples to lx + 0.5 .. lx + lw - 0.5. On a layer
under a buffer pixel across (a 1-pixel layer at half resolution) the bounds
cross and f64::clamp panics. They now meet at the layer's centre there and
are unchanged otherwise.
2026-11-17 16:14:01 +05:30
arnav-hiwarkar 040fe61b84 #3469: Turbulent Displace stays finite at any Amount
Expressions are not clamped to the hard range. Padding computed
amount.abs().ceil() as u32 + 1, which overflowed (a panic in debug builds)
from about 4.3e9 on both the CPU and GPU paths, a NaN Amount filled the
layer with NaN, and an infinite one sent infinite coordinates to the
samplers' integer pixel positions.

turbulent_amount_px, shared by both paths, skips a zero or NaN Amount and
bounds the rest to 2^24 px. Values inside the hard range are unchanged.
Tests cover both ends of the range with every displacement kind, pinning
and Resize Layer (finite, padding within budget), Amounts past it, and
CPU/GPU agreement at -10000, 10000 and infinity.
2026-11-17 16:13:10 +05:30
arnav-hiwarkar 2e17ed1d83 #3469: Turbulent Displace Amount takes After Effects' valid range
The hard range was -1000..1000, so prop.set and the Effect Controls and
Timeline editors clamped Amount values After Effects accepts. The recorded
ADBE Turbulent Displace definition allows -10000..10000 (plain units, no
conversion). The default and the -200..200 slider are unchanged.

The .aep range guard no longer lists the parameter as narrower, and the
engine range test covers both ends through prop.set, undo/redo, save and
reopen, and projects saved with the old range.
2026-11-17 16:12:25 +05:30
arnav-hiwarkar ec1294a1d2 #3486: Fractal Noise: Sub Scaling takes After Effects' 10..10000
After Effects records Sub Scaling's valid range as 10..10000 (slider
25..100), but the hard range stopped at 100, so prop.set and the value
editors clamped 200 to 100. The CPU renderer and the GPU pointwise path
also capped the ratio at 1, so a value above 100 rendered as 100 even
once stored.

Widen the hard range for Fractal and Turbulent Noise (they share the
parameter; slider and default unchanged) and take the ratio from one
sub_scaling_ratio (0.1..100) on the CPU and both GPU paths. Above 100
each octave is larger than the last.

Tests: the range and that 200 and 10000 render differently from 100;
finite output at both ends with Complexity 20, Perspective Offset,
Turbulence Factor 10 and a huge offset; CPU/GPU parity at 200 and 10000
on the pointwise and fxn_fractal paths; prop.set, undo/redo and
save/reopen keep 10 and 10000 (engine range table). The .aep range
guard no longer lists the parameter.
2026-11-17 16:10:16 +05:30
arnav-hiwarkar f98c3e9ba2 #3467: Radial Blur Zoom past 200 stays on its side of the centre
Zoom spreads its 32 samples over scales 1 ± Amount / 200 about the
centre. Past Amount 200, which the range now allows, that reaches below
0 and samples the layer mirrored through the centre: at 1000 a layer
white on the left and black on the right turned the right half 35 %
grey.

raster::radial_blur_zoom_scale keeps the old scales up to 200 exactly
and spreads the samples evenly from the centre to 1 + Amount / 200
beyond. The CPU and GPU paths both take their samples from it. Work per
pixel stays at 32 samples at any Amount.
2026-11-17 16:09:38 +05:30
arnav-hiwarkar 12480ab94e #3492: say when crossed Expansion sides flip the CC Power Pin source
The source rectangle flips when two opposite sides add up to less than
-100 %, not when one side alone does.
2026-11-17 16:09:32 +05:30
arnav-hiwarkar ef7dd7f3d1 #3460: Gaussian Blur: Blurriness takes After Effects' range 0..30000
After Effects records Blurriness as valid from 0 to 30000; the hard range
was 0..3000, so prop.set and the value editors clamped 4000 to 3000. The
default (0) and the 0..50 slider stay as they were. Padding stays within
the effect pixel budget at the new maximum, on the CPU and the GPU.

Tests: the engine round trip (prop.set, undo/redo, save/reopen, older
projects) gets a row, the aep guard drops its known-narrower row, and the
CPU and GPU render at 30000 is checked bounded, finite and matching.
2026-11-17 16:06:36 +05:30
arnav-hiwarkar 6c5d0b51ec #3466: note Sharpen's Amount range in the parity history 2026-11-17 16:05:37 +05:30
arnav-hiwarkar fa11f72434 #3492: note CC Power Pin's Expansion range in the parity log 2026-11-17 16:04:45 +05:30
vangel76 fc4eddf2d5 Merge upstream/main into the plane store branch (#3301)
# Conflicts:
#	Cargo.toml
2026-11-17 11:10:07 +01:00
Dylan M. Taylor 6d908d1301 Merge pull request #3215 from vangel76/cc-ball-action-params-3197
Ball Grid effect has all of After Effects' CC Ball Action controls, including flat balls without shading
2026-11-16 20:39:25 -05:00
vangel76 c1aea6d65a Bound OpenEXR pictures in memory and keep effects' depth fill
The picture of an OpenEXR file (also the black one of a file without a
main picture) is checked before anything is read: no larger than a
still may decode to and than one read of the file may allocate, else
refused with the reason instead of allocated. Import refuses such a
picture as other stills. The fill of a picture channel in a part named
like depth is the background depth again, as effects read it; the
picture is 0 outside that part's data window when composed instead.
A read decompresses on at most four threads of its own, none for a
small file.
2026-11-16 22:59:38 +01:00
vangel76 d671f6e45b Show an OpenEXR file's main picture as After Effects does
The picture of an OpenEXR file is now craft-exr's main picture: the
unprefixed R, G, B (and A) of the first part that has all three, else
the first part's unprefixed Y (and A) as grey. A file of named layers
only (Blender's ViewLayer.Combined.R, a compositor's Image.R) has none
and shows black at its display window's size, opaque, as After Effects
shows it; it still imports and its layers stay readable by effects
(EXtractoR, Cryptomatte, the 3D Channel effects).

The own picture choice (the beauty pass by name, data passes, the first
channel as grey) is gone. The picture's channels keep a fill of 0
outside the data window even in a part named like depth, so the picture
of such a file stays what the image crate shows. The golden hashes of
the named-layer files are re-pinned (their channels are unchanged), and
the docs describe the new rule.
2026-11-16 22:30:46 +01:00
vangel76 9ff031c5f1 Merge upstream/main into the plane store branch (#3301)
Conflicts: Cargo manifests (craft-libs pins from main, plus memory-stats, exr and
half for effectcraft-media), exr_channels.rs (the plane store's version; main's
craft-exr channel decode is replaced by the plane store until craft-exr reads
from a seekable source), pool.rs (frame_px takes the rows of #3271 and the
forget generation of #2042), session open/forget (main's forget_files plus the
reload counter), Project panel thumbnails (main's Thumb types, keyed by content).
2026-11-16 20:57:45 +01:00
FredApps ce23259bf5 Merge main into i778/effectcraft-opus-craft-audio
Take #3763's shared GIF/WebP frame decode (craft-gif/craft-webp frames
features). Keep workspace craft-libs pins at 5a7a63a2 except the #3653
PDF/PS pins at 808730f4.
2026-11-16 10:32:46 +01:00
FredApps e250f8fcb6 Merge pull request #3707 from gmrmad1/docs/roadmap-2026-11-15
docs: bring ROADMAP.md and parity assessment current through 2026-11-15
2026-11-16 10:27:08 +01:00
FredApps 583a8a02db Merge pull request #3147 from dotCooCoo/fix/plugin-library-file-url-unc
Plug-in Library: a file URL cannot name a network path
2026-11-16 10:26:13 +01:00
FredApps af069369fc Merge pull request #3148 from dotCooCoo/fix/plugin-library-release-urls
Plug-in Library: a package downloads only release assets of its repository
2026-11-16 10:25:12 +01:00
vangel76 f4a8c88349 Merge upstream/main into cache-defaults-3298 2026-11-15 20:28:43 +01:00
FredApps e6a8cf8cec Export: WebM Opus from craft-audio; remove crates/opusenc
WebM export (VP9 and AV1) now encodes Opus with craft_audio::opus::Encoder
(the opus-encode feature). The shared encoder was imported from this crate,
and craft-libs #1593 ports the speed-ups that landed here afterwards, so the
packets are byte-identical to effectcraft-opusenc. Encoder errors are export
errors instead of panics.

All direct craft-libs dependencies, the lockfile and the PDF dependency
validator move to b850981f, the head of craft-libs #1593. Repin to its merge
commit once it lands.

Refs storytold/craft-libs#778
2026-11-15 16:05:11 +01:00
.CooCoo d6c9ad6643 Cineon Converter: Gamma 1 gives linear output and saved projects keep their render (#2312)
## Behavior

A new Cineon Converter opens with Gamma 1.7. Its Version parameter is 2 by default. A converter saved before Version existed opens as version 1, retaining its Gamma value, keyframes, and expression text and rendering on its original scale. Reset keeps the instance's Version.

In version 2:

- Log to Linear raises the exposure to `1 / gamma` before subtracting the black offset and normalizing: `(E^(1/g) - O^(1/g)) / (1 - O^(1/g))`, with `E = 10^((code - white) * 0.002 / 0.6)` and `O` the exposure at the black point. Gamma 1 gives linear output, and a larger Gamma lightens the midtones. Highlight Rolloff then applies as before, and Linear to Log is the inverse.
- Log to Log returns code values unchanged at Gamma 1 and raises the normalized code value to `1 / gamma` at other values. With custom black or white points, the code values first go through the Gamma 1 conversion.

The CPU and GPU paths match. Version 1 instances render as before, and Interpret Footage ▸ Cineon Settings keeps its existing formula, which agrees with the version 2 Converter at Gamma 1.

The public Cineon Converter documentation (https://helpx.adobe.com/after-effects/using/utility-effects.html) describes Gamma as a midtone control and gives no defaults or formula. The default, the Log to Linear curve and the Log to Log behavior come from running and scripting After Effects 26.5 on my own machine and reading back the rendered pixels. In After Effects, choosing Log to Log also sets Gamma to 1 and Highlight Rolloff to 0; EffectCraft does not do that yet, because no command sets one parameter from another.

Animation preset format 3 records `cineonVersion` for a saved Gamma property and stores effect key times relative to the first key. Presets in formats 1 and 2 without that tag contain version 1 Gamma values; format 2 already has relative effect key times. Applying a whole old Cineon Converter also gives it version 1. Exposed Essential Properties Gamma values convert to the target converter version where their target is unambiguous (the conversion keeps the linear point; other Gamma values follow each version's own curve); enabled expressions on another scale are skipped instead of rewriting their source.

A saved Gamma records the Version its converter has at the current time. Applied to a converter whose Version is keyframed, a Gamma preset keeps those keys: the Gamma is converted to the one version they hold, or skipped when they hold several or an expression sets the Version. A preset that also holds the Version sets it from that property.

The project schema remains 2. `docs/architecture.md` describes the behavior above.

## Validation

Effect tests check version 2 Log to Linear at Gamma 1.7 (codes 95 to 685) and Gamma 2.2 (codes 180 to 620), and Log to Log at Gamma 1 (Rolloff 0 and 20) and Gamma 1.7, against the measured 8-bit values within one or two codes, plus round trips, version 1 rendering and the Interpret Footage agreement at Gamma 1. GPU tests compare the version 2 paths with the CPU. Engine tests cover old projects, Reset, presets, keyframes, and Essential Properties.

Commands run on `74d398c2`:

- `cargo fmt --all -- --check`
- `cargo clippy -p effectcraft-effects -p effectcraft-gpu -p effectcraft-project -p effectcraft-engine --all-targets -- -D warnings`
- `cargo test -p effectcraft-effects`: 546 passed (including `effects_doc_is_current`, so `docs/effects.md` needs no change), 1 ignored, plus 6
- `cargo test -p effectcraft-project`: 47 passed
- `cargo test -p effectcraft-gpu`: 253 passed, 1 ignored
- `cargo test -p effectcraft-engine`: 1,007 passed, 5 ignored, plus 27
2026-11-15 12:11:07 +01:00
Madhav Agarwal 3a2a564b4b docs: bring ROADMAP.md current through 2026-11-15 2026-11-15 09:13:48 +05:30
vangel76 363e6db494 Merge main 2026-11-14 22:28:58 +01:00
vangel76 3ad49f8f7b Merge upstream/main into cache-defaults-3298
Conflict in crates/render/src/pipeline.rs: kept both the footage-rows
reader of this branch and the frame-mix span reader from main.
Adapted three menus tests to DialogAnswer.paths now being a Result.
2026-11-14 19:53:16 +01:00
FredApps f89dd51bcf Merge pull request #3235 from vangel76/effect-controls-lock-3193
Effect Controls: lock the panel to the layer it shows
2026-11-14 17:27:24 +01:00
FredApps 88bb97b839 Merge pull request #3258 from vangel76/cryptomatte-select-tool-2839
Cryptomatte: the Selection tool picks IDs while the effect is selected
2026-11-14 16:58:44 +01:00
dotCooCoo 8fe757edbd Merge main into fix/plugin-library-release-urls 2026-11-13 11:36:34 -08:00
dotCooCoo 765fd76552 Merge main into fix/plugin-library-file-url-unc 2026-11-13 11:36:31 -08:00