From 8bcf38834e893f54459dea47fc1e1725050158ba Mon Sep 17 00:00:00 2001
From: Dynamitos <dynamitos15@gmail.com>
Date: Mon, 27 Jan 2025 17:09:16 +0100
Subject: [PATCH] minor fix

---
 src/scene/Renderer.cpp | 19 +++++++++++--------
 src/scene/Renderer.h   |  2 +-
 src/scene/Scene.cpp    | 10 ++++------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/scene/Renderer.cpp b/src/scene/Renderer.cpp
index fe510c1..2812945 100644
--- a/src/scene/Renderer.cpp
+++ b/src/scene/Renderer.cpp
@@ -20,15 +20,18 @@ Renderer::~Renderer() {}
 
 void Renderer::startRender(Camera cam, RenderParameter params)
 {
-  threadPool.cancel();
-  pendingCancel = true;
-  if (worker.joinable())
+  //threadPool.cancel();
+  if (running)
+  {
+    running = false;
     worker.join();
-  pendingCancel = false;
+  }
+  sampleTimes.clear();
   image.clear();
   accumulator.clear();
   image.resize(params.width * params.height);
   accumulator.resize(params.width * params.height);
+  running = true;
   worker = std::thread(&Renderer::render, this, cam, params);
 }
 
@@ -43,7 +46,7 @@ void Renderer::render(Camera camera, RenderParameter params)
 {
   for (int samp = 0; samp < params.numSamples; ++samp)
   {
-    if (pendingCancel)
+    if (!running)
       return;
     auto start = std::chrono::high_resolution_clock::now();
     Batch batch;
@@ -76,7 +79,7 @@ void Renderer::render(Camera camera, RenderParameter params)
                    0.5f) *
                   sdim;
               glm::vec3 spos = cam.origin + cx * s.x + cy * s.y, lc = cam.origin + cam.direction * 0.035f; // sample on 3d sensor plane
-              Ray r = Ray(lc, normalize(lc - spos));                  // construct ray
+              Ray r = Ray(lc, normalize(lc - spos));                                                       // construct ray
 
               //-- setup lens
               glm::vec3 lensP = lc;
@@ -89,7 +92,7 @@ void Renderer::render(Camera camera, RenderParameter params)
               glm::vec3 focalPoint = cam.origin + (camera.S_O + S_I) * cam.direction;
               float t = glm::dot(focalPoint - r.origin, lensN) / glm::dot(r.direction, lensN);
               glm::vec3 focus = r.origin + t * r.direction;
-              r = Ray(lensSample, normalize(focus - lensSample)); // TODO: Fix lens
+              // r = Ray(lensSample, normalize(focus - lensSample)); // TODO: Fix lens
 
               bvh.traceRay(r, payload, 1e-4, 1e20);
 
@@ -101,7 +104,7 @@ void Renderer::render(Camera camera, RenderParameter params)
     threadPool.runBatch(std::move(batch));
     auto end = std::chrono::high_resolution_clock::now();
     sampleTimes.push_back(std::chrono::duration_cast<std::chrono::microseconds>(end - start).count() / 1000.0f);
-    float resolver = float(params.numSamples) / float(samp);
+    float resolver = float(params.numSamples) / float(samp+1);
     for (uint32_t i = 0; i < accumulator.size(); ++i)
     {
       image[i] = glm::pow(glm::max(accumulator[i] * resolver, 0.0f), glm::vec3(0.45f));
diff --git a/src/scene/Renderer.h b/src/scene/Renderer.h
index a0d57be..7833d29 100644
--- a/src/scene/Renderer.h
+++ b/src/scene/Renderer.h
@@ -30,7 +30,7 @@ private:
   virtual void render(Camera cam, RenderParameter params);
   ThreadPool threadPool;
   std::thread worker;
-  std::atomic_bool pendingCancel = false;
+  std::atomic_bool running = false;
   std::vector<float> sampleTimes;
   float lastSampleTime;
   float averageSampleTime;
diff --git a/src/scene/Scene.cpp b/src/scene/Scene.cpp
index fc68f18..a7571e3 100644
--- a/src/scene/Scene.cpp
+++ b/src/scene/Scene.cpp
@@ -80,7 +80,7 @@ void Scene::generate()
 void Scene::traceRay(Ray ray, Payload& payload, const float tmin, const float tmax) const noexcept
 {
   IntersectionInfo info = generateIntersections(hierarchy, ray, tmin, tmax);
-  
+
   if (info.hitInfo.t < std::numeric_limits<float>::max())
   {
     // russian roulette ray termination
@@ -154,12 +154,11 @@ bool Scene::testIntersection(const PNode& currentNode, const Ray ray, const floa
   return leftResults || rightResults;
 }
 
-IntersectionInfo Scene::generateIntersections(const PNode& currentNode, const Ray ray, const float tmin,
-                                                           float tmax) const noexcept
+IntersectionInfo Scene::generateIntersections(const PNode& currentNode, const Ray ray, const float tmin, float tmax) const noexcept
 {
   if (!currentNode->aabb.intersects(ray, tmin, tmax))
   {
-  //  return {};
+    return {};
   }
   if (currentNode->model.numIndices > 0)
   {
@@ -219,8 +218,7 @@ bool Scene::testModel(const ModelReference& reference, const Ray ray, const floa
 
   return false;
 }
-IntersectionInfo Scene::intersectModel(const ModelReference& reference, const Ray ray, const float tmin,
-                                                    float tmax) const noexcept
+IntersectionInfo Scene::intersectModel(const ModelReference& reference, const Ray ray, const float tmin, float tmax) const noexcept
 {
   IntersectionInfo intersection = {};