Changeset 11473 for OpenSceneGraph/trunk/src/osgUtil/IncrementalCompileOperation.cpp

Timestamp:

05/28/10 17:51:00 (3 years ago)

Author:

robert

Message:

Conversion of osg::notify to OSG_INFO etc.

Files:

• OpenSceneGraph/trunk/src/osgUtil/IncrementalCompileOperation.cpp (modified) (10 diffs)

OpenSceneGraph/trunk/src/osgUtil/IncrementalCompileOperation.cpp

@@ -94 +94 @@
 void IncrementalCompileOperation::add(osg::Node* subgraphToCompile)
 {
-    osg::notify(osg::INFO)<<"IncrementalCompileOperation::add("<<subgraphToCompile<<")"<<std::endl;
+    OSG_INFO<<"IncrementalCompileOperation::add("<<subgraphToCompile<<")"<<std::endl;
     add(new CompileSet(subgraphToCompile));
 }
@@ -100 +100 @@
 void IncrementalCompileOperation::add(osg::Group* attachmentPoint, osg::Node* subgraphToCompile)
 {
-    osg::notify(osg::INFO)<<"IncrementalCompileOperation::add("<<attachmentPoint<<", "<<subgraphToCompile<<")"<<std::endl;
+    OSG_INFO<<"IncrementalCompileOperation::add("<<attachmentPoint<<", "<<subgraphToCompile<<")"<<std::endl;
     add(new CompileSet(attachmentPoint, subgraphToCompile));
 }
@@ -118 +118 @@
     if (callBuildCompileMap) compileSet->buildCompileMap(_contexts);
 
-    osg::notify(osg::INFO)<<"IncrementalCompileOperation::add(CompileSet = "<<compileSet<<", "<<", "<<callBuildCompileMap<<")"<<std::endl;
+    OSG_INFO<<"IncrementalCompileOperation::add(CompileSet = "<<compileSet<<", "<<", "<<callBuildCompileMap<<")"<<std::endl;
 
     OpenThreads::ScopedLock<OpenThreads::Mutex>  lock(_toCompileMutex);
@@ -126 +126 @@
 void IncrementalCompileOperation::mergeCompiledSubgraphs()
 {
-    // osg::notify(osg::INFO)<<"IncrementalCompileOperation::mergeCompiledSubgraphs()"<<std::endl;
+    // OSG_INFO<<"IncrementalCompileOperation::mergeCompiledSubgraphs()"<<std::endl;
 
     OpenThreads::ScopedLock<OpenThreads::Mutex>  compilded_lock(_compiledMutex);
@@ -287 +287 @@
 void IncrementalCompileOperation::operator () (osg::GraphicsContext* context)
 {
-    // osg::notify(osg::NOTICE)<<"IncrementalCompileOperation::operator () ("<<context<<")"<<std::endl;
+    // OSG_NOTICE<<"IncrementalCompileOperation::operator () ("<<context<<")"<<std::endl;
 
     osg::NotifySeverity level = osg::INFO;
@@ -301 +301 @@
     double currentElapsedFrameTime = context->getTimeSinceLastClear();
     
-    osg::notify(level)<<"currentTime = "<<currentTime<<std::endl;
-    osg::notify(level)<<"currentElapsedFrameTime = "<<currentElapsedFrameTime<<std::endl;
+    OSG_NOTIFY(level)<<"currentTime = "<<currentTime<<std::endl;
+    OSG_NOTIFY(level)<<"currentElapsedFrameTime = "<<currentElapsedFrameTime<<std::endl;
     
     double _flushTimeRatio(0.5);
@@ -314 +314 @@
 
 #if 1
-    osg::notify(level)<<"total availableTime = "<<availableTime*1000.0<<std::endl;
-    osg::notify(level)<<"      flushTime     = "<<flushTime*1000.0<<std::endl;
-    osg::notify(level)<<"      compileTime   = "<<compileTime*1000.0<<std::endl;
+    OSG_NOTIFY(level)<<"total availableTime = "<<availableTime*1000.0<<std::endl;
+    OSG_NOTIFY(level)<<"      flushTime     = "<<flushTime*1000.0<<std::endl;
+    OSG_NOTIFY(level)<<"      compileTime   = "<<compileTime*1000.0<<std::endl;
 #endif
 
@@ -325 +325 @@
 
 #if 1
-    osg::notify(level)<<"      revised compileTime   = "<<compileTime*1000.0<<std::endl;
+    OSG_NOTIFY(level)<<"      revised compileTime   = "<<compileTime*1000.0<<std::endl;
 #endif
 
@@ -351 +351 @@
         if (!cd.empty())
         {
-            osg::notify(level)<<"cd._drawables.size()="<<cd._drawables.size()<<std::endl;
-            osg::notify(level)<<"cd._textures.size()="<<cd._textures.size()<<std::endl;
-            osg::notify(level)<<"cd._programs.size()="<<cd._programs.size()<<std::endl;
+            OSG_NOTIFY(level)<<"cd._drawables.size()="<<cd._drawables.size()<<std::endl;
+            OSG_NOTIFY(level)<<"cd._textures.size()="<<cd._textures.size()<<std::endl;
+            OSG_NOTIFY(level)<<"cd._programs.size()="<<cd._programs.size()<<std::endl;
     
             
@@ -399 +399 @@
                     if (cs_itr != _toCompile.end())
                     {
-                        osg::notify(level)<<"Erasing from list"<<std::endl;
+                        OSG_NOTIFY(level)<<"Erasing from list"<<std::endl;
                         
                         // remove from the _toCompile list, note cs won't be deleted here as the tempoary