Compare commits

..

2 commits

Author SHA1 Message Date
cc29d5226b fix: rename bling animation 2022-06-17 21:09:01 +02:00
7020006e89 feat: add image display mode 2022-06-17 21:09:01 +02:00
2 changed files with 4 additions and 16 deletions

View file

@ -13,7 +13,7 @@ use std::{
use bracket_color::prelude::{HSV, RGB}; use bracket_color::prelude::{HSV, RGB};
use clap::{Parser, Subcommand}; use clap::{Parser, Subcommand};
use image::{imageops::FilterType, io::Reader as ImageReader, Pixel, Rgb, RgbImage}; use image::{Pixel, Rgb, RgbImage};
use rand::Rng; use rand::Rng;
use splink_client::{send_frame, Layout}; use splink_client::{send_frame, Layout};
@ -193,10 +193,7 @@ fn main() -> anyhow::Result<()> {
send_frame(&socket, layout, frame_num, &image)?; send_frame(&socket, layout, frame_num, &image)?;
} }
Action::Image { path } => { Action::Image { path } => {
let image = ImageReader::open(path)? let image = RgbImage::new(layout.width_px(), layout.height_px());
.decode()?
.resize_to_fill(layout.width_px(), layout.height_px(), FilterType::Gaussian)
.into_rgb8();
let frame_num: u32 = rand::thread_rng().gen(); let frame_num: u32 = rand::thread_rng().gen();
send_frame(&socket, layout, frame_num, &image)?; send_frame(&socket, layout, frame_num, &image)?;
} }

View file

@ -23,9 +23,6 @@ pub struct Strandifier<'a> {
pixels_remaining: u32, pixels_remaining: u32,
next_x: u32, next_x: u32,
next_y: u32, next_y: u32,
offset_x: u32,
offset_y: u32,
} }
impl<'a> Strandifier<'a> { impl<'a> Strandifier<'a> {
@ -44,7 +41,7 @@ impl<'a> Strandifier<'a> {
image: &'a RgbImage, image: &'a RgbImage,
strand_num: u32, strand_num: u32,
) -> Result<Self, StrandifierError> { ) -> Result<Self, StrandifierError> {
if layout.width_px() < image.width() || layout.height_px() < image.height() { if layout.width_px() != image.width() || layout.height_px() != image.height() {
return Err(StrandifierError::WrongDimensions); return Err(StrandifierError::WrongDimensions);
} }
@ -58,9 +55,6 @@ impl<'a> Strandifier<'a> {
let first_x = panel_x * layout.gang_len; let first_x = panel_x * layout.gang_len;
let first_y = panel_y * layout.num_gangs; let first_y = panel_y * layout.num_gangs;
let offset_x = (layout.width_px() - image.width()) / 2;
let offset_y = (layout.height_px() - image.height()) / 2;
Ok(Self { Ok(Self {
layout, layout,
image, image,
@ -68,9 +62,6 @@ impl<'a> Strandifier<'a> {
pixels_remaining: layout.strand_len(), pixels_remaining: layout.strand_len(),
next_x: first_x, next_x: first_x,
next_y: first_y, next_y: first_y,
offset_x,
offset_y,
}) })
} }
} }
@ -107,7 +98,7 @@ impl<'a> Iterator for Strandifier<'a> {
} }
self.pixels_remaining -= 1; self.pixels_remaining -= 1;
Some(*self.image.get_pixel(x + self.offset_x, y + self.offset_y)) Some(*self.image.get_pixel(x, y))
} }
fn size_hint(&self) -> (usize, Option<usize>) { fn size_hint(&self) -> (usize, Option<usize>) {