Changeset 11046 for OpenSceneGraph/trunk/src/osgUtil/CullVisitor.cpp

Timestamp:

02/10/10 13:44:59 (3 years ago)

Author:

robert

Message:

Convert NOTIFY to OSG_NOTIFY to avoid problems with polution of users apps with the NOTIFY macro

Files:

• OpenSceneGraph/trunk/src/osgUtil/CullVisitor.cpp (modified) (29 diffs)

OpenSceneGraph/trunk/src/osgUtil/CullVisitor.cpp

@@ -170 +170 @@
         {
             ++numTests;
-            // NOTIFY(osg::WARN)<<"testing computeNearestPointInFrustum with d_near = "<<itr->first<<std::endl;
+            // OSG_NOTIFY(osg::WARN)<<"testing computeNearestPointInFrustum with d_near = "<<itr->first<<std::endl;
             value_type d_near = computeNearestPointInFrustum(itr->second._matrix, itr->second._planes,*(itr->second._drawable));
             if (d_near<_computed_znear)
             {
                 _computed_znear = d_near;
-                // NOTIFY(osg::WARN)<<"updating znear to "<<_computed_znear<<std::endl;
+                // OSG_NOTIFY(osg::WARN)<<"updating znear to "<<_computed_znear<<std::endl;
             }
         } 
 
         // osg::Timer_t end_t = osg::Timer::instance()->tick();
-        // NOTIFY(osg::NOTICE)<<"Took "<<osg::Timer::instance()->delta_m(start_t,end_t)<<"ms to test "<<numTests<<" out of "<<_nearPlaneCandidateMap.size()<<std::endl;
+        // OSG_NOTIFY(osg::NOTICE)<<"Took "<<osg::Timer::instance()->delta_m(start_t,end_t)<<"ms to test "<<numTests<<" out of "<<_nearPlaneCandidateMap.size()<<std::endl;
 
         _nearPlaneCandidateMap.clear();
@@ -193 +193 @@
     {
 
-        //NOTIFY(osg::INFO)<<"clamping "<< "znear="<<_computed_znear << " zfar="<<_computed_zfar<<std::endl;
+        //OSG_NOTIFY(osg::INFO)<<"clamping "<< "znear="<<_computed_znear << " zfar="<<_computed_zfar<<std::endl;
 
 
@@ -207 +207 @@
     else
     {
-        //NOTIFY(osg::INFO)<<"Not clamping "<< "znear="<<_computed_znear << " zfar="<<_computed_zfar<<std::endl;
+        //OSG_NOTIFY(osg::INFO)<<"Not clamping "<< "znear="<<_computed_znear << " zfar="<<_computed_zfar<<std::endl;
     }
 
@@ -219 +219 @@
     if (zfar<znear-epsilon)
     {
-        NOTIFY(osg::INFO)<<"_clampProjectionMatrix not applied, invalid depth range, znear = "<<znear<<"  zfar = "<<zfar<<std::endl;
+        OSG_NOTIFY(osg::INFO)<<"_clampProjectionMatrix not applied, invalid depth range, znear = "<<znear<<"  zfar = "<<zfar<<std::endl;
         return false;
     }
@@ -230 +230 @@
         znear = average-epsilon;
         zfar = average+epsilon;
-        // NOTIFY(osg::INFO) << "_clampProjectionMatrix widening znear and zfar to "<<znear<<" "<<zfar<<std::endl;
+        // OSG_NOTIFY(osg::INFO) << "_clampProjectionMatrix widening znear and zfar to "<<znear<<" "<<zfar<<std::endl;
     }
 
     if (fabs(projection(0,3))<epsilon  && fabs(projection(1,3))<epsilon  && fabs(projection(2,3))<epsilon )
     {
-        // NOTIFY(osg::INFO) << "Orthographic matrix before clamping"<<projection<<std::endl;
+        // OSG_NOTIFY(osg::INFO) << "Orthographic matrix before clamping"<<projection<<std::endl;
 
         value_type delta_span = (zfar-znear)*0.02;
@@ -249 +249 @@
         projection(3,2)=-(desired_zfar+desired_znear)/(desired_zfar-desired_znear);
 
-        // NOTIFY(osg::INFO) << "Orthographic matrix after clamping "<<projection<<std::endl;
+        // OSG_NOTIFY(osg::INFO) << "Orthographic matrix after clamping "<<projection<<std::endl;
     }
     else
     {
 
-        // NOTIFY(osg::INFO) << "Persepective matrix before clamping"<<projection<<std::endl;
+        // OSG_NOTIFY(osg::INFO) << "Persepective matrix before clamping"<<projection<<std::endl;
 
         //std::cout << "_computed_znear"<<_computed_znear<<std::endl;
@@ -286 +286 @@
                                         0.0f,0.0f,center*ratio,1.0f));
 
