diff --git a/src/bin/minitracer/anim.rs b/src/bin/minitracer/anim.rs index 83f790a..7c81614 100644 --- a/src/bin/minitracer/anim.rs +++ b/src/bin/minitracer/anim.rs @@ -3,7 +3,6 @@ use rand_distr::{Bernoulli, Distribution, Uniform}; pub struct SphereParams { pub radius: f32, - pub color: Vec3, pub alpha: f32, pub glossiness: f32, pub origin: Vec3, @@ -15,7 +14,6 @@ pub struct SphereParams { pub struct SphereParamsDistribution { pub drad: Uniform, pub dpos: Uniform, - pub dcol: Uniform, pub demit: Bernoulli, pub dampl: Uniform, pub dfreq: Uniform, @@ -28,7 +26,6 @@ impl Default for SphereParamsDistribution { Self { drad: Uniform::new(0.01, 0.10), dpos: Uniform::new(-1.0, 1.0), - dcol: Uniform::new(0.0, 1.0), demit: Bernoulli::new(0.1).unwrap(), dampl: Uniform::new(0.3, 0.8), dfreq: Uniform::new(0.2, 1.5), @@ -43,7 +40,6 @@ impl SphereParamsDistribution { SphereParams { origin: self.dpos.sample3(rgen), radius: self.drad.sample(rgen), - color: self.dcol.sample3(rgen).normalize(), alpha: if self.demit.sample(rgen) { 10.0 } else { 0.0 }, glossiness: self.dgloss.sample(rgen), amplitudes: self.dampl.sample3(rgen), @@ -57,9 +53,9 @@ impl SphereParams { pub fn to_sphere(&self, time: f32) -> crate::Sphere { let center = self.origin + self.amplitudes * (self.frequencies * time + self.phases).map(|x| x.sin()); let radius = self.radius; - let emit_color = self.alpha * self.color; + let emit_color = self.alpha * vec3(0.9, 0.6, 0.1); let glossiness = self.glossiness; - let reflect_color = 0.6 * self.color + Vec3::splat(0.2); + let reflect_color = Vec3::splat(0.8); crate::Sphere { center, radius,