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.

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

LOOKDEVX-2128 - Allow specializing the topo neutral graph generator #3503

Merged

Conversation

JGamache-autodesk
Copy link
Collaborator

  • Also exports the color management preferences cache.

- Also exports the color management preferences cache.
@@ -47,7 +47,7 @@ class MAYAUSD_CORE_PUBLIC TopoNeutralGraph
// Get the watch list gathered while traversing
const WatchList& getWatchList() const;

private:
protected:
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Allow downstream clients to specialize that class.

namespace MAYAUSD_NS_DEF {

// We will cache the color management preferences since they are used in many loops.
ColorManagementPreferences::~ColorManagementPreferences() { RemoveSinks(); }
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Extracted as-is from material.cpp to be used by downstream clients.

feldstj
feldstj previously approved these changes Dec 7, 2023
Copy link
Collaborator

@feldstj feldstj left a comment

Choose a reason for hiding this comment

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

LGTM, one minor comment.

MString _renderingSpaceName;
MString _sRGBName;
std::vector<MCallbackId> _mayaColorManagementCallbackIds;
MCallbackId _mayaExitingCB { 0 };
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can add this callback to the color management callback vector.

feldstj
feldstj previously approved these changes Dec 7, 2023
@JGamache-autodesk JGamache-autodesk added the ready-for-merge Development process is finished, PR is ready for merge label Dec 7, 2023
@JGamache-autodesk
Copy link
Collaborator Author

@seando-adsk Ready for merge.

@JGamache-autodesk
Copy link
Collaborator Author

@seando-adsk Still ready for merge. Last commit fully reverts previous one, which will be submitted separately. So we are still in a fully reviewed state.

feldstj
feldstj previously approved these changes Dec 11, 2023
Since the OgsFragment code is now shared with other clients, it must be
careful around global state.
@@ -3027,8 +2910,15 @@ MHWRender::MShaderInstance* HdVP2Material::CompiledNetwork::_CreateMaterialXShad
return shaderInstance;
}

// Enable changing texcoord to geompropvalue
const auto prevUVSetName = mx::OgsXmlGenerator::getPrimaryUVSetName();
mx::OgsXmlGenerator::setPrimaryUVSetName(_GetMaterialXData()._mainUvSetName);
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fixes issue see in demo this morning.

@seando-adsk seando-adsk added build Related to building maya-usd repository core Related to core library labels Dec 11, 2023
@seando-adsk seando-adsk merged commit 833a5b7 into dev Dec 11, 2023
@seando-adsk seando-adsk deleted the gamaj/LOOKDEVX-2128/export_common_color_management_api branch December 11, 2023 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Related to building maya-usd repository core Related to core library ready-for-merge Development process is finished, PR is ready for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants