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 16:30:58 +00:00
parent 50c577f602
commit 438c8e7dc4
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgPlugins/bsp/VBSPEntity.cpp
View File

@@ -560,8 +560,8 @@ ref_ptr<Group> VBSPEntity::createModelGeometry()
}
else
{
notify(WARN) << "Couldn't find prop \"" << entity_model << "\".";
notify(WARN) << std::endl;
OSG_WARN << "Couldn't find prop \"" << entity_model << "\".";
OSG_WARN << std::endl;
// Leave the group empty (no model to show)
entityGroup = NULL;

26
src/osgPlugins/bsp/VBSPReader.cpp
View File

@@ -618,8 +618,8 @@ ref_ptr<Texture> VBSPReader::readTextureFile(std::string textureName)
else
{
// We were unable to find the texture file
notify(WARN) << "Couldn't find texture " << textureName;
notify(WARN) << std::endl;
OSG_WARN << "Couldn't find texture " << textureName;
OSG_WARN << std::endl;
// No texture
texture = NULL;
@@ -628,8 +628,8 @@ ref_ptr<Texture> VBSPReader::readTextureFile(std::string textureName)
else
{
// We were unable to find the texture file
notify(WARN) << "Couldn't find texture " << textureName;
notify(WARN) << std::endl;
OSG_WARN << "Couldn't find texture " << textureName;
OSG_WARN << std::endl;
// No texture
texture = NULL;
@@ -692,7 +692,7 @@ ref_ptr<StateSet> VBSPReader::readMaterialFile(std::string materialName)
else
{
// Didn't find the material file, so return NULL
notify(WARN) << "Can't find material " << materialName << std::endl;
OSG_WARN << "Can't find material " << materialName << std::endl;
return NULL;
}
@@ -719,8 +719,8 @@ ref_ptr<StateSet> VBSPReader::readMaterialFile(std::string materialName)
if (!found)
{
mtlFile->close();
notify(WARN) << "Material " << materialName << " isn't valid.";
notify(WARN) << std::endl;
OSG_WARN << "Material " << materialName << " isn't valid.";
OSG_WARN << std::endl;
return NULL;
}
@@ -904,8 +904,8 @@ ref_ptr<StateSet> VBSPReader::readMaterialFile(std::string materialName)
}
else
{
notify(WARN) << "No base texture for material " << materialName;
notify(WARN) << std::endl;
OSG_WARN << "No base texture for material " << materialName;
OSG_WARN << std::endl;
stateSet->setTextureMode(0, GL_TEXTURE_2D, StateAttribute::OFF);
}
}
@@ -955,8 +955,8 @@ ref_ptr<StateSet> VBSPReader::readMaterialFile(std::string materialName)
}
else
{
notify(WARN) << "No base texture for material " << materialName;
notify(WARN) << std::endl;
OSG_WARN << "No base texture for material " << materialName;
OSG_WARN << std::endl;
stateSet->setTextureMode(0, GL_TEXTURE_2D, StateAttribute::OFF);
}
}
@@ -1109,8 +1109,8 @@ void VBSPReader::createScene()
}
else
{
notify(WARN) << "Couldn't find static prop \"" << propModel;
notify(WARN) << "\"." << std::endl;
OSG_WARN << "Couldn't find static prop \"" << propModel;
OSG_WARN << "\"." << std::endl;
// Couldn't find the prop, so get rid of the transform node
propXform = NULL;