added face

Author: AlexRomberg

src/lib.rs

@@ -1,15 +1,14 @@
-pub mod color;
-pub mod ray;
+mod color;
 mod scene;
-pub mod sphere;
-pub mod vector;
+mod sphere;
+mod util;
 
 use wasm_bindgen::prelude::*;
 use web_sys::{CanvasRenderingContext2d, HtmlCanvasElement, ImageData};
 
 use scene::get_pixel;
 
-use crate::vector::Vec3;
+use crate::util::vector::Vec3;
 
 #[wasm_bindgen]
 pub fn render(canvas: HtmlCanvasElement) -> Result<(), JsValue> {

src/scene.rs

@@ -1,35 +1,59 @@
 use crate::color::Color;
-use crate::ray::Ray;
 use crate::sphere::Sphere;
-use crate::vector::Vec3;
+use crate::util::{ray::Ray, vector::Vec3};
 
 pub fn circles() -> Vec<Sphere> {
     vec![
+        // Blue
         Sphere {
-            center: Vec3::new(600.0, 300.0, 500.0),
-            radius: 150.0,
+            center: Vec3::new(800.0, 400.0, 400.0),
+            radius: 250.0,
+            color: Color::new(0.0, 0.0, 1.0),
+        },
+        // Red
+        Sphere {
+            center: Vec3::new(800.0, 400.0, 150.0),
+            radius: 50.0,
             color: Color::new(1.0, 0.0, 0.0),
         },
-        // Circle {
-        //     center: Vec3::new(500.0, 500.0, 500.0),
-        //     radius: 150.0,
-        //     color: Color::new(0.0, 1.0, 0.0),
-        // },
-        // Circle {
-        //     center: Vec3::new(700.0, 500.0, 500.0),
-        //     radius: 150.0,
-        //     color: Color::new(0.0, 0.0, 1.0),
-        // },
+        // Light Blue left
+        Sphere {
+            center: Vec3::new(710.0, 310.0, 330.0),
+            radius: 150.0,
+            color: Color::new(0.0, 1.0, 1.0),
+        },
+        // Light Blue right
+        Sphere {
+            center: Vec3::new(890.0, 310.0, 330.0),
+            radius: 150.0,
+            color: Color::new(0.0, 1.0, 1.0),
+        },
+        // Lime left
+        Sphere {
+            center: Vec3::new(650.0, 250.0, 150.0),
+            radius: 50.0,
+            color: Color::new(0.0, 1.0, 0.0),
+        },
+        // Lime right
+        Sphere {
+            center: Vec3::new(950.0, 250.0, 150.0),
+            radius: 50.0,
+            color: Color::new(0.0, 1.0, 0.0),
+        },
     ]
 }
 
 pub fn get_pixel(point: &Vec3) -> Color {
-    let mut color = Color::new(1.0, 1.0, 1.0);
+    let mut color = Color::new(0.0, 0.0, 0.0);
     let ray = Ray::new(*point, Vec3::new(0.0, 0.0, 1.0));
+    let mut lambda = f32::INFINITY;
 
     for sphere in &circles() {
-        if sphere.contains(point) {
-            color = color + sphere.color;
+        if let Some(l) = sphere.get_lambda(&ray) {
+            if l < lambda {
+                lambda = l;
+                color = sphere.color;
+            }
         }
     }
 

src/sphere.rs

@@ -1,4 +1,7 @@
-use crate::{color::Color, vector::Vec3};
+use crate::{
+    color::Color,
+    util::{ray::Ray, vector::Vec3},
+};
 
 #[derive(Debug, Clone, Copy)]
 pub struct Sphere {
@@ -8,15 +11,16 @@ pub struct Sphere {
 }
 
 impl Sphere {
-    pub fn new(center: Vec3, radius: f32, color: Color) -> Self {
-        Self {
-            center,
-            radius,
-            color,
+    pub fn get_lambda(&self, ray: &Ray) -> Option<f32> {
+        let v = ray.origin - self.center;
+        let u = ray.direction;
+        let a = u.dot(&u);
+        let b = 2.0 * v.dot(&u);
+        let c = v.dot(&v) - self.radius * self.radius;
+        let root_content = b * b - 4.0 * a * c;
+        if root_content < 0.0 {
+            return None;
         }
-    }
-
-    pub fn contains(&self, point: &Vec3) -> bool {
-        point.distance2(&self.center) <= self.radius * self.radius
+        Some((-b - (root_content).sqrt()) / (2.0 * a))
     }
 }

src/util.rs

@@ -0,0 +1,2 @@
+pub mod ray;
+pub mod vector;

src/ray.rs src/util/ray.rssrc/ray.rs renamed to src/util/ray.rs

@@ -1,4 +1,4 @@
-use crate::vector::Vec3;
+use crate::util::vector::Vec3;
 
 pub struct Ray {
     pub origin: Vec3,

src/vector.rs src/util/vector.rssrc/vector.rs renamed to src/util/vector.rs

@@ -36,6 +36,7 @@ impl Vec3 {
     pub fn distance(&self, other: &Self) -> f32 {
         (*self - *other).length()
     }
+
     pub fn distance2(&self, other: &Self) -> f32 {
         (*self - *other).length2()
     }