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

Updating StandardPbr.materialtype to follow the new file format. In this commit all I did was combine the "groups" metadata together with the property lists. The groups will now show up in the wrong order in the Material Editor, because that was based on the "groups" list that no longer exists. I wanted to keep the giant list of properties in the same order for an easier diff review. In the next commit, I'll move the property groups around to be in the same order as before.

Browse Source 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
monroegm-disable-blank-issue-2
santorac 4 years ago
parent ea55c6d5e5
commit c3363fc22e
1 changed files with 968 additions and 971 deletions
Show Stats Download Patch File Download Diff File

181
Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR.materialtype
Unescape Escape View File

@ -10,76 +10,12 @@
} }
], ],
"propertyLayout": { "propertyLayout": {
"groups": [ "propertyGroups": [
{
"name": "baseColor",
"displayName": "Base Color",
"description": "Properties for configuring the surface reflected color for dielectrics or reflectance values for metals."
},
{
"name": "metallic",
"displayName": "Metallic",
"description": "Properties for configuring whether the surface is metallic or not."
},
{
"name": "roughness",
"displayName": "Roughness",
"description": "Properties for configuring how rough the surface appears."
},
{
"name": "specularF0",
"displayName": "Specular Reflectance f0",
"description": "The constant f0 represents the specular reflectance at normal incidence (Fresnel 0 Angle). Used to adjust reflectance of non-metal surfaces."
},
{
"name": "normal",
"displayName": "Normal",
"description": "Properties related to configuring surface normal."
},
{
"name": "occlusion",
"displayName": "Occlusion",
"description": "Properties for baked textures that represent geometric occlusion of light."
},
{
"name": "emissive",
"displayName": "Emissive",
"description": "Properties to add light emission, independent of other lights in the scene."
},
{
"name": "clearCoat",
"displayName": "Clear Coat",
"description": "Properties for configuring gloss clear coat"
},
{
"name": "parallax",
"displayName": "Displacement",
"description": "Properties for parallax effect produced by a height map."
},
{
"name": "opacity",
"displayName": "Opacity",
"description": "Properties for configuring the materials transparency."
},
{
"name": "uv",
"displayName": "UVs",
"description": "Properties for configuring UV transforms."
},
{
// Note: this property group is used in the DiffuseGlobalIllumination pass, it is not read by the StandardPBR shader
"name": "irradiance",
"displayName": "Irradiance",
"description": "Properties for configuring the irradiance used in global illumination."
},
{ {
"name": "general", "name": "general",
"displayName": "General Settings", "displayName": "General Settings",
"description": "General settings." "description": "General settings.",
} "properties": [
],
"properties": {
"general": [
{ {
"name": "doubleSided", "name": "doubleSided",
"displayName": "Double-sided", "displayName": "Double-sided",
@ -163,8 +99,13 @@
"name": "o_materialUseForwardPassIBLSpecular" "name": "o_materialUseForwardPassIBLSpecular"
} }
} }
], ]
"baseColor": [ },
{
"name": "baseColor",
"displayName": "Base Color",
"description": "Properties for configuring the surface reflected color for dielectrics or reflectance values for metals.",
"properties": [
{ {
"name": "color", "name": "color",
"displayName": "Color", "displayName": "Color",
@ -230,8 +171,13 @@
"name": "o_baseColorTextureBlendMode" "name": "o_baseColorTextureBlendMode"
} }
} }
], ]
"metallic": [ },
{
"name": "metallic",
"displayName": "Metallic",
"description": "Properties for configuring whether the surface is metallic or not.",
"properties": [
{ {
"name": "factor", "name": "factor",
"displayName": "Factor", "displayName": "Factor",
@ -274,8 +220,13 @@
"name": "m_metallicMapUvIndex" "name": "m_metallicMapUvIndex"
} }
} }
], ]
"roughness": [ },
{
"name": "roughness",
"displayName": "Roughness",
"description": "Properties for configuring how rough the surface appears.",
"properties": [
{ {
"name": "textureMap", "name": "textureMap",
"displayName": "Texture", "displayName": "Texture",
@ -347,8 +298,13 @@
"name": "m_roughnessFactor" "name": "m_roughnessFactor"
} }
} }
], ]
"specularF0": [ },
{
"name": "specularF0",
"displayName": "Specular Reflectance f0",
"description": "The constant f0 represents the specular reflectance at normal incidence (Fresnel 0 Angle). Used to adjust reflectance of non-metal surfaces.",
"properties": [
{ {
"name": "factor", "name": "factor",
"displayName": "Factor", "displayName": "Factor",
@ -402,8 +358,13 @@
"name": "o_specularF0_enableMultiScatterCompensation" "name": "o_specularF0_enableMultiScatterCompensation"
} }
} }
], ]
"clearCoat": [ },
{
"name": "clearCoat",
"displayName": "Clear Coat",
"description": "Properties for configuring gloss clear coat",
"properties": [
{ {
"name": "enable", "name": "enable",
"displayName": "Enable", "displayName": "Enable",
@ -537,8 +498,13 @@
"name": "m_clearCoatNormalMapUvIndex" "name": "m_clearCoatNormalMapUvIndex"
} }
} }
], ]
"normal": [ },
{
"name": "normal",
"displayName": "Normal",
"description": "Properties related to configuring surface normal.",
"properties": [
{ {
"name": "textureMap", "name": "textureMap",
"displayName": "Texture", "displayName": "Texture",
@ -603,8 +569,13 @@
"name": "m_normalFactor" "name": "m_normalFactor"
} }
} }
], ]
"opacity": [ },
{
"name": "opacity",
"displayName": "Opacity",
"description": "Properties for configuring the materials transparency.",
"properties": [
{ {
"name": "mode", "name": "mode",
"displayName": "Opacity Mode", "displayName": "Opacity Mode",
@ -677,8 +648,13 @@
"name": "m_opacityAffectsSpecularFactor" "name": "m_opacityAffectsSpecularFactor"
} }
} }
], ]
"uv": [ },
{
"name": "uv",
"displayName": "UVs",
"description": "Properties for configuring UV transforms.",
"properties": [
{ {
"name": "center", "name": "center",
"displayName": "Center", "displayName": "Center",
@ -739,8 +715,13 @@
"defaultValue": 1.0, "defaultValue": 1.0,
"step": 0.1 "step": 0.1
} }
], ]
"occlusion": [ },
{
"name": "occlusion",
"displayName": "Occlusion",
"description": "Properties for baked textures that represent geometric occlusion of light.",
"properties": [
{ {
"name": "diffuseTextureMap", "name": "diffuseTextureMap",
"displayName": "Diffuse AO", "displayName": "Diffuse AO",
@ -825,8 +806,13 @@
"name": "m_specularOcclusionFactor" "name": "m_specularOcclusionFactor"
} }
} }
], ]
"emissive": [ },
{
"name": "emissive",
"displayName": "Emissive",
"description": "Properties to add light emission, independent of other lights in the scene.",
"properties": [
{ {
"name": "enable", "name": "enable",
"displayName": "Enable", "displayName": "Enable",
@ -893,8 +879,13 @@
"name": "m_emissiveMapUvIndex" "name": "m_emissiveMapUvIndex"
} }
} }
], ]
"parallax": [ },
{
"name": "parallax",
"displayName": "Displacement",
"description": "Properties for parallax effect produced by a height map.",
"properties": [
{ {
"name": "textureMap", "name": "textureMap",
"displayName": "Height Map", "displayName": "Height Map",
@ -996,9 +987,14 @@
"name": "o_parallax_highlightClipping" "name": "o_parallax_highlightClipping"
} }
} }
], ]
"irradiance": [ },
// Note: this property group is used in the DiffuseGlobalIllumination pass and not by the main forward shader {
// Note: this property group is used in the DiffuseGlobalIllumination pass, it is not read by the StandardPBR shader
"name": "irradiance",
"displayName": "Irradiance",
"description": "Properties for configuring the irradiance used in global illumination.",
"properties": [
{ {
"name": "color", "name": "color",
"displayName": "Color", "displayName": "Color",
@ -1017,6 +1013,7 @@
} }
] ]
} }
]
}, },
"shaders": [ "shaders": [
{ {

Write Preview
Loading…
Cancel
Save