Changeset 8577

Timestamp:

07/13/08 17:24:45

Author:

robert

Message:

Added new ReaderWriter? methods for recording what protocols, extensions and options are
support by ReaderWriters?

Files:

• OpenSceneGraph/trunk/include/osgDB/FileNameUtils (modified) (1 diff)
• OpenSceneGraph/trunk/include/osgDB/ReaderWriter (modified) (3 diffs)
• OpenSceneGraph/trunk/src/osgDB/FileNameUtils.cpp (modified) (1 diff)
• OpenSceneGraph/trunk/src/osgDB/ReaderWriter.cpp (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/curl/ReaderWriterCURL.cpp (modified) (6 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/ive/ReaderWriterIVE.cpp (modified) (1 diff)
• OpenSceneGraph/trunk/src/osgPlugins/osg/ReaderWriterOSG.cpp (modified) (1 diff)
• OpenSceneGraph/trunk/src/osgPlugins/rgb/ReaderWriterRGB.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osgDB/FileNameUtils

@@ -31 +31 @@
-extern OSGDB_EXPORT std::string convertFileNameToWindowsStyle(const std::string& fileName);
-extern OSGDB_EXPORT std::string convertFileNameToUnixStyle(const std::string& fileName);
+extern OSGDB_EXPORT std::string convertToLowerCase(const std::string& fileName);
-
-extern OSGDB_EXPORT bool isFileNameNativeStyle(const std::string& fileName);

OpenSceneGraph/trunk/include/osgDB/ReaderWriter

@@ -23 +23 @@
-
-#include <deque>
+#include <list>
-#include <iosfwd>
-
@@ -48 +49 @@
-        META_Object(osgDB,ReaderWriter);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        /** Options base class used for passing options into plugins to control their operation.*/
@@ -305 +318 @@
-        virtual WriteResult writeShader(const osg::Shader& /*shader*/,std::ostream& /*fout*/,const Options* =NULL) const { return WriteResult(WriteResult::FILE_NOT_HANDLED); }
-
+    protected:
+    
+        void supportsProtocol(const std::string& fmt, const std::string& description);
+        void supportsExtension(const std::string& fmt, const std::string& description);
+        void supportsOption(const std::string& fmt, const std::string& description);
+
+        FormatDescriptionMap _supportedProtocols;
+        FormatDescriptionMap _supportedExtensions;
+        FormatDescriptionMap _supportedOptions;
-};
-

OpenSceneGraph/trunk/src/osgDB/FileNameUtils.cpp

@@ -114 +114 @@
-std::string osgDB::getLowerCaseFileExtension(const std::string& filename)
-{
-
-
-
+
+
+
+
+
+
+
+
-        ++itr)
-    {
-        *itr = tolower(*itr);
-    }
-
-
-
+
+
-
-// strip one level of extension from the filename.

OpenSceneGraph/trunk/src/osgDB/ReaderWriter.cpp

@@ -13 +13 @@
-
-#include <osgDB/ReaderWriter>
+#include <osgDB/FileNameUtils>
-#include <osgDB/Archive>
-
@@ -34 +35 @@
-{
-}
+
+bool ReaderWriter::acceptsExtension(const std::string& extension) const
+{
+    std::string lowercase_ext = convertToLowerCase(extension);
+    return (_supportedExtensions.count(lowercase_ext)!=0);
+}
+
+void ReaderWriter::supportsProtocol(const std::string& fmt, const std::string& description)
+{
+    _supportedProtocols[convertToLowerCase(fmt)] = description;
+}
+
+void ReaderWriter::supportsExtension(const std::string& fmt, const std::string& description)
+{
+    _supportedExtensions[convertToLowerCase(fmt)] = description;
+}
+
+void ReaderWriter::supportsOption(const std::string& fmt, const std::string& description)
+{
+    _supportedOptions[fmt] = description;
+}

OpenSceneGraph/trunk/src/osgPlugins/curl/ReaderWriterCURL.cpp

@@ -143 +143 @@
-ReaderWriterCURL::ReaderWriterCURL()
-{
-
+
+
+
+
-}
-
@@ -186 +189 @@
-    osg::notify(osg::INFO)<<"ReaderWriterCURL::readFile("<<fullFileName<<")"<<std::endl;
-
-    std::string cacheFilePath, cacheFileName;
-    std::string proxyAddress, optProxy, optProxyPort;
-
@@ -196 +198 @@
-        {
-            int index = opt.find( "=" );
-
-
-
+
-                optProxy = opt.substr( index+1 );
-            else if( opt.substr( 0, index ) == "OSG_CURL_PROXYPORT" )
@@ -223 +223 @@
-    }
-
-    //Getting CURL Environment Variables (If found rewrite OSG Options)
-    const char* fileCachePath = getenv("OSG_FILE_CACHE");
-    if (fileCachePath) //Env Cache Directory
-        cacheFilePath = std::string(fileCachePath);
-
-    if (!cacheFilePath.empty())
-    {
-        cacheFileName = cacheFilePath + "/" + 
-                        osgDB::getServerAddress(fileName) + "/" + 
-                        osgDB::getServerFileName(fileName);
-
-        std::string path = osgDB::getFilePath(cacheFileName);
-
-        if (!osgDB::fileExists(path) && !osgDB::makeDirectory(path))
-        {
-            cacheFileName.clear();
-        }
-    }
-
-#if 0
-    if (!cacheFilePath.empty() && osgDB::fileExists(cacheFileName))
-    {
-        osg::notify(osg::NOTICE) << "Reading cache file " << cacheFileName <<", previous path "<<osgDB::getFilePath(fileName)<<std::endl;
-        ReadResult result = osgDB::Registry::instance()->readObject(cacheFileName,options);
-        
-        return result;                
-    }
-#endif
-
-    osgDB::ReaderWriter *reader = 
@@ -274 +246 @@
-    std::stringstream buffer;
-
-#if 0
-    EasyCurl::StreamObject sp(&buffer, cacheFileName);
-#else
-    EasyCurl::StreamObject sp(&buffer, std::string());
-#endif
-
-    ReadResult curlResult = getEasyCurl().read(proxyAddress, fileName, sp);
@@ -290 +258 @@
-
-        ReadResult readResult = readFile(objectType, reader, buffer, local_opt.get() );
-
-#if 0
-        if (!cacheFileName.empty() && readResult.success())
-        {
-            switch(objectType)
-            {
-                case(NODE): 
-                    osg::notify(osg::NOTICE)<<"Write to cache "<<cacheFileName<<std::endl;
-                    reader->writeNode(*readResult.getNode(), cacheFileName, local_opt.get());
-                    break;
-                default:
-                    osg::notify(osg::NOTICE)<<"Curl plugin write to cache not implemented yet"<<std::endl;
-            }
-        }
-#endif
-
-        local_opt->getDatabasePathList().pop_front();

OpenSceneGraph/trunk/src/osgPlugins/ive/ReaderWriterIVE.cpp

@@ -14 +14 @@
-{
-    public:
+    
+        ReaderWriterIVE()
+        {
+            supportsExtension("ive","OpenSceneGraph native binary format");
+        }
+    
-        virtual const char* className() const { return "IVE Reader/Writer"; }
-

OpenSceneGraph/trunk/src/osgPlugins/osg/ReaderWriterOSG.cpp

@@ -17 +17 @@
-{
-    public:
+    
+        OSGReaderWriter()
+        {
+            supportsExtension("osg","OpenSceneGraph Ascii file format");
+            supportsExtension("osgs","Psuedo OpenSceneGraph file loaded, with file encoded in filename string");
+            supportsOption("precision","Set the floating point precision when writing out files");
+            supportsOption("OutputTextureFiles","Write out the texture images to file");
+        }
+    
-        virtual const char* className() const { return "OSG Reader/Writer"; }
-
-        virtual bool acceptsExtension(const std::string& extension) const
-        {
-            return equalCaseInsensitive(extension,"osg");
-        }
-
-        virtual ReadResult readObject(const std::string& file, const Options* opt) const

OpenSceneGraph/trunk/src/osgPlugins/rgb/ReaderWriterRGB.cpp

@@ -444 +444 @@
-{
-    public:
+    
+        ReaderWriterRGB()
+        {
+            supportsExtension("rgb","rgb image format");
+            supportsExtension("rgba","rgba image format");
+            supportsExtension("sgi","sgi image format");
+            supportsExtension("int","int image format");
+            supportsExtension("inta","inta image format");
+            supportsExtension("bw","bw image format");
+        }
+    
-        virtual const char* className() const { return "RGB Image Reader/Writer"; }
-        
-        virtual bool acceptsExtension(const std::string& extension) const
-        {
-            return osgDB::equalCaseInsensitive(extension,"rgb") ||
-                osgDB::equalCaseInsensitive(extension,"sgi") ||
-                osgDB::equalCaseInsensitive(extension,"rgba") ||
-                osgDB::equalCaseInsensitive(extension,"int") || 
-                osgDB::equalCaseInsensitive(extension,"inta") ||
-                osgDB::equalCaseInsensitive(extension,"bw");
-        }
-
-        ReadResult readRGBStream(std::istream& fin) const
-        {