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:10:57 +00:00
parent 08e6d2e3c1
commit cb80a312e1
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgPlugins/txp/ReaderWriterTXP.cpp
View File

@@ -20,7 +20,7 @@
#include "TXPSeamLOD.h"
#include "TileMapper.h"
#define ReaderWriterTXPERROR(s) osg::notify(osg::NOTICE) << "txp::ReaderWriterTXP::" << (s) << " error: "
#define ReaderWriterTXPERROR(s) OSG_NOTICE << "txp::ReaderWriterTXP::" << (s) << " error: "
@@ -435,7 +435,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterTXP::local_readNode(const std::strin
}
}
//osg::notify(osg::NOTICE) << "Subtiles for " << x << " " << y << " " << lod << " lodaded" << std::endl;
//OSG_NOTICE << "Subtiles for " << x << " " << y << " " << lod << " lodaded" << std::endl;
return subtiles.get();
}
@@ -626,7 +626,7 @@ osg::ref_ptr< TXPArchive > ReaderWriterTXP::getArchive(int id, const std::string
bool ReaderWriterTXP::removeArchive( int id )
{
osg::notify(osg::INFO)<<"ReaderWriterTXP::removeArchive(id="<<id<<")"<<std::endl;
OSG_INFO<<"ReaderWriterTXP::removeArchive(id="<<id<<")"<<std::endl;
return (_archives.erase(id) >= 1);
}

20
src/osgPlugins/txp/TXPArchive.cpp
View File

@@ -38,7 +38,7 @@
using namespace txp;
#define TXPArchiveERROR(s) osg::notify(osg::NOTICE) << "txp::TXPArchive::" << (s) << " error: "
#define TXPArchiveERROR(s) OSG_NOTICE << "txp::TXPArchive::" << (s) << " error: "
void TXPArchive::SetTexMap(int key,osg::ref_ptr<osg::Texture2D> ref)
@@ -398,7 +398,7 @@ bool TXPArchive::loadTexture(int i)
}
else
{
osg::notify(osg::WARN) << "TrPageArchive::LoadMaterials() error: "
OSG_WARN << "TrPageArchive::LoadMaterials() error: "
<< "couldn't open image: " << filename << std::endl;
}
SetTexMap(i,osg_texture);
@@ -437,7 +437,7 @@ bool TXPArchive::loadModel(int ix)
osg::Node *osg_model = osgDB::readNodeFile( name );
if ( !osg_model )
{
osg::notify(osg::WARN) << "TrPageArchive::LoadModels() error: "
OSG_WARN << "TrPageArchive::LoadModels() error: "
<< "failed to load model: "
<< name << std::endl;
}
@@ -458,7 +458,7 @@ bool TXPArchive::loadModel(int ix)
bool TXPArchive::loadModels()
{
osg::notify(osg::INFO) << "txp:: Loading models ..." << std::endl;
OSG_INFO << "txp:: Loading models ..." << std::endl;
int numModel;
modelTable.GetNumModels(numModel);
@@ -470,13 +470,13 @@ bool TXPArchive::loadModels()
{
loadModel(itr->first);
}
osg::notify(osg::INFO) << "txp:: ... done." << std::endl;
OSG_INFO << "txp:: ... done." << std::endl;
return true;
}
bool TXPArchive::loadLightAttributes()
{
osg::notify(osg::INFO) << "txp:: Loading light attributes ..." << std::endl;
OSG_INFO << "txp:: Loading light attributes ..." << std::endl;
trpgLightTable::LightMapType *lm = lightTable.getLightMap();
trpgLightTable::LightMapType::iterator itr = lm->begin();
@@ -576,7 +576,7 @@ bool TXPArchive::loadLightAttributes()
addLightAttribute(osgLight, stateSet, osg::Vec3(normal.x,normal.y,normal.z),itr->first);
}
osg::notify(osg::INFO) << "txp:: ... done." << std::endl;
OSG_INFO << "txp:: ... done." << std::endl;
return true;
}
@@ -604,7 +604,7 @@ bool TXPArchive::loadTextStyles()
if (fmapfile.is_open())
{
osg::notify(osg::INFO) << "txp:: Font map file found: " << fmapfname << std::endl;
OSG_INFO << "txp:: Font map file found: " << fmapfname << std::endl;
std::string line;
while (std::getline(fmapfile,line))
{
@@ -625,8 +625,8 @@ bool TXPArchive::loadTextStyles()
}
else
{
osg::notify(osg::NOTICE) << "txp:: No font map file found: " << fmapfname << std::endl;
osg::notify(osg::NOTICE) << "txp:: All fonts defaulted to arial.ttf" << std::endl;
OSG_NOTICE << "txp:: No font map file found: " << fmapfname << std::endl;
OSG_NOTICE << "txp:: All fonts defaulted to arial.ttf" << std::endl;
}
const trpgTextStyleTable::StyleMapType *smap = textStyleTable->getStyleMap();

8
src/osgPlugins/txp/TXPNode.cpp
View File

@@ -59,7 +59,7 @@ protected:
#define TXPNodeERROR(s) osg::notify(osg::NOTICE) << "txp::TXPNode::" << (s) << " error: "
#define TXPNodeERROR(s) OSG_NOTICE << "txp::TXPNode::" << (s) << " error: "
TXPNode::TXPNode():
osg::Group(),
@@ -248,7 +248,7 @@ void TXPNode::updateEye(osg::NodeVisitor& nv)
{
if (!_pageManager)
{
osg::notify(osg::NOTICE)<<"TXPNode::updateEye() no pageManager created"<<std::endl;
OSG_NOTICE<<"TXPNode::updateEye() no pageManager created"<<std::endl;
return;
}
@@ -269,7 +269,7 @@ void TXPNode::updateEye(osg::NodeVisitor& nv)
osg::Node* node = (osg::Node*)(tile->GetLocalData());
_nodesToRemove.push_back(node);
//osg::notify(osg::NOTICE) << "Tile unload: " << x << " " << y << " " << lod << std::endl;
//OSG_NOTICE << "Tile unload: " << x << " " << y << " " << lod << std::endl;
}
_pageManager->AckUnload();
}
@@ -282,7 +282,7 @@ void TXPNode::updateEye(osg::NodeVisitor& nv)
{
osg::Node* node = addPagedLODTile(x,y);
tile->SetLocalData(node);
//osg::notify(osg::NOTICE) << "Tile load: " << x << " " << y << " " << lod << std::endl;
//OSG_NOTICE << "Tile load: " << x << " " << y << " " << lod << std::endl;
}
_pageManager->AckLoad();

