fix bugs again

keptsecret · keptsecret · commit cb5662a63b6d · 2025-03-07T10:44:08.000+07:00
diff --git a/31_HLSLPathTracer/app_resources/hlsl/common.hlsl b/31_HLSLPathTracer/app_resources/hlsl/common.hlsl
@@ -66,7 +66,7 @@ struct Ray
     // immutable
     vector3_type origin;
     vector3_type direction;
-    
+
     // TODO: polygon method == 2 stuff
     vector3_type normalAtOrigin;
     bool wasBSDFAtOrigin;
@@ -417,7 +417,7 @@ struct Shape<PST_TRIANGLE>
                 shapes::SphericalTriangle<float> st = shapes::SphericalTriangle<float>::create(vertex0, vertex1, vertex2, origin);
                 sampling::ProjectedSphericalTriangle<float> sst = sampling::ProjectedSphericalTriangle<float>::create(st);
 
-                const float32_t3 L = sst.generate(rcpPdf, interaction.N, isBSDF, xi.xy);
+                const float32_t3 L = sst.generate(rcpPdf, interaction.isotropic.N, isBSDF, xi.xy);
 
                 pdf = rcpPdf > numeric_limits<float>::min ? (1.0 / rcpPdf) : 0.0;
 
diff --git a/31_HLSLPathTracer/app_resources/hlsl/material_system.hlsl b/31_HLSLPathTracer/app_resources/hlsl/material_system.hlsl
@@ -39,6 +39,7 @@ struct System
     using vector3_type = vector<scalar_type, 3>;
     using measure_type = typename DiffuseBxDF::spectral_type;
     using sample_type = typename DiffuseBxDF::sample_type;
+    using ray_dir_info_type = typename sample_type::ray_dir_info_type;
     using quotient_pdf_type = typename DiffuseBxDF::quotient_pdf_type;
     using anisotropic_type = typename DiffuseBxDF::anisotropic_type;
     using anisocache_type = typename ConductorBxDF::anisocache_type;
@@ -85,7 +86,7 @@ struct System
         }
     }
 
-    sample_type generate(NBL_CONST_REF_ARG(Material) material, NBL_CONST_REF_ARG(create_params_t) cparams, anisotropic_type interaction, NBL_CONST_REF_ARG(vector3_type) u, NBL_REF_ARG(anisocache_type) cache)
+    sample_type generate(NBL_CONST_REF_ARG(Material) material, NBL_CONST_REF_ARG(create_params_t) cparams, NBL_CONST_REF_ARG(anisotropic_type) interaction, NBL_CONST_REF_ARG(vector3_type) u, NBL_REF_ARG(anisocache_type) _cache)
     {
         switch(material.type)
         {
@@ -98,18 +99,26 @@ struct System
             case Material::Type::CONDUCTOR:
             {
                 conductorBxDF.init(cparams);
-                return conductorBxDF.generate(interaction, u.xy, cache);
+                return conductorBxDF.generate(interaction, u.xy, _cache);
             }
             break;
             case Material::Type::DIELECTRIC:
             {
                 dielectricBxDF.init(cparams);
-                return dielectricBxDF.generate(interaction, u, cache);
+                return dielectricBxDF.generate(interaction, u, _cache);
             }
             break;
             default:
-                return (sample_type)numeric_limits<float>::infinity;
+            {
+                ray_dir_info_type L;
+                L.direction = (vector3_type)0;
+                return sample_type::create(L, 0, (vector3_type)0);
+            }
         }
+
+        ray_dir_info_type L;
+        L.direction = (vector3_type)0;
+        return sample_type::create(L, 0, (vector3_type)0);
     }
 
     quotient_pdf_type quotient_and_pdf(NBL_CONST_REF_ARG(Material) material, NBL_CONST_REF_ARG(create_params_t) cparams, NBL_CONST_REF_ARG(params_t) params)
