added shadows

Author: AlexRomberg

src/lib.rs

@@ -7,7 +7,7 @@ use scene::light::Light;
 use scene::scene::get_pixel;
 use scene::sphere::Sphere;
 
-use crate::scene::triangle::{self, Triangle};
+use crate::scene::triangle::Triangle;
 use crate::util::color::Color;
 use crate::util::vector::Vec3;
 

src/scene/scene.rs

@@ -2,6 +2,7 @@ use crate::scene::light::Light;
 use crate::scene::sphere::Sphere;
 use crate::scene::triangle::Triangle;
 use crate::util::hit::Hit;
+use crate::util::ray;
 use crate::util::{color::Color, ray::Ray, vector::Vec3};
 
 pub fn get_pixel(
@@ -37,7 +38,38 @@ pub fn get_pixel(
     if let Some(hit) = nearest_hit {
         color = hit.color * ambient_intensity;
         for light in lights {
-            color += light.get_color(hit);
+            let to_light = light.position - hit.point;
+            let distance_to_light_2 = to_light.length2();
+            let ray_to_light = ray::Ray::new(hit.point, to_light.normalized());
+            let mut in_shadow = false;
+
+            for sphere in spheres {
+                if let Some(intersection) = sphere.get_hit(&ray_to_light) {
+                    if intersection.lambda > 0.0
+                        && intersection.lambda * intersection.lambda < distance_to_light_2
+                    {
+                        in_shadow = true;
+                        break;
+                    }
+                }
+            }
+
+            if !in_shadow {
+                for triangle in triangles {
+                    if let Some(intersection) = triangle.get_hit(&ray_to_light) {
+                        if intersection.lambda > 0.0
+                            && intersection.lambda * intersection.lambda < distance_to_light_2
+                        {
+                            in_shadow = true;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if !in_shadow {
+                color += light.get_color(hit);
+            }
         }
     }
 

src/util/vector.rs

@@ -12,11 +12,11 @@ impl Vec3 {
         Self { x, y, z }
     }
 
-    fn length(&self) -> f32 {
+    pub fn length(&self) -> f32 {
         self.length2().sqrt()
     }
 
-    fn length2(&self) -> f32 {
+    pub fn length2(&self) -> f32 {
         self.x * self.x + self.y * self.y + self.z * self.z
     }
 
@@ -40,14 +40,6 @@ impl Vec3 {
             z: self.x * other.y - self.y * other.x,
         }
     }
-
-    pub fn distance(&self, other: &Self) -> f32 {
-        (*self - *other).length()
-    }
-
-    pub fn distance2(&self, other: &Self) -> f32 {
-        (*self - *other).length2()
-    }
 }
 
 impl Add for Vec3 {

ui/src/app/services/scene.ts

@@ -43,14 +43,14 @@ export interface SceneConfig {
 const DEFAULT_SCENE: SceneConfig = {
   diffuseIntensity: 0.1,
   spheres: [
-    { name: 'Lime Left', center: { x: 650, y: 250, z: 1050 }, radius: 50, color: { r: 0, g: 1, b: 0 } },
+    { name: 'Ball top', center: { x: 500, y: 500, z: 500 }, radius: 50, color: { r: 0, g: 1, b: 0 } },
+    { name: 'Ball bottom', center: { x: 570, y: 200, z: 500 }, radius: 50, color: { r: 0, g: 1, b: 0 } },
   ],
   triangles: [
-    { name: 'TRI', pointA: { x: 500, y: 500, z: 500 }, pointB: { x: 600, y: 600, z: 500 }, pointC: { x: 500, y: 600, z: 500 }, color: { r: 1, g: 1, b: 1 } },
-    { name: 'TRI', pointA: { x: 500, y: 500, z: 500 }, pointB: { x: 600, y: 600, z: 500 }, pointC: { x: 600, y: 500, z: 500 }, color: { r: 1, g: 1, b: 1 } },
+    { name: 'Triangle', pointA: { x: 400, y: 400, z: 600 }, pointB: { x: 400, y: 300, z: 400 }, pointC: { x: 700, y: 300, z: 400 }, color: { r: 1, g: 1, b: 1 } },
   ],
   lights: [
-    { name: 'Main Light', center: { x: 800, y: 300, z: -400 }, color: { r: 1, g: 1, b: 1 } },
+    { name: 'Main light', center: { x: 500, y: 900, z: 500 }, color: { r: 1, g: 1, b: 1 } },
   ],
 };