Introduced CMake option OSG_PROVIDE_READFILE option that defaults to ON, but when switched to OFF disables the building of the osgDB::read*File() methods,

forcing users to use osgDB::readRef*File() methods.  The later is preferable as it closes a potential threading bug when using paging databases in conjunction
with the osgDB::Registry Object Cache.  This threading bug occurs when one thread gets an object from the Cache via an osgDB::read*File() call where only
a pointer to the object is passed back, so taking a reference to the object is delayed till it gets reassigned to a ref_ptr<>, but at the same time another
thread calls a flush of the Object Cache deleting this object as it's referenceCount is now zero.  Using osgDB::readREf*File() makes sure the a ref_ptr<> is
passed back and the referenceCount never goes to zero.

To ensure the OSG builds when OSG_PROVIDE_READFILE is to OFF the many cases of osgDB::read*File() usage had to be replaced with a ref_ptr<> osgDB::readRef*File()
usage.  The avoid this change causing lots of other client code to be rewritten to handle the use of ref_ptr<> in place of C pointer I introduced a serious of
templte methods in various class to adapt ref_ptr<> to the underly C pointer to be passed to old OSG API's, example of this is found in include/osg/Group:

    bool addChild(Node* child); // old method which can only be used with a Node*

    tempalte<class T> bool addChild(const osg::ref_ptr<T>& child) { return addChild(child.get()); } // adapter template method

These changes together cover 149 modified files, so it's a large submission. This extent of changes are warrent to make use of the Object Cache
and multi-threaded loaded more robust.



git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15164 16af8721-9629-0410-8352-f15c8da7e697

include/osgDB/ImagePager

@@ -78,7 +78,7 @@ class OSGDB_EXPORT ImagePager : public osg::NodeVisitor::ImageRequestHandler
         void setPreLoadTime(double preLoadTime) { _preLoadTime=preLoadTime; }
         virtual double getPreLoadTime() const { return _preLoadTime; }
 
-        virtual osg::Image* readImageFile(const std::string& fileName, const osg::Referenced* options=0);
+        virtual osg::ref_ptr<osg::Image> readRefImageFile(const std::string& fileName, const osg::Referenced* options=0);
 
         virtual void requestImageFile(const std::string& fileName, osg::Object* attachmentPoint, int attachmentIndex, double timeToMergeBy, const osg::FrameStamp* framestamp, osg::ref_ptr<osg::Referenced>& imageRequest, const osg::Referenced* options);
 

include/osgDB/Input

@@ -288,10 +288,10 @@ class OSGDB_EXPORT Input : public FieldReaderIterator
         virtual osg::Node*           readNode();
         virtual osg::Shader*         readShader();
 
-        virtual osg::Object*         readObject(const std::string& fileName);
-        virtual osg::Image*          readImage(const std::string& fileName);
-        virtual osg::Node*           readNode(const std::string& fileName);
-        virtual osg::Shader*         readShader(const std::string& fileName);
+        virtual osg::ref_ptr<osg::Object>       readObject(const std::string& fileName);
+        virtual osg::ref_ptr<osg::Image>        readImage(const std::string& fileName);
+        virtual osg::ref_ptr<osg::Node>         readNode(const std::string& fileName);
+        virtual osg::ref_ptr<osg::Shader>       readShader(const std::string& fileName);
 
         virtual osg::Object*         getObjectForUniqueID(const std::string& uniqueID);
         virtual void                 registerUniqueIDForObject(const std::string& uniqueID,osg::Object* obj);

include/osgDB/InputStream

@@ -137,17 +137,12 @@ public:
     InputStream& operator>>( osg::BoundingSpheref& bs );
     InputStream& operator>>( osg::BoundingSphered& bs );
 
-    InputStream& operator>>( osg::Image*& img ) { img = readImage(); return *this; }
-    InputStream& operator>>( osg::Array*& a ) { if (_fileVersion>=112) a = readObjectOfType<osg::Array>(); else a = readArray(); return *this; }
-    InputStream& operator>>( osg::PrimitiveSet*& p ) { if (_fileVersion>=112) p = readObjectOfType<osg::PrimitiveSet>(); else p = readPrimitiveSet(); return *this; }
-    InputStream& operator>>( osg::Object*& obj ) { obj = readObject(); return *this; }
-
     InputStream& operator>>( osg::ref_ptr<osg::Image>& ptr ) { ptr = readImage(); return *this; }
     InputStream& operator>>( osg::ref_ptr<osg::Array>& ptr ) { if (_fileVersion>=112) ptr = readObjectOfType<osg::Array>(); else ptr = readArray(); return *this; }
     InputStream& operator>>( osg::ref_ptr<osg::PrimitiveSet>& ptr ) { if (_fileVersion>=112) ptr = readObjectOfType<osg::PrimitiveSet>(); else ptr = readPrimitiveSet(); return *this; }
 
     template<typename T> InputStream& operator>>( osg::ref_ptr<T>& ptr )
