teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Pass the traversal number instead of the node visitor

Browse source
This commit is contained in:
scrawl 2016-07-02 19:26:11 +02:00
parent 08b2d38c54
commit 6fa95e72c5
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/sceneutil/riggeometry.cpp
View file

@ -241,7 +241,7 @@ void RigGeometry::update(osg::NodeVisitor* nv)
return;
mLastFrameNumber = nv->getTraversalNumber();
mSkeleton->updateBoneMatrices(nv);
mSkeleton->updateBoneMatrices(nv->getTraversalNumber());
// skinning
osg::Vec3Array* positionSrc = static_cast<osg::Vec3Array*>(mSourceGeometry->getVertexArray());
@ -301,7 +301,7 @@ void RigGeometry::updateBounds(osg::NodeVisitor *nv)
return;
mBoundsFirstFrame = false;
mSkeleton->updateBoneMatrices(nv);
mSkeleton->updateBoneMatrices(nv->getTraversalNumber());
updateGeomToSkelMatrix(nv);

6
components/sceneutil/skeleton.cpp
View file

@ -108,12 +108,12 @@ Bone* Skeleton::getBone(const std::string &name)
return bone;
}
void Skeleton::updateBoneMatrices(osg::NodeVisitor* nv)
void Skeleton::updateBoneMatrices(unsigned int traversalNumber)
{
if (nv->getTraversalNumber() != mLastFrameNumber)
if (traversalNumber != mLastFrameNumber)
mNeedToUpdateBoneMatrices = true;
mLastFrameNumber = nv->getTraversalNumber();
mLastFrameNumber = traversalNumber;
if (mLastFrameNumber % 2 == 0)
mTraversedEvenFrame = true;

2
components/sceneutil/skeleton.hpp
View file

@ -45,7 +45,7 @@ namespace SceneUtil
Bone* getBone(const std::string& name);
/// Request an update of bone matrices. May be a no-op if already updated in this frame.
void updateBoneMatrices(osg::NodeVisitor* nv);
void updateBoneMatrices(unsigned int traversalNumber);
/// Set the skinning active flag. Inactive skeletons will not have their child rigs updated.
/// You should set this flag to false if you know that bones are not currently moving.