birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed subsurface scattering, which now is executes in separate FowardWithSubsurfaceOutput pass

Browse Source
This commit is contained in:
antonmic
2021-04-19 22:07:27 -07:00
parent 7c099ed11c
commit 89edc04129
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_ForwardPass_EDS.shader
+1 -1
View File
@@ -49,5 +49,5 @@
]
},
"DrawList" : "forward"
"DrawList" : "forwardWithSubsurfaceOutput"
}
Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering.material
+17 -4
View File
@@ -1,20 +1,33 @@
{
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialType": "Materials/Types/EnhancedPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"emissive": {
"color": [
1.0,
0.0,
0.0,
1.0
],
"intensity": 4.119999885559082
},
"subsurfaceScattering": {
"enableSubsurfaceScattering": true,
"influenceMap": "TestData/Textures/checker8x8_512.png",
"scatterColor": [
1.0,
0.19937437772750855,
0.07179369777441025,
0.20000000298023225,
0.07058823853731156,
1.0
],
"scatterDistance": 40.0,
"subsurfaceScatterFactor": 1.0
"subsurfaceScatterFactor": 1.0,
"thickness": 0.41999998688697817,
"transmissionMode": "ThinObject",
"transmissionScale": 6.599999904632568,
"useThicknessMap": false
}
}
}
Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering_Transmission.material
+2 -1
View File
@@ -1,11 +1,12 @@
{
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialType": "Materials/Types/EnhancedPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"subsurfaceScattering": {
"enableSubsurfaceScattering": true,
"enableTransmission": true,
"scatterDistance": 64.6464614868164,
"subsurfaceScatterFactor": 1.0,
"thicknessMap": "TestData/Textures/checker8x8_512.png",