Skip to content

Fix input default values on cmlib definitions #1369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jstone-lucasfilm merged 5 commits into from
Jun 14, 2023
Merged

Fix input default values on cmlib definitions #1369

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b12036e
Fix cm node default input value. Add cmnode test.
kwokcb May 30, 2023
fd58478
Fix test comment.
kwokcb May 30, 2023
8c5a5d6
Merge branch 'main' into cm_validate
jstone-lucasfilm Jun 3, 2023
dadcdcd
Merge branch 'main' into cm_validate
jstone-lucasfilm Jun 14, 2023
be69509
Remove extra unit tests
jstone-lucasfilm Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions libraries/cmlib/cmlib_defs.mtlx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,82 +8,82 @@
-->

<nodedef name="ND_g18_rec709_to_lin_rec709_color3" node="g18_rec709_to_lin_rec709" nodegroup="colortransform">
<input name="in" type="color3" />
<input name="in" type="color3" value="0.0, 0.0, 0.0" />
<output name="out" type="color3" />
</nodedef>

<nodedef name="ND_g18_rec709_to_lin_rec709_color4" node="g18_rec709_to_lin_rec709" nodegroup="colortransform">
<input name="in" type="color4" />
<input name="in" type="color4" value="0.0, 0.0, 0.0, 1.0" />
<output name="out" type="color4" />
</nodedef>

<nodedef name="ND_g22_rec709_to_lin_rec709_color3" node="g22_rec709_to_lin_rec709" nodegroup="colortransform">
<input name="in" type="color3" />
<input name="in" type="color3" value="0.0, 0.0, 0.0" />
<output name="out" type="color3" />
</nodedef>

<nodedef name="ND_g22_rec709_to_lin_rec709_color4" node="g22_rec709_to_lin_rec709" nodegroup="colortransform">
<input name="in" type="color4" />
<input name="in" type="color4" value="0.0, 0.0, 0.0, 1.0" />
<output name="out" type="color4" />
</nodedef>

<nodedef name="ND_rec709_display_to_lin_rec709_color3" node="rec709_display_to_lin_rec709" nodegroup="colortransform">
<input name="in" type="color3" />
<input name="in" type="color3" value="0.0, 0.0, 0.0" />
<output name="out" type="color3" />
</nodedef>

<nodedef name="ND_rec709_display_to_lin_rec709_color4" node="rec709_display_to_lin_rec709" nodegroup="colortransform">
<input name="in" type="color4" />
<input name="in" type="color4" value="0.0, 0.0, 0.0, 1.0" />
<output name="out" type="color4" />
</nodedef>

<nodedef name="ND_acescg_to_lin_rec709_color3" node="acescg_to_lin_rec709" nodegroup="colortransform">
<input name="in" type="color3" />
<input name="in" type="color3" value="0.0, 0.0, 0.0" />
<output name="out" type="color3" />
</nodedef>

<nodedef name="ND_acescg_to_lin_rec709_color4" node="acescg_to_lin_rec709" nodegroup="colortransform">
<input name="in" type="color4" />
<input name="in" type="color4" value="0.0, 0.0, 0.0, 1.0" />
<output name="out" type="color4" />
</nodedef>

<nodedef name="ND_g22_ap1_to_lin_rec709_color3" node="g22_ap1_to_lin_rec709" nodegroup="colortransform">
<input name="in" type="color3" />
<input name="in" type="color3" value="0.0, 0.0, 0.0" />
<output name="out" type="color3" />
</nodedef>

<nodedef name="ND_g22_ap1_to_lin_rec709_color4" node="g22_ap1_to_lin_rec709" nodegroup="colortransform">
<input name="in" type="color4" />
<input name="in" type="color4" value="0.0, 0.0, 0.0, 1.0" />
<output name="out" type="color4" />
</nodedef>

<nodedef name="ND_srgb_texture_to_lin_rec709_color3" node="srgb_texture_to_lin_rec709" nodegroup="colortransform">
<input name="in" type="color3" />
<input name="in" type="color3" value="0.0, 0.0, 0.0" />
<output name="out" type="color3" />
</nodedef>

<nodedef name="ND_srgb_texture_to_lin_rec709_color4" node="srgb_texture_to_lin_rec709" nodegroup="colortransform">
<input name="in" type="color4" />
<input name="in" type="color4" value="0.0, 0.0, 0.0, 1.0" />
<output name="out" type="color4" />
</nodedef>

