From 260d0d384fd42ab05ec116dca609bf689e42f70d Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 26 Jun 2008 12:08:37 +0000 Subject: [PATCH] From Mathias Froehlich, build fixes for various unices --- include/osg/CullSettings | 1 + src/osg/OcclusionQueryNode.cpp | 2 +- src/osgUtil/IntersectionVisitor.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/osg/CullSettings b/include/osg/CullSettings index 05dd39541..bfe1da58d 100644 --- a/include/osg/CullSettings +++ b/include/osg/CullSettings @@ -14,6 +14,7 @@ #ifndef OSG_CULLSETTINGS #define OSG_CULLSETTINGS 1 +#include #include #include diff --git a/src/osg/OcclusionQueryNode.cpp b/src/osg/OcclusionQueryNode.cpp index 12f1201ba..38b0c0066 100644 --- a/src/osg/OcclusionQueryNode.cpp +++ b/src/osg/OcclusionQueryNode.cpp @@ -383,7 +383,7 @@ QueryGeometry::drawImplementation( osg::RenderInfo& renderInfo ) const "oagOQ: QG: Querying for: " << _oqnName << std::endl; ext->glBeginQuery( GL_SAMPLES_PASSED_ARB, tr->_id ); - Geometry::drawImplementation( renderInfo ); + osg::Geometry::drawImplementation( renderInfo ); ext->glEndQuery( GL_SAMPLES_PASSED_ARB ); tr->_active = true; diff --git a/src/osgUtil/IntersectionVisitor.cpp b/src/osgUtil/IntersectionVisitor.cpp index c83076bd1..61ef0387e 100644 --- a/src/osgUtil/IntersectionVisitor.cpp +++ b/src/osgUtil/IntersectionVisitor.cpp @@ -153,7 +153,7 @@ bool IntersectorGroup::containsIntersections() IntersectionVisitor::IntersectionVisitor(Intersector* intersector, ReadCallback* readCallback) { // override the default node visitor mode. - setTraversalMode(NodeVisitor::TRAVERSE_ACTIVE_CHILDREN); + setTraversalMode(osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN); setIntersector(intersector);