FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Paul Martz, typo fixes

Browse Source
This commit is contained in:
Robert Osfield 2008-07-23 21:25:09 +00:00
parent bfcc7473b8
commit 86ca0860cc
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osg/OcclusionQueryNode.cpp
View File

@ -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 );

8
src/osgUtil/CullVisitor.cpp
View File

@ -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