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

Reordered material property groups according to design review.

Browse Source 
- Base Color
- Metallic
- Roughness
- Specular Reflectance F0
- Normal
- Occlusion
- Emissive
- Subsurface
- Clear Coat
- Displacement
- Opacity
- UVs
- Irradiance
- General Settings

ATOM-14002 [Material Editor] Revisit user facing organization and layout of material types
main
Chris Santora 5 years ago
parent de4e6957e8
commit 2112da5f85
4 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File

54
Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR.materialtype
Unescape Escape View File

@ -13,11 +13,6 @@
"displayName": "Metallic", "displayName": "Metallic",
"description": "Properties for configuring whether the surface is metallic or not." "description": "Properties for configuring whether the surface is metallic or not."
}, },
{
"id": "anisotropy",
"displayName": "Anisotropic Material Response",
"description": "How much is this material response anisotropic."
},
{ {
"id": "roughness", "id": "roughness",
"displayName": "Roughness", "displayName": "Roughness",
@ -28,25 +23,25 @@
"displayName": "Specular Reflectance f0", "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." "description": "The constant f0 represents the specular reflectance at normal incidence (Fresnel 0 Angle). Used to adjust reflectance of non-metal surfaces."
}, },
{
"id": "clearCoat",
"displayName": "Clear Coat",
"description": "Properties for configuring gloss clear coat"
},
{ {
"id": "normal", "id": "normal",
"displayName": "Normal", "displayName": "Normal",
"description": "Properties related to configuring surface normal." "description": "Properties related to configuring surface normal."
}, },
{ {
"id": "opacity", "id": "detailLayerGroup",
"displayName": "Opacity", "displayName": "Detail Layer",
"description": "Properties for configuring the materials transparency." "description": "Properties for Fine Details Layer."
}, },
{ {
"id": "uv", "id": "detailUV",
"displayName": "UVs", "displayName": "Detail Layer UV",
"description": "Properties for configuring UV transforms." "description": "Properties for modifying detail layer UV."
},
{
"id": "anisotropy",
"displayName": "Anisotropic Material Response",
"description": "How much is this material response anisotropic."
}, },
{ {
"id": "occlusion", "id": "occlusion",
@ -58,25 +53,30 @@
"displayName": "Emissive", "displayName": "Emissive",
"description": "Properties to add light emission, independent of other lights in the scene." "description": "Properties to add light emission, independent of other lights in the scene."
}, },
{
"id": "parallax",
"displayName": "Displacement",
"description": "Properties for parallax effect produced by a height map."
},
{ {
"id": "subsurfaceScattering", "id": "subsurfaceScattering",
"displayName": "Subsurface Scattering", "displayName": "Subsurface Scattering",
"description": "Properties for configuring subsurface scattering effects." "description": "Properties for configuring subsurface scattering effects."
}, },
{ {
"id": "detailLayerGroup", "id": "clearCoat",
"displayName": "Detail Layer", "displayName": "Clear Coat",
"description": "Properties for Fine Details Layer." "description": "Properties for configuring gloss clear coat"
},
{
"id": "parallax",
"displayName": "Displacement",
"description": "Properties for parallax effect produced by a height map."
}, },
{ {
"id": "detailUV", "id": "opacity",
"displayName": "Detail Layer UV", "displayName": "Opacity",
"description": "Properties for modifying detail layer UV." "description": "Properties for configuring the materials transparency."
},
{
"id": "uv",
"displayName": "UVs",
"description": "Properties for configuring UV transforms."
}, },
{ {
// 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 and not by the main forward shader

20
Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.materialtype
Unescape Escape View File

@ -23,6 +23,16 @@
"displayName": "Normal", "displayName": "Normal",
"description": "Properties related to configuring surface normal." "description": "Properties related to configuring surface normal."
}, },
{
"id": "detailLayerGroup",
"displayName": "Detail Layer",
"description": "Properties for Fine Details Layer."
},
{
"id": "detailUV",
"displayName": "Detail Layer UV",
"description": "Properties for modifying detail layer UV."
},
{ {
"id": "occlusion", "id": "occlusion",
"displayName": "Occlusion", "displayName": "Occlusion",
@ -38,16 +48,6 @@
"displayName": "Wrinkle Layers", "displayName": "Wrinkle Layers",
"description": "Properties for wrinkle maps to support morph animation, using vertex color blend weights." "description": "Properties for wrinkle maps to support morph animation, using vertex color blend weights."
}, },
{
"id": "detailLayerGroup",
"displayName": "Detail Layer",
"description": "Properties for Fine Details Layer."
},
{
"id": "detailUV",
"displayName": "Detail Layer UV",
"description": "Properties for modifying detail layer UV."
},
{ {
"id": "general", "id": "general",
"displayName": "General Settings", "displayName": "General Settings",

30
Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR.materialtype
Unescape Escape View File

@ -57,11 +57,6 @@
"displayName": "Layer 1: Normal", "displayName": "Layer 1: Normal",
"description": "Properties related to configuring surface normal." "description": "Properties related to configuring surface normal."
}, },
{
"id": "layer1_clearCoat",
"displayName": "Layer 1: Clear Coat",
"description": "Properties for configuring gloss clear coat"
},
{ {
"id": "layer1_occlusion", "id": "layer1_occlusion",
"displayName": "Layer 1: Occlusion", "displayName": "Layer 1: Occlusion",
@ -72,6 +67,11 @@
"displayName": "Layer 1: Emissive", "displayName": "Layer 1: Emissive",
"description": "Properties to add light emission, independent of other lights in the scene." "description": "Properties to add light emission, independent of other lights in the scene."
}, },
{
"id": "layer1_clearCoat",
"displayName": "Layer 1: Clear Coat",
"description": "Properties for configuring gloss clear coat"
},
{ {
"id": "layer1_parallax", "id": "layer1_parallax",
"displayName": "Layer 1: Displacement", "displayName": "Layer 1: Displacement",
@ -110,11 +110,6 @@
"displayName": "Layer 2: Normal", "displayName": "Layer 2: Normal",
"description": "Properties related to configuring surface normal." "description": "Properties related to configuring surface normal."
}, },
{
"id": "layer2_clearCoat",
"displayName": "Layer 2: Clear Coat",
"description": "Properties for configuring gloss clear coat"
},
{ {
"id": "layer2_occlusion", "id": "layer2_occlusion",
"displayName": "Layer 2: Occlusion", "displayName": "Layer 2: Occlusion",
@ -125,6 +120,11 @@
"displayName": "Layer 2: Emissive", "displayName": "Layer 2: Emissive",
"description": "Properties to add light emission, independent of other lights in the scene." "description": "Properties to add light emission, independent of other lights in the scene."
}, },
{
"id": "layer2_clearCoat",
"displayName": "Layer 2: Clear Coat",
"description": "Properties for configuring gloss clear coat"
},
{ {
"id": "layer2_parallax", "id": "layer2_parallax",
"displayName": "Layer 2: Displacement", "displayName": "Layer 2: Displacement",
@ -163,11 +163,6 @@
"displayName": "Layer 3: Normal", "displayName": "Layer 3: Normal",
"description": "Properties related to configuring surface normal." "description": "Properties related to configuring surface normal."
}, },
{
"id": "layer3_clearCoat",
"displayName": "Layer 3: Clear Coat",
"description": "Properties for configuring gloss clear coat"
},
{ {
"id": "layer3_occlusion", "id": "layer3_occlusion",
"displayName": "Layer 3: Occlusion", "displayName": "Layer 3: Occlusion",
@ -178,6 +173,11 @@
"displayName": "Layer 3: Emissive", "displayName": "Layer 3: Emissive",
"description": "Properties to add light emission, independent of other lights in the scene." "description": "Properties to add light emission, independent of other lights in the scene."
}, },
{
"id": "layer3_clearCoat",
"displayName": "Layer 3: Clear Coat",
"description": "Properties for configuring gloss clear coat"
},
{ {
"id": "layer3_parallax", "id": "layer3_parallax",
"displayName": "Layer 3: Displacement", "displayName": "Layer 3: Displacement",

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

@ -23,26 +23,11 @@
"displayName": "Specular Reflectance f0", "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." "description": "The constant f0 represents the specular reflectance at normal incidence (Fresnel 0 Angle). Used to adjust reflectance of non-metal surfaces."
}, },
{
"id": "clearCoat",
"displayName": "Clear Coat",
"description": "Properties for configuring gloss clear coat"
},
{ {
"id": "normal", "id": "normal",
"displayName": "Normal", "displayName": "Normal",
"description": "Properties related to configuring surface normal." "description": "Properties related to configuring surface normal."
}, },
{
"id": "opacity",
"displayName": "Opacity",
"description": "Properties for configuring the materials transparency."
},
{
"id": "uv",
"displayName": "UVs",
"description": "Properties for configuring UV transforms."
},
{ {
"id": "occlusion", "id": "occlusion",
"displayName": "Occlusion", "displayName": "Occlusion",
@ -53,15 +38,30 @@
"displayName": "Emissive", "displayName": "Emissive",
"description": "Properties to add light emission, independent of other lights in the scene." "description": "Properties to add light emission, independent of other lights in the scene."
}, },
{
"id": "subsurfaceScattering",
"displayName": "Subsurface Scattering",
"description": "Properties for configuring subsurface scattering effects."
},
{
"id": "clearCoat",
"displayName": "Clear Coat",
"description": "Properties for configuring gloss clear coat"
},
{ {
"id": "parallax", "id": "parallax",
"displayName": "Displacement", "displayName": "Displacement",
"description": "Properties for parallax effect produced by a height map." "description": "Properties for parallax effect produced by a height map."
}, },
{ {
"id": "subsurfaceScattering", "id": "opacity",
"displayName": "Subsurface Scattering", "displayName": "Opacity",
"description": "Properties for configuring subsurface scattering effects." "description": "Properties for configuring the materials transparency."
},
{
"id": "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 // Note: this property group is used in the DiffuseGlobalIllumination pass, it is not read by the StandardPBR shader

Write Preview
Loading…
Cancel
Save