diff --git a/src/bin/minitracer/anim.rs b/src/bin/minitracer/anim.rs index 7c81614..fc526be 100644 --- a/src/bin/minitracer/anim.rs +++ b/src/bin/minitracer/anim.rs @@ -12,25 +12,25 @@ pub struct SphereParams { } pub struct SphereParamsDistribution { - pub drad: Uniform, - pub dpos: Uniform, - pub demit: Bernoulli, - pub dampl: Uniform, - pub dfreq: Uniform, - pub dphase: Uniform, - pub dgloss: Uniform, + pub rad: Uniform, + pub pos: Uniform, + pub emit: Bernoulli, + pub ampl: Uniform, + pub freq: Uniform, + pub phase: Uniform, + pub gloss: Uniform, } impl Default for SphereParamsDistribution { fn default() -> Self { Self { - drad: Uniform::new(0.01, 0.10), - dpos: Uniform::new(-1.0, 1.0), - demit: Bernoulli::new(0.1).unwrap(), - dampl: Uniform::new(0.3, 0.8), - dfreq: Uniform::new(0.2, 1.5), - dphase: Uniform::new(0., 2. * std::f32::consts::PI), - dgloss: Uniform::new(0., 1.), + rad: Uniform::new(0.01, 0.10), + pos: Uniform::new(-1.0, 1.0), + emit: Bernoulli::new(0.1).unwrap(), + ampl: Uniform::new(0.3, 0.8), + freq: Uniform::new(0.2, 1.5), + phase: Uniform::new(0., 2. * std::f32::consts::PI), + gloss: Uniform::new(0., 1.), } } } @@ -38,13 +38,13 @@ impl Default for SphereParamsDistribution { impl SphereParamsDistribution { pub fn make_params(&self, rgen: &mut impl rand::Rng) -> SphereParams { SphereParams { - origin: self.dpos.sample3(rgen), - radius: self.drad.sample(rgen), - alpha: if self.demit.sample(rgen) { 10.0 } else { 0.0 }, - glossiness: self.dgloss.sample(rgen), - amplitudes: self.dampl.sample3(rgen), - frequencies: self.dfreq.sample3(rgen), - phases: self.dphase.sample3(rgen), + origin: self.pos.sample3(rgen), + radius: self.rad.sample(rgen), + alpha: if self.emit.sample(rgen) { 10.0 } else { 0.0 }, + glossiness: self.gloss.sample(rgen), + amplitudes: self.ampl.sample3(rgen), + frequencies: self.freq.sample3(rgen), + phases: self.phase.sample3(rgen), } } }