-        // NOTIFY(osg::INFO) << "Persepective matrix after clamping"<<projection<<std::endl;
+        // OSG_NOTIFY(osg::INFO) << "Persepective matrix after clamping"<<projection<<std::endl;
     }
     return true;
@@ -337 +337 @@
             n3 >= _znear)
         {
-            //NOTIFY(osg::NOTICE)<<"Triangle totally beyond znear"<<std::endl;
+            //OSG_NOTIFY(osg::NOTICE)<<"Triangle totally beyond znear"<<std::endl;
             return;
         }
@@ -346 +346 @@
             n3 < 0.0)
         {
-            // NOTIFY(osg::NOTICE)<<"Triangle totally behind eye point"<<std::endl;
+            // OSG_NOTIFY(osg::NOTICE)<<"Triangle totally behind eye point"<<std::endl;
             return;
         }
@@ -367 +367 @@
             if (numOutside==3)
             {
-                //NOTIFY(osg::NOTICE)<<"Triangle totally outside frustum "<<d1<<"\t"<<d2<<"\t"<<d3<<std::endl;
+                //OSG_NOTIFY(osg::NOTICE)<<"Triangle totally outside frustum "<<d1<<"\t"<<d2<<"\t"<<d3<<std::endl;
                 return;
             }
@@ -376 +376 @@
             }
             
-            //NOTIFY(osg::NOTICE)<<"Triangle ok w.r.t plane "<<d1<<"\t"<<d2<<"\t"<<d3<<std::endl;
+            //OSG_NOTIFY(osg::NOTICE)<<"Triangle ok w.r.t plane "<<d1<<"\t"<<d2<<"\t"<<d3<<std::endl;
 
             selector_mask <<= 1; 
@@ -386 +386 @@
             _znear = osg::minimum(_znear,n2);
             _znear = osg::minimum(_znear,n3);
-            // NOTIFY(osg::NOTICE)<<"Triangle all inside frustum "<<n1<<"\t"<<n2<<"\t"<<n3<<" number of plane="<<_planes->size()<<std::endl;
+            // OSG_NOTIFY(osg::NOTICE)<<"Triangle all inside frustum "<<n1<<"\t"<<n2<<"\t"<<n3<<" number of plane="<<_planes->size()<<std::endl;
             return;
         }
@@ -395 +395 @@
         // this means that use brute force methods for deviding up triangle. 
         
-        //NOTIFY(osg::NOTICE)<<"Using brute force method of triangle cutting frustum walls"<<std::endl;
+        //OSG_NOTIFY(osg::NOTICE)<<"Using brute force method of triangle cutting frustum walls"<<std::endl;
         _polygonOriginal.clear();
         _polygonOriginal.push_back(DistancePoint(0,v1));
@@ -459 +459 @@
             {
                 _znear = dist;
-                //NOTIFY(osg::NOTICE)<<"Near plane updated "<<_znear<<std::endl;
+                //OSG_NOTIFY(osg::NOTICE)<<"Near plane updated "<<_znear<<std::endl;
             }
         }
@@ -467 +467 @@
 CullVisitor::value_type CullVisitor::computeNearestPointInFrustum(const osg::Matrix& matrix, const osg::Polytope::PlaneList& planes,const osg::Drawable& drawable)
 {
-    // NOTIFY(osg::WARN)<<"CullVisitor::computeNearestPointInFrustum("<<getTraversalNumber()<<"\t"<<planes.size()<<std::endl;
+    // OSG_NOTIFY(osg::WARN)<<"CullVisitor::computeNearestPointInFrustum("<<getTraversalNumber()<<"\t"<<planes.size()<<std::endl;
 
     osg::TriangleFunctor<ComputeNearestPointFunctor> cnpf;
@@ -489 +489 @@
         if ( !EQUAL_F(d_near, d_far) ) 
         {
-            NOTIFY(osg::WARN)<<"Warning: CullVisitor::updateCalculatedNearFar(.) near>far in range calculation,"<< std::endl;
-            NOTIFY(osg::WARN)<<"         correcting by swapping values d_near="<<d_near<<" dfar="<<d_far<< std::endl;
+            OSG_NOTIFY(osg::WARN)<<"Warning: CullVisitor::updateCalculatedNearFar(.) near>far in range calculation,"<< std::endl;
+            OSG_NOTIFY(osg::WARN)<<"         correcting by swapping values d_near="<<d_near<<" dfar="<<d_far<< std::endl;
         }
     }
