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

Fixed virtual method mismtaches between subclasses and parent classes.

Browse Source
This commit is contained in:
Robert Osfield 2011-06-23 16:36:36 +00:00
parent ee7668fe6c
commit c617ea0163
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/osg/OcclusionQueryNode
View File

@ -74,8 +74,8 @@ public:
unsigned int getNumPixels( const osg::Camera* cam );
void releaseGLObjects( osg::State* state = 0 );
virtual void releaseGLObjects( osg::State* state = 0 ) const;
static void deleteQueryObject( unsigned int contextID, GLuint handle );
static void flushDeletedQueryObjects( unsigned int contextID, double currentTime, double& availableTime );
static void discardDeletedQueryObjects( unsigned int contextID );

2
include/osgViewer/Viewer
View File

@ -39,7 +39,7 @@ class OSGVIEWER_EXPORT Viewer : public ViewerBase, public osgViewer::View
META_Object(osgViewer,Viewer);
/** Take all the settings, Camera and Slaves from the passed in view(er), leaving it empty. */
virtual void take(View& rhs);
virtual void take(osg::View& rhs);
/** Set the Stats object used for collect various frame related timing and scene graph stats.*/

9
src/osg/OcclusionQueryNode.cpp
View File

@ -373,14 +373,17 @@ QueryGeometry::getNumPixels( const osg::Camera* cam )
void
QueryGeometry::releaseGLObjects( osg::State* state )
QueryGeometry::releaseGLObjects( osg::State* state ) const
{
if (!state)
{
// delete all query IDs for all contexts.
reset();
const_cast<QueryGeometry*>(this)->reset();
}
else
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock( _mapMutex );
// Delete all query IDs for the specified context.
unsigned int contextID = state->getContextID();
ResultMap::iterator it = _results.begin();

2
src/osgViewer/Viewer.cpp
View File

@ -248,7 +248,7 @@ Viewer::~Viewer()
OSG_INFO<<"Viewer::~Viewer() end destructor getThreads = "<<threads.size()<<std::endl;
}
void Viewer::take(View& rhs)
void Viewer::take(osg::View& rhs)
{
osgViewer::View::take(rhs);