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

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

Browse Source 
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
5 changed files with 3446 additions and 3457 deletions
Show Stats Download Patch File Download Diff File

58
Gems/Atom/Feature/Common/Assets/Materials/Special/ShadowCatcher.materialtype
Unescape Escape View File

@ -2,38 +2,40 @@
"description": "Base material for the reflection probe visualization model.",
"propertyLayout": {
"version": 1,
"properties": {
"settings": [
{
"name": "opacity",
"displayName": "Opacity",
"description": "Opacity of the shadow effect.",
"type": "Float",
"defaultValue": 0.5,
"min": 0.0,
"max": 1.0,
"connection": {
"type": "ShaderInput",
"name": "m_opacity"
"propertySets": [
{
"name": "settings",
"properties": [
{
"name": "opacity",
"displayName": "Opacity",
"description": "Opacity of the shadow effect.",
"type": "Float",
"defaultValue": 0.5,
"min": 0.0,
"max": 1.0,
"connection": {
"type": "ShaderInput",
"name": "m_opacity"
}
},
{
"name": "shadeAll",
"displayName": "Shade All",
"description": "Shades the entire geometry with the shadow color, not just what's in shadow. For debugging.",
"type": "Bool",
"connection": {
"type": "ShaderOption",
"name": "o_shadeAll"
}
}
},
{
"name": "shadeAll",
"displayName": "Shade All",
"description": "Shades the entire geometry with the shadow color, not just what's in shadow. For debugging.",
"type": "Bool",
"connection": {
"type": "ShaderOption",
"name": "o_shadeAll"
}
}
]
}
]
}
]
},
"shaders": [
{
"file": "ShadowCatcher.shader"
}
]
}
}

2761
Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR.materialtype
View File

File diff suppressed because it is too large Load Diff

1848
Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.materialtype
View File

File diff suppressed because it is too large Load Diff

1909
Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR.materialtype
View File

File diff suppressed because it is too large Load Diff

327
Gems/Atom/TestData/TestData/Materials/Types/AutoBrick.materialtype
Unescape Escape View File

