Spurious crashes - Switching to enums

Segfaults and stack overflows. I get overflows when running in either
debug or release. Segmentation faults when hooked up to GDB. I think it
may be related to the copying of uninitialized trait objects, but I
don't know.

I've decided the trait-based interface just isn't worth this. I'll
rearrange the materials into an Enum and a big match block.
This commit is contained in:
2023-06-04 09:19:25 -05:00
parent 5cc0b49cd9
commit d1bde8a1a8
4 changed files with 16 additions and 17 deletions

View File

@@ -5,16 +5,17 @@ use crate::hittable::{
HitRecord,
};
use crate::material::Material;
use crate::ray::Ray;
pub struct Sphere<'a>{
use std::rc::Rc;
pub struct Sphere{
pub center: Vec3,
pub radius: f32,
pub material: &'a Material,
pub material: Option<Rc<dyn Material>>,
}
impl<'a> Hittable for Sphere<'a> {
impl Hittable for Sphere {
fn hit(&self, r: Ray, t_min: f32, t_max: f32) -> Option<HitRecord>{
let oc = r.orig - self.center;
let a = r.dir.length_squared();
@@ -26,7 +27,7 @@ impl<'a> Hittable for Sphere<'a> {
return None;
}
let sqrtd = discriminant.sqrt();
// nearest root that lies within tolerance
let root = (-half_b - sqrtd) / a;
if root < t_min || root > t_max {
@@ -35,11 +36,10 @@ impl<'a> Hittable for Sphere<'a> {
return None;
}
}
let mut record = HitRecord{
p: r.at(root),
normal: (r.at(root) - self.center) / self.radius,
material: Some(self.material),
material: self.material.clone(),
t: root,
front_face: false,
};