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

Atom15729 Fixed broken materials

Browse Source
This commit is contained in:
gallowj
2021-06-04 17:09:44 -05:00
parent 50d6e36ccd
commit dbdf970690
11 changed files with 18 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/baseboards.material
-3
View File
@@ -37,9 +37,6 @@
"factor": 0.4343433976173401,
"textureMap": "Materials/Bricks038_8K/Bricks038_8K_Roughness.png",
"useTexture": false
},
"subsurfaceScattering": {
"useThicknessMap": false
}
}
}
Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Objects/Lighthead_lightfacingemissive.material
-9
View File
@@ -18,15 +18,6 @@
},
"opacity": {
"factor": 1.0
},
"subsurfaceScattering": {
"enableSubsurfaceScattering": true,
"quality": 1.0,
"scatterDistance": 2.626262664794922,
"subsurfaceScatterFactor": 1.0,
"thickness": 0.1414141058921814,
"transmissionMode": "ThinObject",
"transmissionScale": 1.8181817531585694
}
}
}
Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Objects/PlayfulTeapot_playfulteapot.material
-12
View File
@@ -31,18 +31,6 @@
},
"roughness": {
"factor": 0.0
},
"subsurfaceScattering": {
"enableSubsurfaceScattering": true,
"quality": 1.0,
"scatterColor": [
0.045288778841495517,
0.24347294867038728,
0.2060578316450119,
1.0
],
"scatterDistance": 4.040403842926025,
"subsurfaceScatterFactor": 0.5
}
}
}
Gems/AtomContent/ReferenceMaterials/Assets/Materials/Copper/copper.material
-5
View File
@@ -20,11 +20,6 @@
},
"roughness": {
"factor": 0.20202019810676576
},
"subsurfaceScattering": {
"quality": 0.329292893409729,
"scatterDistance": 6.666666507720947,
"subsurfaceScatterFactor": 0.9595959782600403
}
}
}
Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plaster/plaster.material
-11
View File
@@ -28,17 +28,6 @@
},
"specularF0": {
"factor": 1.0
},
"subsurfaceScattering": {
"quality": 0.9838383793830872,
"scatterColor": [
0.143602654337883,
0.012634470127522946,
0.0005798428319394589,
1.0
],
"scatterDistance": 18.383838653564454,
"subsurfaceScatterFactor": 0.1414141058921814
}
}
}
Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plastic_01/plastic_01.material
-11
View File
@@ -25,17 +25,6 @@
},
"specularF0": {
"factor": 1.0
},
"subsurfaceScattering": {
"quality": 0.9838383793830872,
"scatterColor": [
0.143602654337883,
0.012634470127522946,
0.0005798428319394589,
1.0
],
"scatterDistance": 18.383838653564454,
"subsurfaceScatterFactor": 0.1414141058921814
}
}
}
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_ceiling.material
+7 -37
View File
@@ -4,20 +4,15 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"occlusion": {
"diffuseTextureMap": "Textures/ceiling_1k_ao.png"
},
"baseColor": {
"textureBlendMode": "Lerp",
"color": [
0.800000011920929,
0.800000011920929,
0.800000011920929,
1.0
],
"textureMap": "Textures/ceiling_1k_basecolor.png"
},
"clearCoat": {
"enable": true,
"factor": 0.5,
"influenceMap": "Textures/ceiling_1k_ao.png",
"normalMap": "Textures/ceiling_1k_normal.png",
"roughness": 0.30000001192092898
},
"emissive": {
"color": [
0.0,
@@ -26,33 +21,8 @@
1.0
]
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
1.0,
0.7591058015823364,
0.43776607513427737,
1.0
]
},
"normal": {
"textureMap": "Textures/ceiling_1k_normal.png"
},
"opacity": {
"factor": 1.0
},
"parallax": {
"algorithm": "ContactRefinement",
"factor": 0.019999999552965165,
"pdo": true,
"quality": "Medium",
"textureMap": "Textures/ceiling_1k_height.png",
"useTexture": false
},
"roughness": {
"textureMap": "Textures/ceiling_1k_roughness.png"
}
}
}
}
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_chain.material
+6 -21
View File
@@ -13,31 +13,16 @@
],
"textureMap": "Textures/chain_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"emissive": {
"color": [
0.4891279339790344,
0.7931944727897644,
1.0,
0.0,
0.0,
0.0,
1.0
]
},
"metallic": {
"textureMap": "Textures/chain_alpha.png"
},
"normal": {
"textureMap": "Textures/chain_normal.jpg"
},
"opacity": {
"alphaSource": "Split",
"factor": 0.30000001192092898,
"mode": "Cutout",
"textureMap": "Textures/chain_alpha.png"
},
"roughness": {
"factor": 0.4000000059604645
"factor": 1.0
}
}
}
}
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_leaf.material
-19
View File
@@ -47,25 +47,6 @@
},
"roughness": {
"textureMap": "Textures/thorn_roughness.png"
},
"subsurfaceScattering": {
"enableSubsurfaceScattering": true,
"quality": 1.0,
"scatterColor": [
0.28143739700317385,
1.0,
0.13000686466693879,
1.0
],
"scatterDistance": 1.0,
"thickness": 0.10000000149011612,
"transmissionMode": "ThinObject",
"transmissionTint": [
0.07225146889686585,
0.16981765627861024,
0.04444953054189682,
1.0
]
}
}
}
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_lion.material
+5 -30
View File
@@ -4,9 +4,6 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"occlusion": {
"diffuseTextureMap": "Textures/lion_1k_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -16,38 +13,16 @@
],
"textureMap": "Textures/lion_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"emissive": {
"color": [
1.0,
0.7364919781684876,
0.3672388792037964,
0.0,
0.0,
0.0,
1.0
]
},
"metallic": {
"textureMap": "Textures/lion_1k_metallic.png"
},
"normal": {
"textureMap": "Textures/lion_1k_normal.jpg"
},
"opacity": {
"factor": 1.0
},
"parallax": {
"algorithm": "ContactRefinement",
"factor": 0.009999999776482582,
"pdo": true,
"quality": "Ultra",
"textureMap": "Textures/lion_1k_height.png"
},
"roughness": {
"textureMap": "Textures/lion_1k_roughness.png"
},
"specularF0": {
"enableMultiScatterCompensation": true
}
}
}
}
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vaseplant.material
-18
View File
@@ -28,24 +28,6 @@
"doubleSided": true,
"factor": 0.28999999165534975,
"mode": "Cutout"
},
"subsurfaceScattering": {
"enableSubsurfaceScattering": true,
"quality": 1.0,
"scatterColor": [
0.07421988248825073,
0.10223544389009476,
0.0,
1.0
],
"subsurfaceScatterFactor": 0.0,
"transmissionMode": "ThinObject",
"transmissionTint": [
0.33716335892677309,
0.4620737135410309,
0.0,
1.0
]
}
}
}