Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
120 changes: 108 additions & 12 deletions libraries/cmlib/cmlib_defs.mtlx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@
Declarations of the default color transforms in MaterialX.
-->

<!-- Functions that keep the same name in both 1.38 and color interop naming schemes -->
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A lot of movement because I wanted to group NodeDefs by how they were affected by the change.


<nodedef name="ND_lin_adobergb_to_lin_rec709_color3" node="lin_adobergb_to_lin_rec709" nodegroup="colortransform">
<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" value="0.0, 0.0, 0.0, 1.0" />
<output name="out" type="color4" />
</nodedef>

<nodedef name="ND_g18_rec709_to_lin_rec709_color3" node="g18_rec709_to_lin_rec709" nodegroup="colortransform">
<input name="in" type="color3" value="0.0, 0.0, 0.0" />
<output name="out" type="color3" />
Expand All @@ -27,66 +39,128 @@
<output name="out" type="color4" />
</nodedef>

<nodedef name="ND_rec709_display_to_lin_rec709_color3" node="rec709_display_to_lin_rec709" nodegroup="colortransform">
<nodedef name="ND_g22_ap1_to_lin_rec709_color3" node="g22_ap1_to_lin_rec709" nodegroup="colortransform">
<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">
<nodedef name="ND_g22_ap1_to_lin_rec709_color4" node="g22_ap1_to_lin_rec709" nodegroup="colortransform">
<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">
<!-- Functions introduced with color interop naming scheme -->

<nodedef name="ND_lin_ap1_to_lin_rec709_color3" node="lin_ap1_to_lin_rec709" nodegroup="colortransform">
<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">
<nodedef name="ND_lin_ap1_to_lin_rec709_color4" node="lin_ap1_to_lin_rec709" nodegroup="colortransform">
<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">
<nodedef name="ND_srgb_ap1_to_lin_rec709_color3" node="srgb_ap1_to_lin_rec709" nodegroup="colortransform">
<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">
<nodedef name="ND_srgb_ap1_to_lin_rec709_color4" node="srgb_ap1_to_lin_rec709" nodegroup="colortransform">
<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">
<nodedef name="ND_srgb_p3d65_to_lin_rec709_color3" node="srgb_p3d65_to_lin_rec709" nodegroup="colortransform">
<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">
<nodedef name="ND_srgb_p3d65_to_lin_rec709_color4" node="srgb_p3d65_to_lin_rec709" nodegroup="colortransform">
<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">
<nodedef name="ND_lin_p3d65_to_lin_rec709_color3" node="lin_p3d65_to_lin_rec709" nodegroup="colortransform">
<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">
<nodedef name="ND_lin_p3d65_to_lin_rec709_color4" node="lin_p3d65_to_lin_rec709" nodegroup="colortransform">
<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">
<nodedef name="ND_srgb_rec709_to_lin_rec709_color3" node="srgb_rec709_to_lin_rec709" nodegroup="colortransform">
<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">
<nodedef name="ND_srgb_rec709_to_lin_rec709_color4" node="srgb_rec709_to_lin_rec709" nodegroup="colortransform">
<input name="in" type="color4" value="0.0, 0.0, 0.0, 1.0" />
<output name="out" type="color4" />
</nodedef>

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

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

<nodedef name="ND_lin_ap0_to_lin_rec709_color3" node="lin_ap0_to_lin_rec709" nodegroup="colortransform">
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Introducing lin_ap0 and lin_rec2020

<input name="in" type="color3" value="0.0, 0.0, 0.0" />
<output name="out" type="color3" />
</nodedef>

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

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

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

<!-- Note: not adding lin_ciexyzd65_scene -->
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be added if requested.


<!-- DEPRECATED?? This color space is not part of color interop -->

<nodedef name="ND_rec709_display_to_lin_rec709_color3" node="rec709_display_to_lin_rec709" nodegroup="colortransform">
<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" value="0.0, 0.0, 0.0, 1.0" />
<output name="out" type="color4" />
</nodedef>

<!-- DEPRECATED FUNCTIONS: To be removed in 1.40. Names are kept in case
they were explicitly used in saved MaterialX data. The 1.40 upgrade
path will remap these to their color interop equivalents. -->

<!-- acescg becomes lin_ap1 -->
<nodedef name="ND_acescg_to_lin_rec709_color3" node="acescg_to_lin_rec709" nodegroup="colortransform">
<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" value="0.0, 0.0, 0.0, 1.0" />
<output name="out" type="color4" />
</nodedef>

<!-- displayp3 becomes p3d65 -->
<nodedef name="ND_srgb_displayp3_to_lin_rec709_color3" node="srgb_displayp3_to_lin_rec709" nodegroup="colortransform">
<input name="in" type="color3" value="0.0, 0.0, 0.0" />
<output name="out" type="color3" />
Expand All @@ -107,4 +181,26 @@
<output name="out" type="color4" />
</nodedef>

<!-- srgb_texture becomes srgb_rec709 -->
<nodedef name="ND_srgb_texture_to_lin_rec709_color3" node="srgb_texture_to_lin_rec709" nodegroup="colortransform">
<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" value="0.0, 0.0, 0.0, 1.0" />
<output name="out" type="color4" />
</nodedef>

<!-- adobergb becomes g22_adobergb -->
<nodedef name="ND_adobergb_to_lin_rec709_color3" node="adobergb_to_lin_rec709" nodegroup="colortransform">
<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" value="0.0, 0.0, 0.0, 1.0" />
<output name="out" type="color4" />
</nodedef>

</materialx>
Loading