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

Updated more materials for renamed occlusion properties. I guess these were added to main recently.

Browse Source 
ATOM-14040 Add Support for Cavity Maps
This commit is contained in:
Chris Santora
2021-04-21 14:17:39 -07:00
parent c4771997a2
commit cd00d51bed
21 changed files with 42 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_arch.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/arch_1k_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/arch_1k_ao.png"
},
"baseColor": {
"color": [
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_background.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/background_1k_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/background_1k_ao.png"
},
"baseColor": {
"color": [
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_bricks.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/bricks_1k_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/bricks_1k_ao.png"
},
"baseColor": {
"color": [
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_ceiling.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/ceiling_1k_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/ceiling_1k_ao.png"
},
"baseColor": {
"textureBlendMode": "Lerp",
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columna.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/columnA_1k_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/columnA_1k_ao.png"
},
"baseColor": {
"color": [
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columnb.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/columnB_1k_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/columnB_1k_ao.png"
},
"baseColor": {
"color": [
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columnc.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/columnC_1k_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/columnC_1k_ao.png"
},
"baseColor": {
"color": [
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_curtainblue.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/curtain_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/curtain_ao.png"
},
"baseColor": {
"color": [
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_curtaingreen.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/curtain_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/curtain_ao.png"
},
"baseColor": {
"color": [
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_curtainred.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/curtain_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/curtain_ao.png"
},
"baseColor": {
"color": [
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_details.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/details_1k_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/details_1k_ao.png"
},
"baseColor": {
"color": [
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_fabricblue.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/fabric_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/fabric_ao.png"
},
"baseColor": {
"color": [
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_fabricgreen.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/fabric_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/fabric_ao.png"
},
"baseColor": {
"color": [
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_fabricred.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/fabric_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/fabric_ao.png"
},
"baseColor": {
"color": [
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_flagpole.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/flagpole_1k_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/flagpole_1k_ao.png"
},
"baseColor": {
"color": [
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_floor.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/floor_1k_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/floor_1k_ao.png"
},
"baseColor": {
"color": [
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_lion.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/lion_1k_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/lion_1k_ao.png"
},
"baseColor": {
"color": [
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_roof.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/roof_1k_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/roof_1k_ao.png"
},
"baseColor": {
"color": [
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vase.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/vase_1k_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/vase_1k_ao.png"
},
"baseColor": {
"color": [
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vasehanging.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/vaseHanging_1k_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/vaseHanging_1k_ao.png"
},
"baseColor": {
"color": [
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vaseround.material
+2 -3
View File
@@ -4,9 +4,8 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/vaseRound_1k_ao.png"
"occlusion": {
"diffuseTextureMap": "Textures/vaseRound_1k_ao.png"
},
"baseColor": {
"color": [