Commit Graph
4244 Commits
Author SHA1 Message Date
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 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 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
ash 0d1fc924a3 Merge pull request #3820 from arnav-hiwarkar/fix/3486-fractal-noise-sub-scaling-range
Fractal Noise: Sub Scaling takes After Effects' 10..10000 (CPU and GPU)
2026-11-17 17:19:30 +05:30
ash 6c36ad1e17 Merge pull request #3818 from arnav-hiwarkar/fix/3585-effect-controls-up-down
Effect Controls: Up and Down select the previous and next effect (#3585)
2026-11-17 16:52:09 +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 e60d6ac706 #3486: review: the octave test checks the bound; clearer bound comment
The octave test asserts both values stay within OCTAVE_SCALE_MAX (it
passed with the bound removed). The comment names Perspective Offset as
what multiplies the offset by the depth, and says why an octave at the
bound has no detail.
2026-11-17 16:22:07 +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 14d5866190 #3585: say where the gap revealed above an effect header comes from 2026-11-17 16:17:48 +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 4d318a5347 #3585: scroll the effect Up / Down picks into view
Effect Controls scrolls its list so the header Down / Up selected is in
view, as a long effect stack would otherwise move the selection off
screen. The key handler leaves the effect to reveal for the panel's next
pass, which knows where the header is laid out.
2026-11-17 16:11:18 +05:30
arnav-hiwarkar 9b47fcf92f #3585: Up and Down select the previous and next effect in Effect Controls
With an effect header selected in a focused, on-screen Effect Controls,
plain Down / Up now select the next / previous effect in the stacking
order (After Effects), going on from the lowest / highest selected one
and stopping at the last / first without nudging the layer. It is a
selection change only: no undo step, no document or time change.

The arrows reuse the Left / Right collapse path and now act on the layer
the panel shows, so a locked panel's effects answer to them too.
Modified arrows, hidden panels, text fields, menus, dialogs, viewer text
editing and parameter-only selections keep their existing behaviour.
2026-11-17 16:10:22 +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 d918aa6e13 #3467: Radial Blur Amount takes After Effects' range 0..1000
After Effects records 0..1000 for Radial Blur's Amount (slider 0..100);
EffectCraft's hard range stopped at 100, so prop.set and the value
editors clamped 200 to 100. The hard maximum is now 1000; the slider
range and default are unchanged.

The engine range test covers prop.set at both ends, undo and redo, save
and reopen, and a project saved with the old range. The parameter leaves
the .aep range guard's list of known narrower ranges.
2026-11-17 16:09:29 +05:30
arnav-hiwarkar 8f7896b28a #3486: Fractal / Turbulent Noise: bound octave scales and scaled offsets
Each octave's frequency and Perspective Offset depth are Sub Scaling to
the power of the octave. Above 100 % (After Effects allows 10000) that
reaches 100^±19 at Complexity 20, and Perspective Offset or Turbulence
Factor times the offset overflowed to infinity and drew NaN.

Both stay within 1e20 and its inverse and remain each other's inverse,
so an octave's offset in lattice cells is unchanged; 10..100 never
reaches the bound. The scaled offset stays within 1e36 px, past where
the lattice index saturates. The CPU, fxn_fractal (from fractal_gpu)
and pointwise paths share the bound; one octave_origin replaces the two
copies of the origin code.
2026-11-17 16:07:18 +05:30
arnav-hiwarkar e83be3a08f #3486: Fractal Noise: lattice neighbours wrap past the i32 range
At Sub Scaling 10 % and high Complexity an octave's lattice coordinates
pass the i32 range. The cast saturates, and adding the neighbour offset
overflowed (a panic in debug builds). Wrap it, as the GPU's i32 adds do.
2026-11-17 16:05:40 +05:30
arnav-hiwarkar 9e3cfa639a #3492: test CC Power Pin below -100 % Expansion on CPU and GPU
Below -100 % an Expansion edge crosses the opposite one and the source
rectangle flips. Pin that geometry, check that the extremes (including
a zero-size source and Unstretch) keep the buffer size and render
finite pixels, and compare CPU and GPU at the new minimum.
2026-11-17 16:04:45 +05:30
arnav-hiwarkar cfea5b4bf9 #3492: CC Power Pin Expansion takes After Effects' -200 minimum
Top, Left, Right and Bottom Expansion had a hard range of -100..1000, so
prop.set and the value editors stored -100 for After Effects' valid
-200..-100. The hard minimum is now -200; the 1000 maximum, the default
and the 0..100 slider are unchanged. The engine range table covers both
ends through prop.set, undo/redo, save/reopen and an older project's
stored range, and the four rows leave the aep KNOWN_NARROWER list.
2026-11-17 16:04:44 +05:30
Dylan M. Taylor bb54263240 Merge remote-tracking branch 'origin/main' into refactor/shared-svg-transform 2026-11-17 02:16:32 -05:00
Dylan M. Taylor ed7b40ab4d Merge shared CSS integration while retaining transform compatibility 2026-11-17 00:05:47 -05:00
Dylan M. Taylor 69b4115b36 Merge remote-tracking branch 'origin/main' into refactor/shared-svg-colors 2026-11-17 00:04:44 -05:00
Dylan M. Taylor 9953ca314d svg: consume shared compatibility transform-list parser 2026-11-16 23:22:52 -05:00
Dylan M. Taylor f65ad2a42d Merge current main and retain CSS plus prefix-path shared APIs 2026-11-16 23:10:13 -05:00
Dylan M. Taylor d0cbc53494 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	Cargo.lock
#	Cargo.toml
2026-11-16 23:02:54 -05:00
Dylan M. Taylor 41da144555 Shape operators: cap each expanding operator's output (#2948) 2026-11-16 21:58:09 -05:00
Dylan M. Taylor defa16a26f svg: use shared bounded prefix path parsing (#3800) 2026-11-16 21:58:04 -05:00
Dylan M. Taylor d5755f5dd9 Merge remote-tracking branch 'origin/main' into refactor/shared-svg-colors 2026-11-16 21:49:57 -05:00
Dylan M. Taylor ca5ca106fa Merge remote-tracking branch 'origin/main' into refactor/shared-svg-stylesheet 2026-11-16 21:09:59 -05: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
Dylan M. Taylor 22dbd1612f Merge pull request #3246 from vangel76/waveform-reversed-3238
The Timeline waveform shows what is really heard for reversed layers and the Backwards effect
2026-11-16 20:37:23 -05:00
Dylan M. Taylor a9d53efbb5 svg: route paint colours through shared floating-point compatibility parser 2026-11-16 19:51:35 -05:00
Dylan M. Taylor 3972e5181b svg: delegate stylesheet parsing and matching to craft-svg 2026-11-16 19:38:19 -05:00
vangel76 fa542829e9 #3793: build the OCIO test's expected LUT path from its parts
join("luts/grade.cube") keeps the forward slash on Windows, while the code
resolves the config's LUT as luts\grade.cube, so the test's text lookup in the
read log missed there. The code under test is unchanged.
2026-11-16 22:05:56 +01:00
Dylan M. Taylor e2cbc0861f Merge branch 'main' into refactor/interchange-shared-preflight 2026-11-16 13:15:45 -05:00
Dylan M. Taylor a163fa3fcb Merge pull request #3773 from storytold/refactor/interchange-current-shared-film
interchange: stage current shared Film format dependency cutover
2026-11-16 13:14:50 -05:00
Dylan M. Taylor b6d2598b3f interchange: delegate lexical depth preflight to craft-timeline 2026-11-16 11:27:30 -05:00
Dylan M. Taylor e9d5f37561 test: use valid encoded PCE layout for AAC downmix parity 2026-11-16 11:09:24 -05:00
Dylan M. Taylor b842402a83 interchange: retain EDL guessed-path bounds with current Film metadata 2026-11-16 11:04:56 -05:00
Dylan M. Taylor 9da73e9cf3 psd: delegate ZIP prediction reversal with budgeted scratch 2026-11-16 09:47:19 -05:00
Dylan M. Taylor adb120c327 interchange: update test fixtures and adopt merged shared AAF route 2026-11-16 09:41:59 -05:00
FredApps ed8811d2d8 psd: parse linked files with craft-psd and pin past #1845
Repin only craft-psd to craft-libs main e836b6fd (includes #1845).
lnk2 / lnkD / lnk3 / lnkE records come from craft_psd::smart::linked_files;
payload ranges are shifted from the block back into the document bytes.
is_linked_layer_key is the deferral predicate.

Descriptors, placed objects, and pixel decode stay local until
craft-libs#1887 (parse_prefix) and #1885 (PackBits recovery) are on main.
2026-11-16 14:55:09 +01:00
Dylan M. Taylor cb29f77eaf interchange: adapt export to current Film media and marker APIs 2026-11-16 08:42:06 -05:00
FredApps 4edbd480fb Merge remote-tracking branch 'upstream/main' into onee/i786-psd-writer-craft-psd 2026-11-16 14:20:51 +01:00