From 899f81eed6c221dce22333ad03704b12d7634a54 Mon Sep 17 00:00:00 2001 From: Sakarias Johansson Date: Sun, 8 Jan 2023 17:51:44 +0100 Subject: =?UTF-8?q?=F0=9F=8C=8D=20Add=20Geometry?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Created a trait for all geometry that has to implement a hit function. Depending on if the ray hits or not it returns an option with the color. - Add support for multiple samples per pixel Current issues: - Using cooperative multitasking which isn't that helpful in this situation since it's like running without async but without overhead. Should switch to rayon. - All data gets copied once per job. Will decide later what to do (copy or put locks and share data between jobs). --- racer-tracer/src/scene.rs | 58 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 racer-tracer/src/scene.rs (limited to 'racer-tracer/src/scene.rs') diff --git a/racer-tracer/src/scene.rs b/racer-tracer/src/scene.rs new file mode 100644 index 0000000..2d530af --- /dev/null +++ b/racer-tracer/src/scene.rs @@ -0,0 +1,58 @@ +use crate::geometry::Hittable; + +pub struct Scene { + objects: Vec>, +} + +impl Scene { + pub fn new() -> Self { + Self { + objects: Vec::new(), + } + } + + pub fn add(&mut self, hittable: Box) { + self.objects.push(hittable); + } +} + +// TODO: What to do? +// Cloning everything is nice since then every task can do whatever they like. +// Cloning everything is bad becuse you copy everything which takes time. +// Could also put locks on the Scene but then it becomes this global object that everyone +// wants to access at the same time. +// Will do some laborations later and decide on a solution. +impl Clone for Scene { + fn clone(&self) -> Self { + let mut objects = Vec::with_capacity(self.objects.capacity()); + for i in self.objects.iter() { + objects.push(i.clone_box()); + } + Self { objects } + } +} + +impl Hittable for Scene { + fn hit( + &self, + ray: &crate::ray::Ray, + t_min: f64, + t_max: f64, + ) -> Option { + let mut rec = None; + let mut closes_so_far = t_max; + + for obj in self.objects.iter() { + if let Some(hit_rec) = obj.hit(ray, t_min, closes_so_far) { + closes_so_far = hit_rec.t; + rec = Some(hit_rec); + } + } + + rec + } + + fn clone_box(&self) -> Box { + Box::new(self.clone()) + } +} -- cgit v1.2.3