Changeset 11262

Timestamp:

03/19/10 21:12:19 (3 years ago)

Author:

mplatings

Message:

Workaround for files exported from SoftImage? that don't tag skeleton nodes correctly.

Location:

OpenSceneGraph/trunk/src/osgPlugins/fbx

Files:

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

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

@@ -98 +98 @@
 };
 
+//Some files don't correctly mark their skeleton nodes, so this function infers
+//them from the nodes that skin deformers linked to.
+void findLinkedFbxSkeletonNodes(KFbxNode* pNode, std::set<const KFbxNode*>& fbxSkeletons)
+{
+    if (const KFbxGeometry* pMesh = dynamic_cast<const KFbxGeometry*>(pNode->GetNodeAttribute()))
+    {
+        for (int i = 0; i < pMesh->GetDeformerCount(KFbxDeformer::eSKIN); ++i)
+        {
+            const KFbxSkin* pSkin = (const KFbxSkin*)pMesh->GetDeformer(i, KFbxDeformer::eSKIN);
+
+            for (int j = 0; j < pSkin->GetClusterCount(); ++j)
+            {
+                const KFbxNode* pSkeleton = pSkin->GetCluster(j)->GetLink();
+                fbxSkeletons.insert(pSkeleton);
+            }
+        }
+    }
+
+    for (int i = 0; i < pNode->GetChildCount(); ++i)
+    {
+        findLinkedFbxSkeletonNodes(pNode->GetChild(i), fbxSkeletons);
+    }
+}
+
 void resolveBindMatrices(
     osg::Node& root,
@@ -142 +166 @@
 
                     osgAnimation::RigGeometry* pRigGeometry = it->first.second;
-                    
+
                     osgAnimation::VertexInfluenceMap* vertexInfluences = pRigGeometry->getInfluenceMap();
 
@@ -262 +286 @@
             FbxMaterialToOsgStateSet fbxMaterialToOsgStateSet(filePath, localOptions.get());
 
+            std::set<const KFbxNode*> fbxSkeletons;
+            findLinkedFbxSkeletonNodes(pNode, fbxSkeletons);
+
             std::map<KFbxNode*, osg::Node*> nodeMap;
             BindMatrixMap boneBindMatrices;
@@ -267 +294 @@
             ReadResult res = readFbxNode(*pSdkManager, pNode, pAnimationManager,
                 bIsBone, nLightCount, fbxMaterialToOsgStateSet, nodeMap,
-                boneBindMatrices, skeletonMap, localOptions.get());
+                boneBindMatrices, fbxSkeletons, skeletonMap, localOptions.get());
 
             if (res.success())

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

@@ -293 +293 @@
     const char* szName,
     BindMatrixMap& boneBindMatrices,
+    const std::set<const KFbxNode*>& fbxSkeletons,
     std::map<KFbxNode*, osgAnimation::Skeleton*>& skeletonMap)
 {
@@ -300 +301 @@
     pGeode->setName(szName);
 
-    const KFbxLayer* pFbxLayer = 0;
+    const KFbxLayer* pFbxLayer = fbxMesh->GetLayer(0);
     const KFbxLayerElementNormal* pFbxNormals = 0;
     const KFbxLayerElementUV* pFbxUVs = 0;
@@ -308 +309 @@
     const KFbxVector4* pFbxVertices = fbxMesh->GetControlPoints();
 
-    if (pFbxLayer = fbxMesh->GetLayer(0))
+    if (pFbxLayer)
     {
         pFbxNormals = pFbxLayer->GetNormals();
@@ -615 +616 @@
         if (pSkin->GetClusterCount())
         {
-            osgAnimation::Skeleton* pSkeleton = getSkeleton(pSkin->GetCluster(0)->GetLink(), skeletonMap);
+            osgAnimation::Skeleton* pSkeleton = getSkeleton(
+                pSkin->GetCluster(0)->GetLink(), fbxSkeletons, skeletonMap);
             pSkeleton->addChild(pResult);
             return osgDB::ReaderWriter::ReadResult::FILE_LOADED;
@@ -629 +631 @@
     std::vector<StateSetContent>& stateSetList,
     BindMatrixMap& boneBindMatrices,
+    const std::set<const KFbxNode*>& fbxSkeletons,
     std::map<KFbxNode*, osgAnimation::Skeleton*>& skeletonMap)
 {
@@ -639 +642 @@
 
     return readMesh(pSdkManager, pNode, lMesh, pAnimationManager, stateSetList,
-        pNode->GetName(), boneBindMatrices, skeletonMap);
-}
+        pNode->GetName(), boneBindMatrices, fbxSkeletons, skeletonMap);
+}

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

