Hlsl bxdfs 3 #899
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,37 +21,36 @@ namespace bxdf | |
| namespace fresnel | ||
| { | ||
|
|
||
| template<typename T NBL_PRIMARY_REQUIRES(concepts::FloatingPointLikeVectorial<T>) | ||
| struct OrientedEtas | ||
| { | ||
| using scalar_type = typename vector_traits<T>::scalar_type; | ||
|
|
||
| static OrientedEtas<T> create(scalar_type NdotI, T eta) | ||
| { | ||
| OrientedEtas<T> retval; | ||
| const bool backside = NdotI < scalar_type(0.0); | ||
| const T rcpEta = hlsl::promote<T>(1.0) / eta; | ||
| retval.value = backside ? rcpEta : eta; | ||
| retval.rcp = backside ? eta : rcpEta; | ||
| return retval; | ||
| } | ||
|
|
||
| T value; | ||
| T rcp; | ||
| }; | ||
|
|
||
| template<typename T NBL_PRIMARY_REQUIRES(concepts::FloatingPointLikeVectorial<T>) | ||
| struct OrientedEtaRcps | ||
| { | ||
| using scalar_type = typename vector_traits<T>::scalar_type; | ||
|
|
||
| static OrientedEtaRcps<T> create(scalar_type NdotI, T eta) | ||
| { | ||
| OrientedEtaRcps<T> retval; | ||
| const bool backside = NdotI < scalar_type(0.0); | ||
| const T rcpEta = hlsl::promote<T>(1.0) / eta; | ||
| retval.value = backside ? eta : rcpEta; | ||
| retval.value2 = retval.value * retval.value; | ||
| return retval; | ||
| } | ||
|
|
@@ -71,7 +70,6 @@ struct OrientedEtaRcps | |
|
|
||
| T value; | ||
| T value2; | ||
| }; | ||
|
|
||
| } | ||
|
|
@@ -97,7 +95,7 @@ struct Reflect | |
| this_t retval; | ||
| retval.I = I; | ||
| retval.N = N; | ||
| retval.recomputeNdotI(); | ||
| return retval; | ||
| } | ||
|
|
||
|
|
@@ -121,29 +119,16 @@ struct Refract | |
| { | ||
| using this_t = Refract<T>; | ||
| using vector_type = vector<T, 3>; | ||
| using monochrome_type = vector<T, 1>; | ||
| using scalar_type = T; | ||
|
|
||
| static this_t create(NBL_CONST_REF_ARG(fresnel::OrientedEtaRcps<monochrome_type>) rcpEtas, NBL_CONST_REF_ARG(vector_type) I, NBL_CONST_REF_ARG(vector_type) N, const bool backside) | ||
| { | ||
| this_t retval; | ||
| retval.I = I; | ||
| retval.N = N; | ||
| retval.recomputeNdotI(); | ||
| retval.recomputeNdotT(backside, retval.NdotI2, rcpEtas.value2[0]); | ||
devshgraphicsprogramming marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return retval; | ||
| } | ||
|
|
||
|
|
@@ -160,18 +145,17 @@ struct Refract | |
| NdotT = ieee754::flipSign(absNdotT, backside); | ||
devshgraphicsprogramming marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| vector_type operator()(const bool backside, scalar_type rcpOrientedEta) | ||
| { | ||
| recomputeNdotT(rcpOrientedEta.backside, NdotI2, rcpOrientedEta*rcpOrientedEta); | ||
| return N * (NdotI * rcpOrientedEta + NdotT) - rcpOrientedEta * I; | ||
devshgraphicsprogramming marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| vector_type I; | ||
| vector_type N; | ||
| scalar_type NdotT; | ||
| scalar_type NdotI; | ||
| scalar_type NdotI2; | ||
| }; | ||
|
|
||
| template<typename T NBL_PRIMARY_REQUIRES(concepts::Scalar<T>) | ||
|
|
@@ -192,14 +176,14 @@ struct ReflectRefract | |
| return retval; | ||
| } | ||
|
|
||
| static this_t create(bool r, NBL_CONST_REF_ARG(Refract<scalar_type>) refract, scalar_type rcpOrientedEta) | ||
| { | ||
| this_t retval; | ||
| retval.I = refract.I; | ||
| retval.N = refract.N; | ||
| retval.NdotI = refract.NdotI; | ||
| retval.NdotTorR = hlsl::mix(refract.NdotI, refract.NdotT, r); | ||
|
There was a problem hiding this comment. don't store a The idea is that I create once, and I call So we can't keep a cached You can add There was a problem hiding this comment. can accept r(r.computeNdotTorR(doRefract))then you can know whether refraction was intended from looking at |
||
| retval.rcpOrientedEta = rcpOrientedEta; | ||
| return retval; | ||
| } | ||
|
|
||
|
|
@@ -232,7 +216,7 @@ struct ReflectRefract | |
| namespace fresnel | ||
| { | ||
|
|
||
| template<typename T NBL_PRIMARY_REQUIRES(concepts::FloatingPointScalar<T> || concepts::FloatingPointLikeVectorial<T>) | ||
| struct Schlick | ||
| { | ||
| using scalar_type = typename vector_traits<T>::scalar_type; | ||
|
|
@@ -257,7 +241,7 @@ struct Schlick | |
| scalar_type clampedCosTheta; | ||
| }; | ||
|
|
||
| template<typename T NBL_PRIMARY_REQUIRES(concepts::FloatingPointScalar<T> || concepts::FloatingPointLikeVectorial<T>) | ||
| struct Conductor | ||
| { | ||
| using scalar_type = typename vector_traits<T>::scalar_type; | ||
|
|
@@ -294,7 +278,7 @@ struct Conductor | |
| scalar_type clampedCosTheta; | ||
| }; | ||
|
|
||
| template<typename T NBL_PRIMARY_REQUIRES(concepts::FloatingPointScalar<T> || concepts::FloatingPointLikeVectorial<T>) | ||
| struct Dielectric | ||
| { | ||
| using scalar_type = typename vector_traits<T>::scalar_type; | ||
|
|
@@ -332,7 +316,7 @@ struct Dielectric | |
| scalar_type absCosTheta; | ||
| }; | ||
|
|
||
| template<typename T NBL_PRIMARY_REQUIRES(concepts::FloatingPointScalar<T> || concepts::FloatingPointLikeVectorial<T>) | ||
| struct DielectricFrontFaceOnly | ||
| { | ||
| using scalar_type = typename vector_traits<T>::scalar_type; | ||
|
There was a problem hiding this comment. look at your tpedef, your code still wont compile with a scalar T, just give up and require vectorial for Schlick, Conductor, Dielectric and so on There was a problem hiding this comment. There was a problem hiding this comment. It does compile and run with Nabla/include/nbl/builtin/hlsl/vector_utils/vector_traits.hlsl Lines 13 to 16 in 5a1575f There was a problem hiding this comment.
|
||
|
|
||
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.