16
src/osgPlugins/txp/TXPParser.cpp
View File

@@ -142,7 +142,7 @@ osg::Group *TXPParser::parseScene(
if (!Parse(buf))
{
osg::notify(osg::NOTICE) << "txp::TXPParser::parseScene(): failed to parse the given tile" << std::endl;
OSG_NOTICE << "txp::TXPParser::parseScene(): failed to parse the given tile" << std::endl;
return NULL;
}
@@ -165,7 +165,7 @@ osg::Group *TXPParser::parseScene(
}
catch (...)
{
osg::notify(osg::NOTICE) << "txp::TXPParser::parseScene(): exception thrown in the osg::Optimizer" << std::endl;
OSG_NOTICE << "txp::TXPParser::parseScene(): exception thrown in the osg::Optimizer" << std::endl;
}
@@ -467,7 +467,7 @@ void TXPParser::loadLocalMaterials()
}
else
{
osg::notify(osg::WARN) << "No image\n";
OSG_WARN << "No image\n";
}
osg_state_set->setTextureAttributeAndModes(texNo,osg_texture, osg::StateAttribute::ON);
@@ -481,7 +481,7 @@ void TXPParser::loadLocalMaterials()
}
else
{
osg::notify(osg::WARN) << "No texture\n";
OSG_WARN << "No texture\n";
}
}
@@ -693,7 +693,7 @@ void* billboardRead::Parse(trpgToken /*tok*/,trpgReadBuffer &buf)
if (_parse->underBillboardSubgraph())
{
// we don't allow anything under a billboard except geometry
osg::notify(osg::WARN) << "TerraPage loader: can only have geometry nodes beneath a billboard.\n";
OSG_WARN << "TerraPage loader: can only have geometry nodes beneath a billboard.\n";
}
else
{
@@ -788,7 +788,7 @@ void* lightRead::Parse(trpgToken /*tok*/,trpgReadBuffer &buf)
trpgLightAttr *ref = const_cast<trpgLightAttr*>(lt->GetLightAttrRef(attr_index));
if (!ref)
{
osg::notify(osg::NOTICE) << "NULL LightAttr " << attr_index << std::endl;
OSG_NOTICE << "NULL LightAttr " << attr_index << std::endl;
return (void*)1;
}
@@ -1554,7 +1554,7 @@ void* geomRead::Parse(trpgToken /*tok*/,trpgReadBuffer &buf)
break;
default:
billboard->addDrawable(geometry.get());
osg::notify(osg::WARN) << "TerraPage loader: fell through case: " << __FILE__ << " " << __LINE__ << ".\n";
OSG_WARN << "TerraPage loader: fell through case: " << __FILE__ << " " << __LINE__ << ".\n";
break;
}
@@ -1609,7 +1609,7 @@ void* geomRead::Parse(trpgToken /*tok*/,trpgReadBuffer &buf)
}
else
{
osg::notify(osg::WARN)<<"Detected potential memory leak in TXPParser.cpp"<<std::endl;
OSG_WARN<<"Detected potential memory leak in TXPParser.cpp"<<std::endl;
}
return (void *) 1;