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

Timestamp:

05/11/09 13:39:12 (4 years ago)

Author:

robert

Message:

Moved Registry::ReadFileCallback? + WriteFileCallback?, and osgDB::ReaderWriter::Options into their own separate Options file and into the osgDB namespace.

Introduced a new callback osgDB::FindFileCallback? that overrides the default behavior of findDataFile/findLibraryFile.

Introduced support for assigning ReaderWriter::Options directory to PagedLOD.

Introduced new osgDB::FileLocationCallback? for assistancing the DatabasePager? to know when a file is hosted on a local or remote file system.

Files:

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

OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp

@@ -446 +446 @@
             break;
     }
-    
-    //Getting CURL Environment Variables (If found rewrite OSG Options)
-    osg::ref_ptr<FileCache> fileCache = osgDB::Registry::instance()->getFileCache();
+
 
     do
@@ -482 +480 @@
 
         bool readFromFileCache = false;
-                
+
+        osg::ref_ptr<FileCache> fileCache = osgDB::Registry::instance()->getFileCache();
+        osg::ref_ptr<FileLocationCallback> fileLocationCallback = osgDB::Registry::instance()->getFileLocationCallback();
+
         if (databaseRequest.valid())
         {
+            if (databaseRequest->_loadOptions.valid())
+            {
+                if (databaseRequest->_loadOptions->getFileCache()) fileCache = databaseRequest->_loadOptions->getFileCache();
+                if (databaseRequest->_loadOptions->getFileLocationCallback()) fileLocationCallback = databaseRequest->_loadOptions->getFileLocationCallback();
+            }
+
+            // disable the FileCache if the fileLocationCallback tells us that it isn't required for this request.
+            if (fileLocationCallback.valid() && !fileLocationCallback->useFileCache()) fileCache = 0;
+
+
             // check if databaseRequest is still relevant
             if ((_pager->_frameNumber-databaseRequest->_frameNumberLastRequest)<=1)
@@ -493 +504 @@
                 {
                     case(HANDLE_ALL_REQUESTS):
+                    {
                         // do nothing as this thread can handle the load
-                        if (osgDB::containsServerAddress(databaseRequest->_fileName))
+                        if (fileCache.valid() && fileCache->isFileAppropriateForFileCache(databaseRequest->_fileName))
                         {
-                            if (fileCache.valid() && fileCache->existsInCache(databaseRequest->_fileName))
+                            if (fileCache->existsInCache(databaseRequest->_fileName))
                             {
                                 readFromFileCache = true;
@@ -502 +514 @@
                         }
                         break;
-                        
+                    }
                     case(HANDLE_NON_HTTP):
+                    {
                         // check the cache first
-                        if (osgDB::containsServerAddress(databaseRequest->_fileName))
+                        bool isHighLatencyFileRequest = false;
+
+                        if (fileLocationCallback.valid())
+                        {
+                            isHighLatencyFileRequest = fileLocationCallback->fileLocation(databaseRequest->_fileName, databaseRequest->_loadOptions.get()) == FileLocationCallback::REMOTE_FILE;
+                        }
+                        else  if (fileCache.valid() && fileCache->isFileAppropriateForFileCache(databaseRequest->_fileName))
+                        {
+                            isHighLatencyFileRequest = true;
+                        }
+
+                        if (isHighLatencyFileRequest)
                         {
                             if (fileCache.valid() && fileCache->existsInCache(databaseRequest->_fileName))
@@ -519 +543 @@
                         }
                         break;
-                        
+                    }
                     case(HANDLE_ONLY_HTTP):
-                        // make sure the request is a http request
-                        if (!osgDB::containsServerAddress(databaseRequest->_fileName))
-                        {
-                            osg::notify(osg::NOTICE)<<_name<<": Help we have request we shouldn't have "<<databaseRequest->_fileName<<std::endl;
-                            databaseRequest = 0;
-                        }
+                    {
+                        // accept all requests, as we'll assume only high latency requests will have got here.
                         break;
+                    }
                 }
             }
@@ -555 +576 @@
 
             if (databaseRequest->_loadedModel.valid() &&
-                osgDB::containsServerAddress(databaseRequest->_fileName) &&
                 fileCache.valid() &&
+                fileCache->isFileAppropriateForFileCache(databaseRequest->_fileName) &&
                 !readFromFileCache)
             {
@@ -1231 +1252 @@
 void DatabasePager::requestNodeFile(const std::string& fileName,osg::Group* group,
                                     float priority, const osg::FrameStamp* framestamp,
-                                    osg::ref_ptr<osg::Referenced>& databaseRequest)
-{
-    requestNodeFile(fileName,group,priority,framestamp,databaseRequest,Registry::instance()->getOptions());
-}
-
-void DatabasePager::requestNodeFile(const std::string& fileName,osg::Group* group,
-                                    float priority, const osg::FrameStamp* framestamp,
                                     osg::ref_ptr<osg::Referenced>& databaseRequestRef,
-                                    Options* loadOptions)
-{
+                                    const osg::Referenced* options)
+{
+    osgDB::Options* loadOptions = dynamic_cast<osgDB::Options*>(const_cast<osg::Referenced*>(options));
+    if (!loadOptions)
+    {
+       loadOptions = Registry::instance()->getOptions();
+
+        osg::notify(osg::NOTICE)<<"Using options from Registry "<<std::endl;
+    }
+    else
+    {
+        osg::notify(osg::NOTICE)<<"options from requestNodeFile "<<std::endl;
+    }
+
+
     if (!_acceptNewRequests) return;