<nodedef name="ND_lin_adobergb_to_lin_rec709_color3" node="lin_adobergb_to_lin_rec709" nodegroup="colortransform">
<input name="in" type="color3" />
<input name="in" type="color3" value="0.0, 0.0, 0.0" />
<output name="out" type="color3" />
</nodedef>

<nodedef name="ND_lin_adobergb_to_lin_rec709_color4" node="lin_adobergb_to_lin_rec709" nodegroup="colortransform">
<input name="in" type="color4" />
<input name="in" type="color4" value="0.0, 0.0, 0.0, 1.0" />
<output name="out" type="color4" />
</nodedef>

<nodedef name="ND_adobergb_to_lin_rec709_color3" node="adobergb_to_lin_rec709" nodegroup="colortransform">
<input name="in" type="color3" />
<input name="in" type="color3" value="0.0, 0.0, 0.0" />
<output name="out" type="color3" />
</nodedef>

<nodedef name="ND_adobergb_to_lin_rec709_color4" node="adobergb_to_lin_rec709" nodegroup="colortransform">
<input name="in" type="color4" />
<input name="in" type="color4" value="0.0, 0.0, 0.0, 1.0" />
<output name="out" type="color4" />
</nodedef>

Expand Down
2 changes: 1 addition & 1 deletion resources/Materials/TestSuite/_options.mtlx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<input name="extraLibraryPaths" type="string" value="" />

<!-- List of document paths for render tests -->
<input name="renderTestPaths" type="string" value="resources/Materials/Examples/StandardSurface,resources/Materials/TestSuite/stdlib/color_management,resources/Materials/TestSuite/stdlib/convolution,resources/Materials/TestSuite/stdlib/geometric,resources/Materials/TestSuite/stdlib/noise,resources/Materials/TestSuite/pbrlib" />
<input name="renderTestPaths" type="string" value="resources/Materials/Examples/StandardSurface,resources/Materials/TestSuite/stdlib/color_management,resources/Materials/TestSuite/stdlib/convolution,resources/Materials/TestSuite/stdlib/geometric,resources/Materials/TestSuite/stdlib/noise,resources/Materials/TestSuite/pbrlib,resources/Materials/TestSuite/cmlib" />

<!-- Enable reference quality rendering. Default is false. -->
<input name="enableReferenceQuality" type="boolean" value="false" />
Expand Down
165 changes: 165 additions & 0 deletions resources/Materials/TestSuite/cmlib/cmlib_nodes.mtlx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
<?xml version="1.0"?>
<materialx version="1.38">
<!-- Color management node instance test. One of each transform is created and then connected to a downsteam material -->

<acescg_to_lin_rec709 name="acescg_to_lin_rec709_color3" type="color3">
<input name="in" type="color3" value="0.7,0.2, 0.1" />
</acescg_to_lin_rec709>
<convert name="shader_acescg_to_lin_rec709_color3_out" type="surfaceshader">
<input name="in" type="color3" nodename="acescg_to_lin_rec709_color3" />
</convert>
<surfacematerial name="material_acescg_to_lin_rec709_color3_out" type="material">
<input name="surfaceshader" type="surfaceshader" nodename="shader_acescg_to_lin_rec709_color3_out" />
</surfacematerial>

<acescg_to_lin_rec709 name="acescg_to_lin_rec709_color4" type="color4">
<input name="in" type="color4" value="0.7,0.2, 0.1, 1.0" />
</acescg_to_lin_rec709>
<convert name="shader_acescg_to_lin_rec709_color4_out" type="surfaceshader">
<input name="in" type="color4" nodename="acescg_to_lin_rec709_color4" />
</convert>
<surfacematerial name="material_acescg_to_lin_rec709_color4_out" type="material">
<input name="surfaceshader" type="surfaceshader" nodename="shader_acescg_to_lin_rec709_color4_out" />
</surfacematerial>

<adobergb_to_lin_rec709 name="adobergb_to_lin_rec709_color3" type="color3">
<input name="in" type="color3" value="0.7,0.2, 0.1" />
</adobergb_to_lin_rec709>
<convert name="shader_adobergb_to_lin_rec709_color3_out" type="surfaceshader">
<input name="in" type="color3" nodename="adobergb_to_lin_rec709_color3" />
</convert>
<surfacematerial name="material_adobergb_to_lin_rec709_color3_out" type="material">
<input name="surfaceshader" type="surfaceshader" nodename="shader_adobergb_to_lin_rec709_color3_out" />
</surfacematerial>

