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:04:19 +00:00
parent 1119f29f67
commit 030f4c06a9
8 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/osgVolume/FixedFunctionTechnique.cpp
View File

@@ -98,23 +98,23 @@ osg::Node* createCube(const osg::Vec3& center, float size, unsigned int numSlice
void FixedFunctionTechnique::init()
{
osg::notify(osg::INFO)<<"FixedFunctionTechnique::init()"<<std::endl;
OSG_INFO<<"FixedFunctionTechnique::init()"<<std::endl;
if (!_volumeTile)
{
osg::notify(osg::NOTICE)<<"FixedFunctionTechnique::init(), error no volume tile assigned."<<std::endl;
OSG_NOTICE<<"FixedFunctionTechnique::init(), error no volume tile assigned."<<std::endl;
return;
}
if (_volumeTile->getLayer()==0)
{
osg::notify(osg::NOTICE)<<"FixedFunctionTechnique::init(), error no layer assigend to volume tile."<<std::endl;
OSG_NOTICE<<"FixedFunctionTechnique::init(), error no layer assigend to volume tile."<<std::endl;
return;
}
if (_volumeTile->getLayer()->getImage()==0)
{
osg::notify(osg::NOTICE)<<"FixedFunctionTechnique::init(), error no image assigned to layer."<<std::endl;
OSG_NOTICE<<"FixedFunctionTechnique::init(), error no image assigned to layer."<<std::endl;
return;
}
@@ -152,7 +152,7 @@ void FixedFunctionTechnique::init()
if (_volumeTile->getLayer() && !masterLocator)
{
masterLocator = _volumeTile->getLayer()->getLocator();
osg::notify(osg::NOTICE)<<"assigning locator = "<<masterLocator<<std::endl;
OSG_NOTICE<<"assigning locator = "<<masterLocator<<std::endl;
}
osg::Matrix matrix;
@@ -161,7 +161,7 @@ void FixedFunctionTechnique::init()
matrix = masterLocator->getTransform();
}
osg::notify(osg::NOTICE)<<"Matrix = "<<matrix<<std::endl;
OSG_NOTICE<<"Matrix = "<<matrix<<std::endl;
osg::Texture::FilterMode minFilter = osg::Texture::NEAREST;
osg::Texture::FilterMode magFilter = osg::Texture::NEAREST;
@@ -257,12 +257,12 @@ void FixedFunctionTechnique::init()
void FixedFunctionTechnique::update(osgUtil::UpdateVisitor* uv)
{
// osg::notify(osg::NOTICE)<<"FixedFunctionTechnique:update(osgUtil::UpdateVisitor* nv):"<<std::endl;
// OSG_NOTICE<<"FixedFunctionTechnique:update(osgUtil::UpdateVisitor* nv):"<<std::endl;
}
void FixedFunctionTechnique::cull(osgUtil::CullVisitor* cv)
{
//osg::notify(osg::NOTICE)<<"FixedFunctionTechnique::cull(osgUtil::CullVisitor* nv)"<<std::endl;
//OSG_NOTICE<<"FixedFunctionTechnique::cull(osgUtil::CullVisitor* nv)"<<std::endl;
if (_node.valid())
{
_node->accept(*cv);
@@ -271,12 +271,12 @@ void FixedFunctionTechnique::cull(osgUtil::CullVisitor* cv)
void FixedFunctionTechnique::cleanSceneGraph()
{
osg::notify(osg::NOTICE)<<"FixedFunctionTechnique::cleanSceneGraph()"<<std::endl;
OSG_NOTICE<<"FixedFunctionTechnique::cleanSceneGraph()"<<std::endl;
}
void FixedFunctionTechnique::traverse(osg::NodeVisitor& nv)
{
// osg::notify(osg::NOTICE)<<"FixedFunctionTechnique::traverse(osg::NodeVisitor& nv)"<<std::endl;
// OSG_NOTICE<<"FixedFunctionTechnique::traverse(osg::NodeVisitor& nv)"<<std::endl;
if (!_volumeTile) return;
// if app traversal update the frame count.
@@ -305,7 +305,7 @@ void FixedFunctionTechnique::traverse(osg::NodeVisitor& nv)
if (_volumeTile->getDirty())
{
osg::notify(osg::INFO)<<"******* Doing init ***********"<<std::endl;
OSG_INFO<<"******* Doing init ***********"<<std::endl;
_volumeTile->init();
}
}