-    { ptr = static_cast<T*>(readObject()); return *this; }
+    { ptr = readObjectOfType<T>(); return *this; }
 
     // Convenient methods for reading
     bool matchString( const std::string& str ) { return _in->matchString(str); }
@@ -160,23 +155,31 @@ public:
     unsigned int readSize() { unsigned int size; *this>>size; return size; }
 
     // Global reading functions
-    osg::Array* readArray();
-    osg::PrimitiveSet* readPrimitiveSet();
-    osg::Image* readImage(bool readFromExternal=true);
+    osg::ref_ptr<osg::Array> readArray();
+    osg::ref_ptr<osg::PrimitiveSet> readPrimitiveSet();
+    osg::ref_ptr<osg::Image> readImage(bool readFromExternal=true);
 
     template<typename T>
-    T* readObjectOfType()
+    osg::ref_ptr<T> readObjectOfType()
     {
         osg::ref_ptr<osg::Object> obj = readObject();
         T* ptr = dynamic_cast<T*>(obj.get());
-        if (ptr) { obj.release(); return ptr; }
+        if (ptr) { return ptr; }
         else return 0;
     }
 
-    osg::Object* readObject( osg::Object* existingObj=0 );
+    osg::ref_ptr<osg::Object> readObject( osg::Object* existingObj=0 );
 
+    osg::ref_ptr<osg::Object> readObjectFields( const std::string& className, unsigned int id, osg::Object* existingObj=0);
 
-    osg::Object* readObjectFields( const std::string& className, unsigned int id, osg::Object* existingObj=0);
+    template<typename T>
+    osg::ref_ptr<T> readObjectFieldsOfType( const std::string& className, unsigned int id, osg::Object* existingObj=0)
+    {
+        osg::ref_ptr<osg::Object> obj = readObjectFields(className, id, existingObj);
+        T* ptr = dynamic_cast<T*>(obj.get());
+        if (ptr) { return ptr; }
+        else return 0;
+    }
 
     /// set an input iterator, used directly when not using InputStream with a traditional file releated stream.
     void setInputIterator( InputIterator* ii ) { _in = ii; }

include/osgDB/ReadFile

