Merge branch 'spheres_simd' into spheres_simd_wrapped

bitshifter · Jun 1, 2018 · b0b0e22 · b0b0e22
2 parents 110377f + b333074
commit b0b0e22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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,
                         );
                     }

diff --git a/src/scene.rs b/src/scene.rs
@@ -154,7 +154,7 @@ impl Scene {
         } else {
             // sky
             let t = 0.5 * (ray_in.direction.get_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
         }
     }