added triangle support

Author: AlexRomberg

src/lib.rs

@@ -22,7 +22,7 @@ fn parse_spheres(data: &[f32]) -> Vec<Sphere> {
 }
 
 fn parse_triangles(data: &[f32]) -> Vec<Triangle> {
-    data.chunks_exact(9)
+    data.chunks_exact(12)
         .map(|c| {
             Triangle::new(
                 Vec3::new(c[0], c[1], c[2]),
@@ -40,9 +40,16 @@ fn parse_lights(data: &[f32]) -> Vec<Light> {
         .collect()
 }
 
+#[wasm_bindgen(start)]
+pub fn init() {
+    #[cfg(feature = "console_error_panic_hook")]
+    console_error_panic_hook::set_once();
+}
+
 #[wasm_bindgen]
 pub fn render_rows(
     width: u32,
+    height: u32,
     start_row: u32,
     end_row: u32,
     sphere_data: &[f32],
@@ -59,7 +66,8 @@ pub fn render_rows(
 
     for y in start_row..end_row {
         for x in 0..width {
-            let point = Vec3::new(x as f32, y as f32, 0.0);
+            let flipped_y = height as f32 - y as f32 - 1.0;
+            let point = Vec3::new(x as f32, flipped_y, 0.0);
             let color = get_pixel(&point, &spheres, &triangles, &lights, diffuse_intensity);
             pixels.push((color.r * 255.0) as u8);
             pixels.push((color.g * 255.0) as u8);

src/scene/scene.rs

@@ -12,7 +12,7 @@ pub fn get_pixel(
     ambient_intensity: f32,
 ) -> Color {
     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 ray = Ray::new(*point, Vec3::new(0.0, 0.0, -1.0));
     let mut lambda = f32::INFINITY;
     let mut nearest_hit: Option<Hit> = None;
 

src/scene/triangle.rs

@@ -29,16 +29,15 @@ impl Triangle {
     }
 
     pub fn get_hit(&self, ray: &Ray) -> Option<Hit> {
-        let a = Matrix3x3::fromVectors([ray.direction, -self.v, -self.w]);
+        let a = Matrix3x3::from_vectors([ray.direction, -self.v, -self.w]);
         let b = self.point_a - ray.origin;
 
-        let hit_offsets = a * b;
-        if !(hit_offsets.x >= 0.0
-            && hit_offsets.y >= 0.0
-            && hit_offsets.y <= 1.0
-            && hit_offsets.z >= 0.0
-            && hit_offsets.z <= 1.0)
-        {
+        let hit_offsets = a.inverse() * b;
+        let lambda = hit_offsets.x;
+        let mu = hit_offsets.y;
+        let tao = hit_offsets.z;
+
+        if lambda <= 0.0 || mu < 0.0 || tao < 0.0 || mu + tao > 1.0 {
             return None;
         }
 

src/util/matrices.rs

@@ -7,7 +7,7 @@ pub struct Matrix3x3 {
 }
 
 impl Matrix3x3 {
-    pub fn fromVectors(vectors: [Vec3; 3]) -> Self {
+    pub fn from_vectors(vectors: [Vec3; 3]) -> Self {
         Self {
             matrix: [
                 vectors[0].x,