@@ -26,6 +26,215 @@
 namespace osgDB {
 
 
+/** Read an osg::Object from file.
+  * Return an assigned osg::ref_ptr on success,
+  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
+  * Use the Options object to control cache operations and file search paths in osgDB::Registry.
+  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
+  * for the filename extension, and this plugin then handles the request
+  * to read the specified file.*/
+extern OSGDB_EXPORT osg::ref_ptr<osg::Object> readRefObjectFile(const std::string& filename,const Options* options);
+
+/** Read an osg::Object from file.
+  * Return an assigned osg::ref_ptr on success,
+  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
+  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
+  * for the filename extension, and this plugin then handles the request
+  * to read the specified file.*/
+inline osg::ref_ptr<osg::Object> readRefObjectFile(const std::string& filename)
+{
+    return readRefObjectFile(filename, Registry::instance()->getOptions());
+}
+
+template<class T>
+inline osg::ref_ptr<T> readRefFile(const std::string& filename, const Options* options)
+{
+    osg::ref_ptr<osg::Object> object = readRefObjectFile(filename, options);
+    osg::ref_ptr<T> t = dynamic_cast<T*>(object.get());
+    return t;
+}
+
+template<class T>
+inline osg::ref_ptr<T> readRefFile(const std::string& filename)
+{
+    return readRefFile<T>(filename, Registry::instance()->getOptions());
+}
+
+
+/** Read an osg::Image from file.
+  * Return an assigned osg::ref_ptr on success,
+  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
+  * Use the Options object to control cache operations and file search paths in osgDB::Registry.
+  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
+  * for the filename extension, and this plugin then handles the request
+  * to read the specified file.*/
+extern OSGDB_EXPORT osg::ref_ptr<osg::Image> readRefImageFile(const std::string& filename,const Options* options);
+
+/** Read an osg::Image from file.
+  * Return an assigned osg::ref_ptr on success,
+  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
+  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
+  * for the filename extension, and this plugin then handles the request
+  * to read the specified file.*/
+inline osg::ref_ptr<osg::Image> readRefImageFile(const std::string& filename)
+{
+    return readRefImageFile(filename,Registry::instance()->getOptions());
+}
+
+/** Read an osg::HeightField from file.
+  * Return an assigned osg::ref_ptr on success,
+  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
+  * Use the Options object to control cache operations and file search paths in osgDB::Registry.
+  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
+  * for the filename extension, and this plugin then handles the request
+  * to read the specified file.*/
+extern OSGDB_EXPORT osg::ref_ptr<osg::HeightField> readRefHeightFieldFile(const std::string& filename,const Options* options);
+
+/** Read an osg::HeightField from file.
+  * Return an assigned osg::ref_ptr on success,
+  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
+  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
+  * for the filename extension, and this plugin then handles the request
+  * to read the specified file.*/
+inline osg::ref_ptr<osg::HeightField> readRefHeightFieldFile(const std::string& filename)
+{
+    return readRefHeightFieldFile(filename,Registry::instance()->getOptions());
+}
+
+/** Read an osg::Node from file.
+  * Return an assigned osg::ref_ptr on success,
+  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
+  * Use the Options object to control cache operations and file search paths in osgDB::Registry.
+  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
+  * for the filename extension, and this plugin then handles the request
+  * to read the specified file.*/
+extern OSGDB_EXPORT osg::ref_ptr<osg::Node> readRefNodeFile(const std::string& filename,const Options* options);
+
+/** Read an osg::Node from file.
+  * Return an assigned osg::ref_ptr on success,
+  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
+  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
+  * for the filename extension, and this plugin then handles the request
+  * to read the specified file.*/
+inline osg::ref_ptr<osg::Node> readRefNodeFile(const std::string& filename)
+{
+    return readRefNodeFile(filename,Registry::instance()->getOptions());
+}
+
+/** Read an osg::Node subgraph from files, creating a osg::Group to contain the nodes if more
+  * than one subgraph has been loaded.
+  * Use the Options object to control cache operations and file search paths in osgDB::Registry.
+  * Does NOT ignore strings beginning with a dash '-' character. */
+extern OSGDB_EXPORT osg::ref_ptr<osg::Node> readRefNodeFiles(std::vector<std::string>& fileList,const Options* options);
+
+/** Read an osg::Node subgraph from files, creating a osg::Group to contain the nodes if more
+  * than one subgraph has been loaded.*/
+inline osg::ref_ptr<osg::Node> readRefNodeFiles(std::vector<std::string>& fileList)
+{
+    return readRefNodeFiles(fileList, Registry::instance()->getOptions());
+}
+
+
+/** Read an osg::Node subgraph from files, creating a osg::Group to contain the nodes if more
+  * than one subgraph has been loaded.
+  * Use the Options object to control cache operations and file search paths in osgDB::Registry.*/
+extern OSGDB_EXPORT osg::ref_ptr<osg::Node> readRefNodeFiles(osg::ArgumentParser& parser,const Options* options);
+
+/** Read an osg::Node subgraph from files, creating a osg::Group to contain the nodes if more
+  * than one subgraph has been loaded.*/
+inline osg::ref_ptr<osg::Node> readRefNodeFiles(osg::ArgumentParser& parser)
+{
+    return readRefNodeFiles(parser,Registry::instance()->getOptions());
+}
+
+/** Read an osg::Shader from file.
+  * Return an assigned osg::ref_ptr on success,
+  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
+  * Use the Options object to control cache operations and file search paths in osgDB::Registry.
+  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
+  * for the filename extension, and this plugin then handles the request
+  * to read the specified file.*/
+extern OSGDB_EXPORT osg::ref_ptr<osg::Shader> readRefShaderFile(const std::string& filename,const Options* options);
+
+/** Read an osg::Shader from file.
+  * Return an assigned osg::ref_ptr on success,
+  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
+  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
+  * for the filename extension, and this plugin then handles the request
+  * to read the specified file.*/
+inline osg::ref_ptr<osg::Shader> readRefShaderFile(const std::string& filename)
+{
+    return readRefShaderFile(filename, Registry::instance()->getOptions());
+}
+
+/** Read an osg::Shader from file and set to specified shader type.
+  * Return valid osg::Shader on success,
+  * return NULL on failure.
+  * Use the Options object to control cache operations and file search paths in osgDB::Registry.
+  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
+  * for the filename extension, and this plugin then handles the request
+  * to read the specified file.*/
+inline osg::ref_ptr<osg::Shader> readRefShaderFile(osg::Shader::Type type, const std::string& filename, const Options* options)
+{
+    osg::ref_ptr<osg::Shader> shader = readRefShaderFile(filename, options);
+    if (shader.valid() && type != osg::Shader::UNDEFINED) shader->setType(type);
+    return shader;
+}
+
+/** Read an osg::Shader from file and set to specified shader type
+  * Return valid osg::Shader on success,
+  * return NULL on failure.
+  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
+  * for the filename extension, and this plugin then handles the request
+  * to read the specified file.*/
+inline osg::ref_ptr<osg::Shader> readRefShaderFile(osg::Shader::Type type, const std::string& filename)
+{
+    return readRefShaderFile(type, filename, Registry::instance()->getOptions());
+}
+
+/** Read an osg::Shader from file and set to specified shader type, if a shader isn't loaded fallback to specific shader source.
+  * Use the Options object to control cache operations and file search paths in osgDB::Registry.
+  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
+  * for the filename extension, and this plugin then handles the request
+  * to read the specified file.*/
+inline osg::ref_ptr<osg::Shader> readRefShaderFileWithFallback(osg::Shader::Type type, const std::string& filename, const Options* options, const char* fallback)
+{
+    osg::ref_ptr<osg::Shader> shader = readRefShaderFile(filename, options);
+    if (shader.valid() && type != osg::Shader::UNDEFINED) shader->setType(type);
+    if (!shader) shader = new osg::Shader(type, fallback);
+    return shader;
+}
+
+/** Read an osg::Shader from file and set to specified shader type, if a shader isn't loaded fallback to specific shader source.
+  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
+  * for the filename extension, and this plugin then handles the request
+  * to read the specified file.*/
+inline osg::ref_ptr<osg::Shader> readRefShaderFileWithFallback(osg::Shader::Type type, const std::string& filename, const char* fallback)
+{
+    return osgDB::readRefShaderFileWithFallback(type, filename, Registry::instance()->getOptions(), fallback);
+}
+
+/** Read an osg::Script from file.
+  * Return an assigned osg::ref_ptr on success,
+  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
+  * Use the Options object to control cache operations and file search paths in osgDB::Registry.
+  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
+  * for the filename extension, and this plugin then handles the request
+  * to read the specified file.*/
+extern OSGDB_EXPORT osg::ref_ptr<osg::Script> readRefScriptFile(const std::string& filename,const Options* options);
+
+/** Read an osg::Script from file.
+  * Return an assigned osg::ref_ptr on success,
+  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
+  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
+  * for the filename extension, and this plugin then handles the request
+  * to read the specified file.*/
+inline osg::ref_ptr<osg::Script> readRefScriptFile(const std::string& filename)
+{
+    return readRefScriptFile(filename,Registry::instance()->getOptions());
+}
+
+#ifdef OSG_PROVIDE_READFILE
 /** Read an osg::Object from file.
   * Return valid osg::Object on success,
   * return NULL on failure.
@@ -49,7 +258,7 @@ inline osg::Object* readObjectFile(const std::string& filename)
 template<typename T>
 inline T* readFile(const std::string& filename, const Options* options)
 {
-    osg::ref_ptr<osg::Object> object = readObjectFile(filename, options);
+    osg::ref_ptr<osg::Object> object = readRefObjectFile(filename, options);
     osg::ref_ptr<T> t = dynamic_cast<T*>(object.get());
     object = 0;
     return t.release();
@@ -236,155 +445,9 @@ inline osg::Script*  readScriptFile(const std::string& filename)
 {
     return readScriptFile(filename,Registry::instance()->getOptions());
 }
+#endif
 
 
-
-/** Read an osg::Object from file.
-  * Return an assigned osg::ref_ptr on success,
-  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
-  * Use the Options object to control cache operations and file search paths in osgDB::Registry.
-  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
-  * for the filename extension, and this plugin then handles the request
-  * to read the specified file.*/
-extern OSGDB_EXPORT osg::ref_ptr<osg::Object> readRefObjectFile(const std::string& filename,const Options* options);
-
-/** Read an osg::Object from file.
-  * Return an assigned osg::ref_ptr on success,
-  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
-  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
-  * for the filename extension, and this plugin then handles the request
-  * to read the specified file.*/
-inline osg::ref_ptr<osg::Object> readRefObjectFile(const std::string& filename)
-{
-    return readRefObjectFile(filename,Registry::instance()->getOptions());
-}
-
-/** Read an osg::Image from file.
-  * Return an assigned osg::ref_ptr on success,
-  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
-  * Use the Options object to control cache operations and file search paths in osgDB::Registry.
-  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
-  * for the filename extension, and this plugin then handles the request
-  * to read the specified file.*/
-extern OSGDB_EXPORT osg::ref_ptr<osg::Image> readRefImageFile(const std::string& filename,const Options* options);
-
-/** Read an osg::Image from file.
-  * Return an assigned osg::ref_ptr on success,
-  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
-  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
-  * for the filename extension, and this plugin then handles the request
-  * to read the specified file.*/
-inline osg::ref_ptr<osg::Image> readRefImageFile(const std::string& filename)
-{
-    return readRefImageFile(filename,Registry::instance()->getOptions());
-}
-
-/** Read an osg::HeightField from file.
-  * Return an assigned osg::ref_ptr on success,
-  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
-  * Use the Options object to control cache operations and file search paths in osgDB::Registry.
-  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
-  * for the filename extension, and this plugin then handles the request
-  * to read the specified file.*/
-extern OSGDB_EXPORT osg::ref_ptr<osg::HeightField> readRefHeightFieldFile(const std::string& filename,const Options* options);
-
-/** Read an osg::HeightField from file.
-  * Return an assigned osg::ref_ptr on success,
-  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
-  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
-  * for the filename extension, and this plugin then handles the request
-  * to read the specified file.*/
-inline osg::ref_ptr<osg::HeightField> readRefHeightFieldFile(const std::string& filename)
-{
-    return readRefHeightFieldFile(filename,Registry::instance()->getOptions());
-}
-
-/** Read an osg::Node from file.
-  * Return an assigned osg::ref_ptr on success,
-  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
-  * Use the Options object to control cache operations and file search paths in osgDB::Registry.
-  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
-  * for the filename extension, and this plugin then handles the request
-  * to read the specified file.*/
-extern OSGDB_EXPORT osg::ref_ptr<osg::Node> readRefNodeFile(const std::string& filename,const Options* options);
-
-/** Read an osg::Node from file.
-  * Return an assigned osg::ref_ptr on success,
-  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
-  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
-  * for the filename extension, and this plugin then handles the request
-  * to read the specified file.*/
-inline osg::ref_ptr<osg::Node> readRefNodeFile(const std::string& filename)
-{
-    return readRefNodeFile(filename,Registry::instance()->getOptions());
-}
-
-/** Read an osg::Shader from file.
-  * Return an assigned osg::ref_ptr on success,
-  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
-  * Use the Options object to control cache operations and file search paths in osgDB::Registry.
-  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
-  * for the filename extension, and this plugin then handles the request
-  * to read the specified file.*/
-extern OSGDB_EXPORT osg::ref_ptr<osg::Shader> readRefShaderFile(const std::string& filename,const Options* options);
-
-/** Read an osg::Shader from file.
-  * Return an assigned osg::ref_ptr on success,
-  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
-  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
-  * for the filename extension, and this plugin then handles the request
-  * to read the specified file.*/
-inline osg::ref_ptr<osg::Shader> readRefShaderFile(const std::string& filename)
-{
-    return readRefShaderFile(filename, Registry::instance()->getOptions());
-}
-
-/** Read an osg::Shader from file and set to specified shader type.
-  * Return valid osg::Shader on success,
-  * return NULL on failure.
-  * Use the Options object to control cache operations and file search paths in osgDB::Registry.
-  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
-  * for the filename extension, and this plugin then handles the request
-  * to read the specified file.*/
-inline osg::ref_ptr<osg::Shader> readRefShaderFile(osg::Shader::Type type, const std::string& filename, const Options* options)
-{
-    osg::ref_ptr<osg::Shader> shader = readShaderFile(filename, options);
-    if (shader.valid() && type != osg::Shader::UNDEFINED) shader->setType(type);
-    return shader;
-}
-
-/** Read an osg::Shader from file and set to specified shader type
-  * Return valid osg::Shader on success,
-  * return NULL on failure.
-  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
-  * for the filename extension, and this plugin then handles the request
-  * to read the specified file.*/
-inline osg::ref_ptr<osg::Shader> readRefShaderFile(osg::Shader::Type type, const std::string& filename)
-{
-    return readRefShaderFile(type, filename, Registry::instance()->getOptions());
-}
-
-
-/** Read an osg::Script from file.
-  * Return an assigned osg::ref_ptr on success,
-  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
-  * Use the Options object to control cache operations and file search paths in osgDB::Registry.
-  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
-  * for the filename extension, and this plugin then handles the request
-  * to read the specified file.*/
-extern OSGDB_EXPORT osg::ref_ptr<osg::Script> readRefScriptFile(const std::string& filename,const Options* options);
-
-/** Read an osg::Script from file.
-  * Return an assigned osg::ref_ptr on success,
-  * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
-  * The osgDB::Registry is used to load the appropriate ReaderWriter plugin
-  * for the filename extension, and this plugin then handles the request
-  * to read the specified file.*/
-inline osg::ref_ptr<osg::Script> readRefScriptFile(const std::string& filename)
-{
-    return readRefScriptFile(filename,Registry::instance()->getOptions());
-}
-
 }
 
 #endif

