Changeset 10174 for OpenSceneGraph/trunk/src/osgWrappers/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/osgWrappers/osgDB/DatabasePager.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgWrappers/osgDB/DatabasePager.cpp

@@ -20 +20 @@
 #include <osg/State>
 #include <osgDB/DatabasePager>
-#include <osgDB/Options>
 
 // Must undefine IN and OUT macros defined in Windows headers
@@ -70 +69 @@
                   "Create a shallow copy on the DatabasePager. ",
                   "");
-        I_Method5(void, requestNodeFile, IN, const std::string &, fileName, IN, osg::Group *, group, IN, float, priority, IN, const osg::FrameStamp *, framestamp, IN, osg::ref_ptr< osg::Referenced > &, databaseRequest,
-                  Properties::VIRTUAL,
-                  __void__requestNodeFile__C5_std_string_R1__osg_Group_P1__float__C5_osg_FrameStamp_P1__osg_ref_ptrT1_osg_Referenced__R1,
+        I_Method6(void, requestNodeFile, IN, const std::string &, fileName, IN, osg::Group *, group, IN, float, priority, IN, const osg::FrameStamp *, framestamp, IN, osg::ref_ptr< osg::Referenced > &, databaseRequest, IN, const osg::Referenced *, options,
+                  Properties::VIRTUAL,
+                  __void__requestNodeFile__C5_std_string_R1__osg_Group_P1__float__C5_osg_FrameStamp_P1__osg_ref_ptrT1_osg_Referenced__R1__C5_osg_Referenced_P1,
                   "Add a request to load a node file to end the the database request list. ",
-                  "");
-        I_Method6(void, requestNodeFile, IN, const std::string &, fileName, IN, osg::Group *, group, IN, float, priority, IN, const osg::FrameStamp *, framestamp, IN, osg::ref_ptr< osg::Referenced > &, databaseRequest, IN, osgDB::Options *, loadOptions,
-                  Properties::VIRTUAL,
-                  __void__requestNodeFile__C5_std_string_R1__osg_Group_P1__float__C5_osg_FrameStamp_P1__osg_ref_ptrT1_osg_Referenced__R1__Options_P1,
-                  "",
                   "");
         I_Method1(int, setSchedulePriority, IN, OpenThreads::Thread::ThreadPriority, priority,