MAYA-111889 point snapping to similar instances #1521
Merged
Conversation
This file contains 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
14a9e5f to
75bf83d
Compare
JGamache-autodesk
requested changes
Jul 13, 2021
| /* static */ | ||
| InstanceIdMap& MayaUsdCustomData::Get(const MHWRender::MRenderItem& renderItem) | ||
| { | ||
| return sMayaUsdCustomData._itemData[renderItem.InternalObjectId()]; |
There was a problem hiding this comment.
This data structure always grows. Is there a point in time where the data can be cleaned-up?
| @@ -1333,13 +1337,34 @@ void HdVP2Mesh::_InitRepr(const TfToken& reprToken, HdDirtyBits* dirtyBits) | |||
| case HdMeshGeomStyleHull: | |||
| // Creating the smoothHull hull render items requires geom subsets from the topology, | |||
| // and we can't access that here. | |||
| #ifdef HAS_DEFAULT_MATERIAL_SUPPORT_API | |||
| #ifdef MAYA_NEW_POINT_SNAPPING_SUPPORT | |||
| if (reprToken == HdVP2ReprTokens->defaultMaterial) { | |||
There was a problem hiding this comment.
This part is still HAS_DEFAULT_MATERIAL_SUPPORT_API.
| if (reprToken == HdVP2ReprTokens->defaultMaterial) { | ||
| // But default material mode does not use geom subsets, so we create the render item | ||
| renderItem = _CreateSmoothHullRenderItem(renderItemName); | ||
| renderItem->setDefaultMaterialHandling( | ||
| MRenderItem::DrawOnlyWhenDefaultMaterialActive); | ||
| renderItem->setShader(_delegate->Get3dDefaultMaterialShader()); | ||
|
|
||
| if (!GetInstancerId().IsEmpty()) { |
There was a problem hiding this comment.
MAYA_NEW_POINT_SNAPPING_SUPPORT would begin here?
| MString shadedSelectedInstancesRenderItemName = renderItemName; | ||
| shadedSelectedInstancesRenderItemName | ||
| += std::string(1, VP2_RENDER_DELEGATE_SEPARATOR).c_str(); | ||
| shadedSelectedInstancesRenderItemName += "shadedSelectedInstances"; |
There was a problem hiding this comment.
Need one definition for the "shadedSelectedInstances" string which appears 3 times. Maybe a token? Or maybe this code should be in a helper function?
…tances and one for unselected instances. This allows a different values for kSelectPointsForGravity, so that the selected instances can snap to unselected instances.
added 12 commits
July 13, 2021 16:55
4675aea to
8d724d5
Compare
JGamache-autodesk
approved these changes
Jul 14, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The changes for MAYA-111889 also require the work done in #1502. That work is included in this PR for now. #1502 should be merged first, and then this pull request can be re-based on top of the new dev.
This change also requires more Maya API changes, so it can't be merged until that API is available.