Changeset 11153

Timestamp:

03/04/10 17:27:19 (3 years ago)

Author:

mplatings

Message:

Fix for some FBX files with multiple meshes bound to a bone.

Location:

OpenSceneGraph/trunk/src/osgPlugins/fbx

Files:

• ReaderWriterFBX.cpp (modified) (4 diffs)
• fbxRMesh.cpp (modified) (5 diffs)
• fbxRMesh.h (modified) (2 diffs)
• fbxRNode.cpp (modified) (1 diff)
• fbxRNode.h (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgPlugins/fbx/ReaderWriterFBX.cpp

@@ -15 +15 @@
 #include <osgAnimation/AnimationManagerBase>
 #include <osgAnimation/Bone>
+#include <osgAnimation/RigGeometry>
 #include <osgAnimation/Skeleton>
+#include <osgAnimation/VertexInfluence>
 
 #if defined(_MSC_VER)
@@ -96 +98 @@
     }
 };
+
+void resolveBindMatrices(
+    osg::Node& root,
+    const BindMatrixMap& boneBindMatrices,
+    const std::map<KFbxNode*, osg::Node*>& nodeMap)
+{
+    std::set<std::string> nodeNames;
+    for (std::map<KFbxNode*, osg::Node*>::const_iterator it = nodeMap.begin(); it != nodeMap.end(); ++it)
+    {
+        nodeNames.insert(it->second->getName());
+    }
+
+    for (BindMatrixMap::const_iterator it = boneBindMatrices.begin();
+        it != boneBindMatrices.end();)
+    {
+        KFbxNode* const fbxBone = it->first.first;
+        std::map<KFbxNode*, osg::Node*>::const_iterator nodeIt = nodeMap.find(fbxBone);
+        if (nodeIt != nodeMap.end())
+        {
+            const osg::Matrix bindMatrix = it->second;
+            osgAnimation::Bone& osgBone = dynamic_cast<osgAnimation::Bone&>(*nodeIt->second);
+            osgBone.setInvBindMatrixInSkeletonSpace(bindMatrix);
+
+            ++it;
+            for (; it != boneBindMatrices.end() && it->first.first == fbxBone; ++it)
+            {
+                if (it->second != bindMatrix)
+                {
+                    std::string name;
+                    for (int i = 0;; ++i)
+                    {
+                        std::stringstream ss;
+                        ss << osgBone.getName() << '_' << i;
+                        name = ss.str();
+                        if (nodeNames.insert(name).second)
+                        {
+                            break;
+                        }
+                    }
+                    osgAnimation::Bone* newBone = new osgAnimation::Bone(name);
+                    newBone->setDefaultUpdateCallback();
+                    newBone->setInvBindMatrixInSkeletonSpace(it->second);
+                    osgBone.addChild(newBone);
+
+                    osgAnimation::RigGeometry* pRigGeometry = it->first.second;
+                    
+                    osgAnimation::VertexInfluenceMap* vertexInfluences = pRigGeometry->getInfluenceMap();
+
+                    osgAnimation::VertexInfluenceMap::iterator vimIt = vertexInfluences->find(osgBone.getName());
+                    if (vimIt != vertexInfluences->end())
+                    {
+                        osgAnimation::VertexInfluence vi;
+                        vi.swap(vimIt->second);
+                        vertexInfluences->erase(vimIt);
+                        osgAnimation::VertexInfluence& vi2 = (*vertexInfluences)[name];
+                        vi.swap(vi2);
+                        vi2.setName(name);
+                    }
+                    else
+                    {
+                        assert(0);
+                    }
+                }
+            }
+        }
+        else
+        {
+            assert(0);
+        }
+    }
+}
 
 osgDB::ReaderWriter::ReadResult
@@ -190 +263 @@
 
             std::map<KFbxNode*, osg::Node*> nodeMap;