@ -2,176 +2,174 @@
"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."
"description": "Properties for configuring size, shape, and position of the bricks.",
"properties": [
{
"name": "brickWidth",
"displayName": "Brick Width",
"description": "The width of each brick.",
"type": "Float",
"defaultValue": 0.1,
"min": 0.0,
"softMax": 0.2,
"step": 0.001,
"connection": {
"type": "ShaderInput",
"name": "m_brickWidth"
}
},
{
"name": "brickHeight",
"displayName": "Brick Height",
"description": "The height of each brick.",
"type": "Float",
"defaultValue": 0.05,
"min": 0.0,
"softMax": 0.2,
"step": 0.001,
"connection": {
"type": "ShaderInput",
"name": "m_brickHeight"
}
},
{
"name": "brickOffset",
"displayName": "Offset",
"description": "The offset of each stack of bricks as a percentage of brick width.",
"type": "Float",
"defaultValue": 0.5,
"min": 0.0,
"max": 1.0,
"connection": {
"type": "ShaderInput",
"name": "m_brickOffset"
}
},
{
"name": "lineWidth",
"displayName": "Line Width",
"description": "The width of the grout lines.",
"type": "Float",
"defaultValue": 0.01,
"min": 0.0,
"softMax": 0.02,
"step": 0.0001,
"connection": {
"type": "ShaderInput",
"name": "m_lineWidth"
}
},
{
"name": "lineDepth",
"displayName": "Line Depth",
"description": "The depth of the grout lines.",
"type": "Float",
"defaultValue": 0.01,
"min": 0.0,
"softMax": 0.02,
"connection": {
"type": "ShaderInput",
"name": "m_lineDepth"
}
}
]
},
{
"name": "appearance",
"displayName": "Appearance",
"description": "Properties for configuring the appearance of the bricks and grout lines."
}
],
"properties": {
"shape": [
{
"name": "brickWidth",
"displayName": "Brick Width",
"description": "The width of each brick.",
"type": "Float",
"defaultValue": 0.1,
"min": 0.0,
"softMax": 0.2,
"step": 0.001,
"connection": {
"type": "ShaderInput",
"name": "m_brickWidth"
}
},
{
"name": "brickHeight",
"displayName": "Brick Height",
"description": "The height of each brick.",
"type": "Float",
"defaultValue": 0.05,
"min": 0.0,
"softMax": 0.2,
"step": 0.001,
"connection": {
"type": "ShaderInput",
"name": "m_brickHeight"
}
},
{
"name": "brickOffset",
"displayName": "Offset",
"description": "The offset of each stack of bricks as a percentage of brick width.",
"type": "Float",
"defaultValue": 0.5,
"min": 0.0,
"max": 1.0,
"connection": {
"type": "ShaderInput",
"name": "m_brickOffset"
}
},
{
"name": "lineWidth",
"displayName": "Line Width",
"description": "The width of the grout lines.",
"type": "Float",
"defaultValue": 0.01,
"min": 0.0,
"softMax": 0.02,
"step": 0.0001,
"connection": {
"type": "ShaderInput",
"name": "m_lineWidth"
}
},
{
"name": "lineDepth",
"displayName": "Line Depth",
"description": "The depth of the grout lines.",
"type": "Float",
"defaultValue": 0.01,
"min": 0.0,
"softMax": 0.02,
"connection": {
"type": "ShaderInput",
"name": "m_lineDepth"
}
}
],
"appearance": [
{
"name": "noiseTexture",
"type": "Image",
"defaultValue": "TestData/Textures/noise512.png",
"visibility": "Hidden",
"connection": {
"type": "ShaderInput",
"name": "m_noise"
}
},
{
"name": "brickColor",
"displayName": "Brick Color",
"description": "The color of the bricks.",
"type": "Color",
"defaultValue": [1.0,1.0,1.0],
"connection": {
"type": "ShaderInput",
"name": "m_brickColor"
"description": "Properties for configuring the appearance of the bricks and grout lines.",
"properties": [
{
"name": "noiseTexture",
"type": "Image",
"defaultValue": "TestData/Textures/noise512.png",
"visibility": "Hidden",
"connection": {
"type": "ShaderInput",
"name": "m_noise"
}
},
{
"name": "brickColor",
"displayName": "Brick Color",
"description": "The color of the bricks.",
"type": "Color",
"defaultValue": [1.0,1.0,1.0],
"connection": {
"type": "ShaderInput",
"name": "m_brickColor"
}
},
{
"name": "brickColorNoise",
"displayName": "Brick Color Noise",
"description": "Scale the variation of brick color.",
"type": "Float",
"defaultValue": 0.25,
"min": 0.0,
"max": 1.0,
"connection": {
"type": "ShaderInput",
"name": "m_brickNoiseFactor"
}
},
{
"name": "lineColor",
"displayName": "Line Color",
"description": "The color of the grout lines.",
"type": "Color",
"defaultValue": [0.5,0.5,0.5],
"connection": {
"type": "ShaderInput",
"name": "m_lineColor"
}
},
{
"name": "lineColorNoise",
"displayName": "Line Color Noise",
"description": "Scale the variation of grout line color.",
"type": "Float",
"defaultValue": 0.25,
"min": 0.0,
"max": 1.0,
"connection": {
"type": "ShaderInput",
"name": "m_lineNoiseFactor"
}
},
{
"name": "brickColorBleed",
"displayName": "Brick Color Bleed",
"description": "Distance into the grout line that the brick color will continue.",
"type": "Float",
"defaultValue": 0.0,
"min": 0.0,
"max": 1.0,
"connection": {
"type": "ShaderInput",
"name": "m_brickColorBleed"
}
},
{
"name": "ao",
"displayName": "Ambient Occlusion",
"description": "The strength of baked ambient occlusion in the grout lines.",
"type": "Float",
"defaultValue": 0.5,
"min": 0.0,
"max": 1.0,
"connection": {
"type": "ShaderInput",
"name": "m_aoFactor"
}
}
},
{
"name": "brickColorNoise",
"displayName": "Brick Color Noise",
"description": "Scale the variation of brick color.",
"type": "Float",
"defaultValue": 0.25,
"min": 0.0,
"max": 1.0,
"connection": {
"type": "ShaderInput",
"name": "m_brickNoiseFactor"
}
},
{
"name": "lineColor",
"displayName": "Line Color",
"description": "The color of the grout lines.",
"type": "Color",
"defaultValue": [0.5,0.5,0.5],
"connection": {
"type": "ShaderInput",
"name": "m_lineColor"
}
},
{
"name": "lineColorNoise",
"displayName": "Line Color Noise",
"description": "Scale the variation of grout line color.",
"type": "Float",
"defaultValue": 0.25,
"min": 0.0,
"max": 1.0,
"connection": {
"type": "ShaderInput",
"name": "m_lineNoiseFactor"
}
},
{
"name": "brickColorBleed",
"displayName": "Brick Color Bleed",
"description": "Distance into the grout line that the brick color will continue.",
"type": "Float",
"defaultValue": 0.0,
"min": 0.0,
"max": 1.0,
"connection": {
"type": "ShaderInput",
"name": "m_brickColorBleed"
}
},
{
"name": "ao",
"displayName": "Ambient Occlusion",
"description": "The strength of baked ambient occlusion in the grout lines.",
"type": "Float",
"defaultValue": 0.5,
"min": 0.0,
"max": 1.0,
"connection": {
"type": "ShaderInput",
"name": "m_aoFactor"
}
}
]
}
]
}
]
},
"shaders": [
{
@ -187,8 +185,5 @@
{
"file": "Shaders/Depth/DepthPass.shader"
}
],
"functors": [
]
}
}
Write Preview
Loading…
Cancel
Save