update CMakeList

Author: HummaWhite

CMakeLists.txt

@@ -88,6 +88,7 @@ set(headers
     src/ImGui/imstb_rectpack.h 
     src/ImGui/imstb_textedit.h 
     src/ImGui/imstb_truetype.h 
+    src/common.h
     )
 
 set(sources
@@ -110,6 +111,7 @@ set(sources
     src/ImGui/imgui_tables.cpp 
     src/ImGui/imgui_widgets.cpp
     src/tiny_obj_loader.cpp
+    src/common.cpp
     )
 
 list(SORT headers)

src/common.cpp

@@ -0,0 +1 @@
+#include "common.h"

src/common.h

@@ -0,0 +1 @@
+#include <iostream>

src/scene.h

@@ -163,6 +163,33 @@ struct DevScene {
         return true;
     }
 
+    __device__ void naiveIntersect(Ray ray, Intersection& intersec) {
+        float closestDist = FLT_MAX;
+        int closestPrimId = NullPrimitive;
+        glm::vec2 closestBary;
+
+        for (int i = 0; i < (BVHSize + 1) / 2; i++) {
+            float dist;
+            glm::vec2 bary;
+            bool hit = intersectPrimitive(i, ray, dist, bary);
+
+            if (hit && dist < closestDist) {
+                closestDist = dist;
+                closestBary = bary;
+                closestPrimId = i;
+            }
+        }
+
+        if (closestPrimId != NullPrimitive) {
+            getIntersecGeomInfo(closestPrimId, closestBary, intersec);
+            intersec.primId = closestPrimId;
+            intersec.matId = devMaterialIds[closestPrimId];
+        }
+        else {
+            intersec.primId = NullPrimitive;
+        }
+    }
+
     __device__ void intersect(Ray ray, Intersection& intersec) {
         float closestDist = FLT_MAX;
         int closestPrimId = NullPrimitive;