Changeset 11480 for OpenSceneGraph/trunk/src/osgVolume/FixedFunctionTechnique.cpp

Timestamp:

05/28/10 18:04:19 (21 months ago)

Author:

robert

Message:

Converted osg::notify to OSG_INFO etc.

Files:

• OpenSceneGraph/trunk/src/osgVolume/FixedFunctionTechnique.cpp (modified) (8 diffs)

OpenSceneGraph/trunk/src/osgVolume/FixedFunctionTechnique.cpp

@@ -99 +99 @@
 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;
     }
@@ -109 +109 @@
     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;
     }
@@ -115 +115 @@
     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;
     }
@@ -153 +153 @@
     {
         masterLocator = _volumeTile->getLayer()->getLocator();
-        osg::notify(osg::NOTICE)<<"assigning locator = "<<masterLocator<<std::endl;
+        OSG_NOTICE<<"assigning locator = "<<masterLocator<<std::endl;
     }
 
@@ -162 +162 @@
     }
     
-    osg::notify(osg::NOTICE)<<"Matrix = "<<matrix<<std::endl;
+    OSG_NOTICE<<"Matrix = "<<matrix<<std::endl;
 
     osg::Texture::FilterMode minFilter = osg::Texture::NEAREST;
@@ -258 +258 @@
 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())
     {
@@ -272 +272 @@
 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;
 
@@ -306 +306 @@
     if (_volumeTile->getDirty()) 
     {
-        osg::notify(osg::INFO)<<"******* Doing init ***********"<<std::endl;
+        OSG_INFO<<"******* Doing init ***********"<<std::endl;
         _volumeTile->init();
     }