@@ -12 +12 @@
     std::vector<StateSetContent>&,
     BindMatrixMap& boneBindMatrices,
+    const std::set<const KFbxNode*>& fbxSkeletons,
     std::map<KFbxNode*, osgAnimation::Skeleton*>& skeletonMap);
 

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

@@ -325 +325 @@
     std::map<KFbxNode*, osg::Node*>& nodeMap,
     BindMatrixMap& boneBindMatrices,
+    const std::set<const KFbxNode*>& fbxSkeletons,
     std::map<KFbxNode*, osgAnimation::Skeleton*>& skeletonMap,
     const osgDB::Options* options)
@@ -349 +350 @@
             bIsBone = true;
         }
+    }
+
+    if (!bIsBone && fbxSkeletons.find(pNode) != fbxSkeletons.end())
+    {
+        bIsBone = true;
     }
 
@@ -378 +384 @@
             pSdkManager, pChildNode, pAnimationManager,
             bChildIsBone, nLightCount, fbxMaterialToOsgStateSet, nodeMap,
-            boneBindMatrices, skeletonMap, options);
+            boneBindMatrices, fbxSkeletons, skeletonMap, options);
         if (childResult.error())
         {
@@ -426 +432 @@
             size_t bindMatrixCount = boneBindMatrices.size();
             osgDB::ReaderWriter::ReadResult meshRes = readFbxMesh(pSdkManager,
-                pNode, pAnimationManager, stateSetList, boneBindMatrices, skeletonMap);
+                pNode, pAnimationManager, stateSetList, boneBindMatrices,
+                fbxSkeletons, skeletonMap);
             if (meshRes.error())
             {
@@ -491 +498 @@
     if (bCreateSkeleton)
     {
-        osgAnimation::Skeleton* osgSkeleton = getSkeleton(pNode, skeletonMap);
+        osgAnimation::Skeleton* osgSkeleton = getSkeleton(pNode, fbxSkeletons, skeletonMap);
         osgSkeleton->setDefaultUpdateCallback();
         pAddChildrenTo->addChild(osgSkeleton);
@@ -511 +518 @@
 
 osgAnimation::Skeleton* getSkeleton(KFbxNode* fbxNode,
+    const std::set<const KFbxNode*>& fbxSkeletons,
     std::map<KFbxNode*, osgAnimation::Skeleton*>& skeletonMap)
 {
     //Find the first non-skeleton ancestor of the node.
     while (fbxNode &&
-        fbxNode->GetNodeAttribute() &&
-        fbxNode->GetNodeAttribute()->GetAttributeType() == KFbxNodeAttribute::eSKELETON)
+        ((fbxNode->GetNodeAttribute() &&
+        fbxNode->GetNodeAttribute()->GetAttributeType() == KFbxNodeAttribute::eSKELETON) ||
+        fbxSkeletons.find(fbxNode) != fbxSkeletons.end()))
     {
         fbxNode = fbxNode->GetParent();

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

@@ -11 +11 @@
 typedef std::map<std::pair<KFbxNode*, osgAnimation::RigGeometry*>, osg::Matrix> BindMatrixMap;
 
-osgAnimation::Skeleton* getSkeleton(KFbxNode*, std::map<KFbxNode*, osgAnimation::Skeleton*>&);
+osgAnimation::Skeleton* getSkeleton(KFbxNode*,
+    const std::set<const KFbxNode*>& fbxSkeletons,
+    std::map<KFbxNode*, osgAnimation::Skeleton*>&);
 
 osgDB::ReaderWriter::ReadResult readFbxNode(
@@ -22 +24 @@
     std::map<KFbxNode*, osg::Node*>& nodeMap,
     BindMatrixMap& boneBindMatrices,
+    const std::set<const KFbxNode*>& fbxSkeletons,
     std::map<KFbxNode*, osgAnimation::Skeleton*>& skeletonMap,
     const osgDB::Options* options = NULL);