core: Rename Color::argb to Color::rgba to reflect internal representation

Author: moulins

core/src/avm2/globals/flash/display3D/textures/texture.rs

@@ -47,7 +47,7 @@ pub fn do_copy<'gc>(
                 .chunks_exact(4)
                 .map(|chunk| {
                     // The ByteArray is in BGRA format. FIXME - should this be premultiplied?
-                    Color::argb(chunk[3], chunk[2], chunk[1], chunk[0])
+                    Color::rgba(chunk[2], chunk[1], chunk[0], chunk[3])
                 })
                 .collect();
 

core/src/bitmap/bitmap_data.rs

@@ -59,7 +59,7 @@ pub enum BitmapDataDrawError {
 
 impl Color {
     #[must_use]
-    pub fn argb(a: u8, r: u8, g: u8, b: u8) -> Self {
+    pub fn rgba(r: u8, g: u8, b: u8, a: u8) -> Self {
         Self { r, g, b, a }
     }
 
@@ -100,7 +100,7 @@ impl Color {
         let g = ((self.green() as u32 * a + 127) / 255) as u8;
         let b = ((self.blue() as u32 * a + 127) / 255) as u8;
 
-        Self::argb(old_alpha, r, g, b)
+        Self::rgba(r, g, b, old_alpha)
     }
 
     #[must_use]
@@ -143,12 +143,12 @@ impl Color {
         let g = unmultiply(self.green());
         let b = unmultiply(self.blue());
 
-        Self::argb(self.alpha(), r, g, b)
+        Self::rgba(r, g, b, self.alpha())
     }
 
     #[must_use]
     pub fn with_alpha(&self, alpha: u8) -> Self {
-        Self::argb(alpha, self.red(), self.green(), self.blue())
+        Self::rgba(self.red(), self.green(), self.blue(), alpha)
     }
 
     /// # Arguments
@@ -163,7 +163,7 @@ impl Color {
         let g = source.green() + ((self.green() as u16 * (255 - sa as u16)) / 255) as u8;
         let b = source.blue() + ((self.blue() as u16 * (255 - sa as u16)) / 255) as u8;
         let a = source.alpha() + ((self.alpha() as u16 * (255 - sa as u16)) / 255) as u8;
-        Self::argb(a, r, g, b)
+        Self::rgba(r, g, b, a)
     }
 
     fn slice_as_rgba(slice: &[Self]) -> &[u8] {
@@ -191,7 +191,7 @@ impl From<u32> for Color {
 
 impl From<swf::Color> for Color {
     fn from(c: swf::Color) -> Self {
-        Self::argb(c.a, c.r, c.g, c.b)
+        Self::rgba(c.r, c.g, c.b, c.a)
     }
 }
 
@@ -837,7 +837,7 @@ fn copy_pixels_to_bitmapdata(
                 255
             };
 
-            let nc = Color::argb(a, r, g, b);
+            let nc = Color::rgba(r, g, b, a);
 
             // Ignore the original color entirely - the blending (including alpha)
             // was done by the renderer when it wrote over the previous texture contents.

core/src/bitmap/operations.rs

@@ -218,7 +218,7 @@ pub fn noise<'gc>(
                     255
                 };
 
-                Color::argb(alpha, gray, gray, gray)
+                Color::rgba(gray, gray, gray, alpha)
             } else {
                 let r = if channel_options.contains(ChannelOptions::RED) {
                     rng.random_range(low..high)
@@ -244,7 +244,7 @@ pub fn noise<'gc>(
                     255
                 };
 
-                Color::argb(a, r, g, b)
+                Color::rgba(r, g, b, a)
             };
 
             write.set_pixel32_raw(x, y, pixel_color);
@@ -364,7 +364,7 @@ pub fn perlin_noise<'gc>(
                 color[3] = 255;
             }
 
-            write.set_pixel32_raw(x, y, Color::argb(color[3], color[0], color[1], color[2]));
+            write.set_pixel32_raw(x, y, Color::rgba(color[0], color[1], color[2], color[3]));
         }
     }
     let region = PixelRegion::for_whole_size(write.width(), write.height());
@@ -773,19 +773,19 @@ pub fn compare<'gc>(
             let bitmap_pixel = bitmap_pixel.to_un_multiplied_alpha();
             let other_pixel = other_pixel.to_un_multiplied_alpha();
             if bitmap_pixel == other_pixel {
-                Color::argb(0, 0, 0, 0)
+                Color::rgba(0, 0, 0, 0)
             } else if bitmap_pixel.with_alpha(0) != other_pixel.with_alpha(0) {
                 different = true;
-                Color::argb(
-                    0xff,
+                Color::rgba(
                     bitmap_pixel.red().wrapping_sub(other_pixel.red()),
                     bitmap_pixel.green().wrapping_sub(other_pixel.green()),
                     bitmap_pixel.blue().wrapping_sub(other_pixel.blue()),
+                    0xff,
                 )
             } else {
                 different = true;
                 let alpha = bitmap_pixel.alpha().wrapping_sub(other_pixel.alpha());
-                Color::argb(alpha, alpha, alpha, alpha)
+                Color::rgba(alpha, alpha, alpha, alpha)
             }
         })
         .collect();
@@ -1021,7 +1021,7 @@ pub fn merge<'gc>(
                 + dest_color.alpha() as u16 * (256 - alpha_mult))
                 / 256;
 
-            let mix_color = Color::argb(alpha as u8, red as u8, green as u8, blue as u8);
+            let mix_color = Color::rgba(red as u8, green as u8, blue as u8, alpha as u8);
 
             write.set_pixel32_raw(
                 dest_x,
@@ -1186,7 +1186,7 @@ pub fn copy_pixels_with_alpha_source<'gc>(
             let r = (source_color.red() as f64 / a).round() as u8;
             let g = (source_color.green() as f64 / a).round() as u8;
             let b = (source_color.blue() as f64 / a).round() as u8;
-            let intermediate_color = Color::argb(source_color.alpha(), r, g, b)
+            let intermediate_color = Color::rgba(r, g, b, source_color.alpha())
                 .with_alpha(final_alpha)
                 .to_premultiplied_alpha(true);