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

Merge branch 'main' into ly-as-sdk/LYN-2948

Browse Source
This commit is contained in:
pappeste
2021-05-28 00:16:26 -07:00
parent f80f87a4d1 5bb55ac1c7
commit 8b9f5230f6
135 changed files with 1463 additions and 1577 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/Bricks038_8K/bricks038.material
-1
View File
@@ -26,7 +26,6 @@
},
"parallax": {
"algorithm": "POM",
"enable": true,
"factor": 0.02500000037252903,
"pdo": true,
"quality": "Ultra",
Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/Concrete016_8K/Concrete016.material
+2 -1
View File
@@ -31,7 +31,8 @@
"algorithm": "ContactRefinement",
"factor": 0.019999999552965165,
"quality": "Ultra",
"textureMap": "Materials/Concrete016_8K/Concrete016_8K_Displacement.png"
"textureMap": "Materials/Concrete016_8K/Concrete016_8K_Displacement.png",
"useTexture": false
},
"roughness": {
"textureMap": "Materials/Concrete016_8K/Concrete016_8K_Roughness.png"
Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/Fabric001_8K/Fabric001.material
-1
View File
@@ -20,7 +20,6 @@
},
"parallax": {
"algorithm": "ContactRefinement",
"enable": true,
"factor": 0.004999999888241291,
"quality": "Ultra",
"textureMap": "Materials/Fabric001_8K/Fabric001_8K_Displacement.png"
Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/Fabric030_4K/Fabric030.material
-1
View File
@@ -20,7 +20,6 @@
},
"parallax": {
"algorithm": "ContactRefinement",
"enable": true,
"factor": 0.0020000000949949028,
"pdo": true,
"quality": "Medium",
Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/PaintedPlaster015_8K/PaintedPlaster015.material
-1
View File
@@ -19,7 +19,6 @@
},
"parallax": {
"algorithm": "ContactRefinement",
"enable": true,
"factor": 0.009999999776482582,
"pdo": true,
"quality": "Ultra",
Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/baseboards.material
+2 -1
View File
@@ -30,7 +30,8 @@
"factor": 0.02500000037252903,
"pdo": true,
"quality": "Ultra",
"textureMap": "Materials/Bricks038_8K/Bricks038_8K_Displacement.png"
"textureMap": "Materials/Bricks038_8K/Bricks038_8K_Displacement.png",
"useTexture": false
},
"roughness": {
"factor": 0.4343433976173401,
Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/crown.material
-1
View File
@@ -22,7 +22,6 @@
},
"parallax": {
"algorithm": "POM",
"enable": true,
"factor": 0.02500000037252903,
"pdo": true,
"quality": "Ultra",
Gems/AtomContent/ReferenceMaterials/Assets/Materials/ConcreteStucco/concrete_stucco.material
+2 -1
View File
@@ -19,7 +19,8 @@
},
"parallax": {
"factor": 0.0010101000079885126,
"textureMap": "Materials/ConcreteStucco/concrete_stucco_height.jpg"
"textureMap": "Materials/ConcreteStucco/concrete_stucco_height.jpg",
"useTexture": false
},
"specularF0": {
"factor": 0.5050504803657532
Gems/AtomContent/Sponza/Assets/license.txt
+8
View File
@@ -0,0 +1,8 @@
The content in this gem "O3DE\Gems\AtomContent\Sponza" is ported
from the original source, and modified for the O3DE Engine and Atom Renderer.
The original "Crytek Sponza" scene data can be downloaded from the
"McGuire Computer Graphics Archive": https://casual-effects.com/data/
The original content is under the "CC BY 3.0" License:
https://creativecommons.org/licenses/by/3.0/
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_arch.material
+2 -1
View File
@@ -41,7 +41,8 @@
"factor": 0.050999999046325687,
"pdo": true,
"quality": "High",
"textureMap": "Textures/arch_1k_height.png"
"textureMap": "Textures/arch_1k_height.png",
"useTexture": false
},
"roughness": {
"textureMap": "Textures/arch_1k_roughness.png"
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_background.material
+2 -1
View File
@@ -47,7 +47,8 @@
"factor": 0.03099999949336052,
"pdo": true,
"quality": "High",
"textureMap": "Textures/background_1k_height.png"
"textureMap": "Textures/background_1k_height.png",
"useTexture": false
},
"roughness": {
"textureMap": "Textures/background_1k_roughness.png"
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_bricks.material
+2 -1
View File
@@ -46,7 +46,8 @@
"algorithm": "ContactRefinement",
"factor": 0.03500000014901161,
"quality": "Medium",
"textureMap": "Textures/bricks_1k_height.png"
"textureMap": "Textures/bricks_1k_height.png",
"useTexture": false
},
"roughness": {
"textureMap": "Textures/bricks_1k_roughness.png"
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_ceiling.material
+2 -1
View File
@@ -48,7 +48,8 @@
"factor": 0.019999999552965165,
"pdo": true,
"quality": "Medium",
"textureMap": "Textures/ceiling_1k_height.png"
"textureMap": "Textures/ceiling_1k_height.png",
"useTexture": false
},
"roughness": {
"textureMap": "Textures/ceiling_1k_roughness.png"
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columna.material
+2 -1
View File
@@ -47,7 +47,8 @@
"factor": 0.017000000923871995,
"pdo": true,
"quality": "High",
"textureMap": "Textures/columnA_1k_height.png"
"textureMap": "Textures/columnA_1k_height.png",
"useTexture": false
},
"roughness": {
"textureMap": "Textures/columnA_1k_roughness.png"
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columnb.material
+2 -1
View File
@@ -46,7 +46,8 @@
"factor": 0.020999999716877939,
"pdo": true,
"quality": "High",
"textureMap": "Textures/columnB_1k_height.png"
"textureMap": "Textures/columnB_1k_height.png",
"useTexture": false
},
"roughness": {
"textureMap": "Textures/columnB_1k_roughness.png"
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columnc.material
+2 -1
View File
@@ -47,7 +47,8 @@
"factor": 0.014000000432133675,
"pdo": true,
"quality": "High",
"textureMap": "Textures/columnC_1k_height.png"
"textureMap": "Textures/columnC_1k_height.png",
"useTexture": false
},
"roughness": {
"textureMap": "Textures/columnC_1k_roughness.png"
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_details.material
+2 -1
View File
@@ -38,7 +38,8 @@
"algorithm": "POM",
"factor": 0.02500000037252903,
"pdo": true,
"textureMap": "Textures/details_1k_height.png"
"textureMap": "Textures/details_1k_height.png",
"useTexture": false
},
"roughness": {
"textureMap": "Textures/details_1k_roughness.png"
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_flagpole.material
+2 -1
View File
@@ -41,7 +41,8 @@
"factor": 0.014000000432133675,
"pdo": true,
"quality": "High",
"textureMap": "Textures/flagpole_1k_height.png"
"textureMap": "Textures/flagpole_1k_height.png",
"useTexture": false
},
"roughness": {
"textureMap": "Textures/flagpole_1k_roughness.png"
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_floor.material
+2 -1
View File
@@ -43,7 +43,8 @@
"algorithm": "POM",
"factor": 0.012000000104308129,
"pdo": true,
"textureMap": "Textures/floor_1k_height.png"
"textureMap": "Textures/floor_1k_height.png",
"useTexture": false
},
"roughness": {
"textureMap": "Textures/floor_1k_roughness.png"
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_leaf.material
+2 -1
View File
@@ -42,7 +42,8 @@
"mode": "Cutout"
},
"parallax": {
"textureMap": "Textures/thorn_height.png"
"textureMap": "Textures/thorn_height.png",
"useTexture": false
},
"roughness": {
"textureMap": "Textures/thorn_roughness.png"
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_lion.material
-1
View File
@@ -38,7 +38,6 @@
},
"parallax": {
"algorithm": "ContactRefinement",
"enable": true,
"factor": 0.009999999776482582,
"pdo": true,
"quality": "Ultra",
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_roof.material
+2 -1
View File
@@ -35,7 +35,8 @@
"algorithm": "ContactRefinement",
"factor": 0.019999999552965165,
"quality": "Medium",
"textureMap": "Textures/roof_1k_height.png"
"textureMap": "Textures/roof_1k_height.png",
"useTexture": false
},
"roughness": {
"textureMap": "Textures/roof_1k_roughness.png"
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vase.material
+2 -1
View File
@@ -41,7 +41,8 @@
"factor": 0.027000000700354577,
"pdo": true,
"quality": "High",
"textureMap": "Textures/vase_1k_height.png"
"textureMap": "Textures/vase_1k_height.png",
"useTexture": false
},
"roughness": {
"textureMap": "Textures/vase_1k_roughness.png"
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vasehanging.material
+2 -1
View File
@@ -41,7 +41,8 @@
"factor": 0.04600000008940697,
"pdo": true,
"quality": "High",
"textureMap": "Textures/vaseHanging_1k_height.png"
"textureMap": "Textures/vaseHanging_1k_height.png",
"useTexture": false
},
"roughness": {
"textureMap": "Textures/vaseHanging_1k_roughness.png"
Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vaseround.material
+2 -1
View File
@@ -45,7 +45,8 @@
"factor": 0.019999999552965165,
"pdo": true,
"quality": "High",
"textureMap": "Textures/vaseRound_1k_height.png"
"textureMap": "Textures/vaseRound_1k_height.png",
"useTexture": false
},
"roughness": {
"textureMap": "Textures/vaseRound_1k_roughness.png"
Gems/AtomContent/Sponza/Assets/stub
View File