move rig update in update thread

OpenMW · Jul 9, 2019 · 3f618fe · 3f618fe
1 parent 1c545c8
commit 3f618fe
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 9 deletions.
diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
@@ -171,29 +171,31 @@ bool RigGeometry::initFromParentSkeleton(osg::NodeVisitor* nv)
     return true;
 }
 
-void RigGeometry::cull(osg::NodeVisitor* nv)
-{
+void RigGeometry::update(osg::NodeVisitor* nv){
+
     if (!mSkeleton)
     {
-        Log(Debug::Error) << "Error: RigGeometry rendering with no skeleton, should have been initialized by UpdateVisitor";
-        // try to recover anyway, though rendering is likely to be incorrect.
-        if (!initFromParentSkeleton(nv))
+         if (!initFromParentSkeleton(nv))
             return;
     }
-
+    //update next frame geom in order not to interfere with draw thread
+    mLastFrameMutex.lock();
     unsigned int traversalNumber = nv->getTraversalNumber();
+
     if (mLastFrameNumber == traversalNumber || (mLastFrameNumber != 0 && !mSkeleton->getActive()))
     {
-        osg::Geometry& geom = *getGeometry(mLastFrameNumber);
+        osg::Geometry& geom = *getGeometry(mLastFrameNumber+1);
+        mLastFrameMutex.unlock();
         nv->pushOntoNodePath(&geom);
         nv->apply(geom);
         nv->popFromNodePath();
         return;
     }
     mLastFrameNumber = traversalNumber;
-    osg::Geometry& geom = *getGeometry(mLastFrameNumber);
+    osg::Geometry& geom = *getGeometry(mLastFrameNumber+1);
 
-    mSkeleton->updateBoneMatrices(traversalNumber);
+    mLastFrameMutex.unlock();
+    mSkeleton->updateBoneMatrices(mLastFrameNumber+1);
 
     // skinning
     const osg::Vec3Array* positionSrc = static_cast<osg::Vec3Array*>(mSourceGeometry->getVertexArray());
@@ -255,6 +257,24 @@ void RigGeometry::cull(osg::NodeVisitor* nv)
     nv->popFromNodePath();
 }
 
+void RigGeometry::cull(osg::NodeVisitor* nv)
+{
+    if (!mSkeleton)
+    {
+        Log(Debug::Error) << "Error: RigGeometry rendering with no skeleton, should have been initialized by UpdateVisitor";
+        // try to recover anyway, though rendering is likely to be incorrect.
+        if (!initFromParentSkeleton(nv))
+            return;
+    }
+
+    osg::Geometry& geom = *getGeometry(mLastFrameNumber);
+
+    nv->pushOntoNodePath(&geom);
+    nv->apply(geom);
+    nv->popFromNodePath();
+
+}
+
 void RigGeometry::updateBounds(osg::NodeVisitor *nv)
 {
     if (!mSkeleton)
@@ -376,7 +396,10 @@ void RigGeometry::accept(osg::NodeVisitor &nv)
     if (nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR)
         cull(&nv);
     else if (nv.getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR)
+    {
+        update(&nv);
         updateBounds(&nv);
+    }
     else
         nv.apply(*this);
 

diff --git a/components/sceneutil/riggeometry.hpp b/components/sceneutil/riggeometry.hpp
@@ -66,6 +66,7 @@ namespace SceneUtil
 
     private:
         void cull(osg::NodeVisitor* nv);
+        void update(osg::NodeVisitor* nv);
         void updateBounds(osg::NodeVisitor* nv);
 
         osg::ref_ptr<osg::Geometry> mGeometry[2];
@@ -101,6 +102,7 @@ namespace SceneUtil
         std::vector<Bone*> mBoneNodesVector;
 
         unsigned int mLastFrameNumber;
+        OpenThreads::Mutex mLastFrameMutex;
         bool mBoundsFirstFrame;
 
         bool initFromParentSkeleton(osg::NodeVisitor* nv);