Merge pull request #15 from SergioRibera/text_sections_color

fix #10 - Inconsistent color definition

examples/custom_skip.rs

@@ -131,10 +131,7 @@ fn create_scene(mut cmd: Commands, assets: ResMut<AssetServer>) {
                     Tween::new(
                         EaseFunction::QuadraticInOut,
                         Duration::from_secs(3),
-                        SplashTextColorLens {
-                            start: Color::WHITE,
-                            end: Color::WHITE.with_a(0.),
-                        },
+                        SplashTextColorLens::new(vec![Color::WHITE]),
                     )
                     .with_repeat_count(RepeatCount::Infinite)
                     .with_repeat_strategy(RepeatStrategy::MirroredRepeat),

examples/simple.rs

@@ -43,7 +43,7 @@ fn main() {
                                         "Sergio Ribera",
                                         TextStyle {
                                             font_size: 32.,
-                                            color: Color::WHITE,
+                                            color: Color::BLUE,
                                             ..default()
                                         },
                                     ),

src/lens.rs

@@ -13,29 +13,31 @@ pub struct SplashImageColorLens {
     pub end: Color,
 }
 
-#[derive(Debug, Copy, Clone, PartialEq)]
-pub struct SplashTextColorLens {
-    /// Start color.
-    pub start: Color,
-    /// End color.
-    pub end: Color,
-}
+#[derive(Debug, Clone, PartialEq)]
+/// Lens for interpolating Bevy Text sections. The single parameter is a reference to the color of each section.
+pub struct SplashTextColorLens(Vec<Color>);
 
-impl InstanceLens for SplashTextColorLens {
-    fn create(start: Color, end: Color) -> Self {
-        Self { start, end }
+impl SplashTextColorLens {
+    /// Create instance of Text Lens
+    ///
+    /// * `colors`: Each color refers to a section and is placed in order.
+    pub fn new(colors: Vec<Color>) -> Self {
+        Self(colors)
     }
 }
 
 impl Lens<Text> for SplashTextColorLens {
     fn lerp(&mut self, target: &mut Text, ratio: f32) {
-        let start: Vec4 = self.start.into();
-        let end: Vec4 = self.end.into();
-        let value = start.lerp(end, ratio);
         target
             .sections
             .iter_mut()
-            .for_each(|section| section.style.color = value.into());
+            .enumerate()
+            .for_each(|(i, section)| {
+                let start: Vec4 = self.0[i].with_a(0.).into();
+                let end: Vec4 = self.0[i].into();
+                let value = start.lerp(end, ratio);
+                section.style.color = value.into();
+            });
     }
 }
 

src/splash.rs

@@ -111,10 +111,34 @@ pub(crate) fn create_splash(
                                 },
                                 ..default()
                             },
-                            create_animator::<Text, SplashTextColorLens>(
-                                brand,
-                                max_duration,
-                                i_screen,
+                            Animator::new(
+                                Tween::new(
+                                    brand.ease_function,
+                                    Duration::from_secs(1),
+                                    SplashTextColorLens::new(
+                                        text.sections
+                                            .iter()
+                                            .map(|_| Color::WHITE.with_a(0.))
+                                            .collect(),
+                                    ),
+                                )
+                                .then(
+                                    Delay::new(max_duration).then(
+                                        Tween::new(
+                                            brand.ease_function,
+                                            brand.duration,
+                                            SplashTextColorLens::new(
+                                                text.sections
+                                                    .iter()
+                                                    .map(|s| s.style.color)
+                                                    .collect(),
+                                            ),
+                                        )
+                                        .with_repeat_strategy(RepeatStrategy::MirroredRepeat)
+                                        .with_repeat_count(RepeatCount::Finite(2))
+                                        .with_completed_event(i_screen as u64),
+                                    ),
+                                ),
                             ),
                         ))
                     }