painter integrators

cppd · cppd · commit 244cf7c899fc · 2026-03-25T08:53:06.000+03:00
diff --git a/src/painter/integrators/bpt/connect.cpp b/src/painter/integrators/bpt/connect.cpp
@@ -45,6 +45,26 @@ namespace ns::painter::integrators::bpt
 {
 namespace
 {
+template <std::size_t N, typename T, typename Color>
+[[nodiscard]] std::optional<Color> connect_s_0_infinite_light(
+        const Scene<N, T, Color>& scene,
+        const vertex::InfiniteLight<N, T, Color>& infinite_light)
+{
+        std::optional<Color> res;
+        for (const LightSource<N, T, Color>* const light : scene.light_sources())
+        {
+                if (!light->is_infinite_area())
+                {
+                        continue;
+                }
+                if (const auto& radiance = light->leave_radiance(infinite_light.dir()))
+                {
+                        com::add_optional(&res, *radiance * infinite_light.beta());
+                }
+        }
+        return res;
+}
+
 template <std::size_t N, typename T, typename Color>
 [[nodiscard]] std::optional<Color> connect_s_0(
         const Scene<N, T, Color>& scene,
@@ -55,13 +75,13 @@ template <std::size_t N, typename T, typename Color>
                 {
                         if (!surface.is_light())
                         {
-                                return {};
+                                return std::nullopt;
                         }
                         if (const auto& radiance = surface.light_radiance())
                         {
                                 return *radiance * surface.beta();
                         }
-                        return {};
+                        return std::nullopt;
                 },
                 [](const vertex::Camera<N, T, Color>&) -> std::optional<Color>
                 {
@@ -73,19 +93,7 @@ template <std::size_t N, typename T, typename Color>
                 },
                 [&scene](const vertex::InfiniteLight<N, T, Color>& infinite_light) -> std::optional<Color>
                 {
-                        std::optional<Color> res;
-                        for (const LightSource<N, T, Color>* const light : scene.light_sources())
-                        {
-                                if (!light->is_infinite_area())
-                                {
-                                        continue;
-                                }
-                                if (const auto& radiance = light->leave_radiance(infinite_light.dir()))
-                                {
-                                        com::add_optional(&res, *radiance * infinite_light.beta());
-                                }
-                        }
-                        return res;
+                        return connect_s_0_infinite_light(scene, infinite_light);
                 }};
 
         return std::visit(visitors, camera_path_vertex);
