Hlsl bxdfs 3 #899
Open
Hlsl bxdfs 3 #899
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Comment on lines
202
to
204
| scalar_type a2 = A*A; | ||
| ndf::Beckmann<scalar_type, false> beckmann_ndf; | ||
| beckmann_ndf.a2 = a2; |
There was a problem hiding this comment.
why are you storing A as a member when you could store the parametrized NDF instead ?
btw seems that CookTorrance is a good idea as there's really not much difference between GGX and beckmann BRDF and BTDF
| } | ||
|
|
||
| scalar_type A; | ||
| spectral_type ior0, ior1; |
There was a problem hiding this comment.
why store ior instead of oriented Etas ?
There was a problem hiding this comment.
The values of ior are used directly in fresnel::Conductor, but OrientedEtas not used anywhere in beckmann brdf.
Comment on lines
88
to
135
| Scalar getTdotL2() NBL_CONST_MEMBER_FUNC { return _sample.getTdotL2(); } | ||
| Scalar getBdotL2() NBL_CONST_MEMBER_FUNC { return _sample.getBdotL2(); } | ||
| Scalar getTdotV2() NBL_CONST_MEMBER_FUNC { return interaction.getTdotV2(); } | ||
| Scalar getBdotV2() NBL_CONST_MEMBER_FUNC { return interaction.getBdotV2(); } | ||
| Scalar getTdotH2() NBL_CONST_MEMBER_FUNC { return cache.getTdotH2(); } | ||
| Scalar getBdotH2() NBL_CONST_MEMBER_FUNC { return cache.getBdotH2(); } | ||
|
|
||
| LS _sample; | ||
| SI interaction; | ||
| MC cache; | ||
| BxDFClampMode _clamp; | ||
| }; | ||
|
|
||
| template<class LS, class Iso, class Aniso, class IsoCache, class AnisoCache, class Spectrum NBL_PRIMARY_REQUIRES(LightSample<LS> && surface_interactions::Isotropic<Iso> && surface_interactions::Anisotropic<Aniso> && CreatableIsotropicMicrofacetCache<IsoCache> && AnisotropicMicrofacetCache<AnisoCache>) | ||
| struct SGGXBxDF | ||
| template<typename T> | ||
| struct SGGXDG1Query | ||
| { | ||
| using this_t = SGGXBxDF<LS, Iso, Aniso, IsoCache, AnisoCache, Spectrum>; | ||
| using scalar_type = typename LS::scalar_type; | ||
| using ray_dir_info_type = typename LS::ray_dir_info_type; | ||
| using scalar_type = T; | ||
|
|
||
| scalar_type getNdf() NBL_CONST_MEMBER_FUNC { return ndf; } | ||
| scalar_type getG1over2NdotV() NBL_CONST_MEMBER_FUNC { return G1_over_2NdotV; } | ||
|
|
||
| scalar_type ndf; | ||
| scalar_type G1_over_2NdotV; | ||
| }; | ||
|
|
||
| template<class Config NBL_STRUCT_CONSTRAINABLE> | ||
| struct SGGXAnisotropicBxDF; | ||
|
|
||
| template<class Config NBL_PRIMARY_REQUIRES(config_concepts::MicrofacetConfiguration<Config>) | ||
| struct SGGXIsotropicBxDF | ||
| { | ||
| using this_t = SGGXIsotropicBxDF<Config>; | ||
| using scalar_type = typename Config::scalar_type; | ||
| using vector2_type = vector<scalar_type, 2>; | ||
| using vector3_type = vector<scalar_type, 3>; | ||
| using matrix2x3_type = matrix<scalar_type,3,2>; | ||
| using ray_dir_info_type = typename Config::ray_dir_info_type; | ||
|
|
||
| using isotropic_interaction_type = Iso; | ||
| using anisotropic_interaction_type = Aniso; | ||
| using sample_type = LS; | ||
| using spectral_type = Spectrum; | ||
| using isotropic_interaction_type = typename Config::isotropic_interaction_type; | ||
| using anisotropic_interaction_type = typename Config::anisotropic_interaction_type; | ||
| using sample_type = typename Config::sample_type; | ||
| using spectral_type = typename Config::spectral_type; | ||
| using quotient_pdf_type = sampling::quotient_and_pdf<spectral_type, scalar_type>; | ||
| using isocache_type = IsoCache; | ||
| using anisocache_type = AnisoCache; | ||
| using isocache_type = typename Config::isocache_type; | ||
| using anisocache_type = typename Config::anisocache_type; | ||
|
|
||
| using params_isotropic_t = GGXParams<LS, Iso, IsoCache, scalar_type>; | ||
| using params_anisotropic_t = GGXParams<LS, Aniso, AnisoCache, scalar_type>; | ||
| using params_isotropic_t = GGXParams<sample_type, isotropic_interaction_type, isocache_type, scalar_type>; | ||
| using params_anisotropic_t = GGXParams<sample_type, anisotropic_interaction_type, anisocache_type, scalar_type>; |
There was a problem hiding this comment.
similar insights as Beckmann
| return quotient_pdf_type::create(hlsl::promote<spectral_type>(quo), _pdf); | ||
| } | ||
|
|
||
| scalar_type A; |
There was a problem hiding this comment.
why not store the NDF instead of its parameters, also transmission should store orientedEtas
Cook Torrance brdf and bsdf would help a lot here
… refactor into bxdfs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Continuing #811 due to GH UI messing up diffs again
Testing
TODO list: