hal8174/ray-tracing2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix camera for egui renderer

Browse source
This commit is contained in:
hal8174 2024-11-29 20:24:49 +01:00
parent 1bfef16afa
commit 632cb97007
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ray-tracing-core/src/camera.rs
View file

@ -6,6 +6,7 @@ pub trait Camera<R: Rng> {
fn height(&self) -> u32; fn height(&self) -> u32;
} }
#[derive(Debug)]
pub struct BasicCamera { pub struct BasicCamera {
width: u32, width: u32,
height: u32, height: u32,
@ -55,10 +56,11 @@ impl BasicCamera {
impl<R: Rng> Camera<R> for BasicCamera { impl<R: Rng> Camera<R> for BasicCamera {
fn forward(&self, x: u32, y: u32, rng: &mut R) -> Ray { fn forward(&self, x: u32, y: u32, rng: &mut R) -> Ray {
// normalize x and y to -0.5 to 0.5 // normalize x and y to -0.5 to 0.5
let x = ((x as Float + rng.gen::<Float>()) / (self.width as Float)) - 0.5;
let y = ((y as Float + rng.gen::<Float>()) / (self.height as Float)) - 0.5;
let dir = self.dir + x * self.h + y * self.v; let x_float = ((x as Float + rng.gen::<Float>()) / (self.width as Float)) - 0.5;
let y_float = ((y as Float + rng.gen::<Float>()) / (self.height as Float)) - 0.5;
let dir = self.dir + x_float * self.h + y_float * self.v;
Ray::new(self.pos, dir.normalize(), 0.0) Ray::new(self.pos, dir.normalize(), 0.0)
} }

3
ray-tracing-egui/src/render.rs
View file

@ -99,6 +99,7 @@ pub fn render_thread(
e.camera_up, e.camera_up,
e.horizontal_fov, e.horizontal_fov,
); );
dbg!(&camera);
buffer = vec![0.0; settings.width as usize * settings.height as usize * 3]; buffer = vec![0.0; settings.width as usize * settings.height as usize * 3];
renderer = (RENDERER[settings.renderer_id].1)(settings.width, settings.height); renderer = (RENDERER[settings.renderer_id].1)(settings.width, settings.height);
samples = 0; samples = 0;
@ -106,7 +107,7 @@ pub fn render_thread(
buffer.par_chunks_mut(3).enumerate().for_each(|(i, c)| { buffer.par_chunks_mut(3).enumerate().for_each(|(i, c)| {
let x = (i % settings.width as usize) as u32; let x = (i % settings.width as usize) as u32;
let y = (i / settings.height as usize) as u32; let y = (i / settings.width as usize) as u32;
let mut rng = SmallRng::seed_from_u64( let mut rng = SmallRng::seed_from_u64(
(x + y * settings.width) as u64 (x + y * settings.width) as u64

2
ray-tracing-image/src/main.rs
View file

@ -58,5 +58,5 @@ fn main() -> ImageResult<()> {
let r = PathTracerImportance::new(400, 400); let r = PathTracerImportance::new(400, 400);
render_image(&r, &s.scene, &c, "test.exr", 1048) render_image(&r, &(s.scene)(), &c, "test.exr", 1048)
} }