Skip to content
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

Jump to bottom

Add DisplayP3 colorspaces #1368

Merged
merged 6 commits into from
Jun 3, 2023
Merged

Add DisplayP3 colorspaces #1368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
039fd79
Add srgb_displayp3 and lin_displayp3 colorspaces
dgovil May 25, 2023
7fdce82
Fix output connection
jstone-lucasfilm May 26, 2023
68556a5
Fix mismatched node name
jstone-lucasfilm May 26, 2023
961298a
Fix node name mismatches
jstone-lucasfilm May 26, 2023
4301064
Add default values to cmlib_defs.mtlx
dgovil May 30, 2023
ded1a6b
Merge branch 'main' into srgb_displayp3
jstone-lucasfilm Jun 2, 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
2 changes: 2 additions & 0 deletions documents/Specification/inprog_v1.39/MaterialX.Specification.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,8 @@ By default, MaterialX supports the following color spaces as defined in ACES 1.2
* `lin_srgb`
* `adobergb`
* `lin_adobergb`
* `srgb_displayp3`
* `lin_displayp3`

The working color space of a MaterialX document is defined by the `colorspace` attribute of its root <materialx> element, and it is strongly recommended that all <materialx> elements define a specific `colorspace` if they wish to use a color-managed workflow rather than relying on a default colorspace setting from an external configuration file.

