matthew
/
vanrijn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make ToneMapper generic over it's input type

This commit is contained in:
Matthew Gordon 2020-09-01 23:33:32 -04:00
parent 7c8baf57da
commit eccb444721
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/image.rs
View File

@ -67,7 +67,7 @@ impl ImageRgbU8 {
} }
pub struct ImageRgbF { pub struct ImageRgbF {
data: Array2D<ColourRgbF>, pub data: Array2D<ColourRgbF>,
} }
impl ImageRgbF { impl ImageRgbF {
@ -127,8 +127,8 @@ impl NormalizedAsByte for f64 {
} }
} }
pub trait ToneMapper { pub trait ToneMapper<SourceType> {
fn apply_tone_mapping(&self, image_in: &ImageRgbF, image_out: &mut ImageRgbU8); fn apply_tone_mapping(&self, image_in: &Array2D<SourceType>, image_out: &mut ImageRgbU8);
} }
#[derive(Default)] #[derive(Default)]
@ -140,13 +140,13 @@ impl ClampingToneMapper {
} }
} }
impl ToneMapper for ClampingToneMapper { impl ToneMapper<ColourRgbF> for ClampingToneMapper {
fn apply_tone_mapping(&self, image_in: &ImageRgbF, image_out: &mut ImageRgbU8) { fn apply_tone_mapping(&self, image_in: &Array2D<ColourRgbF>, image_out: &mut ImageRgbU8) {
assert!(image_in.get_width() == image_out.get_width()); assert!(image_in.get_width() == image_out.get_width());
assert!(image_in.get_height() == image_out.get_height()); assert!(image_in.get_height() == image_out.get_height());
for column in 0..image_in.get_width() { for column in 0..image_in.get_width() {
for row in 0..image_in.get_height() { for row in 0..image_in.get_height() {
let colour = image_in.get_colour(row, column); let colour = image_in[row][column];
image_out.set_colour( image_out.set_colour(
row, row,
column, column,
@ -264,7 +264,7 @@ mod tests {
let mut image_in = ImageRgbF::new(1, 1); let mut image_in = ImageRgbF::new(1, 1);
let mut image_out = ImageRgbU8::new(1, 1); let mut image_out = ImageRgbU8::new(1, 1);
image_in.set_colour(0, 0, ColourRgbF::new(0.0, 0.0, 0.0)); image_in.set_colour(0, 0, ColourRgbF::new(0.0, 0.0, 0.0));
target.apply_tone_mapping(&image_in, &mut image_out); target.apply_tone_mapping(&image_in.data, &mut image_out);
assert!(image_out.get_colour(0, 0).values == [0, 0, 0]); assert!(image_out.get_colour(0, 0).values == [0, 0, 0]);
} }
@ -274,7 +274,7 @@ mod tests {
let mut image_in = ImageRgbF::new(1, 1); let mut image_in = ImageRgbF::new(1, 1);
let mut image_out = ImageRgbU8::new(1, 1); let mut image_out = ImageRgbU8::new(1, 1);
image_in.set_colour(0, 0, ColourRgbF::new(1.0, 1.0, 1.0)); image_in.set_colour(0, 0, ColourRgbF::new(1.0, 1.0, 1.0));
target.apply_tone_mapping(&image_in, &mut image_out); target.apply_tone_mapping(&image_in.data, &mut image_out);
assert!(image_out.get_colour(0, 0).values == [0xff, 0xff, 0xff]); assert!(image_out.get_colour(0, 0).values == [0xff, 0xff, 0xff]);
} }
@ -284,7 +284,7 @@ mod tests {
let mut image_in = ImageRgbF::new(1, 1); let mut image_in = ImageRgbF::new(1, 1);
let mut image_out = ImageRgbU8::new(1, 1); let mut image_out = ImageRgbU8::new(1, 1);
image_in.set_colour(0, 0, ColourRgbF::new(2.0, 2.0, 2.0)); image_in.set_colour(0, 0, ColourRgbF::new(2.0, 2.0, 2.0));
target.apply_tone_mapping(&image_in, &mut image_out); target.apply_tone_mapping(&image_in.data, &mut image_out);
assert!(image_out.get_colour(0, 0).values == [0xff, 0xff, 0xff]); assert!(image_out.get_colour(0, 0).values == [0xff, 0xff, 0xff]);
} }
@ -294,7 +294,7 @@ mod tests {
let mut image_in = ImageRgbF::new(1, 1); let mut image_in = ImageRgbF::new(1, 1);
let mut image_out = ImageRgbU8::new(1, 1); let mut image_out = ImageRgbU8::new(1, 1);
image_in.set_colour(0, 0, ColourRgbF::new(0.0, 2.0, 0.0)); image_in.set_colour(0, 0, ColourRgbF::new(0.0, 2.0, 0.0));
target.apply_tone_mapping(&image_in, &mut image_out); target.apply_tone_mapping(&image_in.data, &mut image_out);
assert!(image_out.get_colour(0, 0).values == [0x0, 0xff, 0x0]); assert!(image_out.get_colour(0, 0).values == [0x0, 0xff, 0x0]);
} }
@ -304,7 +304,7 @@ mod tests {
let mut image_in = ImageRgbF::new(1, 1); let mut image_in = ImageRgbF::new(1, 1);
let mut image_out = ImageRgbU8::new(1, 1); let mut image_out = ImageRgbU8::new(1, 1);
image_in.set_colour(0, 0, ColourRgbF::new(0.5, 0.0, 0.0)); image_in.set_colour(0, 0, ColourRgbF::new(0.5, 0.0, 0.0));
target.apply_tone_mapping(&image_in, &mut image_out); target.apply_tone_mapping(&image_in.data, &mut image_out);
assert!(image_out.get_colour(0, 0).values == [0x7f, 0x0, 0x0]); assert!(image_out.get_colour(0, 0).values == [0x7f, 0x0, 0x0]);
} }
} }

3
src/main.rs
View File

@ -211,7 +211,8 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
for message in tile_rx.try_iter() { for message in tile_rx.try_iter() {
if let Some((tile, tile_image)) = message { if let Some((tile, tile_image)) = message {
let mut tile_image_rgbu8 = ImageRgbU8::new(tile.width(), tile.height()); let mut tile_image_rgbu8 = ImageRgbU8::new(tile.width(), tile.height());
ClampingToneMapper {}.apply_tone_mapping(&tile_image, &mut tile_image_rgbu8); ClampingToneMapper {}
.apply_tone_mapping(&tile_image.data, &mut tile_image_rgbu8);
update_texture(&tile, &tile_image_rgbu8, &mut rendered_image_texture); update_texture(&tile, &tile_image_rgbu8, &mut rendered_image_texture);
update_image(&tile, &tile_image_rgbu8, &mut rendered_image); update_image(&tile, &tile_image_rgbu8, &mut rendered_image);
canvas.copy(&rendered_image_texture, None, None).unwrap(); canvas.copy(&rendered_image_texture, None, None).unwrap();