From c2b194940af6fbffadc9c9c94e7d97537d788ce2 Mon Sep 17 00:00:00 2001 From: Cameron Hart Date: Sat, 2 Jun 2018 09:05:20 +1000 Subject: [PATCH 1/2] Clamp RGB colour values before converting to u8. --- src/glium_window.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/glium_window.rs b/src/glium_window.rs index 99ff1ff..f33b12d 100644 --- a/src/glium_window.rs +++ b/src/glium_window.rs @@ -159,9 +159,9 @@ pub fn start_loop(params: Params, camera: Camera, scene: Scene, max_frames: Opti let mut mapping = buffer_texture.map(); for (texel, rgb) in mapping.iter_mut().zip(rgb_buffer.iter()) { *texel = ( - (255.99 * rgb.0).max(0.0) as u8, - (255.99 * rgb.1).max(0.0) as u8, - (255.99 * rgb.2).max(0.0) as u8, + (255.99 * rgb.0.min(1.0).max(0.0)) as u8, + (255.99 * rgb.1.min(1.0).max(0.0)) as u8, + (255.99 * rgb.2.min(1.0).max(0.0)) as u8, 255, ); } From 9f6fa121556239d3b206b578cbfc3192d9c410d6 Mon Sep 17 00:00:00 2001 From: Cameron Hart Date: Sat, 2 Jun 2018 09:06:00 +1000 Subject: [PATCH 2/2] Adjusted sky colour to match Aras' scene. --- src/scene.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scene.rs b/src/scene.rs index 93beef4..ab7aa90 100644 --- a/src/scene.rs +++ b/src/scene.rs @@ -162,7 +162,7 @@ impl Scene { // sky let unit_direction = ray_in.direction.normalize(); let t = 0.5 * (unit_direction.y + 1.0); - (1.0 - t) * vec3(1.0, 1.0, 1.0) + t * vec3(0.5, 0.7, 1.0) + (1.0 - t) * vec3(1.0, 1.0, 1.0) + t * vec3(0.5, 0.7, 1.0) * 0.3 } }