diff --git a/src/osgShadow/ConvexPolyhedron.cpp b/src/osgShadow/ConvexPolyhedron.cpp index a6cf2e966..217d2a46c 100644 --- a/src/osgShadow/ConvexPolyhedron.cpp +++ b/src/osgShadow/ConvexPolyhedron.cpp @@ -31,18 +31,12 @@ using namespace osgShadow; #if defined( DEBUG ) || defined( _DEBUG ) || defined( _DEBUG_ ) - -// #define MAKE_CHECKS 0 - + #define MAKE_CHECKS 1 #endif #if MAKE_CHECKS -inline std::ostream & DEBUG_NOTIFY( void ) -{ - return osg::notify( osg::WARN ); -} -#define WARN DEBUG_NOTIFY() +#define WARN OSG_WARN #define CONVEX_POLYHEDRON_CHECK_COHERENCY 1 #define CONVEX_POLYHEDRON_WARN_ON_INCOHERENT_DATA 2 @@ -57,7 +51,7 @@ inline std::ostream & DEBUG_NOTIFY( void ) #else -#define WARN osg::notify( osg::WARN ) +#define WARN OSG_WARN #define CONVEX_POLYHEDRON_CHECK_COHERENCY 0 #define CONVEX_POLYHEDRON_WARN_ON_INCOHERENT_DATA 0 diff --git a/src/osgShadow/MinimalShadowMap.cpp b/src/osgShadow/MinimalShadowMap.cpp index 78c77fab8..5f31ba65c 100644 --- a/src/osgShadow/MinimalShadowMap.cpp +++ b/src/osgShadow/MinimalShadowMap.cpp @@ -438,9 +438,7 @@ void MinimalShadowMap::ViewData::clampProjection if( !perspective && !projection.getOrtho( l, r, b, t, n, f ) ) { // What to do here ? - osg::notify( osg::WARN ) - << "MinimalShadowMap::clampProjectionFarPlane failed - non standard matrix" - << std::endl; + OSG_WARN << "MinimalShadowMap::clampProjectionFarPlane failed - non standard matrix" << std::endl; } else if( n < new_near || new_far < f ) { @@ -482,9 +480,7 @@ void MinimalShadowMap::ViewData::extendProjection bool frustum = projection.getFrustum( l,r,b,t,n,f ); if( !frustum && !projection.getOrtho( l,r,b,t,n,f ) ) { - osg::notify( osg::WARN ) - << " Awkward projection matrix. ComputeExtendedProjection failed" - << std::endl; + OSG_WARN << " Awkward projection matrix. ComputeExtendedProjection failed" << std::endl; return; } diff --git a/src/osgShadow/OccluderGeometry.cpp b/src/osgShadow/OccluderGeometry.cpp index e51edeb2b..2cacf952b 100644 --- a/src/osgShadow/OccluderGeometry.cpp +++ b/src/osgShadow/OccluderGeometry.cpp @@ -129,7 +129,7 @@ public: osg::StateAttribute::GLModeValue blendModeValue = _blendModeStack.empty() ? osg::StateAttribute::GLModeValue(osg::StateAttribute::INHERIT) : _blendModeStack.back(); if (blendModeValue & osg::StateAttribute::ON) { - // osg::notify(osg::NOTICE)<<"Ignoring transparent drawable."<tick(); @@ -163,7 +163,7 @@ void OccluderGeometry::computeOccluderGeometry(osg::Node* subgraph, osg::Matrix* osg::Timer_t endTick = osg::Timer::instance()->tick(); - osg::notify(osg::NOTICE)<<"done in "<delta_m(startTick, endTick)<<" ms"<delta_m(startTick, endTick)<<" ms"<size(); unsigned int numberNewVertices = _vertexPointers.empty() ? 0 : (maxVertex - minVertex) + 1; - // osg::notify(osg::NOTICE)<<"base = "<tick(); - osg::notify(osg::NOTICE)<<"removeDuplicateVertices "<delta_m(t0,t1)<<" ms"<delta_m(t1,t2)<<" ms"<delta_m(t2,t3)<<" ms"<delta_m(t3,t4)<<" ms"<delta_m(t0,t4)<<" ms"<delta_m(t0,t1)<<" ms"<delta_m(t1,t2)<<" ms"<delta_m(t2,t3)<<" ms"<delta_m(t3,t4)<<" ms"<delta_m(t0,t4)<<" ms"< EdgeSet; EdgeSet edgeSet; @@ -654,7 +654,7 @@ void OccluderGeometry::buildEdgeMaps() case(0): ++numEdgesWithNoTriangles; edge._normal.set(0.0,0.0,0.0); - osg::notify(osg::NOTICE)<<"Warning no triangles on edge."<delta_m(t0,t1)<<" ms"<delta_m(t0,t1)<<" ms"<osg::Group::traverse(nv); } void ShadowTechnique::cull(osgUtil::CullVisitor& cv) { - osg::notify(osg::NOTICE)<osg::Group::traverse(cv); } void ShadowTechnique::cleanSceneGraph() { - osg::notify(osg::NOTICE)<getOrCreateStateSet(); ss_sv1->setRenderBinDetails(shadowVolumeBin, "RenderBin"); @@ -111,7 +111,7 @@ void ShadowVolume::init() } else { - osg::notify(osg::NOTICE)<<"STENCIL_TWO_PASSES selecteted"<getOrCreateStateSet(); ss_sv1->setRenderBinDetails(shadowVolumeBin, "RenderBin"); @@ -257,7 +257,7 @@ void ShadowVolume::cull(osgUtil::CullVisitor& cv) if (shadowVolumeBin.valid()) { - //osg::notify(osg::NOTICE)<<"Found shadow volume bin, now removing it"<getRenderBinList().erase(itr); } } @@ -351,6 +351,6 @@ void ShadowVolume::cull(osgUtil::CullVisitor& cv) void ShadowVolume::cleanSceneGraph() { - osg::notify(osg::NOTICE)<