From 89deb7fac4d4c9114499574417aa34760277aaef Mon Sep 17 00:00:00 2001 From: Tanish Manku Date: Mon, 16 Nov 2026 23:21:59 -0500 Subject: [PATCH 1/3] feat(lottie): expose raw gradient wire values without opacity elision --- ATTRIBUTION.md | 4 ++++ crates/lottie/src/gradient.rs | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md index 9d260300c..21ff5a2f4 100644 --- a/ATTRIBUTION.md +++ b/ATTRIBUTION.md @@ -114,3 +114,7 @@ The XML reader in `crates/plist/src/xml.rs` and its base64 compatibility helper ## GIMP palette reader `crates/palette` extracts the GPL text parser from AniCraft `crates/doc/src/swatch.rs` at `d875a7feb250e6ab06aa28a37fb78a0699e88330` (MIT OR Apache-2.0), introduced by Tanish Manku in `a64130a9da9bdde545463b852d95d6a6774b1dfd` (AniCraft #270). The import preserves Tanish as primary author. Neutral RGB/name adaptation separates application display-name sanitization and the `Untitled` policy; validation tests and integration are subsequent Dylan M. Taylor changes. + +The raw gradient wire ordering in `craft-lottie::Gradient::flat_values` follows +AniCraft's Lottie exporter by Tanish Manku (`63b39355`, `b9258b7b`), MIT OR Apache-2.0. +Sanitization, animation fitting and numeric output policy remain caller-owned. diff --git a/crates/lottie/src/gradient.rs b/crates/lottie/src/gradient.rs index 7edd60025..afb8495fd 100644 --- a/crates/lottie/src/gradient.rs +++ b/crates/lottie/src/gradient.rs @@ -29,6 +29,17 @@ impl Gradient { Some(Self { colors, opacities }) } + /// Raw color groups (`position, r, g, b`), followed by all opacity pairs + /// (`position, alpha`), in input order. No rounding, clamping, or opacity elision. + /// + /// This allocation-free view lets callers fit or interpolate equal-sized animated + /// values before applying their own numeric policy. In particular, opaque alpha + /// stops remain present so an opaque frame can interpolate to a translucent one. + /// Non-finite values are preserved; callers must sanitize them before JSON output. + pub fn flat_values(&self) -> impl Iterator + '_ { + self.colors.iter().flat_map(|(p, [r, g, b])| [*p, *r, *g, *b]).chain(self.opacities.iter().flat_map(|(p, a)| [*p, *a])) + } + /// The flat list, rounded to six decimals. The alpha pairs are left out when every stop is /// opaque. pub fn to_flat(&self) -> Json { @@ -44,3 +55,4 @@ impl Gradient { json!(out) } } + From c2ae800d87ff5a6266c2e0818ee7a18d72f97e25 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 16 Nov 2026 23:21:59 -0500 Subject: [PATCH 2/3] test(lottie): preserve raw gradient precision and alpha topology --- crates/lottie/src/gradient.rs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/crates/lottie/src/gradient.rs b/crates/lottie/src/gradient.rs index afb8495fd..0c9a9608f 100644 --- a/crates/lottie/src/gradient.rs +++ b/crates/lottie/src/gradient.rs @@ -56,3 +56,24 @@ impl Gradient { } } +#[cfg(test)] +mod raw_tests { + use super::*; + + #[test] + fn raw_values_keep_order_precision_and_opaque_alpha() { + let g = Gradient { colors: vec![(0.123456789, [0.2, 0.3, 0.4]), (1.0, [0.5, 0.6, 0.7])], opacities: vec![(0.0, 1.0), (1.0, 1.0)] }; + assert_eq!(g.flat_values().collect::>(), vec![0.123456789, 0.2, 0.3, 0.4, 1.0, 0.5, 0.6, 0.7, 0.0, 1.0, 1.0, 1.0]); + assert_eq!(g.to_flat(), json!([0.123457, 0.2, 0.3, 0.4, 1.0, 0.5, 0.6, 0.7])); + } + + #[test] + fn raw_values_keep_nonfinite_signed_zero_and_unpaired_lists() { + let g = Gradient { colors: vec![], opacities: vec![(-0.0, f64::NAN), (f64::INFINITY, f64::NEG_INFINITY)] }; + let bits: Vec<_> = g.flat_values().map(f64::to_bits).collect(); + assert_eq!(bits, [-0.0, f64::NAN, f64::INFINITY, f64::NEG_INFINITY].map(f64::to_bits)); + assert_eq!(Gradient::default().flat_values().count(), 0); + let g = Gradient { colors: vec![(1e303, [1.0, 0.0, 0.0])], opacities: vec![] }; + assert_eq!(g.flat_values().collect::>(), [1e303, 1.0, 0.0, 0.0]); + } +} From 6181ae557fdf27cdf63052c6db5d21a7d31a0010 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 16 Nov 2026 23:26:35 -0500 Subject: [PATCH 3/3] feat(lottie): flatten borrowed gradient stops without temporary buffers --- crates/lottie/src/gradient.rs | 14 +++++++++++++- crates/lottie/src/lib.rs | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/crates/lottie/src/gradient.rs b/crates/lottie/src/gradient.rs index 0c9a9608f..a3dff7314 100644 --- a/crates/lottie/src/gradient.rs +++ b/crates/lottie/src/gradient.rs @@ -4,6 +4,18 @@ use serde_json::json; use crate::{Json, nums, round6}; +/// Raw gradient wire values from borrowed or mapped stops, without intermediate allocation. +/// +/// Yields color groups (`position, r, g, b`) then every opacity pair (`position, alpha`). +/// Input order and all values, including non-finite values and opaque alpha, are preserved. +/// Sanitization, rounding, and input/output size budgets remain the caller's responsibility. +pub fn flat_gradient_values( + colors: impl IntoIterator, + opacities: impl IntoIterator, +) -> impl Iterator { + colors.into_iter().flat_map(|(p, [r, g, b])| [p, r, g, b]).chain(opacities.into_iter().flat_map(|(p, a)| [p, a])) +} + /// A gradient: colour stops and opacity stops, each at a position in 0..=1. #[derive(Debug, Clone, Default, PartialEq)] pub struct Gradient { @@ -37,7 +49,7 @@ impl Gradient { /// stops remain present so an opaque frame can interpolate to a translucent one. /// Non-finite values are preserved; callers must sanitize them before JSON output. pub fn flat_values(&self) -> impl Iterator + '_ { - self.colors.iter().flat_map(|(p, [r, g, b])| [*p, *r, *g, *b]).chain(self.opacities.iter().flat_map(|(p, a)| [*p, *a])) + flat_gradient_values(self.colors.iter().copied(), self.opacities.iter().copied()) } /// The flat list, rounded to six decimals. The alpha pairs are left out when every stop is diff --git a/crates/lottie/src/lib.rs b/crates/lottie/src/lib.rs index 16c1c6e07..578939d6b 100644 --- a/crates/lottie/src/lib.rs +++ b/crates/lottie/src/lib.rs @@ -30,7 +30,7 @@ mod prop; mod value; pub mod zip; -pub use gradient::Gradient; +pub use gradient::{Gradient, flat_gradient_values}; pub use model::{Animated, Animation, Layer, LayerContent, Limits, Shape, ShapeKind}; pub use path::Bezier; pub use prop::{Ease, Key, KeyOut, Prop, PropValue, Tangents, is_animated, read_prop, tangent, write_keys, write_prop};