Changeset 10819

Timestamp:

11/23/09 12:00:07 (3 years ago)

Author:

robert

Message:

From Chris Hanson, " Add support for "OutputTextureFiles?" option to IVE plugin to permit creation of external
.dds texture files from internally-embedded textures during IVE writes."

From Robert Osfield, fixed a bug in the above submission, and changed the way that the filename of the file is passed into DataOutputStream? to avoid issues with the .ive's plugins ability to read from istreams.

Location:

OpenSceneGraph/trunk/src/osgPlugins

Files:

• ive/DataOutputStream.cpp (modified) (5 diffs)
• ive/DataOutputStream.h (modified) (3 diffs)
• ive/ReaderWriterIVE.cpp (modified) (4 diffs)
• osgTerrain/ImageLayer.cpp (modified) (2 diffs)

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

@@ -124 +124 @@
 #include <osg/io_utils>
 #include <osgDB/FileUtils>
+#include <osgDB/FileNameUtils>
 #include <osgDB/fstream>
+#include <osgDB/WriteFile>
 
 #include <stdlib.h>
@@ -143 +145 @@
     _maximumErrorToSizeRatio       = 0.001;
 
+    _outputTextureFiles = false;
+    _textureFileNameNumber = 0;
+
     _options = options;
 
     _compressionLevel = 0;
+
+    if (options) _filename = options->getPluginStringData("filename");
+
+    if (_filename.empty())
+    {
+        // initialize _filename to a unique identifier in case a real filename is not supplied
+        std::ostringstream filenameBuilder;
+        filenameBuilder << "file" << ostream; // use address of ostream to formulate unique filename
+        _filename = filenameBuilder.str();
+    }
 
     if (_options.get())
@@ -158 +173 @@
             setIncludeImageMode(IMAGE_COMPRESS_DATA);
         }
-        osg::notify(osg::DEBUG_INFO) << "ive::DataOutpouStream.setIncludeImageMode()=" << getIncludeImageMode() << std::endl;
+        osg::notify(osg::DEBUG_INFO) << "ive::DataOutputStream.setIncludeImageMode()=" << getIncludeImageMode() << std::endl;
 
         setIncludeExternalReferences(optionsString.find("inlineExternalReferencesInIVEFile")!=std::string::npos);
-        osg::notify(osg::DEBUG_INFO) << "ive::DataOutpouStream.setIncludeExternalReferences()=" << getIncludeExternalReferences() << std::endl;
+        osg::notify(osg::DEBUG_INFO) << "ive::DataOutputStream.setIncludeExternalReferences()=" << getIncludeExternalReferences() << std::endl;
 
         setWriteExternalReferenceFiles(optionsString.find("noWriteExternalReferenceFiles")==std::string::npos);
-        osg::notify(osg::DEBUG_INFO) << "ive::DataOutpouStream.setWriteExternalReferenceFiles()=" << getWriteExternalReferenceFiles() << std::endl;
+        osg::notify(osg::DEBUG_INFO) << "ive::DataOutputStream.setWriteExternalReferenceFiles()=" << getWriteExternalReferenceFiles() << std::endl;
 
         setUseOriginalExternalReferences(optionsString.find("useOriginalExternalReferences")!=std::string::npos);
-        osg::notify(osg::DEBUG_INFO) << "ive::DataOutpouStream.setUseOriginalExternalReferences()=" << getUseOriginalExternalReferences() << std::endl;
+        osg::notify(osg::DEBUG_INFO) << "ive::DataOutputStream.setUseOriginalExternalReferences()=" << getUseOriginalExternalReferences() << std::endl;
+
+        setOutputTextureFiles(optionsString.find("OutputTextureFiles")!=std::string::npos);
+        osg::notify(osg::DEBUG_INFO) << "ive::DataOutputStream.setOutputTextureFiles()=" << getOutputTextureFiles() << std::endl;
 
         _compressionLevel =  (optionsString.find("compressed")!=std::string::npos) ? 1 : 0;
-        osg::notify(osg::DEBUG_INFO) << "ive::DataOutpouStream._compressionLevel=" << _compressionLevel << std::endl;
+        osg::notify(osg::DEBUG_INFO) << "ive::DataOutputStream._compressionLevel=" << _compressionLevel << std::endl;
 
         std::string::size_type terrainErrorPos = optionsString.find("TerrainMaximumErrorToSizeRatio=");
@@ -1440 +1458 @@
             break;
         case IMAGE_REFERENCE_FILE:
