Skip to main content

token_value_map/
value.rs

1use crate::*;
2use core::num::NonZeroU16;
3use std::hash::{Hash, Hasher};
4
5/// Type alias for bracket sampling return type.
6type BracketSample = (Option<(Time, Data)>, Option<(Time, Data)>);
7
8/// A value that can be either uniform or animated over time.
9///
10/// A [`Value`] contains either a single [`Data`] value that remains constant
11/// (uniform) or [`AnimatedData`] that changes over time with interpolation.
12#[derive(Clone, Debug, PartialEq, Hash)]
13#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
14#[cfg_attr(feature = "facet", derive(Facet))]
15#[cfg_attr(feature = "facet", facet(opaque))]
16#[cfg_attr(feature = "facet", repr(u8))]
17#[cfg_attr(feature = "rkyv", derive(Archive, RkyvSerialize, RkyvDeserialize))]
18pub enum Value {
19    /// A constant value that does not change over time.
20    Uniform(Data),
21    /// A value that changes over time with keyframe interpolation.
22    Animated(AnimatedData),
23}
24
25impl Value {
26    /// Create a uniform value that does not change over time.
27    pub fn uniform<V: Into<Data>>(value: V) -> Self {
28        Value::Uniform(value.into())
29    }
30
31    /// Create an animated value from time-value pairs.
32    ///
33    /// All samples must have the same data type. Vector samples are padded
34    /// to match the length of the longest vector in the set.
35    pub fn animated<I, V>(samples: I) -> Result<Self>
36    where
37        I: IntoIterator<Item = (Time, V)>,
38        V: Into<Data>,
39    {
40        let mut samples_vec: Vec<(Time, Data)> =
41            samples.into_iter().map(|(t, v)| (t, v.into())).collect();
42
43        if samples_vec.is_empty() {
44            return Err(Error::EmptySamples);
45        }
46
47        // Get the data type from the first sample
48        let data_type = samples_vec[0].1.data_type();
49
50        // Check all samples have the same type and handle length consistency
51        let mut expected_len: Option<usize> = None;
52        for (time, value) in &mut samples_vec {
53            if value.data_type() != data_type {
54                return Err(Error::AnimatedTypeMismatch {
55                    expected: data_type,
56                    got: value.data_type(),
57                    time: *time,
58                });
59            }
60
61            // Check vector length consistency
62            if let Some(vec_len) = value.try_len() {
63                match expected_len {
64                    None => expected_len = Some(vec_len),
65                    Some(expected) => {
66                        if vec_len > expected {
67                            return Err(Error::VectorLengthExceeded {
68                                actual: vec_len,
69                                expected,
70                                time: *time,
71                            });
72                        } else if vec_len < expected {
73                            // Pad to expected length
74                            value.pad_to_length(expected);
75                        }
76                    }
77                }
78            }
79        }
80
81        // Create the appropriate AnimatedData variant by extracting the
82        // specific data type
83
84        let animated_data = match data_type {
85            DataType::Boolean => {
86                let typed_samples: Vec<(Time, Boolean)> = samples_vec
87                    .into_iter()
88                    .map(|(t, data)| match data {
89                        Data::Boolean(v) => (t, v),
90                        _ => unreachable!("Type validation should have caught this"),
91                    })
92                    .collect();
93                AnimatedData::Boolean(TimeDataMap::from_iter(typed_samples))
94            }
95            DataType::Integer => {
96                let typed_samples: Vec<(Time, Integer)> = samples_vec
97                    .into_iter()
98                    .map(|(t, data)| match data {
99                        Data::Integer(v) => (t, v),
100                        _ => unreachable!("Type validation should have caught this"),
101                    })
102                    .collect();
103                AnimatedData::Integer(TimeDataMap::from_iter(typed_samples))
104            }
105            DataType::Real => {
106                let typed_samples: Vec<(Time, Real)> = samples_vec
107                    .into_iter()
108                    .map(|(t, data)| match data {
109                        Data::Real(v) => (t, v),
110                        _ => unreachable!("Type validation should have caught this"),
111                    })
112                    .collect();
113                AnimatedData::Real(TimeDataMap::from_iter(typed_samples))
114            }
115            DataType::String => {
116                let typed_samples: Vec<(Time, String)> = samples_vec
117                    .into_iter()
118                    .map(|(t, data)| match data {
119                        Data::String(v) => (t, v),
120                        _ => unreachable!("Type validation should have caught this"),
121                    })
122                    .collect();
123                AnimatedData::String(TimeDataMap::from_iter(typed_samples))
124            }
125            DataType::Color => {
126                let typed_samples: Vec<(Time, Color)> = samples_vec
127                    .into_iter()
128                    .map(|(t, data)| match data {
129                        Data::Color(v) => (t, v),
130                        _ => unreachable!("Type validation should have caught this"),
131                    })
132                    .collect();
133                AnimatedData::Color(TimeDataMap::from_iter(typed_samples))
134            }
135            #[cfg(feature = "vector2")]
136            DataType::Vector2 => {
137                let typed_samples: Vec<(Time, Vector2)> = samples_vec
138                    .into_iter()
139                    .map(|(t, data)| match data {
140                        Data::Vector2(v) => (t, v),
141                        _ => unreachable!("Type validation should have caught this"),
142                    })
143                    .collect();
144                AnimatedData::Vector2(TimeDataMap::from_iter(typed_samples))
145            }
146            #[cfg(feature = "vector3")]
147            DataType::Vector3 => {
148                let typed_samples: Vec<(Time, Vector3)> = samples_vec
149                    .into_iter()
150                    .map(|(t, data)| match data {
151                        Data::Vector3(v) => (t, v),
152                        _ => unreachable!("Type validation should have caught this"),
153                    })
154                    .collect();
155                AnimatedData::Vector3(TimeDataMap::from_iter(typed_samples))
156            }
157            #[cfg(feature = "matrix3")]
158            DataType::Matrix3 => {
159                let typed_samples: Vec<(Time, Matrix3)> = samples_vec
160                    .into_iter()
161                    .map(|(t, data)| match data {
162                        Data::Matrix3(v) => (t, v),
163                        _ => unreachable!("Type validation should have caught this"),
164                    })
165                    .collect();
166                AnimatedData::Matrix3(TimeDataMap::from_iter(typed_samples))
167            }
168            #[cfg(feature = "normal3")]
169            DataType::Normal3 => {
170                let typed_samples: Vec<(Time, Normal3)> = samples_vec
171                    .into_iter()
172                    .map(|(t, data)| match data {
173                        Data::Normal3(v) => (t, v),
174                        _ => unreachable!("Type validation should have caught this"),
175                    })
176                    .collect();
177                AnimatedData::Normal3(TimeDataMap::from_iter(typed_samples))
178            }
179            #[cfg(feature = "point3")]
180            DataType::Point3 => {
181                let typed_samples: Vec<(Time, Point3)> = samples_vec
182                    .into_iter()
183                    .map(|(t, data)| match data {
184                        Data::Point3(v) => (t, v),
185                        _ => unreachable!("Type validation should have caught this"),
186                    })
187                    .collect();
188                AnimatedData::Point3(TimeDataMap::from_iter(typed_samples))
189            }
190            #[cfg(feature = "matrix4")]
191            DataType::Matrix4 => {
192                let typed_samples: Vec<(Time, Matrix4)> = samples_vec
193                    .into_iter()
194                    .map(|(t, data)| match data {
195                        Data::Matrix4(v) => (t, v),
196                        _ => unreachable!("Type validation should have caught this"),
197                    })
198                    .collect();
199                AnimatedData::Matrix4(TimeDataMap::from_iter(typed_samples))
200            }
201            DataType::BooleanVec => {
202                let typed_samples: Vec<(Time, BooleanVec)> = samples_vec
203                    .into_iter()
204                    .map(|(t, data)| match data {
205                        Data::BooleanVec(v) => (t, v),
206                        _ => unreachable!("Type validation should have caught this"),
207                    })
208                    .collect();
209                AnimatedData::BooleanVec(TimeDataMap::from_iter(typed_samples))
210            }
211            DataType::IntegerVec => {
212                let typed_samples: Vec<(Time, IntegerVec)> = samples_vec
213                    .into_iter()
214                    .map(|(t, data)| match data {
215                        Data::IntegerVec(v) => (t, v),
216                        _ => unreachable!("Type validation should have caught this"),
217                    })
218                    .collect();
219                AnimatedData::IntegerVec(TimeDataMap::from_iter(typed_samples))
220            }
221            DataType::RealVec => {
222                let typed_samples: Vec<(Time, RealVec)> = samples_vec
223                    .into_iter()
224                    .map(|(t, data)| match data {
225                        Data::RealVec(v) => (t, v),
226                        _ => unreachable!("Type validation should have caught this"),
227                    })
228                    .collect();
229                AnimatedData::RealVec(TimeDataMap::from_iter(typed_samples))
230            }
231            DataType::ColorVec => {
232                let typed_samples: Vec<(Time, ColorVec)> = samples_vec
233                    .into_iter()
234                    .map(|(t, data)| match data {
235                        Data::ColorVec(v) => (t, v),
236                        _ => unreachable!("Type validation should have caught this"),
237                    })
238                    .collect();
239                AnimatedData::ColorVec(TimeDataMap::from_iter(typed_samples))
240            }
241            DataType::StringVec => {
242                let typed_samples: Vec<(Time, StringVec)> = samples_vec
243                    .into_iter()
244                    .map(|(t, data)| match data {
245                        Data::StringVec(v) => (t, v),
246                        _ => unreachable!("Type validation should have caught this"),
247                    })
248                    .collect();
249                AnimatedData::StringVec(TimeDataMap::from_iter(typed_samples))
250            }
251            #[cfg(all(feature = "vector2", feature = "vec_variants"))]
252            DataType::Vector2Vec => {
253                let typed_samples: Vec<(Time, Vector2Vec)> = samples_vec
254                    .into_iter()
255                    .map(|(t, data)| match data {
256                        Data::Vector2Vec(v) => (t, v),
257                        _ => unreachable!("Type validation should have caught this"),
258                    })
259                    .collect();
260                AnimatedData::Vector2Vec(TimeDataMap::from_iter(typed_samples))
261            }
262            #[cfg(all(feature = "vector3", feature = "vec_variants"))]
263            DataType::Vector3Vec => {
264                let typed_samples: Vec<(Time, Vector3Vec)> = samples_vec
265                    .into_iter()
266                    .map(|(t, data)| match data {
267                        Data::Vector3Vec(v) => (t, v),
268                        _ => unreachable!("Type validation should have caught this"),
269                    })
270                    .collect();
271                AnimatedData::Vector3Vec(TimeDataMap::from_iter(typed_samples))
272            }
273            #[cfg(all(feature = "matrix3", feature = "vec_variants"))]
274            DataType::Matrix3Vec => {
275                let typed_samples: Vec<(Time, Matrix3Vec)> = samples_vec
276                    .into_iter()
277                    .map(|(t, data)| match data {
278                        Data::Matrix3Vec(v) => (t, v),
279                        _ => unreachable!("Type validation should have caught this"),
280                    })
281                    .collect();
282                AnimatedData::Matrix3Vec(TimeDataMap::from_iter(typed_samples))
283            }
284            #[cfg(all(feature = "normal3", feature = "vec_variants"))]
285            DataType::Normal3Vec => {
286                let typed_samples: Vec<(Time, Normal3Vec)> = samples_vec
287                    .into_iter()
288                    .map(|(t, data)| match data {
289                        Data::Normal3Vec(v) => (t, v),
290                        _ => unreachable!("Type validation should have caught this"),
291                    })
292                    .collect();
293                AnimatedData::Normal3Vec(TimeDataMap::from_iter(typed_samples))
294            }
295            #[cfg(all(feature = "point3", feature = "vec_variants"))]
296            DataType::Point3Vec => {
297                let typed_samples: Vec<(Time, Point3Vec)> = samples_vec
298                    .into_iter()
299                    .map(|(t, data)| match data {
300                        Data::Point3Vec(v) => (t, v),
301                        _ => unreachable!("Type validation should have caught this"),
302                    })
303                    .collect();
304                AnimatedData::Point3Vec(TimeDataMap::from_iter(typed_samples))
305            }
306            #[cfg(all(feature = "matrix4", feature = "vec_variants"))]
307            DataType::Matrix4Vec => {
308                let typed_samples: Vec<(Time, Matrix4Vec)> = samples_vec
309                    .into_iter()
310                    .map(|(t, data)| match data {
311                        Data::Matrix4Vec(v) => (t, v),
312                        _ => unreachable!("Type validation should have caught this"),
313                    })
314                    .collect();
315                AnimatedData::Matrix4Vec(TimeDataMap::from_iter(typed_samples))
316            }
317        };
318
319        Ok(Value::Animated(animated_data))
320    }
321
322    /// Add a sample at a specific time, checking length constraints
323    pub fn add_sample<V: Into<Data>>(&mut self, time: Time, val: V) -> Result<()> {
324        let value = val.into();
325
326        match self {
327            Value::Uniform(_uniform_value) => {
328                // Switch to animated and drop/ignore the existing uniform
329                // content Create a new animated value with only
330                // the new sample
331                *self = Value::animated(vec![(time, value)])?;
332                Ok(())
333            }
334            Value::Animated(samples) => {
335                let data_type = samples.data_type();
336                if value.data_type() != data_type {
337                    return Err(Error::SampleTypeMismatch {
338                        expected: data_type,
339                        got: value.data_type(),
340                    });
341                }
342
343                // Insert the value using the generic insert method
344                samples.try_insert(time, value)
345            }
346        }
347    }
348
349    /// Remove a sample at a specific time.
350    ///
351    /// Returns the removed value if it existed. For uniform values, this is a
352    /// no-op and returns `None`. If the last sample is removed from an
353    /// animated value, the value remains animated but empty.
354    pub fn remove_sample(&mut self, time: &Time) -> Option<Data> {
355        match self {
356            Value::Uniform(_) => None,
357            Value::Animated(samples) => samples.remove_at(time),
358        }
359    }
360
361    /// Sample value at exact time without interpolation.
362    ///
363    /// Returns the exact value if it exists at the given time, or `None` if
364    /// no sample exists at that time for animated values.
365    pub fn sample_at(&self, time: Time) -> Option<Data> {
366        match self {
367            Value::Uniform(v) => Some(v.clone()),
368            Value::Animated(samples) => samples.sample_at(time),
369        }
370    }
371
372    /// Get the value at or before the given time
373    pub fn sample_at_or_before(&self, time: Time) -> Option<Data> {
374        match self {
375            Value::Uniform(v) => Some(v.clone()),
376            Value::Animated(_samples) => {
377                // For now, use interpolation at the exact time
378                // TODO: Implement proper at-or-before sampling in AnimatedData
379                Some(self.interpolate(time))
380            }
381        }
382    }
383
384    /// Get the value at or after the given time
385    pub fn sample_at_or_after(&self, time: Time) -> Option<Data> {
386        match self {
387            Value::Uniform(v) => Some(v.clone()),
388            Value::Animated(_samples) => {
389                // For now, use interpolation at the exact time
390                // TODO: Implement proper at-or-after sampling in AnimatedData
391                Some(self.interpolate(time))
392            }
393        }
394    }
395
396    /// Interpolate value at the given time.
397    ///
398    /// For uniform values, returns the constant value. For animated values,
399    /// interpolates between surrounding keyframes using appropriate
400    /// interpolation methods (linear, quadratic, or hermite).
401    pub fn interpolate(&self, time: Time) -> Data {
402        match self {
403            Value::Uniform(v) => v.clone(),
404            Value::Animated(samples) => samples.interpolate(time),
405        }
406    }
407
408    /// Get surrounding samples for interpolation.
409    pub fn sample_surrounding<const N: usize>(&self, time: Time) -> SmallVec<[(Time, Data); N]> {
410        let mut result = SmallVec::<[(Time, Data); N]>::new_const();
411        match self {
412            Value::Uniform(v) => result.push((time, v.clone())),
413            Value::Animated(_samples) => {
414                // TODO: Implement proper surrounding sample collection for
415                // AnimatedData For now, just return the
416                // interpolated value at the given time
417                let value = self.interpolate(time);
418                result.push((time, value));
419            }
420        }
421        result
422    }
423
424    /// Get the two samples surrounding a time for linear interpolation
425    pub fn sample_bracket(&self, time: Time) -> BracketSample {
426        match self {
427            Value::Uniform(v) => (Some((time, v.clone())), None),
428            Value::Animated(_samples) => {
429                // TODO: Implement proper bracketing for AnimatedData
430                // For now, just return the interpolated value at the given time
431                let value = self.interpolate(time);
432                (Some((time, value)), None)
433            }
434        }
435    }
436
437    /// Check if the value is animated.
438    pub fn is_animated(&self) -> bool {
439        match self {
440            Value::Uniform(_) => false,
441            Value::Animated(samples) => samples.is_animated(),
442        }
443    }
444
445    /// Get the number of time samples.
446    pub fn sample_count(&self) -> usize {
447        match self {
448            Value::Uniform(_) => 1,
449            Value::Animated(samples) => samples.len(),
450        }
451    }
452
453    /// Get all time samples.
454    pub fn times(&self) -> SmallVec<[Time; 10]> {
455        match self {
456            Value::Uniform(_) => SmallVec::<[Time; 10]>::new_const(),
457            Value::Animated(samples) => samples.times(),
458        }
459    }
460
461    /// Get bezier handles at a given time.
462    ///
463    /// Returns None for uniform values or non-scalar types.
464    #[cfg(all(feature = "interpolation", feature = "egui-keyframe"))]
465    pub fn bezier_handles(&self, time: &Time) -> Option<egui_keyframe::BezierHandles> {
466        match self {
467            Value::Uniform(_) => None,
468            Value::Animated(samples) => samples.bezier_handles(time),
469        }
470    }
471
472    /// Set bezier handles at a given time.
473    ///
474    /// Returns an error for uniform values or non-scalar types.
475    #[cfg(all(feature = "interpolation", feature = "egui-keyframe"))]
476    pub fn set_bezier_handles(
477        &mut self,
478        time: &Time,
479        handles: egui_keyframe::BezierHandles,
480    ) -> Result<()> {
481        match self {
482            Value::Uniform(_) => Err(Error::InterpolationOnUniform),
483            Value::Animated(samples) => samples.set_bezier_handles(time, handles),
484        }
485    }
486
487    /// Set the interpolation type at a given time.
488    ///
489    /// Returns an error for uniform values or non-scalar types.
490    #[cfg(all(feature = "interpolation", feature = "egui-keyframe"))]
491    pub fn set_keyframe_type(
492        &mut self,
493        time: &Time,
494        keyframe_type: egui_keyframe::KeyframeType,
495    ) -> Result<()> {
496        match self {
497            Value::Uniform(_) => Err(Error::InterpolationOnUniform),
498            Value::Animated(samples) => samples.set_keyframe_type(time, keyframe_type),
499        }
500    }
501
502    /// Merge this value with another using a combiner function.
503    ///
504    /// For uniform values, applies the combiner once.
505    /// For animated values, samples both at the union of all keyframe times
506    /// and applies the combiner at each time.
507    ///
508    /// # Example
509    /// ```ignore
510    /// // Multiply two matrices
511    /// let result = matrix1.merge_with(&matrix2, |a, b| {
512    ///     match (a, b) {
513    ///         (Data::Matrix3(m1), Data::Matrix3(m2)) => {
514    ///             Data::Matrix3(Matrix3(m1.0 * m2.0))
515    ///         }
516    ///         _ => a, // fallback
517    ///     }
518    /// })?;
519    /// ```
520    pub fn merge_with<F>(&self, other: &Value, combiner: F) -> Result<Value>
521    where
522        F: Fn(&Data, &Data) -> Data,
523    {
524        match (self, other) {
525            // Both uniform: simple case
526            (Value::Uniform(a), Value::Uniform(b)) => Ok(Value::Uniform(combiner(a, b))),
527
528            // One or both animated: need to sample at union of times
529            _ => {
530                // Collect all unique times from both values
531                let mut all_times = std::collections::BTreeSet::new();
532
533                // Add times from self
534                for t in self.times() {
535                    all_times.insert(t);
536                }
537
538                // Add times from other
539                for t in other.times() {
540                    all_times.insert(t);
541                }
542
543                // If no times found (both were uniform with no times), sample at default
544                if all_times.is_empty() {
545                    let a = self.interpolate(Time::default());
546                    let b = other.interpolate(Time::default());
547                    return Ok(Value::Uniform(combiner(&a, &b)));
548                }
549
550                // Sample both values at all times and combine
551                let mut combined_samples = Vec::new();
552                for time in all_times {
553                    let a = self.interpolate(time);
554                    let b = other.interpolate(time);
555                    let combined = combiner(&a, &b);
556                    combined_samples.push((time, combined));
557                }
558
559                // If only one sample, return as uniform
560                if combined_samples.len() == 1 {
561                    Ok(Value::Uniform(combined_samples[0].1.clone()))
562                } else {
563                    // Create animated value from combined samples
564                    Value::animated(combined_samples)
565                }
566            }
567        }
568    }
569}
570
571// From implementations for Value
572impl<V: Into<Data>> From<V> for Value {
573    fn from(value: V) -> Self {
574        Value::uniform(value)
575    }
576}
577
578// Sample trait implementations for Value using macro
579#[cfg(feature = "vector2")]
580impl_sample_for_value!(Vector2, Vector2);
581#[cfg(feature = "vector3")]
582impl_sample_for_value!(Vector3, Vector3);
583impl_sample_for_value!(Color, Color);
584#[cfg(feature = "matrix3")]
585impl_sample_for_value!(Matrix3, Matrix3);
586#[cfg(feature = "normal3")]
587impl_sample_for_value!(Normal3, Normal3);
588#[cfg(feature = "point3")]
589impl_sample_for_value!(Point3, Point3);
590#[cfg(feature = "matrix4")]
591impl_sample_for_value!(Matrix4, Matrix4);
592
593// Special implementations for Real and Integer that handle type conversion
594impl Sample<Real> for Value {
595    fn sample(&self, shutter: &Shutter, samples: NonZeroU16) -> Result<Vec<(Real, SampleWeight)>> {
596        match self {
597            Value::Uniform(data) => {
598                let value = Real(data.to_f32()? as f64);
599                Ok(vec![(value, 1.0)])
600            }
601            Value::Animated(animated_data) => animated_data.sample(shutter, samples),
602        }
603    }
604}
605
606impl Sample<Integer> for Value {
607    fn sample(
608        &self,
609        shutter: &Shutter,
610        samples: NonZeroU16,
611    ) -> Result<Vec<(Integer, SampleWeight)>> {
612        match self {
613            Value::Uniform(data) => {
614                let value = Integer(data.to_i64()?);
615                Ok(vec![(value, 1.0)])
616            }
617            Value::Animated(animated_data) => animated_data.sample(shutter, samples),
618        }
619    }
620}
621
622// Manual Eq implementation for Value
623// This is safe because we handle floating point comparison deterministically
624impl Eq for Value {}
625
626impl Value {
627    /// Hash the value with shutter context for animation-aware caching.
628    ///
629    /// For animated values, this samples at standardized points within the shutter
630    /// range and hashes the interpolated values rather than raw keyframes.
631    /// This provides better cache coherency for animations with different absolute
632    /// times but identical interpolated values.
633    pub fn hash_with_shutter<H: Hasher>(&self, state: &mut H, shutter: &Shutter) {
634        match self {
635            Value::Uniform(data) => {
636                // For uniform values, just use regular hashing.
637                data.hash(state);
638            }
639            Value::Animated(animated) => {
640                // For animated values, sample at standardized points.
641                animated.hash_with_shutter(state, shutter);
642            }
643        }
644    }
645}
646
647#[cfg(test)]
648mod tests {
649    use super::*;
650
651    #[cfg(feature = "matrix3")]
652    #[test]
653    fn test_matrix_merge_uniform() {
654        // Create two uniform matrices
655        let m1 = crate::math::mat3_from_row_slice(&[2.0, 0.0, 0.0, 0.0, 2.0, 0.0, 0.0, 0.0, 1.0]); // Scale by 2
656        let m2 = crate::math::mat3_from_row_slice(&[1.0, 0.0, 10.0, 0.0, 1.0, 20.0, 0.0, 0.0, 1.0]); // Translate by (10, 20)
657
658        let v1 = Value::uniform(m1);
659        let v2 = Value::uniform(m2);
660
661        // Merge them with multiplication
662        let result = v1
663            .merge_with(&v2, |a, b| match (a, b) {
664                (Data::Matrix3(ma), Data::Matrix3(mb)) => Data::Matrix3(ma.clone() * mb.clone()),
665                _ => a.clone(),
666            })
667            .unwrap();
668
669        // Check result is uniform
670        if let Value::Uniform(Data::Matrix3(result_matrix)) = result {
671            let expected = m1 * m2;
672            assert_eq!(result_matrix.0, expected);
673        } else {
674            panic!("Expected uniform result");
675        }
676    }
677
678    #[cfg(feature = "matrix3")]
679    #[test]
680    fn test_matrix_merge_animated() {
681        use frame_tick::Tick;
682
683        // Create first animated matrix (rotation)
684        let m1_t0 =
685            crate::math::mat3_from_row_slice(&[1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0]); // Identity
686        let m1_t10 =
687            crate::math::mat3_from_row_slice(&[0.0, -1.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0]); // 90 degree rotation
688
689        let v1 = Value::animated([
690            (Tick::from_secs(0.0), m1_t0),
691            (Tick::from_secs(10.0), m1_t10),
692        ])
693        .unwrap();
694
695        // Create second animated matrix (scale)
696        let m2_t5 =
697            crate::math::mat3_from_row_slice(&[2.0, 0.0, 0.0, 0.0, 2.0, 0.0, 0.0, 0.0, 1.0]);
698        let m2_t15 =
699            crate::math::mat3_from_row_slice(&[3.0, 0.0, 0.0, 0.0, 3.0, 0.0, 0.0, 0.0, 1.0]);
700
701        let v2 = Value::animated([
702            (Tick::from_secs(5.0), m2_t5),
703            (Tick::from_secs(15.0), m2_t15),
704        ])
705        .unwrap();
706
707        // Merge them
708        let result = v1
709            .merge_with(&v2, |a, b| match (a, b) {
710                (Data::Matrix3(ma), Data::Matrix3(mb)) => Data::Matrix3(ma.clone() * mb.clone()),
711                _ => a.clone(),
712            })
713            .unwrap();
714
715        // Check that result is animated with samples at t=0, 5, 10, 15
716        if let Value::Animated(animated) = result {
717            let times = animated.times();
718            assert_eq!(times.len(), 4);
719            assert!(times.contains(&Tick::from_secs(0.0)));
720            assert!(times.contains(&Tick::from_secs(5.0)));
721            assert!(times.contains(&Tick::from_secs(10.0)));
722            assert!(times.contains(&Tick::from_secs(15.0)));
723        } else {
724            panic!("Expected animated result");
725        }
726    }
727}