pdf should also depend on surface interaction

keptsecret · keptsecret · commit b01ebf735f75 · 2025-10-28T16:08:41.000+07:00
diff --git a/include/nbl/builtin/hlsl/bxdf/base/lambertian.hlsl b/include/nbl/builtin/hlsl/bxdf/base/lambertian.hlsl
@@ -60,13 +60,17 @@ struct SLambertianBase
         return generate(anisotropic_interaction_type::create(interaction), u);
     }
 
-    scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample)
+    scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(isotropic_interaction_type) interaction)
     {
         NBL_IF_CONSTEXPR (IsBSDF)
             return sampling::ProjectedSphere<scalar_type>::pdf(_sample.getNdotL(_clamp));
         else
             return sampling::ProjectedHemisphere<scalar_type>::pdf(_sample.getNdotL(_clamp));
     }
+    scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction)
+    {
+        return pdf(_sample, interaction.isotropic);
+    }
 
     quotient_pdf_type quotient_and_pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(isotropic_interaction_type) interaction)
     {
diff --git a/include/nbl/builtin/hlsl/bxdf/base/oren_nayar.hlsl b/include/nbl/builtin/hlsl/bxdf/base/oren_nayar.hlsl
@@ -95,18 +95,22 @@ struct SOrenNayarBase
         return generate(anisotropic_interaction_type::create(interaction), u);
     }
 
-    scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample)
+    scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(isotropic_interaction_type) interaction)
     {
         if (IsBSDF)
             return sampling::ProjectedSphere<scalar_type>::pdf(_sample.getNdotL(_clamp));
         else
             return sampling::ProjectedHemisphere<scalar_type>::pdf(_sample.getNdotL(_clamp));
     }
+    scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction)
+    {
+        return pdf(_sample, interaction.isotropic);
+    }
 
     template<typename Query>
     quotient_pdf_type __quotient_and_pdf(NBL_CONST_REF_ARG(Query) query, NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(isotropic_interaction_type) interaction)
     {
-        scalar_type _pdf = pdf(_sample);
+        scalar_type _pdf = pdf(_sample, interaction);
         scalar_type q = __rec_pi_factored_out_wo_clamps(query.getVdotL(), _sample.getNdotL(_clamp), interaction.getNdotV(_clamp));
         return quotient_pdf_type::create(q, _pdf);
     }
diff --git a/include/nbl/builtin/hlsl/bxdf/common.hlsl b/include/nbl/builtin/hlsl/bxdf/common.hlsl
@@ -900,7 +900,7 @@ NBL_CONCEPT_BEGIN(3)
 NBL_CONCEPT_END(
     ((NBL_CONCEPT_REQ_TYPE_ALIAS_CONCEPT)(bxdf_common_typdefs, T))
     ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((bxdf.eval(_sample, aniso)), ::nbl::hlsl::is_same_v, typename T::spectral_type))
-    ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((bxdf.pdf(_sample)), ::nbl::hlsl::is_same_v, typename T::scalar_type))
+    ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((bxdf.pdf(_sample, aniso)), ::nbl::hlsl::is_same_v, typename T::scalar_type))
     ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((bxdf.quotient_and_pdf(_sample, aniso)), ::nbl::hlsl::is_same_v, typename T::quotient_pdf_type))
     ((NBL_CONCEPT_REQ_TYPE_ALIAS_CONCEPT)(LightSample, typename T::sample_type))
     ((NBL_CONCEPT_REQ_TYPE_ALIAS_CONCEPT)(concepts::FloatingPointLikeVectorial, typename T::spectral_type))
@@ -925,6 +925,7 @@ NBL_CONCEPT_END(
     ((NBL_CONCEPT_REQ_TYPE_ALIAS_CONCEPT)(bxdf_common, T))
     ((NBL_CONCEPT_REQ_TYPE)(T::isotropic_interaction_type))
     ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((bxdf.eval(_sample, iso)), ::nbl::hlsl::is_same_v, typename T::spectral_type))
+    ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((bxdf.pdf(_sample, iso)), ::nbl::hlsl::is_same_v, typename T::scalar_type))
     ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((bxdf.quotient_and_pdf(_sample, iso)), ::nbl::hlsl::is_same_v, typename T::quotient_pdf_type))
     ((NBL_CONCEPT_REQ_TYPE_ALIAS_CONCEPT)(concepts::FloatingPointLikeVectorial, typename T::spectral_type))
     ((NBL_CONCEPT_REQ_TYPE_ALIAS_CONCEPT)(surface_interactions::Isotropic, typename T::isotropic_interaction_type))
diff --git a/include/nbl/builtin/hlsl/bxdf/reflection/delta_distribution.hlsl b/include/nbl/builtin/hlsl/bxdf/reflection/delta_distribution.hlsl
@@ -52,7 +52,11 @@ struct SDeltaDistribution
         return generate(anisotropic_interaction_type::create(interaction), u);
     }
 
-    scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample)
+    scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(isotropic_interaction_type) interaction)
+    {
+        return 0;
+    }
+    scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction)
     {
         return 0;
     }
diff --git a/include/nbl/builtin/hlsl/bxdf/transmission/delta_distribution.hlsl b/include/nbl/builtin/hlsl/bxdf/transmission/delta_distribution.hlsl
@@ -49,7 +49,11 @@ struct SDeltaDistribution
         return generate(anisotropic_interaction_type::create(interaction), u);
     }
 
-    scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample)
+    scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(isotropic_interaction_type) interaction)
+    {
+        return 0;
+    }
+    scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction)
     {
         return 0;
     }
