MAYA-129798 - Use experimental OCIO hooks for MaterialX shading #3171
Conversation
| MATERIALX_NAMESPACE_BEGIN | ||
|
|
||
| namespace { | ||
| // Internal OCIO strings: |
There was a problem hiding this comment.
Familiarity with the internal structure of an OGS fragment is recommended. You can use lib\mayaUsd\render\vp2ShaderFragments\Float3ToFloatX.xml as reference.
| } | ||
|
|
||
| void addOCIONodeDef(DocumentPtr lib, const pugi::xml_document& doc, const std::string& output_type) | ||
| { |
There was a problem hiding this comment.
Add the NodeDef and Implementation in the library, allowing us to use them in our internal graphs.
There was a problem hiding this comment.
This file has UsdPreviewSurface and MaterialX textures in 7 different color spaces. We want all squares to be color managed identically.
There was a problem hiding this comment.
Necessary to split this reference image because of a small but important difference between the old color correction and the OCIO code. The OCIO code will clamp the colors between 0 and 1 before doing any computations.
The triplanar projection used on the rightmost sphere of the top row can generate colors with out of range components. This causes visible differences when using OCIO.
A fix for incorrect triplanar blending has been submitted to MaterialX by Chris Rydalch, so we will need to revisit these reference images in future MaterialX updates.
| @@ -87,16 +87,32 @@ def testMayaSurfaces(self): | |||
| cmds.file(force=True, new=True) | |||
| cmds.move(6, -6, 6, 'persp') | |||
| cmds.rotate(60, 0, 45, 'persp') | |||
| self._StartTest('MayaSurfaces') | |||
There was a problem hiding this comment.
Copied code from _StartTest to help keep this test clean.
There was a problem hiding this comment.
Config copied from ACES, but with additional file rules that catches the naming convention used below.
There was a problem hiding this comment.
Standard color paletted used for calibration. Contains multiple midtones that help make sure the color management provides correct response.
All images below were generated in sRGB and converted to a different source color space using OCIO-aware OIIO tools.
| for (auto&& property : ocioDoc.child(TAG_FRAGMENT).child(TAG_PROPERTIES).children()) { | ||
| if (std::strncmp(property.name(), TAG_TEXTURE2, TAG_TEXTURE2_LEN) == 0) { | ||
| std::string samplerName = property.attribute(ATTR_NAME).as_string(); | ||
| samplerName += "Sampler"; |
There was a problem hiding this comment.
Preserving the name to make sure Maya can load the LUTs for the more complex color management shaders.
JGamache-autodesk
added
the
ready-for-merge
|
@seando-adsk ready for merge. |
No description provided.