include/osgDB/ReaderWriter

@@ -123,8 +123,12 @@ class OSGDB_EXPORT ReaderWriter : public osg::Object
 
                 ReadResult(ReadStatus status=FILE_NOT_HANDLED):_status(status) {}
                 ReadResult(const std::string& m):_status(ERROR_IN_READING_FILE),_message(m) {}
+
                 ReadResult(osg::Object* obj, ReadStatus status=FILE_LOADED):_status(status),_object(obj) {}
 
+                template<class T>
+                ReadResult(const osg::ref_ptr<T>& obj, ReadStatus status=FILE_LOADED):_status(status),_object(obj.get()) {}
+
                 ReadResult(const ReadResult& rr):_status(rr._status),_message(rr._message),_object(rr._object) {}
                 ReadResult& operator = (const ReadResult& rr) { if (this==&rr) return *this; _status=rr._status; _message=rr._message;_object=rr._object; return *this; }
 

include/osgDB/Serializer

@@ -563,8 +563,8 @@ public:
             is >> hasObject;
             if ( hasObject )
             {
-                P* value = dynamic_cast<P*>( is.readObject() );
-                (object.*_setter)( value );
+                osg::ref_ptr<P> value = is.readObjectOfType<P>();
+                (object.*_setter)( value.get() );
             }
         }
         else if ( is.matchString(ParentType::_name) )
