Merge branch 'next' of https://github.com/LuisaGroup/LuisaRender into…

… next
LuisaGroup · Apr 20, 2024 · 7e9f67e · 7e9f67e
2 parents 6a308aa + 55acf53
commit 7e9f67e
Show file tree

Hide file tree

Showing 18 changed files with 2,248 additions and 1,618 deletions.
diff --git a/src/base/surface.h b/src/base/surface.h
@@ -43,11 +43,14 @@ class Surface : public SceneNode {
     struct Evaluation {
         SampledSpectrum f;
         Float pdf;
-
+        SampledSpectrum f_diffuse;
+        Float pdf_diffuse;
         [[nodiscard]] static auto zero(uint spec_dim) noexcept {
             return Evaluation{
                 .f = SampledSpectrum{spec_dim},
-                .pdf = 0.f};
+                .pdf = 0.f,
+                .f_diffuse = SampledSpectrum{spec_dim},
+                .pdf_diffuse = 0.f};
         }
     };
 

diff --git a/src/ext/assimp b/src/ext/assimp
diff --git a/src/ext/cxxopts b/src/ext/cxxopts
diff --git a/src/ext/fast_float b/src/ext/fast_float
diff --git a/src/ext/json b/src/ext/json
diff --git a/src/ext/tinyexr b/src/ext/tinyexr
diff --git a/src/integrators/CMakeLists.txt b/src/integrators/CMakeLists.txt
@@ -6,6 +6,7 @@ luisa_render_add_plugin(wavepathreadback CATEGORY integrator SOURCES wave_path_r
 luisa_render_add_plugin(wavepath_v2 CATEGORY integrator SOURCES wave_path_v2.cpp)
 luisa_render_add_plugin(group CATEGORY integrator SOURCES group.cpp)
 luisa_render_add_plugin(aov CATEGORY integrator SOURCES aov.cpp)
+luisa_render_add_plugin(nfor CATEGORY integrator SOURCES nfor.cpp)
 luisa_render_add_plugin(direct CATEGORY integrator SOURCES direct.cpp)
 luisa_render_add_plugin(pssmlt CATEGORY integrator SOURCES pssmlt.cpp)
 luisa_render_add_plugin(gradientpath CATEGORY integrator SOURCES gpt.cpp)
+9 −1		CHANGELOG.md
+3 −2		CMakeLists.txt
+14 −8		cmake/cxxopts.cmake
+55 −25		include/cxxopts.hpp
+3 −1		packaging/pkgconfig.pc.in
+57 −2		test/options.cpp
+1 −1		CMakeLists.txt
+8 −10		README.md
+7 −0		SECURITY.md
+0 −18		include/fast_float/ascii_number.h
+2 −2		include/fast_float/float_common.h
+123 −0		script/release.py