-
Notifications
You must be signed in to change notification settings - Fork 411
Align MaterialX to Color Interop recommendations #2514
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.
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
Open
JGamache-autodesk
wants to merge
6
commits into
AcademySoftwareFoundation:main
Choose a base branch
from
autodesk-forks:adsk/full_color_interop_support
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
4ac0999
Align MaterialX to Color Interop recommendations
JGamache-autodesk 59e408b
Introduce "data" as equivalent to "none"
JGamache-autodesk bba605e
Fix build.
JGamache-autodesk 7976846
Merge branch 'main' into adsk/full_color_interop_support
JGamache-autodesk 5999750
Merge remote-tracking branch 'origin/main' into adsk/full_color_inter…
JGamache-autodesk ed339e0
Merge branch 'adsk/full_color_interop_support' of https://github.com/…
JGamache-autodesk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 --> | ||
|
|
||
| <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" /> | ||
|
|
@@ -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"> | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 --> | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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" /> | ||
|
|
@@ -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> | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.