simplified material data

keptsecret · keptsecret · commit 011fbfb376ef · 2025-03-13T16:24:12.000+07:00
diff --git a/31_HLSLPathTracer/app_resources/hlsl/material_system.hlsl b/31_HLSLPathTracer/app_resources/hlsl/material_system.hlsl
@@ -14,20 +14,27 @@ namespace ext
 namespace MaterialSystem
 {
 
-struct Material
-{
-    enum Type : uint32_t    // enum class?
-    {
-        DIFFUSE,
-        CONDUCTOR,
-        DIELECTRIC
-    };
+// struct Material
+// {
+//     enum Type : uint32_t    // enum class?
+//     {
+//         DIFFUSE,
+//         CONDUCTOR,
+//         DIELECTRIC
+//     };
 
-    NBL_CONSTEXPR_STATIC_INLINE uint32_t DataSize = 1;
+//     NBL_CONSTEXPR_STATIC_INLINE uint32_t DataSize = 1;
 
-    uint32_t type : 2;
-    uint32_t unused : 30;   // possible space for flags
-    uint32_t data[DataSize];
+//     uint32_t type : 2;
+//     uint32_t unused : 30;   // possible space for flags
+//     uint32_t data[DataSize];
+// };
+
+enum MaterialType : uint32_t    // enum class?
+{
+    DIFFUSE,
+    CONDUCTOR,
+    DIELECTRIC
 };
 
 template<class DiffuseBxDF, class ConductorBxDF, class DielectricBxDF>  // NOTE: these bxdfs should match the ones in Scene BxDFNode
@@ -59,23 +66,23 @@ struct System
         return retval;
     }
 
-    measure_type eval(NBL_CONST_REF_ARG(Material) material, NBL_CONST_REF_ARG(create_params_t) cparams, NBL_CONST_REF_ARG(params_t) params)
+    measure_type eval(uint32_t material, NBL_CONST_REF_ARG(create_params_t) cparams, NBL_CONST_REF_ARG(params_t) params)
     {
-        switch(material.type)
+        switch(material)
         {
-            case Material::Type::DIFFUSE:
+            case MaterialType::DIFFUSE:
             {
                 diffuseBxDF.init(cparams);
                 return (measure_type)diffuseBxDF.eval(params);
             }
             break;
-            case Material::Type::CONDUCTOR:
+            case MaterialType::CONDUCTOR:
             {
                 conductorBxDF.init(cparams);
                 return conductorBxDF.eval(params);
             }
             break;
-            case Material::Type::DIELECTRIC:
+            case MaterialType::DIELECTRIC:
             {
                 dielectricBxDF.init(cparams);
                 return dielectricBxDF.eval(params);
@@ -86,23 +93,23 @@ struct System
         }
     }
 
-    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)
+    sample_type generate(uint32_t 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)
+        switch(material)
         {
-            case Material::Type::DIFFUSE:
+            case MaterialType::DIFFUSE:
             {
                 diffuseBxDF.init(cparams);
                 return diffuseBxDF.generate(interaction, u.xy);
             }
             break;
-            case Material::Type::CONDUCTOR:
+            case MaterialType::CONDUCTOR:
             {
                 conductorBxDF.init(cparams);
                 return conductorBxDF.generate(interaction, u.xy, _cache);
             }
             break;
-            case Material::Type::DIELECTRIC:
+            case MaterialType::DIELECTRIC:
             {
                 dielectricBxDF.init(cparams);
                 return dielectricBxDF.generate(interaction, u, _cache);
@@ -121,26 +128,26 @@ struct System
         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)
+    quotient_pdf_type quotient_and_pdf(uint32_t material, NBL_CONST_REF_ARG(create_params_t) cparams, NBL_CONST_REF_ARG(params_t) params)
     {
         const float minimumProjVectorLen = 0.00000001;
         if (params.NdotV > minimumProjVectorLen && params.NdotL > minimumProjVectorLen)
         {
-            switch(material.type)
+            switch(material)
             {
-                case Material::Type::DIFFUSE:
+                case MaterialType::DIFFUSE:
                 {
                     diffuseBxDF.init(cparams);
                     return diffuseBxDF.quotient_and_pdf(params);
                 }
                 break;
-                case Material::Type::CONDUCTOR:
+                case MaterialType::CONDUCTOR:
                 {
                     conductorBxDF.init(cparams);
                     return conductorBxDF.quotient_and_pdf(params);
                 }
                 break;
-                case Material::Type::DIELECTRIC:
+                case MaterialType::DIELECTRIC:
                 {
                     dielectricBxDF.init(cparams);
                     return dielectricBxDF.quotient_and_pdf(params);
diff --git a/31_HLSLPathTracer/app_resources/hlsl/pathtracer.hlsl b/31_HLSLPathTracer/app_resources/hlsl/pathtracer.hlsl
@@ -150,8 +150,8 @@ struct Unidirectional
 
         // TODO: ifdef kill diffuse specular paths
 
-        const bool isBSDF = (bxdf.materialType == ext::MaterialSystem::Material::Type::DIFFUSE) ? bxdf_traits<diffuse_op_type>::type == BT_BSDF :
-                            (bxdf.materialType == ext::MaterialSystem::Material::Type::CONDUCTOR) ? bxdf_traits<conductor_op_type>::type == BT_BSDF :
+        const bool isBSDF = (bxdf.materialType == ext::MaterialSystem::MaterialType::DIFFUSE) ? bxdf_traits<diffuse_op_type>::type == BT_BSDF :
+                            (bxdf.materialType == ext::MaterialSystem::MaterialType::CONDUCTOR) ? bxdf_traits<conductor_op_type>::type == BT_BSDF :
                             bxdf_traits<dielectric_op_type>::type == BT_BSDF;
 
         vector3_type eps0 = rand3d(depth, _sample, 0u);
@@ -193,11 +193,8 @@ struct Unidirectional
                     ray.payload.accumulation += vector3_type(0.f, 1000.f, 0.f);
                 else if (validPath)
                 {
-                    ext::MaterialSystem::Material material;
-                    material.type = bxdf.materialType;
-
                     bxdf::BxDFClampMode _clamp;
-                    _clamp = (bxdf.materialType == ext::MaterialSystem::Material::Type::DIELECTRIC) ? bxdf::BxDFClampMode::BCM_ABS : bxdf::BxDFClampMode::BCM_MAX;
+                    _clamp = (bxdf.materialType == ext::MaterialSystem::MaterialType::DIELECTRIC) ? bxdf::BxDFClampMode::BCM_ABS : bxdf::BxDFClampMode::BCM_MAX;
                     // example only uses isotropic bxdfs
                     params_type params = params_type::template create<sample_type, isotropic_type, isocache_type>(nee_sample, interaction.isotropic, _cache.iso_cache, _clamp);
 
@@ -231,7 +228,7 @@ struct Unidirectional
                     //     }
                     // }
 
-                    quotient_pdf_type bsdf_quotient_pdf = materialSystem.quotient_and_pdf(material, bxdf.params, params);
+                    quotient_pdf_type bsdf_quotient_pdf = materialSystem.quotient_and_pdf(bxdf.materialType, bxdf.params, params);
                     neeContrib_pdf.quotient *= bxdf.albedo * throughput * bsdf_quotient_pdf.quotient;
                     const scalar_type otherGenOverChoice = bsdf_quotient_pdf.pdf * rcpChoiceProb;
                     const scalar_type otherGenOverLightAndChoice = otherGenOverChoice / bsdf_quotient_pdf.pdf;
@@ -256,14 +253,11 @@ struct Unidirectional
         scalar_type bxdfPdf;
         vector3_type bxdfSample;
         {
-            ext::MaterialSystem::Material material;
-            material.type = bxdf.materialType;
-
             anisocache_type _cache;
-            sample_type bsdf_sample = materialSystem.generate(material, bxdf.params, interaction, eps1, _cache);
+            sample_type bsdf_sample = materialSystem.generate(bxdf.materialType, bxdf.params, interaction, eps1, _cache);
 
             bxdf::BxDFClampMode _clamp;
-            _clamp = (bxdf.materialType == ext::MaterialSystem::Material::Type::DIELECTRIC) ? bxdf::BxDFClampMode::BCM_ABS : bxdf::BxDFClampMode::BCM_MAX;
+            _clamp = (bxdf.materialType == ext::MaterialSystem::MaterialType::DIELECTRIC) ? bxdf::BxDFClampMode::BCM_ABS : bxdf::BxDFClampMode::BCM_MAX;
             // example only uses isotropic bxdfs
             params_type params = params_type::template create<sample_type, isotropic_type, isocache_type>(bsdf_sample, interaction.isotropic, _cache.iso_cache, _clamp);
 
@@ -299,7 +293,7 @@ struct Unidirectional
             // }
 
             // the value of the bsdf divided by the probability of the sample being generated
-            quotient_pdf_type bsdf_quotient_pdf = materialSystem.quotient_and_pdf(material, bxdf.params, params);
+            quotient_pdf_type bsdf_quotient_pdf = materialSystem.quotient_and_pdf(bxdf.materialType, bxdf.params, params);
             throughput *= bxdf.albedo * bsdf_quotient_pdf.quotient;
             bxdfPdf = bsdf_quotient_pdf.pdf;
             bxdfSample = bsdf_sample.L.direction;
diff --git a/31_HLSLPathTracer/app_resources/hlsl/render.comp.hlsl b/31_HLSLPathTracer/app_resources/hlsl/render.comp.hlsl
@@ -108,13 +108,13 @@ static const light_type lights[LIGHT_COUNT] = {
 
 #define BXDF_COUNT 7
 static const bxdfnode_type bxdfs[BXDF_COUNT] = {
-    bxdfnode_type::create(ext::MaterialSystem::Material::Type::DIFFUSE, false, float2(0,0), spectral_t(0.8,0.8,0.8)),
-    bxdfnode_type::create(ext::MaterialSystem::Material::Type::DIFFUSE, false, float2(0,0), spectral_t(0.8,0.4,0.4)),
-    bxdfnode_type::create(ext::MaterialSystem::Material::Type::DIFFUSE, false, float2(0,0), spectral_t(0.4,0.8,0.4)),
-    bxdfnode_type::create(ext::MaterialSystem::Material::Type::CONDUCTOR, false, float2(0,0), spectral_t(1,1,1), spectral_t(0.98,0.98,0.77)),
-    bxdfnode_type::create(ext::MaterialSystem::Material::Type::CONDUCTOR, false, float2(0,0), spectral_t(1,1,1), spectral_t(0.98,0.77,0.98)),
-    bxdfnode_type::create(ext::MaterialSystem::Material::Type::CONDUCTOR, false, float2(0.15,0.15), spectral_t(1,1,1), spectral_t(0.98,0.77,0.98)),
-    bxdfnode_type::create(ext::MaterialSystem::Material::Type::DIELECTRIC, false, float2(0.0625,0.0625), spectral_t(1,1,1), spectral_t(0.71,0.69,0.67))
+    bxdfnode_type::create(ext::MaterialSystem::MaterialType::DIFFUSE, false, float2(0,0), spectral_t(0.8,0.8,0.8)),
+    bxdfnode_type::create(ext::MaterialSystem::MaterialType::DIFFUSE, false, float2(0,0), spectral_t(0.8,0.4,0.4)),
+    bxdfnode_type::create(ext::MaterialSystem::MaterialType::DIFFUSE, false, float2(0,0), spectral_t(0.4,0.8,0.4)),
+    bxdfnode_type::create(ext::MaterialSystem::MaterialType::CONDUCTOR, false, float2(0,0), spectral_t(1,1,1), spectral_t(0.98,0.98,0.77)),
+    bxdfnode_type::create(ext::MaterialSystem::MaterialType::CONDUCTOR, false, float2(0,0), spectral_t(1,1,1), spectral_t(0.98,0.77,0.98)),
+    bxdfnode_type::create(ext::MaterialSystem::MaterialType::CONDUCTOR, false, float2(0.15,0.15), spectral_t(1,1,1), spectral_t(0.98,0.77,0.98)),
+    bxdfnode_type::create(ext::MaterialSystem::MaterialType::DIELECTRIC, false, float2(0.0625,0.0625), spectral_t(1,1,1), spectral_t(0.71,0.69,0.67))
 };
 
 [numthreads(WorkgroupSize, WorkgroupSize, 1)]
diff --git a/31_HLSLPathTracer/main.cpp b/31_HLSLPathTracer/main.cpp
@@ -1350,7 +1350,7 @@ class HLSLComputePathtracer final : public examples::SimpleWindowedApplication,
 		int PTPipline = E_LIGHT_GEOMETRY::ELG_SPHERE;
 		int renderMode = E_RENDER_MODE::ERM_HLSL;
 		int spp = 32;
-		int depth = 1;
+		int depth = 3;
 
 		bool m_firstFrame = true;
 		IGPUCommandBuffer::SClearColorValue clearColor = { .float32 = {0.f,0.f,0.f,1.f} };

Original file line number	Diff line number	Diff line change
`@@ -14,20 +14,27 @@ namespace ext`
`14`	`14`	`namespace MaterialSystem`
`15`	`15`	`{`
`16`	`16`
`17`		`-struct Material`
`18`		`-{`
`19`		`- enum Type : uint32_t // enum class?`
`20`		`- {`
`21`		`- DIFFUSE,`
`22`		`- CONDUCTOR,`
`23`		`- DIELECTRIC`
`24`		`- };`
	`17`	`+// struct Material`
	`18`	`+// {`
	`19`	`+// enum Type : uint32_t // enum class?`
	`20`	`+// {`
	`21`	`+// DIFFUSE,`
	`22`	`+// CONDUCTOR,`
	`23`	`+// DIELECTRIC`
	`24`	`+// };`
`25`	`25`
`26`		`- NBL_CONSTEXPR_STATIC_INLINE uint32_t DataSize = 1;`
	`26`	`+// NBL_CONSTEXPR_STATIC_INLINE uint32_t DataSize = 1;`
`27`	`27`
`28`		`- uint32_t type : 2;`
`29`		`- uint32_t unused : 30; // possible space for flags`
`30`		`- uint32_t data[DataSize];`
	`28`	`+// uint32_t type : 2;`
	`29`	`+// uint32_t unused : 30; // possible space for flags`
	`30`	`+// uint32_t data[DataSize];`
	`31`	`+// };`
	`32`	`+`
	`33`	`+enum MaterialType : uint32_t // enum class?`
	`34`	`+{`
	`35`	`+ DIFFUSE,`
	`36`	`+ CONDUCTOR,`
	`37`	`+ DIELECTRIC`
`31`	`38`	`};`
`32`	`39`
`33`	`40`	`template<class DiffuseBxDF, class ConductorBxDF, class DielectricBxDF> // NOTE: these bxdfs should match the ones in Scene BxDFNode`
`@@ -59,23 +66,23 @@ struct System`
`59`	`66`	`return retval;`
`60`	`67`	`}`
`61`	`68`
`62`		`- measure_type eval(NBL_CONST_REF_ARG(Material) material, NBL_CONST_REF_ARG(create_params_t) cparams, NBL_CONST_REF_ARG(params_t) params)`
	`69`	`+ measure_type eval(uint32_t material, NBL_CONST_REF_ARG(create_params_t) cparams, NBL_CONST_REF_ARG(params_t) params)`
`63`	`70`	`{`
`64`		`- switch(material.type)`
	`71`	`+ switch(material)`
`65`	`72`	`{`
`66`		`- case Material::Type::DIFFUSE:`
	`73`	`+ case MaterialType::DIFFUSE:`
`67`	`74`	`{`
`68`	`75`	`diffuseBxDF.init(cparams);`
`69`	`76`	`return (measure_type)diffuseBxDF.eval(params);`
`70`	`77`	`}`
`71`	`78`	`break;`
`72`		`- case Material::Type::CONDUCTOR:`
	`79`	`+ case MaterialType::CONDUCTOR:`
`73`	`80`	`{`
`74`	`81`	`conductorBxDF.init(cparams);`
`75`	`82`	`return conductorBxDF.eval(params);`
`76`	`83`	`}`
`77`	`84`	`break;`
`78`		`- case Material::Type::DIELECTRIC:`
	`85`	`+ case MaterialType::DIELECTRIC:`
`79`	`86`	`{`
`80`	`87`	`dielectricBxDF.init(cparams);`
`81`	`88`	`return dielectricBxDF.eval(params);`
`@@ -86,23 +93,23 @@ struct System`
`86`	`93`	`}`
`87`	`94`	`}`
`88`	`95`
`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)`
	`96`	`+ sample_type generate(uint32_t 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)`
`90`	`97`	`{`
`91`		`- switch(material.type)`
	`98`	`+ switch(material)`
`92`	`99`	`{`
`93`		`- case Material::Type::DIFFUSE:`
	`100`	`+ case MaterialType::DIFFUSE:`
`94`	`101`	`{`
`95`	`102`	`diffuseBxDF.init(cparams);`
`96`	`103`	`return diffuseBxDF.generate(interaction, u.xy);`
`97`	`104`	`}`
`98`	`105`	`break;`
`99`		`- case Material::Type::CONDUCTOR:`
	`106`	`+ case MaterialType::CONDUCTOR:`
`100`	`107`	`{`
`101`	`108`	`conductorBxDF.init(cparams);`
`102`	`109`	`return conductorBxDF.generate(interaction, u.xy, _cache);`
`103`	`110`	`}`
`104`	`111`	`break;`
`105`		`- case Material::Type::DIELECTRIC:`
	`112`	`+ case MaterialType::DIELECTRIC:`
`106`	`113`	`{`
`107`	`114`	`dielectricBxDF.init(cparams);`
`108`	`115`	`return dielectricBxDF.generate(interaction, u, _cache);`
`@@ -121,26 +128,26 @@ struct System`
`121`	`128`	`return sample_type::create(L, 0, (vector3_type)0);`
`122`	`129`	`}`
`123`	`130`
`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)`
	`131`	`+ quotient_pdf_type quotient_and_pdf(uint32_t material, NBL_CONST_REF_ARG(create_params_t) cparams, NBL_CONST_REF_ARG(params_t) params)`
`125`	`132`	`{`
`126`	`133`	`const float minimumProjVectorLen = 0.00000001;`
`127`	`134`	`if (params.NdotV > minimumProjVectorLen && params.NdotL > minimumProjVectorLen)`
`128`	`135`	`{`
`129`		`- switch(material.type)`
	`136`	`+ switch(material)`
`130`	`137`	`{`
`131`		`- case Material::Type::DIFFUSE:`
	`138`	`+ case MaterialType::DIFFUSE:`
`132`	`139`	`{`
`133`	`140`	`diffuseBxDF.init(cparams);`
`134`	`141`	`return diffuseBxDF.quotient_and_pdf(params);`
`135`	`142`	`}`
`136`	`143`	`break;`
`137`		`- case Material::Type::CONDUCTOR:`
	`144`	`+ case MaterialType::CONDUCTOR:`
`138`	`145`	`{`
`139`	`146`	`conductorBxDF.init(cparams);`
`140`	`147`	`return conductorBxDF.quotient_and_pdf(params);`
`141`	`148`	`}`
`142`	`149`	`break;`
`143`		`- case Material::Type::DIELECTRIC:`
	`150`	`+ case MaterialType::DIELECTRIC:`
`144`	`151`	`{`
`145`	`152`	`dielectricBxDF.init(cparams);`
`146`	`153`	`return dielectricBxDF.quotient_and_pdf(params);`