diff options
Diffstat (limited to 'stockton-levels/src/types.rs')
| -rw-r--r-- | stockton-levels/src/types.rs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/stockton-levels/src/types.rs b/stockton-levels/src/types.rs index fa90398..4af0725 100644 --- a/stockton-levels/src/types.rs +++ b/stockton-levels/src/types.rs @@ -21,17 +21,17 @@ use std::convert::TryInto; /// RGBA Colour (0-255) #[derive(Debug, Clone, Copy, PartialEq)] -pub struct RGBA { +pub struct Rgba { pub r: u8, pub g: u8, pub b: u8, pub a: u8, } -impl RGBA { +impl Rgba { /// Interpret the given bytes as an RGBA colour. - pub fn from_bytes(bytes: [u8; 4]) -> RGBA { - RGBA { + pub fn from_bytes(bytes: [u8; 4]) -> Rgba { + Rgba { r: bytes[0], g: bytes[1], b: bytes[2], @@ -42,23 +42,23 @@ impl RGBA { /// Convert a slice to an RGBA colour /// # Panics /// If slice is not 4 bytes long. - pub fn from_slice(slice: &[u8]) -> RGBA { - RGBA::from_bytes(slice.try_into().unwrap()) + pub fn from_slice(slice: &[u8]) -> Rgba { + Rgba::from_bytes(slice.try_into().unwrap()) } } /// RGB Colour (0-255) #[derive(Debug, Clone, Copy, PartialEq)] -pub struct RGB { +pub struct Rgb { pub r: u8, pub g: u8, pub b: u8, } -impl RGB { +impl Rgb { /// 255, 255, 255 - pub fn white() -> RGB { - RGB { + pub fn white() -> Rgb { + Rgb { r: 255, g: 255, b: 255, @@ -66,8 +66,8 @@ impl RGB { } /// Interpret the given bytes as an RGB colour. - pub fn from_bytes(bytes: [u8; 3]) -> RGB { - RGB { + pub fn from_bytes(bytes: [u8; 3]) -> Rgb { + Rgb { r: bytes[0], g: bytes[1], b: bytes[2], @@ -77,8 +77,8 @@ impl RGB { /// Convert a slice to an RGB colour /// # Panics /// If slice is not 3 bytes long. - pub fn from_slice(slice: &[u8]) -> RGB { - RGB::from_bytes(slice.try_into().unwrap()) + pub fn from_slice(slice: &[u8]) -> Rgb { + Rgb::from_bytes(slice.try_into().unwrap()) } } |