From 6d5aa272fc50e0410cbcabdf7109daf9bd739b91 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 22 Nov 2015 19:49:11 +0100
Subject: [PATCH] RigGeometry: do not update the geomToSkelMatrix more than
 once per frame

---
 components/sceneutil/riggeometry.cpp | 14 ++++++--------
 components/sceneutil/riggeometry.hpp |  4 +++-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index bd24ba785f..2de6bc1ad0 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -224,8 +224,6 @@ void RigGeometry::update(osg::NodeVisitor* nv)
 
     mSkeleton->updateBoneMatrices(nv);
 
-    osg::Matrixf geomToSkel = getGeomToSkelMatrix(nv);
-
     // skinning
     osg::Vec3Array* positionSrc = static_cast<osg::Vec3Array*>(mSourceGeometry->getVertexArray());
     osg::Vec3Array* normalSrc = static_cast<osg::Vec3Array*>(mSourceGeometry->getNormalArray());
@@ -248,7 +246,7 @@ void RigGeometry::update(osg::NodeVisitor* nv)
             const osg::Matrixf& boneMatrix = bone->mMatrixInSkeletonSpace;
             accumulateMatrix(invBindMatrix, boneMatrix, weight, resultMat);
         }
-        resultMat = resultMat * geomToSkel;
+        resultMat = resultMat * mGeomToSkelMatrix;
 
         for (std::vector<unsigned short>::const_iterator vertexIt = it->second.begin(); vertexIt != it->second.end(); ++vertexIt)
         {
@@ -276,13 +274,14 @@ void RigGeometry::updateBounds(osg::NodeVisitor *nv)
 
     mSkeleton->updateBoneMatrices(nv);
 
-    osg::Matrixf geomToSkel = getGeomToSkelMatrix(nv);
+    updateGeomToSkelMatrix(nv);
+
     osg::BoundingBox box;
     for (BoneSphereMap::const_iterator it = mBoneSphereMap.begin(); it != mBoneSphereMap.end(); ++it)
     {
         Bone* bone = it->first;
         osg::BoundingSpheref bs = it->second;
-        transformBoundingSphere(bone->mMatrixInSkeletonSpace * geomToSkel, bs);
+        transformBoundingSphere(bone->mMatrixInSkeletonSpace * mGeomToSkelMatrix, bs);
         box.expandBy(bs);
     }
 
@@ -297,7 +296,7 @@ void RigGeometry::updateBounds(osg::NodeVisitor *nv)
         getParent(i)->dirtyBound();
 }
 
-osg::Matrixf RigGeometry::getGeomToSkelMatrix(osg::NodeVisitor *nv)
+void RigGeometry::updateGeomToSkelMatrix(osg::NodeVisitor *nv)
 {
     osg::NodePath path;
     bool foundSkel = false;
@@ -311,8 +310,7 @@ osg::Matrixf RigGeometry::getGeomToSkelMatrix(osg::NodeVisitor *nv)
         else
             path.push_back(*it);
     }
-    return osg::computeWorldToLocal(path);
-
+    mGeomToSkelMatrix = osg::computeWorldToLocal(path);
 }
 
 void RigGeometry::setInfluenceMap(osg::ref_ptr<InfluenceMap> influenceMap)
diff --git a/components/sceneutil/riggeometry.hpp b/components/sceneutil/riggeometry.hpp
index e51fc0cf69..0a39fcde2e 100644
--- a/components/sceneutil/riggeometry.hpp
+++ b/components/sceneutil/riggeometry.hpp
@@ -48,6 +48,8 @@ namespace SceneUtil
         osg::ref_ptr<osg::Geometry> mSourceGeometry;
         Skeleton* mSkeleton;
 
+        osg::Matrixf mGeomToSkelMatrix;
+
         osg::ref_ptr<InfluenceMap> mInfluenceMap;
 
         typedef std::pair<Bone*, osg::Matrixf> BoneBindMatrixPair;
@@ -69,7 +71,7 @@ namespace SceneUtil
 
         bool initFromParentSkeleton(osg::NodeVisitor* nv);
 
-        osg::Matrixf getGeomToSkelMatrix(osg::NodeVisitor* nv);
+        void updateGeomToSkelMatrix(osg::NodeVisitor* nv);
     };
 
 }