Render image a tile at a time, so user can see progress
This commit is contained in:
parent
20d3e9ba8d
commit
86ef364ed2
|
|
@ -63,6 +63,24 @@ impl<T: RealField> ImageSampler<T> {
|
|||
}
|
||||
|
||||
pub fn render_scene<T: RealField>(output_image: &mut ImageRgbF<T>, scene: &Scene<T>) {
|
||||
partial_render_scene(
|
||||
output_image,
|
||||
scene,
|
||||
0,
|
||||
output_image.get_height(),
|
||||
0,
|
||||
output_image.get_width(),
|
||||
)
|
||||
}
|
||||
|
||||
pub fn partial_render_scene<T: RealField>(
|
||||
output_image: &mut ImageRgbF<T>,
|
||||
scene: &Scene<T>,
|
||||
row_start: u32,
|
||||
row_end: u32,
|
||||
column_start: u32,
|
||||
column_end: u32,
|
||||
) {
|
||||
let image_sampler = ImageSampler::new(
|
||||
output_image.get_width(),
|
||||
output_image.get_height(),
|
||||
|
|
@ -85,8 +103,8 @@ pub fn render_scene<T: RealField>(output_image: &mut ImageRgbF<T>, scene: &Scene
|
|||
],
|
||||
};
|
||||
let sampler = Sampler { scene };
|
||||
for column in 0..output_image.get_width() {
|
||||
for row in 0..output_image.get_height() {
|
||||
for column in column_start..column_end {
|
||||
for row in row_start..row_end {
|
||||
let ray = image_sampler.ray_for_pixel(row, column);
|
||||
let hit = sampler.sample(&ray);
|
||||
let colour = match hit {
|
||||
|
|
|
|||
41
src/main.rs
41
src/main.rs
|
|
@ -7,9 +7,10 @@ use std::time::Duration;
|
|||
|
||||
use nalgebra::Vector3;
|
||||
|
||||
use std::cmp::min;
|
||||
use std::rc::Rc;
|
||||
|
||||
use vanrijn::camera::render_scene;
|
||||
use vanrijn::camera::partial_render_scene;
|
||||
use vanrijn::colour::{ColourRgbF, NamedColour};
|
||||
use vanrijn::image::{ClampingToneMapper, ImageRgbF, ImageRgbU8, ToneMapper};
|
||||
use vanrijn::materials::LambertianMaterial;
|
||||
|
|
@ -90,16 +91,46 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||
)),
|
||||
],
|
||||
};
|
||||
render_scene(&mut output_image, &scene);
|
||||
|
||||
let mut event_pump = sdl_context.event_pump()?;
|
||||
let mut i = 0;
|
||||
'running: loop {
|
||||
let tile_size = 128;
|
||||
for tile_row in 0..(output_image.get_height() + 1) / tile_size {
|
||||
for tile_column in 0..(output_image.get_width() + 1) / tile_size {
|
||||
let row_start = tile_row * tile_size;
|
||||
let row_end = min(tile_row * tile_size + tile_size, output_image.get_width());
|
||||
let column_start = tile_column * tile_size;
|
||||
let column_end = min(
|
||||
tile_column * tile_size + tile_size,
|
||||
output_image.get_height(),
|
||||
);
|
||||
partial_render_scene(
|
||||
&mut output_image,
|
||||
&scene,
|
||||
row_start,
|
||||
row_end,
|
||||
column_start,
|
||||
column_end,
|
||||
);
|
||||
let mut output_image_rgbu8 = ImageRgbU8::new(image_width, image_height);
|
||||
ClampingToneMapper {}.apply_tone_mapping(&output_image, &mut output_image_rgbu8);
|
||||
update_texture(&output_image_rgbu8, &mut rendered_image_texture);
|
||||
canvas.copy(&rendered_image_texture, None, None)?;
|
||||
canvas.present();
|
||||
|
||||
let mut event_pump = sdl_context.event_pump()?;
|
||||
let mut i = 0;
|
||||
'running: loop {
|
||||
for event in event_pump.poll_iter() {
|
||||
match event {
|
||||
Event::Quit { .. }
|
||||
| Event::KeyDown {
|
||||
keycode: Some(Keycode::Escape),
|
||||
..
|
||||
} => break 'running,
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
i = (i + 1) % 255;
|
||||
for event in event_pump.poll_iter() {
|
||||
match event {
|
||||
|
|
|
|||
Loading…
Reference in New Issue