Work around apparent OSG 3.2.0 normal binding bug.

[simgear.git] / simgear / scene / util / SGReaderWriterOptions.hxx

diff --git a/simgear/scene/util/SGReaderWriterOptions.hxx b/simgear/scene/util/SGReaderWriterOptions.hxx
index 29ff31eb1e4baa04c12fd563ac8968ac183d088b..2a4b983d283194b8c00985e5f89d6f5f94ea0ab3 100644 (file)
--- a/simgear/scene/util/SGReaderWriterOptions.hxx
+++ b/simgear/scene/util/SGReaderWriterOptions.hxx
@@ -39,7 +39,7 @@ public:
         _instantiateEffects(false)
     { }
     SGReaderWriterOptions(const std::string& str) :
-        osgDB::ReaderWriter::Options(str),
+        osgDB::Options(str),
         _materialLib(0),
         _load_panel(0),
         _model_data(0),
@@ -47,7 +47,7 @@ public:
     { }
     SGReaderWriterOptions(const osgDB::Options& options,
                           const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY) :
-        osgDB::ReaderWriter::Options(options, copyop),
+        osgDB::Options(options, copyop),
         _materialLib(0),
         _load_panel(0),
         _model_data(0),
@@ -55,7 +55,7 @@ public:
     { }
     SGReaderWriterOptions(const SGReaderWriterOptions& options,
                           const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY) :
-        osgDB::ReaderWriter::Options(options, copyop),
+        osgDB::Options(options, copyop),
         _propertyNode(options._propertyNode),
         _materialLib(options._materialLib),
         _load_panel(options._load_panel),
@@ -92,8 +92,11 @@ public:
     void setInstantiateEffects(bool instantiateEffects)
     { _instantiateEffects = instantiateEffects; }
 
+    static SGReaderWriterOptions* copyOrCreate(const osgDB::Options* options);
+    static SGReaderWriterOptions* fromPath(const std::string& path);
+
 protected:
-    virtual ~SGReaderWriterOptions() {}
+    virtual ~SGReaderWriterOptions();
 
 private:
     SGSharedPtr<SGPropertyNode> _propertyNode;