update hw6

Author: Bayonetta

Assignment5/codes/Sphere.hpp

@@ -58,7 +58,7 @@ class Sphere : public Object
         if (!solveQuadratic(a, b, c, t0, t1))
             return false;
         if (t0 < 0)
-            t0 = t1;
+            t0 = t2;
         if (t0 < 0)
             return false;
         tnear = t0;

Assignment6/codes/BVH.cpp

@@ -105,5 +105,16 @@ Intersection BVHAccel::Intersect(const Ray& ray) const
 Intersection BVHAccel::getIntersection(BVHBuildNode* node, const Ray& ray) const
 {
     // TODO Traverse the BVH to find intersection
+    Intersection isect;
+    std::arrray<int, 3> dirIsNeg= {ray.direction.x > 0, ray.direction.y > 0, ray,direction.z > 0};
+    if (!node->bounds.IntersectP(ray, ray.direction_inv, dirIsNeg)) {
+        return isect;
+    }
+    if (node->left == nullptr && node->right == nullptr) {
+        return node->object->getIntersection(ray);
+    }
+    Intersection lsec = getIntersection(node->left, ray);
+    Intersection rsec = getIntersection(node->right, ray);
+    return lsec.distance < rsec.distance ? lsec : rsec;
 
 }

Assignment6/codes/Bounds3.hpp

@@ -96,7 +96,26 @@ inline bool Bounds3::IntersectP(const Ray& ray, const Vector3f& invDir,
     // invDir: ray direction(x,y,z), invDir=(1.0/x,1.0/y,1.0/z), use this because Multiply is faster that Division
     // dirIsNeg: ray direction(x,y,z), dirIsNeg=[int(x>0),int(y>0),int(z>0)], use this to simplify your logic
     // TODO test if ray bound intersects
+    Vector3f tMin = (pMin - ray.direction) * invDir;
+    Vector3f tMax = (pMax - ray.direction) * invDir;
+
+    if (dirIsNeg[0]) {
+        std::swap(tMin.x, tMax.x);
+    }
+    if (dirIsNeg[1]) {
+        std::swap(tMin.y, tMax.y);
+    }
+    if (dirIsNeg[2]) {
+        std::swap(tMin.z, tMax.z);
+    }
+    float tEnter, tExit;
+    tEnter = fmin(tMin,x, fmin(tMin.y, tMin.z));
+    tExit = fmax(tMax,x, fmax(tMax.y, tMax.z));
 
+    if (tEnter < tExit && tExit > 0) {
+        return true;
+    }
+    return false;
 }
 
 inline Bounds3 Union(const Bounds3& b1, const Bounds3& b2)

Assignment6/codes/Triangle.hpp

@@ -207,10 +207,6 @@ inline bool Triangle::intersect(const Ray& ray, float& tnear,
 }
 
 inline Bounds3 Triangle::getBounds() { return Union(Bounds3(v0, v1), v2); }
-/*
-
-*/
-
 
 inline Intersection Triangle::getIntersection(Ray ray)
 {
@@ -237,11 +233,11 @@ inline Intersection Triangle::getIntersection(Ray ray)
 
     // TODO find ray triangle intersection
     inter.happened = true;
-inter.coords = Vector3f(ray.origin + ray.direction * t_tmp);
-inter.normal = normal;
-inter.m = this->m;
-inter.obj = this;
-inter.distance = t_tmp;
+	inter.coords = Vector3f(ray.origin + ray.direction * t_tmp);
+	inter.normal = normal;
+	inter.m = this->m;
+	inter.obj = this;
+	inter.distance = t_tmp;
 
 
     return inter;