Moving closest intersection logic to scene.cpp

pantaray/cpp/renderer.cpp

@@ -37,22 +37,12 @@ namespace PantaRay {
     }
 
     Color Renderer::Trace(Ray& ray, Scene& scene) {
-        auto closest_intersection = Intersection();
-        closest_intersection.distance = Constants::inf;
-        Mesh* closest_mesh = nullptr;
-
-        for (auto& object : scene.GetObjects()) {
-            auto intersection = Intersection();
-            if (object.geometry->Intersect(ray, intersection) &&
-                intersection.distance < closest_intersection.distance) {
-                closest_intersection = intersection;
-                closest_mesh = &object;
-            }
-        }
+        Intersection intersection;
+        scene.Intersect(ray, intersection);
 
-        if (closest_mesh != nullptr) {
-            ShadingContext context(ray, closest_intersection, closest_mesh->texture, scene);
-            return closest_mesh->shader->Shade(context);
+        if (intersection.mesh != nullptr) {
+            ShadingContext context(ray, intersection, intersection.mesh->texture, scene);
+            return intersection.mesh->shader->Shade(context);
         }
 
         return Color();

pantaray/cpp/scene.cpp

@@ -0,0 +1,26 @@
+#include "../hpp/scene.hpp"
+
+
+namespace PantaRay {
+
+    bool Scene::Intersect(const Ray& ray, Intersection& intersection) {
+        auto closest_intersection = Intersection();
+        closest_intersection.distance = Constants::inf;
+        Mesh* closest_mesh = nullptr;
+
+        for (auto& object : GetObjects()) {
+            auto intersection = Intersection();
+            if (object.geometry->Intersect(ray, intersection) &&
+                intersection.distance < closest_intersection.distance) {
+                closest_intersection = intersection;
+                closest_mesh = &object;
+            }
+        }
+
+        intersection = closest_intersection;
+        intersection.mesh = closest_mesh;
+
+        return true;
+    }
+
+}

pantaray/hpp/intersection.hpp

@@ -5,10 +5,13 @@
 
 namespace PantaRay {
 
+    struct Mesh;
+
     struct Intersection {
 
         Vector position;
         Vector normal;
+        Mesh* mesh;
         float distance;
         float u, v;
 

pantaray/hpp/mesh.hpp

@@ -6,6 +6,7 @@
 namespace PantaRay {
 
     struct IShader;
+    struct ITexture;
 
     struct Mesh {
 

pantaray/hpp/scene.hpp

@@ -8,7 +8,7 @@
 
 namespace PantaRay {
 
-    class Scene {
+    class Scene : IGeometry {
 
         std::vector<Mesh> objects;
         std::vector<ILight*> lights;
@@ -24,6 +24,8 @@ namespace PantaRay {
             return *this;
         }
 
+        bool Intersect(const Ray& ray, Intersection& intersection);
+
         std::vector<Mesh>& GetObjects() {
             return objects;
         }

pantaray/pantaray.vcxproj

@@ -164,6 +164,7 @@
     <ClCompile Include="cpp\light.cpp" />
     <ClCompile Include="cpp\matrix.cpp" />
     <ClCompile Include="cpp\renderer.cpp" />
+    <ClCompile Include="cpp\scene.cpp" />
     <ClCompile Include="cpp\shading.cpp" />
     <ClCompile Include="cpp\texture.cpp" />
     <ClCompile Include="main.cpp" />

pantaray/pantaray.vcxproj.filters

@@ -39,6 +39,9 @@
     <ClCompile Include="cpp\light.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="cpp\scene.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="hpp\camera.hpp">