mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-19 16:10:18 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2846 from Capostrophic/envmap

Browse source 
CopyRigVisitor fixes (bug #5415)
This commit is contained in:
Bret Curtis 2020-05-15 17:32:11 +02:00 committed by GitHub
commit f9fca8675b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -13,6 +13,7 @@
Bug #5369: Spawnpoint in the Grazelands doesn't produce oversized creatures Bug #5369: Spawnpoint in the Grazelands doesn't produce oversized creatures
Bug #5370: Opening an unlocked but trapped door uses the key Bug #5370: Opening an unlocked but trapped door uses the key
Bug #5400: Editor: Verifier checks race of non-skin bodyparts Bug #5400: Editor: Verifier checks race of non-skin bodyparts
Bug #5415: Environment maps in ebony cuirass and HiRez Armors Indoril cuirass don't work
Bug #5416: Junk non-node records before the root node are not handled gracefully Bug #5416: Junk non-node records before the root node are not handled gracefully
Feature #5362: Show the soul gems' trapped soul in count dialog Feature #5362: Show the soul gems' trapped soul in count dialog

33
components/sceneutil/attach.cpp
View file

@ -45,23 +45,24 @@ namespace SceneUtil
virtual void apply(osg::Drawable& drawable) virtual void apply(osg::Drawable& drawable)
{ {
std::string lowerName = Misc::StringUtils::lowerCase(drawable.getName()); if (!filterMatches(drawable.getName()))
if ((lowerName.size() >= mFilter.size() && lowerName.compare(0, mFilter.size(), mFilter) == 0) return;
|| (lowerName.size() >= mFilter2.size() && lowerName.compare(0, mFilter2.size(), mFilter2) == 0))
osg::Node* node = &drawable;
while (node->getNumParents())
{ {
osg::Node* node = &drawable; osg::Group* parent = node->getParent(0);
while (node && node->getNumParents() && !node->getStateSet()) if (!parent || !filterMatches(parent->getName()))
node = node->getParent(0); break;
if (node) node = parent;
mToCopy.push_back(node);
} }
mToCopy.emplace(node);
} }
void doCopy() void doCopy()
{ {
for (std::vector<osg::ref_ptr<osg::Node> >::iterator it = mToCopy.begin(); it != mToCopy.end(); ++it) for (const osg::ref_ptr<osg::Node>& node : mToCopy)
{ {
osg::ref_ptr<osg::Node> node = *it;
if (node->getNumParents() > 1) if (node->getNumParents() > 1)
Log(Debug::Error) << "Error CopyRigVisitor: node has multiple parents"; Log(Debug::Error) << "Error CopyRigVisitor: node has multiple parents";
while (node->getNumParents()) while (node->getNumParents())
@ -73,8 +74,16 @@ namespace SceneUtil
} }
private: private:
typedef std::vector<osg::ref_ptr<osg::Node> > NodeVector;
NodeVector mToCopy; bool filterMatches(const std::string& name) const
{
std::string lowerName = Misc::StringUtils::lowerCase(name);
return (lowerName.size() >= mFilter.size() && lowerName.compare(0, mFilter.size(), mFilter) == 0)
|| (lowerName.size() >= mFilter2.size() && lowerName.compare(0, mFilter2.size(), mFilter2) == 0);
}
using NodeSet = std::set<osg::ref_ptr<osg::Node>>;
NodeSet mToCopy;
osg::ref_ptr<osg::Group> mParent; osg::ref_ptr<osg::Group> mParent;
std::string mFilter; std::string mFilter;