implement BitmapLinear* commands

This commit is contained in:
Vinzenz Schroeter 2024-05-11 00:46:49 +02:00
parent d07440f3d0
commit 5f4d2fba25
2 changed files with 122 additions and 96 deletions

2
Cargo.lock generated
View file

@ -2151,7 +2151,7 @@ dependencies = [
[[package]]
name = "servicepoint2"
version = "0.1.0"
source = "git+https://github.com/kaesaecracker/servicepoint.git#571cf735105c39a11455b83392ce3b863bd590c1"
source = "git+https://github.com/kaesaecracker/servicepoint.git#8ceaef72faaa5d36000089c415a5b28f7e244513"
dependencies = [
"num",
"num-derive",

View file

@ -9,11 +9,11 @@ use clap::Parser;
use log::{debug, error, info, warn};
use servicepoint2::{
Command, Origin, Packet, PixelGrid, Size, Window, PIXEL_HEIGHT, PIXEL_WIDTH, TILE_SIZE,
TILE_WIDTH,
};
use std::io::ErrorKind;
use std::net::UdpSocket;
use std::sync::{mpsc, RwLock, RwLockWriteGuard};
use std::thread;
use std::time::Duration;
use winit::event_loop::{ControlFlow, EventLoop};
@ -50,7 +50,7 @@ fn main() {
while stop_udp_rx.try_recv().is_err() {
let (amount, _) = match socket.recv_from(&mut buf) {
Err(err) if err.kind() == ErrorKind::WouldBlock => {
thread::sleep(Duration::from_millis(1));
std::thread::sleep(Duration::from_millis(1));
continue;
}
Ok(result) => result,
@ -87,13 +87,9 @@ fn main() {
udp_thread.join().expect("could not join udp thread");
});
}
fn handle_package(
received: Packet,
font: &BitmapFont,
display: &mut RwLockWriteGuard<PixelGrid>,
) {
// TODO handle error case
fn handle_package(received: Packet, font: &BitmapFont, display: &mut RwLockWriteGuard<PixelGrid>) {
let command = match Command::try_from(received) {
Err(err) => {
warn!("could not read command for packet: {:?}", err);
@ -117,17 +113,48 @@ fn main() {
Command::Cp437Data(window, payload) => {
print_cp437_data(window, &payload, font, display);
}
#[allow(deprecated)]
Command::BitmapLegacy => {
warn!("ignoring deprecated command {:?}", command);
}
Command::BitmapLinear(offset, vec) => {}
Command::BitmapLinearAnd(_, _) => {}
Command::BitmapLinearOr(_, _) => {}
Command::BitmapLinearXor(_, _) => {}
Command::FadeOut => {}
Command::CharBrightness(_, _) => {}
Command::Brightness(_) => {}
Command::BitmapLinear(offset, vec) => {
for bitmap_index in 0..vec.len() {
let pixel_index = offset as usize + bitmap_index;
let y = pixel_index / TILE_WIDTH as usize;
let x = pixel_index % TILE_SIZE as usize;
display.set(x, y, vec.get(bitmap_index));
}
}
Command::BitmapLinearAnd(offset, vec) => {
for bitmap_index in 0..vec.len() {
let pixel_index = offset as usize + bitmap_index;
let y = pixel_index / TILE_WIDTH as usize;
let x = pixel_index % TILE_SIZE as usize;
let old_value = display.get(x, y);
display.set(x, y, old_value && vec.get(bitmap_index));
}
}
Command::BitmapLinearOr(offset, vec) => {
for bitmap_index in 0..vec.len() {
let pixel_index = offset as usize + bitmap_index;
let y = pixel_index / TILE_WIDTH as usize;
let x = pixel_index % TILE_SIZE as usize;
let old_value = display.get(x, y);
display.set(x, y, old_value || vec.get(bitmap_index));
}
}
Command::BitmapLinearXor(offset, vec) => {
for bitmap_index in 0..vec.len() {
let pixel_index = offset as usize + bitmap_index;
let y = pixel_index / TILE_WIDTH as usize;
let x = pixel_index % TILE_SIZE as usize;
let old_value = display.get(x, y);
display.set(x, y, old_value ^ vec.get(bitmap_index));
}
}
_ => {
error!("command not implemented: {command:?}")
}
};
}
@ -190,4 +217,3 @@ fn main() {
}
}
}
}