Updated .materialtype files to use the new format, "propertySets" instead of "groups".

First I used some local changes to do an auto-conversion that loaded, upgraded, and then saved each .materialtype but some details were lost in translation. For example, comments were lost, and default values changed slightly. So I grabbed an original copy of each file, and copied/pasted each section from the old file to the new one, while preserving the new layout.

I did not update StandardMultilayerPBR because that will be too much work, will wait until after common property sets can be factored out. And I will likely discard that auto-conversion soon.

Testing: AtomSampleViewer MaterialScreenshotTest script passed with the same results as before.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
monroegm-disable-blank-issue-2
santorac 4 years ago
parent 9d09656023
commit 95cfe056a1

@ -2,8 +2,10 @@
"description": "Base material for the reflection probe visualization model.",
"propertyLayout": {
"version": 1,
"properties": {
"settings": [
"propertySets": [
{
"name": "settings",
"properties": [
{
"name": "opacity",
"displayName": "Opacity",
@ -29,6 +31,7 @@
}
]
}
]
},
"shaders": [
{
@ -36,4 +39,3 @@
}
]
}

@ -2,128 +2,12 @@
"description": "Material Type tailored for rendering skin, with support for blended wrinkle maps that work with animated vertex blend shapes.",
"propertyLayout": {
"version": 3,
"groups": [
"propertySets": [
{
"name": "baseColor",
"displayName": "Base Color",
"description": "Properties for configuring the surface reflected color for dielectrics or reflectance values for metals."
},
{
"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": "detailLayerGroup",
"displayName": "Detail Layer",
"description": "Properties for Fine Details Layer."
},
{
"name": "detailUV",
"displayName": "Detail Layer UV",
"description": "Properties for modifying detail layer UV."
},
{
"name": "occlusion",
"displayName": "Occlusion",
"description": "Properties for baked textures that represent geometric occlusion of light."
},
{
"name": "subsurfaceScattering",
"displayName": "Subsurface Scattering",
"description": "Properties for configuring subsurface scattering effects."
},
{
"name": "wrinkleLayers",
"displayName": "Wrinkle Layers",
"description": "Properties for wrinkle maps to support morph animation, using vertex color blend weights."
},
{
"name": "general",
"displayName": "General Settings",
"description": "General settings."
}
],
"properties": {
"general": [
{
"name": "applySpecularAA",
"displayName": "Apply Specular AA",
"description": "Whether to apply specular anti-aliasing in the shader.",
"type": "Bool",
"defaultValue": false,
"connection": {
"type": "ShaderOption",
"name": "o_applySpecularAA"
}
},
{
"name": "enableShadows",
"displayName": "Enable Shadows",
"description": "Whether to use the shadow maps.",
"type": "Bool",
"defaultValue": true,
"connection": {
"type": "ShaderOption",
"name": "o_enableShadows"
}
},
{
"name": "enableDirectionalLights",
"displayName": "Enable Directional Lights",
"description": "Whether to use directional lights.",
"type": "Bool",
"defaultValue": true,
"connection": {
"type": "ShaderOption",
"name": "o_enableDirectionalLights"
}
},
{
"name": "enablePunctualLights",
"displayName": "Enable Punctual Lights",
"description": "Whether to use punctual lights.",
"type": "Bool",
"defaultValue": true,
"connection": {
"type": "ShaderOption",
"name": "o_enablePunctualLights"
}
},
{
"name": "enableAreaLights",
"displayName": "Enable Area Lights",
"description": "Whether to use area lights.",
"type": "Bool",
"defaultValue": true,
"connection": {
"type": "ShaderOption",
"name": "o_enableAreaLights"
}
},
{
"name": "enableIBL",
"displayName": "Enable IBL",
"description": "Whether to use Image Based Lighting (IBL).",
"type": "Bool",
"defaultValue": true,
"connection": {
"type": "ShaderOption",
"name": "o_enableIBL"
}
}
],
"baseColor": [
"description": "Properties for configuring the surface reflected color for dielectrics or reflectance values for metals.",
"properties": [
{
"name": "color",
"displayName": "Color",
@ -189,8 +73,13 @@
"name": "o_baseColorTextureBlendMode"
}
}
],
"roughness": [
]
},
{
"name": "roughness",
"displayName": "Roughness",
"description": "Properties for configuring how rough the surface appears.",
"properties": [
{
"name": "textureMap",
"displayName": "Texture",
@ -262,8 +151,13 @@
"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",
"displayName": "Factor",
@ -317,8 +211,13 @@
"name": "o_specularF0_enableMultiScatterCompensation"
}
}
],
"normal": [
]
},
{
"name": "normal",
"displayName": "Normal",
"description": "Properties related to configuring surface normal.",
"properties": [
{
"name": "textureMap",
"displayName": "Texture",
@ -371,20 +270,242 @@
}
},
{
"name": "factor",
"displayName": "Factor",
"description": "Strength factor for scaling the values",
"type": "Float",
"name": "factor",
"displayName": "Factor",
"description": "Strength factor for scaling the values",
"type": "Float",
"defaultValue": 1.0,
"min": 0.0,
"softMax": 2.0,
"connection": {
"type": "ShaderInput",
"name": "m_normalFactor"
}
}
]
},
{
"name": "detailLayerGroup",
"displayName": "Detail Layer",
"description": "Properties for Fine Details Layer.",
"properties": [
{
"name": "enableDetailLayer",
"displayName": "Enable Detail Layer",
"description": "Enable detail layer for fine details and scratches",
"type": "Bool",
"defaultValue": false
},
{
"name": "blendDetailFactor",
"displayName": "Blend Factor",
"description": "Scales the overall impact of the detail layer.",
"type": "Float",
"defaultValue": 1.0,
"min": 0.0,
"max": 1.0,
"connection": {
"type": "ShaderInput",
"name": "m_detail_blendFactor"
}
},
{
"name": "blendDetailMask",
"displayName": "Blend Mask",
"description": "Detailed blend mask for application of the detail maps.",
"type": "Image",
"connection": {
"type": "ShaderInput",
"name": "m_detail_blendMask_texture"
}
},
{
"name": "enableDetailMaskTexture",
"displayName": " Use Texture",
"description": "Enable detail blend mask",
"type": "Bool",
"defaultValue": true
},
{
"name": "blendDetailMaskUv",
"displayName": " Blend Mask UV",
"description": "Which UV set to use for sampling the detail blend mask",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Unwrapped",
"connection": {
"type": "ShaderInput",
"name": "m_detail_blendMask_uvIndex"
}
},
{
"name": "textureMapUv",
"displayName": "Detail Map UVs",
"description": "Which UV set to use for detail map sampling",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Unwrapped",
"connection": {
"type": "ShaderInput",
"name": "m_detail_allMapsUvIndex"
}
},
{
"name": "enableBaseColor",
"displayName": "Enable Base Color",
"description": "Enable detail blending for base color",
"type": "Bool",
"defaultValue": false
},
{
"name": "baseColorDetailMap",
"displayName": " Texture",
"description": "Detailed Base Color Texture",
"type": "Image",
"connection": {
"type": "ShaderInput",
"name": "m_detail_baseColor_texture"
}
},
{
"name": "baseColorDetailBlend",
"displayName": " Blend Factor",
"description": "How much to blend the detail layer into the base color.",
"type": "Float",
"defaultValue": 1.0,
"min": 0.0,
"max": 1.0,
"connection": {
"type": "ShaderInput",
"name": "m_detail_baseColor_factor"
}
},
{
"name": "enableNormals",
"displayName": "Enable Normal",
"description": "Enable detail normal map to be used for fine detail normal such as scratches and small dents",
"type": "Bool",
"defaultValue": false
},
{
"name": "normalDetailStrength",
"displayName": " Factor",
"description": "Strength factor for scaling the Detail Normal",
"type": "Float",
"defaultValue": 1.0,
"min": 0.0,
"softMax": 2.0,
"connection": {
"type": "ShaderInput",
"name": "m_detail_normal_factor"
}
},
{
"name": "normalDetailMap",
"displayName": " Texture",
"description": "Detailed Normal map",
"type": "Image",
"connection": {
"type": "ShaderInput",
"name": "m_detail_normal_texture"
}
},
{
"name": "normalDetailFlipX",
"displayName": " Flip X Channel",
"description": "Flip Detail tangent direction for this normal map.",
"type": "Bool",
"defaultValue": false,
"connection": {
"type": "ShaderInput",
"name": "m_detail_normal_flipX"
}
},
{
"name": "normalDetailFlipY",
"displayName": " Flip Y Channel",
"description": "Flip Detail bitangent direction for this normal map.",
"type": "Bool",
"defaultValue": false,
"connection": {
"type": "ShaderInput",
"name": "m_detail_normal_flipY"
}
}
]
},
{
"name": "detailUV",
"displayName": "Detail Layer UV",
"description": "Properties for modifying detail layer UV.",
"properties": [
{
"name": "center",
"displayName": "Center",
"description": "Center point for scaling and rotation transformations.",
"type": "vector2",
"vectorLabels": [ "U", "V" ],
"defaultValue": [ 0.5, 0.5 ]
},
{
"name": "tileU",
"displayName": "Tile U",
"description": "Scales texture coordinates in V.",
"type": "float",
"defaultValue": 1.0,
"step": 0.1
},
{
"name": "tileV",
"displayName": "Tile V",
"description": "Scales texture coordinates in V.",
"type": "float",
"defaultValue": 1.0,
"step": 0.1
},
{
"name": "offsetU",
"displayName": "Offset U",
"description": "Offsets texture coordinates in the U direction.",
"type": "float",
"defaultValue": 0.0,
"min": -1.0,
"max": 1.0
},
{
"name": "offsetV",
"displayName": "Offset V",
"description": "Offsets texture coordinates in the V direction.",
"type": "float",
"defaultValue": 0.0,
"min": -1.0,
"max": 1.0
},
{
"name": "rotateDegrees",
"displayName": "Rotate",
"description": "Rotates the texture coordinates (degrees).",
"type": "float",
"defaultValue": 0.0,
"min": -180.0,
"max": 180.0,
"step": 1.0
},
{
"name": "scale",
"displayName": "Scale",
"description": "Scales texture coordinates in both U and V.",
"type": "float",
"defaultValue": 1.0,
"min": 0.0,
"softMax": 2.0,
"connection": {
"type": "ShaderInput",
"name": "m_normalFactor"
}
"step": 0.1
}
],
"occlusion": [
]
},
{
"name": "occlusion",
"displayName": "Occlusion",
"description": "Properties for baked textures that represent geometric occlusion of light.",
"properties": [
{
"name": "diffuseTextureMap",
"displayName": "Diffuse AO",
@ -469,8 +590,13 @@
"name": "m_specularOcclusionFactor"
}
}
],
"subsurfaceScattering": [
]
},
{
"name": "subsurfaceScattering",
"displayName": "Subsurface Scattering",
"description": "Properties for configuring subsurface scattering effects.",
"properties": [
{
"name": "enableSubsurfaceScattering",
"displayName": "Subsurface Scattering",
@ -646,8 +772,13 @@
"min": 0.0,
"softMax": 20.0
}
],
"wrinkleLayers": [
]
},
{
"name": "wrinkleLayers",
"displayName": "Wrinkle Layers",
"description": "Properties for wrinkle maps to support morph animation, using vertex color blend weights.",
"properties": [
{
"name": "enable",
"displayName": "Enable Wrinkle Layers",
@ -757,215 +888,82 @@
"name": "m_wrinkle_normal_texture4"
}
}
],
"detailLayerGroup": [
{
"name": "enableDetailLayer",
"displayName": "Enable Detail Layer",
"description": "Enable detail layer for fine details and scratches",
"type": "Bool",
"defaultValue": false
},
{
"name": "blendDetailFactor",
"displayName": "Blend Factor",
"description": "Scales the overall impact of the detail layer.",
"type": "Float",
"defaultValue": 1.0,
"min": 0.0,
"max": 1.0,
"connection": {
"type": "ShaderInput",
"name": "m_detail_blendFactor"
}
]
},
{
"name": "blendDetailMask",
"displayName": "Blend Mask",
"description": "Detailed blend mask for application of the detail maps.",
"type": "Image",
"connection": {
"type": "ShaderInput",
"name": "m_detail_blendMask_texture"
}
},
"name": "general",
"displayName": "General Settings",
"description": "General settings.",
"properties": [
{
"name": "enableDetailMaskTexture",
"displayName": " Use Texture",
"description": "Enable detail blend mask",
"name": "applySpecularAA",
"displayName": "Apply Specular AA",
"description": "Whether to apply specular anti-aliasing in the shader.",
"type": "Bool",
"defaultValue": true
},
{
"name": "blendDetailMaskUv",
"displayName": " Blend Mask UV",
"description": "Which UV set to use for sampling the detail blend mask",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Unwrapped",
"connection": {
"type": "ShaderInput",
"name": "m_detail_blendMask_uvIndex"
}
},
{
"name": "textureMapUv",
"displayName": "Detail Map UVs",
"description": "Which UV set to use for detail map sampling",
"type": "Enum",
"enumIsUv": true,
"defaultValue": "Unwrapped",
"defaultValue": false,
"connection": {
"type": "ShaderInput",
"name": "m_detail_allMapsUvIndex"
"type": "ShaderOption",
"name": "o_applySpecularAA"
}
},
{
"name": "enableBaseColor",
"displayName": "Enable Base Color",
"description": "Enable detail blending for base color",
"name": "enableShadows",
"displayName": "Enable Shadows",
"description": "Whether to use the shadow maps.",
"type": "Bool",
"defaultValue": false
},
{
"name": "baseColorDetailMap",
"displayName": " Texture",
"description": "Detailed Base Color Texture",
"type": "Image",
"connection": {
"type": "ShaderInput",
"name": "m_detail_baseColor_texture"
}
},
{
"name": "baseColorDetailBlend",
"displayName": " Blend Factor",
"description": "How much to blend the detail layer into the base color.",
"type": "Float",
"defaultValue": 1.0,
"min": 0.0,
"max": 1.0,
"defaultValue": true,
"connection": {
"type": "ShaderInput",
"name": "m_detail_baseColor_factor"
"type": "ShaderOption",
"name": "o_enableShadows"
}
},
{
"name": "enableNormals",
"displayName": "Enable Normal",
"description": "Enable detail normal map to be used for fine detail normal such as scratches and small dents",
"name": "enableDirectionalLights",
"displayName": "Enable Directional Lights",
"description": "Whether to use directional lights.",
"type": "Bool",
"defaultValue": false
},
{
"name": "normalDetailStrength",
"displayName": " Factor",
"description": "Strength factor for scaling the Detail Normal",
"type": "Float",
"defaultValue": 1.0,
"min": 0.0,
"softMax": 2.0,
"defaultValue": true,
"connection": {
"type": "ShaderInput",
"name": "m_detail_normal_factor"
"type": "ShaderOption",
"name": "o_enableDirectionalLights"
}
},
{
"name": "normalDetailMap",
"displayName": " Texture",
"description": "Detailed Normal map",
"type": "Image",
"name": "enablePunctualLights",
"displayName": "Enable Punctual Lights",
"description": "Whether to use punctual lights.",
"type": "Bool",
"defaultValue": true,
"connection": {
"type": "ShaderInput",
"name": "m_detail_normal_texture"
"type": "ShaderOption",
"name": "o_enablePunctualLights"
}
},
{
"name": "normalDetailFlipX",
"displayName": " Flip X Channel",
"description": "Flip Detail tangent direction for this normal map.",
"name": "enableAreaLights",
"displayName": "Enable Area Lights",
"description": "Whether to use area lights.",
"type": "Bool",
"defaultValue": false,
"defaultValue": true,
"connection": {
"type": "ShaderInput",
"name": "m_detail_normal_flipX"
"type": "ShaderOption",
"name": "o_enableAreaLights"
}
},
{
"name": "normalDetailFlipY",
"displayName": " Flip Y Channel",
"description": "Flip Detail bitangent direction for this normal map.",
"name": "enableIBL",
"displayName": "Enable IBL",
"description": "Whether to use Image Based Lighting (IBL).",
"type": "Bool",
"defaultValue": false,
"defaultValue": true,
"connection": {
"type": "ShaderInput",
"name": "m_detail_normal_flipY"
}
"type": "ShaderOption",
"name": "o_enableIBL"
}
],
"detailUV": [
{
"name": "center",
"displayName": "Center",
"description": "Center point for scaling and rotation transformations.",
"type": "vector2",
"vectorLabels": [ "U", "V" ],
"defaultValue": [ 0.5, 0.5 ]
},
{
"name": "tileU",
"displayName": "Tile U",
"description": "Scales texture coordinates in V.",
"type": "float",
"defaultValue": 1.0,
"step": 0.1
},
{
"name": "tileV",
"displayName": "Tile V",
"description": "Scales texture coordinates in V.",
"type": "float",
"defaultValue": 1.0,
"step": 0.1
},
{
"name": "offsetU",
"displayName": "Offset U",
"description": "Offsets texture coordinates in the U direction.",
"type": "float",
"defaultValue": 0.0,
"min": -1.0,
"max": 1.0
},
{
"name": "offsetV",
"displayName": "Offset V",
"description": "Offsets texture coordinates in the V direction.",
"type": "float",
"defaultValue": 0.0,
"min": -1.0,
"max": 1.0
},
{
"name": "rotateDegrees",
"displayName": "Rotate",
"description": "Rotates the texture coordinates (degrees).",
"type": "float",
"defaultValue": 0.0,
"min": -180.0,
"max": 180.0,
"step": 1.0
},
{
"name": "scale",
"displayName": "Scale",
"description": "Scales texture coordinates in both U and V.",
"type": "float",
"defaultValue": 1.0,
"step": 0.1
}
]
}
]
},
"shaders": [
{

@ -2,20 +2,12 @@
"description": "This is an example of a custom material type using Atom's PBR shading model: procedurally generated brick or tile.",
"propertyLayout": {
"version": 3,
"groups": [
"propertySets": [
{
"name": "shape",
"displayName": "Shape",
"description": "Properties for configuring size, shape, and position of the bricks."
},
{
"name": "appearance",
"displayName": "Appearance",
"description": "Properties for configuring the appearance of the bricks and grout lines."
}
],
"properties": {
"shape": [
"description": "Properties for configuring size, shape, and position of the bricks.",
"properties": [
{
"name": "brickWidth",
"displayName": "Brick Width",
@ -84,8 +76,13 @@
"name": "m_lineDepth"
}
}
],
"appearance": [
]
},
{
"name": "appearance",
"displayName": "Appearance",
"description": "Properties for configuring the appearance of the bricks and grout lines.",
"properties": [
{
"name": "noiseTexture",
"type": "Image",
@ -172,6 +169,7 @@
}
]
}
]
},
"shaders": [
{
@ -187,8 +185,5 @@
{
"file": "Shaders/Depth/DepthPass.shader"
}
],
"functors": [
]
}

Loading…
Cancel
Save