Replace osgDB::ReaderWriter::Options to osgDB::Options.

This has changed in osg, so reflect that here.

diff --git a/simgear/scene/material/mat.cxx b/simgear/scene/material/mat.cxx
index cf68c2d65d9cc4606e289f6be6c87472841615a4..51b8bbe5d39ab86d3af9e1958e8116e153c5e3ea 100644 (file)
--- a/simgear/scene/material/mat.cxx
+++ b/simgear/scene/material/mat.cxx
@@ -96,7 +96,7 @@ SGMaterial::SGMaterial( const SGReaderWriterOptions* options,
     buildEffectProperties(options);
 }
 
-SGMaterial::SGMaterial( const osgDB::ReaderWriter::Options* options,
+SGMaterial::SGMaterial( const osgDB::Options* options,
                         const SGPropertyNode *props, 
                         SGPropertyNode *prop_root)
 {

diff --git a/simgear/scene/material/mat.hxx b/simgear/scene/material/mat.hxx
index c3b7b3c3986f7483778b7541ce6d2fc40f7c26c5..292df681c03b0a27484b97cc42eea7f5bd72ccf6 100644 (file)
--- a/simgear/scene/material/mat.hxx
+++ b/simgear/scene/material/mat.hxx
@@ -89,7 +89,7 @@ public:
    * state information for the material.  This node is usually
    * loaded from the $FG_ROOT/materials.xml file.
    */
-  SGMaterial( const osgDB::ReaderWriter::Options*, 
+  SGMaterial( const osgDB::Options*, 
               const SGPropertyNode *props, 
               SGPropertyNode *prop_root);
 

diff --git a/simgear/scene/material/matlib.cxx b/simgear/scene/material/matlib.cxx
index e69fd60ddfc1d800299fad77d7fb93df2182c2ef..822147250f6ec1cb97a3747c0eb265302d11f092 100644 (file)
--- a/simgear/scene/material/matlib.cxx
+++ b/simgear/scene/material/matlib.cxx
@@ -67,9 +67,9 @@ bool SGMaterialLib::load( const string &fg_root, const string& mpath,
                 << ex.getMessage() );
         throw;
     }
-    osg::ref_ptr<osgDB::ReaderWriter::Options> options
-        = new osgDB::ReaderWriter::Options;
-    options->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_ALL);
+    osg::ref_ptr<osgDB::Options> options
+        = new osgDB::Options;
+    options->setObjectCacheHint(osgDB::Options::CACHE_ALL);
     options->setDatabasePath(fg_root);
     int nMaterials = materials.nChildren();
     for (int i = 0; i < nMaterials; i++) {

diff --git a/simgear/scene/model/ModelRegistry.cxx b/simgear/scene/model/ModelRegistry.cxx
index 273eb493f5382da4e75385b29a3559cc2033354c..f1199f689398995cf1be5decda9eb39b63f569e4 100644 (file)
--- a/simgear/scene/model/ModelRegistry.cxx
+++ b/simgear/scene/model/ModelRegistry.cxx
@@ -193,7 +193,7 @@ public:
 } // namespace
 
 Node* DefaultProcessPolicy::process(Node* node, const string& filename,
-                                    const ReaderWriter::Options* opt)
+                                    const Options* opt)
 {
     TextureNameVisitor nameVisitor;
     node->accept(nameVisitor);
@@ -202,7 +202,7 @@ Node* DefaultProcessPolicy::process(Node* node, const string& filename,
 
 ReaderWriter::ReadResult
 ModelRegistry::readImage(const string& fileName,
-                         const ReaderWriter::Options* opt)
+                         const Options* opt)
 {
     CallbackMap::iterator iter
         = imageCallbackMap.find(getFileExtension(fileName));
@@ -300,7 +300,7 @@ ModelRegistry::readImage(const string& fileName,
 
 
 osg::Node* DefaultCachePolicy::find(const string& fileName,
-                                    const ReaderWriter::Options* opt)
+                                    const Options* opt)
 {
     Registry* registry = Registry::instance();
     osg::Node* cached
@@ -342,7 +342,7 @@ OptimizeModelPolicy::OptimizeModelPolicy(const string& extension) :
 
 osg::Node* OptimizeModelPolicy::optimize(osg::Node* node,
                                          const string& fileName,
-                                         const osgDB::ReaderWriter::Options* opt)
+                                         const osgDB::Options* opt)
 {
     osgUtil::Optimizer optimizer;
     optimizer.optimize(node, _osgOptions);
@@ -358,7 +358,7 @@ osg::Node* OptimizeModelPolicy::optimize(osg::Node* node,
 }
 
 string OSGSubstitutePolicy::substitute(const string& name,
-                                       const ReaderWriter::Options* opt)
+                                       const Options* opt)
 {
     string fileSansExtension = getNameLessExtension(name);
     string osgFileName = fileSansExtension + ".osg";
@@ -413,7 +413,7 @@ ModelRegistry::addNodeCallbackForExtension(const string& extension,
 
 ReaderWriter::ReadResult
 ModelRegistry::readNode(const string& fileName,
-                        const ReaderWriter::Options* opt)
+                        const Options* opt)
 {
     ReaderWriter::ReadResult res;
     CallbackMap::iterator iter
@@ -436,10 +436,10 @@ public:
     Referenced::setThreadSafeReferenceCounting(true);
 
     Registry* registry = Registry::instance();
-    ReaderWriter::Options* options = new ReaderWriter::Options;
-    int cacheOptions = ReaderWriter::Options::CACHE_ALL;
+    Options* options = new Options;
+    int cacheOptions = Options::CACHE_ALL;
     options->
-      setObjectCacheHint((ReaderWriter::Options::CacheHintOptions)cacheOptions);
+      setObjectCacheHint((Options::CacheHintOptions)cacheOptions);
     registry->setOptions(options);
     registry->getOrCreateSharedStateManager()->
       setShareMode(SharedStateManager::SHARE_STATESETS);
@@ -457,7 +457,7 @@ struct ACOptimizePolicy : public OptimizeModelPolicy {
         _osgOptions &= ~Optimizer::TRISTRIP_GEOMETRY;
     }
     Node* optimize(Node* node, const string& fileName,
-                   const ReaderWriter::Options* opt)
+                   const Options* opt)
     {
         ref_ptr<Node> optimized
             = OptimizeModelPolicy::optimize(node, fileName, opt);
@@ -484,7 +484,7 @@ struct ACOptimizePolicy : public OptimizeModelPolicy {
 struct ACProcessPolicy {
     ACProcessPolicy(const string& extension) {}
     Node* process(Node* node, const string& filename,
-                  const ReaderWriter::Options* opt)
+                  const Options* opt)
     {
         Matrix m(1, 0, 0, 0,
                  0, 0, 1, 0,

diff --git a/simgear/scene/model/ModelRegistry.hxx b/simgear/scene/model/ModelRegistry.hxx
index e048f187a47c03a46a1a9150d5711555bcd9e296..24e78eb27c645ec0e69e65d016f3a9cd119b71dc 100644 (file)
--- a/simgear/scene/model/ModelRegistry.hxx
+++ b/simgear/scene/model/ModelRegistry.hxx
@@ -70,7 +70,7 @@ public:
     }
     virtual osgDB::ReaderWriter::ReadResult
     readNode(const std::string& fileName,
-             const osgDB::ReaderWriter::Options* opt)
+             const osgDB::Options* opt)
     {
         using namespace osg;
         using namespace osgDB;
@@ -103,7 +103,7 @@ public:
 protected:
     static osgDB::ReaderWriter::ReadResult
     loadUsingReaderWriter(const std::string& fileName,
-                          const osgDB::ReaderWriter::Options* opt)
+                          const osgDB::Options* opt)
     {
         using namespace osgDB;
         ReaderWriter* rw = Registry::instance()
@@ -126,20 +126,20 @@ protected:
 struct DefaultProcessPolicy {
     DefaultProcessPolicy(const std::string& extension) {}
     osg::Node* process(osg::Node* node, const std::string& filename,
-                       const osgDB::ReaderWriter::Options* opt);
+                       const osgDB::Options* opt);
 };
 
 struct DefaultCachePolicy {
     DefaultCachePolicy(const std::string& extension) {}
     osg::Node* find(const std::string& fileName,
-                    const osgDB::ReaderWriter::Options* opt);
+                    const osgDB::Options* opt);
     void addToCache(const std::string& filename, osg::Node* node);
 };
 
 struct NoCachePolicy {
     NoCachePolicy(const std::string& extension) {}
     osg::Node* find(const std::string& fileName,
-                    const osgDB::ReaderWriter::Options* opt)
+                    const osgDB::Options* opt)
     {
         return 0;
     }
@@ -150,7 +150,7 @@ class OptimizeModelPolicy {
 public:
     OptimizeModelPolicy(const std::string& extension);
     osg::Node* optimize(osg::Node* node, const std::string& fileName,
-                        const osgDB::ReaderWriter::Options* opt);
+                        const osgDB::Options* opt);
 protected:
     unsigned _osgOptions;
 };
@@ -158,7 +158,7 @@ protected:
 struct NoOptimizePolicy {
     NoOptimizePolicy(const std::string& extension) {}
     osg::Node* optimize(osg::Node* node, const std::string& fileName,
-                        const osgDB::ReaderWriter::Options* opt)
+                        const osgDB::Options* opt)
     {
         return node;
     }
@@ -167,13 +167,13 @@ struct NoOptimizePolicy {
 struct OSGSubstitutePolicy {
     OSGSubstitutePolicy(const std::string& extension) {}
     std::string substitute(const std::string& name,
-                           const osgDB::ReaderWriter::Options* opt);
+                           const osgDB::Options* opt);
 };
 
 struct NoSubstitutePolicy {
     NoSubstitutePolicy(const std::string& extension) {}
     std::string substitute(const std::string& name,
-                           const osgDB::ReaderWriter::Options* opt)
+                           const osgDB::Options* opt)
     {
         return std::string();
     }
@@ -206,10 +206,10 @@ public:
     ModelRegistry();
     virtual osgDB::ReaderWriter::ReadResult
     readImage(const std::string& fileName,
-              const osgDB::ReaderWriter::Options* opt);
+              const osgDB::Options* opt);
     virtual osgDB::ReaderWriter::ReadResult
     readNode(const std::string& fileName,
-             const osgDB::ReaderWriter::Options* opt);
+             const osgDB::Options* opt);
     void addImageCallbackForExtension(const std::string& extension,
                                       osgDB::Registry::ReadFileCallback*
                                       callback);

diff --git a/simgear/scene/model/SGMaterialAnimation.cxx b/simgear/scene/model/SGMaterialAnimation.cxx
index 07bfe6c7a5cd5333d9be8f9ea13ced91f8461d7f..bec77fa5570f7711e5bb51481902898a7e5e96f1 100644 (file)
--- a/simgear/scene/model/SGMaterialAnimation.cxx
+++ b/simgear/scene/model/SGMaterialAnimation.cxx
@@ -412,7 +412,7 @@ private:
 
 SGMaterialAnimation::SGMaterialAnimation(const SGPropertyNode* configNode,
                                          SGPropertyNode* modelRoot,
-                                         const osgDB::ReaderWriter::Options*
+                                         const osgDB::Options*
                                          options) :
   SGAnimation(configNode, modelRoot),
   texturePathList(options->getDatabasePathList())

diff --git a/simgear/scene/model/SGMaterialAnimation.hxx b/simgear/scene/model/SGMaterialAnimation.hxx
index b5b7c0bbf1e29af5e0b1d62a7c6fa32b557971e4..54d1b15b3120909e001ccfc450740a3ab3cd2592 100644 (file)
--- a/simgear/scene/model/SGMaterialAnimation.hxx
+++ b/simgear/scene/model/SGMaterialAnimation.hxx
@@ -23,7 +23,7 @@ class SGMaterialAnimation : public SGAnimation {
 public:
   SGMaterialAnimation(const SGPropertyNode* configNode,
                       SGPropertyNode* modelRoot,
-                      const osgDB::ReaderWriter::Options* options);
+                      const osgDB::Options* options);
   virtual osg::Group* createAnimationGroup(osg::Group& parent);
   virtual void install(osg::Node& node);
   static SGPropertyNode_ptr makeEffectProperties(const SGPropertyNode* animProp);

diff --git a/simgear/scene/model/SGReaderWriterXML.cxx b/simgear/scene/model/SGReaderWriterXML.cxx
index 2fafbcfa5cc44a6d2a0b7bbff1cf708625a3e783..ec74059306547f725f45ecf98e5a61dd4850cdc4 100644 (file)
--- a/simgear/scene/model/SGReaderWriterXML.cxx
+++ b/simgear/scene/model/SGReaderWriterXML.cxx
@@ -58,7 +58,7 @@ using namespace osg;
 
 static osg::Node *
 sgLoad3DModel_internal(const SGPath& path,
-                       const osgDB::ReaderWriter::Options* options,
+                       const osgDB::Options* options,
                        SGPropertyNode *overlay = 0);
 
 
@@ -78,7 +78,7 @@ const char* SGReaderWriterXML::className() const
 
 osgDB::ReaderWriter::ReadResult
 SGReaderWriterXML::readNode(const std::string& fileName,
-                            const osgDB::ReaderWriter::Options* options) const
+                            const osgDB::Options* options) const
 {
     osg::Node *result=0;
     try {
@@ -200,7 +200,7 @@ void makeEffectAnimations(PropertyList& animation_nodes,
 
 static osg::Node *
 sgLoad3DModel_internal(const SGPath& path,
-                       const osgDB::ReaderWriter::Options* options_,
+                       const osgDB::Options* options_,
                        SGPropertyNode *overlay)
 {
     if (!path.exists()) {

diff --git a/simgear/scene/model/SGReaderWriterXML.hxx b/simgear/scene/model/SGReaderWriterXML.hxx
index afa5925d73da4e98964652f51768d13bf349a368..f1a0aed3df0c8a580c9f499230f28fe3fe606a68 100644 (file)
--- a/simgear/scene/model/SGReaderWriterXML.hxx
+++ b/simgear/scene/model/SGReaderWriterXML.hxx
@@ -33,7 +33,7 @@ public:
     virtual const char* className() const;
 
     virtual ReadResult readNode(const std::string& fileName,
-                                const osgDB::ReaderWriter::Options* options)
+                                const osgDB::Options* options)
     const;
 };
 

diff --git a/simgear/scene/model/SGText.cxx b/simgear/scene/model/SGText.cxx
index e7c536a3482d6ffd23e564582f734faf6c6ae34d..e87b48a7765b8b7cac999e0a44a7289300542537 100644 (file)
--- a/simgear/scene/model/SGText.cxx
+++ b/simgear/scene/model/SGText.cxx
@@ -84,7 +84,7 @@ void SGText::UpdateCallback::operator()(osg::Node * node, osg::NodeVisitor *nv )
 }
 
 osg::Node * SGText::appendText(const SGPropertyNode* configNode, 
-  SGPropertyNode* modelRoot, const osgDB::ReaderWriter::Options* options)
+  SGPropertyNode* modelRoot, const osgDB::Options* options)
 {
   SGConstPropertyNode_ptr p;
 

diff --git a/simgear/scene/model/SGText.hxx b/simgear/scene/model/SGText.hxx
index 19b27c80b677f503e08b69308a4f85d267d84cc9..a8bf00809870a6bfccbc903e577a6ffe5d0bdd75 100644 (file)
--- a/simgear/scene/model/SGText.hxx
+++ b/simgear/scene/model/SGText.hxx
@@ -27,7 +27,7 @@
 class SGText : public osg::NodeCallback 
 {
 public:
-  static osg::Node * appendText(const SGPropertyNode* configNode, SGPropertyNode* modelRoot, const osgDB::ReaderWriter::Options* options);
+  static osg::Node * appendText(const SGPropertyNode* configNode, SGPropertyNode* modelRoot, const osgDB::Options* options);
 private:
   class UpdateCallback;
 };

diff --git a/simgear/scene/model/animation.cxx b/simgear/scene/model/animation.cxx
index 110240b93b9e8273cadd76b5e94d4d17cc3aca71..ee9b4fc9dbda301ce0855b1b18f2ef40a0557ca3 100644 (file)
--- a/simgear/scene/model/animation.cxx
+++ b/simgear/scene/model/animation.cxx
@@ -410,7 +410,7 @@ SGAnimation::~SGAnimation()
 bool
 SGAnimation::animate(osg::Node* node, const SGPropertyNode* configNode,
                      SGPropertyNode* modelRoot,
-                     const osgDB::ReaderWriter::Options* options)
+                     const osgDB::Options* options)
 {
   std::string type = configNode->getStringValue("type", "none");
   if (type == "alpha-test") {

diff --git a/simgear/scene/model/animation.hxx b/simgear/scene/model/animation.hxx
index ae4eaead9abfc70be9bedd2a1cb244be52c3af60..e8c7e4b6c3448d99922f3bd9723be5c4cc069884 100644 (file)
--- a/simgear/scene/model/animation.hxx
+++ b/simgear/scene/model/animation.hxx
@@ -46,7 +46,7 @@ public:
 
   static bool animate(osg::Node* node, const SGPropertyNode* configNode,
                       SGPropertyNode* modelRoot,
-                      const osgDB::ReaderWriter::Options* options);
+                      const osgDB::Options* options);
 
 protected:
   void apply(osg::Node* node);
@@ -321,7 +321,7 @@ class SGShaderAnimation : public SGAnimation {
 public:
   SGShaderAnimation(const SGPropertyNode* configNode,
                     SGPropertyNode* modelRoot,
-                    const osgDB::ReaderWriter::Options* options);
+                    const osgDB::Options* options);
   virtual osg::Group* createAnimationGroup(osg::Group& parent);
 private:
   class UpdateCallback;

diff --git a/simgear/scene/model/model.cxx b/simgear/scene/model/model.cxx
index ef9e11c6f6d040e18478d1ac3f3cac5faf74d3df..eba1e306f8da12897cbfe131c61448be0426cd2b 100644 (file)
--- a/simgear/scene/model/model.cxx
+++ b/simgear/scene/model/model.cxx
@@ -39,7 +39,7 @@ using std::vector;
 
 osg::Texture2D*
 SGLoadTexture2D(bool staticTexture, const std::string& path,
-                const osgDB::ReaderWriter::Options* options,
+                const osgDB::Options* options,
                 bool wrapu, bool wrapv, int)
 {
   osg::Image* image;

diff --git a/simgear/scene/model/model.hxx b/simgear/scene/model/model.hxx
index 2761d09e4699ed1a053a6754ee6ddc87df5843d5..9c9f0342e8f20d64a90fd9ee5158bbff805aa4a0 100644 (file)
--- a/simgear/scene/model/model.hxx
+++ b/simgear/scene/model/model.hxx
@@ -30,12 +30,12 @@ class SGReaderWriterOptions;
 
 osg::Texture2D*
 SGLoadTexture2D(bool staticTexture, const std::string& path,
-                const osgDB::ReaderWriter::Options* options = 0,
+                const osgDB::Options* options = 0,
                 bool wrapu = true, bool wrapv = true, int mipmaplevels = -1);
 
 inline osg::Texture2D*
 SGLoadTexture2D(const std::string& path,
-                const osgDB::ReaderWriter::Options* options = 0,
+                const osgDB::Options* options = 0,
                 bool wrapu = true, bool wrapv = true, int mipmaplevels = -1)
 {
     return SGLoadTexture2D(true, path, options, wrapu, wrapv, mipmaplevels);
@@ -43,7 +43,7 @@ SGLoadTexture2D(const std::string& path,
 
 inline osg::Texture2D*
 SGLoadTexture2D(const SGPath& path,
-                const osgDB::ReaderWriter::Options* options = 0,
+                const osgDB::Options* options = 0,
                 bool wrapu = true, bool wrapv = true,
                 int mipmaplevels = -1)
 {
@@ -53,7 +53,7 @@ SGLoadTexture2D(const SGPath& path,
 
 inline osg::Texture2D*
 SGLoadTexture2D(bool staticTexture, const SGPath& path,
-                const osgDB::ReaderWriter::Options* options = 0,
+                const osgDB::Options* options = 0,
                 bool wrapu = true, bool wrapv = true,
                 int mipmaplevels = -1)
 {

diff --git a/simgear/scene/model/modellib.cxx b/simgear/scene/model/modellib.cxx
index 5c8a2eb2e29f08f881ebc90ee34e6e8e4bd9e686..988afea09baa2994c117fd1e2357b88664338a2f 100644 (file)
--- a/simgear/scene/model/modellib.cxx
+++ b/simgear/scene/model/modellib.cxx
@@ -65,7 +65,7 @@ void SGModelLib::setPanelFunc(panel_func pf)
 }
 
 std::string SGModelLib::findDataFile(const std::string& file, 
-  const osgDB::ReaderWriter::Options* opts,
+  const osgDB::Options* opts,
   SGPath currentPath)
 {
   if (file.empty())
@@ -141,9 +141,9 @@ SGModelLib::loadDeferredModel(const string &path, SGPropertyNode *prop_root,
     if (SGPath(path).lower_extension() == "ac")
         opt->setInstantiateEffects(true);
     if (!prop_root || prop_root->getBoolValue("/sim/rendering/cache", true))
-        opt->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_ALL);
+        opt->setObjectCacheHint(osgDB::Options::CACHE_ALL);
     else
-        opt->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_NONE);
+        opt->setObjectCacheHint(osgDB::Options::CACHE_NONE);
     proxyNode->setDatabaseOptions(opt.get());
 
     return proxyNode;
@@ -167,9 +167,9 @@ SGModelLib::loadPagedModel(const string &path, SGPropertyNode *prop_root,
     if (SGPath(path).lower_extension() == "ac")
         opt->setInstantiateEffects(true);
     if (!prop_root || prop_root->getBoolValue("/sim/rendering/cache", true))
-        opt->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_ALL);
+        opt->setObjectCacheHint(osgDB::Options::CACHE_ALL);
     else
-        opt->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_NONE);
+        opt->setObjectCacheHint(osgDB::Options::CACHE_NONE);
     plod->setDatabaseOptions(opt.get());
     return plod;
 }

diff --git a/simgear/scene/model/modellib.hxx b/simgear/scene/model/modellib.hxx
index a9a3eb0d7362c562143287914706203a68cdac7b..10a2fc1ebb3e5d7482a77314033cf53e64a93fc7 100644 (file)
--- a/simgear/scene/model/modellib.hxx
+++ b/simgear/scene/model/modellib.hxx
@@ -71,7 +71,7 @@ public:
                                      SGModelData *data=0);
 
     static std::string findDataFile(const std::string& file, 
-      const osgDB::ReaderWriter::Options* opts = NULL,
+      const osgDB::Options* opts = NULL,
       SGPath currentDir = SGPath()); 
 protected:
     SGModelLib();

diff --git a/simgear/scene/model/particles.cxx b/simgear/scene/model/particles.cxx
index 4d1ebc04044c29283edba281b630d231866ba14c..0b5f32c8e316dc08cc881c4eb081c2f39c3add6c 100644 (file)
--- a/simgear/scene/model/particles.cxx
+++ b/simgear/scene/model/particles.cxx
@@ -135,7 +135,7 @@ void transformParticles(osgParticle::ParticleSystem* particleSys,
 
 osg::Group * Particles::appendParticles(const SGPropertyNode* configNode,
                                           SGPropertyNode* modelRoot,
-                                          const osgDB::ReaderWriter::Options*
+                                          const osgDB::Options*
                                           options)
 {
     SG_LOG(SG_GENERAL, SG_DEBUG, "Setting up a particle system!\n");

diff --git a/simgear/scene/model/particles.hxx b/simgear/scene/model/particles.hxx
index a637f20bcf758e54b3c1de24d2b289ffbe480e1f..cdbb1f21af317e456b1fa8d42ddc0fedc9673731 100644 (file)
--- a/simgear/scene/model/particles.hxx
+++ b/simgear/scene/model/particles.hxx
@@ -111,7 +111,7 @@ class Particles : public osg::NodeCallback
 public:
     Particles();
 
-    static osg::Group * appendParticles(const SGPropertyNode* configNode, SGPropertyNode* modelRoot, const osgDB::ReaderWriter::Options* options);
+    static osg::Group * appendParticles(const SGPropertyNode* configNode, SGPropertyNode* modelRoot, const osgDB::Options* options);
 
     virtual void operator()(osg::Node* node, osg::NodeVisitor* nv);
 

diff --git a/simgear/scene/model/shadanim.cxx b/simgear/scene/model/shadanim.cxx
index cb9270a30cdbf5df1513c9ded3a3cfce0ea16c99..ea1f1c2617479af9b37c965874d634fa1e5e5a3a 100644 (file)
--- a/simgear/scene/model/shadanim.cxx
+++ b/simgear/scene/model/shadanim.cxx
@@ -187,7 +187,7 @@ static void create_specular_highlights(osg::Node *node)
 
 SGShaderAnimation::SGShaderAnimation(const SGPropertyNode* configNode,
                                      SGPropertyNode* modelRoot,
-                                     const osgDB::ReaderWriter::Options*
+                                     const osgDB::Options*
                                      options) :
   SGAnimation(configNode, modelRoot)
 {

diff --git a/simgear/scene/sky/cloud.cxx b/simgear/scene/sky/cloud.cxx
index 5bdf91d7c8bd96027397a5f134b64fbd3405793c..aeac58ffe1ee0d59bc0a0e88957a47ece806018c 100644 (file)
--- a/simgear/scene/sky/cloud.cxx
+++ b/simgear/scene/sky/cloud.cxx
@@ -94,7 +94,7 @@ SGMakeState(const SGPath &path, const char* colorTexture,
 {
     osg::StateSet *stateSet = new osg::StateSet;
 
-    osg::ref_ptr<osgDB::ReaderWriter::Options> options
+    osg::ref_ptr<osgDB::Options> options
         = makeOptionsFromPath(path);
     stateSet->setTextureAttribute(0, SGLoadTexture2D(colorTexture,
                                                      options.get()));

diff --git a/simgear/scene/sky/moon.cxx b/simgear/scene/sky/moon.cxx
index 28275e6a6714bbc72633166a6a875dcd88d13119..f6539309dfd2d577d763965061df99da458426e8 100644 (file)
--- a/simgear/scene/sky/moon.cxx
+++ b/simgear/scene/sky/moon.cxx
@@ -78,7 +78,7 @@ SGMoon::build( SGPath path, double moon_size ) {
     stateSet->setRenderBinDetails(-5, "RenderBin");
 
     // set up the orb state
-    osg::ref_ptr<osgDB::ReaderWriter::Options> options
+    osg::ref_ptr<osgDB::Options> options
         = makeOptionsFromPath(path);
 
     osg::Texture2D* texture = SGLoadTexture2D("moon.png", options.get());

diff --git a/simgear/scene/sky/newcloud.cxx b/simgear/scene/sky/newcloud.cxx
index b27704dac40d29d8b8b21d86b938b4b555a75246..3dee4ab479e90bba6a2f90e20fe8457440383c1f 100644 (file)
--- a/simgear/scene/sky/newcloud.cxx
+++ b/simgear/scene/sky/newcloud.cxx
@@ -110,7 +110,7 @@ SGNewCloud::SGNewCloud(const SGPath &texture_root, const SGPropertyNode *cld_def
                                      "texture"),
                            "image"),
                  texture);
-        ref_ptr<osgDB::ReaderWriter::Options> options
+        ref_ptr<osgDB::Options> options
             = makeOptionsFromPath(texture_root);
         ref_ptr<SGReaderWriterOptions> sgOptions
             = new SGReaderWriterOptions(*options.get());

diff --git a/simgear/scene/sky/oursun.cxx b/simgear/scene/sky/oursun.cxx
index 59db466c54c6c45814ef86f6f28ac5b05d5e9de0..f2af25f804ac42dfef67df8404933e08dd8ae359 100644 (file)
--- a/simgear/scene/sky/oursun.cxx
+++ b/simgear/scene/sky/oursun.cxx
@@ -69,7 +69,7 @@ SGSun::build( SGPath path, double sun_size, SGPropertyNode *property_tree_Node )
 
     env_node = property_tree_Node;
 
-    osg::ref_ptr<osgDB::ReaderWriter::Options> options
+    osg::ref_ptr<osgDB::Options> options
         = makeOptionsFromPath(path);
     // build the ssg scene graph sub tree for the sky and connected
     // into the provide scene graph branch

diff --git a/simgear/scene/tgdb/ReaderWriterSTG.cxx b/simgear/scene/tgdb/ReaderWriterSTG.cxx
index f79638bb0335438f569edf3c2bc295404a0ef701..47d45e68f38418259e4fb7229c0e4833dcf7523b 100644 (file)
--- a/simgear/scene/tgdb/ReaderWriterSTG.cxx
+++ b/simgear/scene/tgdb/ReaderWriterSTG.cxx
@@ -54,7 +54,7 @@ const char* ReaderWriterSTG::className() const
 
 osgDB::ReaderWriter::ReadResult
 ReaderWriterSTG::readNode(const std::string& fileName,
-                          const osgDB::ReaderWriter::Options* options) const
+                          const osgDB::Options* options) const
 {
     osg::Node* result = TileEntry::loadTileByFileName(fileName, options);
     // For debugging race conditions

diff --git a/simgear/scene/tgdb/ReaderWriterSTG.hxx b/simgear/scene/tgdb/ReaderWriterSTG.hxx
index 7c571ccf78462e51dea2e8a0f649c69ebf673096..f319a6b82c5c7466a424fb002729ccc18f4f8144 100644 (file)
--- a/simgear/scene/tgdb/ReaderWriterSTG.hxx
+++ b/simgear/scene/tgdb/ReaderWriterSTG.hxx
@@ -34,7 +34,7 @@ public:
     virtual const char* className() const;
 
     virtual ReadResult readNode(const std::string& fileName,
-                                const osgDB::ReaderWriter::Options* options)
+                                const osgDB::Options* options)
         const;
 };
 

diff --git a/simgear/scene/tgdb/SGReaderWriterBTG.cxx b/simgear/scene/tgdb/SGReaderWriterBTG.cxx
index 753720d25c612cb3a6c11c56941a4e1bfad954d6..5e2a94b70210632929dc616106be58ae533ef103 100644 (file)
--- a/simgear/scene/tgdb/SGReaderWriterBTG.cxx
+++ b/simgear/scene/tgdb/SGReaderWriterBTG.cxx
@@ -57,7 +57,7 @@ SGReaderWriterBTG::acceptsExtension(const std::string& extension) const
 
 osgDB::ReaderWriter::ReadResult
 SGReaderWriterBTG::readNode(const std::string& fileName,
-                            const osgDB::ReaderWriter::Options* options) const
+                            const osgDB::Options* options) const
 {
     const SGReaderWriterOptions* sgOptions;
     sgOptions = dynamic_cast<const SGReaderWriterOptions*>(options);

diff --git a/simgear/scene/tgdb/SGReaderWriterBTG.hxx b/simgear/scene/tgdb/SGReaderWriterBTG.hxx
index a28ea7eb5d9d773f7fd730123332c985f854e607..dd9d4b57e316b9b152cdce113b572fef03176903 100644 (file)
--- a/simgear/scene/tgdb/SGReaderWriterBTG.hxx
+++ b/simgear/scene/tgdb/SGReaderWriterBTG.hxx
@@ -30,7 +30,7 @@ public:
  
     virtual bool acceptsExtension(const std::string& /*extension*/) const;
     virtual ReadResult readNode(const std::string& fileName,
-                                const osgDB::ReaderWriter::Options* options)
+                                const osgDB::Options* options)
         const;
 };
 

diff --git a/simgear/scene/tgdb/TileEntry.cxx b/simgear/scene/tgdb/TileEntry.cxx
index f196c7dd7cc0859050d3dde33edc7aef12efd1d8..f139d1454724713291069135f623a200cf79980d 100644 (file)
--- a/simgear/scene/tgdb/TileEntry.cxx
+++ b/simgear/scene/tgdb/TileEntry.cxx
@@ -131,7 +131,7 @@ void TileEntry::prep_ssg_node(float vis) {
 }
 
 bool TileEntry::obj_load(const string& path, osg::Group *geometry, bool is_base,
-                         const osgDB::ReaderWriter::Options* options)
+                         const osgDB::Options* options)
 {
     osg::Node* node = osgDB::readNodeFile(path, options);
     if (node)
@@ -178,7 +178,7 @@ struct Object {
 
 osg::Node*
 TileEntry::loadTileByFileName(const string& fileName,
-                              const osgDB::ReaderWriter::Options* options)
+                              const osgDB::Options* options)
 {
     std::string index_str = osgDB::getNameLessExtension(fileName);
     index_str = osgDB::getSimpleFileName(index_str);

diff --git a/simgear/scene/tgdb/TileEntry.hxx b/simgear/scene/tgdb/TileEntry.hxx
index 7aec5d1f76e19bc261cfdc4dadef1ef07f8f420c..c7e8f8e1d6de42fc07a012291f0b37f64562c0f4 100644 (file)
--- a/simgear/scene/tgdb/TileEntry.hxx
+++ b/simgear/scene/tgdb/TileEntry.hxx
@@ -71,7 +71,7 @@ private:
     static bool obj_load( const std::string& path,
                           osg::Group* geometry,
                           bool is_base,
-                          const osgDB::ReaderWriter::Options* options);
+                          const osgDB::Options* options);
 
     /**
      * This value is used by the tile scheduler/loader to load tiles
@@ -106,7 +106,7 @@ public:
      * Transition to OSG database pager
      */
     static osg::Node* loadTileByFileName(const std::string& index_str,
-                                         const osgDB::ReaderWriter::Options*);
+                                         const osgDB::Options*);
     /**
      * Return true if the tile entry is loaded, otherwise return false
      * indicating that the loading thread is still working on this.

diff --git a/simgear/scene/util/PathOptions.cxx b/simgear/scene/util/PathOptions.cxx
index 203247b7a8f8c6c5d24f579973347334500e300b..711b04b27a72d0f27d85d17daaa20c9dc22632d3 100644 (file)
--- a/simgear/scene/util/PathOptions.cxx
+++ b/simgear/scene/util/PathOptions.cxx
@@ -27,11 +27,11 @@
 
 using namespace simgear;
 
-osgDB::ReaderWriter::Options* simgear::makeOptionsFromPath(const SGPath& path)
+osgDB::Options* simgear::makeOptionsFromPath(const SGPath& path)
 {
     using namespace osgDB;
-    ReaderWriter::Options *options
-        = new ReaderWriter::Options(*(Registry::instance()->getOptions()));
+    Options *options
+        = new Options(*(Registry::instance()->getOptions()));
     options->setDatabasePath(path.str());
     return options;
 }

diff --git a/simgear/scene/util/PathOptions.hxx b/simgear/scene/util/PathOptions.hxx
index 5bf3a4b74982c2fdc7a81cf160c57839d8c556b9..e1bc331bfe772b01c50cc0ce2b39e4d76c94c311 100644 (file)
--- a/simgear/scene/util/PathOptions.hxx
+++ b/simgear/scene/util/PathOptions.hxx
@@ -25,7 +25,7 @@
 
 namespace simgear
 {
-osgDB::ReaderWriter::Options* makeOptionsFromPath(const SGPath&);
+osgDB::Options* makeOptionsFromPath(const SGPath&);
 }
 
 #endif

diff --git a/simgear/scene/util/SGReaderWriterOptions.hxx b/simgear/scene/util/SGReaderWriterOptions.hxx
index 29ff31eb1e4baa04c12fd563ac8968ac183d088b..082cfb8228fef18f4f0bad054ed1cfab39322fc2 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),