Skip to content

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

Merge pull request #1172 from redonion23/fix/815-stroke-dash-matchnames

Brandon Thomasee682bbfd9a2
diff --cc crates/script/src/tests.rs
index 3be473b6d,a4930f470..bfffdee59
--- a/crates/script/src/tests.rs
+++ b/crates/script/src/tests.rs
@@@ -910,24 -828,37 +910,55 @@@ fn script_remove_keys_batches_a_range_a
assert!(invalid.error.is_some());
}
+/// #814: one key is looked up without serialising the whole list (removeKey on a property with
+/// thousands of keys was linear in the key count), and the key calls behave as before.
+#[test]
+fn script_key_lookup_fetches_only_that_key() {
+ let mut s = session();
+ let o = ok(
+ &mut s,
+ "var c = app.project.items.addComp('Keys', 100, 100, 1, 100, 25); var p = c.layers.addNull().transform.rotation;\
+ var ts = [], vs = []; for (var i = 0; i < 2000; i++) { ts.push(i / 25); vs.push(i); } p.setValuesAtTimes(ts, vs);\
+ var q = { comp: p.__layer.__comp, layer: p.__layer.__id, uid: p.__uid };\
+ q.index = 2; var one = __get('keys', q); q.index = 2000; var none = __get('keys', q);\
+ p.removeKey(p.numKeys); p.removeKey(1);\
+ var err = ''; try { p.keyTime(1999); } catch (e) { err = e.message; }\
+ [one.count, one.key.time, none.key, p.numKeys, p.keyTime(1), p.keyValue(1998), err]",
+ );
+ assert_eq!(o.result, json!([2000, 0.08, null, 1998, 0.04, 1998, "keyIndex 1999 is out of range 1..1998"]));
+}
+
+ /// #815: a stroke's Dashes use After Effects' match names, and addProperty with them returns
+ /// Dash 1 / Gap 1 / Offset or adds the Dash 2 / Gap 2 pair.
+ #[test]
+ fn script_stroke_dashes_use_after_effects_match_names() {
+ let mut s = session();
+ let o = ok(
+ &mut s,
+ "function names(g) { var a = []; for (var i = 1; i <= g.numProperties; i++) a.push(g.property(i).matchName); return a.join(','); }\
+ var comp = app.project.items.addComp('Names', 100, 100, 1, 10, 25);\
+ var contents = comp.layers.addShape().property('ADBE Root Vectors Group'); contents.addProperty('ADBE Vector Shape - Rect');\
+ var d = contents.addProperty('ADBE Vector Graphic - Stroke').property('ADBE Vector Stroke Dashes');\
+ var before = names(d);\
+ var dash1 = d.addProperty('ADBE Vector Stroke Dash 1'); dash1.setValue(12);\
+ var gap2 = d.addProperty('ADBE Vector Stroke Gap 2');\
+ var err = ''; try { d.addProperty('ADBE Vector Stroke Dash 9'); } catch (e) { err = e.message; }\
+ [before, dash1.matchName, d.property('ADBE Vector Stroke Dash 1').value, d.property('ADBE Vector Stroke Offset').matchName, gap2.matchName, names(d), err]",
+ );
+ assert_eq!(
+ o.result,
+ json!([
+ "ADBE Vector Stroke Dash 1,ADBE Vector Stroke Gap 1,ADBE Vector Stroke Offset",
+ "ADBE Vector Stroke Dash 1",
+ 12,
+ "ADBE Vector Stroke Offset",
+ "ADBE Vector Stroke Gap 2",
+ "ADBE Vector Stroke Dash 1,ADBE Vector Stroke Gap 1,ADBE Vector Stroke Dash 2,ADBE Vector Stroke Gap 2,ADBE Vector Stroke Offset",
+ "Can not add \"ADBE Vector Stroke Dash 9\" to Dashes"
+ ])
+ );
+ }
+
#[test]
fn script_layer_comment_and_unnamed_marker_params_round_trip() {
let mut s = session();