Changeset 10174 for OpenSceneGraph/trunk/include/osgDB/Options

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/include/osgDB/Options (modified) (4 diffs)

OpenSceneGraph/trunk/include/osgDB/Options

@@ -17 +17 @@
 #include <osgDB/AuthenticationMap>
 #include <osgDB/ReaderWriter>
+#include <osgDB/FileCache>
 
 #include <deque>
@@ -87 +88 @@
 };
 
+class OSGDB_EXPORT FileLocationCallback : public virtual osg::Referenced
+{
+    public:
+
+        enum Location
+        {
+            LOCAL_FILE,
+            REMOTE_FILE
+        };
+
+        virtual Location fileLocation(const std::string& filename, const Options* options) = 0;
+
+        virtual bool useFileCache() const = 0;
+
+    protected:
+        virtual ~FileLocationCallback() {}
+};
+
+
 /** Options base class used for passing options into plugins to control their operation.*/
-class Options : public osg::Object
+class OSGDB_EXPORT Options : public osg::Object
 {
     public:
@@ -234 +254 @@
 
 
-        /** Set the Registry callback to use in place of the default writeFile calls.*/
+        /** Set the callback to use in place of the default writeFile calls.*/
         void setWriteFileCallback( WriteFileCallback* cb) { _writeFileCallback = cb; }
 
         /** Get the const writeFile callback.*/
         WriteFileCallback* getWriteFileCallback() const { return _writeFileCallback.get(); }
+
+
+        /** Set the callback to use inform the DatabasePager whether a file is located on local or remote file system..*/
+        void setFileLocationCallback( FileLocationCallback* cb) { _fileLocationCallback = cb; }
+
+        /** Get the callback to use inform the DatabasePager whether a file is located on local or remote file system..*/
+        FileLocationCallback* getFileLocationCallback() const { return _fileLocationCallback.get(); }
+
+
+        /** Set the FileCache that is used to manage local storage of files downloaded from the internet.*/
+        void setFileCache(FileCache* fileCache) { _fileCache = fileCache; }
+
+        /** Get the FileCache that is used to manage local storage of files downloaded from the internet.*/
+        FileCache* getFileCache() const { return _fileCache.get(); }
 
 
@@ -259 +293 @@
         osg::ref_ptr<ReadFileCallback>      _readFileCallback;
         osg::ref_ptr<WriteFileCallback>     _writeFileCallback;
+        osg::ref_ptr<FileLocationCallback>  _fileLocationCallback;
+
+        osg::ref_ptr<FileCache>             _fileCache;
 };