Changeset 10520 for OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp

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:

• OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp

@@ -909 +909 @@
     {
         _expiryDelay = osg::asciiToDouble(ptr);
-        osg::notify(osg::NOTICE)<<"Expiry delay = "<<_expiryDelay<<std::endl;
+        osg::notify(osg::NOTICE)<<"DatabasePager: Expiry delay = "<<_expiryDelay<<std::endl;
     }
 
@@ -916 +916 @@
     {
         _expiryFrames = atoi(ptr);
-        osg::notify(osg::NOTICE)<<"Expiry frames = "<<_expiryFrames<<std::endl;
+        osg::notify(osg::NOTICE)<<"DatabasePager: Expiry frames = "<<_expiryFrames<<std::endl;
     }
 
@@ -930 +930 @@
         }
             
-        osg::notify(osg::NOTICE)<<"Release delay = "<<_releaseDelay<<std::endl;
+        osg::notify(osg::NOTICE)<<"DatabasePager: Release delay = "<<_releaseDelay<<std::endl;
     }
     else
@@ -1782 +1782 @@
                               " B="<<time_b<<" avg="<<s_total_time_stage_b/s_total_iter_stage_b<<" max = "<<s_total_max_stage_b<<
                               " C="<<time_c<<" avg="<<s_total_time_stage_c/s_total_iter_stage_c<<" max = "<<s_total_max_stage_c<<std::endl;
-
-    
-    if (osgDB::Registry::instance()->getSharedStateManager()) 
-        osgDB::Registry::instance()->getSharedStateManager()->prune();
-
-    // update the Registry object cache.
-    osgDB::Registry::instance()->updateTimeStampOfObjectsInCacheWithExternalReferences(frameStamp.getReferenceTime());
-    osgDB::Registry::instance()->removeExpiredObjectsInCache(expiryTime);
 }
 
@@ -1884 +1876 @@
     osg::notify(osg::INFO)<<"_activePagedLODList.size()="<<_activePagedLODList.size()<<" overall = "<<time<<
                               " avg="<<s_total_time/s_total_iter<<" max = "<<s_total_max<<std::endl;
-     
-   
-    if (osgDB::Registry::instance()->getSharedStateManager()) 
-        osgDB::Registry::instance()->getSharedStateManager()->prune();
-
-    // update the Registry object cache.
-    osgDB::Registry::instance()->updateTimeStampOfObjectsInCacheWithExternalReferences(frameStamp.getReferenceTime());
-    osgDB::Registry::instance()->removeExpiredObjectsInCache(expiryTime);
-
-
 }