Skip to content

Fixes for Hair Reference and Multiple Scattering Approximation #5832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 28 commits into from
Oct 1, 2021
Merged

Fixes for Hair Reference and Multiple Scattering Approximation #5832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
563196a
Add the various color parameterization modes (color, melanin, absorpt…
johnpars Sep 22, 2021
ff1bdaa
Add the BSDFData conversion to absorption
johnpars Sep 22, 2021
39d845b
Clean up the hair reference and add the longitudinal scattering
johnpars Sep 22, 2021
467276d
Add fiber attenuations for each path
johnpars Sep 22, 2021
881a273
Add the azimuthal scattering from trimmed logistic
johnpars Sep 22, 2021
22c405e
Compute the BSDF
johnpars Sep 23, 2021
3b31255
Add Hair BSDF Reference Furnace Test
johnpars Sep 24, 2021
c6a92ec
Fix many subtle issues in the reference and improve the stability of …
johnpars Sep 24, 2021
da5d6ed
Add importance sampling. Now matching ground truth renders
johnpars Sep 25, 2021
6632b18
Add some inverse absorption mappings
johnpars Sep 25, 2021
e2baece
Make the approximation better fit the reference
johnpars Sep 25, 2021
be9fc92
More reference matching
johnpars Sep 25, 2021
aef3299
Match the dual scattering to the reference
johnpars Sep 25, 2021
4dd92ed
Various DS and preintegration fixes
johnpars Sep 27, 2021
197dba2
Fix near/far field reference, fix low variance nans
johnpars Sep 28, 2021
47d956c
Fix the azimuthal scattering preintegration
johnpars Sep 29, 2021
2c49eaa
Disable symbols, furnace test
johnpars Sep 29, 2021
ef07fe8
mend
johnpars Sep 29, 2021
6a3df0d
Revert "mend"
johnpars Sep 29, 2021
fe6be75
Remove the unused common function I added
johnpars Sep 29, 2021
084f0b6
hide the color mode for now
johnpars Sep 29, 2021
467e907
Merge branch 'master' into HDRP/hair-bsdf-validation
sebastienlagarde Sep 30, 2021
2d6d84d
Precompue all azimuthal distributions, finally fix the absorption dis…
johnpars Sep 30, 2021
630166a
Merge branch 'HDRP/hair-bsdf-validation' of https://github.com/Unity-…
johnpars Sep 30, 2021
98ebc70
Remove the azimuthal scattering toggle as it's now always enabled
johnpars Sep 30, 2021
b244946
Update reference images and tweak the graph to ensure we have coverag…
johnpars Sep 30, 2021
e5fbe51
Fix reference images for Vulkan
johnpars Oct 1, 2021
f8fbfbe
Suppress all the warnings
johnpars Oct 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...phicTests/Scenes/1x_Materials/1401_HairGraph/HairTest_Marschner_Opaque_DualScattering.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,8 @@ Material:
- _ShiverDirectionality: 0.5
- _ShiverDrag: 0.2
- _Smoothness: 0.5
- _SmoothnessRemapMax: 0.89
- _SmoothnessRemapMin: 0.547
- _SmoothnessRemapMax: 0.903
- _SmoothnessRemapMin: 0.553
- _SpecularAAScreenSpaceVariance: 0.1
- _SpecularAAThreshold: 0.2
- _SpecularMultiplier: 0.348
Expand Down Expand Up @@ -318,17 +318,18 @@ Material:
- _ZWrite: 1
m_Colors:
- Color_6FC6C3A4: {r: 0.29999998, g: 0.19499996, b: 0.089999996, a: 1}
- _BaseColor: {r: 0.5, g: 0.34403664, b: 0.24770638, a: 1}
- _BaseColor: {r: 0.8207547, g: 0.6714855, b: 0.32907617, a: 1}
- _Base_UV_Mask: {r: 1, g: 0, b: 0, a: 0}
- _Base_UV_Tiling_and_Offset: {r: 1, g: 1, b: 0, a: 0}
- _Color: {r: 0.5, g: 0.3440366, b: 0.24770635, a: 1}
- _Color: {r: 0.8207547, g: 0.6714855, b: 0.32907614, a: 1}
- _Diffuse_Color: {r: 0.643, g: 0.47758824, b: 0.35943696, a: 1}
- _DoubleSidedConstants: {r: 1, g: 1, b: 1, a: 0}
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
- _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
- _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
- _SpecularColor: {r: 0.8679245, g: 0.559068, b: 0.2251691, a: 1}
- _Strand_Probe: {r: 0.98, g: -1.46, b: 0.13, a: 0}
- _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
- _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
Expand Down
Loading