forked from mirror/openmw-tes3mp
Pass the node path instead of the node visitor
This commit is contained in:
parent
6fa95e72c5
commit
d5f497c47d
2 changed files with 4 additions and 4 deletions
|
@ -303,7 +303,7 @@ void RigGeometry::updateBounds(osg::NodeVisitor *nv)
|
||||||
|
|
||||||
mSkeleton->updateBoneMatrices(nv->getTraversalNumber());
|
mSkeleton->updateBoneMatrices(nv->getTraversalNumber());
|
||||||
|
|
||||||
updateGeomToSkelMatrix(nv);
|
updateGeomToSkelMatrix(nv->getNodePath());
|
||||||
|
|
||||||
osg::BoundingBox box;
|
osg::BoundingBox box;
|
||||||
for (BoneSphereMap::const_iterator it = mBoneSphereMap.begin(); it != mBoneSphereMap.end(); ++it)
|
for (BoneSphereMap::const_iterator it = mBoneSphereMap.begin(); it != mBoneSphereMap.end(); ++it)
|
||||||
|
@ -321,11 +321,11 @@ void RigGeometry::updateBounds(osg::NodeVisitor *nv)
|
||||||
getParent(i)->dirtyBound();
|
getParent(i)->dirtyBound();
|
||||||
}
|
}
|
||||||
|
|
||||||
void RigGeometry::updateGeomToSkelMatrix(osg::NodeVisitor *nv)
|
void RigGeometry::updateGeomToSkelMatrix(const osg::NodePath& nodePath)
|
||||||
{
|
{
|
||||||
mSkelToGeomPath.clear();
|
mSkelToGeomPath.clear();
|
||||||
bool foundSkel = false;
|
bool foundSkel = false;
|
||||||
for (osg::NodePath::const_iterator it = nv->getNodePath().begin(); it != nv->getNodePath().end(); ++it)
|
for (osg::NodePath::const_iterator it = nodePath.begin(); it != nodePath.end(); ++it)
|
||||||
{
|
{
|
||||||
if (!foundSkel)
|
if (!foundSkel)
|
||||||
{
|
{
|
||||||
|
|
|
@ -80,7 +80,7 @@ namespace SceneUtil
|
||||||
|
|
||||||
bool initFromParentSkeleton(osg::NodeVisitor* nv);
|
bool initFromParentSkeleton(osg::NodeVisitor* nv);
|
||||||
|
|
||||||
void updateGeomToSkelMatrix(osg::NodeVisitor* nv);
|
void updateGeomToSkelMatrix(const osg::NodePath& nodePath);
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue