move inputs to separate file & add Animation trait

This commit is contained in:
Michael Sippel 2024-08-03 19:58:25 +02:00
parent eb42f5fa54
commit 783631182c
Signed by: senvas
GPG key ID: 060F22F65102F95C
4 changed files with 34 additions and 19 deletions

24
src/inputs.rs Normal file
View file

@ -0,0 +1,24 @@
use {
std::time::Duration,
crate::waveform::Waveform
};
#[derive(Clone, Debug)]
pub struct Inputs {
pub t: Duration,
pub transition_time: Duration,
pub scene_select: usize,
pub cycle_len: Duration,
pub wave_peak: f32,
pub master_wave: Option< Waveform >,
pub master_subdivision: i32,
pub master_intensity: f32,
pub wheel: i32,
pub wheel2: i32,
}

View file

@ -16,6 +16,7 @@ use {
mod util;
mod fixture;
mod setup;
mod inputs;
mod view;
mod stripe_driver;
mod jack;
@ -32,25 +33,10 @@ use crate::{
util::get_angle,
scene_library::SceneLibrary,
waveform::Waveform
waveform::Waveform,
inputs::Inputs
};
#[derive(Clone, Debug)]
pub struct Inputs {
t: Duration,
transition_time: Duration,
scene_select: usize,
cycle_len: Duration,
wave_peak: f32,
master_wave: Option< Waveform >,
master_subdivision: i32,
master_intensity: f32,
wheel: i32,
wheel2: i32,
}
#[async_std::main]
async fn main() {
let event_loop = EventLoop::new().unwrap();

View file

@ -17,7 +17,6 @@ pub struct ArcticRain { pub inputs: Arc<RwLock< Inputs >> }
impl ColorGrid for ArcticRain {
fn get(&self, p: &Vector2<f32>) -> Rgb<f32> {
let inputs = self.inputs.read().unwrap().clone();
// let millis = self
let i = ( inputs.t.as_millis() as f32 / (4.0*inputs.cycle_len.as_millis() as f32) ) % 1.0;

View file

@ -1,9 +1,15 @@
use {
cgmath::Vector2,
prisma::Rgb
prisma::Rgb,
crate::inputs::Inputs
};
pub trait ColorGrid {
fn get(&self, pos: &Vector2<f32>) -> Rgb<f32>;
}
pub trait Animation {
fn advance(&mut self, inputs: Inputs);
}