Show
Ignore:
Timestamp:
09/19/14 12:35:23 (11 days ago)
Author:
robert
Message:

Moved widgets from VolumeEditorWidget? to TransferFunctionWidget?, and widget utilities into WidgetUtils?.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/fbx/fbxReader.h

    r12337 r13466  
    22#define FBXRANIMATION_H 
    33 
    4 #include <fbxfilesdk/fbxfilesdk_def.h> 
     4#include <fbxsdk.h> 
    55#include <osgDB/ReaderWriter> 
    66#include <osgAnimation/BasicAnimationManager> 
     
    1414} 
    1515 
    16 typedef std::map<std::pair<KFbxNode*, osgAnimation::RigGeometry*>, osg::Matrix> BindMatrixMap; 
     16typedef std::map<std::pair<FbxNode*, osgAnimation::RigGeometry*>, osg::Matrix> BindMatrixMap; 
    1717 
    1818class OsgFbxReader 
    1919{ 
    2020public: 
    21     KFbxSdkManager& pSdkManager; 
    22     KFbxScene& fbxScene; 
     21    FbxManager& pSdkManager; 
     22    FbxScene& fbxScene; 
    2323    osg::ref_ptr<osgAnimation::AnimationManagerBase> pAnimationManager; 
    2424    FbxMaterialToOsgStateSet& fbxMaterialToOsgStateSet; 
    25     std::map<KFbxNode*, osg::Node*> nodeMap; 
     25    std::map<FbxNode*, osg::Node*> nodeMap; 
    2626    BindMatrixMap boneBindMatrices; 
    27     const std::set<const KFbxNode*>& fbxSkeletons; 
    28     std::map<KFbxNode*, osgAnimation::Skeleton*> skeletonMap; 
     27    const std::set<const FbxNode*>& fbxSkeletons; 
     28    std::map<FbxNode*, osgAnimation::Skeleton*> skeletonMap; 
    2929    const osgDB::Options& options; 
    3030    bool lightmapTextures, tessellatePolygons; 
     
    3838 
    3939    OsgFbxReader( 
    40         KFbxSdkManager& pSdkManager1, 
    41         KFbxScene& fbxScene1, 
     40        FbxManager& pSdkManager1, 
     41        FbxScene& fbxScene1, 
    4242        FbxMaterialToOsgStateSet& fbxMaterialToOsgStateSet1, 
    43         const std::set<const KFbxNode*>& fbxSkeletons1, 
     43        const std::set<const FbxNode*>& fbxSkeletons1, 
    4444        const osgDB::Options& options1, 
    4545        AuthoringTool authoringTool1, 
     
    5757 
    5858    osgDB::ReaderWriter::ReadResult readFbxNode( 
    59         KFbxNode*, bool& bIsBone, int& nLightCount); 
     59        FbxNode*, bool& bIsBone, int& nLightCount); 
    6060 
    6161    std::string readFbxAnimation( 
    62         KFbxNode*, const char* targetName); 
     62        FbxNode*, const char* targetName); 
    6363 
    6464    osgDB::ReaderWriter::ReadResult readFbxCamera( 
    65         KFbxNode* pNode); 
     65        FbxNode* pNode); 
    6666 
    6767    osgDB::ReaderWriter::ReadResult readFbxLight( 
    68         KFbxNode* pNode, int& nLightCount); 
     68        FbxNode* pNode, int& nLightCount); 
    6969 
    7070    osgDB::ReaderWriter::ReadResult readMesh( 
    71         KFbxNode* pNode, KFbxMesh* fbxMesh, 
     71        FbxNode* pNode, FbxMesh* fbxMesh, 
    7272        std::vector<StateSetContent>& stateSetList, 
    7373        const char* szName); 
    7474 
    7575    osgDB::ReaderWriter::ReadResult readFbxMesh( 
    76         KFbxNode* pNode, 
     76        FbxNode* pNode, 
    7777        std::vector<StateSetContent>&); 
    7878}; 
    7979 
    80 osgAnimation::Skeleton* getSkeleton(KFbxNode*, 
    81     const std::set<const KFbxNode*>& fbxSkeletons, 
    82     std::map<KFbxNode*, osgAnimation::Skeleton*>&); 
     80osgAnimation::Skeleton* getSkeleton(FbxNode*, 
     81    const std::set<const FbxNode*>& fbxSkeletons, 
     82    std::map<FbxNode*, osgAnimation::Skeleton*>&); 
    8383 
    8484#endif