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

Merge pull request #1046 from aws-lumberyard-dev/Atom/santorac/MaterialLayoutCleanup-ATOM-14002

Browse Source 
Updated Material Property Layouts Per Design

- Renamed "Details" group to "Overview".
- Renamed "UV Names" group to "UV Sets".
- Renamed "General" group to "General Settings".
- Renamed "Parallax" group to "Displacement".
- Renamed "Texture Map" properties to just "Texture". In cases where a specific type of texture is mentioned like "roughness texture map" I called this "roughness map" (which is more common according to google).
- Renamed "Heightmap" to "Height map" (which is more common according to google).
- Reordered material property groups according to design review.
  - 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 16:55:35 -07:00
committed by GitHub
parent 75cb293b2a 19b7b330d0
commit e690c0e626
10 changed files with 383 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR.materialtype
+102 -102
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,46 +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",
"description": "Properties for baked textures that represent geometric occlusion of light."
},
{
"id": "emissive",
"displayName": "Emissive",
"description": "Properties to add light emission, independent of other lights in the scene."
},
{
"id": "parallax",
"displayName": "Parallax Mapping",
"description": "Properties for parallax effect produced by depthmap."
},
{
"id": "subsurfaceScattering",
"displayName": "Subsurface Scattering",
"description": "Properties for configuring subsurface scattering effects."
},
{
"id": "detailLayerGroup",
"displayName": "Detail Layer",
@@ -78,6 +38,46 @@
"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",
"displayName": "Occlusion",
"description": "Properties for baked textures that represent geometric occlusion of light."
},
{
"id": "emissive",
"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": "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
"id": "irradiance",
@@ -86,7 +86,7 @@
},
{
"id": "general",
"displayName": "General",
"displayName": "General Settings",
"description": "General settings."
}
],
@@ -197,7 +197,7 @@
},
{
"id": "textureMap",
"displayName": "Texture Map",
"displayName": "Texture",
"description": "Base color texture map",
"type": "Image",
"connection": {
@@ -208,14 +208,14 @@
{
"id": "useTexture",
"displayName": "Use Texture",
"description": "Whether to use the texture map.",
"description": "Whether to use the texture.",
"type": "Bool",
"defaultValue": true
},
{
"id": "textureMapUv",
"displayName": "UV",
"description": "Base color texture map UV set",
"description": "Base color map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -227,7 +227,7 @@
{
"id": "textureBlendMode",
"displayName": "Texture Blend Mode",
"description": "Selects the equation to use when combining Color, Factor, and Texture Map.",
"description": "Selects the equation to use when combining Color, Factor, and Texture.",
"type": "Enum",
"enumValues": [ "Multiply", "LinearLight", "Lerp", "Overlay" ],
"defaultValue": "Multiply",
@@ -253,7 +253,7 @@
},
{
"id": "textureMap",
"displayName": "Texture Map",
"displayName": "Texture",
"description": "",
"type": "Image",
"connection": {
@@ -264,14 +264,14 @@
{
"id": "useTexture",
"displayName": "Use Texture",
"description": "Whether to use the texture map, or just default to the Factor value.",
"description": "Whether to use the texture, or just default to the Factor value.",
"type": "Bool",
"defaultValue": true
},
{
"id": "textureMapUv",
"displayName": "UV",
"description": "Metallic texture map UV set",
"description": "Metallic map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -284,8 +284,8 @@
"roughness": [
{
"id": "textureMap",
"displayName": "Texture Map",
"description": "Texture map for defining surface roughness.",
"displayName": "Texture",
"description": "Texture for defining surface roughness.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -295,14 +295,14 @@
{
"id": "useTexture",
"displayName": "Use Texture",
"description": "Whether to use the texture map, or just default to the Factor value.",
"description": "Whether to use the texture, or just default to the Factor value.",
"type": "Bool",
"defaultValue": true
},
{
"id": "textureMapUv",
"displayName": "UV",
"description": "Roughness texture map UV set",
"description": "Roughness map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -315,7 +315,7 @@
// Note that "factor" is mutually exclusive with "lowerBound"/"upperBound". These are swapped by a lua functor.
"id": "lowerBound",
"displayName": "Lower Bound",
"description": "The roughness value that corresponds to black in the texture map.",
"description": "The roughness value that corresponds to black in the texture.",
"type": "Float",
"defaultValue": 0.0,
"min": 0.0,
@@ -329,7 +329,7 @@
// Note that "factor" is mutually exclusive with "lowerBound"/"upperBound". These are swapped by a lua functor.
"id": "upperBound",
"displayName": "Upper Bound",
"description": "The roughness value that corresponds to white in the texture map.",
"description": "The roughness value that corresponds to white in the texture.",
"type": "Float",
"defaultValue": 1.0,
"min": 0.0,
@@ -409,8 +409,8 @@
},
{
"id": "textureMap",
"displayName": "Texture Map",
"description": "Texture map for defining surface reflectance.",
"displayName": "Texture",
"description": "Texture for defining surface reflectance.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -420,14 +420,14 @@
{
"id": "useTexture",
"displayName": "Use Texture",
"description": "Whether to use the texture map, or just default to the Factor value.",
"description": "Whether to use the texture, or just default to the Factor value.",
"type": "Bool",
"defaultValue": true
},
{
"id": "textureMapUv",
"displayName": "UV",
"description": "Specular reflection texture map UV set",
"description": "Specular reflection map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -472,7 +472,7 @@
{
"id": "influenceMap",
"displayName": " Influence Map",
"description": "Strength factor texture map",
"description": "Strength factor texture",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -482,14 +482,14 @@
{
"id": "useInfluenceMap",
"displayName": " Use Texture",
"description": "Whether to use the texture map, or just default to the Factor value.",
"description": "Whether to use the texture, or just default to the Factor value.",
"type": "Bool",
"defaultValue": true
},
{
"id": "influenceMapUv",
"displayName": " UV",
"description": "Strength factor texture map UV set",
"description": "Strength factor map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -514,7 +514,7 @@
{
"id": "roughnessMap",
"displayName": " Roughness Map",
"description": "Roughness texture map",
"description": "Texture for defining surface roughness",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -524,14 +524,14 @@
{
"id": "useRoughnessMap",
"displayName": " Use Texture",
"description": "Whether to use the texture map, or just default to the roughness value.",
"description": "Whether to use the texture, or just default to the roughness value.",
"type": "Bool",
"defaultValue": true
},
{
"id": "roughnessMapUv",
"displayName": " UV",
"description": "Roughness texture map UV set",
"description": "Roughness map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -573,7 +573,7 @@
{
"id": "normalMapUv",
"displayName": " UV",
"description": "Normal texture map UV set",
"description": "Normal map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -586,8 +586,8 @@
"normal": [
{
"id": "textureMap",
"displayName": "Texture Map",
"description": "Texture map for defining surface normal direction.",
"displayName": "Texture",
"description": "Texture for defining surface normal direction.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -597,14 +597,14 @@
{
"id": "useTexture",
"displayName": "Use Texture",
"description": "Whether to use the texture map, or just rely on vertex normals.",
"description": "Whether to use the texture, or just rely on vertex normals.",
"type": "Bool",
"defaultValue": true
},
{
"id": "textureMapUv",
"displayName": "UV",
"description": "Normal texture map UV set",
"description": "Normal map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -653,7 +653,7 @@
{
"id": "mode",
"displayName": "Opacity Mode",
"description": "Opacity mode for this texture.",
"description": "Indicates the general approach how transparency is to be applied.",
"type": "Enum",
"enumValues": [ "Opaque", "Cutout", "Blended", "TintedTransparent" ],
"defaultValue": "Opaque",
@@ -665,7 +665,7 @@
{
"id": "alphaSource",
"displayName": "Alpha Source",
"description": "Source texture of alpha value.",
"description": "Indicates whether to get the opacity texture from the Base Color map (Packed) or from a separate greyscale texture (Split).",
"type": "Enum",
"enumValues": [ "Packed", "Split", "None" ],
"defaultValue": "Packed",
@@ -676,8 +676,8 @@
},
{
"id": "textureMap",
"displayName": "Texture Map",
"description": "Texture map for defining surface opacity.",
"displayName": "Texture",
"description": "Texture for defining surface opacity.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -687,7 +687,7 @@
{
"id": "textureMapUv",
"displayName": "UV",
"description": "Opacity texture map UV set",
"description": "Opacity map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -782,7 +782,7 @@
{
"id": "diffuseTextureMap",
"displayName": "Diffuse AO",
"description": "Texture map for defining occlusion area for diffuse ambient lighting.",
"description": "Texture for defining occlusion area for diffuse ambient lighting.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -792,14 +792,14 @@
{
"id": "diffuseUseTexture",
"displayName": " Use Texture",
"description": "Whether to use the Diffuse AO texture map.",
"description": "Whether to use the Diffuse AO map.",
"type": "Bool",
"defaultValue": true
},
{
"id": "diffuseTextureMapUv",
"displayName": " UV",
"description": "Diffuse AO texture map UV set.",
"description": "Diffuse AO map UV set.",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -824,7 +824,7 @@
{
"id": "specularTextureMap",
"displayName": "Specular Cavity",
"description": "Texture map for defining occlusion area for specular lighting.",
"description": "Texture for defining occlusion area for specular lighting.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -834,14 +834,14 @@
{
"id": "specularUseTexture",
"displayName": " Use Texture",
"description": "Whether to use the Specular Cavity texture map.",
"description": "Whether to use the Specular Cavity map.",
"type": "Bool",
"defaultValue": true
},
{
"id": "specularTextureMapUv",
"displayName": " UV",
"description": "Specular Cavity texture map UV set.",
"description": "Specular Cavity map UV set.",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -904,8 +904,8 @@
},
{
"id": "textureMap",
"displayName": "Texture Map",
"description": "Texture map for defining emissive area.",
"displayName": "Texture",
"description": "Texture for defining emissive area.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -915,14 +915,14 @@
{
"id": "useTexture",
"displayName": "Use Texture",
"description": "Whether to use the texture map.",
"description": "Whether to use the texture.",
"type": "Bool",
"defaultValue": true
},
{
"id": "textureMapUv",
"displayName": "UV",
"description": "Emissive texture map UV set",
"description": "Emissive map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -935,8 +935,8 @@
"parallax": [
{
"id": "textureMap",
"displayName": "Heightmap",
"description": "Displacement heightmap to create parallax effect.",
"displayName": "Height Map",
"description": "Displacement height map to create parallax effect.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -946,14 +946,14 @@
{
"id": "useTexture",
"displayName": "Use Texture",
"description": "Whether to use the heightmap.",
"description": "Whether to use the height map.",
"type": "Bool",
"defaultValue": true
},
{
"id": "textureMapUv",
"displayName": "UV",
"description": "Heightmap UV set",
"description": "Height map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -964,8 +964,8 @@
},
{
"id": "factor",
"displayName": "Heightmap Scale",
"description": "The total height of the heightmap in local model units.",
"displayName": "Height Map Scale",
"description": "The total height of the height map in local model units.",
"type": "Float",
"defaultValue": 0.05,
"min": 0.0,
@@ -1026,7 +1026,7 @@
{
"id": "showClipping",
"displayName": "Show Clipping",
"description": "Highlight areas where the heightmap is clipped by the mesh surface.",
"description": "Highlight areas where the height map is clipped by the mesh surface.",
"type": "Bool",
"defaultValue": false,
"connection": {
@@ -1063,7 +1063,7 @@
{
"id": "influenceMap",
"displayName": " Influence Map",
"description": "Use texture map to control the strength of subsurface scattering",
"description": "Texture for controlling the strength of subsurface scattering",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -1073,7 +1073,7 @@
{
"id": "useInfluenceMap",
"displayName": " Use Influence Map",
"description": "Whether to use the texture map as influence mask.",
"description": "Whether to use the influence map.",
"type": "Bool",
"defaultValue": true
},
@@ -1142,7 +1142,7 @@
{
"id": "thicknessMap",
"displayName": " Thickness Map",
"description": "Use a greyscale texture for per pixel thickness",
"description": "Texture for controlling per pixel thickness",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -1171,7 +1171,7 @@
{
"id": "transmissionTint",
"displayName": " Transmission Tint",
"description": "Color of the volume light travelling through",
"description": "Color of the volume light traveling through",
"type": "Color",
"defaultValue": [ 1.0, 0.8, 0.6 ]
},
@@ -1246,7 +1246,7 @@
{
"id": "enableDetailMaskTexture",
"displayName": " Use Texture",
"description": "Enable detail mask texture",
"description": "Enable detail blend mask",
"type": "Bool",
"defaultValue": true
},
@@ -1265,7 +1265,7 @@
{
"id": "textureMapUv",
"displayName": "Detail Map UVs",
"description": "Which UV set to use for detail map texture sampling",
"description": "Which UV set to use for detail map sampling",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -1283,8 +1283,8 @@
},
{
"id": "baseColorDetailMap",
"displayName": " Texture Map",
"description": "Detailed Base Color Texture map",
"displayName": " Texture",
"description": "Detailed Base Color Texture",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -1307,7 +1307,7 @@
{
"id": "enableNormals",
"displayName": "Enable Normal",
"description": "Enable detail normal texture to be used for fine detail normal such as scratches and small dents",
"description": "Enable detail normal map to be used for fine detail normal such as scratches and small dents",
"type": "Bool",
"defaultValue": false
},
@@ -1326,8 +1326,8 @@
},
{
"id": "normalDetailMap",
"displayName": " Texture Map",
"description": "Detailed Normal Texture map",
"displayName": " Texture",
"description": "Detailed Normal map",
"type": "Image",
"connection": {
"type": "ShaderInput",
Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.materialtype
+46 -46
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,19 +48,9 @@
"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",
"displayName": "General Settings",
"description": "General settings."
}
],
@@ -150,7 +150,7 @@
},
{
"id": "textureMap",
"displayName": "Texture Map",
"displayName": "Texture",
"description": "Base color texture map",
"type": "Image",
"connection": {
@@ -161,14 +161,14 @@
{
"id": "useTexture",
"displayName": "Use Texture",
"description": "Whether to use the texture map.",
"description": "Whether to use the texture.",
"type": "Bool",
"defaultValue": true
},
{
"id": "textureMapUv",
"displayName": "UV",
"description": "Base color texture map UV set",
"description": "Base color map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Unwrapped",
@@ -180,7 +180,7 @@
{
"id": "textureBlendMode",
"displayName": "Texture Blend Mode",
"description": "Selects the equation to use when combining Color, Factor, and Texture Map.",
"description": "Selects the equation to use when combining Color, Factor, and Texture.",
"type": "Enum",
"enumValues": [ "Multiply", "LinearLight", "Lerp", "Overlay" ],
"defaultValue": "Multiply",
@@ -193,8 +193,8 @@
"roughness": [
{
"id": "textureMap",
"displayName": "Texture Map",
"description": "Texture map for defining surface roughness.",
"displayName": "Texture",
"description": "Texture for defining surface roughness.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -204,14 +204,14 @@
{
"id": "useTexture",
"displayName": "Use Texture",
"description": "Whether to use the texture map, or just default to the Factor value.",
"description": "Whether to use the texture, or just default to the Factor value.",
"type": "Bool",
"defaultValue": true
},
{
"id": "textureMapUv",
"displayName": "UV",
"description": "Roughness texture map UV set",
"description": "Roughness map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Unwrapped",
@@ -224,7 +224,7 @@
// Note that "factor" is mutually exclusive with "lowerBound"/"upperBound". These are swapped by a lua functor.
"id": "lowerBound",
"displayName": "Lower Bound",
"description": "The roughness value that corresponds to black in the texture map.",
"description": "The roughness value that corresponds to black in the texture.",
"type": "Float",
"defaultValue": 0.0,
"min": 0.0,
@@ -238,7 +238,7 @@
// Note that "factor" is mutually exclusive with "lowerBound"/"upperBound". These are swapped by a lua functor.
"id": "upperBound",
"displayName": "Upper Bound",
"description": "The roughness value that corresponds to white in the texture map.",
"description": "The roughness value that corresponds to white in the texture.",
"type": "Float",
"defaultValue": 1.0,
"min": 0.0,
@@ -279,8 +279,8 @@
},
{
"id": "textureMap",
"displayName": "Texture Map",
"description": "Texture map for defining surface reflectance.",
"displayName": "Texture",
"description": "Texture for defining surface reflectance.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -290,14 +290,14 @@
{
"id": "useTexture",
"displayName": "Use Texture",
"description": "Whether to use the texture map, or just default to the Factor value.",
"description": "Whether to use the texture, or just default to the Factor value.",
"type": "Bool",
"defaultValue": true
},
{
"id": "textureMapUv",
"displayName": "UV",
"description": "Specular reflection texture map UV set",
"description": "Specular reflection map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Unwrapped",
@@ -321,8 +321,8 @@
"normal": [
{
"id": "textureMap",
"displayName": "Texture Map",
"description": "Texture map for defining surface normal direction.",
"displayName": "Texture",
"description": "Texture for defining surface normal direction.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -332,14 +332,14 @@
{
"id": "useTexture",
"displayName": "Use Texture",
"description": "Whether to use the texture map, or just rely on vertex normals.",
"description": "Whether to use the texture, or just rely on vertex normals.",
"type": "Bool",
"defaultValue": true
},
{
"id": "textureMapUv",
"displayName": "UV",
"description": "Normal texture map UV set",
"description": "Normal map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Unwrapped",
@@ -388,7 +388,7 @@
{
"id": "diffuseTextureMap",
"displayName": "Diffuse AO",
"description": "Texture map for defining occlusion area for diffuse ambient lighting.",
"description": "Texture for defining occlusion area for diffuse ambient lighting.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -398,14 +398,14 @@
{
"id": "diffuseUseTexture",
"displayName": " Use Texture",
"description": "Whether to use the Diffuse AO texture map.",
"description": "Whether to use the Diffuse AO map.",
"type": "Bool",
"defaultValue": true
},
{
"id": "diffuseTextureMapUv",
"displayName": " UV",
"description": "Diffuse AO texture map UV set.",
"description": "Diffuse AO map UV set.",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -430,7 +430,7 @@
{
"id": "specularTextureMap",
"displayName": "Specular Cavity",
"description": "Texture map for defining occlusion area for specular lighting.",
"description": "Texture for defining occlusion area for specular lighting.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -440,14 +440,14 @@
{
"id": "specularUseTexture",
"displayName": " Use Texture",
"description": "Whether to use the Specular Cavity texture map.",
"description": "Whether to use the Specular Cavity map.",
"type": "Bool",
"defaultValue": true
},
{
"id": "specularTextureMapUv",
"displayName": " UV",
"description": "Specular Cavity texture map UV set.",
"description": "Specular Cavity map UV set.",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -498,7 +498,7 @@
{
"id": "influenceMap",
"displayName": " Influence Map",
"description": "Use texture map to control the strength of subsurface scattering",
"description": "Texture for controlling the strength of subsurface scattering",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -508,7 +508,7 @@
{
"id": "useInfluenceMap",
"displayName": " Use Influence Map",
"description": "Whether to use the texture map as influence mask.",
"description": "Whether to use the influence map.",
"type": "Bool",
"defaultValue": true
},
@@ -577,7 +577,7 @@
{
"id": "thicknessMap",
"displayName": " Thickness Map",
"description": "Use a greyscale texture for per pixel thickness",
"description": "Texture for controlling per pixel thickness",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -606,7 +606,7 @@
{
"id": "transmissionTint",
"displayName": " Transmission Tint",
"description": "Color of the volume light travelling through",
"description": "Color of the volume light traveling through",
"type": "Color",
"defaultValue": [ 1.0, 0.8, 0.6 ]
},
@@ -792,7 +792,7 @@
{
"id": "enableDetailMaskTexture",
"displayName": " Use Texture",
"description": "Enable detail mask texture",
"description": "Enable detail blend mask",
"type": "Bool",
"defaultValue": true
},
@@ -811,7 +811,7 @@
{
"id": "textureMapUv",
"displayName": "Detail Map UVs",
"description": "Which UV set to use for detail map texture sampling",
"description": "Which UV set to use for detail map sampling",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Unwrapped",
@@ -829,8 +829,8 @@
},
{
"id": "baseColorDetailMap",
"displayName": " Texture Map",
"description": "Detailed Base Color Texture map",
"displayName": " Texture",
"description": "Detailed Base Color Texture",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -853,7 +853,7 @@
{
"id": "enableNormals",
"displayName": "Enable Normal",
"description": "Enable detail normal texture to be used for fine detail normal such as scratches and small dents",
"description": "Enable detail normal map to be used for fine detail normal such as scratches and small dents",
"type": "Bool",
"defaultValue": false
},
@@ -872,8 +872,8 @@
},
{
"id": "normalDetailMap",
"displayName": " Texture Map",
"description": "Detailed Normal Texture map",
"displayName": " Texture",
"description": "Detailed Normal map",
"type": "Image",
"connection": {
"type": "ShaderInput",
Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR.materialtype
+143 -143
View File
File diff suppressed because it is too large Load Diff
Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR.materialtype
+75 -75
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,16 +38,31 @@
"displayName": "Emissive",
"description": "Properties to add light emission, independent of other lights in the scene."
},
{
"id": "parallax",
"displayName": "Parallax Mapping",
"description": "Properties for parallax effect produced by depthmap."
},
{
"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": "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
"id": "irradiance",
@@ -71,7 +71,7 @@
},
{
"id": "general",
"displayName": "General",
"displayName": "General Settings",
"description": "General settings."
}
],
@@ -182,7 +182,7 @@
},
{
"id": "textureMap",
"displayName": "Texture Map",
"displayName": "Texture",
"description": "Base color texture map",
"type": "Image",
"connection": {
@@ -193,14 +193,14 @@
{
"id": "useTexture",
"displayName": "Use Texture",
"description": "Whether to use the texture map.",
"description": "Whether to use the texture.",
"type": "Bool",
"defaultValue": true
},
{
"id": "textureMapUv",
"displayName": "UV",
"description": "Base color texture map UV set",
"description": "Base color map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -212,7 +212,7 @@
{
"id": "textureBlendMode",
"displayName": "Texture Blend Mode",
"description": "Selects the equation to use when combining Color, Factor, and Texture Map.",
"description": "Selects the equation to use when combining Color, Factor, and Texture.",
"type": "Enum",
"enumValues": [ "Multiply", "LinearLight", "Lerp", "Overlay" ],
"defaultValue": "Multiply",
@@ -238,7 +238,7 @@
},
{
"id": "textureMap",
"displayName": "Texture Map",
"displayName": "Texture",
"description": "",
"type": "Image",
"connection": {
@@ -249,14 +249,14 @@
{
"id": "useTexture",
"displayName": "Use Texture",
"description": "Whether to use the texture map, or just default to the Factor value.",
"description": "Whether to use the texture, or just default to the Factor value.",
"type": "Bool",
"defaultValue": true
},
{
"id": "textureMapUv",
"displayName": "UV",
"description": "Metallic texture map UV set",
"description": "Metallic map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -269,8 +269,8 @@
"roughness": [
{
"id": "textureMap",
"displayName": "Texture Map",
"description": "Texture map for defining surface roughness.",
"displayName": "Texture",
"description": "Texture for defining surface roughness.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -280,14 +280,14 @@
{
"id": "useTexture",
"displayName": "Use Texture",
"description": "Whether to use the texture map, or just default to the Factor value.",
"description": "Whether to use the texture, or just default to the Factor value.",
"type": "Bool",
"defaultValue": true
},
{
"id": "textureMapUv",
"displayName": "UV",
"description": "Roughness texture map UV set",
"description": "Roughness map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -300,7 +300,7 @@
// Note that "factor" is mutually exclusive with "lowerBound"/"upperBound". These are swapped by a lua functor.
"id": "lowerBound",
"displayName": "Lower Bound",
"description": "The roughness value that corresponds to black in the texture map.",
"description": "The roughness value that corresponds to black in the texture.",
"type": "Float",
"defaultValue": 0.0,
"min": 0.0,
@@ -314,7 +314,7 @@
// Note that "factor" is mutually exclusive with "lowerBound"/"upperBound". These are swapped by a lua functor.
"id": "upperBound",
"displayName": "Upper Bound",
"description": "The roughness value that corresponds to white in the texture map.",
"description": "The roughness value that corresponds to white in the texture.",
"type": "Float",
"defaultValue": 1.0,
"min": 0.0,
@@ -355,8 +355,8 @@
},
{
"id": "textureMap",
"displayName": "Texture Map",
"description": "Texture map for defining surface reflectance.",
"displayName": "Texture",
"description": "Texture for defining surface reflectance.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -366,14 +366,14 @@
{
"id": "useTexture",
"displayName": "Use Texture",
"description": "Whether to use the texture map, or just default to the Factor value.",
"description": "Whether to use the texture, or just default to the Factor value.",
"type": "Bool",
"defaultValue": true
},
{
"id": "textureMapUv",
"displayName": "UV",
"description": "Specular reflection texture map UV set",
"description": "Specular reflection map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -418,7 +418,7 @@
{
"id": "influenceMap",
"displayName": " Influence Map",
"description": "Strength factor texture map",
"description": "Strength factor texture",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -428,14 +428,14 @@
{
"id": "useInfluenceMap",
"displayName": " Use Texture",
"description": "Whether to use the texture map, or just default to the Factor value.",
"description": "Whether to use the texture, or just default to the Factor value.",
"type": "Bool",
"defaultValue": true
},
{
"id": "influenceMapUv",
"displayName": " UV",
"description": "Strength factor texture map UV set",
"description": "Strength factor map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -460,7 +460,7 @@
{
"id": "roughnessMap",
"displayName": " Roughness Map",
"description": "Roughness texture map",
"description": "Texture for defining surface roughness",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -470,14 +470,14 @@
{
"id": "useRoughnessMap",
"displayName": " Use Texture",
"description": "Whether to use the texture map, or just default to the roughness value.",
"description": "Whether to use the texture, or just default to the roughness value.",
"type": "Bool",
"defaultValue": true
},
{
"id": "roughnessMapUv",
"displayName": " UV",
"description": "Roughness texture map UV set",
"description": "Roughness map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -519,7 +519,7 @@
{
"id": "normalMapUv",
"displayName": " UV",
"description": "Normal texture map UV set",
"description": "Normal map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -532,8 +532,8 @@
"normal": [
{
"id": "textureMap",
"displayName": "Texture Map",
"description": "Texture map for defining surface normal direction.",
"displayName": "Texture",
"description": "Texture for defining surface normal direction.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -543,14 +543,14 @@
{
"id": "useTexture",
"displayName": "Use Texture",
"description": "Whether to use the texture map, or just rely on vertex normals.",
"description": "Whether to use the texture, or just rely on vertex normals.",
"type": "Bool",
"defaultValue": true
},
{
"id": "textureMapUv",
"displayName": "UV",
"description": "Normal texture map UV set",
"description": "Normal map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -599,7 +599,7 @@
{
"id": "mode",
"displayName": "Opacity Mode",
"description": "Opacity mode for this texture.",
"description": "Indicates the general approach how transparency is to be applied.",
"type": "Enum",
"enumValues": [ "Opaque", "Cutout", "Blended", "TintedTransparent" ],
"defaultValue": "Opaque",
@@ -611,7 +611,7 @@
{
"id": "alphaSource",
"displayName": "Alpha Source",
"description": "Source texture of alpha value.",
"description": "Indicates whether to get the opacity texture from the Base Color map (Packed) or from a separate greyscale texture (Split).",
"type": "Enum",
"enumValues": [ "Packed", "Split", "None" ],
"defaultValue": "Packed",
@@ -622,8 +622,8 @@
},
{
"id": "textureMap",
"displayName": "Texture Map",
"description": "Texture map for defining surface opacity.",
"displayName": "Texture",
"description": "Texture for defining surface opacity.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -633,7 +633,7 @@
{
"id": "textureMapUv",
"displayName": "UV",
"description": "Opacity texture map UV set",
"description": "Opacity map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -728,7 +728,7 @@
{
"id": "diffuseTextureMap",
"displayName": "Diffuse AO",
"description": "Texture map for defining occlusion area for diffuse ambient lighting.",
"description": "Texture for defining occlusion area for diffuse ambient lighting.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -738,14 +738,14 @@
{
"id": "diffuseUseTexture",
"displayName": " Use Texture",
"description": "Whether to use the Diffuse AO texture map.",
"description": "Whether to use the Diffuse AO map.",
"type": "Bool",
"defaultValue": true
},
{
"id": "diffuseTextureMapUv",
"displayName": " UV",
"description": "Diffuse AO texture map UV set.",
"description": "Diffuse AO map UV set.",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -770,7 +770,7 @@
{
"id": "specularTextureMap",
"displayName": "Specular Cavity",
"description": "Texture map for defining occlusion area for specular lighting.",
"description": "Texture for defining occlusion area for specular lighting.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -780,14 +780,14 @@
{
"id": "specularUseTexture",
"displayName": " Use Texture",
"description": "Whether to use the Specular Cavity texture map.",
"description": "Whether to use the Specular Cavity map.",
"type": "Bool",
"defaultValue": true
},
{
"id": "specularTextureMapUv",
"displayName": " UV",
"description": "Specular Cavity texture map UV set.",
"description": "Specular Cavity map UV set.",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -850,8 +850,8 @@
},
{
"id": "textureMap",
"displayName": "Texture Map",
"description": "Texture map for defining emissive area.",
"displayName": "Texture",
"description": "Texture for defining emissive area.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -861,14 +861,14 @@
{
"id": "useTexture",
"displayName": "Use Texture",
"description": "Whether to use the texture map.",
"description": "Whether to use the texture.",
"type": "Bool",
"defaultValue": true
},
{
"id": "textureMapUv",
"displayName": "UV",
"description": "Emissive texture map UV set",
"description": "Emissive map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -881,8 +881,8 @@
"parallax": [
{
"id": "textureMap",
"displayName": "Heightmap",
"description": "Displacement heightmap to create parallax effect.",
"displayName": "Height Map",
"description": "Displacement height map to create parallax effect.",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -892,14 +892,14 @@
{
"id": "useTexture",
"displayName": "Use Texture",
"description": "Whether to use the heightmap.",
"description": "Whether to use the height map.",
"type": "Bool",
"defaultValue": true
},
{
"id": "textureMapUv",
"displayName": "UV",
"description": "Heightmap UV set",
"description": "Height map UV set",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Tiled",
@@ -910,8 +910,8 @@
},
{
"id": "factor",
"displayName": "Heightmap Scale",
"description": "The total height of the heightmap in local model units.",
"displayName": "Height Map Scale",
"description": "The total height of the height map in local model units.",
"type": "Float",
"defaultValue": 0.05,
"min": 0.0,
@@ -972,7 +972,7 @@
{
"id": "showClipping",
"displayName": "Show Clipping",
"description": "Highlight areas where the heightmap is clipped by the mesh surface.",
"description": "Highlight areas where the height map is clipped by the mesh surface.",
"type": "Bool",
"defaultValue": false,
"connection": {
@@ -1009,7 +1009,7 @@
{
"id": "influenceMap",
"displayName": " Influence Map",
"description": "Use texture map to control the strength of subsurface scattering",
"description": "Texture for controlling the strength of subsurface scattering",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -1019,7 +1019,7 @@
{
"id": "useInfluenceMap",
"displayName": " Use Influence Map",
"description": "Whether to use the texture map as influence mask.",
"description": "Whether to use the influence map.",
"type": "Bool",
"defaultValue": true
},
@@ -1088,7 +1088,7 @@
{
"id": "thicknessMap",
"displayName": " Thickness Map",
"description": "Use a greyscale texture for per pixel thickness",
"description": "Texture for controlling per pixel thickness",
"type": "Image",
"connection": {
"type": "ShaderInput",
@@ -1117,7 +1117,7 @@
{
"id": "transmissionTint",
"displayName": " Transmission Tint",
"description": "Color of the volume light travelling through",
"description": "Color of the volume light traveling through",
"type": "Color",
"defaultValue": [ 1.0, 0.8, 0.6 ]
},
Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialSourceData.h
+1 -1
View File
@@ -32,7 +32,7 @@ namespace AZ
//! In the source data, properties and UV names are loaded separately.
//! However, treating UV names as a special property group can greatly simplify the editor code.
//! See MaterialInspector::AddUvNamesGroup() for more details.
static constexpr const char UvGroupName[] = "UvNames";
static constexpr const char UvGroupName[] = "uvSets";
class MaterialAsset;
Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentRequestBus.h
+1 -1
View File
@@ -33,7 +33,7 @@ namespace AZ
namespace MaterialEditor
{
//! UVs are processed in a property group but will be handled differently.
static constexpr const char UvGroupName[] = "UvNames";
static constexpr const char UvGroupName[] = "uvSets";
class MaterialDocumentRequests
: public AZ::EBusTraits
Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp
+5 -5
View File
@@ -819,10 +819,10 @@ namespace MaterialEditor
// is implemented.
AtomToolsFramework::DynamicPropertyConfig propertyConfig;
propertyConfig.m_dataType = AtomToolsFramework::DynamicPropertyType::Asset;
propertyConfig.m_id = "details.materialType";
propertyConfig.m_id = "overview.materialType";
propertyConfig.m_nameId = "materialType";
propertyConfig.m_displayName = "Material Type";
propertyConfig.m_groupName = "Details";
propertyConfig.m_groupName = "Overview";
propertyConfig.m_description = "The material type defines the layout, properties, default values, shader connections, and other "
"data needed to create and edit a derived material.";
propertyConfig.m_defaultValue = AZStd::any(materialTypeAsset);
@@ -834,10 +834,10 @@ namespace MaterialEditor
propertyConfig = {};
propertyConfig.m_dataType = AtomToolsFramework::DynamicPropertyType::Asset;
propertyConfig.m_id = "details.parentMaterial";
propertyConfig.m_id = "overview.parentMaterial";
propertyConfig.m_nameId = "parentMaterial";
propertyConfig.m_displayName = "Parent Material";
propertyConfig.m_groupName = "Details";
propertyConfig.m_groupName = "Overview";
propertyConfig.m_description =
"The parent material provides an initial configuration whose properties are inherited and overriden by a derived material.";
propertyConfig.m_defaultValue = AZStd::any(parentMaterialAsset);
@@ -860,7 +860,7 @@ namespace MaterialEditor
propertyConfig.m_id = MaterialPropertyId(UvGroupName, shaderInput).GetCStr();
propertyConfig.m_nameId = shaderInput;
propertyConfig.m_displayName = shaderInput;
propertyConfig.m_groupName = "UV Names";
propertyConfig.m_groupName = "UV Sets";
propertyConfig.m_description = shaderInput;
propertyConfig.m_defaultValue = uvName;
propertyConfig.m_originalValue = uvName;
Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp
+8 -8
View File
@@ -79,8 +79,8 @@ namespace MaterialEditor
if (!m_documentId.IsNull() && isOpen)
{
// Create the top group for displaying details about the material
AddDetailsGroup();
// Create the top group for displaying overview info about the material
AddOverviewGroup();
// Create groups for displaying editable UV names
AddUvNamesGroup();
// Create groups for displaying editable properties
@@ -105,25 +105,25 @@ namespace MaterialEditor
return property && AtomToolsFramework::ArePropertyValuesEqual(property->GetValue(), property->GetConfig().m_parentValue);
}
void MaterialInspector::AddDetailsGroup()
void MaterialInspector::AddOverviewGroup()
{
const AZ::RPI::MaterialTypeSourceData* materialTypeSourceData = nullptr;
MaterialDocumentRequestBus::EventResult(
materialTypeSourceData, m_documentId, &MaterialDocumentRequestBus::Events::GetMaterialTypeSourceData);
const AZStd::string groupNameId = "details";
const AZStd::string groupDisplayName = "Details";
const AZStd::string groupNameId = "overview";
const AZStd::string groupDisplayName = "Overview";
const AZStd::string groupDescription = materialTypeSourceData->m_description;
auto& group = m_groups[groupNameId];
AtomToolsFramework::DynamicProperty property;
MaterialDocumentRequestBus::EventResult(
property, m_documentId, &MaterialDocumentRequestBus::Events::GetProperty, AZ::Name("details.materialType"));
property, m_documentId, &MaterialDocumentRequestBus::Events::GetProperty, AZ::Name("overview.materialType"));
group.m_properties.push_back(property);
property = {};
MaterialDocumentRequestBus::EventResult(
property, m_documentId, &MaterialDocumentRequestBus::Events::GetProperty, AZ::Name("details.parentMaterial"));
property, m_documentId, &MaterialDocumentRequestBus::Events::GetProperty, AZ::Name("overview.parentMaterial"));
group.m_properties.push_back(property);
// Passing in same group as main and comparison instance to enable custom value comparison for highlighting modified properties
@@ -139,7 +139,7 @@ namespace MaterialEditor
MaterialDocumentRequestBus::EventResult(materialAsset, m_documentId, &MaterialDocumentRequestBus::Events::GetAsset);
const AZStd::string groupNameId = UvGroupName;
const AZStd::string groupDisplayName = "UV Names";
const AZStd::string groupDisplayName = "UV Sets";
const AZStd::string groupDescription = "UV set names in this material, which can be renamed to match those in the model.";
auto& group = m_groups[groupNameId];
Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h
+1 -1
View File
@@ -52,7 +52,7 @@ namespace MaterialEditor
bool CompareInstanceNodeProperties(
const AzToolsFramework::InstanceDataNode* source, const AzToolsFramework::InstanceDataNode* target) const;
void AddDetailsGroup();
void AddOverviewGroup();
void AddUvNamesGroup();
void AddPropertiesGroup();
Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp
+1 -1
View File
@@ -184,7 +184,7 @@ namespace AZ
void MaterialPropertyInspector::AddUvNamesGroup()
{
const AZStd::string groupNameId = AZ::RPI::UvGroupName;
const AZStd::string groupDisplayName = "UV Names";
const AZStd::string groupDisplayName = "UV Sets";
const AZStd::string groupDescription = "UV set names in this material, which can be renamed to match those in the model.";
auto& group = m_groups[groupNameId];