k/raytracer-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Working threading

Browse source
This commit is contained in:
k 2026-04-13 14:02:39 -04:00
parent 993136ea9e
commit 8ec807c147
3 changed files with 49 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/material.rs
View file

@ -9,7 +9,7 @@ pub struct Scatter {
pub ray: Ray, pub ray: Ray,
} }
pub trait Material { pub trait Material: Send + Sync {
fn scatter(&self, r_in: &Ray, rec: &HitRecord, rng: &mut ThreadRng) -> Option<Scatter>; fn scatter(&self, r_in: &Ray, rec: &HitRecord, rng: &mut ThreadRng) -> Option<Scatter>;
} }

2
src/object.rs
View file

@ -5,7 +5,7 @@ use rand::prelude::*;
use std::sync::Arc; use std::sync::Arc;
pub trait Hittable { pub trait Hittable: Send + Sync{
fn hit(&self, ray: Ray, interval:Interval) -> Option<HitRecord>; fn hit(&self, ray: Ray, interval:Interval) -> Option<HitRecord>;
} }

49
src/render.rs
View file

@ -2,6 +2,7 @@ use crate::object::{HitRecord, Hittable};
use crate::vec3::{Interval, Ray, Vec3, Point3}; use crate::vec3::{Interval, Ray, Vec3, Point3};
use crate::image::Image; use crate::image::Image;
use std::sync::Arc; use std::sync::Arc;
use std::thread;
use rand::prelude::*; use rand::prelude::*;
@ -70,29 +71,53 @@ impl Camera {
pub fn render(&mut self, world: &World){ pub fn render(&mut self, world: &World){
let thread_count = thread::available_parallelism().unwrap().get() as i32;
let height = self.img.height;
let width = self.img.width;
let total_pixels = height*width;
let num_samples = 5;
//cast to const ref
let const_self = &*self;
let threads:Vec<Vec<((i32,i32),(f64,f64,f64))>> = thread::scope(|s|{
(0..thread_count).map(|i|{
s.spawn(move ||{
let mut rng:ThreadRng = rand::rng(); let mut rng:ThreadRng = rand::rng();
for y in 0..self.img.height { let start = (i*total_pixels)/thread_count;
for x in 0..self.img.width { let end = ((i+1)*total_pixels)/thread_count;
(start..end).map(|i|{
let x = i%width;
let y = i/width;
let (mut r,mut g,mut b) = (0.0,0.0,0.0); let (mut r,mut g,mut b) = (0.0,0.0,0.0);
let num_samples=10.0; let ray = const_self.get_ray(x,y,&mut rng);
let depth=10; for _ in 0..num_samples{
for _ in 0..num_samples as i32{ let (tr,tg,tb) = trace(ray, &world,10,&mut rng);
let ray = self.get_ray(x,y,&mut rng);
let (tr,tg,tb)= trace(ray, &world,depth,&mut rng);
r+=tr; r+=tr;
g+=tg; g+=tg;
b+=tb; b+=tb;
} }
r /= num_samples;
g /= num_samples; r/=num_samples as f64;
b /= num_samples; g/=num_samples as f64;
b/=num_samples as f64;
r = r.clamp(0.0,1.0).sqrt(); r = r.clamp(0.0,1.0).sqrt();
g = g.clamp(0.0,1.0).sqrt(); g = g.clamp(0.0,1.0).sqrt();
b = b.clamp(0.0,1.0).sqrt(); b = b.clamp(0.0,1.0).sqrt();
if let Some(px) = self.img.get_pixel(x,y){
((x,y),(r,g,b))
}).collect::<Vec<_>>()
})
}).collect::<Vec<_>>().into_iter().map(|t|{t.join().unwrap()}).collect()
});
for t in threads {
for c in t {
let ((x,y),rgb) = c;
let px = self.img.get_pixel(x,y).unwrap();
let (r,g,b)= rgb;
px.set_color(r,g,b); px.set_color(r,g,b);
} else{/*ignore*/}
} }
} }
self.img.save("./foo.ppm").unwrap(); self.img.save("./foo.ppm").unwrap();