Show
Ignore:
Timestamp:
08/05/09 13:06:53 (4 years ago)
Author:
robert
Message:

Moved the updating and expiry of the Registry object cache from DatabasePager? into osgViewer::Viewer/CompositeViewer.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgViewer/Viewer.cpp

    r10365 r10520  
    925925    _updateVisitor->setTraversalNumber(getFrameStamp()->getFrameNumber()); 
    926926 
    927     if (getSceneData()) 
    928     { 
    929         _updateVisitor->setImageRequestHandler(_scene->getImagePager()); 
    930         getSceneData()->accept(*_updateVisitor); 
    931     } 
    932      
    933     if (_scene->getDatabasePager()) 
    934     {     
    935         // synchronize changes required by the DatabasePager thread to the scene graph 
    936         _scene->getDatabasePager()->updateSceneGraph(*_frameStamp); 
    937     } 
    938  
    939     if (_scene->getImagePager()) 
    940     {     
    941         // synchronize changes required by the DatabasePager thread to the scene graph 
    942         _scene->getImagePager()->updateSceneGraph(*_frameStamp); 
    943     } 
     927    _scene->updateSceneGraph(*_updateVisitor); 
     928 
     929    // if we have a shared state manager prune any unused entries 
     930    if (osgDB::Registry::instance()->getSharedStateManager()) 
     931        osgDB::Registry::instance()->getSharedStateManager()->prune(); 
     932 
     933    // update the Registry object cache. 
     934    osgDB::Registry::instance()->updateTimeStampOfObjectsInCacheWithExternalReferences(*getFrameStamp()); 
     935    osgDB::Registry::instance()->removeExpiredObjectsInCache(*getFrameStamp()); 
     936 
    944937 
    945938    if (_updateOperations.valid()) 
     
    947940        _updateOperations->runOperations(this); 
    948941    } 
    949      
     942 
    950943    if (_incrementalCompileOperation.valid()) 
    951944    {