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
This commit is contained in:
Chris Santora
2021-05-28 14:34:07 -07:00
parent de4e6957e8
commit 2112da5f85
4 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR.materialtype
+27 -27
View File
@@ -13,11 +13,6 @@
"displayName": "Metallic",
"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",
"displayName": "Roughness",
@@ -28,25 +23,25 @@
"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."
},
{
"id": "clearCoat",
"displayName": "Clear Coat",
"description": "Properties for configuring gloss clear coat"
},
{
"id": "normal",
"displayName": "Normal",
"description": "Properties related to configuring surface normal."
},
{
"id": "opacity",
"displayName": "Opacity",
"description": "Properties for configuring the materials transparency."
"id": "detailLayerGroup",
"displayName": "Detail Layer",
"description": "Properties for Fine Details Layer."
},
{
"id": "uv",
"displayName": "UVs",
"description": "Properties for configuring UV transforms."
"id": "detailUV",
"displayName": "Detail Layer UV",
"description": "Properties for modifying detail layer UV."
},
{
"id": "anisotropy",
"displayName": "Anisotropic Material Response",
"description": "How much is this material response anisotropic."
},
{
"id": "occlusion",
@@ -58,25 +53,30 @@
"displayName": "Emissive",
"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",
"displayName": "Subsurface Scattering",
"description": "Properties for configuring subsurface scattering effects."
},
{
"id": "detailLayerGroup",
"displayName": "Detail Layer",
"description": "Properties for Fine Details Layer."
"id": "clearCoat",
"displayName": "Clear Coat",
"description": "Properties for configuring gloss clear coat"
},
{
"id": "parallax",
"displayName": "Displacement",
"description": "Properties for parallax effect produced by a height map."
},
{
"id": "detailUV",
"displayName": "Detail Layer UV",
"description": "Properties for modifying detail layer UV."
"id": "opacity",
"displayName": "Opacity",
"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
Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.materialtype
+10 -10
View File
@@ -23,6 +23,16 @@
"displayName": "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",
"displayName": "Occlusion",
@@ -38,16 +48,6 @@
"displayName": "Wrinkle Layers",
"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",
"displayName": "General Settings",
Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR.materialtype
+15 -15
View File
@@ -57,11 +57,6 @@
"displayName": "Layer 1: 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",
"displayName": "Layer 1: Occlusion",
@@ -72,6 +67,11 @@
"displayName": "Layer 1: Emissive",
"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",
"displayName": "Layer 1: Displacement",
@@ -110,11 +110,6 @@
"displayName": "Layer 2: 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",
"displayName": "Layer 2: Occlusion",
@@ -125,6 +120,11 @@
"displayName": "Layer 2: Emissive",
"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",
"displayName": "Layer 2: Displacement",
@@ -163,11 +163,6 @@
"displayName": "Layer 3: 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",
"displayName": "Layer 3: Occlusion",
@@ -178,6 +173,11 @@
"displayName": "Layer 3: Emissive",
"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",
"displayName": "Layer 3: Displacement",
Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR.materialtype
+18 -18
View File
@@ -23,26 +23,11 @@
"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."
},
{
"id": "clearCoat",
"displayName": "Clear Coat",
"description": "Properties for configuring gloss clear coat"
},
{
"id": "normal",
"displayName": "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",
"displayName": "Occlusion",
@@ -53,15 +38,30 @@
"displayName": "Emissive",
"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",
"displayName": "Displacement",
"description": "Properties for parallax effect produced by a height map."
},
{
"id": "subsurfaceScattering",
"displayName": "Subsurface Scattering",
"description": "Properties for configuring subsurface scattering effects."
"id": "opacity",
"displayName": "Opacity",
"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