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/CompositeViewer.cpp

    r10365 r10520  
    10381038    { 
    10391039        Scene* scene = *sitr; 
    1040         if (scene->getSceneData()) 
    1041         { 
    1042             _updateVisitor->setImageRequestHandler(scene->getImagePager()); 
    1043              
    1044             scene->getSceneData()->accept(*_updateVisitor); 
    1045         } 
    1046  
    1047         if (scene->getDatabasePager()) 
    1048         {     
    1049             // synchronize changes required by the DatabasePager thread to the scene graph 
    1050             scene->getDatabasePager()->updateSceneGraph(*_frameStamp); 
    1051         } 
    1052  
    1053         if (scene->getImagePager()) 
    1054         {     
    1055             // synchronize changes required by the DatabasePager thread to the scene graph 
    1056             scene->getImagePager()->updateSceneGraph(*_frameStamp); 
    1057         } 
    1058  
    1059     } 
     1040        scene->updateSceneGraph(*_updateVisitor); 
     1041    } 
     1042 
     1043    // if we have a shared state manager prune any unused entries 
     1044    if (osgDB::Registry::instance()->getSharedStateManager()) 
     1045        osgDB::Registry::instance()->getSharedStateManager()->prune(); 
     1046 
     1047    // update the Registry object cache. 
     1048    osgDB::Registry::instance()->updateTimeStampOfObjectsInCacheWithExternalReferences(*getFrameStamp()); 
     1049    osgDB::Registry::instance()->removeExpiredObjectsInCache(*getFrameStamp()); 
     1050 
    10601051 
    10611052    if (_incrementalCompileOperation.valid())