Changeset 10520 for OpenSceneGraph/trunk/src/osgDB/Registry.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/Registry.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgDB/Registry.cpp

@@ -186 +186 @@
         if (switchOff) _buildKdTreesHint = Options::DO_NOT_BUILD_KDTREES;
         else _buildKdTreesHint = Options::BUILD_KDTREES;
+    }
+
+    const char* ptr=0;
+
+    _expiryDelay = 10.0;
+    if( (ptr = getenv("OSG_EXPIRY_DELAY")) != 0)
+    {
+        _expiryDelay = osg::asciiToDouble(ptr);
+        osg::notify(osg::INFO)<<"Registry : Expiry delay = "<<_expiryDelay<<std::endl;
     }
 
@@ -2105 +2114 @@
 }
 
-void Registry::updateTimeStampOfObjectsInCacheWithExternalReferences(double currentTime)
+void Registry::updateTimeStampOfObjectsInCacheWithExternalReferences(const osg::FrameStamp& frameStamp)
 {
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);
@@ -2118 +2127 @@
         {
             // so update it time stamp.
-            itr->second.second = currentTime;
-        }
-    }
-}
-
-void Registry::removeExpiredObjectsInCache(double expiryTime)
-{
+            itr->second.second = frameStamp.getReferenceTime();
+        }
+    }
+}
+
+void Registry::removeExpiredObjectsInCache(const osg::FrameStamp& frameStamp)
+{
+    double expiryTime = frameStamp.getReferenceTime() - _expiryDelay;
+
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);