@@ -521 +521 @@
         if (lastFrameNumber != getTraversalNumber())
         {
-            NOTIFY(osg::NOTICE)<<"Took "<<elapsed_time<<"ms to test "<<numBillboards<<" billboards"<<std::endl;
+            OSG_NOTIFY(osg::NOTICE)<<"Took "<<elapsed_time<<"ms to test "<<numBillboards<<" billboards"<<std::endl;
             numBillboards = 0;
             elapsed_time = 0.0;
@@ -540 +540 @@
         d_far = distance(bb.corner(bbCornerFar),matrix);
 
-        NOTIFY(osg::NOTICE).precision(15);
+        OSG_NOTIFY(osg::NOTICE).precision(15);
 
         if (false)
         {
 
-            NOTIFY(osg::NOTICE)<<"TESTING Billboard near/far computation"<<std::endl;
-
-             // NOTIFY(osg::WARN)<<"Checking corners of billboard "<<std::endl;
+            OSG_NOTIFY(osg::NOTICE)<<"TESTING Billboard near/far computation"<<std::endl;
+
+             // OSG_NOTIFY(osg::WARN)<<"Checking corners of billboard "<<std::endl;
             // deprecated brute force way, use all corners of the bounding box.
             value_type nd_near, nd_far;
@@ -556 +556 @@
                 if (d<nd_near) nd_near = d;
                 if (d>nd_far) nd_far = d;
-                NOTIFY(osg::NOTICE)<<"\ti="<<i<<"\td="<<d<<std::endl;
+                OSG_NOTIFY(osg::NOTICE)<<"\ti="<<i<<"\td="<<d<<std::endl;
             }
 
             if (nd_near==d_near && nd_far==d_far)
             {
-                NOTIFY(osg::NOTICE)<<"\tBillboard near/far computation correct "<<std::endl;
+                OSG_NOTIFY(osg::NOTICE)<<"\tBillboard near/far computation correct "<<std::endl;
             }
             else
             {
-                NOTIFY(osg::NOTICE)<<"\tBillboard near/far computation ERROR\n\t\t"<<d_near<<"\t"<<nd_near
+                OSG_NOTIFY(osg::NOTICE)<<"\tBillboard near/far computation ERROR\n\t\t"<<d_near<<"\t"<<nd_near
                                         <<"\n\t\t"<<d_far<<"\t"<<nd_far<<std::endl;
             }
@@ -591 +591 @@
         if ( !EQUAL_F(d_near, d_far) ) 
         {
-            NOTIFY(osg::WARN)<<"Warning: CullVisitor::updateCalculatedNearFar(.) near>far in range calculation,"<< std::endl;
-            NOTIFY(osg::WARN)<<"         correcting by swapping values d_near="<<d_near<<" dfar="<<d_far<< std::endl;
+            OSG_NOTIFY(osg::WARN)<<"Warning: CullVisitor::updateCalculatedNearFar(.) near>far in range calculation,"<< std::endl;
+            OSG_NOTIFY(osg::WARN)<<"         correcting by swapping values d_near="<<d_near<<" dfar="<<d_far<< std::endl;
         }
     }
@@ -611 +611 @@
                 if (isBillboard)
                 {
-                    // NOTIFY(osg::WARN)<<"Adding billboard into deffered list"<<std::endl;
+                    // OSG_NOTIFY(osg::WARN)<<"Adding billboard into deffered list"<<std::endl;
                 
                     osg::Polytope transformed_frustum;
@@ -632 +632 @@
                 {
                     if (d_far>=0.0) _computed_znear = d_far;
-                    else NOTIFY(osg::WARN)<<"       1)  sett near with dnear="<<d_near<<"  dfar="<<d_far<< std::endl;
+                    else OSG_NOTIFY(osg::WARN)<<"       1)  sett near with dnear="<<d_near<<"  dfar="<<d_far<< std::endl;
                 }
             }
