Merge branch 'next' of git.gitorious.org:fg/simgear into next

[simgear.git] / simgear / scene / model / SGPagedLOD.hxx

diff --git a/simgear/scene/model/SGPagedLOD.hxx b/simgear/scene/model/SGPagedLOD.hxx
index a9e55d96f7d76034473fdbb4e6dbade13cf23a6c..69f8dc21edcf4a8dc6c21fd6ea136bf587fd3ed5 100644 (file)
--- a/simgear/scene/model/SGPagedLOD.hxx
+++ b/simgear/scene/model/SGPagedLOD.hxx
@@ -20,8 +20,7 @@
 #include <simgear/structure/OSGVersion.hxx>
 
 #define SG_PAGEDLOD_HAS_OPTIONS \
-    (SG_OSG_VERSION >= 29005 \
-     || (SG_OSG_VERSION < 29000 && SG_OSG_VERSION >= 28003))
+    (SG_OSG_VERSION >= 29005)
 
 #include <osg/PagedLOD>
 #include <osgDB/Registry>
@@ -53,14 +52,7 @@ public:
     // reimplemented to notify the loading through ModelData
     bool addChild(osg::Node *child);
 
-    void setReaderWriterOptions(osgDB::ReaderWriter::Options *options) {
-        options->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_NONE);
-#if SG_PAGEDLOD_HAS_OPTIONS
-        setDatabaseOptions(options);
-#else
-        _readerWriterOptions = options;
-#endif
-    }
+    void setReaderWriterOptions(osgDB::ReaderWriter::Options *options);
 
     osgDB::ReaderWriter::Options* getReaderWriterOptions() {
 #if SG_PAGEDLOD_HAS_OPTIONS
@@ -70,11 +62,14 @@ public:
 #endif
     }
 
+    static void setRenderingCache(bool cache) {_cache = cache;}
 protected:
     virtual ~SGPagedLOD();
-#if SG_PAGEDLOD_HAS_OPTIONS
+#if !SG_PAGEDLOD_HAS_OPTIONS
     osg::ref_ptr<osgDB::ReaderWriter::Options> _readerWriterOptions;
 #endif
+private:
+    static bool _cache;
 };
 }
 #endif