Show
Ignore:
Timestamp:
05/28/10 17:51:00 (5 years ago)
Author:
robert
Message:

Conversion of osg::notify to OSG_INFO etc.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgUtil/IncrementalCompileOperation.cpp

    r10764 r11473  
    9494void IncrementalCompileOperation::add(osg::Node* subgraphToCompile) 
    9595{ 
    96     osg::notify(osg::INFO)<<"IncrementalCompileOperation::add("<<subgraphToCompile<<")"<<std::endl; 
     96    OSG_INFO<<"IncrementalCompileOperation::add("<<subgraphToCompile<<")"<<std::endl; 
    9797    add(new CompileSet(subgraphToCompile)); 
    9898} 
     
    100100void IncrementalCompileOperation::add(osg::Group* attachmentPoint, osg::Node* subgraphToCompile) 
    101101{ 
    102     osg::notify(osg::INFO)<<"IncrementalCompileOperation::add("<<attachmentPoint<<", "<<subgraphToCompile<<")"<<std::endl; 
     102    OSG_INFO<<"IncrementalCompileOperation::add("<<attachmentPoint<<", "<<subgraphToCompile<<")"<<std::endl; 
    103103    add(new CompileSet(attachmentPoint, subgraphToCompile)); 
    104104} 
     
    118118    if (callBuildCompileMap) compileSet->buildCompileMap(_contexts); 
    119119 
    120     osg::notify(osg::INFO)<<"IncrementalCompileOperation::add(CompileSet = "<<compileSet<<", "<<", "<<callBuildCompileMap<<")"<<std::endl; 
     120    OSG_INFO<<"IncrementalCompileOperation::add(CompileSet = "<<compileSet<<", "<<", "<<callBuildCompileMap<<")"<<std::endl; 
    121121 
    122122    OpenThreads::ScopedLock<OpenThreads::Mutex>  lock(_toCompileMutex); 
     
    126126void IncrementalCompileOperation::mergeCompiledSubgraphs() 
    127127{ 
    128     // osg::notify(osg::INFO)<<"IncrementalCompileOperation::mergeCompiledSubgraphs()"<<std::endl; 
     128    // OSG_INFO<<"IncrementalCompileOperation::mergeCompiledSubgraphs()"<<std::endl; 
    129129 
    130130    OpenThreads::ScopedLock<OpenThreads::Mutex>  compilded_lock(_compiledMutex); 
     
    287287void IncrementalCompileOperation::operator () (osg::GraphicsContext* context) 
    288288{ 
    289     // osg::notify(osg::NOTICE)<<"IncrementalCompileOperation::operator () ("<<context<<")"<<std::endl; 
     289    // OSG_NOTICE<<"IncrementalCompileOperation::operator () ("<<context<<")"<<std::endl; 
    290290 
    291291    osg::NotifySeverity level = osg::INFO; 
     
    301301    double currentElapsedFrameTime = context->getTimeSinceLastClear(); 
    302302     
    303     osg::notify(level)<<"currentTime = "<<currentTime<<std::endl; 
    304     osg::notify(level)<<"currentElapsedFrameTime = "<<currentElapsedFrameTime<<std::endl; 
     303    OSG_NOTIFY(level)<<"currentTime = "<<currentTime<<std::endl; 
     304    OSG_NOTIFY(level)<<"currentElapsedFrameTime = "<<currentElapsedFrameTime<<std::endl; 
    305305     
    306306    double _flushTimeRatio(0.5); 
     
    314314 
    315315#if 1 
    316     osg::notify(level)<<"total availableTime = "<<availableTime*1000.0<<std::endl; 
    317     osg::notify(level)<<"      flushTime     = "<<flushTime*1000.0<<std::endl; 
    318     osg::notify(level)<<"      compileTime   = "<<compileTime*1000.0<<std::endl; 
     316    OSG_NOTIFY(level)<<"total availableTime = "<<availableTime*1000.0<<std::endl; 
     317    OSG_NOTIFY(level)<<"      flushTime     = "<<flushTime*1000.0<<std::endl; 
     318    OSG_NOTIFY(level)<<"      compileTime   = "<<compileTime*1000.0<<std::endl; 
    319319#endif 
    320320 
     
    325325 
    326326#if 1 
    327     osg::notify(level)<<"      revised compileTime   = "<<compileTime*1000.0<<std::endl; 
     327    OSG_NOTIFY(level)<<"      revised compileTime   = "<<compileTime*1000.0<<std::endl; 
    328328#endif 
    329329 
     
    351351        if (!cd.empty()) 
    352352        { 
    353             osg::notify(level)<<"cd._drawables.size()="<<cd._drawables.size()<<std::endl; 
    354             osg::notify(level)<<"cd._textures.size()="<<cd._textures.size()<<std::endl; 
    355             osg::notify(level)<<"cd._programs.size()="<<cd._programs.size()<<std::endl; 
     353            OSG_NOTIFY(level)<<"cd._drawables.size()="<<cd._drawables.size()<<std::endl; 
     354            OSG_NOTIFY(level)<<"cd._textures.size()="<<cd._textures.size()<<std::endl; 
     355            OSG_NOTIFY(level)<<"cd._programs.size()="<<cd._programs.size()<<std::endl; 
    356356     
    357357             
     
    399399                    if (cs_itr != _toCompile.end()) 
    400400                    { 
    401                         osg::notify(level)<<"Erasing from list"<<std::endl; 
     401                        OSG_NOTIFY(level)<<"Erasing from list"<<std::endl; 
    402402                         
    403403                        // remove from the _toCompile list, note cs won't be deleted here as the tempoary