@@ -638 +638 @@
             {
                 if (d_near>=0.0) _computed_znear = d_near;
-                else NOTIFY(osg::WARN)<<"        2) sett near with d_near="<<d_near<< std::endl;
+                else OSG_NOTIFY(osg::WARN)<<"        2) sett near with d_near="<<d_near<< std::endl;
             }
         }
         else
         {
-            //if (d_near<0.0) NOTIFY(osg::WARN)<<"         3) set near with d_near="<<d_near<< std::endl;
+            //if (d_near<0.0) OSG_NOTIFY(osg::WARN)<<"         3) set near with d_near="<<d_near<< std::endl;
             _computed_znear = d_near;
         }
@@ -682 +682 @@
     {
        _computed_znear = d;
-       if (d<0.0) NOTIFY(osg::WARN)<<"Alerting billboard ="<<d<< std::endl;
+       if (d<0.0) OSG_NOTIFY(osg::WARN)<<"Alerting billboard ="<<d<< std::endl;
     }
     if (d>_computed_zfar) _computed_zfar = d;
@@ -773 +773 @@
         if (osg::isNaN(depth))
         {
-            NOTIFY(osg::NOTICE)<<"CullVisitor::apply(Geode&) detected NaN,"<<std::endl
+            OSG_NOTIFY(osg::NOTICE)<<"CullVisitor::apply(Geode&) detected NaN,"<<std::endl
                                     <<"    depth="<<depth<<", center=("<<bb.center()<<"),"<<std::endl
                                     <<"    matrix="<<matrix<<std::endl;
-            NOTIFY(osg::DEBUG_INFO) << "    NodePath:" << std::endl;
+            OSG_NOTIFY(osg::DEBUG_INFO) << "    NodePath:" << std::endl;
             for (NodePath::const_iterator i = getNodePath().begin(); i != getNodePath().end(); ++i)
             {
-                NOTIFY(osg::DEBUG_INFO) << "        \"" << (*i)->getName() << "\"" << std::endl;
+                OSG_NOTIFY(osg::DEBUG_INFO) << "        \"" << (*i)->getName() << "\"" << std::endl;
             }
         }
@@ -840 +840 @@
             if (d<_computed_znear)
             {
-                if (d<0.0) NOTIFY(osg::WARN)<<"Alerting billboard handling ="<<d<< std::endl;
+                if (d<0.0) OSG_NOTIFY(osg::WARN)<<"Alerting billboard handling ="<<d<< std::endl;
                 _computed_znear = d;
             }
@@ -851 +851 @@
         if (osg::isNaN(depth))
         {
-            NOTIFY(osg::NOTICE)<<"CullVisitor::apply(Billboard&) detected NaN,"<<std::endl
+            OSG_NOTIFY(osg::NOTICE)<<"CullVisitor::apply(Billboard&) detected NaN,"<<std::endl
                                     <<"    depth="<<depth<<", pos=("<<pos<<"),"<<std::endl
                                     <<"    *billboard_matrix="<<*billboard_matrix<<std::endl;
-            NOTIFY(osg::DEBUG_INFO) << "    NodePath:" << std::endl;
+            OSG_NOTIFY(osg::DEBUG_INFO) << "    NodePath:" << std::endl;
             for (NodePath::const_iterator i = getNodePath().begin(); i != getNodePath().end(); ++i)
             {
-                NOTIFY(osg::DEBUG_INFO) << "        \"" << (*i)->getName() << "\"" << std::endl;
+                OSG_NOTIFY(osg::DEBUG_INFO) << "        \"" << (*i)->getName() << "\"" << std::endl;
             }
         }
@@ -1026 +1026 @@
     pushProjectionMatrix(matrix.get());
     
-    //NOTIFY(osg::INFO)<<"Push projection "<<*matrix<<std::endl;
+    //OSG_NOTIFY(osg::INFO)<<"Push projection "<<*matrix<<std::endl;
     
     // note do culling check after the frustum has been updated to ensure
@@ -1037 +1037 @@
     popProjectionMatrix();
 
-    //NOTIFY(osg::INFO)<<"Pop projection "<<*matrix<<std::endl;
+    //OSG_NOTIFY(osg::INFO)<<"Pop projection "<<*matrix<<std::endl;
 
     _computed_znear = previous_znear;