diff --git a/31_HLSLPathTracer/app_resources/hlsl/next_event_estimator.hlsl b/31_HLSLPathTracer/app_resources/hlsl/next_event_estimator.hlsl
@@ -23,6 +23,7 @@ struct Estimator
     using interaction_type = Aniso;
     using quotient_pdf_type = bxdf::quotient_and_pdf<spectral_type, scalar_type>;
     using sample_type = LightSample;
+    using ray_dir_info_type = typename sample_type::ray_dir_info_type;
 
     static spectral_type proceduralDeferredEvalAndPdf(NBL_REF_ARG(scalar_type) pdf, NBL_CONST_REF_ARG(light_type) light, NBL_CONST_REF_ARG(ray_type) ray, NBL_CONST_REF_ARG(Event) event)
     {
@@ -88,6 +89,7 @@ struct Estimator
             default:
                 return (spectral_type)0.0;
         }
+        return (spectral_type)0.0;
     }
 
     static sample_type procedural_generate_and_quotient_and_pdf(NBL_REF_ARG(quotient_pdf_type) quotient_pdf, NBL_REF_ARG(scalar_type) newRayMaxT, NBL_CONST_REF_ARG(light_type) light, NBL_CONST_REF_ARG(vector3_type) origin, NBL_CONST_REF_ARG(interaction_type) interaction, bool isBSDF, NBL_CONST_REF_ARG(vector3_type) xi, uint32_t depth, NBL_CONST_REF_ARG(Event) event)
@@ -104,9 +106,11 @@ struct Estimator
                 vector3_type position = vector3_type(asfloat(event.data[2]), asfloat(event.data[3]), asfloat(event.data[4]));
                 Shape<PST_SPHERE> sphere = Shape<PST_SPHERE>::create(position, asfloat(event.data[5]), event.data[6]);
                 const vector3_type sampleL = sphere.template generate_and_pdf<interaction_type>(pdf, newRayMaxT, origin, interaction, isBSDF, xi);
-                const vector3_type V = interaction.V.getDirection();
+                const vector3_type V = interaction.isotropic.V.getDirection();
                 const scalar_type VdotL = nbl::hlsl::dot<vector3_type>(V, sampleL);
-                L = sample_type::create(sampleL,VdotL,interaction.T,interaction.B,interaction.N);
+                ray_dir_info_type rayL;
+                rayL.direction = sampleL;
+                L = sample_type::create(rayL,VdotL,interaction.T,interaction.B,interaction.isotropic.N);
             }
             break;
             case PST_TRIANGLE:
@@ -116,9 +120,11 @@ struct Estimator
                 vector3_type vertex2 = vector3_type(asfloat(event.data[8]), asfloat(event.data[9]), asfloat(event.data[10]));
                 Shape<PST_TRIANGLE> tri = Shape<PST_TRIANGLE>::create(vertex0, vertex1, vertex2, event.data[11]);
                 const vector3_type sampleL = tri.template generate_and_pdf<interaction_type>(pdf, newRayMaxT, origin, interaction, isBSDF, xi);
-                const vector3_type V = interaction.V.getDirection();
+                const vector3_type V = interaction.isotropic.V.getDirection();
                 const scalar_type VdotL = nbl::hlsl::dot<vector3_type>(V, sampleL);
-                L = sample_type::create(sampleL,VdotL,interaction.T,interaction.B,interaction.N);
+                ray_dir_info_type rayL;
+                rayL.direction = sampleL;
+                L = sample_type::create(rayL,VdotL,interaction.T,interaction.B,interaction.isotropic.N);
             }
             break;
             case PST_RECTANGLE:
@@ -128,9 +134,11 @@ struct Estimator
                 vector3_type edge1 = vector3_type(asfloat(event.data[8]), asfloat(event.data[9]), asfloat(event.data[10]));
                 Shape<PST_RECTANGLE> rect = Shape<PST_RECTANGLE>::create(offset, edge0, edge1, event.data[11]);
                 const vector3_type sampleL = rect.template generate_and_pdf<interaction_type>(pdf, newRayMaxT, origin, interaction, isBSDF, xi);
