From 86ca0860cc0b5e27153f723d92546c933033f758 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 23 Jul 2008 21:25:09 +0000 Subject: [PATCH] From Paul Martz, typo fixes --- src/osg/OcclusionQueryNode.cpp | 6 +++--- src/osgUtil/CullVisitor.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/osg/OcclusionQueryNode.cpp b/src/osg/OcclusionQueryNode.cpp index 38b0c0066be..7666c01b993 100644 --- a/src/osg/OcclusionQueryNode.cpp +++ b/src/osg/OcclusionQueryNode.cpp @@ -284,7 +284,7 @@ struct ClearQueriesCallback : public osg::Camera::DrawCallback { if (!_rqcb) { - osg::notify( osg::FATAL ) << "oagOQ: CQCB: Invalid RQCB." << std::endl; + osg::notify( osg::FATAL ) << "osgOQ: CQCB: Invalid RQCB." << std::endl; return; } _rqcb->reset(); @@ -365,7 +365,7 @@ QueryGeometry::drawImplementation( osg::RenderInfo& renderInfo ) const RetrieveQueriesCallback* >( cam->getPostDrawCallback() ); if (!rqcb) { - osg::notify( osg::FATAL ) << "oagOQ: QG: Invalid RQCB." << std::endl; + osg::notify( osg::FATAL ) << "osgOQ: QG: Invalid RQCB." << std::endl; return; } rqcb->add( tr ); @@ -380,7 +380,7 @@ QueryGeometry::drawImplementation( osg::RenderInfo& renderInfo ) const } osg::notify( osg::DEBUG_INFO ) << - "oagOQ: QG: Querying for: " << _oqnName << std::endl; + "osgOQ: QG: Querying for: " << _oqnName << std::endl; ext->glBeginQuery( GL_SAMPLES_PASSED_ARB, tr->_id ); osg::Geometry::drawImplementation( renderInfo ); diff --git a/src/osgUtil/CullVisitor.cpp b/src/osgUtil/CullVisitor.cpp index 003cae5740e..c6664f43be3 100644 --- a/src/osgUtil/CullVisitor.cpp +++ b/src/osgUtil/CullVisitor.cpp @@ -1344,10 +1344,10 @@ void CullVisitor::apply(osg::Camera& camera) // set up to charge the same PositionalStateContainer is the parent previous stage. - osg::Matrix inhertiedMVtolocalMV; - inhertiedMVtolocalMV.invert(originalModelView); - inhertiedMVtolocalMV.postMult(*getModelViewMatrix()); - rtts->setInheritedPositionalStateContainerMatrix(inhertiedMVtolocalMV); + osg::Matrix inheritedMVtolocalMV; + inheritedMVtolocalMV.invert(originalModelView); + inheritedMVtolocalMV.postMult(*getModelViewMatrix()); + rtts->setInheritedPositionalStateContainerMatrix(inheritedMVtolocalMV); rtts->setInheritedPositionalStateContainer(previous_stage->getPositionalStateContainer()); // record the render bin, to be restored after creation