fix: optimize to unwrap_or_default for dark color and set 0.0 case fo…

…r premultiplied alpha
jabuwu · Mar 17, 2024 · 73ce0de · 73ce0de
1 parent fa98121
commit 73ce0de
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/draw/combined.rs b/src/draw/combined.rs
@@ -186,13 +186,13 @@ impl CombinedDrawer {
                 slot.attachment().and_then(|a| a.as_mesh())
             {
                 let mut color = mesh_attachment.color() * slot.color() * skeleton.color();
-                let mut dark_color = slot
-                    .dark_color()
-                    .unwrap_or_else(|| Color::new_rgba(0.0, 0.0, 0.0, 0.0));
+                let mut dark_color = slot.dark_color().unwrap_or_default();
                 if self.premultiplied_alpha {
                     color.premultiply_alpha();
                     dark_color *= color.a;
                     dark_color.a = 1.0;
+                } else {
+                    dark_color.a = 0.;
                 }
                 color = match self.color_space {
                     ColorSpace::SRGB => color,
@@ -271,13 +271,13 @@ impl CombinedDrawer {
                 (color, dark_color)
             } else if let Some(region_attachment) = slot.attachment().and_then(|a| a.as_region()) {
                 let mut color = region_attachment.color() * slot.color() * skeleton.color();
-                let mut dark_color = slot
-                    .dark_color()
-                    .unwrap_or_else(|| Color::new_rgba(0.0, 0.0, 0.0, 0.0));
+                let mut dark_color = slot.dark_color().unwrap_or_default();
                 if self.premultiplied_alpha {
                     color.premultiply_alpha();
                     dark_color *= color.a;
                     dark_color.a = 1.0;
+                } else {
+                    dark_color.a = 0.;
                 }
                 color = match self.color_space {
                     ColorSpace::SRGB => color,

diff --git a/src/draw/simple.rs b/src/draw/simple.rs
@@ -284,13 +284,13 @@ impl SimpleDrawer {
                 );
 
             color *= slot.color() * skeleton.color();
-            let mut dark_color = slot
-                .dark_color()
-                .unwrap_or_else(|| Color::new_rgba(0.0, 0.0, 0.0, 0.0));
+            let mut dark_color = slot.dark_color().unwrap_or_default();
             if self.premultiplied_alpha {
                 color.premultiply_alpha();
                 dark_color *= color.a;
                 dark_color.a = 1.0;
+            } else {
+                dark_color.a = 0.;
             }
             color = match self.color_space {
                 ColorSpace::SRGB => color,