<adobergb_to_lin_rec709 name="adobergb_to_lin_rec709_color4" type="color4">
<input name="in" type="color4" value="0.7,0.2, 0.1, 1.0" />
</adobergb_to_lin_rec709>
<convert name="shader_adobergb_to_lin_rec709_color4_out" type="surfaceshader">
<input name="in" type="color4" nodename="adobergb_to_lin_rec709_color4" />
</convert>
<surfacematerial name="material_adobergb_to_lin_rec709_color4_out" type="material">
<input name="surfaceshader" type="surfaceshader" nodename="shader_adobergb_to_lin_rec709_color4_out" />
</surfacematerial>

<g18_rec709_to_lin_rec709 name="g18_rec709_to_lin_rec709_color3" type="color3">
<input name="in" type="color3" value="0.7,0.2, 0.1" />
</g18_rec709_to_lin_rec709>
<convert name="shader_g18_rec709_to_lin_rec709_color3_out" type="surfaceshader">
<input name="in" type="color3" nodename="g18_rec709_to_lin_rec709_color3" />
</convert>
<surfacematerial name="material_g18_rec709_to_lin_rec709_color3_out" type="material">
<input name="surfaceshader" type="surfaceshader" nodename="shader_g18_rec709_to_lin_rec709_color3_out" />
</surfacematerial>

<g18_rec709_to_lin_rec709 name="g18_rec709_to_lin_rec709_color4" type="color4">
<input name="in" type="color4" value="0.7,0.2, 0.1, 1.0" />
</g18_rec709_to_lin_rec709>
<convert name="shader_g18_rec709_to_lin_rec709_color4_out" type="surfaceshader">
<input name="in" type="color4" nodename="g18_rec709_to_lin_rec709_color4" />
</convert>
<surfacematerial name="material_g18_rec709_to_lin_rec709_color4_out" type="material">
<input name="surfaceshader" type="surfaceshader" nodename="shader_g18_rec709_to_lin_rec709_color4_out" />
</surfacematerial>

<g22_ap1_to_lin_rec709 name="g22_ap1_to_lin_rec709_color3" type="color3">
<input name="in" type="color3" value="0.7,0.2, 0.1" />
</g22_ap1_to_lin_rec709>
<convert name="shader_g22_ap1_to_lin_rec709_color3_out" type="surfaceshader">
<input name="in" type="color3" nodename="g22_ap1_to_lin_rec709_color3" />
</convert>
<surfacematerial name="material_g22_ap1_to_lin_rec709_color3_out" type="material">
<input name="surfaceshader" type="surfaceshader" nodename="shader_g22_ap1_to_lin_rec709_color3_out" />
</surfacematerial>

<g22_ap1_to_lin_rec709 name="g22_ap1_to_lin_rec709_color4" type="color4">
<input name="in" type="color4" value="0.7,0.2, 0.1, 1.0" />
</g22_ap1_to_lin_rec709>
<convert name="shader_g22_ap1_to_lin_rec709_color4_out" type="surfaceshader">
<input name="in" type="color4" nodename="g22_ap1_to_lin_rec709_color4" />
</convert>
<surfacematerial name="material_g22_ap1_to_lin_rec709_color4_out" type="material">
<input name="surfaceshader" type="surfaceshader" nodename="shader_g22_ap1_to_lin_rec709_color4_out" />
</surfacematerial>

<g22_rec709_to_lin_rec709 name="g22_rec709_to_lin_rec709_color3" type="color3">
<input name="in" type="color3" value="0.7,0.2, 0.1" />
</g22_rec709_to_lin_rec709>
<convert name="shader_g22_rec709_to_lin_rec709_color3_out" type="surfaceshader">
<input name="in" type="color3" nodename="g22_rec709_to_lin_rec709_color3" />
</convert>
<surfacematerial name="material_g22_rec709_to_lin_rec709_color3_out" type="material">
<input name="surfaceshader" type="surfaceshader" nodename="shader_g22_rec709_to_lin_rec709_color3_out" />
</surfacematerial>

