mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Improve performance in RigGeometry by optimizing for the most common case of identity geomToSkelMatrix

Browse Source
This commit is contained in:
scrawl 2017-02-03 02:18:44 +01:00
parent f3045331f1
commit 84a92e665c
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
components/sceneutil/riggeometry.cpp
View File

@ -271,7 +271,8 @@ void RigGeometry::update(osg::NodeVisitor* nv)
const osg::Matrixf& boneMatrix = bone->mMatrixInSkeletonSpace; const osg::Matrixf& boneMatrix = bone->mMatrixInSkeletonSpace;
accumulateMatrix(invBindMatrix, boneMatrix, weight, resultMat); accumulateMatrix(invBindMatrix, boneMatrix, weight, resultMat);
} }
resultMat = resultMat * mGeomToSkelMatrix; if (mGeomToSkelMatrix)
resultMat *= (*mGeomToSkelMatrix);
for (std::vector<unsigned short>::const_iterator vertexIt = it->second.begin(); vertexIt != it->second.end(); ++vertexIt) for (std::vector<unsigned short>::const_iterator vertexIt = it->second.begin(); vertexIt != it->second.end(); ++vertexIt)
{ {
@ -316,7 +317,10 @@ void RigGeometry::updateBounds(osg::NodeVisitor *nv)
{ {
Bone* bone = it->first; Bone* bone = it->first;
osg::BoundingSpheref bs = it->second; osg::BoundingSpheref bs = it->second;
transformBoundingSphere(bone->mMatrixInSkeletonSpace * mGeomToSkelMatrix, bs); if (mGeomToSkelMatrix)
transformBoundingSphere(bone->mMatrixInSkeletonSpace * (*mGeomToSkelMatrix), bs);
else
transformBoundingSphere(bone->mMatrixInSkeletonSpace, bs);
box.expandBy(bs); box.expandBy(bs);
} }
@ -332,19 +336,28 @@ void RigGeometry::updateBounds(osg::NodeVisitor *nv)
void RigGeometry::updateGeomToSkelMatrix(const osg::NodePath& nodePath) void RigGeometry::updateGeomToSkelMatrix(const osg::NodePath& nodePath)
{ {
mSkelToGeomPath.clear();
bool foundSkel = false; bool foundSkel = false;
osg::ref_ptr<osg::RefMatrixf> geomToSkelMatrix;
for (osg::NodePath::const_iterator it = nodePath.begin(); it != nodePath.end(); ++it) for (osg::NodePath::const_iterator it = nodePath.begin(); it != nodePath.end(); ++it)
{ {
osg::Node* node = *it;
if (!foundSkel) if (!foundSkel)
{ {
if (*it == mSkeleton) if (node == mSkeleton)
foundSkel = true; foundSkel = true;
} }
else else
mSkelToGeomPath.push_back(*it); {
if (osg::Transform* trans = node->asTransform())
{
if (!geomToSkelMatrix)
geomToSkelMatrix = new osg::RefMatrixf;
trans->computeWorldToLocalMatrix(*geomToSkelMatrix, NULL);
}
}
} }
mGeomToSkelMatrix = osg::computeWorldToLocal(mSkelToGeomPath); if (geomToSkelMatrix && !geomToSkelMatrix->isIdentity())
mGeomToSkelMatrix = geomToSkelMatrix;
} }
void RigGeometry::setInfluenceMap(osg::ref_ptr<InfluenceMap> influenceMap) void RigGeometry::setInfluenceMap(osg::ref_ptr<InfluenceMap> influenceMap)

3
components/sceneutil/riggeometry.hpp
View File

@ -56,8 +56,7 @@ namespace SceneUtil
osg::ref_ptr<osg::Vec4Array> mSourceTangents; osg::ref_ptr<osg::Vec4Array> mSourceTangents;
Skeleton* mSkeleton; Skeleton* mSkeleton;
osg::NodePath mSkelToGeomPath; osg::ref_ptr<osg::RefMatrixf> mGeomToSkelMatrix;
osg::Matrixf mGeomToSkelMatrix;
osg::ref_ptr<InfluenceMap> mInfluenceMap; osg::ref_ptr<InfluenceMap> mInfluenceMap;