Rename distributions
This commit is contained in:
parent
221fbfbcb8
commit
811c5307e5
|
|
@ -12,25 +12,25 @@ pub struct SphereParams {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct SphereParamsDistribution {
|
pub struct SphereParamsDistribution {
|
||||||
pub drad: Uniform<f32>,
|
pub rad: Uniform<f32>,
|
||||||
pub dpos: Uniform<f32>,
|
pub pos: Uniform<f32>,
|
||||||
pub demit: Bernoulli,
|
pub emit: Bernoulli,
|
||||||
pub dampl: Uniform<f32>,
|
pub ampl: Uniform<f32>,
|
||||||
pub dfreq: Uniform<f32>,
|
pub freq: Uniform<f32>,
|
||||||
pub dphase: Uniform<f32>,
|
pub phase: Uniform<f32>,
|
||||||
pub dgloss: Uniform<f32>,
|
pub gloss: Uniform<f32>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for SphereParamsDistribution {
|
impl Default for SphereParamsDistribution {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Self {
|
Self {
|
||||||
drad: Uniform::new(0.01, 0.10),
|
rad: Uniform::new(0.01, 0.10),
|
||||||
dpos: Uniform::new(-1.0, 1.0),
|
pos: Uniform::new(-1.0, 1.0),
|
||||||
demit: Bernoulli::new(0.1).unwrap(),
|
emit: Bernoulli::new(0.1).unwrap(),
|
||||||
dampl: Uniform::new(0.3, 0.8),
|
ampl: Uniform::new(0.3, 0.8),
|
||||||
dfreq: Uniform::new(0.2, 1.5),
|
freq: Uniform::new(0.2, 1.5),
|
||||||
dphase: Uniform::new(0., 2. * std::f32::consts::PI),
|
phase: Uniform::new(0., 2. * std::f32::consts::PI),
|
||||||
dgloss: Uniform::new(0., 1.),
|
gloss: Uniform::new(0., 1.),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -38,13 +38,13 @@ impl Default for SphereParamsDistribution {
|
||||||
impl SphereParamsDistribution {
|
impl SphereParamsDistribution {
|
||||||
pub fn make_params(&self, rgen: &mut impl rand::Rng) -> SphereParams {
|
pub fn make_params(&self, rgen: &mut impl rand::Rng) -> SphereParams {
|
||||||
SphereParams {
|
SphereParams {
|
||||||
origin: self.dpos.sample3(rgen),
|
origin: self.pos.sample3(rgen),
|
||||||
radius: self.drad.sample(rgen),
|
radius: self.rad.sample(rgen),
|
||||||
alpha: if self.demit.sample(rgen) { 10.0 } else { 0.0 },
|
alpha: if self.emit.sample(rgen) { 10.0 } else { 0.0 },
|
||||||
glossiness: self.dgloss.sample(rgen),
|
glossiness: self.gloss.sample(rgen),
|
||||||
amplitudes: self.dampl.sample3(rgen),
|
amplitudes: self.ampl.sample3(rgen),
|
||||||
frequencies: self.dfreq.sample3(rgen),
|
frequencies: self.freq.sample3(rgen),
|
||||||
phases: self.dphase.sample3(rgen),
|
phases: self.phase.sample3(rgen),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user