Bxdf fixes cook torrance

include/nbl/builtin/hlsl/bxdf/base/lambertian.hlsl

@@ -29,26 +29,40 @@ struct SLambertianBase
     {
         return hlsl::promote<spectral_type>(_sample.getNdotL(_clamp) * numbers::inv_pi<scalar_type> * hlsl::mix(1.0, 0.5, IsBSDF));
     }
+    spectral_type eval(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction)
+    {
+        return eval(_sample, interaction.isotropic);
+    }
 
-    sample_type generate(NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction, const vector2_type u)
+    template<typename C=bool_constant<!IsBSDF> >
+    enable_if_t<C::value && !IsBSDF, sample_type> generate(NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction, const vector2_type u)
     {
-        // static_assert(!IsBSDF);
         ray_dir_info_type L;
-        L.direction = sampling::ProjectedHemisphere<scalar_type>::generate(u);
+        L.setDirection(sampling::ProjectedHemisphere<scalar_type>::generate(u));
         return sample_type::createFromTangentSpace(L, interaction.getFromTangentSpace());
     }
-
-    sample_type generate(NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction, const vector3_type u)
+    template<typename C=bool_constant<IsBSDF> >
+    enable_if_t<C::value && IsBSDF, sample_type> generate(NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction, const vector3_type u)
     {
-        // static_assert(IsBSDF);
+        vector3_type _u = u;
         ray_dir_info_type L;
-        L.direction = sampling::ProjectedSphere<scalar_type>::generate(u);
+        L.setDirection(sampling::ProjectedSphere<scalar_type>::generate(_u));
         return sample_type::createFromTangentSpace(L, interaction.getFromTangentSpace());
     }
+    template<typename C=bool_constant<!IsBSDF> >
+    enable_if_t<C::value && !IsBSDF, sample_type> generate(NBL_CONST_REF_ARG(isotropic_interaction_type) interaction, const vector2_type u)
+    {
+        return generate(anisotropic_interaction_type::create(interaction), u);
+    }
+    template<typename C=bool_constant<IsBSDF> >
+    enable_if_t<C::value && IsBSDF, sample_type> generate(NBL_CONST_REF_ARG(isotropic_interaction_type) interaction, const vector3_type u)
+    {
+        return generate(anisotropic_interaction_type::create(interaction), u);
+    }
 
     scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample)
     {
-        if (IsBSDF)
+        NBL_IF_CONSTEXPR (IsBSDF)
             return sampling::ProjectedSphere<scalar_type>::pdf(_sample.getNdotL(_clamp));
         else
             return sampling::ProjectedHemisphere<scalar_type>::pdf(_sample.getNdotL(_clamp));
@@ -57,12 +71,16 @@ struct SLambertianBase
     quotient_pdf_type quotient_and_pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(isotropic_interaction_type) interaction)
     {
         sampling::quotient_and_pdf<monochrome_type, scalar_type> qp;
-        if (IsBSDF)
+        NBL_IF_CONSTEXPR (IsBSDF)
             qp = sampling::ProjectedSphere<scalar_type>::template quotient_and_pdf(_sample.getNdotL(_clamp));
         else
             qp = sampling::ProjectedHemisphere<scalar_type>::template quotient_and_pdf(_sample.getNdotL(_clamp));
         return quotient_pdf_type::create(qp.quotient[0], qp.pdf);
     }
+    quotient_pdf_type quotient_and_pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction)
+    {
+        return quotient_and_pdf(_sample, interaction.isotropic);
+    }
 };
 
 }

include/nbl/builtin/hlsl/bxdf/base/oren_nayar.hlsl

@@ -64,22 +64,36 @@ struct SOrenNayarBase
         query.VdotL = hlsl::dot(interaction.getV().getDirection(), _sample.getL().getDirection());
         return __eval<SQuery>(query, _sample, interaction); 
     }
+    spectral_type eval(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction)
+    {
+        return eval(_sample, interaction.isotropic); 
+    }
 
-    sample_type generate(NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction, const vector2_type u)
+    template<typename C=bool_constant<!IsBSDF> >
+    enable_if_t<C::value && !IsBSDF, sample_type> generate(NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction, const vector2_type u)
     {
-        // static_assert(!IsBSDF);
         ray_dir_info_type L;
-        L.direction = sampling::ProjectedHemisphere<scalar_type>::generate(u);
+        L.setDirection(sampling::ProjectedHemisphere<scalar_type>::generate(u));
         return sample_type::createFromTangentSpace(L, interaction.getFromTangentSpace());
     }
-
-    sample_type generate(NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction, const vector3_type u)
+    template<typename C=bool_constant<IsBSDF> >
+    enable_if_t<C::value && IsBSDF, sample_type> generate(NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction, const vector3_type u)
     {
-        // static_assert(IsBSDF);
+        vector3_type _u = u;
         ray_dir_info_type L;
-        L.direction = sampling::ProjectedSphere<scalar_type>::generate(u);
+        L.setDirection(sampling::ProjectedSphere<scalar_type>::generate(_u));
         return sample_type::createFromTangentSpace(L, interaction.getFromTangentSpace());
     }
+    template<typename C=bool_constant<!IsBSDF> >
+    enable_if_t<C::value && !IsBSDF, sample_type> generate(NBL_CONST_REF_ARG(isotropic_interaction_type) interaction, const vector2_type u)
+    {
+        return generate(anisotropic_interaction_type::create(interaction), u);
+    }
+    template<typename C=bool_constant<IsBSDF> >
+    enable_if_t<C::value && IsBSDF, sample_type> generate(NBL_CONST_REF_ARG(isotropic_interaction_type) interaction, const vector3_type u)
+    {
+        return generate(anisotropic_interaction_type::create(interaction), u);
+    }
 
     scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample)
     {
@@ -102,6 +116,10 @@ struct SOrenNayarBase
         query.VdotL = hlsl::dot(interaction.getV().getDirection(), _sample.getL().getDirection());
         return __quotient_and_pdf<SQuery>(query, _sample, interaction);
     }
+    quotient_pdf_type quotient_and_pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction)
+    {
+        return quotient_and_pdf(_sample, interaction.isotropic);
+    }
 
     scalar_type A2;
     vector2_type AB;