feat: added Y rotation

Wafelack · Dec 28, 2020 · 2244ed9 · 2244ed9
1 parent 9a93a2f
commit 2244ed9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/objects/hittable.rs b/src/objects/hittable.rs
@@ -146,10 +146,29 @@ impl Hittable for RotateY {
         let mut direction = r.direction();
 
         origin[0] = self.cos_theta * r.origin()[0] - self.sin_theta * r.origin()[2];
-        origin[0] = self.sin_theta * r.origin()[0] + self.cos_theta * r.origin()[2];
+        origin[2] = self.sin_theta * r.origin()[0] + self.cos_theta * r.origin()[2];
 
         direction[0] = self.cos_theta * r.direction()[0] - self.sin_theta * r.direction()[2];
-        direction[0] = self.sin_theta * r.direction()[0] + self.cos_theta * r.direction()[2];
+        direction[2] = self.sin_theta * r.direction()[0] + self.cos_theta * r.direction()[2];
+
+        let rotated_r = Ray::new(origin, direction, r.time());
+
+        if !self.ptr.hit(&rotated_r, t_min, t_max, rec) {
+            return false;
+        }
+
+        let mut p = rec.p;
+        let mut normal = rec.normal;
+
+        p[0] = self.cos_theta * rec.p[0] + self.sin_theta * rec.p[2];
+        p[2] = -self.sin_theta * rec.p[0] + self.cos_theta * rec.p[2];
+
+        normal[0] = self.cos_theta * rec.normal[0] + self.sin_theta * rec.normal[2];
+        normal[2] = -self.sin_theta * rec.normal[0] + self.cos_theta * rec.normal[2];
+
+        rec.p = p;
+
+        rec.set_face_normal(rotated_r, normal);
 
         true
     }

diff --git a/src/texture.rs b/src/texture.rs
@@ -167,3 +167,4 @@ impl Texture for ImageTexture {
     )
   }
 }
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -167,3 +167,4 @@ impl Texture for ImageTexture {
		)
		}
		}