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

Convesion of osg::notify to OSG_INFO etc.

Browse Source
This commit is contained in:
Robert Osfield
2010-05-28 15:47:52 +00:00
parent e753be1b20
commit a79a8d30f9
67 changed files with 775 additions and 785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osg/ImageSequence.cpp
View File

@@ -86,7 +86,7 @@ void ImageSequence::setLength(double length)
{
if (length<=0.0)
{
osg::notify(osg::NOTICE)<<"ImageSequence::setLength("<<length<<") invalid length value, must be greater than 0."<<std::endl;
OSG_NOTICE<<"ImageSequence::setLength("<<length<<") invalid length value, must be greater than 0."<<std::endl;
return;
}
@@ -126,7 +126,7 @@ void ImageSequence::setImage(unsigned int pos, osg::Image* image)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
osg::notify(osg::INFO)<<"ImageSequence::setImage("<<pos<<","<<image->getFileName()<<")"<<std::endl;
OSG_INFO<<"ImageSequence::setImage("<<pos<<","<<image->getFileName()<<")"<<std::endl;
if (pos>=_images.size()) _images.resize(pos+1);
@@ -155,7 +155,7 @@ void ImageSequence::addImage(osg::Image* image)
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
// osg::notify(osg::NOTICE)<<"merging image in order expected : "<<image->getFileName()<<std::endl;
// OSG_NOTICE<<"merging image in order expected : "<<image->getFileName()<<std::endl;
_images.push_back(image);
computeTimePerImage();
@@ -168,7 +168,7 @@ void ImageSequence::addImage(osg::Image* image)
void ImageSequence::setImageToChild(const osg::Image* image)
{
// osg::notify(osg::NOTICE)<<"setImageToChild("<<image<<")"<<std::endl;
// OSG_NOTICE<<"setImageToChild("<<image<<")"<<std::endl;
if (image==0) return;
@@ -208,7 +208,7 @@ void ImageSequence::update(osg::NodeVisitor* nv)
osg::NodeVisitor::ImageRequestHandler* irh = nv->getImageRequestHandler();
const osg::FrameStamp* fs = nv->getFrameStamp();
// osg::notify(osg::NOTICE)<<"ImageSequence::update("<<fs<<", "<<irh<<")"<<std::endl;
// OSG_NOTICE<<"ImageSequence::update("<<fs<<", "<<irh<<")"<<std::endl;
if (_referenceTime == DBL_MAX)
{
@@ -280,7 +280,7 @@ void ImageSequence::update(osg::NodeVisitor* nv)
}
int index = int(time/_timePerImage);
// osg::notify(osg::NOTICE)<<"time= "<<time<<" _timePerImage="<<_timePerImage<<" index="<<index<<" _length="<<_length<<std::endl;
// OSG_NOTICE<<"time= "<<time<<" _timePerImage="<<_timePerImage<<" index="<<index<<" _length="<<_length<<std::endl;
if (index>=int(_images.size())) index = int(_images.size())-1;
@@ -297,7 +297,7 @@ void ImageSequence::update(osg::NodeVisitor* nv)
if (index>=0)
{
// osg::notify(osg::NOTICE)<<"at time "<<time<<" setting child = "<<index<<std::endl;
// OSG_NOTICE<<"at time "<<time<<" setting child = "<<index<<std::endl;
if (_previousAppliedImageIndex!=index)
{
@@ -315,7 +315,7 @@ void ImageSequence::update(osg::NodeVisitor* nv)
}
}
// osg::notify(osg::NOTICE)<<"time = "<<time<<std::endl;
// OSG_NOTICE<<"time = "<<time<<std::endl;
if (irh)
{