Public/rust_musiclight
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Decouple racer brightness from racer speed; change settings

Browse source
This commit is contained in:
Florian Jung 2022-06-25 21:37:34 +02:00 committed by Thomas Kolb
parent 23d5c67ba1
commit 6dbfcf9e9d
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/animation/racers.rs
View file

@ -14,24 +14,24 @@ const RGB_EXPONENT : f32 = 1.5;
const W_EXPONENT : f32 = 2.2; const W_EXPONENT : f32 = 2.2;
const W_SCALE : f32 = 0.3; const W_SCALE : f32 = 0.3;
const ENERGY_FILTER_ALPHA : f32 = 0.20; const ENERGY_FILTER_ALPHA : f32 = 0.20;
const BRIGHTNESS_FILTER_ALPHA : f32 = 0.10; const BRIGHTNESS_FILTER_ALPHA : f32 = 0.002;
const NUM_RACERS_R : usize = 20 * config::NUM_LEDS_TOTAL / 300; const NUM_RACERS_R : usize = 10 * config::NUM_LEDS_TOTAL / 300;
const NUM_RACERS_G : usize = 20 * config::NUM_LEDS_TOTAL / 300; const NUM_RACERS_G : usize = 10 * config::NUM_LEDS_TOTAL / 300;
const NUM_RACERS_B : usize = 20 * config::NUM_LEDS_TOTAL / 300; const NUM_RACERS_B : usize = 10 * config::NUM_LEDS_TOTAL / 300;
const RACER_MIN_SPEED_R : f32 = 0.5 / config::FPS_ANIMATION; const RACER_MIN_SPEED_R : f32 = 0.5 / config::FPS_ANIMATION;
const RACER_MAX_SPEED_R : f32 = 30.0 / config::FPS_ANIMATION; const RACER_MAX_SPEED_R : f32 = 80.0 / config::FPS_ANIMATION;
const RACER_MIN_BRIGHTNESS_R : f32 = 0.01; const RACER_MIN_BRIGHTNESS_R : f32 = 0.01;
const RACER_MAX_BRIGHTNESS_R : f32 = 1.00; const RACER_MAX_BRIGHTNESS_R : f32 = 1.00;
const RACER_MIN_SPEED_G : f32 = 0.5 / config::FPS_ANIMATION; const RACER_MIN_SPEED_G : f32 = 0.5 / config::FPS_ANIMATION;
const RACER_MAX_SPEED_G : f32 = 30.0 / config::FPS_ANIMATION; const RACER_MAX_SPEED_G : f32 = 80.0 / config::FPS_ANIMATION;
const RACER_MIN_BRIGHTNESS_G : f32 = 0.01; const RACER_MIN_BRIGHTNESS_G : f32 = 0.01;
const RACER_MAX_BRIGHTNESS_G : f32 = 1.00; const RACER_MAX_BRIGHTNESS_G : f32 = 1.00;
const RACER_MIN_SPEED_B : f32 = 0.5 / config::FPS_ANIMATION; const RACER_MIN_SPEED_B : f32 = 0.5 / config::FPS_ANIMATION;
const RACER_MAX_SPEED_B : f32 = 30.0 / config::FPS_ANIMATION; const RACER_MAX_SPEED_B : f32 = 80.0 / config::FPS_ANIMATION;
const RACER_MIN_BRIGHTNESS_B : f32 = 0.01; const RACER_MIN_BRIGHTNESS_B : f32 = 0.01;
const RACER_MAX_BRIGHTNESS_B : f32 = 1.00; const RACER_MAX_BRIGHTNESS_B : f32 = 1.00;
@ -106,10 +106,10 @@ impl Racer
(strip, led) (strip, led)
} }
pub fn update(&mut self, brightness: f32, flare_brightness: f32) pub fn update(&mut self, speed: f32, brightness: f32, flare_brightness: f32)
{ {
// move along the strip // move along the strip
let cur_speed = self.min_speed + brightness * (self.max_speed - self.min_speed); let cur_speed = self.min_speed + speed * (self.max_speed - self.min_speed);
self.pos += (self.direction as f32) * cur_speed; self.pos += (self.direction as f32) * cur_speed;
@ -346,9 +346,10 @@ impl Animation for Racers
// update all racers // update all racers
let f = &self.filtered_brightness; let f = &self.filtered_brightness;
self.racers_r.iter_mut().for_each(|x| x.update(f.r, f.w)); let speed = &brightness;
self.racers_g.iter_mut().for_each(|x| x.update(f.g, f.w)); self.racers_r.iter_mut().for_each(|x| x.update(speed.r, f.r, f.w));
self.racers_b.iter_mut().for_each(|x| x.update(f.b, f.w)); self.racers_g.iter_mut().for_each(|x| x.update(speed.g, f.g, f.w));
self.racers_b.iter_mut().for_each(|x| x.update(speed.b, f.b, f.w));
// render all racers // render all racers
for racer in self.racers_r.iter() { for racer in self.racers_r.iter() {