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

Fixed warnings.

Browse Source
This commit is contained in:
Robert Osfield
2011-06-16 18:43:58 +00:00
parent d970b9fa5f
commit 4dd0782549
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgPlugins/fbx/ReaderWriterFBX.cpp
View File

@@ -309,7 +309,7 @@ ReaderWriterFBX::readNode(const std::string& filenameInit,
fbxString appName = pDocInfo->LastSaved_ApplicationName.Get();
for (int i = 0; i < sizeof(authoringTools) / sizeof(authoringTools[0]); ++i)
for (unsigned int i = 0; i < sizeof(authoringTools) / sizeof(authoringTools[0]); ++i)
{
if (0 ==
#ifdef WIN32

11
src/osgPlugins/fbx/WriterNodeVisitor.cpp
View File

@@ -37,16 +37,17 @@ public:
ListTriangle& listTriangles,
unsigned int drawable_n,
unsigned int material) :
_drawable_n(drawable_n),
_listTriangles(listTriangles),
_modeCache(0),
_hasNormalCoords(geo->getNormalArray() != NULL),
_hasTexCoords(geo->getTexCoordArray(0) != NULL),
_geo(geo),
_lastFaceIndex(0),
_listTriangles(listTriangles),
_drawable_n(drawable_n),
_material(material),
//_iPrimitiveSet(iPrimitiveSet),
_curNormalIndex(0),
_normalBinding(geo->getNormalBinding())
_normalBinding(geo->getNormalBinding()),
_mesh(0)
{
if (!geo->getNormalArray() || geo->getNormalArray()->getNumElements()==0)
{
@@ -286,9 +287,9 @@ WriterNodeVisitor::Material::Material(WriterNodeVisitor& writerNodeVisitor,
KFbxSdkManager* pSdkManager,
const osgDB::ReaderWriter::Options * options,
int index) :
_index(index),
_fbxMaterial(NULL),
_fbxTexture(NULL),
_index(index),
_osgImage(NULL)
{
osg::Vec4 diffuse(1,1,1,1),

8
src/osgPlugins/fbx/WriterNodeVisitor.h
View File

@@ -76,14 +76,14 @@ class WriterNodeVisitor: public osg::NodeVisitor
const osgDB::ReaderWriter::Options* options,
const std::string& srcDirectory) :
osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN),
_pScene(pScene),
_pSdkManager(pSdkManager),
_succeedLastApply(true),
_pScene(pScene),
_curFbxNode(pScene->GetRootNode()),
_currentStateSet(new osg::StateSet()),
_lastMaterialIndex(0),
_lastMeshIndex(0),
_curFbxNode(pScene->GetRootNode()),
_options(options),
_succeedLastApply(true),
_externalWriter(srcDirectory, osgDB::getFilePath(fileName), true, 0)
{}
@@ -175,7 +175,7 @@ class WriterNodeVisitor: public osg::NodeVisitor
private:
KFbxSurfacePhong* _fbxMaterial;
KFbxFileTexture* _fbxTexture;
KFbxFileTexture* _fbxTexture;
int _index;///< Index in the Map
const osg::Image* _osgImage;
};