Skip to content

Multiple Scattering Approximation for Hair #5604

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 82 commits into from
Sep 20, 2021
Merged

Multiple Scattering Approximation for Hair #5604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
da52c2b
Initial commit of the marschner infrastructure (LUT/LTC, Analytic BSD…
johnpars May 7, 2021
49cce2f
Initial commit to add scattering mode dropdown
johnpars May 11, 2021
669720b
Add the framework for a preintegrated Marschner FGD
johnpars May 11, 2021
ed6388d
Re-hide the material type for hair
johnpars May 11, 2021
6b4b76d
Correct some slight typos
johnpars May 11, 2021
e7e5060
Un-hide the hair material type
johnpars May 11, 2021
d2babaf
Initial commit strand count estimation from density volume
johnpars May 13, 2021
72319da
Initial work for Surface to BSDF data
johnpars May 13, 2021
d9a9ec8
Initial readdition of the hair reference
johnpars May 13, 2021
c212397
Adapt the reference to use the new BSDF data
johnpars May 13, 2021
7ebe255
Use the reference for the raster BSDF
johnpars May 13, 2021
23a6273
Add the first lobe approximation
johnpars May 13, 2021
3533017
Initial commit TRT approximation
johnpars May 18, 2021
819ae15
Add TT attenuation term
johnpars May 19, 2021
8718b84
Merge Master
johnpars May 19, 2021
601281e
Further simplify the attenuation TT
johnpars May 19, 2021
bfe3297
Add roughened azimuthal scattering, remove IOR param, add TT distribu…
johnpars May 25, 2021
17986e4
Initial work for environment evaluation
johnpars Jun 1, 2021
d23fe8f
Add the approximated scattering mode. Move the environment evaluation…
johnpars Jun 1, 2021
5bef065
Disable area lights for Marschner (temporary until LTC is fixed for a…
johnpars Jun 1, 2021
30de2e3
Use the newly fitted gaussian coefficient LUT for azimuthal transmiss…
johnpars Jun 7, 2021
01a686c
Merge Master
johnpars Jun 7, 2021
b0c646b
Readjust the gaussian fit for azimuthal roughness
johnpars Jun 10, 2021
fda3e5a
Merge Master
johnpars Jun 16, 2021
642dd18
Skip TT lobe for environment sample
johnpars Jun 22, 2021
ec964a2
Merge branch 'master' into HDRP/hair-material-type-2-bsdf
johnpars Jun 22, 2021
57867ad
Improve Parameterization: Longitudinal Roughness -> Smoothness
johnpars Jun 22, 2021
1f5b02d
Improve Parameterization: Azimuthal Roughness -> Radial Smoothness
johnpars Jun 22, 2021
3affd51
Optimize the math for spherical coordinate angles.
johnpars Jun 22, 2021
6e8b2af
NaN suppression
johnpars Jun 22, 2021
9ba4063
Revert back from sine theta to the half angle for longitudinal scatter
johnpars Jun 22, 2021
e27115e
Fix all the warnings
johnpars Jun 23, 2021
63aae44
Re-enable area light and fall back to GGX like Kajiya
johnpars Jun 25, 2021
ba0196d
Add note regarding Marschner pre-integration
johnpars Jun 25, 2021
d9521f5
Update hair graphics test
johnpars Jun 28, 2021
59ece82
Update some reference images for Vulkan/Metal due to some shadow casc…
johnpars Jun 29, 2021
362bb2c
Remove the primary reflection smooth parameter.
johnpars Jun 30, 2021
1f6c443
Roughness clamping for longitudinal scattering
johnpars Jul 6, 2021
37d45b0
Rename Use Light Facing Normal to Geometry Mode (Cards, Strands)
johnpars Jul 6, 2021
7091851
Documentation - First Pass
johnpars Jul 6, 2021
f1343e4
Rename Geometry Mode -> Geometry Type
johnpars Jul 6, 2021
e17a09b
Tooltips - Also hide the Scattering Mode until the improved approxima…
johnpars Jul 7, 2021
10b2f8f
Un-hide the scattering mode.
johnpars Jul 7, 2021
dfadcff
Initial commit dual scattering preintegration and global scattering c…
johnpars Jul 15, 2021
3ec6399
Compute the average backscattering attenuation
johnpars Jul 15, 2021
36a530d
Add the local scattering term.
johnpars Jul 15, 2021
cf046ed
Organize the dual scattering term computation
johnpars Jul 26, 2021
1ca7fe1
Refactor dual scattering to better integrate with the light loop, add…
johnpars Jul 30, 2021
c8ceb67
Progress on average scattering preintegration for the DS scatter bcsdf
johnpars Aug 3, 2021
08cfb68
Initial commit of completed DS implementation (average azimuthal scat…
johnpars Aug 9, 2021
0b7c2aa
Initial commit of completed DS implementation (average azimuthal scat…
johnpars Aug 9, 2021
13f62ac
Resolve a strange git divergence
johnpars Aug 9, 2021
e4588cd
Merge Master
johnpars Aug 13, 2021
b154c4c
Further simplify the dual scattering approximation and nan suppresion
johnpars Aug 30, 2021
61b395f
Merge Master
johnpars Sep 3, 2021
fcbb2d8
Remove density tracing code from HDRP
johnpars Sep 3, 2021
b2d8bfc
Add the new new stack block inputs for sampling pre-processed global …
johnpars Sep 3, 2021
a75dba4
Configure GPU-side new bsdf inputs for multiple scattering
johnpars Sep 3, 2021
6ccfce5
Fix reflection probe support and revert baked lighting modifications
johnpars Sep 6, 2021
84b63aa
Switch to spherical harmonic representation of strand count as input
johnpars Sep 8, 2021
72bf9b8
Rename to strand count probe
johnpars Sep 9, 2021
18011e6
Disable shadows again until reintroducing a biasing solution
johnpars Sep 9, 2021
57122cc
Merge branch 'master' into HDRP/hair-multiple-scattering
johnpars Sep 9, 2021
6315cf2
Resolve some bad merge artifacts impacting the PR diff
johnpars Sep 10, 2021
b4ace91
More PR cleanup
johnpars Sep 10, 2021
354a765
Update test images due to the environment lighting fix
johnpars Sep 10, 2021
cfe68e3
Add multiple scattering to the test and update images
johnpars Sep 10, 2021
98286e4
Add documentation and update appearance of scattering mode (only for …
johnpars Sep 10, 2021
fcb38b1
Explicitly set the multiple scattering test graph to Marschner + Stra…
johnpars Sep 10, 2021
d5b7b13
Fix preintegration NaN in BSDF
johnpars Sep 13, 2021
57e9f7d
Fix various subtle issues (preintegration domain, scattering gaussian…
johnpars Sep 15, 2021
0ace987
Add spline shadow bias
johnpars Sep 15, 2021
6534543
Merge branch 'master' into HDRP/hair-multiple-scattering
johnpars Sep 15, 2021
c74563c
Update test images
johnpars Sep 15, 2021
e824b31
Update reference images for Vulkan and Metal + re-run
johnpars Sep 15, 2021
ca3ac53
Change the default azimuthal from 0.3 -> 0.8
johnpars Sep 16, 2021
39500a9
Revert "Add spline shadow bias"
johnpars Sep 16, 2021
94e33bf
Add back the strand shadow bias property
johnpars Sep 16, 2021
cb28ef7
Incorporate spline shadow bias to light loop for analytic light shado…
johnpars Sep 16, 2021
a14e191
Add second shadow tap for strand visibility term.
johnpars Sep 16, 2021
0b54460
Remove the debug symbols
johnpars Sep 16, 2021
5b3ab79
Mitigate SH ringing
johnpars Sep 17, 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
336 changes: 331 additions & 5 deletions TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph.unity
View file
Open in desktop

Large diffs are not rendered by default.

115 changes: 93 additions & 22 deletions .../HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTestSettings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,51 +9,40 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_GeneratorAsset: {fileID: 0}
m_Script: {fileID: 11500000, guid: 7ddcec8a8eb2d684d833ac8f5d26aebd, type: 3}
m_Name: HDShadowSettings
m_EditorClassIdentifier:
active: 1
maxShadowDistance:
m_OverrideState: 1
m_Value: 30
min: 0
directionalTransmissionMultiplier:
m_OverrideState: 0
m_Value: 1
cascadeShadowSplitCount:
m_OverrideState: 0
m_Value: 4
min: 1
max: 4
cascadeShadowSplit0:
m_OverrideState: 0
m_Value: 0.05
min: 0
max: 1
cascadeShadowSplit1:
m_OverrideState: 0
m_Value: 0.15
min: 0
max: 1
cascadeShadowSplit2:
m_OverrideState: 0
m_Value: 0.3
min: 0
max: 1
cascadeShadowBorder0:
m_OverrideState: 0
m_Value: 0
min: 0
cascadeShadowBorder1:
m_OverrideState: 0
m_Value: 0
min: 0
cascadeShadowBorder2:
m_OverrideState: 0
m_Value: 0
min: 0
cascadeShadowBorder3:
m_OverrideState: 0
m_Value: 0
min: 0
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -63,7 +52,6 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_GeneratorAsset: {fileID: 0}
m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3}
m_Name: HairTestSettings
m_EditorClassIdentifier:
Expand All @@ -80,14 +68,25 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_GeneratorAsset: {fileID: 0}
m_Script: {fileID: 11500000, guid: 0d7593b3a9277ac4696b20006c21dde2, type: 3}
m_Name: VisualEnvironment
m_EditorClassIdentifier:
active: 1
skyType:
m_OverrideState: 1
m_Value: 1
cloudType:
m_OverrideState: 0
m_Value: 0
skyAmbientMode:
m_OverrideState: 0
m_Value: 1
windOrientation:
m_OverrideState: 0
m_Value: 0
windSpeed:
m_OverrideState: 0
m_Value: 100
fogType:
m_OverrideState: 1
m_Value: 0
Expand All @@ -100,16 +99,13 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_GeneratorAsset: {fileID: 0}
m_Script: {fileID: 11500000, guid: 59b6606ef2548734bb6d11b9d160bc7e, type: 3}
m_Name: HDRISky
m_EditorClassIdentifier:
active: 1
rotation:
m_OverrideState: 0
m_Value: 0
min: 0
max: 360
skyIntensityMode:
m_OverrideState: 0
m_Value: 0
Expand All @@ -119,11 +115,12 @@ MonoBehaviour:
multiplier:
m_OverrideState: 0
m_Value: 1
min: 0
upperHemisphereLuxValue:
m_OverrideState: 0
m_Value: 2.4222
min: 0
upperHemisphereLuxColor:
m_OverrideState: 0
m_Value: {x: 0, y: 0, z: 0}
desiredLuxValue:
m_OverrideState: 0
m_Value: 20000
Expand All @@ -133,10 +130,84 @@ MonoBehaviour:
updatePeriod:
m_OverrideState: 0
m_Value: 0
min: 0
includeSunInBaking:
m_OverrideState: 0
m_Value: 0
hdriSky:
m_OverrideState: 1
m_Value: {fileID: 8900000, guid: 5fb993a599e7e9b4b825e1a28e6d2c07, type: 3}
distortionMode:
m_OverrideState: 0
m_Value: 0
flowmap:
m_OverrideState: 0
m_Value: {fileID: 0}
upperHemisphereOnly:
m_OverrideState: 0
m_Value: 1
scrollOrientation:
m_OverrideState: 0
m_Value:
mode: 1
customValue: 0
additiveValue: 0
multiplyValue: 1
scrollSpeed:
m_OverrideState: 0
m_Value:
mode: 1
customValue: 100
additiveValue: 0
multiplyValue: 1
enableBackplate:
m_OverrideState: 0
m_Value: 0
backplateType:
m_OverrideState: 0
m_Value: 0
groundLevel:
m_OverrideState: 0
m_Value: 0
scale:
m_OverrideState: 0
m_Value: {x: 32, y: 32}
projectionDistance:
m_OverrideState: 0
m_Value: 16
plateRotation:
m_OverrideState: 0
m_Value: 0
plateTexRotation:
m_OverrideState: 0
m_Value: 0
plateTexOffset:
m_OverrideState: 0
m_Value: {x: 0, y: 0}
blendAmount:
m_OverrideState: 0
m_Value: 0
shadowTint:
m_OverrideState: 0
m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1}
pointLightShadow:
m_OverrideState: 0
m_Value: 0
dirLightShadow:
m_OverrideState: 0
m_Value: 0
rectLightShadow:
m_OverrideState: 0
m_Value: 0
m_SkyVersion: 1
enableDistortion:
m_OverrideState: 0
m_Value: 0
procedural:
m_OverrideState: 0
m_Value: 1
scrollDirection:
m_OverrideState: 0
m_Value: 0
m_ObsoleteScrollSpeed:
m_OverrideState: 0
m_Value: 1
Loading