+

Author: marsermd

DeepestScatter_DataGen/DeepestScatter_DataGen/src/ExecutionLoop/GuiExecutionLoop.h

@@ -35,8 +35,8 @@ namespace DeepestScatter
 
         static GuiExecutionLoop* instance;
 
-        uint32_t width = 1792u;
-        uint32_t height = 1024u;
+        uint32_t width = 512u;
+        uint32_t height = 512u;
 
         // Mouse state
         optix::int2    mousePrevPos = optix::make_int2(0, 0);

DeepestScatter_DataGen/DeepestScatter_DataGen/src/ExecutionLoop/Tasks.cpp

@@ -19,14 +19,35 @@
 
 namespace DeepestScatter
 {
-    namespace di = Hypodermic;
-
-    uint32_t width = 1792u;
-    uint32_t height = 1024u;
-
     enum class LightDirection {
         Front, Back, Side
     };
+}
+
+namespace std
+{
+    std::string to_string(DeepestScatter::LightDirection direction)
+    {
+        switch (direction)
+        {
+        case DeepestScatter::LightDirection::Front:
+            return "Front";
+        case DeepestScatter::LightDirection::Back:
+            return "Back";
+        case DeepestScatter::LightDirection::Side:
+            return "Side";
+        default:
+            throw std::exception("Unexpected direction");
+        }
+    }
+}
+
+namespace DeepestScatter
+{
+    namespace di = Hypodermic;
+
+    uint32_t width = 512u;
+    uint32_t height = 256u;
 
     optix::float3 getLightDirection(LightDirection direction)
     {
@@ -43,19 +64,17 @@ namespace DeepestScatter
 
     }
 
-    std::queue<GuiExecutionLoop::LazyTask> Tasks::renderCloud(const std::string &cloudPath, float sizeM)
+    GuiExecutionLoop::LazyTask renderCloudSingleTask(const std::string &cloudPath, float sizeM, LightDirection lightDirection)
     {
-        std::queue<GuiExecutionLoop::LazyTask> tasks;
-
-        GuiExecutionLoop::LazyTask task = [=]()
+        return [=]()
         {
             di::ContainerBuilder taskBuilder;
 
             Persistance::SceneSetup sceneSetup{};
             sceneSetup.set_cloud_path(cloudPath);
             sceneSetup.set_cloud_size_m(sizeM);
 
-            optix::float3 direction = getLightDirection(LightDirection::Front);
+            optix::float3 direction = getLightDirection(lightDirection);
             sceneSetup.mutable_light_direction()->set_x(direction.x);
             sceneSetup.mutable_light_direction()->set_y(direction.y);
             sceneSetup.mutable_light_direction()->set_z(direction.z);
@@ -68,7 +87,7 @@ namespace DeepestScatter
             taskBuilder.registerType<TRenderer>().as<ARenderer>().singleInstance();
             auto outputPath = 
                 std::filesystem::path("../../Data/Renders") / 
-                std::filesystem::path(cloudPath).filename().replace_extension(TRenderer::NAME + ".exr");
+                std::filesystem::path(cloudPath).filename().replace_extension(std::to_string(lightDirection) + "." + TRenderer::NAME + ".exr");
             taskBuilder.addRegistrations(installFramework(width, height, outputPath));
             taskBuilder.addRegistrations(installSceneSetup(sceneSetup, ".", Cloud::Rendering::Mode::SunAndSkyAllScatter, Cloud::Model::Mipmaps::On));
             taskBuilder.addRegistrations(installApp());
@@ -80,8 +99,14 @@ namespace DeepestScatter
 
             return container;
         };
+    }
+
+    std::queue<GuiExecutionLoop::LazyTask> Tasks::renderCloud(const std::string &cloudPath, float sizeM)
+    {
+        std::queue<GuiExecutionLoop::LazyTask> tasks;
 
-        tasks.push(task);
+        tasks.push(renderCloudSingleTask(cloudPath, sizeM, LightDirection::Side));
+        tasks.push(renderCloudSingleTask(cloudPath, sizeM, LightDirection::Back));
 
         return tasks;
     }

DeepestScatter_DataGen/DeepestScatter_DataGen/src/Scene/Cameras/Camera.cpp

@@ -186,7 +186,7 @@ namespace DeepestScatter
             }
 
             //todo: configurable subframe count
-            for (int i = 0; i < 1; i++)
+            for (int i = 0; i < 10; i++)
             {
                 subframeId++;
                 context["subframeId"]->setUint(subframeId);
@@ -263,7 +263,8 @@ namespace DeepestScatter
         std::cout << "Converged: " << convergedCount << "/" << runningVariance.getData().size() 
             << " --- " << runningVariance.getData().size() - convergedCount << "left" << std::endl;
 
-        return isConverged;
+        //TODO:
+        return runningVariance.getData().size() - convergedCount < 500;
     }
 
     void Camera::increaseExposure()