FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael PLATINGS
2010-03-19 20:12:19 +00:00
parent f053c6c567
commit 03d5b81a6f
5 changed files with 55 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/osgPlugins/fbx/fbxRNode.cpp
View File

@@ -324,6 +324,7 @@ osgDB::ReaderWriter::ReadResult readFbxNode(
FbxMaterialToOsgStateSet& fbxMaterialToOsgStateSet,
std::map<KFbxNode*, osg::Node*>& nodeMap,
BindMatrixMap& boneBindMatrices,
const std::set<const KFbxNode*>& fbxSkeletons,
std::map<KFbxNode*, osgAnimation::Skeleton*>& skeletonMap,
const osgDB::Options* options)
{
@@ -350,6 +351,11 @@ osgDB::ReaderWriter::ReadResult readFbxNode(
}
}
if (!bIsBone && fbxSkeletons.find(pNode) != fbxSkeletons.end())
{
bIsBone = true;
}
unsigned nMaterials = pNode->GetMaterialCount();
std::vector<StateSetContent > stateSetList;
@@ -377,7 +383,7 @@ osgDB::ReaderWriter::ReadResult readFbxNode(
osgDB::ReaderWriter::ReadResult childResult = readFbxNode(
pSdkManager, pChildNode, pAnimationManager,
bChildIsBone, nLightCount, fbxMaterialToOsgStateSet, nodeMap,
boneBindMatrices, skeletonMap, options);
boneBindMatrices, fbxSkeletons, skeletonMap, options);
if (childResult.error())
{
return childResult;
@@ -425,7 +431,8 @@ osgDB::ReaderWriter::ReadResult readFbxNode(
{
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())
{
return meshRes;
@@ -490,7 +497,7 @@ osgDB::ReaderWriter::ReadResult readFbxNode(
osg::Group* pAddChildrenTo = osgGroup.get();
if (bCreateSkeleton)
{
osgAnimation::Skeleton* osgSkeleton = getSkeleton(pNode, skeletonMap);
osgAnimation::Skeleton* osgSkeleton = getSkeleton(pNode, fbxSkeletons, skeletonMap);
osgSkeleton->setDefaultUpdateCallback();
pAddChildrenTo->addChild(osgSkeleton);
pAddChildrenTo = osgSkeleton;
@@ -510,12 +517,14 @@ osgDB::ReaderWriter::ReadResult readFbxNode(
}
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();
}