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

Merge branch 'main' into Atom/moudgils/BumpResourcePoolbuilder

Browse Source
This commit is contained in:
moudgils
2021-04-15 20:24:00 -07:00
parent 3c631e4a85 82ca4bf221
commit 62b38bdf9e
28 changed files with 504 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomContent/Sponza/ArtSource/objects/sponza_cleanup.mb
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9d3c18d76f00688d15c54736ef3d8c953df08baf46a796fa71627de18bdb3c0f
size 22804332
Gems/AtomContent/Sponza/Assets/objects/sponza.fbx
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6cbfc4d0a6722726070468da4368df7c76be67e8d067a7e3130fd29cdcdd5c6b
size 7613840
oid sha256:35a880abc018520d4b30d21a64f7a14fca74d936593320d5afd03ddf25771bf3
size 9176416
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_arch.material
+15
View File
@@ -4,6 +4,10 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/arch_1k_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -13,6 +17,17 @@
],
"textureMap": "Textures/arch_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
1.0,
0.885053813457489,
0.801281750202179,
1.0
]
},
"metallic": {
"textureMap": "Textures/arch_1k_metallic.png"
},
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_background.material
+21 -1
View File
@@ -4,6 +4,10 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/background_1k_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -13,6 +17,23 @@
],
"textureMap": "Textures/background_1k_basecolor.png"
},
"clearCoat": {
"enable": true,
"factor": 0.5,
"normalMap": "Textures/background_1k_normal.jpg",
"roughness": 0.4000000059604645
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
1.0,
0.8911573886871338,
0.7894102334976196,
1.0
]
},
"metallic": {
"textureMap": "Textures/background_1k_metallic.png"
},
@@ -24,7 +45,6 @@
},
"parallax": {
"algorithm": "POM",
"enable": true,
"factor": 0.03099999949336052,
"pdo": true,
"quality": "High",
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_bricks.material
+23 -4
View File
@@ -4,6 +4,10 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/bricks_1k_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -13,6 +17,23 @@
],
"textureMap": "Textures/bricks_1k_basecolor.png"
},
"clearCoat": {
"enable": true,
"factor": 0.5,
"normalMap": "Textures/bricks_1k_normal.jpg",
"roughness": 0.5
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
1.0,
0.9703211784362793,
0.9703211784362793,
1.0
]
},
"metallic": {
"textureMap": "Textures/bricks_1k_metallic.png"
},
@@ -23,11 +44,9 @@
"factor": 1.0
},
"parallax": {
"algorithm": "POM",
"enable": true,
"algorithm": "ContactRefinement",
"factor": 0.03500000014901161,
"pdo": true,
"quality": "High",
"quality": "Medium",
"textureMap": "Textures/bricks_1k_height.png"
},
"roughness": {
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_ceiling.material
+44 -6
View File
@@ -4,17 +4,55 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/ceiling_1k_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
0.800000011920929,
0.800000011920929,
1.0
],
"textureBlendMode": "Lerp",
"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,
0.0,
0.0,
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"
},
"roughness": {
"textureMap": "Textures/ceiling_1k_roughness.png"
}
}
}
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_chain.material
+12 -1
View File
@@ -13,6 +13,17 @@
],
"textureMap": "Textures/chain_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.4891279339790344,
0.7931944727897644,
1.0,
1.0
]
},
"metallic": {
"textureMap": "Textures/chain_alpha.png"
},
@@ -21,7 +32,7 @@
},
"opacity": {
"alphaSource": "Split",
"factor": 1.0,
"factor": 0.30000001192092898,
"mode": "Cutout",
"textureMap": "Textures/chain_alpha.png"
},
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columna.material
+21 -1
View File
@@ -4,6 +4,10 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/columnA_1k_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -13,6 +17,23 @@
],
"textureMap": "Textures/columnA_1k_basecolor.png"
},
"clearCoat": {
"enable": true,
"factor": 0.5,
"normalMap": "Textures/columnA_1k_normal.jpg",
"roughness": 0.30000001192092898
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
1.0,
0.8964369893074036,
0.8264744281768799,
1.0
]
},
"metallic": {
"textureMap": "Textures/columnA_1k_metallic.png"
},
@@ -24,7 +45,6 @@
},
"parallax": {
"algorithm": "POM",
"enable": true,
"factor": 0.017000000923871995,
"pdo": true,
"quality": "High",
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columnb.material
+21 -1
View File
@@ -4,6 +4,10 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/columnB_1k_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -13,6 +17,23 @@
],
"textureMap": "Textures/columnB_1k_basecolor.png"
},
"clearCoat": {
"enable": true,
"factor": 0.5,
"normalMap": "Textures/columnB_1k_normal.jpg",
"roughness": 0.30000001192092898
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
1.0,
0.9015335440635681,
0.8348516225814819,
1.0
]
},
"metallic": {
"textureMap": "Textures/columnB_1k_metallic.png"
},
@@ -23,7 +44,6 @@
"factor": 1.0
},
"parallax": {
"enable": true,
"factor": 0.020999999716877939,
"pdo": true,
"quality": "High",
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columnc.material
+21 -1
View File
@@ -4,6 +4,10 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/columnC_1k_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -13,6 +17,23 @@
],
"textureMap": "Textures/columnC_1k_basecolor.png"
},
"clearCoat": {
"enable": true,
"factor": 0.5,
"normalMap": "Textures/columnC_1k_normal.jpg",
"roughness": 0.30000001192092898
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.9050736427307129,
0.9050736427307129,
1.0,
1.0
]
},
"metallic": {
"textureMap": "Textures/columnC_1k_metallic.png"
},
@@ -24,7 +45,6 @@
},
"parallax": {
"algorithm": "POM",
"enable": true,
"factor": 0.014000000432133675,
"pdo": true,
"quality": "High",
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_curtainblue.material
+19
View File
@@ -4,6 +4,10 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/curtain_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -13,10 +17,22 @@
],
"textureMap": "Textures/curtainBlue_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.06195162981748581,
0.2056153267621994,
1.0,
1.0
]
},
"metallic": {
"textureMap": "Textures/curtain_metallic.png"
},
"normal": {
"factor": 0.5,
"textureMap": "Textures/curtain_normal.jpg"
},
"opacity": {
@@ -24,6 +40,9 @@
},
"roughness": {
"textureMap": "Textures/curtain_roughness.png"
},
"specularF0": {
"enableMultiScatterCompensation": true
}
}
}
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_curtaingreen.material
+16
View File
@@ -4,6 +4,10 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/curtain_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -13,10 +17,22 @@
],
"textureMap": "Textures/curtainGreen_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.0,
1.0,
0.029526207596063615,
1.0
]
},
"metallic": {
"textureMap": "Textures/curtain_metallic.png"
},
"normal": {
"factor": 0.5,
"textureMap": "Textures/curtain_normal.jpg"
},
"opacity": {
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_curtainred.material
+21
View File
@@ -4,6 +4,10 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/curtain_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -13,6 +17,17 @@
],
"textureMap": "Textures/curtainRed_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
1.0,
0.023315785452723504,
0.048538949340581897,
1.0
]
},
"metallic": {
"textureMap": "Textures/curtain_metallic.png"
},
@@ -24,6 +39,12 @@
},
"roughness": {
"textureMap": "Textures/curtain_roughness.png"
},
"uv": {
"center": [
16.0,
0.0
]
}
}
}
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_details.material
+13 -1
View File
@@ -4,6 +4,10 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/details_1k_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -13,6 +17,15 @@
],
"textureMap": "Textures/details_1k_basecolor.png"
},
"clearCoat": {
"enable": true,
"factor": 0.5,
"normalMap": "Textures/details_1k_normal.png",
"roughness": 0.25
},
"general": {
"applySpecularAA": true
},
"metallic": {
"textureMap": "Textures/details_1k_metallic.png"
},
@@ -24,7 +37,6 @@
},
"parallax": {
"algorithm": "POM",
"enable": true,
"factor": 0.02500000037252903,
"pdo": true,
"textureMap": "Textures/details_1k_height.png"
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_fabricblue.material
+16
View File
@@ -4,6 +4,10 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/fabric_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -13,10 +17,22 @@
],
"textureMap": "Textures/fabricBlue_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.0,
0.15049973130226136,
1.0,
1.0
]
},
"metallic": {
"textureMap": "Textures/fabric_metallic.png"
},
"normal": {
"factor": 0.5,
"textureMap": "Textures/fabric_normal.jpg"
},
"opacity": {
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_fabricgreen.material
+16
View File
@@ -4,6 +4,10 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/fabric_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -13,10 +17,22 @@
],
"textureMap": "Textures/fabricGreen_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.0,
1.0,
0.15378041565418244,
1.0
]
},
"metallic": {
"textureMap": "Textures/fabric_metallic.png"
},
"normal": {
"factor": 0.5,
"textureMap": "Textures/fabric_normal.jpg"
},
"opacity": {
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_fabricred.material
+16
View File
@@ -4,6 +4,10 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/fabric_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -13,10 +17,22 @@
],
"textureMap": "Textures/fabricRed_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
1.0,
0.08197146654129029,
0.10267795622348786,
1.0
]
},
"metallic": {
"textureMap": "Textures/fabric_metallic.png"
},
"normal": {
"factor": 0.5,
"textureMap": "Textures/fabric_normal.jpg"
},
"opacity": {
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_flagpole.material
+18 -1
View File
@@ -4,6 +4,10 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/flagpole_1k_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -13,6 +17,17 @@
],
"textureMap": "Textures/flagpole_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
1.0,
0.6520485281944275,
0.7122911214828491,
1.0
]
},
"metallic": {
"textureMap": "Textures/flagpole_1k_metallic.png"
},
@@ -24,7 +39,6 @@
},
"parallax": {
"algorithm": "POM",
"enable": true,
"factor": 0.014000000432133675,
"pdo": true,
"quality": "High",
@@ -32,6 +46,9 @@
},
"roughness": {
"textureMap": "Textures/flagpole_1k_roughness.png"
},
"specularF0": {
"enableMultiScatterCompensation": true
}
}
}
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_floor.material
+21 -1
View File
@@ -4,6 +4,10 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/floor_1k_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -13,6 +17,23 @@
],
"textureMap": "Textures/floor_1k_basecolor.png"
},
"clearCoat": {
"enable": true,
"influenceMap": "Textures/floor_1k_ao.png",
"normalMap": "Textures/floor_1k_normal.png",
"roughness": 0.25
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
1.0,
0.9404135346412659,
0.8688944578170776,
1.0
]
},
"normal": {
"textureMap": "Textures/floor_1k_normal.png"
},
@@ -21,7 +42,6 @@
},
"parallax": {
"algorithm": "POM",
"enable": true,
"factor": 0.012000000104308129,
"pdo": true,
"textureMap": "Textures/floor_1k_height.png"
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_leaf.material
+38 -1
View File
@@ -13,6 +13,23 @@
],
"textureMap": "Textures/thorn_basecolor.png"
},
"clearCoat": {
"enable": true,
"factor": 0.05000000074505806,
"normalMap": "Textures/thorn_normal.jpg",
"roughness": 0.10000000149011612
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.46506446599960329,
1.0,
0.3944609761238098,
1.0
]
},
"metallic": {
"textureMap": "Textures/thorn_metallic.png"
},
@@ -20,7 +37,8 @@
"textureMap": "Textures/thorn_normal.jpg"
},
"opacity": {
"factor": 0.5699999928474426,
"doubleSided": true,
"factor": 0.20000000298023225,
"mode": "Cutout"
},
"parallax": {
@@ -28,6 +46,25 @@
},
"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
+21 -2
View File
@@ -4,6 +4,10 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/lion_1k_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -13,6 +17,17 @@
],
"textureMap": "Textures/lion_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
1.0,
0.7364919781684876,
0.3672388792037964,
1.0
]
},
"metallic": {
"textureMap": "Textures/lion_1k_metallic.png"
},
@@ -23,14 +38,18 @@
"factor": 1.0
},
"parallax": {
"algorithm": "POM",
"algorithm": "ContactRefinement",
"enable": true,
"factor": 0.023000000044703485,
"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_roof.material
+12 -5
View File
@@ -4,6 +4,10 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/roof_1k_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -11,24 +15,27 @@
0.800000011920929,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "Textures/roof_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"metallic": {
"factor": 0.009999999776482582,
"useTexture": false
},
"normal": {
"factor": 0.5,
"flipY": true,
"textureMap": "Textures/roof_1k_normal.jpg"
},
"opacity": {
"factor": 1.0
},
"parallax": {
"algorithm": "POM",
"enable": true,
"algorithm": "ContactRefinement",
"factor": 0.019999999552965165,
"pdo": true,
"quality": "High",
"quality": "Medium",
"textureMap": "Textures/roof_1k_height.png"
},
"roughness": {
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vase.material
+18 -1
View File
@@ -4,6 +4,10 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/vase_1k_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -13,6 +17,17 @@
],
"textureMap": "Textures/vase_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
1.0,
0.8713664412498474,
0.6021667718887329,
1.0
]
},
"metallic": {
"textureMap": "Textures/vase_1k_metallic.png"
},
@@ -24,7 +39,6 @@
},
"parallax": {
"algorithm": "POM",
"enable": true,
"factor": 0.027000000700354577,
"pdo": true,
"quality": "High",
@@ -32,6 +46,9 @@
},
"roughness": {
"textureMap": "Textures/vase_1k_roughness.png"
},
"specularF0": {
"enableMultiScatterCompensation": true
}
}
}
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vasehanging.material
+15 -1
View File
@@ -4,6 +4,10 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/vaseHanging_1k_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -13,6 +17,17 @@
],
"textureMap": "Textures/vaseHanging_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.765606164932251,
1.0,
0.7052567601203919,
1.0
]
},
"metallic": {
"textureMap": "Textures/vaseHanging_1k_metallic.png"
},
@@ -24,7 +39,6 @@
},
"parallax": {
"algorithm": "POM",
"enable": true,
"factor": 0.04600000008940697,
"pdo": true,
"quality": "High",
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vaseplant.material
+31 -1
View File
@@ -13,9 +13,39 @@
],
"textureMap": "Textures/vasePlant_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.6788738965988159,
1.0,
0.026138704270124437,
1.0
]
},
"opacity": {
"factor": 0.8399999737739563,
"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
]
}
}
}
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vaseround.material
+25 -1
View File
@@ -4,6 +4,10 @@
"parentMaterial": "",
"propertyLayoutVersion": 3,
"properties": {
"ambientOcclusion": {
"enable": true,
"textureMap": "Textures/vaseRound_1k_ao.png"
},
"baseColor": {
"color": [
0.800000011920929,
@@ -13,6 +17,24 @@
],
"textureMap": "Textures/vaseRound_1k_basecolor.png"
},
"clearCoat": {
"enable": true,
"factor": 0.5,
"influenceMap": "Textures/vaseRound_1k_ao.png",
"normalMap": "Textures/vaseRound_1k_normal.jpg",
"roughness": 0.25
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
1.0,
0.5939116477966309,
0.29176774621009829,
1.0
]
},
"normal": {
"textureMap": "Textures/vaseRound_1k_normal.jpg"
},
@@ -21,7 +43,6 @@
},
"parallax": {
"algorithm": "POM",
"enable": true,
"factor": 0.019999999552965165,
"pdo": true,
"quality": "High",
@@ -29,6 +50,9 @@
},
"roughness": {
"textureMap": "Textures/vaseRound_1k_roughness.png"
},
"specularF0": {
"enableMultiScatterCompensation": true
}
}
}
Gems/AtomContent/Sponza/Project_Env.bat
+1 -1
View File
@@ -44,7 +44,7 @@ CD /d %LY_PROJECT_PATH%\%DEV_REL_PATH%
set LY_DEV=%CD%
echo LY_DEV = %LY_DEV%
CALL %LY_DEV%\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\Launchers\Windows\Env.bat
CALL %LY_DEV%\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\Launchers\Windows\Env_Maya.bat
rem :: Constant Vars (Global)
rem SET LYPY_GDEBUG=0
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/config_utils.py
+4 -4
View File
@@ -158,10 +158,10 @@ def bootstrap_dccsi_py_libs(dccsi_dirpath=return_stub_dir()):
"""Builds and adds local site dir libs based on py version"""
from azpy.constants import STR_DCCSI_PYTHON_LIB_PATH # a path string constructor
_DCCSI_PYTHON_LIB_PATH = "E:\\P4\\jromnoa_spectra_atom_2\\dev\\Tools\\Python\\3.7.5\\windows\\Lib\\site-packages"
# _DCCSI_PYTHON_LIB_PATH = STR_DCCSI_PYTHON_LIB_PATH.format(dccsi_dirpath,
# sys.version_info[0],
# sys.version_info[1])
#_DCCSI_PYTHON_LIB_PATH = "E:\\P4\\jromnoa_spectra_atom_2\\dev\\Tools\\Python\\3.7.5\\windows\\Lib\\site-packages"
_DCCSI_PYTHON_LIB_PATH = STR_DCCSI_PYTHON_LIB_PATH.format(dccsi_dirpath,
sys.version_info[0],
sys.version_info[1])
if os.path.exists(_DCCSI_PYTHON_LIB_PATH):
_LOGGER.debug('Performed site.addsitedir({})'.format(_DCCSI_PYTHON_LIB_PATH))