templated ray_dir_info reflect/refract funcs

Author: keptsecret

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

@@ -170,19 +170,19 @@ struct SCookTorrance
         const vector3_type localH = ndf.generateH(localV, u);
 
         cache = anisocache_type::createForReflection(localV, localH);
-        // struct reflect_wrapper
-        // {
-        //     vector3_type operator()()
-        //     {
-        //         return r(VdotH);
-        //     }
-        //     bxdf::Reflect<scalar_type> r;
-        //     scalar_type VdotH;
-        // };
-        // reflect_wrapper r;
-        bxdf::Reflect<scalar_type> r = bxdf::Reflect<scalar_type>::create(localV, localH);
-        // r.VdotH = cache.getVdotH();
-        ray_dir_info_type localL = localV_raydir.reflect(r);
+        struct reflect_wrapper
+        {
+            vector3_type operator()() NBL_CONST_MEMBER_FUNC
+            {
+                return r(VdotH);
+            }
+            bxdf::Reflect<scalar_type> r;
+            scalar_type VdotH;
+        };
+        reflect_wrapper r;
+        r.r = bxdf::Reflect<scalar_type>::create(localV, localH);
+        r.VdotH = cache.getVdotH();
+        ray_dir_info_type localL = localV_raydir.template reflect<reflect_wrapper>(r);
 
         return sample_type::createFromTangentSpace(localL, interaction.getFromTangentSpace());
     }

include/nbl/builtin/hlsl/bxdf/common.hlsl

@@ -88,28 +88,32 @@ struct SBasic
         return retval;
     }
 
-    SBasic<T> reflect(NBL_CONST_REF_ARG(Reflect<scalar_type>) r) NBL_CONST_MEMBER_FUNC
+    template<typename R=Reflect<scalar_type> >
+    SBasic<T> reflect(NBL_CONST_REF_ARG(R) r) NBL_CONST_MEMBER_FUNC
     {
         SBasic<T> retval;
         retval.direction = r();
         return retval;
     }
 
-    SBasic<T> refract(NBL_CONST_REF_ARG(Refract<scalar_type>) r, scalar_type rcpOrientedEta) NBL_CONST_MEMBER_FUNC
+    template<typename R=Refract<scalar_type> >
+    SBasic<T> refract(NBL_CONST_REF_ARG(R) r, scalar_type rcpOrientedEta) NBL_CONST_MEMBER_FUNC
     {
         SBasic<T> retval;
         retval.direction = r(rcpOrientedEta);
         return retval;
     }
 
-    SBasic<T> reflectTransmit(NBL_CONST_REF_ARG(Reflect<scalar_type>) r, bool transmitted) NBL_CONST_MEMBER_FUNC
+    template<typename R=Reflect<scalar_type> >
+    SBasic<T> reflectTransmit(NBL_CONST_REF_ARG(R) r, bool transmitted) NBL_CONST_MEMBER_FUNC
     {
         SBasic<T> retval;
         retval.direction = hlsl::mix(r(), -direction, transmitted);
         return retval;
     }
 
-    SBasic<T> reflectRefract(NBL_CONST_REF_ARG(ReflectRefract<scalar_type>) rr, bool transmitted, scalar_type rcpOrientedEta) NBL_CONST_MEMBER_FUNC
+    template<typename R=ReflectRefract<scalar_type> >
+    SBasic<T> reflectRefract(NBL_CONST_REF_ARG(R) rr, bool transmitted, scalar_type rcpOrientedEta) NBL_CONST_MEMBER_FUNC
     {
         SBasic<T> retval;
         retval.direction = rr(transmitted, rcpOrientedEta);