// $Id$
#ifndef FLIGHTGEAR_SCENERYPAGERHXX
+#define FLIGHTGEAR_SCENERYPAGERHXX 1
#include <string>
#include <vector>
#include <osg/Group>
#include <osgDB/DatabasePager>
+#include <simgear/structure/OSGVersion.hxx>
+
namespace flightgear
{
class SceneryPager : public osgDB::DatabasePager
public:
SceneryPager();
SceneryPager(const SceneryPager& rhs);
-
+ // Unhide DatabasePager::requestNodeFile
+ using osgDB::DatabasePager::requestNodeFile;
// reimplement to add readerWriterOptions from SGPagedLOD
- virtual void requestNodeFile(const std::string& fileName,osg::Group* group,
- float priority, const osg::FrameStamp* framestamp);
-
+ virtual void requestNodeFile(const std::string& fileName, osg::Group* group,
+ float priority,
+ const osg::FrameStamp* framestamp,
+ osg::ref_ptr<osg::Referenced>& databaseRequest,
+#if SG_OSG_MIN_VERSION_REQUIRED(2,9,5)
+ const osg::Referenced* options
+#else
+ osgDB::ReaderWriter::Options* options
+#endif
+ );
void queueRequest(const std::string& fileName, osg::Group* node,
- float priority, osg::FrameStamp* frameStamp);
+ float priority, osg::FrameStamp* frameStamp,
+ osg::ref_ptr<osg::Referenced>& databaseRequest,
+ osgDB::ReaderWriter::Options* options);
// This is passed a ref_ptr so that it can "take ownership" of the
// node to delete and decrement its refcount while holding the
// lock on the delete list.
// Queue up file requests until the end of the frame
struct PagerRequest
{
- PagerRequest() {}
+ PagerRequest() : _priority(0.0f), _databaseRequest(0) {}
PagerRequest(const PagerRequest& rhs) :
_fileName(rhs._fileName), _group(rhs._group),
- _priority(rhs._priority), _frameStamp(rhs._frameStamp) {}
+ _priority(rhs._priority), _frameStamp(rhs._frameStamp),
+ _options(rhs._options), _databaseRequest(rhs._databaseRequest) {}
+
PagerRequest(const std::string& fileName, osg::Group* group,
- float priority, osg::FrameStamp* frameStamp) :
+ float priority, osg::FrameStamp* frameStamp,
+ osg::ref_ptr<Referenced>& databaseRequest,
+ osgDB::ReaderWriter::Options* options):
_fileName(fileName), _group(group), _priority(priority),
- _frameStamp(frameStamp) {}
+ _frameStamp(frameStamp), _options(options),
+ _databaseRequest(&databaseRequest)
+ {}
+
void doRequest(SceneryPager* pager)
{
if (_group->getNumChildren() == 0)
pager->requestNodeFile(_fileName, _group.get(), _priority,
- _frameStamp.get());
+ _frameStamp.get(),
+ *_databaseRequest,
+ _options.get());
}
+
std::string _fileName;
osg::ref_ptr<osg::Group> _group;
float _priority;
osg::ref_ptr<osg::FrameStamp> _frameStamp;
+ osg::ref_ptr<osgDB::ReaderWriter::Options> _options;
+ osg::ref_ptr<osg::Referenced>* _databaseRequest;
};
typedef std::vector<PagerRequest> PagerRequestList;
PagerRequestList _pagerRequests;
virtual ~SceneryPager();
};
}
-#define FLIGHTGEAR_SCENERYPAGERHXX 1
#endif