@@ -573,8 +573,8 @@ public:
             if ( hasObject )
             {
                 is >> is.BEGIN_BRACKET;
-                P* value = dynamic_cast<P*>( is.readObject() );
-                (object.*_setter)( value );
+                osg::ref_ptr<P> value = is.readObjectOfType<P>();
+                (object.*_setter)( value.get() );
                 is >> is.END_BRACKET;
             }
         }
@@ -639,7 +639,8 @@ public:
             is >> hasObject;
             if ( hasObject )
             {
-                P* value = dynamic_cast<P*>( is.readImage() );
+                osg::ref_ptr<osg::Image> image = is.readImage();
+                P* value = dynamic_cast<P*>( image.get() );
                 (object.*_setter)( value );
             }
         }
@@ -649,7 +650,8 @@ public:
             if ( hasObject )
             {
                 is >> is.BEGIN_BRACKET;
-                P* value = dynamic_cast<P*>( is.readImage() );
+                osg::ref_ptr<osg::Image> image = is.readImage();
+                P* value = dynamic_cast<P*>( image.get() );
                 (object.*_setter)( value );
                 is >> is.END_BRACKET;
             }
@@ -1457,7 +1459,7 @@ public:
                 bool ok = false; is >> ok; //code from user serialized ensuring backwards-compatibility
                 if ( !ok ) return true;
             }
-            
+
             P mask;
             is >> mask;
             (object.*_setter)( mask );
@@ -1844,7 +1846,7 @@ protected:
 
 #define END_ENUM_SERIALIZER() \
     wrapper->addSerializer(serializer.get(), osgDB::BaseSerializer::RW_ENUM); }
-    
+
 /** defaults to uint bitfield type.*/
 #define BEGIN_BITFLAGS_SERIALIZER(PROP, DEF) \
     { typedef osgDB::BitFlagsSerializer<MyClass> MySerializer; \