Skip to content

EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust

Merge branch 'main' into expr-property-group-1619

Gert Pellin0bdf9ec5e33b
diff --cc crates/expr/src/tests.rs
index 990b6a273,8a4db485b..18b725084
--- a/crates/expr/src/tests.rs
+++ b/crates/expr/src/tests.rs
@@@ -1286,4 -1286,79 +1286,81 @@@ fn layer_control_property_stands_for_it
assert_close!(f.num("effect('Map')(1).value.name == 'B' ? 1 : 0", 0.0), 1.0);
}
+ #[test]
+ fn time_to_frames_rounds_durations_away_from_zero() {
+ let f = fx();
+ // Adobe's public expression reference distinguishes durations from absolute times.
+ // Expected integer counts are literal values, independent of the implementation.
+ for (expression, expected) in [
+ ("timeToFrames(-0.01, 24, true)", -1.0),
+ ("timeToFrames(-0.05, 24, true)", -2.0),
+ ("timeToFrames(0, 24, true)", 0.0),
+ ("timeToFrames(-0.125, 24, true)", -3.0),
+ ("timeToFrames(0.125, 24, true)", 3.0),
+ ("timeToFrames(0.01, 24, true)", 1.0),
+ ("timeToFrames(0.05, 24, true)", 2.0),
+ ] {
+ assert_eq!(f.num(expression, 0.0), expected, "{expression}");
+ }
+ }
+
+ #[test]
+ fn time_to_frames_rounds_absolute_times_toward_negative_infinity() {
+ let f = fx();
+ for (expression, expected) in [
+ ("timeToFrames(-0.01, 24, false)", -1.0),
+ ("timeToFrames(-0.05, 24, false)", -2.0),
+ ("timeToFrames(0, 24, false)", 0.0),
+ ("timeToFrames(-0.125, 24, false)", -3.0),
+ ("timeToFrames(0.125, 24, false)", 3.0),
+ ("timeToFrames(0.01, 24, false)", 0.0),
+ ("timeToFrames(0.05, 24, false)", 1.0),
+ ] {
+ assert_eq!(f.num(expression, 0.0), expected, "{expression}");
+ }
+ }
+
+ #[test]
+ fn time_to_frames_preserves_default_arguments() {
+ let f = fx();
+ // The fixture's composition is 30 fps with displayStartTime = 0.
+ for (expression, evaluation_time, expected) in [
+ ("timeToFrames(0.01, 24)", 0.0, 0.0),
+ ("timeToFrames(-0.01, 24)", 0.0, -1.0),
+ ("timeToFrames(0.05)", 0.0, 1.0),
+ ("timeToFrames(-0.05)", 0.0, -2.0),
+ ("timeToFrames()", 0.0, 0.0),
+ ("timeToFrames()", 0.05, 1.0),
+ ("timeToFrames()", -0.05, -2.0),
+ ("timeToFrames(undefined, 24, true)", 0.05, 2.0),
+ ("timeToFrames(0.05, undefined, true)", 0.0, 2.0),
+ ] {
+ assert_eq!(f.num(expression, evaluation_time), expected, "{expression} at {evaluation_time}s");
+ }
+ }
+
+ #[test]
+ fn time_to_frames_preserves_coercion_and_small_durations() {
+ let f = fx();
+ // Duration rounding must not erase tiny nonzero values; absolute times keep the existing tolerance.
+ for (expression, expected) in [
+ ("timeToFrames('0.05', '24', false)", 1.0),
+ ("timeToFrames('0.05', '24', true)", 2.0),
+ ("timeToFrames('-0.05', '24', true)", -2.0),
+ ("timeToFrames(null, 24, true)", 0.0),
+ ("timeToFrames(0.05, null, true)", 0.0),
+ ("timeToFrames(0.05, 0, true)", 0.0),
+ ("timeToFrames(31 / 24 - 5 / 24, 24, true)", 26.0),
+ ("timeToFrames(5 / 24 - 31 / 24, 24, true)", -26.0),
+ ("timeToFrames(-1e-10, 24, false)", 0.0),
+ ("1 / timeToFrames(-0, 24, true) === Infinity ? 1 : 0", 1.0),
+ ("isNaN(timeToFrames(NaN, 24, true)) ? 1 : 0", 1.0),
+ ("timeToFrames(Infinity, 24, true) === Infinity ? 1 : 0", 1.0),
+ ("timeToFrames(-Infinity, 24, true) === -Infinity ? 1 : 0", 1.0),
+ ("var calls = 0; var t = {valueOf: function () { calls++; return 0.05; }}; timeToFrames(t, 24, true) + 100 * calls", 102.0),
+ ] {
+ assert_eq!(f.num(expression, 0.0), expected, "{expression}");
+ }
+ }
++
+mod property_group;