Expand Down
14 changes: 12 additions & 2 deletions libraries/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,18 @@ This folder contains the standard data libraries for MaterialX, providing declar
- [lama](bxdf/lama) : Graph definitions of the [MaterialX Lama](https://rmanwiki.pixar.com/display/REN24/MaterialX+Lama) node set.

## Color Management Library
- MaterialX shader generation natively supports a small set of common spaces for input colors, with all color transforms implemented as language-independent MaterialX graphs. The canonical definitions of these color transforms may be found in the OpenColorIO configuration for [ACES 1.2](https://github.com/colour-science/OpenColorIO-Configs/tree/feature/aces-1.2-config/aces_1.2).
- lin_rec709, g18_rec709, g22_rec709, rec709_display, acescg (lin_ap1), g22_ap1, srgb_texture, lin_adobergb, adobergb
- MaterialX shader generation natively supports a small set of common spaces for input colors, with all color transforms implemented as language-independent MaterialX graphs.The canonical definitions of these color transforms may be found in the OpenColorIO configuration for [ACES 1.2](https://github.com/colour-science/OpenColorIO-Configs/tree/feature/aces-1.2-config/aces_1.2).
- lin_rec709
- g18_rec709
- g22_rec709
- rec709_display
- acescg (lin_ap1)
- g22_ap1
- srgb_texture
- lin_adobergb
- adobergb
- srgb_displayp3
- lin_displayp3
- [cmlib](cmlib)
- [cmlib_defs.mtlx](cmlib/cmlib_defs.mtlx) : Nodedef declarations.
- [cmlib_ng.mtlx](cmlib/cmlib_ng.mtlx) : Nodegraph definitions.
Expand Down
20 changes: 20 additions & 0 deletions libraries/cmlib/cmlib_defs.mtlx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,24 @@
<output name="out" type="color4" />
</nodedef>

<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" />
</nodedef>

<nodedef name="ND_srgb_displayp3_to_lin_rec709_color4" node="srgb_displayp3_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_displayp3_to_lin_rec709_color3" node="lin_displayp3_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_displayp3_to_lin_rec709_color4" node="lin_displayp3_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>
70 changes: 70 additions & 0 deletions libraries/cmlib/cmlib_ng.mtlx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,4 +294,74 @@
<output name="out" type="color4" nodename="asColor4" />
</nodegraph>

<nodegraph name="NG_srgb_displayp3_to_lin_rec709_color3" nodedef="ND_srgb_displayp3_to_lin_rec709_color3">
<constant name="mat" type="matrix33">
<input name="value" type="matrix33" value="1.22493029, -0.22492968, 0.00000006, -0.04205868, 1.04205894, -0.00000001, -0.01964128, -0.07864794, 1.09828925" />
</constant>
<!-- Use srgb_texture_to_lin_rec709 to convert from sRGB to Lin before passing to the mat conversion -->
<srgb_texture_to_lin_rec709 name="srgb_transform" type="color3">
<input name="in" type="color3" interfacename="in" />
</srgb_texture_to_lin_rec709>
<convert name="asVec" type="vector3">
<input name="in" type="color3" nodename="srgb_transform" />
</convert>
<transformmatrix name="transform" type="vector3">
<input name="in" type="vector3" nodename="asVec" />
<input name="mat" type="matrix33" nodename="mat" />
</transformmatrix>
<convert name="asColor" type="color3">
<input name="in" type="vector3" nodename="transform" />
</convert>
<output name="out" type="color3" nodename="asColor" />
</nodegraph>

<nodegraph name="NG_srgb_displayp3_to_lin_rec709_color4" nodedef="ND_srgb_displayp3_to_lin_rec709_color4">
<convert name="asColor3" type="color3">
<input name="in" type="color4" interfacename="in" />
</convert>
<srgb_displayp3_to_lin_rec709 name="transform" type="color3">
<input name="in" type="color3" nodename="asColor3" />
</srgb_displayp3_to_lin_rec709>
<combine4 name="asColor4" type="color4">
<input name="in1" type="float" nodename="transform" channels="r" />
<input name="in2" type="float" nodename="transform" channels="g" />
<input name="in3" type="float" nodename="transform" channels="b" />
<input name="in4" type="float" interfacename="in" channels="a" />
</combine4>
<output name="out" type="color4" nodename="asColor4" />
</nodegraph>

<nodegraph name="NG_lin_displayp3_to_lin_rec709_color3" nodedef="ND_lin_displayp3_to_lin_rec709_color3">
<constant name="mat" type="matrix33">
<input name="value" type="matrix33" value="1.22493029, -0.22492968, 0.00000006, -0.04205868, 1.04205894, -0.00000001, -0.01964128, -0.07864794, 1.09828925" />
</constant>
<convert name="asVec" type="vector3">
<input name="in" type="color3" interfacename="in" />
</convert>
<transformmatrix name="transform" type="vector3">
<input name="in" type="vector3" nodename="asVec" />
<input name="mat" type="matrix33" nodename="mat" />
</transformmatrix>
<convert name="asColor" type="color3">
<input name="in" type="vector3" nodename="transform" />
</convert>
<output name="out" type="color3" nodename="asColor" />
</nodegraph>

<nodegraph name="NG_lin_displayp3_to_lin_rec709_color4" nodedef="ND_lin_displayp3_to_lin_rec709_color4">
<convert name="asColor3" type="color3">
<input name="in" type="color4" interfacename="in" />
</convert>
<lin_displayp3_to_lin_rec709 name="transform" type="color3">
<input name="in" type="color3" nodename="asColor3" />
</lin_displayp3_to_lin_rec709>
<combine4 name="asColor4" type="color4">
<input name="in1" type="float" nodename="transform" channels="r" />
<input name="in2" type="float" nodename="transform" channels="g" />
<input name="in3" type="float" nodename="transform" channels="b" />
<input name="in4" type="float" interfacename="in" channels="a" />
</combine4>
<output name="out" type="color4" nodename="asColor4" />
</nodegraph>

</materialx>
28 changes: 28 additions & 0 deletions resources/Materials/TestSuite/stdlib/color_management/color_management.mtlx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,20 @@
<input name="base_color" type="color3" value="1, 1, 1" nodename="image_lin_adobergb" />
</standard_surface>
<output name="image_lin_adobergb_output" type="surfaceshader" nodename="image_lin_adobergb_standard_surface8" />
<image name="image_srgb_displayp3" type="color3">
<input name="file" type="filename" value="resources/Images/grid.png" colorspace="srgb_displayp3" />
</image>
<standard_surface name="image_srgb_displayp3_standard_surface9" type="surfaceshader">
<input name="base_color" type="color3" nodename="image_srgb_displayp3" />
</standard_surface>
<output name="image_srgb_displayp3_output" type="surfaceshader" nodename="image_srgb_displayp3_standard_surface9" />
<image name="image_lin_displayp3" type="color3">
<input name="file" type="filename" value="resources/Images/grid.png" colorspace="lin_displayp3" />
</image>
<standard_surface name="image_lin_displayp3_standard_surface10" type="surfaceshader">
<input name="base_color" type="color3" nodename="image_lin_displayp3" />
</standard_surface>
<output name="image_lin_displayp3_output" type="surfaceshader" nodename="image_lin_displayp3_standard_surface10" />
<constant name="color_lin_rec709" type="color4">
<input name="value" type="color4" value="0.5, 0.0, 0.0, 1.0" colorspace="lin_rec709" />
</constant>
Expand Down Expand Up @@ -127,5 +141,19 @@
<input name="base_color" type="color3" value="1, 1, 1" nodename="color_lin_adobergb" channels="rgb" />
</standard_surface>
<output name="color_lin_adobergb_output" type="surfaceshader" nodename="color_lin_adobergb_standard_surface8" />
<constant name="color_srgb_displayp3" type="color4">
<input name="value" type="color4" value="0.5, 0.0, 0.0, 1.0" colorspace="srgb_displayp3" />
</constant>
<standard_surface name="color_srgb_displayp3_standard_surface5" type="surfaceshader">
<input name="base_color" type="color3" nodename="color_srgb_displayp3" channels="rgb" />
</standard_surface>
<output name="color_srgb_displayp3_output" type="surfaceshader" nodename="color_srgb_displayp3_standard_surface5" />
<constant name="color_lin_displayp3" type="color4">
<input name="value" type="color4" value="0.5, 0.0, 0.0, 1.0" colorspace="lin_displayp3" />
</constant>
<standard_surface name="color_lin_displayp3_standard_surface5" type="surfaceshader">
<input name="base_color" type="color3" nodename="color_lin_displayp3" channels="rgb" />
</standard_surface>
<output name="color_lin_displayp3_output" type="surfaceshader" nodename="color_lin_displayp3_standard_surface5" />
</nodegraph>
</materialx>