-                const vector3_type V = interaction.V.getDirection();
+                const vector3_type V = interaction.isotropic.V.getDirection();
                 const scalar_type VdotL = nbl::hlsl::dot<vector3_type>(V, sampleL);
-                L = sample_type::create(sampleL,VdotL,interaction.T,interaction.B,interaction.N);
+                ray_dir_info_type rayL;
+                rayL.direction = sampleL;
+                L = sample_type::create(rayL,VdotL,interaction.T,interaction.B,interaction.isotropic.N);
             }
             break;
             default:
@@ -149,6 +157,7 @@ struct Estimator
     static sample_type generate_and_quotient_and_pdf(NBL_REF_ARG(quotient_pdf_type) quotient_pdf, NBL_REF_ARG(scalar_type) newRayMaxT, NBL_CONST_REF_ARG(light_type) light, NBL_CONST_REF_ARG(vector3_type) origin, NBL_CONST_REF_ARG(interaction_type) interaction, bool isBSDF, NBL_CONST_REF_ARG(vector3_type) xi, uint32_t depth, NBL_CONST_REF_ARG(Event) event)
     {
         const Event::Mode mode = (Event::Mode)event.mode;
+        sample_type L;
         switch (mode)
         {
             case Event::Mode::RAY_QUERY:
@@ -168,10 +177,10 @@ struct Estimator
             break;
             default:
             {
-                sample_type L;
                 return L;
             }
         }
+        return L;
     }
 };
 
diff --git a/31_HLSLPathTracer/app_resources/hlsl/pathtracer.hlsl b/31_HLSLPathTracer/app_resources/hlsl/pathtracer.hlsl
@@ -54,6 +54,7 @@ struct Unidirectional
     using vector3_type = vector<scalar_type, 3>;
     using measure_type = typename MaterialSystem::measure_type;
     using sample_type = typename NextEventEstimator::sample_type;
+    using ray_dir_info_type = typename sample_type::ray_dir_info_type;
     using ray_type = typename RayGen::ray_type;
     using light_type = Light<measure_type>;
     using bxdfnode_type = BxDFNode<measure_type>;
@@ -181,7 +182,7 @@ struct Unidirectional
             bool validPath = nee_sample.NdotL > numeric_limits<scalar_type>::min;
             // but if we allowed non-watertight transmitters (single water surface), it would make sense just to apply this line by itself
             anisocache_type _cache;
-            validPath = validPath && anisocache_type::compute(_cache, interaction, nee_sample, monochromeEta);
+            validPath = validPath && anisocache_type::template compute<ray_dir_info_type, ray_dir_info_type>(_cache, interaction, nee_sample, monochromeEta);
             bxdf.params.A = nbl::hlsl::max(bxdf.params.A, vector<scalar_type, 2>(0,0));
             bxdf.params.eta = monochromeEta;
 
@@ -268,7 +269,7 @@ struct Unidirectional
                     params = params_type::template create<sample_type, anisotropic_type, anisocache_type>(bsdf_sample, interaction, _cache, bxdf::BCM_MAX);
                 else
                 {
-                    isocache_type isocache = (isocache_type)_cache;
+                    isocache_type isocache = _cache.iso_cache;
                     params = params_type::template create<sample_type, isotropic_type, isocache_type>(bsdf_sample, iso_interaction, isocache, bxdf::BCM_MAX);
                 }
             }
@@ -282,7 +283,7 @@ struct Unidirectional
                     params = params_type::template create<sample_type, anisotropic_type, anisocache_type>(bsdf_sample, interaction, _cache, bxdf::BCM_ABS);
                 else
                 {
-                    isocache_type isocache = (isocache_type)_cache;
+                    isocache_type isocache = _cache.iso_cache;
                     params = params_type::template create<sample_type, isotropic_type, isocache_type>(bsdf_sample, iso_interaction, isocache, bxdf::BCM_ABS);
                 }
             }