-            // Only include image name in stream
-            if (image && !(image->getFileName().empty())){
-                writeString(image->getFileName());
+        {
+            if (image)
+            {
+                // Only include image name in stream
+                std::string fileName = image->getFileName();
+                // Export an image, if requested
+                if (getOutputTextureFiles())
+                {
+                    if (fileName.empty())
+                    { // synthesize a new faux filename
+                        fileName = getTextureFileNameForOutput();
+                    }
+                    osgDB::writeImageFile(*image, fileName);
+                }
+                writeString(fileName);
             }
-            else{
+            else
+            {
                 writeString("");
             }
             break;
+        }
         case IMAGE_INCLUDE_FILE:
             // Include image file in stream
@@ -1840 +1872 @@
 }
 
+std::string DataOutputStream::getTextureFileNameForOutput()
+{
+    std::string fileName = osgDB::getNameLessExtension(_filename);
+    if (_textureFileNameNumber>0)
+    {
+        std::ostringstream o;
+        o << '_' << _textureFileNameNumber;
+        fileName += o.str();
+    }
+    
+    fileName += ".dds";
+    ++_textureFileNameNumber;
+    
+    return fileName;
+}
+
+
+
 void DataOutputStream::setExternalFileWritten(const std::string& filename, bool hasBeenWritten)
 {

OpenSceneGraph/trunk/src/osgPlugins/ive/DataOutputStream.h

@@ -131 +131 @@
     bool getUseOriginalExternalReferences() const {return _useOriginalExternalReferences;};
 
+    // Set and get if export texture files during write
+    void setOutputTextureFiles(bool flag) { _outputTextureFiles = flag; }
+    bool getOutputTextureFiles() const { return _outputTextureFiles; }
+
+    // support code for OutputTextureFiles
+    virtual std::string getTextureFileNameForOutput();
+    void setFileName(std::string newFileName) {_filename = newFileName;}
+    std::string getFileName(void) const {return(_filename);}
+
     void setTerrainMaximumErrorToSizeRatio(double ratio) { _maximumErrorToSizeRatio = ratio; }
     double getTerrainMaximumErrorToSizeRatio() const { return _maximumErrorToSizeRatio; }
@@ -151 +160 @@
     std::ostream* _ostream;
     std::ostream* _output_ostream;
+    std::string _filename; // not necessary, but optional for use in texture export
     
     std::stringstream _compressionStream;
@@ -189 +199 @@
 
     IncludeImageMode    _includeImageMode;
-    
+
+    bool _outputTextureFiles;
+    unsigned int _textureFileNameNumber;
+
     osg::ref_ptr<const osgDB::ReaderWriter::Options> _options;
 

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

@@ -29 +29 @@
             supportsOption("TerrainMaximumErrorToSizeRatio=value","Export option that controls error matric used to determine terrain HieghtField storage precision.");
             supportsOption("noLoadExternalReferenceFiles","Import option");
+            supportsOption("OutputTextureFiles","Write out the texture images to file");
         }
     
@@ -69 +70 @@
             osg::ref_ptr<Options> local_opt = options ? static_cast<Options*>(options->clone(osg::CopyOp::SHALLOW_COPY)) : new Options;
             local_opt->getDatabasePathList().push_front(osgDB::getFilePath(fileName));
-            
+
             osgDB::ifstream istream(fileName.c_str(), std::ios::in | std::ios::binary);
             return readNode(istream,local_opt.get());
@@ -119 +120 @@
             if(local_opt->getDatabasePathList().empty())
                 local_opt->setDatabasePath(osgDB::getFilePath(fileName));
+
+            local_opt->setPluginStringData("filename",fileName);
+
             osgDB::ofstream fout(fileName.c_str(), std::ios::out | std::ios::binary);
             if (!fout) return WriteResult::ERROR_IN_WRITING_FILE;
@@ -135 +139 @@
             if(local_opt->getDatabasePathList().empty())
                 local_opt->setDatabasePath(osgDB::getFilePath(fileName));
+
+            local_opt->setPluginStringData("filename",fileName);
 
             osgDB::ofstream fout(fileName.c_str(), std::ios::out | std::ios::binary);

OpenSceneGraph/trunk/src/osgPlugins/osgTerrain/ImageLayer.cpp

@@ -12 +12 @@
 #include <osgDB/Input>
 #include <osgDB/Output>
+#include <osgDB/WriteFile>
 #include <osgDB/ParameterOutput>
 
@@ -65 +66 @@
 {
     const osgTerrain::ImageLayer& layer = static_cast<const osgTerrain::ImageLayer&>(obj);
+
+    std::string fileName = layer.getFileName();
     
-    if (!layer.getFileName().empty())
+    if (fw.getOutputTextureFiles())
     {
-        fw.indent()<<"file "<< layer.getFileName() << std::endl;
+        if (fileName.empty())
+        {
+            fileName = fw.getTextureFileNameForOutput();
+        }
+        osgDB::writeImageFile(*layer.getImage(), fileName);
+    }
+    if (!fileName.empty())
+    {
+        fw.indent()<<"file "<< fw.wrapString(fileName) << std::endl;
     }