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

undo rename for easier rebase

Browse source
This commit is contained in:
peppidesu 2024-10-19 15:08:56 +02:00
parent 4bcab8ad67
commit 339eee14f6
No known key found for this signature in database
GPG key ID: 4E9BA776E329260F
4 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/flutclient.rs
View file

@ -7,7 +7,7 @@ use tokio::io::{AsyncReadExt, AsyncWriteExt, BufReader, BufWriter};
use crate::{ use crate::{
get_pixel, get_pixel,
grid::{self, FlutGrid}, grid::{self, Flut},
increment_counter, increment_counter,
protocols::{BinaryParser, IOProtocol, Parser, Responder, TextParser}, protocols::{BinaryParser, IOProtocol, Parser, Responder, TextParser},
set_pixel_rgba, Canvas, Color, Command, Coordinate, Protocol, Response, set_pixel_rgba, Canvas, Color, Command, Coordinate, Protocol, Response,
@ -45,7 +45,7 @@ where
{ {
reader: BufReader<R>, reader: BufReader<R>,
writer: BufWriter<W>, writer: BufWriter<W>,
grids: Arc<[FlutGrid<u32>]>, grids: Arc<[Flut<u32>]>,
parser: ParserTypes, parser: ParserTypes,
counter: u64, counter: u64,
} }
@ -111,7 +111,7 @@ where
} }
} }
pub fn new(reader: R, writer: W, grids: Arc<[grid::FlutGrid<u32>]>) -> Self { pub fn new(reader: R, writer: W, grids: Arc<[grid::Flut<u32>]>) -> Self {
FlutClient { FlutClient {
reader: BufReader::new(reader), reader: BufReader::new(reader),
writer: BufWriter::new(writer), writer: BufWriter::new(writer),

30
src/grid.rs
View file

@ -12,20 +12,20 @@ pub trait Grid<I, V> {
fn set(&self, x: I, y: I, value: V); fn set(&self, x: I, y: I, value: V);
} }
pub struct FlutGrid<T> { pub struct Flut<T> {
size_x: usize, size_x: usize,
size_y: usize, size_y: usize,
cells: SyncUnsafeCell<Vec<T>>, cells: SyncUnsafeCell<Vec<T>>,
jpgbuf: RwLock<Vec<u8>> jpgbuf: RwLock<Vec<u8>>
} }
impl<T: Clone> FlutGrid<T> { impl<T: Clone> Flut<T> {
pub fn init(size_x: usize, size_y: usize, value: T) -> FlutGrid<T> { pub fn init(size_x: usize, size_y: usize, value: T) -> Flut<T> {
let mut vec = Vec::with_capacity(size_x * size_y); let mut vec = Vec::with_capacity(size_x * size_y);
for _ in 0..(size_x * size_y) { for _ in 0..(size_x * size_y) {
vec.push(value.clone()); vec.push(value.clone());
} }
FlutGrid { Flut {
size_x, size_x,
size_y, size_y,
cells: vec.into(), cells: vec.into(),
@ -38,7 +38,7 @@ impl<T: Clone> FlutGrid<T> {
} }
} }
impl<T> FlutGrid<T> { impl<T> Flut<T> {
fn index(&self, x: Coordinate, y: Coordinate) -> Option<usize> { fn index(&self, x: Coordinate, y: Coordinate) -> Option<usize> {
let x = x as usize; let x = x as usize;
let y = y as usize; let y = y as usize;
@ -52,7 +52,7 @@ impl<T> FlutGrid<T> {
} }
} }
impl<T> Grid<Coordinate, T> for FlutGrid<T> { impl<T> Grid<Coordinate, T> for Flut<T> {
fn get(&self, x: Coordinate, y: Coordinate) -> Option<&T> { fn get(&self, x: Coordinate, y: Coordinate) -> Option<&T> {
self.index(x, y) self.index(x, y)
.map(|idx| unsafe { &(*self.cells.get())[idx] }) .map(|idx| unsafe { &(*self.cells.get())[idx] })
@ -71,7 +71,7 @@ impl<T> Grid<Coordinate, T> for FlutGrid<T> {
} }
} }
impl GenericImageView for FlutGrid<u32> { impl GenericImageView for Flut<u32> {
type Pixel = Rgb<u8>; type Pixel = Rgb<u8>;
fn dimensions(&self) -> (u32, u32) { fn dimensions(&self) -> (u32, u32) {
@ -87,7 +87,7 @@ impl GenericImageView for FlutGrid<u32> {
} }
impl FlutGrid<u32> { impl Flut<u32> {
pub async fn update_jpg_buffer(&self) { pub async fn update_jpg_buffer(&self) {
let mut jpgbuf = self.jpgbuf.write().await; let mut jpgbuf = self.jpgbuf.write().await;
jpgbuf.clear(); jpgbuf.clear();
@ -103,19 +103,19 @@ impl FlutGrid<u32> {
#[cfg(test)] #[cfg(test)]
#[allow(clippy::needless_return)] #[allow(clippy::needless_return)]
mod tests { mod tests {
use super::FlutGrid; use super::Flut;
use super::Grid; use super::Grid;
#[tokio::test] #[tokio::test]
async fn test_grid_init_values() { async fn test_grid_init_values() {
let grid = FlutGrid::init(3, 3, 0); let grid = Flut::init(3, 3, 0);
assert_eq!(grid.cells.into_inner(), vec![0, 0, 0, 0, 0, 0, 0, 0, 0]); assert_eq!(grid.cells.into_inner(), vec![0, 0, 0, 0, 0, 0, 0, 0, 0]);
} }
#[tokio::test] #[tokio::test]
async fn test_grid_init_size() { async fn test_grid_init_size() {
let grid = FlutGrid::init(800, 600, 0); let grid = Flut::init(800, 600, 0);
assert_eq!(grid.size_x, 800); assert_eq!(grid.size_x, 800);
assert_eq!(grid.size_y, 600); assert_eq!(grid.size_y, 600);
@ -123,7 +123,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_grid_set() { async fn test_grid_set() {
let grid = FlutGrid::init(3, 3, 0); let grid = Flut::init(3, 3, 0);
grid.set(1, 1, 255); grid.set(1, 1, 255);
grid.set(2, 1, 256); grid.set(2, 1, 256);
assert_eq!(grid.cells.into_inner(), vec![0, 0, 0, 0, 255, 256, 0, 0, 0]); assert_eq!(grid.cells.into_inner(), vec![0, 0, 0, 0, 255, 256, 0, 0, 0]);
@ -131,7 +131,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_grid_set_out_of_range() { async fn test_grid_set_out_of_range() {
let grid = FlutGrid::init(3, 3, 0); let grid = Flut::init(3, 3, 0);
grid.set(1, 1, 255); grid.set(1, 1, 255);
grid.set(3, 1, 256); grid.set(3, 1, 256);
assert_eq!(grid.cells.into_inner(), vec![0, 0, 0, 0, 255, 0, 0, 0, 0]); assert_eq!(grid.cells.into_inner(), vec![0, 0, 0, 0, 255, 0, 0, 0, 0]);
@ -139,14 +139,14 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_grid_get() { async fn test_grid_get() {
let grid = FlutGrid::init(3, 3, 0); let grid = Flut::init(3, 3, 0);
grid.set(1, 2, 222); grid.set(1, 2, 222);
assert_eq!(grid.get(1, 2), Some(&222)); assert_eq!(grid.get(1, 2), Some(&222));
} }
#[tokio::test] #[tokio::test]
async fn test_grid_get_out_of_range() { async fn test_grid_get_out_of_range() {
let grid = FlutGrid::init(3, 3, 0); let grid = Flut::init(3, 3, 0);
grid.set(3, 1, 256); grid.set(3, 1, 256);
assert_eq!(grid.get(3, 1), None); assert_eq!(grid.get(3, 1), None);
assert_eq!(grid.get(1, 2), Some(&0)); assert_eq!(grid.get(1, 2), Some(&0));

4
src/lib.rs
View file

@ -22,7 +22,7 @@ pub type Coordinate = u16;
pub static COUNTER: AtomicU64 = AtomicU64::new(0); pub static COUNTER: AtomicU64 = AtomicU64::new(0);
fn set_pixel_rgba( fn set_pixel_rgba(
grids: &[grid::FlutGrid<u32>], grids: &[grid::Flut<u32>],
canvas: Canvas, canvas: Canvas,
x: Coordinate, x: Coordinate,
y: Coordinate, y: Coordinate,
@ -34,7 +34,7 @@ fn set_pixel_rgba(
} }
fn get_pixel( fn get_pixel(
grids: &[grid::FlutGrid<u32>], grids: &[grid::Flut<u32>],
canvas: Canvas, canvas: Canvas,
x: Coordinate, x: Coordinate,
y: Coordinate, y: Coordinate,

4
src/main.rs
View file

@ -12,7 +12,7 @@ use debug_print::{debug_eprintln, debug_println};
use flurry::{ use flurry::{
config::{GRID_LENGTH, HOST, IMAGE_SAVE_INTERVAL}, config::{GRID_LENGTH, HOST, IMAGE_SAVE_INTERVAL},
flutclient::FlutClient, flutclient::FlutClient,
grid::{self, FlutGrid}, grid::{self, Flut},
COUNTER, COUNTER,
}; };
use image::{codecs::jpeg::JpegEncoder, GenericImageView, SubImage}; use image::{codecs::jpeg::JpegEncoder, GenericImageView, SubImage};
@ -84,7 +84,7 @@ async fn handle_flut(flut_listener: TcpListener, grids: Arc<[grid::Flut<u32>]>)
#[tokio::main] #[tokio::main]
#[allow(clippy::needless_return)] #[allow(clippy::needless_return)]
async fn main() { async fn main() {
let grids: Arc<[FlutGrid<u32>; GRID_LENGTH]> = [grid::FlutGrid::init(800, 600, 0xff_00_ff_ff)].into(); let grids: Arc<[Flut<u32>; GRID_LENGTH]> = [grid::Flut::init(800, 600, 0xff_00_ff_ff)].into();
println!("created grids"); println!("created grids");
let Ok(flut_listener) = TcpListener::bind(HOST).await else { let Ok(flut_listener) = TcpListener::bind(HOST).await else {