Changeset 11043 for OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp

Timestamp:

02/09/10 19:24:37 (3 years ago)

Author:

robert

Message:

Converted osg::notify usage to NOTIFY

Files:

• OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp (modified) (62 diffs)

OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp

@@ -156 +156 @@
     if (options & TESSELLATE_GEOMETRY)
     {
-        osg::notify(osg::INFO)<<"Optimizer::optimize() doing TESSELLATE_GEOMETRY"<<std::endl;
+        NOTIFY(osg::INFO)<<"Optimizer::optimize() doing TESSELLATE_GEOMETRY"<<std::endl;
 
         TessellateVisitor tsv;
@@ -164 +164 @@
     if (options & REMOVE_LOADED_PROXY_NODES)
     {
-        osg::notify(osg::INFO)<<"Optimizer::optimize() doing REMOVE_LOADED_PROXY_NODES"<<std::endl;
+        NOTIFY(osg::INFO)<<"Optimizer::optimize() doing REMOVE_LOADED_PROXY_NODES"<<std::endl;
 
         RemoveLoadedProxyNodesVisitor rlpnv(this);
@@ -174 +174 @@
     if (options & COMBINE_ADJACENT_LODS)
     {
-        osg::notify(osg::INFO)<<"Optimizer::optimize() doing COMBINE_ADJACENT_LODS"<<std::endl;
+        NOTIFY(osg::INFO)<<"Optimizer::optimize() doing COMBINE_ADJACENT_LODS"<<std::endl;
 
         CombineLODsVisitor clv(this);
@@ -183 +183 @@
     if (options & OPTIMIZE_TEXTURE_SETTINGS)
     {
-        osg::notify(osg::INFO)<<"Optimizer::optimize() doing OPTIMIZE_TEXTURE_SETTINGS"<<std::endl;
+        NOTIFY(osg::INFO)<<"Optimizer::optimize() doing OPTIMIZE_TEXTURE_SETTINGS"<<std::endl;
 
         TextureVisitor tv(true,true, // unref image 
@@ -194 +194 @@
     if (options & SHARE_DUPLICATE_STATE)
     {
-        osg::notify(osg::INFO)<<"Optimizer::optimize() doing SHARE_DUPLICATE_STATE"<<std::endl;
+        NOTIFY(osg::INFO)<<"Optimizer::optimize() doing SHARE_DUPLICATE_STATE"<<std::endl;
 
         bool combineDynamicState = false;
@@ -207 +207 @@
     if (options & TEXTURE_ATLAS_BUILDER)
     {
-        osg::notify(osg::INFO)<<"Optimizer::optimize() doing TEXTURE_ATLAS_BUILDER"<<std::endl;
+        NOTIFY(osg::INFO)<<"Optimizer::optimize() doing TEXTURE_ATLAS_BUILDER"<<std::endl;
         
         // traverse the scene collecting textures into texture atlas.
@@ -226 +226 @@
     if (options & COPY_SHARED_NODES)
     {
-        osg::notify(osg::INFO)<<"Optimizer::optimize() doing COPY_SHARED_NODES"<<std::endl;
+        NOTIFY(osg::INFO)<<"Optimizer::optimize() doing COPY_SHARED_NODES"<<std::endl;
 
         CopySharedSubgraphsVisitor cssv(this);
@@ -235 +235 @@
     if (options & FLATTEN_STATIC_TRANSFORMS)
     {
-        osg::notify(osg::INFO)<<"Optimizer::optimize() doing FLATTEN_STATIC_TRANSFORMS"<<std::endl;
+        NOTIFY(osg::INFO)<<"Optimizer::optimize() doing FLATTEN_STATIC_TRANSFORMS"<<std::endl;
 
         int i=0;
@@ -241 +241 @@
         do
         {
-            osg::notify(osg::DEBUG_INFO) << "** RemoveStaticTransformsVisitor *** Pass "<<i<<std::endl;
+            NOTIFY(osg::DEBUG_INFO) << "** RemoveStaticTransformsVisitor *** Pass "<<i<<std::endl;
             FlattenStaticTransformsVisitor fstv(this);
             node->accept(fstv);
@@ -256 +256 @@
     if (options & FLATTEN_STATIC_TRANSFORMS_DUPLICATING_SHARED_SUBGRAPHS)
     {
-        osg::notify(osg::INFO)<<"Optimizer::optimize() doing FLATTEN_STATIC_TRANSFORMS_DUPLICATING_SHARED_SUBGRAPHS"<<std::endl;
+        NOTIFY(osg::INFO)<<"Optimizer::optimize() doing FLATTEN_STATIC_TRANSFORMS_DUPLICATING_SHARED_SUBGRAPHS"<<std::endl;
 
         // no combine any adjacent static transforms.
@@ -266 +266 @@
     if (options & MERGE_GEODES)
     {
-        osg::notify(osg::INFO)<<"Optimizer::optimize() doing MERGE_GEODES"<<std::endl;
+        NOTIFY(osg::INFO)<<"Optimizer::optimize() doing MERGE_GEODES"<<std::endl;
 
         osg::Timer_t startTick = osg::Timer::instance()->tick();
@@ -275 +275 @@
         osg::Timer_t endTick = osg::Timer::instance()->tick();
         
-        osg::notify(osg::INFO)<<"MERGE_GEODES took "<<osg::Timer::instance()->delta_s(startTick,endTick)<<std::endl;
+        NOTIFY(osg::INFO)<<"MERGE_GEODES took "<<osg::Timer::instance()->delta_s(startTick,endTick)<<std::endl;
     }
 
     if (options & CHECK_GEOMETRY)
     {
-        osg::notify(osg::INFO)<<"Optimizer::optimize() doing CHECK_GEOMETRY"<<std::endl;
+        NOTIFY(osg::INFO)<<"Optimizer::optimize() doing CHECK_GEOMETRY"<<std::endl;
 
         CheckGeometryVisitor mgv(this);
@@ -288 +288 @@
     if (options & MAKE_FAST_GEOMETRY)
     {
-        osg::notify(osg::INFO)<<"Optimizer::optimize() doing MAKE_FAST_GEOMETRY"<<std::endl;
+        NOTIFY(osg::INFO)<<"Optimizer::optimize() doing MAKE_FAST_GEOMETRY"<<std::endl;
 
         MakeFastGeometryVisitor mgv(this);
@@ -296 +296 @@
     if (options & MERGE_GEOMETRY)
     {
-        osg::notify(osg::INFO)<<"Optimizer::optimize() doing MERGE_GEOMETRY"<<std::endl;
+        NOTIFY(osg::INFO)<<"Optimizer::optimize() doing MERGE_GEOMETRY"<<std::endl;
 
         osg::Timer_t startTick = osg::Timer::instance()->tick();
@@ -306 +306 @@
         osg::Timer_t endTick = osg::Timer::instance()->tick();
 
-        osg::notify(osg::INFO)<<"MERGE_GEOMETRY took "<<osg::Timer::instance()->delta_s(startTick,endTick)<<std::endl;
+        NOTIFY(osg::INFO)<<"MERGE_GEOMETRY took "<<osg::Timer::instance()->delta_s(startTick,endTick)<<std::endl;
     }
     
     if (options & TRISTRIP_GEOMETRY)
     {
-        osg::notify(osg::INFO)<<"Optimizer::optimize() doing TRISTRIP_GEOMETRY"<<std::endl;
+        NOTIFY(osg::INFO)<<"Optimizer::optimize() doing TRISTRIP_GEOMETRY"<<std::endl;
 
         TriStripVisitor tsv(this);
@@ -320 +320 @@
     if (options & REMOVE_REDUNDANT_NODES)
     {
-        osg::notify(osg::INFO)<<"Optimizer::optimize() doing REMOVE_REDUNDANT_NODES"<<std::endl;
+        NOTIFY(osg::INFO)<<"Optimizer::optimize() doing REMOVE_REDUNDANT_NODES"<<std::endl;
 
         RemoveEmptyNodesVisitor renv(this);
@@ -341 +341 @@
     if (options & SPATIALIZE_GROUPS)
     {
-        osg::notify(osg::INFO)<<"Optimizer::optimize() doing SPATIALIZE_GROUPS"<<std::endl;
+        NOTIFY(osg::INFO)<<"Optimizer::optimize() doing SPATIALIZE_GROUPS"<<std::endl;
 
         SpatializeGroupsVisitor sv(this);
@@ -459 +459 @@
 void Optimizer::StateVisitor::optimize()
 {
-    osg::notify(osg::INFO) << "Num of StateSet="<<_statesets.size()<< std::endl;
+    NOTIFY(osg::INFO) << "Num of StateSet="<<_statesets.size()<< std::endl;
 
     {
@@ -540 +540 @@
             std::sort(attributeList.begin(),attributeList.end(),LessDerefFunctor<osg::StateAttribute>());
 
-            osg::notify(osg::INFO) << "state attribute list"<< std::endl;
+            NOTIFY(osg::INFO) << "state attribute list"<< std::endl;
             for(AttributeList::iterator aaitr = attributeList.begin();
                 aaitr!=attributeList.end();
                 ++aaitr)
             {
-                osg::notify(osg::INFO) << "    "<<*aaitr << "  "<<(*aaitr)->className()<< std::endl;
-            }
-
-            osg::notify(osg::INFO) << "searching for duplicate attributes"<< std::endl;
+                NOTIFY(osg::INFO) << "    "<<*aaitr << "  "<<(*aaitr)->className()<< std::endl;
+            }
+
+            NOTIFY(osg::INFO) << "searching for duplicate attributes"<< std::endl;
             // find the duplicates.
             AttributeList::iterator first_unique = attributeList.begin();
@@ -557 +557 @@
                 if (**current==**first_unique)
                 {
-                    osg::notify(osg::INFO) << "    found duplicate "<<(*current)->className()<<"  first="<<*first_unique<<"  current="<<*current<< std::endl;
+                    NOTIFY(osg::INFO) << "    found duplicate "<<(*current)->className()<<"  first="<<*first_unique<<"  current="<<*current<< std::endl;
                     StateSetList& statesetlist = attributeToStateSetMap[*current];
                     for(StateSetList::iterator sitr=statesetlist.begin();
@@ -563 +563 @@
                         ++sitr)
                     {
-                        osg::notify(osg::INFO) << "       replace duplicate "<<*current<<" with "<<*first_unique<< std::endl;
+                        NOTIFY(osg::INFO) << "       replace duplicate "<<*current<<" with "<<*first_unique<< std::endl;
                         osg::StateSet* stateset = sitr->first;
                         unsigned int unit = sitr->second;
@@ -592 +592 @@
             std::sort(uniformList.begin(),uniformList.end(),LessDerefFunctor<osg::Uniform>());
 
-            osg::notify(osg::INFO) << "state uniform list"<< std::endl;
+            NOTIFY(osg::INFO) << "state uniform list"<< std::endl;
             for(UniformList::iterator uuitr = uniformList.begin();
                 uuitr!=uniformList.end();
                 ++uuitr)
             {
-                osg::notify(osg::INFO) << "    "<<*uuitr << "  "<<(*uuitr)->getName()<< std::endl;
-            }
-
-            osg::notify(osg::INFO) << "searching for duplicate uniforms"<< std::endl;
+                NOTIFY(osg::INFO) << "    "<<*uuitr << "  "<<(*uuitr)->getName()<< std::endl;
+            }
+
+            NOTIFY(osg::INFO) << "searching for duplicate uniforms"<< std::endl;
             // find the duplicates.
             UniformList::iterator first_unique_uniform = uniformList.begin();
@@ -609 +609 @@
                 if ((**current_uniform)==(**first_unique_uniform))
                 {
-                    osg::notify(osg::INFO) << "    found duplicate uniform "<<(*current_uniform)->getName()<<"  first_unique_uniform="<<*first_unique_uniform<<"  current_uniform="<<*current_uniform<< std::endl;
+                    NOTIFY(osg::INFO) << "    found duplicate uniform "<<(*current_uniform)->getName()<<"  first_unique_uniform="<<*first_unique_uniform<<"  current_uniform="<<*current_uniform<< std::endl;
                     StateSetSet& statesetset = uniformToStateSetMap[*current_uniform];
                     for(StateSetSet::iterator sitr=statesetset.begin();
@@ -615 +615 @@
                         ++sitr)
                     {
-                        osg::notify(osg::INFO) << "       replace duplicate "<<*current_uniform<<" with "<<*first_unique_uniform<< std::endl;
+                        NOTIFY(osg::INFO) << "       replace duplicate "<<*current_uniform<<" with "<<*first_unique_uniform<< std::endl;
                         osg::StateSet* stateset = *sitr;
                         stateset->addUniform(*first_unique_uniform);
@@ -645 +645 @@
         std::sort(statesetSortList.begin(),statesetSortList.end(),LessDerefFunctor<osg::StateSet>());
 
-        osg::notify(osg::INFO) << "searching for duplicate attributes"<< std::endl;
+        NOTIFY(osg::INFO) << "searching for duplicate attributes"<< std::endl;
         // find the duplicates.
         StateSetSortList::iterator first_unique = statesetSortList.begin();
@@ -653 +653 @@
             if (**current==**first_unique)
             {
-                osg::notify(osg::INFO) << "    found duplicate "<<(*current)->className()<<"  first="<<*first_unique<<"  current="<<*current<< std::endl;
+                NOTIFY(osg::INFO) << "    found duplicate "<<(*current)->className()<<"  first="<<*first_unique<<"  current="<<*current<< std::endl;
                 ObjectSet& objSet = _statesets[*current];
                 for(ObjectSet::iterator sitr=objSet.begin();
@@ -659 +659 @@
                     ++sitr)
                 {
-                    osg::notify(osg::INFO) << "       replace duplicate "<<*current<<" with "<<*first_unique<< std::endl;
+                    NOTIFY(osg::INFO) << "       replace duplicate "<<*current<<" with "<<*first_unique<< std::endl;
                     osg::Object* obj = *sitr;
                     osg::Drawable* drawable = dynamic_cast<osg::Drawable*>(obj);
@@ -1105 +1105 @@
                     else
                     {
-                        osg::notify(osg::WARN)<<"Warning:: during Optimize::CollectLowestTransformsVisitor::removeTransforms(Node*)"<<std::endl;
-                        osg::notify(osg::WARN)<<"          unhandled of setting of indentity matrix on "<< titr->first->className()<<std::endl;
-                        osg::notify(osg::WARN)<<"          model will appear in the incorrect position."<<std::endl;
+                        NOTIFY(osg::WARN)<<"Warning:: during Optimize::CollectLowestTransformsVisitor::removeTransforms(Node*)"<<std::endl;
+                        NOTIFY(osg::WARN)<<"          unhandled of setting of indentity matrix on "<< titr->first->className()<<std::endl;
+                        NOTIFY(osg::WARN)<<"          model will appear in the incorrect position."<<std::endl;
                     }
                 }
@@ -1444 +1444 @@
         else
         {
-            osg::notify(osg::WARN)<<"Optimizer::RemoveRedundantNodesVisitor::removeRedundantNodes() - failed dynamic_cast"<<std::endl;
+            NOTIFY(osg::WARN)<<"Optimizer::RemoveRedundantNodesVisitor::removeRedundantNodes() - failed dynamic_cast"<<std::endl;
         }                                
     }
@@ -1525 +1525 @@
         else
         {
-            osg::notify(osg::WARN)<<"Optimizer::RemoveLoadedProxyNodesVisitor::removeRedundantNodes() - failed dynamic_cast"<<std::endl;
+            NOTIFY(osg::WARN)<<"Optimizer::RemoveLoadedProxyNodesVisitor::removeRedundantNodes() - failed dynamic_cast"<<std::endl;
         }                                
     }
@@ -1826 +1826 @@
     {
     
-        // osg::notify(osg::NOTICE)<<"Before "<<geode.getNumDrawables()<<std::endl;
+        // NOTIFY(osg::NOTICE)<<"Before "<<geode.getNumDrawables()<<std::endl;
     
         typedef std::vector<osg::Geometry*>                         DuplicateList;
@@ -1995 +1995 @@
 
                         static int co = 0;
-                        osg::notify(osg::INFO)<<"merged and removed Geometry "<<++co<<std::endl;
+                        NOTIFY(osg::INFO)<<"merged and removed Geometry "<<++co<<std::endl;
                     }
                 }
@@ -2002 +2002 @@
 #endif
 
-        // osg::notify(osg::NOTICE)<<"After "<<geode.getNumDrawables()<<std::endl;
+        // NOTIFY(osg::NOTICE)<<"After "<<geode.getNumDrawables()<<std::endl;
 
     }
@@ -2282 +2282 @@
         }
             
-        virtual void apply(osg::Array&) { osg::notify(osg::WARN) << "Warning: Optimizer's MergeArrayVisitor cannot merge Array type." << std::endl; }
+        virtual void apply(osg::Array&) { NOTIFY(osg::WARN) << "Warning: Optimizer's MergeArrayVisitor cannot merge Array type." << std::endl; }
 
         virtual void apply(osg::ByteArray& rhs) { if (_offset) _mergeAndOffset(rhs); else  _merge(rhs); }
@@ -2643 +2643 @@
     bool zAxis = (bb.zMax()-bb.zMin())>divide_distance;
 
-    osg::notify(osg::INFO)<<"Dividing "<<group->className()<<"  num children = "<<group->getNumChildren()<<"  xAxis="<<xAxis<<"  yAxis="<<yAxis<<"   zAxis="<<zAxis<<std::endl;
+    NOTIFY(osg::INFO)<<"Dividing "<<group->className()<<"  num children = "<<group->getNumChildren()<<"  xAxis="<<xAxis<<"  yAxis="<<yAxis<<"   zAxis="<<zAxis<<std::endl;
     
     if (!xAxis && !yAxis && !zAxis)
     {
-        osg::notify(osg::INFO)<<"  No axis to divide, stopping division."<<std::endl;
+        NOTIFY(osg::INFO)<<"  No axis to divide, stopping division."<<std::endl;
         return false;
     }
@@ -2811 +2811 @@
     bool zAxis = (bb.zMax()-bb.zMin())>divide_distance;
 
-    osg::notify(osg::INFO)<<"INFO "<<geode->className()<<"  num drawables = "<<geode->getNumDrawables()<<"  xAxis="<<xAxis<<"  yAxis="<<yAxis<<"   zAxis="<<zAxis<<std::endl;
+    NOTIFY(osg::INFO)<<"INFO "<<geode->className()<<"  num drawables = "<<geode->getNumDrawables()<<"  xAxis="<<xAxis<<"  yAxis="<<yAxis<<"   zAxis="<<zAxis<<std::endl;
     
     if (!xAxis && !yAxis && !zAxis)
     {
-        osg::notify(osg::INFO)<<"  No axis to divide, stopping division."<<std::endl;
+        NOTIFY(osg::INFO)<<"  No axis to divide, stopping division."<<std::endl;
         return false;
     }
@@ -2822 +2822 @@
     if (parents.empty()) 
     {
-        osg::notify(osg::INFO)<<"  Cannot perform spatialize on root Geode, add a Group above it to allow subdivision."<<std::endl;
+        NOTIFY(osg::INFO)<<"  Cannot perform spatialize on root Geode, add a Group above it to allow subdivision."<<std::endl;
         return false;
     }
@@ -2867 +2867 @@
 void Optimizer::CopySharedSubgraphsVisitor::copySharedNodes()
 {
-    osg::notify(osg::INFO)<<"Shared node "<<_sharedNodeList.size()<<std::endl;
+    NOTIFY(osg::INFO)<<"Shared node "<<_sharedNodeList.size()<<std::endl;
     for(SharedNodeList::iterator itr=_sharedNodeList.begin();
         itr!=_sharedNodeList.end();
         ++itr)
     {
-        osg::notify(osg::INFO)<<"   No parents "<<(*itr)->getNumParents()<<std::endl;
+        NOTIFY(osg::INFO)<<"   No parents "<<(*itr)->getNumParents()<<std::endl;
         osg::Node* node = *itr;
         for(unsigned int i=node->getNumParents()-1;i>0;--i)
@@ -3039 +3039 @@
     if (geodeDuplicateMap.empty()) return false;
     
-    osg::notify(osg::INFO)<<"mergeGeodes in group '"<<group.getName()<<"' "<<geodeDuplicateMap.size()<<std::endl;
+    NOTIFY(osg::INFO)<<"mergeGeodes in group '"<<group.getName()<<"' "<<geodeDuplicateMap.size()<<std::endl;
     
     // merge
@@ -3246 +3246 @@
                 ++aitr)
             {
-                osg::notify(osg::INFO)<<"checking source "<<source->_image->getFileName()<<" to see it it'll fit in atlas "<<aitr->get()<<std::endl;
+                NOTIFY(osg::INFO)<<"checking source "<<source->_image->getFileName()<<" to see it it'll fit in atlas "<<aitr->get()<<std::endl;
                 if ((*aitr)->doesSourceFit(source))
                 {
@@ -3254 +3254 @@
                 else
                 {
-                    osg::notify(osg::INFO)<<"source "<<source->_image->getFileName()<<" does not fit in atlas "<<aitr->get()<<std::endl;
+                    NOTIFY(osg::INFO)<<"source "<<source->_image->getFileName()<<" does not fit in atlas "<<aitr->get()<<std::endl;
                 }
             }
@@ -3260 +3260 @@
             if (!addedSourceToAtlas)
             {
-                osg::notify(osg::INFO)<<"creating new Atlas for "<<source->_image->getFileName()<<std::endl;
+                NOTIFY(osg::INFO)<<"creating new Atlas for "<<source->_image->getFileName()<<std::endl;
 
                 osg::ref_ptr<Atlas> atlas = new Atlas(_maximumAtlasWidth,_maximumAtlasHeight,_margin);
@@ -3579 +3579 @@
     {
         // yes it fits :-)
-        osg::notify(osg::INFO)<<"Fits in current row"<<std::endl;
+        NOTIFY(osg::INFO)<<"Fits in current row"<<std::endl;
         return true;
     }
@@ -3587 +3587 @@
     {
         // yes it fits :-)
-        osg::notify(osg::INFO)<<"Fits in next row"<<std::endl;
+        NOTIFY(osg::INFO)<<"Fits in next row"<<std::endl;
         return true;
     }
@@ -3600 +3600 @@
     if (!doesSourceFit(source))
     {
-        osg::notify(osg::INFO)<<"source "<<source->_image->getFileName()<<" does not fit in atlas "<<this<<std::endl;
+        NOTIFY(osg::INFO)<<"source "<<source->_image->getFileName()<<" does not fit in atlas "<<this<<std::endl;
         return false;
     }
@@ -3644 +3644 @@
         _sourceList.push_back(source);
 
-        osg::notify(osg::INFO)<<"current row insertion, source "<<source->_image->getFileName()<<" "<<_x<<","<<_y<<" fits in row of atlas "<<this<<std::endl;
+        NOTIFY(osg::INFO)<<"current row insertion, source "<<source->_image->getFileName()<<" "<<_x<<","<<_y<<" fits in row of atlas "<<this<<std::endl;
 
         // set up the source so it knows where it is in the atlas
@@ -3672 +3672 @@
         _sourceList.push_back(source);
 
-        osg::notify(osg::INFO)<<"next row insertion, source "<<source->_image->getFileName()<<" "<<_x<<","<<_y<<" fits in row of atlas "<<this<<std::endl;
+        NOTIFY(osg::INFO)<<"next row insertion, source "<<source->_image->getFileName()<<" "<<_x<<","<<_y<<" fits in row of atlas "<<this<<std::endl;
 
         // set up the source so it knows where it is in the atlas
@@ -3686 +3686 @@
         _height = _y + sourceImage->t() + 2*_margin;
 
-        osg::notify(osg::INFO)<<"source "<<source->_image->getFileName()<<" "<<_x<<","<<_y<<" fits in row of atlas "<<this<<std::endl;
+        NOTIFY(osg::INFO)<<"source "<<source->_image->getFileName()<<" "<<_x<<","<<_y<<" fits in row of atlas "<<this<<std::endl;
 
         return true;
     }
 
-    osg::notify(osg::INFO)<<"source "<<source->_image->getFileName()<<" does not fit in atlas "<<this<<std::endl;
+    NOTIFY(osg::INFO)<<"source "<<source->_image->getFileName()<<" does not fit in atlas "<<this<<std::endl;
 
     // shouldn't get here, unless doesSourceFit isn't working...
@@ -3705 +3705 @@
     while (h<_height) h *= 2;
     
-    osg::notify(osg::INFO)<<"Clamping "<<_width<<", "<<_height<<" to "<<w<<","<<h<<std::endl;
+    NOTIFY(osg::INFO)<<"Clamping "<<_width<<", "<<_height<<" to "<<w<<","<<h<<std::endl;
     
     _width = w;
@@ -3714 +3714 @@
 void Optimizer::TextureAtlasBuilder::Atlas::copySources()
 {
-    osg::notify(osg::INFO)<<"Allocated to "<<_width<<","<<_height<<std::endl;
+    NOTIFY(osg::INFO)<<"Allocated to "<<_width<<","<<_height<<std::endl;
     _image->allocateImage(_width,_height,1,
                           _image->getPixelFormat(),_image->getDataType(),
@@ -3726 +3726 @@
     }        
 
-    osg::notify(osg::INFO)<<"Atlas::copySources() "<<std::endl;
+    NOTIFY(osg::INFO)<<"Atlas::copySources() "<<std::endl;
     for(SourceList::iterator itr = _sourceList.begin();
         itr !=_sourceList.end();
@@ -3736 +3736 @@
         if (atlas)
         {
-            osg::notify(osg::INFO)<<"Copying image "<<source->_image->getFileName()<<" to "<<source->_x<<" ,"<<source->_y<<std::endl;
-            osg::notify(osg::INFO)<<"        image size "<<source->_image->s()<<","<<source->_image->t()<<std::endl;
+            NOTIFY(osg::INFO)<<"Copying image "<<source->_image->getFileName()<<" to "<<source->_x<<" ,"<<source->_y<<std::endl;
+            NOTIFY(osg::INFO)<<"        image size "<<source->_image->s()<<","<<source->_image->t()<<std::endl;
 
             const osg::Image* sourceImage = source->_image.get();
@@ -4098 +4098 @@
         {
             // safe to convert into CLAMP wrap mode.
-            osg::notify(osg::INFO)<<"Changing wrap mode to CLAMP"<<std::endl;
+            NOTIFY(osg::INFO)<<"Changing wrap mode to CLAMP"<<std::endl;
             texture->setWrap(osg::Texture2D::WRAP_S, osg::Texture::CLAMP);
             texture->setWrap(osg::Texture2D::WRAP_T, osg::Texture::CLAMP);
@@ -4207 +4207 @@
                     if (s_repeat || t_repeat)
                     {
-                        osg::notify(osg::NOTICE)<<"Warning!!! shouldn't get here"<<std::endl;
+                        NOTIFY(osg::NOTICE)<<"Warning!!! shouldn't get here"<<std::endl;
                     }
 
@@ -4238 +4238 @@
                     if (canTexMatBeFlattenedToAllDrawables)
                     {
-                        // osg::notify(osg::NOTICE)<<"All drawables can be flattened "<<drawables.size()<<std::endl;
+                        // NOTIFY(osg::NOTICE)<<"All drawables can be flattened "<<drawables.size()<<std::endl;
                         for(Drawables::iterator ditr = drawables.begin();
                             ditr != drawables.end();
@@ -4258 +4258 @@
                             else
                             {
-                                osg::notify(osg::NOTICE)<<"Error, Optimizer::TextureAtlasVisitor::optimize() shouldn't ever get here..."<<std::endl;
+                                NOTIFY(osg::NOTICE)<<"Error, Optimizer::TextureAtlasVisitor::optimize() shouldn't ever get here..."<<std::endl;
                             }                        
                         }
@@ -4264 +4264 @@
                     else
                     {
-                        // osg::notify(osg::NOTICE)<<"Applying TexMat "<<drawables.size()<<std::endl;
+                        // NOTIFY(osg::NOTICE)<<"Applying TexMat "<<drawables.size()<<std::endl;
                         stateset->setTextureAttribute(unit, new osg::TexMat(matrix));
                     }
@@ -4344 +4344 @@
         else
         {
-            osg::notify(osg::NOTICE) << "No parent for this Group" << std::endl;
+            NOTIFY(osg::NOTICE) << "No parent for this Group" << std::endl;
         }
     }
@@ -4385 +4385 @@
         else
         {
-            osg::notify(osg::NOTICE) << "No parent for this Group" << std::endl;
+            NOTIFY(osg::NOTICE) << "No parent for this Group" << std::endl;
         }
     }
@@ -4423 +4423 @@
         }
         else
-            osg::notify(osg::NOTICE) << "No parent for this LOD" << std::endl;
+            NOTIFY(osg::NOTICE) << "No parent for this LOD" << std::endl;
     }
     else
@@ -4461 +4461 @@
                     parent_group->replaceChild(&geode, new_geode.get());
                 else
-                    osg::notify(osg::NOTICE) << "No parent for this Geode" << std::endl;
+                    NOTIFY(osg::NOTICE) << "No parent for this Geode" << std::endl;
 
                 transformGeode(*(new_geode.get()));
@@ -4495 +4495 @@
                     parent_group->replaceChild(&billboard, new_billboard.get());
                 else
-                    osg::notify(osg::NOTICE) << "No parent for this Billboard" << std::endl;
+                    NOTIFY(osg::NOTICE) << "No parent for this Billboard" << std::endl;
 
                 transformBillboard(*(new_billboard.get()));