wathiede/raytracers
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Plumb --adaptive flag for adaptive subsampling.

Browse Source
This commit is contained in:
Bill Thiede 2019-10-12 20:41:07 -07:00
parent 7b5571344e
commit 051482e7fe
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rtiow/src/renderer.rs
View File

@ -146,9 +146,12 @@ pub struct Opt {
/// Sub-samples per pixel /// Sub-samples per pixel
#[structopt(short = "s", long = "subsample", default_value = "8")] #[structopt(short = "s", long = "subsample", default_value = "8")]
pub subsamples: usize, pub subsamples: usize,
/// Use adaptive subsampling
#[structopt(long = "adaptive")]
pub adaptive_subsampling: bool,
/// Select scene to render, one of: "bench", "book", "tutorial", "bvh", "test", "cornell_box", /// Select scene to render, one of: "bench", "book", "tutorial", "bvh", "test", "cornell_box",
/// "cornell_smoke", "perlin_debug", "final" /// "cornell_smoke", "perlin_debug", "final"
#[structopt(long = "model", default_value = "perlin_debug")] #[structopt(long = "model", default_value = "book")]
pub model: Model, pub model: Model,
/// Path to store pprof profile data, i.e. /tmp/cpuprofile.pprof /// Path to store pprof profile data, i.e. /tmp/cpuprofile.pprof
#[structopt(long = "pprof", parse(from_os_str))] #[structopt(long = "pprof", parse(from_os_str))]
@ -180,6 +183,8 @@ pub struct Scene {
pub world: Box<dyn Hit>, pub world: Box<dyn Hit>,
pub camera: Camera, pub camera: Camera,
pub subsamples: usize, pub subsamples: usize,
/// overrides subsamples setting.
pub adaptive_subsampling: bool,
pub num_threads: Option<usize>, pub num_threads: Option<usize>,
pub width: usize, pub width: usize,
pub height: usize, pub height: usize,
@ -214,6 +219,7 @@ impl Default for Scene {
)), )),
camera, camera,
subsamples: 0, subsamples: 0,
adaptive_subsampling: false,
num_threads: None, num_threads: None,
width: 0, width: 0,
height: 0, height: 0,
@ -304,10 +310,14 @@ static PIXEL_COUNT: AtomicUsize = AtomicUsize::new(0);
fn render_pixel(scene: &Scene, x: usize, y: usize) -> Vec3 { fn render_pixel(scene: &Scene, x: usize, y: usize) -> Vec3 {
let mut pixel: Vec3 = Default::default(); let mut pixel: Vec3 = Default::default();
for _ in 0..scene.subsamples { let pixel = if scene.adaptive_subsampling {
pixel = pixel + trace_pixel(x, y, scene); Default::default()
} } else {
pixel = pixel / scene.subsamples as f32; for _ in 0..scene.subsamples {
pixel = pixel + trace_pixel(x, y, scene);
}
pixel / scene.subsamples as f32
};
// Gamma correct, use gamma 2 correction, which is 1/gamma where gamma=2 which is 1/2 or // Gamma correct, use gamma 2 correction, which is 1/gamma where gamma=2 which is 1/2 or
// sqrt. // sqrt.
PIXEL_COUNT.fetch_add(1, Ordering::SeqCst); PIXEL_COUNT.fetch_add(1, Ordering::SeqCst);
@ -351,6 +361,7 @@ pub fn render(scene: Scene, output_dir: &Path) -> std::result::Result<(), std::i
let scene = Arc::new(scene); let scene = Arc::new(scene);
let pixel_req_rx = Arc::new(Mutex::new(pixel_req_rx)); let pixel_req_rx = Arc::new(Mutex::new(pixel_req_rx));
info!("Creating {} render threads", num_threads); info!("Creating {} render threads", num_threads);
info!("Adaptive subsampling: {}", scene.adaptive_subsampling);
for i in 0..num_threads { for i in 0..num_threads {
let s = sync::Arc::clone(&scene); let s = sync::Arc::clone(&scene);
let pixel_req_rx = pixel_req_rx.clone(); let pixel_req_rx = pixel_req_rx.clone();

1
rtiow/src/scenes/book.rs
View File

@ -51,6 +51,7 @@ pub fn new(opt: &Opt) -> Scene {
camera, camera,
world, world,
subsamples: opt.subsamples, subsamples: opt.subsamples,
adaptive_subsampling: opt.adaptive_subsampling,
num_threads: opt.num_threads, num_threads: opt.num_threads,
width: opt.width, width: opt.width,
height: opt.height, height: opt.height,