X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FScenery%2FSceneryPager.hxx;h=d8f519a1bc3960255701c0ea058240060efddcb7;hb=69baf3a9d6adb645325e7bfc0305b09604379d9f;hp=ba018993c6075b04f481425b9e6efbe85a485b10;hpb=047af7dec4c9fa508e700d9fe11b416bfe8028cd;p=flightgear.git diff --git a/src/Scenery/SceneryPager.hxx b/src/Scenery/SceneryPager.hxx index ba018993c..d8f519a1b 100644 --- a/src/Scenery/SceneryPager.hxx +++ b/src/Scenery/SceneryPager.hxx @@ -38,17 +38,6 @@ public: 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, - osg::ref_ptr& 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, osg::ref_ptr& databaseRequest, @@ -77,15 +66,7 @@ protected: _databaseRequest(&databaseRequest) {} - void doRequest(SceneryPager* pager) - { - if (_group->getNumChildren() == 0) - pager->requestNodeFile(_fileName, _group.get(), _priority, - _frameStamp.get(), - *_databaseRequest, - _options.get()); - } - + void doRequest(SceneryPager* pager); std::string _fileName; osg::ref_ptr _group; float _priority;