noa/flurry
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: swap from u16_le to u16

Browse source
This commit is contained in:
Noa Aarts 2024-10-10 09:37:43 +02:00
parent a4c19d5f98
commit 899c5343ae
Signed by: noa
GPG key ID: 1850932741EFF672
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
README.md
View file

@ -10,11 +10,11 @@ Multiple protocols are supported:
- text: goes to the Text protocol - text: goes to the Text protocol
- binary: goes to the Binary protocol - binary: goes to the Binary protocol
- Binary: A binary analog to the text version, about twice as efficient with bandwidth, the commands are - Binary: A binary analog to the text version, about twice as efficient with bandwidth, the commands are
- size: `0x73 <u8 canvas>` -> `<u16_le x> <u16_le y>` - size: `0x73 <u8 canvas>` -> `<u16 x> <u16 y>`
- help: `0x68` -> help message (in UTF-8) - help: `0x68` -> help message (in UTF-8)
- get pixel: `0x20 <u8 canvas> <u16_le x> <u16_le y>` -> `<u8 red> <u8 green> <u8 blue>` - get pixel: `0x20 <u8 canvas> <u16 x> <u16 y>` -> `<u8 red> <u8 green> <u8 blue>`
- set pixel rgb: `0x80 <u8 canvas> <u16_le x> <u16_le y> <u8 red> <u8 green> <u8 blue>` - set pixel rgb: `0x80 <u8 canvas> <u16 x> <u16 y> <u8 red> <u8 green> <u8 blue>`
- blend pixel rgba: `0x81 <u8 canvas> <u16_le x> <u16_le y> <u8 red> <u8 green> <u8 blue> <u8 blend>` - blend pixel rgba: `0x81 <u8 canvas> <u16 x> <u16 y> <u8 red> <u8 green> <u8 blue> <u8 blend>`
- set pixel grayscale: `0x82 <u8 canvas> <u16_le x> <u16_le y> <u8 white>` - set pixel grayscale: `0x82 <u8 canvas> <u16 x> <u16 y> <u8 white>`

34
src/binary_protocol.rs
View file

@ -32,14 +32,14 @@ impl<R: AsyncBufRead + AsyncBufReadExt + std::marker::Unpin> Parser<R> for Binar
} }
GET_PX_BIN => { GET_PX_BIN => {
let canvas = reader.read_u8().await?; let canvas = reader.read_u8().await?;
let horizontal = reader.read_u16_le().await?; let horizontal = reader.read_u16().await?;
let vertical = reader.read_u16_le().await?; let vertical = reader.read_u16().await?;
Ok(Command::GetPixel(canvas, horizontal, vertical)) Ok(Command::GetPixel(canvas, horizontal, vertical))
} }
SET_PX_W_BIN => { SET_PX_W_BIN => {
let canvas = reader.read_u8().await?; let canvas = reader.read_u8().await?;
let horizontal = reader.read_u16_le().await?; let horizontal = reader.read_u16().await?;
let vertical = reader.read_u16_le().await?; let vertical = reader.read_u16().await?;
let white = reader.read_u8().await?; let white = reader.read_u8().await?;
Ok(Command::SetPixel( Ok(Command::SetPixel(
canvas, canvas,
@ -50,8 +50,8 @@ impl<R: AsyncBufRead + AsyncBufReadExt + std::marker::Unpin> Parser<R> for Binar
} }
SET_PX_RGB_BIN => { SET_PX_RGB_BIN => {
let canvas = reader.read_u8().await?; let canvas = reader.read_u8().await?;
let horizontal = reader.read_u16_le().await?; let horizontal = reader.read_u16().await?;
let vertical = reader.read_u16_le().await?; let vertical = reader.read_u16().await?;
let red = reader.read_u8().await?; let red = reader.read_u8().await?;
let green = reader.read_u8().await?; let green = reader.read_u8().await?;
let blue = reader.read_u8().await?; let blue = reader.read_u8().await?;
@ -64,8 +64,8 @@ impl<R: AsyncBufRead + AsyncBufReadExt + std::marker::Unpin> Parser<R> for Binar
} }
SET_PX_RGBA_BIN => { SET_PX_RGBA_BIN => {
let canvas = reader.read_u8().await?; let canvas = reader.read_u8().await?;
let horizontal = reader.read_u16_le().await?; let horizontal = reader.read_u16().await?;
let vertical = reader.read_u16_le().await?; let vertical = reader.read_u16().await?;
let red = reader.read_u8().await?; let red = reader.read_u8().await?;
let green = reader.read_u8().await?; let green = reader.read_u8().await?;
let blue = reader.read_u8().await?; let blue = reader.read_u8().await?;
@ -157,7 +157,7 @@ mod tests {
let thingy = parser.parse(&mut bufreader).await; let thingy = parser.parse(&mut bufreader).await;
assert_eq!( assert_eq!(
thingy.unwrap(), thingy.unwrap(),
Command::SetPixel(1, 0x4269, 0x6942, Color::W8(0x82)) Command::SetPixel(1, 0x6942, 0x4269, Color::W8(0x82))
); );
} }
@ -168,10 +168,10 @@ mod tests {
.read(&[ .read(&[
SET_PX_RGB_BIN, SET_PX_RGB_BIN,
0x01, 0x01,
0x69,
0x42,
0x42, 0x42,
0x69, 0x69,
0x69,
0x42,
0x82, 0x82,
0x00, 0x00,
0xff, 0xff,
@ -192,10 +192,10 @@ mod tests {
.read(&[ .read(&[
SET_PX_RGBA_BIN, SET_PX_RGBA_BIN,
0x01, 0x01,
0x69,
0x42,
0x42, 0x42,
0x69, 0x69,
0x69,
0x42,
0x82, 0x82,
0x00, 0x00,
0xff, 0xff,
@ -218,7 +218,7 @@ mod tests {
.build(); .build();
let mut bufreader = BufReader::new(reader); let mut bufreader = BufReader::new(reader);
let thingy = parser.parse(&mut bufreader).await; let thingy = parser.parse(&mut bufreader).await;
assert_eq!(thingy.unwrap(), Command::GetPixel(3, 0x4269, 0x6942)); assert_eq!(thingy.unwrap(), Command::GetPixel(3, 0x6942, 0x4269));
} }
#[tokio::test] #[tokio::test]
@ -242,7 +242,7 @@ mod tests {
0x69, 0x69,
0x42, 0x42,
0x42, 0x42,
0x69, 0x70,
0x82, 0x82,
0x00, 0x00,
0xff, 0xff,
@ -254,11 +254,11 @@ mod tests {
let thingy2 = parser.parse(&mut bufreader).await; let thingy2 = parser.parse(&mut bufreader).await;
assert_eq!( assert_eq!(
thingy.unwrap(), thingy.unwrap(),
Command::SetPixel(1, 0x4269, 0x6942, Color::RGB24(0x82, 0x00, 0xff)) Command::SetPixel(1, 0x6942, 0x4269, Color::RGB24(0x82, 0x00, 0xff))
); );
assert_eq!( assert_eq!(
thingy2.unwrap(), thingy2.unwrap(),
Command::SetPixel(1, 0x4269, 0x6942, Color::RGBA32(0x82, 0x00, 0xff, 0xa0)) Command::SetPixel(1, 0x6942, 0x4270, Color::RGBA32(0x82, 0x00, 0xff, 0xa0))
); );
} }
} }