<g22_rec709_to_lin_rec709 name="g22_rec709_to_lin_rec709_color4" type="color4">
<input name="in" type="color4" value="0.7,0.2, 0.1, 1.0" />
</g22_rec709_to_lin_rec709>
<convert name="shader_g22_rec709_to_lin_rec709_color4_out" type="surfaceshader">
<input name="in" type="color4" nodename="g22_rec709_to_lin_rec709_color4" />
</convert>
<surfacematerial name="material_g22_rec709_to_lin_rec709_color4_out" type="material">
<input name="surfaceshader" type="surfaceshader" nodename="shader_g22_rec709_to_lin_rec709_color4_out" />
</surfacematerial>

<lin_adobergb_to_lin_rec709 name="lin_adobergb_to_lin_rec709_color3" type="color3">
<input name="in" type="color3" value="0.7,0.2, 0.1" />
</lin_adobergb_to_lin_rec709>
<convert name="shader_lin_adobergb_to_lin_rec709_color3_out" type="surfaceshader">
<input name="in" type="color3" nodename="lin_adobergb_to_lin_rec709_color3" />
</convert>
<surfacematerial name="material_lin_adobergb_to_lin_rec709_color3_out" type="material">
<input name="surfaceshader" type="surfaceshader" nodename="shader_lin_adobergb_to_lin_rec709_color3_out" />
</surfacematerial>

<lin_adobergb_to_lin_rec709 name="lin_adobergb_to_lin_rec709_color4" type="color4">
<input name="in" type="color4" value="0.7,0.2, 0.1, 1.0" />
</lin_adobergb_to_lin_rec709>
<convert name="shader_lin_adobergb_to_lin_rec709_color4_out" type="surfaceshader">
<input name="in" type="color4" nodename="lin_adobergb_to_lin_rec709_color4" />
</convert>
<surfacematerial name="material_lin_adobergb_to_lin_rec709_color4_out" type="material">
<input name="surfaceshader" type="surfaceshader" nodename="shader_lin_adobergb_to_lin_rec709_color4_out" />
</surfacematerial>

<rec709_display_to_lin_rec709 name="rec709_display_to_lin_rec709_color3" type="color3">
<input name="in" type="color3" value="0.7,0.2, 0.1" />
</rec709_display_to_lin_rec709>
<convert name="shader_rec709_display_to_lin_rec709_color3_out" type="surfaceshader">
<input name="in" type="color3" nodename="rec709_display_to_lin_rec709_color3" />
</convert>
<surfacematerial name="material_rec709_display_to_lin_rec709_color3_out" type="material">
<input name="surfaceshader" type="surfaceshader" nodename="shader_rec709_display_to_lin_rec709_color3_out" />
</surfacematerial>

<rec709_display_to_lin_rec709 name="rec709_display_to_lin_rec709_color4" type="color4">
<input name="in" type="color4" value="0.7,0.2, 0.1, 1.0" />
</rec709_display_to_lin_rec709>
<convert name="shader_rec709_display_to_lin_rec709_color4_out" type="surfaceshader">
<input name="in" type="color4" nodename="rec709_display_to_lin_rec709_color4" />
</convert>
<surfacematerial name="material_rec709_display_to_lin_rec709_color4_out" type="material">
<input name="surfaceshader" type="surfaceshader" nodename="shader_rec709_display_to_lin_rec709_color4_out" />
</surfacematerial>

<srgb_texture_to_lin_rec709 name="srgb_texture_to_lin_rec709_color3" type="color3">
<input name="in" type="color3" value="0.7,0.2, 0.1" />
</srgb_texture_to_lin_rec709>
<convert name="shader_srgb_texture_to_lin_rec709_color3_out" type="surfaceshader">
<input name="in" type="color3" nodename="srgb_texture_to_lin_rec709_color3" />
</convert>
<surfacematerial name="material_srgb_texture_to_lin_rec709_color3_out" type="material">
<input name="surfaceshader" type="surfaceshader" nodename="shader_srgb_texture_to_lin_rec709_color3_out" />
</surfacematerial>

<srgb_texture_to_lin_rec709 name="srgb_texture_to_lin_rec709_color4" type="color4">
<input name="in" type="color4" value="0.7,0.2, 0.1, 1.0" />
</srgb_texture_to_lin_rec709>
<convert name="shader_srgb_texture_to_lin_rec709_color4_out" type="surfaceshader">
<input name="in" type="color4" nodename="srgb_texture_to_lin_rec709_color4" />
</convert>
<surfacematerial name="material_srgb_texture_to_lin_rec709_color4_out" type="material">
<input name="surfaceshader" type="surfaceshader" nodename="shader_srgb_texture_to_lin_rec709_color4_out" />
</surfacematerial>

</materialx>
⚡