Skip to content

Commit

Permalink
[Hd] Remove render tags API from HdRprimCollection.
Browse files Browse the repository at this point in the history
Now Hydra and All the front-ends no longer use render tags from the collection, this change cleans up and removes that API.

Changes:
- Removed SetRenderTags(), GetRenderTags() and HasRenderTag() from HdRprimCollection.

(Internal change: 1974425)
  • Loading branch information
MWDD authored and pixar-oss committed May 29, 2019
1 parent bc9c153 commit 02ffe93
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 46 deletions.
33 changes: 0 additions & 33 deletions pxr/imaging/lib/hd/rprimCollection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ HdRprimCollection::HdRprimCollection(HdRprimCollection const& col)
_name = col._name;
_reprSelector = col._reprSelector;
_forcedRepr = col._forcedRepr;
_renderTags = col._renderTags;
_rootPaths = col._rootPaths;
_excludePaths = col._excludePaths;
_materialTag = col._materialTag;
Expand Down Expand Up @@ -150,34 +149,6 @@ HdRprimCollection::GetExcludePaths() const
return _excludePaths;
}

void
HdRprimCollection::SetRenderTags(TfTokenVector const& renderTags)
{
_renderTags = renderTags;
}

TfTokenVector const&
HdRprimCollection::GetRenderTags() const
{
return _renderTags;
}

bool
HdRprimCollection::HasRenderTag(TfToken const & renderTag) const
{
if (_renderTags.empty()) {
return true;
}

TF_FOR_ALL (t, _renderTags) {
if (renderTag == *t) {
return true;
}
}

return false;
}

void
HdRprimCollection::SetMaterialTag(TfToken const& tag)
{
Expand All @@ -202,9 +173,6 @@ HdRprimCollection::ComputeHash() const
TF_FOR_ALL(pathIt, _excludePaths) {
boost::hash_combine(h, SdfPath::Hash()(*pathIt));
}
TF_FOR_ALL(rtIt, _renderTags) {
boost::hash_combine(h, rtIt->Hash());
}

boost::hash_combine(h, _materialTag);
return h;
Expand All @@ -217,7 +185,6 @@ bool HdRprimCollection::operator==(HdRprimCollection const & other) const
&& _forcedRepr == other._forcedRepr
&& _rootPaths == other._rootPaths
&& _excludePaths == other._excludePaths
&& _renderTags == other._renderTags
&& _materialTag == other._materialTag;
}

Expand Down
13 changes: 0 additions & 13 deletions pxr/imaging/lib/hd/rprimCollection.h
Original file line number Diff line number Diff line change
Expand Up @@ -163,18 +163,6 @@ class HdRprimCollection {
HD_API
SdfPathVector const& GetExcludePaths() const;

/// Sets the render tags that this collection will render.
HD_API
void SetRenderTags(TfTokenVector const& renderTags);

/// Returns the render tags.
HD_API
TfTokenVector const& GetRenderTags() const;

/// Returns if a tag is used by this collection
HD_API
bool HasRenderTag(TfToken const & renderTag) const;

/// A MaterialTag can be used to ensure only prims whos material have
/// a matching tag will end up in the collection. Different rendering
/// backends can control what material properties are useful for splitting
Expand Down Expand Up @@ -217,7 +205,6 @@ class HdRprimCollection {
TfToken _materialTag;
SdfPathVector _rootPaths;
SdfPathVector _excludePaths;
TfTokenVector _renderTags;
};

// VtValue requirements
Expand Down

0 comments on commit 02ffe93

Please sign in to comment.