From 6bd29a215227f3fc50191d61cef3390bead8fb95 Mon Sep 17 00:00:00 2001 From: Bill Thiede Date: Wed, 30 Oct 2019 19:54:51 -0700 Subject: [PATCH] rtiow: include render time in metadata written. --- rtiow/src/output.rs | 9 ++++++++- rtiow/src/renderer.rs | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/rtiow/src/output.rs b/rtiow/src/output.rs index 012c73e..ccf9777 100644 --- a/rtiow/src/output.rs +++ b/rtiow/src/output.rs @@ -3,6 +3,7 @@ use std::fs::File; use std::path::Path; use std::sync::Arc; use std::sync::Mutex; +use std::time; use chrono::Local; use image; @@ -38,6 +39,7 @@ struct ImageMetadata { #[serde(rename_all = "camelCase")] struct Data<'s> { timestamp: i64, + render_time_seconds: f32, scene: &'s Scene, image_metadata: Vec, } @@ -115,7 +117,11 @@ trait ImageSaver { Q: AsRef + Sized; } -pub fn write_images>(scene: &Scene, output_dir: P) -> std::io::Result<()> { +pub fn write_images>( + scene: &Scene, + render_time: time::Duration, + output_dir: P, +) -> std::io::Result<()> { let output_dir: &Path = output_dir.as_ref(); let debugger = DEBUGGER.lock().unwrap(); let now = Local::now(); @@ -204,6 +210,7 @@ pub fn write_images>(scene: &Scene, output_dir: P) -> std::io::Re f, &Data { timestamp: now.timestamp(), + render_time_seconds: render_time.as_secs_f32(), scene, image_metadata, }, diff --git a/rtiow/src/renderer.rs b/rtiow/src/renderer.rs index 21e3151..5c2fa8c 100644 --- a/rtiow/src/renderer.rs +++ b/rtiow/src/renderer.rs @@ -641,5 +641,5 @@ pub fn render(scene: Scene, output_dir: &Path) -> std::result::Result<(), std::i progress(&Default::default(), ¤t_stat, time_diff, pixel_total) ); - output::write_images(&scene, output_dir) + output::write_images(&scene, time_diff, output_dir) }