diff --git a/31_HLSLPathTracer/main.cpp b/31_HLSLPathTracer/main.cpp
@@ -23,7 +23,7 @@ struct PTPushConstant {
 
 // TODO: Add a QueryPool for timestamping once its ready
 // TODO: Do buffer creation using assConv
-class ComputeShaderPathtracer final : public examples::SimpleWindowedApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
+class HLSLComputePathtracer final : public examples::SimpleWindowedApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
 {
 		using device_base_t = examples::SimpleWindowedApplication;
 		using asset_base_t = application_templates::MonoAssetManagerAndBuiltinResourceApplication;
@@ -69,7 +69,7 @@ class ComputeShaderPathtracer final : public examples::SimpleWindowedApplication
 		};
 
 	public:
-		inline ComputeShaderPathtracer(const path& _localInputCWD, const path& _localOutputCWD, const path& _sharedInputCWD, const path& _sharedOutputCWD)
+		inline HLSLComputePathtracer(const path& _localInputCWD, const path& _localOutputCWD, const path& _sharedInputCWD, const path& _sharedOutputCWD)
 			: IApplicationFramework(_localInputCWD, _localOutputCWD, _sharedInputCWD, _sharedOutputCWD) {}
 
 		inline bool isComputeOnly() const override { return false; }
@@ -1349,4 +1349,4 @@ class ComputeShaderPathtracer final : public examples::SimpleWindowedApplication
 		IGPUCommandBuffer::SClearColorValue clearColor = { .float32 = {0.f,0.f,0.f,1.f} };
 };
 
-NBL_MAIN_FUNC(ComputeShaderPathtracer)
+NBL_MAIN_FUNC(HLSLComputePathtracer)

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ struct System`
`39`	`39`	`using vector3_type = vector<scalar_type, 3>;`
`40`	`40`	`using measure_type = typename DiffuseBxDF::spectral_type;`
`41`	`41`	`using sample_type = typename DiffuseBxDF::sample_type;`
	`42`	`+ using ray_dir_info_type = typename sample_type::ray_dir_info_type;`
`42`	`43`	`using quotient_pdf_type = typename DiffuseBxDF::quotient_pdf_type;`
`43`	`44`	`using anisotropic_type = typename DiffuseBxDF::anisotropic_type;`
`44`	`45`	`using anisocache_type = typename ConductorBxDF::anisocache_type;`
`@@ -85,7 +86,7 @@ struct System`
`85`	`86`	`}`
`86`	`87`	`}`
`87`	`88`
`88`		`- sample_type generate(NBL_CONST_REF_ARG(Material) material, NBL_CONST_REF_ARG(create_params_t) cparams, anisotropic_type interaction, NBL_CONST_REF_ARG(vector3_type) u, NBL_REF_ARG(anisocache_type) cache)`
	`89`	`+ sample_type generate(NBL_CONST_REF_ARG(Material) material, NBL_CONST_REF_ARG(create_params_t) cparams, NBL_CONST_REF_ARG(anisotropic_type) interaction, NBL_CONST_REF_ARG(vector3_type) u, NBL_REF_ARG(anisocache_type) _cache)`
`89`	`90`	`{`
`90`	`91`	`switch(material.type)`
`91`	`92`	`{`
`@@ -98,18 +99,26 @@ struct System`
`98`	`99`	`case Material::Type::CONDUCTOR:`
`99`	`100`	`{`
`100`	`101`	`conductorBxDF.init(cparams);`
`101`		`- return conductorBxDF.generate(interaction, u.xy, cache);`
	`102`	`+ return conductorBxDF.generate(interaction, u.xy, _cache);`
`102`	`103`	`}`
`103`	`104`	`break;`
`104`	`105`	`case Material::Type::DIELECTRIC:`
`105`	`106`	`{`
`106`	`107`	`dielectricBxDF.init(cparams);`
`107`		`- return dielectricBxDF.generate(interaction, u, cache);`
	`108`	`+ return dielectricBxDF.generate(interaction, u, _cache);`
`108`	`109`	`}`
`109`	`110`	`break;`
`110`	`111`	`default:`
`111`		`- return (sample_type)numeric_limits<float>::infinity;`
	`112`	`+ {`
	`113`	`+ ray_dir_info_type L;`
	`114`	`+ L.direction = (vector3_type)0;`
	`115`	`+ return sample_type::create(L, 0, (vector3_type)0);`
	`116`	`+ }`
`112`	`117`	`}`
	`118`	`+`
	`119`	`+ ray_dir_info_type L;`
	`120`	`+ L.direction = (vector3_type)0;`
	`121`	`+ return sample_type::create(L, 0, (vector3_type)0);`
`113`	`122`	`}`
`114`	`123`
`115`	`124`	`quotient_pdf_type quotient_and_pdf(NBL_CONST_REF_ARG(Material) material, NBL_CONST_REF_ARG(create_params_t) cparams, NBL_CONST_REF_ARG(params_t) params)`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ struct Unidirectional`
`54`	`54`	`using vector3_type = vector<scalar_type, 3>;`
`55`	`55`	`using measure_type = typename MaterialSystem::measure_type;`
`56`	`56`	`using sample_type = typename NextEventEstimator::sample_type;`
	`57`	`+ using ray_dir_info_type = typename sample_type::ray_dir_info_type;`
