From 971372cf6350533e36db0404afedb1a36817037c Mon Sep 17 00:00:00 2001 From: Sakarias Johansson Date: Fri, 17 Feb 2023 17:48:41 +0100 Subject: =?UTF-8?q?=F0=9F=A7=B9=20Refactor=20rendering=20&=20Cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Refactored how the threading worked. Before it just keept up splitting the screen recursively for x number of times. Felt like using recursion was unnecessary. It's now just done in a loop instead. The user can control the behaviour by setting `num_threads_width` and `num_threads_height` which will split the image x number of times and run a thread for each. Split up the rendering function for one that does scaling and one that doesn't. I just don't want to deal with any kind of scaling when actually rendering the image. The code shouldn't change much so maintaining is going to be ok. - Fixed scaling issues where black bars would appear if the subimage size wasn't divisible by the scale. - Cleaned up a bunch of arcs and other things that wasn't neccesary any more. --- racer-tracer/src/main.rs | 89 +++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 54 deletions(-) (limited to 'racer-tracer/src/main.rs') diff --git a/racer-tracer/src/main.rs b/racer-tracer/src/main.rs index d97e3a1..b441dd0 100644 --- a/racer-tracer/src/main.rs +++ b/racer-tracer/src/main.rs @@ -13,7 +13,7 @@ mod vec3; use std::{ convert::TryFrom, - sync::{Arc, Mutex, RwLock}, + sync::RwLock, time::{Duration, Instant}, vec::Vec, }; @@ -25,38 +25,27 @@ use crate::{ camera::Camera, config::{Args, Config}, error::TracerError, - geometry::Hittable, - image::SubImage, render::render, scene::Scene, }; fn run(config: Config) -> Result<(), TracerError> { - let preview_render_data = Arc::new(config.preview); - let render_data = Arc::new(config.render); + let preview_render_data = config.preview; + let render_data = config.render; let image = image::Image::new(config.screen.width, config.screen.height); - let camera = Arc::new(RwLock::new(Camera::new(&image, 2.0, 1.0))); - let scene: Arc> = Arc::new(Box::new( - config - .scene - .ok_or(TracerError::NoScene()) - .and_then(Scene::from_file)?, - )); - let screen_buffer: Arc>> = - Arc::new(RwLock::new(vec![0; image.width * image.height])); + let camera = RwLock::new(Camera::new(&image, 2.0, 1.0)); + let scene: Scene = config + .scene + .ok_or(TracerError::NoScene()) + .and_then(Scene::from_file)?; + let screen_buffer: RwLock> = RwLock::new(vec![0; image.width * image.height]); - let window_res: Arc>> = Arc::new(Mutex::new(Ok(()))); - let sub_image: SubImage = (&image).into(); - let move_camera = Arc::clone(&camera); + let mut window_res: Result<(), TracerError> = Ok(()); + let move_camera = &camera; - let render_image = Arc::new(SignalEvent::manual(false)); - let window_render_image = Arc::clone(&render_image); - - let cancel_render = Arc::new(SignalEvent::manual(false)); - let window_cancel_render = cancel_render.clone(); - - let exit = Arc::new(SignalEvent::manual(false)); - let window_exit = Arc::clone(&exit); + let render_image = SignalEvent::manual(false); + let cancel_render = SignalEvent::manual(false); + let exit = SignalEvent::manual(false); rayon::scope(|s| { s.spawn(|_| { @@ -67,15 +56,14 @@ fn run(config: Config) -> Result<(), TracerError> { if render_image.wait_timeout(Duration::from_secs(0)) && render_image.status() { let render_time = Instant::now(); - let cancel_render_event = Arc::clone(&cancel_render); render( - Arc::clone(&screen_buffer), - Arc::clone(&camera), - &sub_image, - Arc::clone(&scene), - Arc::clone(&render_data), - render_data.recurse_depth, - Some(cancel_render_event), + &screen_buffer, + &camera, + &image, + &scene, + &render_data, + Some(&cancel_render), + None, ); println!( @@ -85,19 +73,19 @@ fn run(config: Config) -> Result<(), TracerError> { } else { // Render preview render( - Arc::clone(&screen_buffer), - Arc::clone(&camera), - &sub_image, - Arc::clone(&scene), - Arc::clone(&preview_render_data), - preview_render_data.recurse_depth, + &screen_buffer, + &camera, + &image, + &scene, + &preview_render_data, None, + Some(preview_render_data.scale), ); } } }); s.spawn(|_| { - let result = Window::new( + window_res = Window::new( "racer-tracer", image.width, image.height, @@ -117,12 +105,12 @@ fn run(config: Config) -> Result<(), TracerError> { std::thread::sleep(std::time::Duration::from_millis(10)); if window.is_key_released(Key::R) { - if window_render_image.status() { - window_cancel_render.signal(); - window_render_image.reset(); + if render_image.status() { + cancel_render.signal(); + render_image.reset(); } else { - window_render_image.signal(); - window_cancel_render.reset(); + render_image.signal(); + cancel_render.reset(); } } @@ -150,19 +138,12 @@ fn run(config: Config) -> Result<(), TracerError> { .map_err(|e| TracerError::FailedToUpdateWindow(e.to_string())) })? } - window_exit.signal(); + exit.signal(); Ok(()) }); - - if result.is_err() { - let mut a = window_res.lock().expect("Failed to get result lock."); - *a = result; - } }); }); - - let res = (window_res.lock().expect("Failed to get result lock.")).clone(); - res + window_res } use structopt::StructOpt; fn main() { -- cgit v1.2.3