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

Conversion of osg::notify to OSG_INFO etc.

Browse Source
This commit is contained in:
Robert Osfield
2010-05-28 16:03:38 +00:00
parent 83bef8afd4
commit 1119f29f67
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/osgTerrain/Layer.cpp
View File

@@ -212,7 +212,7 @@ bool ImageLayer::transform(float offset, float scale)
{
if (!_image.valid()) return false;
OSG_NOTIFY(osg::INFO)<<"ImageLayer::transform("<<offset<<","<<scale<<")"<<std::endl;;
OSG_INFO<<"ImageLayer::transform("<<offset<<","<<scale<<")"<<std::endl;;
processImage(_image.get(), TransformOperator(offset,scale));
@@ -228,30 +228,30 @@ bool ImageLayer::getValue(unsigned int i, unsigned int j, float& value) const
{
case(GL_BYTE):
value = *((const char*)data);
// OSG_NOTIFY(osg::NOTICE)<<"byte "<<value<<std::endl;
// OSG_NOTICE<<"byte "<<value<<std::endl;
break;
case(GL_UNSIGNED_BYTE):
value = *data;
// OSG_NOTIFY(osg::NOTICE)<<"Unsigned byte "<<value<<std::endl;
// OSG_NOTICE<<"Unsigned byte "<<value<<std::endl;
break;
case(GL_SHORT):
value = *((const short*)data);
// OSG_NOTIFY(osg::NOTICE)<<"Short "<<value<<std::endl;
// OSG_NOTICE<<"Short "<<value<<std::endl;
break;
case(GL_UNSIGNED_SHORT):
value = *((const unsigned short*)data);
// OSG_NOTIFY(osg::NOTICE)<<"Unsigned Short "<<value<<std::endl;
// OSG_NOTICE<<"Unsigned Short "<<value<<std::endl;
break;
case(GL_INT):
value = *((const int*)data);
// OSG_NOTIFY(osg::NOTICE)<<"Int "<<value<<std::endl;
// OSG_NOTICE<<"Int "<<value<<std::endl;
break;
case(GL_UNSIGNED_INT):
// OSG_NOTIFY(osg::NOTICE)<<"Unsigned Int "<<value<<std::endl;
// OSG_NOTICE<<"Unsigned Int "<<value<<std::endl;
value = *((const unsigned int*)data);
break;
case(GL_FLOAT):
// OSG_NOTIFY(osg::NOTICE)<<"Float "<<value<<std::endl;
// OSG_NOTICE<<"Float "<<value<<std::endl;
value = *((const float*)data);
break;
default:
@@ -264,19 +264,19 @@ bool ImageLayer::getValue(unsigned int i, unsigned int j, float& value) const
bool ImageLayer::getValue(unsigned int i, unsigned int j, osg::Vec2& value) const
{
OSG_NOTIFY(osg::NOTICE)<<"Not implemented yet"<<std::endl;
OSG_NOTICE<<"Not implemented yet"<<std::endl;
return false;
}
bool ImageLayer::getValue(unsigned int i, unsigned int j, osg::Vec3& value) const
{
OSG_NOTIFY(osg::NOTICE)<<"Not implemented yet"<<std::endl;
OSG_NOTICE<<"Not implemented yet"<<std::endl;
return false;
}
bool ImageLayer::getValue(unsigned int i, unsigned int j, osg::Vec4& value) const
{
OSG_NOTIFY(osg::NOTICE)<<"Not implemented yet"<<std::endl;
OSG_NOTICE<<"Not implemented yet"<<std::endl;
return false;
}
@@ -324,7 +324,7 @@ bool ContourLayer::transform(float offset, float scale)
{
if (!_tf) return false;
OSG_NOTIFY(osg::INFO)<<"ContourLayer::transform("<<offset<<","<<scale<<")"<<std::endl;;
OSG_INFO<<"ContourLayer::transform("<<offset<<","<<scale<<")"<<std::endl;;
osg::TransferFunction1D::ColorMap newColorMap = _tf->getColorMap();
for(osg::TransferFunction1D::ColorMap::iterator itr = newColorMap.begin();
@@ -438,7 +438,7 @@ bool HeightFieldLayer::transform(float offset, float scale)
osg::FloatArray* heights = _heightField->getFloatArray();
if (!heights) return false;
OSG_NOTIFY(osg::INFO)<<"HeightFieldLayer::transform("<<offset<<","<<scale<<")"<<std::endl;;
OSG_INFO<<"HeightFieldLayer::transform("<<offset<<","<<scale<<")"<<std::endl;;
for(osg::FloatArray::iterator itr = heights->begin();
itr != heights->end();

8
src/osgTerrain/TerrainTechnique.cpp
View File

@@ -85,24 +85,24 @@ void TerrainTechnique::setTerrainTile(TerrainTile* tile)
void TerrainTechnique::init(int dirtyMask, bool assumeMultiThreaded)
{
OSG_NOTIFY(osg::NOTICE)<<className()<<"::init(..) not implementated yet"<<std::endl;
OSG_NOTICE<<className()<<"::init(..) not implementated yet"<<std::endl;
}
void TerrainTechnique::update(osgUtil::UpdateVisitor* uv)
{
OSG_NOTIFY(osg::NOTICE)<<className()<<"::update(..) not implementated yet"<<std::endl;
OSG_NOTICE<<className()<<"::update(..) not implementated yet"<<std::endl;
if (_terrainTile) _terrainTile->osg::Group::traverse(*uv);
}
void TerrainTechnique::cull(osgUtil::CullVisitor* cv)
{
OSG_NOTIFY(osg::NOTICE)<<className()<<"::cull(..) not implementated yet"<<std::endl;
OSG_NOTICE<<className()<<"::cull(..) not implementated yet"<<std::endl;
if (_terrainTile) _terrainTile->osg::Group::traverse(*cv);
}
void TerrainTechnique::cleanSceneGraph()
{
OSG_NOTIFY(osg::NOTICE)<<className()<<"::cleanSceneGraph(..) not implementated yet"<<std::endl;
OSG_NOTICE<<className()<<"::cleanSceneGraph(..) not implementated yet"<<std::endl;
}
void TerrainTechnique::traverse(osg::NodeVisitor& nv)

2
src/osgTerrain/TerrainTile.cpp
View File

@@ -133,7 +133,7 @@ void TerrainTile::traverse(osg::NodeVisitor& nv)
osgTerrain::Terrain* ts = dynamic_cast<Terrain*>(*itr);
if (ts)
{
OSG_NOTIFY(osg::INFO)<<"Assigning terrain system "<<ts<<std::endl;
OSG_INFO<<"Assigning terrain system "<<ts<<std::endl;
setTerrain(ts);
}
}