Spread all components over modules
This commit is contained in:
Tim Visée
135
src/arg_handler.rs
Normal file
135
src/arg_handler.rs
Normal file
@@ -0,0 +1,135 @@
|
|||||||
|
extern crate clap;
|
||||||
|
|
||||||
|
use clap::{Arg, ArgMatches, App};
|
||||||
|
|
||||||
|
use app::*;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/// CLI argument handler.
|
||||||
|
pub struct ArgHandler<'a> {
|
||||||
|
matches: ArgMatches<'a>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a: 'b, 'b> ArgHandler<'a> {
|
||||||
|
|
||||||
|
/// Parse CLI arguments.
|
||||||
|
pub fn parse() -> ArgHandler<'a> {
|
||||||
|
// Handle/parse arguments
|
||||||
|
let matches = App::new(APP_NAME)
|
||||||
|
.version(APP_VERSION)
|
||||||
|
.author(APP_AUTHOR)
|
||||||
|
.about(APP_ABOUT)
|
||||||
|
.arg(Arg::with_name("HOST")
|
||||||
|
.help("The host to pwn \"host:port\"")
|
||||||
|
.required(true)
|
||||||
|
.index(1))
|
||||||
|
.arg(Arg::with_name("count")
|
||||||
|
.short("c")
|
||||||
|
.long("count")
|
||||||
|
.value_name("COUNT")
|
||||||
|
.help("Number of simultanious threads (def: 4)")
|
||||||
|
.takes_value(true))
|
||||||
|
.arg(Arg::with_name("image")
|
||||||
|
.short("i")
|
||||||
|
.long("images")
|
||||||
|
.value_name("PATH")
|
||||||
|
.help("Paths of the images to print")
|
||||||
|
.required(true)
|
||||||
|
.multiple(true)
|
||||||
|
.takes_value(true))
|
||||||
|
.arg(Arg::with_name("width")
|
||||||
|
.short("w")
|
||||||
|
.long("width")
|
||||||
|
.value_name("PIXELS")
|
||||||
|
.help("Drawing width in pixels (def: 1920)")
|
||||||
|
.takes_value(true))
|
||||||
|
.arg(Arg::with_name("height")
|
||||||
|
.short("h")
|
||||||
|
.long("height")
|
||||||
|
.value_name("PIXELS")
|
||||||
|
.help("Drawing height in pixels (def: 1080)")
|
||||||
|
.takes_value(true))
|
||||||
|
.arg(Arg::with_name("x")
|
||||||
|
.short("x")
|
||||||
|
.long("x")
|
||||||
|
.value_name("PIXELS")
|
||||||
|
.help("Drawing X offset in pixels (def: 0)")
|
||||||
|
.takes_value(true))
|
||||||
|
.arg(Arg::with_name("y")
|
||||||
|
.short("y")
|
||||||
|
.long("y")
|
||||||
|
.value_name("PIXELS")
|
||||||
|
.help("Drawing Y offset in pixels (def: 0)")
|
||||||
|
.takes_value(true))
|
||||||
|
.arg(Arg::with_name("fps")
|
||||||
|
.short("r")
|
||||||
|
.long("fps")
|
||||||
|
.value_name("RATE")
|
||||||
|
.help("Frames per second with multiple images (def: 1)")
|
||||||
|
.takes_value(true))
|
||||||
|
.get_matches();
|
||||||
|
|
||||||
|
// Instantiate
|
||||||
|
ArgHandler {
|
||||||
|
matches,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get the host property.
|
||||||
|
pub fn host(&'a self) -> &'b str {
|
||||||
|
self.matches.value_of("HOST")
|
||||||
|
.expect("Please specify a host")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get the thread count.
|
||||||
|
pub fn count(&self) -> usize {
|
||||||
|
self.matches.value_of("count")
|
||||||
|
.unwrap_or(&format!("{}", DEFAULT_THREAD_COUNT))
|
||||||
|
.parse::<usize>()
|
||||||
|
.expect("Invalid count specified")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get the image paths.
|
||||||
|
pub fn image_paths(&'a self) -> Vec<&'b str> {
|
||||||
|
self.matches.values_of("image")
|
||||||
|
.expect("Please specify an image paths")
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get the image size.
|
||||||
|
pub fn size(&self) -> (u32, u32) {
|
||||||
|
(
|
||||||
|
self.matches.value_of("width")
|
||||||
|
.unwrap_or(&format!("{}", DEFAULT_IMAGE_WIDTH))
|
||||||
|
.parse::<u32>()
|
||||||
|
.expect("Invalid image width"),
|
||||||
|
self.matches.value_of("height")
|
||||||
|
.unwrap_or(&format!("{}", DEFAULT_IMAGE_HEIGHT))
|
||||||
|
.parse::<u32>()
|
||||||
|
.expect("Invalid image height"),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get the image offset.
|
||||||
|
pub fn offset(&self) -> (u32, u32) {
|
||||||
|
(
|
||||||
|
self.matches.value_of("x")
|
||||||
|
.unwrap_or("0")
|
||||||
|
.parse::<u32>()
|
||||||
|
.expect("Invalid X offset"),
|
||||||
|
self.matches.value_of("y")
|
||||||
|
.unwrap_or("0")
|
||||||
|
.parse::<u32>()
|
||||||
|
.expect("Invalid Y offset"),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get the FPS.
|
||||||
|
pub fn fps(&self) -> u32 {
|
||||||
|
self.matches.value_of("fps")
|
||||||
|
.unwrap_or(&format!("{}", DEFAULT_IMAGE_FPS))
|
||||||
|
.parse::<u32>()
|
||||||
|
.expect("Invalid frames per second rate")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,13 @@
|
|||||||
/// Color struct.
|
/// Color struct.
|
||||||
///
|
///
|
||||||
/// Represents a color with RGB values from 0 to 255.
|
/// Represents a color with RGB values from 0 to 255.
|
||||||
|
#[derive(Copy, Clone)]
|
||||||
|
pub struct Color {
|
||||||
|
r: u8,
|
||||||
|
g: u8,
|
||||||
|
b: u8,
|
||||||
|
}
|
||||||
|
|
||||||
impl Color {
|
impl Color {
|
||||||
|
|
||||||
/// Constructor.
|
/// Constructor.
|
||||||
|
|||||||
82
src/image_manager.rs
Normal file
82
src/image_manager.rs
Normal file
@@ -0,0 +1,82 @@
|
|||||||
|
use std::path::Path;
|
||||||
|
|
||||||
|
use image;
|
||||||
|
use image::{DynamicImage, FilterType};
|
||||||
|
|
||||||
|
use pix_canvas::PixCanvas;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/// A manager that manages all images to print.
|
||||||
|
pub struct ImageManager {
|
||||||
|
images: Vec<DynamicImage>,
|
||||||
|
index: isize,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ImageManager {
|
||||||
|
/// Intantiate the image manager.
|
||||||
|
pub fn from(images: Vec<DynamicImage>) -> ImageManager {
|
||||||
|
ImageManager {
|
||||||
|
images,
|
||||||
|
index: 0,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Instantiate the image manager, and load the images from the given paths.
|
||||||
|
pub fn load(paths: Vec<&str>, size: &(u32, u32)) -> ImageManager {
|
||||||
|
// Show a status message
|
||||||
|
println!("Load and process {} image(s)...", paths.len());
|
||||||
|
|
||||||
|
// Load the images from the paths
|
||||||
|
let image_manager = ImageManager::from(
|
||||||
|
paths.iter()
|
||||||
|
.map(|path| load_image(path, &size))
|
||||||
|
.collect()
|
||||||
|
);
|
||||||
|
|
||||||
|
// We succeeded
|
||||||
|
println!("All images have been loaded successfully");
|
||||||
|
|
||||||
|
image_manager
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Tick the image
|
||||||
|
pub fn tick(&mut self, canvas: &mut PixCanvas) {
|
||||||
|
// Get the image index bound
|
||||||
|
let bound = self.images.len();
|
||||||
|
|
||||||
|
// Get the image to use
|
||||||
|
let image = &mut self.images[
|
||||||
|
self.index as usize % bound
|
||||||
|
];
|
||||||
|
|
||||||
|
// Update the image on the canvas
|
||||||
|
canvas.update_image(image);
|
||||||
|
|
||||||
|
// Increase the index
|
||||||
|
self.index += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/// Load the image at the given path, and size it correctly
|
||||||
|
fn load_image(path: &str, size: &(u32, u32)) -> DynamicImage {
|
||||||
|
// Create a path instance
|
||||||
|
let path = Path::new(&path);
|
||||||
|
|
||||||
|
// Check whether the path exists
|
||||||
|
if !path.is_file() {
|
||||||
|
panic!("The given path does not exist or is not a file");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load the image
|
||||||
|
let image = image::open(&path).unwrap();
|
||||||
|
|
||||||
|
// Resize the image to fit the screen
|
||||||
|
image.resize_exact(
|
||||||
|
size.0,
|
||||||
|
size.1,
|
||||||
|
FilterType::Gaussian,
|
||||||
|
)
|
||||||
|
}
|
||||||
515
src/main.rs
515
src/main.rs
@@ -1,154 +1,41 @@
|
|||||||
extern crate bufstream;
|
|
||||||
extern crate clap;
|
extern crate clap;
|
||||||
extern crate image;
|
extern crate image;
|
||||||
|
|
||||||
mod app;
|
mod app;
|
||||||
|
mod arg_handler;
|
||||||
mod color;
|
mod color;
|
||||||
|
mod image_manager;
|
||||||
|
mod painter;
|
||||||
|
mod painter_handle;
|
||||||
|
mod pix_canvas;
|
||||||
|
mod pix_client;
|
||||||
mod rect;
|
mod rect;
|
||||||
|
|
||||||
use std::io::Error;
|
|
||||||
use std::io::prelude::*;
|
|
||||||
use std::net::TcpStream;
|
|
||||||
use std::path::Path;
|
|
||||||
use std::sync::mpsc;
|
|
||||||
use std::sync::mpsc::{Sender, Receiver};
|
|
||||||
use std::thread;
|
use std::thread;
|
||||||
use std::thread::JoinHandle;
|
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
use bufstream::BufStream;
|
use arg_handler::ArgHandler;
|
||||||
use clap::{Arg, ArgMatches, App};
|
use image_manager::ImageManager;
|
||||||
use image::{DynamicImage, FilterType, Pixel};
|
use pix_canvas::PixCanvas;
|
||||||
|
|
||||||
use app::*;
|
|
||||||
use color::Color;
|
|
||||||
use rect::Rect;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// Main application entrypoint.
|
/// Main application entrypoint.
|
||||||
fn main() {
|
fn main() {
|
||||||
// Parse CLI arguments
|
// Parse CLI arguments
|
||||||
let matches = parse_args();
|
let arg_handler = ArgHandler::parse();
|
||||||
|
|
||||||
// Get the host
|
|
||||||
let host = matches
|
|
||||||
.value_of("HOST")
|
|
||||||
.expect("Please specify a host");
|
|
||||||
|
|
||||||
// Get the count
|
|
||||||
let count = matches
|
|
||||||
.value_of("count")
|
|
||||||
.unwrap_or(&format!("{}", DEFAULT_THREAD_COUNT))
|
|
||||||
.parse::<usize>()
|
|
||||||
.expect("Invalid count specified");
|
|
||||||
|
|
||||||
// Get the image path
|
|
||||||
let image_paths = matches
|
|
||||||
.values_of("image")
|
|
||||||
.expect("Please specify an image paths")
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
// Get the width and height
|
|
||||||
let width = matches
|
|
||||||
.value_of("width")
|
|
||||||
.unwrap_or(&format!("{}", DEFAULT_IMAGE_WIDTH))
|
|
||||||
.parse::<u32>()
|
|
||||||
.expect("Invalid image width");
|
|
||||||
let height = matches
|
|
||||||
.value_of("height")
|
|
||||||
.unwrap_or(&format!("{}", DEFAULT_IMAGE_HEIGHT))
|
|
||||||
.parse::<u32>()
|
|
||||||
.expect("Invalid image height");
|
|
||||||
|
|
||||||
// Get the offset
|
|
||||||
let offset_x = matches
|
|
||||||
.value_of("x")
|
|
||||||
.unwrap_or("0")
|
|
||||||
.parse::<u32>()
|
|
||||||
.expect("Invalid X offset");
|
|
||||||
let offset_y = matches
|
|
||||||
.value_of("y")
|
|
||||||
.unwrap_or("0")
|
|
||||||
.parse::<u32>()
|
|
||||||
.expect("Invalid Y offset");
|
|
||||||
|
|
||||||
// Get the FPS rate
|
|
||||||
let fps = matches
|
|
||||||
.value_of("fps")
|
|
||||||
.unwrap_or(&format!("{}", DEFAULT_IMAGE_FPS))
|
|
||||||
.parse::<u32>()
|
|
||||||
.expect("Invalid frames per second rate");
|
|
||||||
|
|
||||||
// Start
|
// Start
|
||||||
start(
|
start(
|
||||||
host,
|
arg_handler.host(),
|
||||||
image_paths,
|
arg_handler.image_paths(),
|
||||||
fps,
|
arg_handler.fps(),
|
||||||
count,
|
arg_handler.count(),
|
||||||
(width, height),
|
arg_handler.size(),
|
||||||
(offset_x, offset_y)
|
arg_handler.offset(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Parse CLI arguments, return the matches.
|
|
||||||
fn parse_args<'a>() -> ArgMatches<'a> {
|
|
||||||
// Handle/parse arguments
|
|
||||||
App::new(APP_NAME)
|
|
||||||
.version(APP_VERSION)
|
|
||||||
.author(APP_AUTHOR)
|
|
||||||
.about(APP_ABOUT)
|
|
||||||
.arg(Arg::with_name("HOST")
|
|
||||||
.help("The host to pwn \"host:port\"")
|
|
||||||
.required(true)
|
|
||||||
.index(1))
|
|
||||||
.arg(Arg::with_name("count")
|
|
||||||
.short("c")
|
|
||||||
.long("count")
|
|
||||||
.value_name("COUNT")
|
|
||||||
.help("Number of simultanious threads (def: 4)")
|
|
||||||
.takes_value(true))
|
|
||||||
.arg(Arg::with_name("image")
|
|
||||||
.short("i")
|
|
||||||
.long("images")
|
|
||||||
.value_name("PATH")
|
|
||||||
.help("Paths of the images to print")
|
|
||||||
.required(true)
|
|
||||||
.multiple(true)
|
|
||||||
.takes_value(true))
|
|
||||||
.arg(Arg::with_name("width")
|
|
||||||
.short("w")
|
|
||||||
.long("width")
|
|
||||||
.value_name("PIXELS")
|
|
||||||
.help("Drawing width in pixels (def: 1920)")
|
|
||||||
.takes_value(true))
|
|
||||||
.arg(Arg::with_name("height")
|
|
||||||
.short("h")
|
|
||||||
.long("height")
|
|
||||||
.value_name("PIXELS")
|
|
||||||
.help("Drawing height in pixels (def: 1080)")
|
|
||||||
.takes_value(true))
|
|
||||||
.arg(Arg::with_name("x")
|
|
||||||
.short("x")
|
|
||||||
.long("x")
|
|
||||||
.value_name("PIXELS")
|
|
||||||
.help("Drawing X offset in pixels (def: 0)")
|
|
||||||
.takes_value(true))
|
|
||||||
.arg(Arg::with_name("y")
|
|
||||||
.short("y")
|
|
||||||
.long("y")
|
|
||||||
.value_name("PIXELS")
|
|
||||||
.help("Drawing Y offset in pixels (def: 0)")
|
|
||||||
.takes_value(true))
|
|
||||||
.arg(Arg::with_name("fps")
|
|
||||||
.short("r")
|
|
||||||
.long("fps")
|
|
||||||
.value_name("RATE")
|
|
||||||
.help("Frames per second with multiple images (def: 1)")
|
|
||||||
.takes_value(true))
|
|
||||||
.get_matches()
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Start the client.
|
/// Start the client.
|
||||||
fn start(
|
fn start(
|
||||||
host: &str,
|
host: &str,
|
||||||
@@ -180,373 +67,3 @@ fn start(
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Create a stream to talk to the pixelflut server.
|
|
||||||
///
|
|
||||||
/// The stream is returned as result.
|
|
||||||
fn create_stream(host: String) -> Result<TcpStream, Error> {
|
|
||||||
TcpStream::connect(host)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Load the image at the given path, and size it correctly
|
|
||||||
fn load_image(path: &str, size: &(u32, u32)) -> DynamicImage {
|
|
||||||
// Create a path instance
|
|
||||||
let path = Path::new(&path);
|
|
||||||
|
|
||||||
// Check whether the path exists
|
|
||||||
if !path.is_file() {
|
|
||||||
panic!("The given path does not exist or is not a file");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load the image
|
|
||||||
let image = image::open(&path).unwrap();
|
|
||||||
|
|
||||||
// Resize the image to fit the screen
|
|
||||||
image.resize_exact(
|
|
||||||
size.0,
|
|
||||||
size.1,
|
|
||||||
FilterType::Gaussian,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// A manager that manages all images to print.
|
|
||||||
struct ImageManager {
|
|
||||||
images: Vec<DynamicImage>,
|
|
||||||
index: isize,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ImageManager {
|
|
||||||
/// Intantiate the image manager.
|
|
||||||
pub fn from(images: Vec<DynamicImage>) -> ImageManager {
|
|
||||||
ImageManager {
|
|
||||||
images,
|
|
||||||
index: 0,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Instantiate the image manager, and load the images from the given paths.
|
|
||||||
pub fn load(paths: Vec<&str>, size: &(u32, u32)) -> ImageManager {
|
|
||||||
// Show a status message
|
|
||||||
println!("Load and process {} image(s)...", paths.len());
|
|
||||||
|
|
||||||
// Load the images from the paths
|
|
||||||
let image_manager = ImageManager::from(
|
|
||||||
paths.iter()
|
|
||||||
.map(|path| load_image(path, &size))
|
|
||||||
.collect()
|
|
||||||
);
|
|
||||||
|
|
||||||
// We succeeded
|
|
||||||
println!("All images have been loaded successfully");
|
|
||||||
|
|
||||||
image_manager
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Tick the image
|
|
||||||
pub fn tick(&mut self, canvas: &mut PixCanvas) {
|
|
||||||
// Get the image index bound
|
|
||||||
let bound = self.images.len();
|
|
||||||
|
|
||||||
// Get the image to use
|
|
||||||
let image = &mut self.images[
|
|
||||||
self.index as usize % bound
|
|
||||||
];
|
|
||||||
|
|
||||||
// Update the image on the canvas
|
|
||||||
canvas.update_image(image);
|
|
||||||
|
|
||||||
// Increase the index
|
|
||||||
self.index += 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// A pixflut instance
|
|
||||||
struct PixCanvas {
|
|
||||||
host: String,
|
|
||||||
painter_count: usize,
|
|
||||||
painter_handles: Vec<PainterHandle>,
|
|
||||||
size: (u32, u32),
|
|
||||||
offset: (u32, u32),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl PixCanvas {
|
|
||||||
/// Create a new pixelflut canvas.
|
|
||||||
pub fn new(
|
|
||||||
host: &str,
|
|
||||||
painter_count: usize,
|
|
||||||
size: (u32, u32),
|
|
||||||
offset: (u32, u32),
|
|
||||||
) -> PixCanvas {
|
|
||||||
// Initialize the object
|
|
||||||
let mut canvas = PixCanvas {
|
|
||||||
host: host.to_string(),
|
|
||||||
painter_count,
|
|
||||||
painter_handles: Vec::with_capacity(painter_count),
|
|
||||||
size,
|
|
||||||
offset,
|
|
||||||
};
|
|
||||||
|
|
||||||
// Show a status message
|
|
||||||
println!("Starting painter threads...");
|
|
||||||
|
|
||||||
// Spawn some painters
|
|
||||||
canvas.spawn_painters();
|
|
||||||
|
|
||||||
// Return the canvas
|
|
||||||
canvas
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Spawn the painters for this canvas
|
|
||||||
fn spawn_painters(&mut self) {
|
|
||||||
// Spawn some painters
|
|
||||||
for i in 0..self.painter_count {
|
|
||||||
// Determine the slice width
|
|
||||||
let width = self.size.0 / (self.painter_count as u32);
|
|
||||||
|
|
||||||
// Define the area to paint per thread
|
|
||||||
let painter_area = Rect::from(
|
|
||||||
(i as u32) * width,
|
|
||||||
0,
|
|
||||||
width,
|
|
||||||
self.size.1,
|
|
||||||
);
|
|
||||||
|
|
||||||
// Spawn the painter
|
|
||||||
self.spawn_painter(painter_area);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Spawn a single painter in a thread.
|
|
||||||
fn spawn_painter(&mut self, area: Rect) {
|
|
||||||
// Get the host that will be used
|
|
||||||
let host = self.host.to_string();
|
|
||||||
|
|
||||||
// Redefine the offset to make it usable in the thread
|
|
||||||
let offset = (self.offset.0, self.offset.1);
|
|
||||||
|
|
||||||
// Create a channel to push new images
|
|
||||||
let (tx, rx): (Sender<DynamicImage>, Receiver<DynamicImage>)
|
|
||||||
= mpsc::channel();
|
|
||||||
|
|
||||||
// Create the painter thread
|
|
||||||
let thread = thread::spawn(move || {
|
|
||||||
// Create a new stream
|
|
||||||
let stream = create_stream(host)
|
|
||||||
.expect("failed to open stream to pixelflut");
|
|
||||||
|
|
||||||
// Create a new client
|
|
||||||
let client = PixClient::new(stream);
|
|
||||||
|
|
||||||
// Create a painter
|
|
||||||
let mut painter = Painter::new(
|
|
||||||
client,
|
|
||||||
area,
|
|
||||||
offset,
|
|
||||||
None
|
|
||||||
);
|
|
||||||
|
|
||||||
// Do some work
|
|
||||||
loop {
|
|
||||||
// Work
|
|
||||||
painter.work()
|
|
||||||
.expect("Painter failed to perform work");
|
|
||||||
|
|
||||||
// Update the image to paint
|
|
||||||
if let Ok(image) = rx.try_recv() {
|
|
||||||
painter.set_image(image);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Create a new painter handle, pust it to the list
|
|
||||||
self.painter_handles.push(
|
|
||||||
PainterHandle::new(
|
|
||||||
thread,
|
|
||||||
area,
|
|
||||||
tx,
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update the image that is being rendered for all painters.
|
|
||||||
pub fn update_image(&mut self, image: &mut DynamicImage) {
|
|
||||||
// Update the image for each specific painter handle
|
|
||||||
for handle in &self.painter_handles {
|
|
||||||
handle.update_image(image);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// A handle for a painter thread.
|
|
||||||
struct PainterHandle {
|
|
||||||
#[allow(dead_code)]
|
|
||||||
thread: JoinHandle<u32>,
|
|
||||||
area: Rect,
|
|
||||||
image_sender: Sender<DynamicImage>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl PainterHandle {
|
|
||||||
/// Create a new handle from the given properties.
|
|
||||||
pub fn new(thread: JoinHandle<u32>, area: Rect, image_sender: Sender<DynamicImage>) -> PainterHandle {
|
|
||||||
PainterHandle {
|
|
||||||
thread,
|
|
||||||
area,
|
|
||||||
image_sender,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Push an image update.
|
|
||||||
pub fn update_image(&self, full_image: &mut DynamicImage) {
|
|
||||||
// Crop the image to the area
|
|
||||||
let image = full_image.crop(
|
|
||||||
self.area.x,
|
|
||||||
self.area.y,
|
|
||||||
self.area.w,
|
|
||||||
self.area.h,
|
|
||||||
);
|
|
||||||
|
|
||||||
// Push a new image to the thread
|
|
||||||
// TODO: return this result
|
|
||||||
self.image_sender.send(image)
|
|
||||||
.expect("Failed to send image update to painter");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
struct Painter {
|
|
||||||
client: PixClient,
|
|
||||||
area: Rect,
|
|
||||||
offset: (u32, u32),
|
|
||||||
image: Option<DynamicImage>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Painter {
|
|
||||||
/// Create a new painter.
|
|
||||||
pub fn new(client: PixClient, area: Rect, offset: (u32, u32), image: Option<DynamicImage>) -> Painter {
|
|
||||||
Painter {
|
|
||||||
client,
|
|
||||||
area,
|
|
||||||
offset,
|
|
||||||
image,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Perform work.
|
|
||||||
/// Paint the whole defined area.
|
|
||||||
pub fn work(&mut self) -> Result<(), Error> {
|
|
||||||
// Make sure there is an image
|
|
||||||
if self.image.is_none() {
|
|
||||||
// Show a warning
|
|
||||||
println!("Painter thread has no image yet to paint, waiting...");
|
|
||||||
|
|
||||||
// Sleep a little
|
|
||||||
thread::sleep(Duration::from_millis(PAINTER_IMAGE_WAIT_DELAY_MILLIS));
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get an RGB image
|
|
||||||
let image = self.image.as_mut().unwrap().to_rgb();
|
|
||||||
|
|
||||||
// Loop through all the pixels, and set their color
|
|
||||||
for x in 0..self.area.w {
|
|
||||||
for y in 0..self.area.h {
|
|
||||||
// Get the pixel at this location
|
|
||||||
let pixel = image.get_pixel(x, y);
|
|
||||||
|
|
||||||
// Get the channels
|
|
||||||
let channels = pixel.channels();
|
|
||||||
|
|
||||||
// Define the color
|
|
||||||
let color = Color::from(
|
|
||||||
channels[0],
|
|
||||||
channels[1],
|
|
||||||
channels[2],
|
|
||||||
);
|
|
||||||
|
|
||||||
// Set the pixel
|
|
||||||
self.client.write_pixel(
|
|
||||||
x + self.area.x + self.offset.0,
|
|
||||||
y + self.area.y + self.offset.1,
|
|
||||||
&color,
|
|
||||||
)?;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Everything seems to be ok
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Update the image that should be painted
|
|
||||||
pub fn set_image(&mut self, image: DynamicImage) {
|
|
||||||
self.image = Some(image);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// A pixelflut client.
|
|
||||||
/// This client uses a stream to talk to a pixelflut panel.
|
|
||||||
/// It allows to write pixels to the panel, and read some status.
|
|
||||||
struct PixClient {
|
|
||||||
stream: BufStream<TcpStream>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl PixClient {
|
|
||||||
/// Create a new client instance.
|
|
||||||
pub fn new(stream: TcpStream) -> PixClient {
|
|
||||||
PixClient {
|
|
||||||
stream: BufStream::new(stream),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Write a pixel to the given stream.
|
|
||||||
fn write_pixel(&mut self, x: u32, y: u32, color: &Color) -> Result<(), Error> {
|
|
||||||
// Write the command to set a pixel
|
|
||||||
self.write_command(
|
|
||||||
format!("PX {} {} {}", x, y, color.as_hex()),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// /// Read the size of the screen.
|
|
||||||
// fn read_screen_size(&mut self) {
|
|
||||||
// // Read the screen size
|
|
||||||
// let size = self
|
|
||||||
// .write_read_command("SIZE".into())
|
|
||||||
// .expect("Failed to read screen size");
|
|
||||||
//
|
|
||||||
// // TODO: Remove this after debugging
|
|
||||||
// println!("Read size: {}", size);
|
|
||||||
// }
|
|
||||||
|
|
||||||
/// Write the given command to the given stream.
|
|
||||||
fn write_command(&mut self, cmd: String) -> Result<(), Error> {
|
|
||||||
// Write the pixels and a new line
|
|
||||||
self.stream.write(cmd.as_bytes())?;
|
|
||||||
self.stream.write("\n".as_bytes())?;
|
|
||||||
|
|
||||||
// Everything seems to be ok
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
// /// Write the given command to the given stream, and read the output.
|
|
||||||
// fn write_read_command(&mut self, cmd: String) -> Result<String, Error> {
|
|
||||||
// // Write the command
|
|
||||||
// self.write_command(cmd);
|
|
||||||
//
|
|
||||||
// // Read the output
|
|
||||||
// let mut buffer = String::with_capacity(CMD_READ_BUFFER_SIZE);
|
|
||||||
// println!("Reading line...");
|
|
||||||
// self.stream.read_line(&mut buffer)?;
|
|
||||||
// println!("Done reading");
|
|
||||||
//
|
|
||||||
// // Return the read string
|
|
||||||
// Ok(buffer)
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|||||||
82
src/painter.rs
Normal file
82
src/painter.rs
Normal file
@@ -0,0 +1,82 @@
|
|||||||
|
use std::io::Error;
|
||||||
|
use std::thread;
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use image::{DynamicImage, Pixel};
|
||||||
|
|
||||||
|
use app::PAINTER_IMAGE_WAIT_DELAY_MILLIS;
|
||||||
|
use color::Color;
|
||||||
|
use pix_client::PixClient;
|
||||||
|
use rect::Rect;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/// A painter that paints on a pixelflut panel.
|
||||||
|
pub struct Painter {
|
||||||
|
client: PixClient,
|
||||||
|
area: Rect,
|
||||||
|
offset: (u32, u32),
|
||||||
|
image: Option<DynamicImage>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Painter {
|
||||||
|
/// Create a new painter.
|
||||||
|
pub fn new(client: PixClient, area: Rect, offset: (u32, u32), image: Option<DynamicImage>) -> Painter {
|
||||||
|
Painter {
|
||||||
|
client,
|
||||||
|
area,
|
||||||
|
offset,
|
||||||
|
image,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Perform work.
|
||||||
|
/// Paint the whole defined area.
|
||||||
|
pub fn work(&mut self) -> Result<(), Error> {
|
||||||
|
// Make sure there is an image
|
||||||
|
if self.image.is_none() {
|
||||||
|
// Show a warning
|
||||||
|
println!("Painter thread has no image yet to paint, waiting...");
|
||||||
|
|
||||||
|
// Sleep a little
|
||||||
|
thread::sleep(Duration::from_millis(PAINTER_IMAGE_WAIT_DELAY_MILLIS));
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get an RGB image
|
||||||
|
let image = self.image.as_mut().unwrap().to_rgb();
|
||||||
|
|
||||||
|
// Loop through all the pixels, and set their color
|
||||||
|
for x in 0..self.area.w {
|
||||||
|
for y in 0..self.area.h {
|
||||||
|
// Get the pixel at this location
|
||||||
|
let pixel = image.get_pixel(x, y);
|
||||||
|
|
||||||
|
// Get the channels
|
||||||
|
let channels = pixel.channels();
|
||||||
|
|
||||||
|
// Define the color
|
||||||
|
let color = Color::from(
|
||||||
|
channels[0],
|
||||||
|
channels[1],
|
||||||
|
channels[2],
|
||||||
|
);
|
||||||
|
|
||||||
|
// Set the pixel
|
||||||
|
self.client.write_pixel(
|
||||||
|
x + self.area.x + self.offset.0,
|
||||||
|
y + self.area.y + self.offset.1,
|
||||||
|
&color,
|
||||||
|
)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Everything seems to be ok
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Update the image that should be painted
|
||||||
|
pub fn set_image(&mut self, image: DynamicImage) {
|
||||||
|
self.image = Some(image);
|
||||||
|
}
|
||||||
|
}
|
||||||
48
src/painter_handle.rs
Normal file
48
src/painter_handle.rs
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
extern crate image;
|
||||||
|
|
||||||
|
use std::sync::mpsc::Sender;
|
||||||
|
use std::thread::JoinHandle;
|
||||||
|
|
||||||
|
use image::DynamicImage;
|
||||||
|
|
||||||
|
use rect::Rect;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/// A handle to a painter thread.
|
||||||
|
///
|
||||||
|
/// This also holds a channel to the painter thread,
|
||||||
|
/// to allow image updates to be pushed to the thread.
|
||||||
|
pub struct PainterHandle {
|
||||||
|
#[allow(dead_code)]
|
||||||
|
thread: JoinHandle<u32>,
|
||||||
|
area: Rect,
|
||||||
|
image_sender: Sender<DynamicImage>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PainterHandle {
|
||||||
|
/// Create a new handle from the given properties.
|
||||||
|
pub fn new(thread: JoinHandle<u32>, area: Rect, image_sender: Sender<DynamicImage>) -> PainterHandle {
|
||||||
|
PainterHandle {
|
||||||
|
thread,
|
||||||
|
area,
|
||||||
|
image_sender,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Push an image update.
|
||||||
|
pub fn update_image(&self, full_image: &mut DynamicImage) {
|
||||||
|
// Crop the image to the area
|
||||||
|
let image = full_image.crop(
|
||||||
|
self.area.x,
|
||||||
|
self.area.y,
|
||||||
|
self.area.w,
|
||||||
|
self.area.h,
|
||||||
|
);
|
||||||
|
|
||||||
|
// Push a new image to the thread
|
||||||
|
// TODO: return this result
|
||||||
|
self.image_sender.send(image)
|
||||||
|
.expect("Failed to send image update to painter");
|
||||||
|
}
|
||||||
|
}
|
||||||
140
src/pix_canvas.rs
Normal file
140
src/pix_canvas.rs
Normal file
@@ -0,0 +1,140 @@
|
|||||||
|
use std::io::Error;
|
||||||
|
use std::net::TcpStream;
|
||||||
|
use std::sync::mpsc;
|
||||||
|
use std::sync::mpsc::{Sender, Receiver};
|
||||||
|
use std::thread;
|
||||||
|
|
||||||
|
use image::DynamicImage;
|
||||||
|
|
||||||
|
use painter::Painter;
|
||||||
|
use painter_handle::PainterHandle;
|
||||||
|
use pix_client::PixClient;
|
||||||
|
use rect::Rect;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/// A pixflut instance
|
||||||
|
pub struct PixCanvas {
|
||||||
|
host: String,
|
||||||
|
painter_count: usize,
|
||||||
|
painter_handles: Vec<PainterHandle>,
|
||||||
|
size: (u32, u32),
|
||||||
|
offset: (u32, u32),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PixCanvas {
|
||||||
|
/// Create a new pixelflut canvas.
|
||||||
|
pub fn new(
|
||||||
|
host: &str,
|
||||||
|
painter_count: usize,
|
||||||
|
size: (u32, u32),
|
||||||
|
offset: (u32, u32),
|
||||||
|
) -> PixCanvas {
|
||||||
|
// Initialize the object
|
||||||
|
let mut canvas = PixCanvas {
|
||||||
|
host: host.to_string(),
|
||||||
|
painter_count,
|
||||||
|
painter_handles: Vec::with_capacity(painter_count),
|
||||||
|
size,
|
||||||
|
offset,
|
||||||
|
};
|
||||||
|
|
||||||
|
// Show a status message
|
||||||
|
println!("Starting painter threads...");
|
||||||
|
|
||||||
|
// Spawn some painters
|
||||||
|
canvas.spawn_painters();
|
||||||
|
|
||||||
|
// Return the canvas
|
||||||
|
canvas
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Spawn the painters for this canvas
|
||||||
|
fn spawn_painters(&mut self) {
|
||||||
|
// Spawn some painters
|
||||||
|
for i in 0..self.painter_count {
|
||||||
|
// Determine the slice width
|
||||||
|
let width = self.size.0 / (self.painter_count as u32);
|
||||||
|
|
||||||
|
// Define the area to paint per thread
|
||||||
|
let painter_area = Rect::from(
|
||||||
|
(i as u32) * width,
|
||||||
|
0,
|
||||||
|
width,
|
||||||
|
self.size.1,
|
||||||
|
);
|
||||||
|
|
||||||
|
// Spawn the painter
|
||||||
|
self.spawn_painter(painter_area);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Spawn a single painter in a thread.
|
||||||
|
fn spawn_painter(&mut self, area: Rect) {
|
||||||
|
// Get the host that will be used
|
||||||
|
let host = self.host.to_string();
|
||||||
|
|
||||||
|
// Redefine the offset to make it usable in the thread
|
||||||
|
let offset = (self.offset.0, self.offset.1);
|
||||||
|
|
||||||
|
// Create a channel to push new images
|
||||||
|
let (tx, rx): (Sender<DynamicImage>, Receiver<DynamicImage>)
|
||||||
|
= mpsc::channel();
|
||||||
|
|
||||||
|
// Create the painter thread
|
||||||
|
let thread = thread::spawn(move || {
|
||||||
|
// Create a new stream
|
||||||
|
let stream = create_stream(host)
|
||||||
|
.expect("failed to open stream to pixelflut");
|
||||||
|
|
||||||
|
// Create a new client
|
||||||
|
let client = PixClient::new(stream);
|
||||||
|
|
||||||
|
// Create a painter
|
||||||
|
let mut painter = Painter::new(
|
||||||
|
client,
|
||||||
|
area,
|
||||||
|
offset,
|
||||||
|
None
|
||||||
|
);
|
||||||
|
|
||||||
|
// Do some work
|
||||||
|
loop {
|
||||||
|
// Work
|
||||||
|
painter.work()
|
||||||
|
.expect("Painter failed to perform work");
|
||||||
|
|
||||||
|
// Update the image to paint
|
||||||
|
if let Ok(image) = rx.try_recv() {
|
||||||
|
painter.set_image(image);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Create a new painter handle, pust it to the list
|
||||||
|
self.painter_handles.push(
|
||||||
|
PainterHandle::new(
|
||||||
|
thread,
|
||||||
|
area,
|
||||||
|
tx,
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update the image that is being rendered for all painters.
|
||||||
|
pub fn update_image(&mut self, image: &mut DynamicImage) {
|
||||||
|
// Update the image for each specific painter handle
|
||||||
|
for handle in &self.painter_handles {
|
||||||
|
handle.update_image(image);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/// Create a stream to talk to the pixelflut server.
|
||||||
|
///
|
||||||
|
/// The stream is returned as result.
|
||||||
|
fn create_stream(host: String) -> Result<TcpStream, Error> {
|
||||||
|
TcpStream::connect(host)
|
||||||
|
}
|
||||||
75
src/pix_client.rs
Normal file
75
src/pix_client.rs
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
extern crate bufstream;
|
||||||
|
|
||||||
|
use std::io::Error;
|
||||||
|
use std::io::prelude::*;
|
||||||
|
use std::net::TcpStream;
|
||||||
|
|
||||||
|
use self::bufstream::BufStream;
|
||||||
|
|
||||||
|
use color::Color;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/// A pixelflut client.
|
||||||
|
///
|
||||||
|
/// This client uses a stream to talk to a pixelflut panel.
|
||||||
|
/// It allows to write pixels to the panel, and read some status.
|
||||||
|
///
|
||||||
|
/// The client provides an interface for other logic to easily talk
|
||||||
|
/// to the pixelflut panel.
|
||||||
|
pub struct PixClient {
|
||||||
|
stream: BufStream<TcpStream>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PixClient {
|
||||||
|
/// Create a new client instance.
|
||||||
|
pub fn new(stream: TcpStream) -> PixClient {
|
||||||
|
PixClient {
|
||||||
|
stream: BufStream::new(stream),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Write a pixel to the given stream.
|
||||||
|
pub fn write_pixel(&mut self, x: u32, y: u32, color: &Color) -> Result<(), Error> {
|
||||||
|
// Write the command to set a pixel
|
||||||
|
self.write_command(
|
||||||
|
format!("PX {} {} {}", x, y, color.as_hex()),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// /// Read the size of the screen.
|
||||||
|
// fn read_screen_size(&mut self) {
|
||||||
|
// // Read the screen size
|
||||||
|
// let size = self
|
||||||
|
// .write_read_command("SIZE".into())
|
||||||
|
// .expect("Failed to read screen size");
|
||||||
|
//
|
||||||
|
// // TODO: Remove this after debugging
|
||||||
|
// println!("Read size: {}", size);
|
||||||
|
// }
|
||||||
|
|
||||||
|
/// Write the given command to the given stream.
|
||||||
|
fn write_command(&mut self, cmd: String) -> Result<(), Error> {
|
||||||
|
// Write the pixels and a new line
|
||||||
|
self.stream.write(cmd.as_bytes())?;
|
||||||
|
self.stream.write("\n".as_bytes())?;
|
||||||
|
|
||||||
|
// Everything seems to be ok
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
// /// Write the given command to the given stream, and read the output.
|
||||||
|
// fn write_read_command(&mut self, cmd: String) -> Result<String, Error> {
|
||||||
|
// // Write the command
|
||||||
|
// self.write_command(cmd);
|
||||||
|
//
|
||||||
|
// // Read the output
|
||||||
|
// let mut buffer = String::with_capacity(CMD_READ_BUFFER_SIZE);
|
||||||
|
// println!("Reading line...");
|
||||||
|
// self.stream.read_line(&mut buffer)?;
|
||||||
|
// println!("Done reading");
|
||||||
|
//
|
||||||
|
// // Return the read string
|
||||||
|
// Ok(buffer)
|
||||||
|
// }
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user