Made the rng persist from frame to frame, so particles don't spawn in the same place every time

macos-click-through
Jon Valdés 5 years ago
parent b29a83214a
commit 0fc2680098

@ -179,6 +179,7 @@ pub struct ParticleTrail {
particles: Vec<ParticleData>, particles: Vec<ParticleData>,
previous_cursor_dest: Point, previous_cursor_dest: Point,
trail_mode: TrailMode, trail_mode: TrailMode,
rng: RngState,
} }
impl ParticleTrail { impl ParticleTrail {
@ -187,6 +188,7 @@ impl ParticleTrail {
particles: vec![], particles: vec![],
previous_cursor_dest: Point::new(0.0, 0.0), previous_cursor_dest: Point::new(0.0, 0.0),
trail_mode: trail_mode.clone(), trail_mode: trail_mode.clone(),
rng: RngState::new(),
} }
} }
@ -236,8 +238,6 @@ impl CursorVfx for ParticleTrail {
let prev_p = self.previous_cursor_dest; let prev_p = self.previous_cursor_dest;
let mut rng = RngState::new();
for i in 0..particle_count { for i in 0..particle_count {
let t = i as f32 / (particle_count as f32); let t = i as f32 / (particle_count as f32);
@ -246,9 +246,9 @@ impl CursorVfx for ParticleTrail {
let phase = t * 60.0; // TODO -- Hardcoded spiral curl let phase = t * 60.0; // TODO -- Hardcoded spiral curl
Point::new(phase.sin(), phase.cos()) * 20.0 // TODO -- Hardcoded spiral outward speed Point::new(phase.sin(), phase.cos()) * 20.0 // TODO -- Hardcoded spiral outward speed
} }
TrailMode::Torpedo => rng.rand_dir_normalized() * 10.0, // TODO -- Hardcoded particle speed TrailMode::Torpedo => self.rng.rand_dir_normalized() * 10.0, // TODO -- Hardcoded particle speed
TrailMode::PixieDust => { TrailMode::PixieDust => {
let base_dir = rng.rand_dir_normalized(); let base_dir = self.rng.rand_dir_normalized();
let dir = Point::new(base_dir.x * 0.5, 0.4 + base_dir.y.abs()); let dir = Point::new(base_dir.x * 0.5, 0.4 + base_dir.y.abs());
dir * 30.0 // TODO -- hardcoded particle speed dir * 30.0 // TODO -- hardcoded particle speed
} }
@ -259,7 +259,7 @@ impl CursorVfx for ParticleTrail {
// Distribute particles along the travel distance, with a random offset to make it // Distribute particles along the travel distance, with a random offset to make it
// look random // look random
let pos = prev_p + travel * rng.next_f32(); let pos = prev_p + travel * self.rng.next_f32();
self.add_particle(pos, speed, t * settings.vfx_particle_lifetime); self.add_particle(pos, speed, t * settings.vfx_particle_lifetime);
} }

Loading…
Cancel
Save