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

From Per Fahlberg, "Attached is a fix for loading the same file multiple times with the

Browse Source 
COLLADA plugin. dae->load will not return DAE_OK the second time a model is loaded, so a
second check for DAE_ERR_COLLECTION_ALREADY_EXISTS has been added."
This commit is contained in:
Robert Osfield 2006-10-02 13:24:39 +00:00
parent 3bfa8a27a8
commit e3478069b4
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/osgPlugins/dae/daeReader.cpp
View File

@ -19,11 +19,11 @@
using namespace osgdae; using namespace osgdae;
daeReader::daeReader(DAE *dae_) : dae(dae_), daeReader::daeReader(DAE *dae_) : dae(dae_),
rootNode(NULL), rootNode(NULL),
m_numlights(0), m_numlights(0),
currentEffect(NULL), currentEffect(NULL),
geometryMap(), geometryMap(),
materialMap() materialMap()
{ {
} }
@ -42,7 +42,9 @@ bool daeReader::convert( const std::string &fileURI )
{ {
fURI = fileURI; fURI = fileURI;
} }
if( dae->load( fURI.c_str() ) != DAE_OK ) daeInt res = dae->load( fURI.c_str() );
if( res != DAE_OK && res != DAE_ERR_COLLECTION_ALREADY_EXISTS)
{ {
osg::notify( osg::WARN ) << "Load failed in COLLADA DOM" << std::endl; osg::notify( osg::WARN ) << "Load failed in COLLADA DOM" << std::endl;
return false; return false;