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

Converted osg::notify to OSG_INFO etc.

Browse Source
This commit is contained in:
Robert Osfield 2010-05-28 17:07:24 +00:00
parent e16268ca76
commit c3d3a36af4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/osgPlugins/scale/ReaderWriterSCALE.cpp
View File

@ -51,7 +51,7 @@ static bool getFilenameAndParams(const std::string& input, std::string& filename
params = input.substr(pos+1, std::string::npos ); params = input.substr(pos+1, std::string::npos );
if( params.empty() ) if( params.empty() )
{ {
osg::notify(osg::WARN) << "Missing parameters for " EXTENSION_NAME " pseudo-loader" << std::endl; OSG_WARN << "Missing parameters for " EXTENSION_NAME " pseudo-loader" << std::endl;
return false; return false;
} }
@ -114,7 +114,7 @@ public:
if( !acceptsExtension(ext) ) if( !acceptsExtension(ext) )
return ReadResult::FILE_NOT_HANDLED; return ReadResult::FILE_NOT_HANDLED;
osg::notify(osg::INFO) << "ReaderWriterSCALE( \"" << fileName << "\" )" << std::endl; OSG_INFO << "ReaderWriterSCALE( \"" << fileName << "\" )" << std::endl;
// strip the pseudo-loader extension // strip the pseudo-loader extension
std::string tmpName = osgDB::getNameLessExtension( fileName ); std::string tmpName = osgDB::getNameLessExtension( fileName );
@ -130,12 +130,12 @@ public:
if( subFileName.empty()) if( subFileName.empty())
{ {
osg::notify(osg::WARN) << "Missing subfilename for " EXTENSION_NAME " pseudo-loader" << std::endl; OSG_WARN << "Missing subfilename for " EXTENSION_NAME " pseudo-loader" << std::endl;
return ReadResult::FILE_NOT_HANDLED; return ReadResult::FILE_NOT_HANDLED;
} }
osg::notify(osg::INFO) << " params = \"" << params << "\"" << std::endl; OSG_INFO << " params = \"" << params << "\"" << std::endl;
osg::notify(osg::INFO) << " subFileName = \"" << subFileName << "\"" << std::endl; OSG_INFO << " subFileName = \"" << subFileName << "\"" << std::endl;
float sx, sy, sz; float sx, sy, sz;
int count = sscanf( params.c_str(), "%f,%f,%f", &sx, &sy, &sz ); int count = sscanf( params.c_str(), "%f,%f,%f", &sx, &sy, &sz );
@ -147,7 +147,7 @@ public:
} }
else if( count != 3 ) else if( count != 3 )
{ {
osg::notify(osg::WARN) << "Bad parameters for " EXTENSION_NAME " pseudo-loader: \"" << params << "\"" << std::endl; OSG_WARN << "Bad parameters for " EXTENSION_NAME " pseudo-loader: \"" << params << "\"" << std::endl;
return ReadResult::FILE_NOT_HANDLED; return ReadResult::FILE_NOT_HANDLED;
} }
@ -156,7 +156,7 @@ public:
if( !node ) if( !node )
{ {
// propagate the read failure upwards // propagate the read failure upwards
osg::notify(osg::WARN) << "Subfile \"" << subFileName << "\" could not be loaded" << std::endl; OSG_WARN << "Subfile \"" << subFileName << "\" could not be loaded" << std::endl;
return ReadResult::FILE_NOT_HANDLED; return ReadResult::FILE_NOT_HANDLED;
} }