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

Merge pull request #6266 from aws-lumberyard-dev/Neil_o3de_local

Browse Source 
Converting PbrMaterialChart to prefab, and moving to AutomatedTesting
This commit is contained in:
jromnoa
2021-12-16 16:23:42 -08:00
committed by GitHub
parent f52d49834a 20e697a8d6
commit ea04449fa0
26 changed files with 5694 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AutomatedTesting/Levels/PbrMaterialChart/PbrMaterialChart.prefab
+5361
View File
File diff suppressed because it is too large Load Diff
AutomatedTesting/Levels/PbrMaterialChart/materials/basic.material
+32
View File
@@ -0,0 +1,32 @@
{
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"baseColor": {
"color": [ 1.0, 1.0, 1.0 ],
"factor": 0.75,
"useTexture": false,
"textureMap": ""
},
"metallic": {
"factor": 0.0,
"useTexture": false,
"textureMap": ""
},
"roughness": {
"factor": 0.0,
"useTexture": false,
"textureMap": ""
},
"specularF0": {
"factor": 0.5,
"useTexture": false,
"textureMap": ""
},
"normal": {
"factor": 1.0,
"useTexture": false,
"textureMap": ""
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r00.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 0.0
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r01.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 0.1
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r02.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 0.2
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r03.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 0.3
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r04.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 0.4
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r05.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 0.5
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r06.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 0.6
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r07.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 0.7
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r08.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 0.8
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r09.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 0.9
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r10.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 1.0
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r00.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
},
"roughness": {
"factor": 0.0
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r01.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
},
"roughness": {
"factor": 0.1
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r02.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
},
"roughness": {
"factor": 0.2
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r03.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
},
"roughness": {
"factor": 0.3
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r04.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
},
"roughness": {
"factor": 0.4
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r05.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
},
"roughness": {
"factor": 0.5
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r06.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
},
"roughness": {
"factor": 0.6
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r07.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
},
"roughness": {
"factor": 0.7
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r08.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
},
"roughness": {
"factor": 0.8
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r09.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
},
"roughness": {
"factor": 0.9
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r10.material
+13
View File
@@ -0,0 +1,13 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
},
"roughness": {
"factor": 1.0
}
}
}
AutomatedTesting/Levels/PbrMaterialChart/tags.txt
+12
View File
@@ -0,0 +1,12 @@
0,0,0,0,0,0
0,0,0,0,0,0
0,0,0,0,0,0
0,0,0,0,0,0
0,0,0,0,0,0
0,0,0,0,0,0
0,0,0,0,0,0
0,0,0,0,0,0
0,0,0,0,0,0
0,0,0,0,0,0
0,0,0,0,0,0
0,0,0,0,0,0
AutomatedTesting/Objects/sphere.fbx
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a476e99b55cf2a76fef6775c5a57dad29f8ffcb942c625bab04c89051a72a560
size 62626