Skip to content

Commit

Permalink
Hide deprecated OSL params in UIs in Max and Gaffer
Browse files Browse the repository at this point in the history
  • Loading branch information
@est77
est77 committed Mar 31, 2020
1 parent 3f8f3a7 commit b8b7286
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 42 deletions.
16 changes: 5 additions & 11 deletions src/appleseed.shaders/src/appleseed/as_glass.osl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,14 @@ shader as_glass
[[
string as_maya_attribute_name = "distribution",
string as_maya_attribute_short_name = "dd",
string label = "Distribution",
string widget = "popup",
string options = "beckmann|ggx|std",
string page = "Specular",
string widget = "null",
int as_maya_attribute_connectable = 0,
int as_maya_attribute_keyable = 0,
int as_maya_attribute_hidden = 1,
int as_blender_input_socket = 0,
int gafferNoduleLayoutVisible = 0,
int as_deprecated = 1,
int as_max_param_id = 9
int as_deprecated = 1,
int as_max_param_id = 9
]],
float in_roughness = 0.1
[[
Expand All @@ -116,17 +113,14 @@ shader as_glass
float max = 1.0,
string label = "Roughness",
string page = "Specular",
int divider = 1,
int as_max_param_id = 10
]],
float in_specular_spread = 0.5
[[
string as_maya_attribute_name = "specularSpread",
string as_maya_attribute_short_name = "ss",
float min = 0.0,
float max = 1.0,
string label = "Specular Spread",
string page = "Specular",
int divider = 1,
string widget = "null",
int as_deprecated = 1,
int as_max_param_id = 12,
]],
Expand Down
9 changes: 3 additions & 6 deletions src/appleseed.shaders/src/appleseed/as_metal.osl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,22 +69,19 @@ shader as_metal
string label = "Edge Reflectance Weight",
string page = "Fresnel",
string help = "Edge reflectance weight.",
int as_max_param_id = 26
int as_max_param_id = 26,
int divider = 1
]],
int in_distribution = 0
[[
string as_maya_attribute_name = "distribution",
string as_maya_attribute_short_name = "mdf",
string widget = "mapper",
string options = "Beckmann:0|GGX:1",
string label = "Distribution",
string page = "Specular",
string widget = "null",
int as_maya_attribute_connectable = 0,
int as_maya_attribute_keyable = 0,
int as_maya_attribute_hidden = 1,
int as_blender_input_socket = 0,
int gafferNoduleLayoutVisible = 0,
int divider = 1,
int as_deprecated = 1,
int as_max_param_id = 4
]],
Expand Down
13 changes: 3 additions & 10 deletions src/appleseed.shaders/src/appleseed/as_plastic.osl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,22 +98,19 @@ shader as_plastic
string label = "IOR",
string page = "Specular",
string help = "Index of refraction.",
int divider = 1,
int as_max_param_id = 10
]],
int in_distribution = 0
[[
string as_maya_attribute_name = "distribution",
string as_maya_attribute_short_name = "dst",
string widget = "mapper",
string options = "Beckmann:0|GGX:1|GTR:2|Student's t-MDF:3",
string label = "Distribution",
string page = "Specular",
string widget = "null",
int as_maya_attribute_connectable = 0,
int as_maya_attribute_keyable = 0,
int as_maya_attribute_hidden = 1,
int as_blender_input_socket = 0,
int gafferNoduleLayoutVisible = 0,
int divider = 1,
int as_deprecated = 1,
int as_max_param_id = 12
]],
Expand All @@ -131,11 +128,7 @@ shader as_plastic
[[
string as_maya_attribute_name = "specularSpread",
string as_maya_attribute_short_name = "spr",
float min = 0.0,
float max = 1.0,
string label = "Specular Spread",
string page = "Specular",
string help = "Specular highlights spread, only valid for GTR, Student's t-MDF.",
string widget = "null",
int as_deprecated = 1,
int as_max_param_id = 15
]],
Expand Down
10 changes: 3 additions & 7 deletions src/appleseed.shaders/src/appleseed/as_standard_surface.osl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,18 +191,14 @@ shader as_standard_surface
float max = 1.0,
string label = "Specular Roughness",
string page = "Specular",
int as_max_param_id = 20
int as_max_param_id = 20,
int divider = 1
]],
float in_specular_spread = 0.25
[[
string as_maya_attribute_name = "specularSpread",
string as_maya_attribute_short_name = "sps",
float min = 0.0,
float max = 1.0,
string label = "Specular Spread",
string page = "Specular",
string help = "Specular spread, controls the tails of the highlights.",
int divider = 1,
string widget = "null",
int as_deprecated = 1,
int as_max_param_id = 22
]],
Expand Down
1 change: 1 addition & 0 deletions src/appleseed.shaders/src/max/as_max_glass_material.osl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ shader as_max_glass_material
float Ior = 1.5,
string Distribution = "ggx"
[[
string widget = "null",
int as_deprecated = 1
]],
float Roughness = 0.1,
Expand Down
3 changes: 1 addition & 2 deletions src/appleseed.shaders/src/max/as_max_metal_material.osl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ shader as_max_metal_material
string Distribution = "ggx"
[[
string help = "Microfacet distribution to use: Beckmann or GGX.",
string widget = "popup",
string options = "beckmann|ggx",
string widget = "null",
int as_deprecated = 1
]],
float Roughness = 0.1
Expand Down
8 changes: 2 additions & 6 deletions src/appleseed.shaders/src/max/as_max_plastic_material.osl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ shader as_max_plastic_material
vector Normal = N,
string Distribution = "ggx"
[[
string widget = "popup",
string options = "beckmann|ggx|gtr1|std",
string help = "Microfacet distribution function to use",
string widget = "null",
int as_deprecated = 1
]],
color SpecularColor = color(0.5),
Expand All @@ -52,9 +50,7 @@ shader as_max_plastic_material
]],
float Spread = 0.25
[[
float min = 0.0,
float max = 1.0,
string help = "Specular falloff, or highlights spread.",
string widget = "null",
int as_deprecated = 1
]],
float IOR = 1.5
Expand Down
1 change: 1 addition & 0 deletions src/appleseed.shaders/src/max/as_max_sss_material.osl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ shader as_max_sss_material
color SpecularColor = 1.0,
string Distribution = "ggx"
[[
string widget = "null",
int as_deprecated = 1,
]],
float Roughness = 0.1,
Expand Down

0 comments on commit b8b7286

Please sign in to comment.