Fix russian roulette bug

Sopiro · Sopiro · commit cb320a13069b · 2025-07-08T06:41:56.000+09:00
diff --git a/src/integrator/naive_path_integrator.cpp b/src/integrator/naive_path_integrator.cpp
@@ -82,7 +82,7 @@ Spectrum NaivePathIntegrator::Li(const Ray& primary_ray, const Medium* primary_m
         constexpr int32 min_bounces = 2;
         if (bounce > min_bounces)
         {
-            if (Float p = beta.MaxComponent() * eta_scale < 1)
+            if (Float p = beta.MaxComponent() * eta_scale; p < 1)
             {
                 if (sampler.Next1D() > p)
                 {
diff --git a/src/integrator/naive_vol_path_integrator.cpp b/src/integrator/naive_vol_path_integrator.cpp
@@ -224,7 +224,7 @@ Spectrum NaiveVolPathIntegrator::Li(const Ray& primary_ray, const Medium* primar
         constexpr int32 min_bounces = 2;
         if (bounce > min_bounces)
         {
-            if (Float p = beta.MaxComponent() * eta_scale < 1)
+            if (Float p = beta.MaxComponent() * eta_scale; p < 1)
             {
                 if (sampler.Next1D() > p)
                 {
diff --git a/src/integrator/path_integrator.cpp b/src/integrator/path_integrator.cpp
@@ -146,7 +146,7 @@ Spectrum PathIntegrator::Li(const Ray& primary_ray, const Medium* primary_medium
         constexpr int32 min_bounces = 2;
         if (bounce > min_bounces)
         {
-            if (Float p = beta.MaxComponent() * eta_scale < 1)
+            if (Float p = beta.MaxComponent() * eta_scale; p < 1)
             {
                 if (sampler.Next1D() > p)
                 {
diff --git a/src/integrator/vol_path_integrator.cpp b/src/integrator/vol_path_integrator.cpp
@@ -345,7 +345,7 @@ Spectrum VolPathIntegrator::Li(const Ray& primary_ray, const Medium* primary_med
         if (bounce > min_bounces)
         {
             Spectrum rr = beta * eta_scale / r_u.Average();
-            if (Float p = rr.MaxComponent() < 1)
+            if (Float p = rr.MaxComponent(); p < 1)
             {
                 if (sampler.Next1D() > p)
                 {

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ Spectrum NaivePathIntegrator::Li(const Ray& primary_ray, const Medium* primary_m`
`82`	`82`	`constexpr int32 min_bounces = 2;`
`83`	`83`	`if (bounce > min_bounces)`
`84`	`84`	`{`
`85`		`- if (Float p = beta.MaxComponent() * eta_scale < 1)`
	`85`	`+ if (Float p = beta.MaxComponent() * eta_scale; p < 1)`
`86`	`86`	`{`
`87`	`87`	`if (sampler.Next1D() > p)`
`88`	`88`	`{`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ Spectrum NaiveVolPathIntegrator::Li(const Ray& primary_ray, const Medium* primar`
`224`	`224`	`constexpr int32 min_bounces = 2;`
`225`	`225`	`if (bounce > min_bounces)`
`226`	`226`	`{`
`227`		`- if (Float p = beta.MaxComponent() * eta_scale < 1)`
	`227`	`+ if (Float p = beta.MaxComponent() * eta_scale; p < 1)`
`228`	`228`	`{`
`229`	`229`	`if (sampler.Next1D() > p)`
`230`	`230`	`{`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ Spectrum PathIntegrator::Li(const Ray& primary_ray, const Medium* primary_medium`
`146`	`146`	`constexpr int32 min_bounces = 2;`
`147`	`147`	`if (bounce > min_bounces)`
`148`	`148`	`{`
`149`		`- if (Float p = beta.MaxComponent() * eta_scale < 1)`
	`149`	`+ if (Float p = beta.MaxComponent() * eta_scale; p < 1)`
`150`	`150`	`{`
`151`	`151`	`if (sampler.Next1D() > p)`
`152`	`152`	`{`
Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ Spectrum VolPathIntegrator::Li(const Ray& primary_ray, const Medium* primary_med`
`345`	`345`	`if (bounce > min_bounces)`
`346`	`346`	`{`
`347`	`347`	`Spectrum rr = beta * eta_scale / r_u.Average();`
`348`		`- if (Float p = rr.MaxComponent() < 1)`
	`348`	`+ if (Float p = rr.MaxComponent(); p < 1)`
`349`	`349`	`{`
`350`	`350`	`if (sampler.Next1D() > p)`
`351`	`351`	`{`