-            std::map<KFbxNode*, osg::Matrix> boneBindMatrices;
+            BindMatrixMap boneBindMatrices;
             std::map<KFbxNode*, osgAnimation::Skeleton*> skeletonMap;
             ReadResult res = readFbxNode(*pSdkManager, pNode, pAnimationManager,
@@ -198 +271 @@
             if (res.success())
             {
-                for (std::map<KFbxNode*, osg::Matrix>::const_iterator it = boneBindMatrices.begin();
-                    it != boneBindMatrices.end(); ++it)
-                {
-                    std::map<KFbxNode*, osg::Node*>::iterator nodeIt = nodeMap.find(it->first);
-                    if (nodeIt != nodeMap.end())
-                    {
-                        osgAnimation::Bone& osgBone = dynamic_cast<osgAnimation::Bone&>(*nodeIt->second);
-                        osgBone.setInvBindMatrixInSkeletonSpace(it->second);
-                    }
-                    else
-                    {
-                        assert(0);
-                    }
-                }
+                resolveBindMatrices(*res.getNode(), boneBindMatrices, nodeMap);
 
                 osg::Node* osgNode = res.getNode();

OpenSceneGraph/trunk/src/osgPlugins/fbx/fbxRMesh.cpp

@@ -261 +261 @@
 }
 
+void addBindMatrix(
+    BindMatrixMap& boneBindMatrices,
+    KFbxNode* pBone,
+    const osg::Matrix& bindMatrix,
+    osgAnimation::RigGeometry* pRigGeometry)
+{
+    boneBindMatrices.insert(BindMatrixMap::value_type(
+        BindMatrixMap::key_type(pBone, pRigGeometry), bindMatrix));
+}
+
 osgDB::ReaderWriter::ReadResult readMesh(KFbxSdkManager& pSdkManager,
     KFbxNode* pNode, KFbxMesh* fbxMesh,
@@ -266 +276 @@
     std::vector<StateSetContent>& stateSetList,
     const char* szName,
-    std::map<KFbxNode*, osg::Matrix>& boneBindMatrices,
+    BindMatrixMap& boneBindMatrices,
     std::map<KFbxNode*, osgAnimation::Skeleton*>& skeletonMap)
 {
@@ -441 +451 @@
                 KFbxXMatrix transformLinkInverse = transformLink.Inverse();
                 const double* pTransformLinkInverse = transformLinkInverse;
-                if (!boneBindMatrices.insert(std::pair<KFbxNode*, osg::Matrix>(pBone, osg::Matrix(pTransformLinkInverse))).second)
-                {
-                    osg::notify(osg::WARN) << "Multiple meshes attached to a bone - bind matrices may be incorrect." << std::endl;
-                }
+                osg::Matrix bindMatrix(pTransformLinkInverse);
 
                 int nIndices = pCluster->GetControlPointIndicesCount();
@@ -464 +471 @@
                             dynamic_cast<osgAnimation::RigGeometry&>(
                             *old2newGeometryMap[gi.first]);
+                        addBindMatrix(boneBindMatrices, pBone, bindMatrix, &rig);
                         osgAnimation::VertexInfluenceMap& vim =
                             *rig.getInfluenceMap();
@@ -604 +612 @@
     osg::ref_ptr<osgAnimation::AnimationManagerBase>& pAnimationManager,
     std::vector<StateSetContent>& stateSetList,
-    std::map<KFbxNode*, osg::Matrix>& boneBindMatrices,
+    BindMatrixMap& boneBindMatrices,
     std::map<KFbxNode*, osgAnimation::Skeleton*>& skeletonMap)
 {

OpenSceneGraph/trunk/src/osgPlugins/fbx/fbxRMesh.h

@@ -5 +5 @@
 #include <osgDB/ReaderWriter>
 #include <osg/Material>
-#include "fbxMaterialToOsgStateSet.h"
+#include "fbxRNode.h"
 osgDB::ReaderWriter::ReadResult readFbxMesh(
     FBXFILESDK_NAMESPACE::KFbxSdkManager& pSdkManager,
@@ -11 +11 @@
     osg::ref_ptr<osgAnimation::AnimationManagerBase>& pAnimationManager,
     std::vector<StateSetContent>&,
-    std::map<KFbxNode*, osg::Matrix>& boneBindMatrices,
+    BindMatrixMap& boneBindMatrices,
     std::map<KFbxNode*, osgAnimation::Skeleton*>& skeletonMap);
 

OpenSceneGraph/trunk/src/osgPlugins/fbx/fbxRNode.cpp

@@ -324 +324 @@
     FbxMaterialToOsgStateSet& fbxMaterialToOsgStateSet,
     std::map<KFbxNode*, osg::Node*>& nodeMap,
-    std::map<KFbxNode*, osg::Matrix>& boneBindMatrices,
+    BindMatrixMap& boneBindMatrices,
     std::map<KFbxNode*, osgAnimation::Skeleton*>& skeletonMap,
     const osgDB::Options* options)

OpenSceneGraph/trunk/src/osgPlugins/fbx/fbxRNode.h

@@ -6 +6 @@
 {
     class AnimationManagerBase;
+    class RigGeometry;
 }
+
+typedef std::map<std::pair<KFbxNode*, osgAnimation::RigGeometry*>, osg::Matrix> BindMatrixMap;
 
 osgAnimation::Skeleton* getSkeleton(KFbxNode*, std::map<KFbxNode*, osgAnimation::Skeleton*>&);
@@ -18 +21 @@
     FbxMaterialToOsgStateSet& fbxMaterialToOsgStateSet,
     std::map<KFbxNode*, osg::Node*>& nodeMap,
-    std::map<KFbxNode*, osg::Matrix>& boneBindMatrices,
+    BindMatrixMap& boneBindMatrices,
     std::map<KFbxNode*, osgAnimation::Skeleton*>& skeletonMap,
     const osgDB::Options* options = NULL);