Changeset 11472 for OpenSceneGraph/trunk/src/osg/OcclusionQueryNode.cpp

Timestamp:

05/28/10 17:47:52 (3 years ago)

Author:

robert

Message:

Convesion of osg::notify to OSG_INFO etc.

Files:

• OpenSceneGraph/trunk/src/osg/OcclusionQueryNode.cpp (modified) (16 diffs)

OpenSceneGraph/trunk/src/osg/OcclusionQueryNode.cpp

@@ -207 +207 @@
             //   in a valid Extensions pointer, and hope it's valid for any
             //   context that might be current.
-            osg::notify( osg::DEBUG_INFO ) << "osgOQ: RQCB: Using fallback path to obtain Extensions pointer." << std::endl;
+            OSG_DEBUG << "osgOQ: RQCB: Using fallback path to obtain Extensions pointer." << std::endl;
             ext = _extensionsFallback;
             if (!ext)
             {
-                osg::notify( osg::FATAL ) << "osgOQ: RQCB: Extensions pointer fallback is NULL." << std::endl;
+                OSG_FATAL << "osgOQ: RQCB: Extensions pointer fallback is NULL." << std::endl;
                 return;
             }
@@ -232 +232 @@
             }
 
-            osg::notify( osg::DEBUG_INFO ) <<
+            OSG_DEBUG <<
                 "osgOQ: RQCB: Retrieving..." << std::endl;
 
@@ -254 +254 @@
             ext->glGetQueryObjectiv( tr->_id, GL_QUERY_RESULT, &(tr->_numPixels) );
             if (tr->_numPixels < 0)
-                osg::notify( osg::WARN ) << "osgOQ: RQCB: " <<
+                OSG_WARN << "osgOQ: RQCB: " <<
                 "glGetQueryObjectiv returned negative value (" << tr->_numPixels << ")." << std::endl;
 
@@ -266 +266 @@
 
         elapsedTime = timer.delta_s(start_tick,timer.tick());
-        osg::notify( osg::INFO ) << "osgOQ: RQCB: " << "Retrieved " << count <<
+        OSG_INFO << "osgOQ: RQCB: " << "Retrieved " << count <<
             " queries in " << elapsedTime << " seconds." << std::endl;
     }
@@ -304 +304 @@
         if (!_rqcb)
         {
-            osg::notify( osg::FATAL ) << "osgOQ: CQCB: Invalid RQCB." << std::endl;
+            OSG_FATAL << "osgOQ: CQCB: Invalid RQCB." << std::endl;
             return;
         }
@@ -385 +385 @@
     if (!rqcb)
     {
-        osg::notify( osg::FATAL ) << "osgOQ: QG: Invalid RQCB." << std::endl;
+        OSG_FATAL << "osgOQ: QG: Invalid RQCB." << std::endl;
         return;
     }
@@ -399 +399 @@
     }
 
-    osg::notify( osg::DEBUG_INFO ) <<
+    OSG_DEBUG <<
         "osgOQ: QG: Querying for: " << _oqnName << std::endl;
 
@@ -408 +408 @@
 
 
-    osg::notify( osg::DEBUG_INFO ) <<
+    OSG_DEBUG <<
         "osgOQ: QG. OQNName: " << _oqnName <<
         ", Ctx: " << contextID <<
@@ -416 +416 @@
         GLenum err;
         if ((err = glGetError()) != GL_NO_ERROR)
-            osg::notify( osg::FATAL ) <<
-            "osgOQ: QG: OpenGL error: " << err << "." << std::endl;
+        {
+            OSG_FATAL << "osgOQ: QG: OpenGL error: " << err << "." << std::endl;
+        }
     }
 #endif
@@ -574 +575 @@
     if (_queryGeode->getDrawable( 0 ) == NULL)
     {
-        osg::notify( osg::FATAL ) <<
-            "osgOQ: OcclusionQueryNode: No QueryGeometry." << std::endl;
+        OSG_FATAL << "osgOQ: OcclusionQueryNode: No QueryGeometry." << std::endl;
         // Something's broke. Return true so we at least render correctly.
         return true;
@@ -697 +697 @@
     if (!_queryGeode)
     {
-        osg::notify( osg::WARN ) << "osgOQ: OcclusionQueryNode:: Invalid query support node." << std::endl;
+        OSG_WARN << "osgOQ: OcclusionQueryNode:: Invalid query support node." << std::endl;
         return;
     }
@@ -708 +708 @@
     if (!_queryGeode)
     {
-        osg::notify( osg::WARN ) << "osgOQ: OcclusionQueryNode:: Invalid query support node." << std::endl;
+        OSG_WARN << "osgOQ: OcclusionQueryNode:: Invalid query support node." << std::endl;
         return NULL;
     }
@@ -719 +719 @@
     if (!_queryGeode)
     {
-        osg::notify( osg::WARN ) << "osgOQ: OcclusionQueryNode:: Invalid query support node." << std::endl;
+        OSG_WARN << "osgOQ: OcclusionQueryNode:: Invalid query support node." << std::endl;
         return NULL;
     }
@@ -730 +730 @@
     if (!_debugGeode)
     {
-        osg::notify( osg::WARN ) << "osgOQ: OcclusionQueryNode:: Invalid debug support node." << std::endl;
+        OSG_WARN << "osgOQ: OcclusionQueryNode:: Invalid debug support node." << std::endl;
         return;
     }
@@ -741 +741 @@
     if (!_debugGeode.valid())
     {
-        osg::notify( osg::WARN ) << "osgOQ: OcclusionQueryNode:: Invalid debug support node." << std::endl;
+        OSG_WARN << "osgOQ: OcclusionQueryNode:: Invalid debug support node." << std::endl;
         return NULL;
     }
@@ -751 +751 @@
     if (!_debugGeode.valid())
     {
-        osg::notify( osg::WARN ) << "osgOQ: OcclusionQueryNode:: Invalid debug support node." << std::endl;
+        OSG_WARN << "osgOQ: OcclusionQueryNode:: Invalid debug support node." << std::endl;
         return NULL;
     }