`57`	`58`	`using ray_type = typename RayGen::ray_type;`
`58`	`59`	`using light_type = Light<measure_type>;`
`59`	`60`	`using bxdfnode_type = BxDFNode<measure_type>;`
`@@ -181,7 +182,7 @@ struct Unidirectional`
`181`	`182`	`bool validPath = nee_sample.NdotL > numeric_limits<scalar_type>::min;`
`182`	`183`	`// but if we allowed non-watertight transmitters (single water surface), it would make sense just to apply this line by itself`
`183`	`184`	`anisocache_type _cache;`
`184`		`- validPath = validPath && anisocache_type::compute(_cache, interaction, nee_sample, monochromeEta);`
	`185`	`+ validPath = validPath && anisocache_type::template compute<ray_dir_info_type, ray_dir_info_type>(_cache, interaction, nee_sample, monochromeEta);`
`185`	`186`	`bxdf.params.A = nbl::hlsl::max(bxdf.params.A, vector<scalar_type, 2>(0,0));`
`186`	`187`	`bxdf.params.eta = monochromeEta;`
`187`	`188`
`@@ -268,7 +269,7 @@ struct Unidirectional`
`268`	`269`	`params = params_type::template create<sample_type, anisotropic_type, anisocache_type>(bsdf_sample, interaction, _cache, bxdf::BCM_MAX);`
`269`	`270`	`else`
`270`	`271`	`{`
`271`		`- isocache_type isocache = (isocache_type)_cache;`
	`272`	`+ isocache_type isocache = _cache.iso_cache;`
`272`	`273`	`params = params_type::template create<sample_type, isotropic_type, isocache_type>(bsdf_sample, iso_interaction, isocache, bxdf::BCM_MAX);`
`273`	`274`	`}`
`274`	`275`	`}`
`@@ -282,7 +283,7 @@ struct Unidirectional`
`282`	`283`	`params = params_type::template create<sample_type, anisotropic_type, anisocache_type>(bsdf_sample, interaction, _cache, bxdf::BCM_ABS);`
`283`	`284`	`else`
`284`	`285`	`{`
`285`		`- isocache_type isocache = (isocache_type)_cache;`
	`286`	`+ isocache_type isocache = _cache.iso_cache;`
`286`	`287`	`params = params_type::template create<sample_type, isotropic_type, isocache_type>(bsdf_sample, iso_interaction, isocache, bxdf::BCM_ABS);`
`287`	`288`	`}`
`288`	`289`	`}`