diff --git a/include/nbl/builtin/hlsl/bxdf/transmission/smooth_dielectric.hlsl b/include/nbl/builtin/hlsl/bxdf/transmission/smooth_dielectric.hlsl
@@ -54,7 +54,11 @@ struct SSmoothDielectric
     }
 
     // eval and pdf return 0 because smooth dielectric/conductor BxDFs are dirac delta distributions, model perfectly specular objects that scatter light to only one outgoing direction
-    scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample)
+    scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(isotropic_interaction_type) interaction)
+    {
+        return 0;
+    }
+    scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction)
     {
         return 0;
     }
@@ -141,7 +145,11 @@ struct SThinSmoothDielectric
         return generate(anisotropic_interaction_type::create(interaction), u);
     }
 
-    scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample)
+    scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(isotropic_interaction_type) interaction)
+    {
+        return 0;
+    }
+    scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction)
     {
         return 0;
     }

Original file line number	Diff line number	Diff line change
`@@ -60,13 +60,17 @@ struct SLambertianBase`
`60`	`60`	`return generate(anisotropic_interaction_type::create(interaction), u);`
`61`	`61`	`}`
`62`	`62`
`63`		`- scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample)`
	`63`	`+ scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(isotropic_interaction_type) interaction)`
`64`	`64`	`{`
`65`	`65`	`NBL_IF_CONSTEXPR (IsBSDF)`
`66`	`66`	`return sampling::ProjectedSphere<scalar_type>::pdf(_sample.getNdotL(_clamp));`
`67`	`67`	`else`
`68`	`68`	`return sampling::ProjectedHemisphere<scalar_type>::pdf(_sample.getNdotL(_clamp));`
`69`	`69`	`}`
	`70`	`+ scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction)`
	`71`	`+ {`
	`72`	`+ return pdf(_sample, interaction.isotropic);`
	`73`	`+ }`
`70`	`74`
`71`	`75`	`quotient_pdf_type quotient_and_pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(isotropic_interaction_type) interaction)`
`72`	`76`	`{`
Original file line number	Diff line number	Diff line change
`@@ -95,18 +95,22 @@ struct SOrenNayarBase`
`95`	`95`	`return generate(anisotropic_interaction_type::create(interaction), u);`
`96`	`96`	`}`
`97`	`97`
`98`		`- scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample)`
	`98`	`+ scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(isotropic_interaction_type) interaction)`
`99`	`99`	`{`
`100`	`100`	`if (IsBSDF)`
`101`	`101`	`return sampling::ProjectedSphere<scalar_type>::pdf(_sample.getNdotL(_clamp));`
`102`	`102`	`else`
`103`	`103`	`return sampling::ProjectedHemisphere<scalar_type>::pdf(_sample.getNdotL(_clamp));`
`104`	`104`	`}`
	`105`	`+ scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction)`
	`106`	`+ {`
	`107`	`+ return pdf(_sample, interaction.isotropic);`
	`108`	`+ }`
`105`	`109`
`106`	`110`	`template<typename Query>`
`107`	`111`	`quotient_pdf_type __quotient_and_pdf(NBL_CONST_REF_ARG(Query) query, NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(isotropic_interaction_type) interaction)`
`108`	`112`	`{`
`109`		`- scalar_type _pdf = pdf(_sample);`
	`113`	`+ scalar_type _pdf = pdf(_sample, interaction);`
`110`	`114`	`scalar_type q = __rec_pi_factored_out_wo_clamps(query.getVdotL(), _sample.getNdotL(_clamp), interaction.getNdotV(_clamp));`
`111`	`115`	`return quotient_pdf_type::create(q, _pdf);`
`112`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,11 @@ struct SDeltaDistribution`
`52`	`52`	`return generate(anisotropic_interaction_type::create(interaction), u);`
`53`	`53`	`}`
`54`	`54`
`55`		`- scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample)`
	`55`	`+ scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(isotropic_interaction_type) interaction)`
	`56`	`+ {`
	`57`	`+ return 0;`
	`58`	`+ }`
	`59`	`+ scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction)`
`56`	`60`	`{`
`57`	`61`	`return 0;`
`58`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,11 @@ struct SDeltaDistribution`
`49`	`49`	`return generate(anisotropic_interaction_type::create(interaction), u);`
`50`	`50`	`}`
`51`	`51`
`52`		`- scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample)`
	`52`	`+ scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(isotropic_interaction_type) interaction)`
	`53`	`+ {`
	`54`	`+ return 0;`
	`55`	`+ }`
	`56`	`+ scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction)`
`53`	`57`	`{`
`54`	`58`	`return 0;`
`55`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,11 @@ struct SSmoothDielectric`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`// eval and pdf return 0 because smooth dielectric/conductor BxDFs are dirac delta distributions, model perfectly specular objects that scatter light to only one outgoing direction`
`57`		`- scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample)`
	`57`	`+ scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(isotropic_interaction_type) interaction)`
	`58`	`+ {`
	`59`	`+ return 0;`
	`60`	`+ }`
	`61`	`+ scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction)`
`58`	`62`	`{`
`59`	`63`	`return 0;`
`60`	`64`	`}`
`@@ -141,7 +145,11 @@ struct SThinSmoothDielectric`
`141`	`145`	`return generate(anisotropic_interaction_type::create(interaction), u);`
`142`	`146`	`}`
`143`	`147`
`144`		`- scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample)`
	`148`	`+ scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(isotropic_interaction_type) interaction)`
	`149`	`+ {`
	`150`	`+ return 0;`
	`151`	`+ }`
	`152`	`+ scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction)`
`145`	`153`	`{`
`146`	`154`	`return 0;`
`147`	`155`	`}`