mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-06 00:55:50 +00:00
Code Issues Projects Releases Wiki Activity

optimises riggeometry.cpp (#3165)

Browse Source 
We skip this during node path iterations. this is not a node we are interested in.
We avoid allocating a new mGeomToSkelMatrix per frame and avoid a ref_ptr associated with its update.
We speed up a search for the Skeleton node by adding a continue; condition prior to an expensive dynamic_cast.
This commit is contained in:
Bo Svensson 2021-10-10 16:37:34 +00:00 committed by GitHub
parent af759683b8
commit c2d836c6c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/sceneutil/riggeometry.cpp
View File

@ -3,6 +3,7 @@
#include <osg/Version>
#include <components/debug/debuglog.hpp>
#include <osg/MatrixTransform>
#include "skeleton.hpp"
#include "util.hpp"
@ -114,9 +115,11 @@ osg::ref_ptr<osg::Geometry> RigGeometry::getSourceGeometry() const
bool RigGeometry::initFromParentSkeleton(osg::NodeVisitor* nv)
{
const osg::NodePath& path = nv->getNodePath();
for (osg::NodePath::const_reverse_iterator it = path.rbegin(); it != path.rend(); ++it)
for (osg::NodePath::const_reverse_iterator it = path.rbegin()+1; it != path.rend(); ++it)
{
osg::Node* node = *it;
if (node->asTransform())
continue;
if (Skeleton* skel = dynamic_cast<Skeleton*>(node))
{
mSkeleton = skel;
@ -310,8 +313,10 @@ void RigGeometry::updateBounds(osg::NodeVisitor *nv)
void RigGeometry::updateGeomToSkelMatrix(const osg::NodePath& nodePath)
{
bool foundSkel = false;
osg::ref_ptr<osg::RefMatrix> geomToSkelMatrix;
for (osg::NodePath::const_iterator it = nodePath.begin(); it != nodePath.end(); ++it)
osg::RefMatrix* geomToSkelMatrix = mGeomToSkelMatrix;
if (geomToSkelMatrix)
geomToSkelMatrix->makeIdentity();
for (osg::NodePath::const_iterator it = nodePath.begin(); it != nodePath.end()-1; ++it)
{
osg::Node* node = *it;
if (!foundSkel)
@ -323,14 +328,15 @@ void RigGeometry::updateGeomToSkelMatrix(const osg::NodePath& nodePath)
{
if (osg::Transform* trans = node->asTransform())
{
osg::MatrixTransform* matrixTrans = trans->asMatrixTransform();
if (matrixTrans && matrixTrans->getMatrix().isIdentity())
continue;
if (!geomToSkelMatrix)
geomToSkelMatrix = new osg::RefMatrix;
geomToSkelMatrix = mGeomToSkelMatrix = new osg::RefMatrix;
trans->computeWorldToLocalMatrix(*geomToSkelMatrix, nullptr);
}
}
}
if (geomToSkelMatrix && !geomToSkelMatrix->isIdentity())
mGeomToSkelMatrix = geomToSkelMatrix;
}
void RigGeometry::setInfluenceMap(osg::ref_ptr<InfluenceMap> influenceMap)