Changeset 12031 for OpenSceneGraph/trunk/examples/osganalysis/osganalysis.cpp

Timestamp:

12/14/10 15:32:16 (3 years ago)

Author:

robert

Message:

Improved the parsing of output filename

Files:

• OpenSceneGraph/trunk/examples/osganalysis/osganalysis.cpp (modified) (6 diffs)

OpenSceneGraph/trunk/examples/osganalysis/osganalysis.cpp

@@ -23 +23 @@
 #include <osgDB/ReadFile>
 #include <osgDB/WriteFile>
+#include <osgDB/FileNameUtils>
 
 #include <osgGA/TrackballManipulator>
@@ -481 +482 @@
         _modelReadyToMerge(false),
         _sceneGraphProcessor(sceneGraphProcessor),
-        _incrementalCompileOperation(ico) {}
+        _incrementalCompileOperation(ico)
+        {
+        }
 
     virtual void operator () (osg::Object* object)
@@ -502 +505 @@
             if (!_outputFilename.empty())
             {
+                OSG_NOTICE<<"Writing out file "<<_outputFilename<<std::endl;
+                
                 osgDB::writeNodeFile(*_loadedModel, _outputFilename);
             }
@@ -636 +641 @@
 
     std::string outputPostfix;
-    while (arguments.read("-o",outputPostfix)) {}
+    while (arguments.read("-o",outputPostfix)) { OSG_NOTICE<<"Set ouputPostfix to "<<outputPostfix<<std::endl; }
 
 
@@ -667 +672 @@
 
     std::string filename = fileNames[modelIndex++];
-    std::string outputFilename = outputPostfix.empty() ? std::string() : filename+outputPostfix;
+    std::string outputFilename = outputPostfix.empty() ? std::string() : osgDB::getStrippedName(filename)+outputPostfix;
 
     databasePagingOperation = new DatabasePagingOperation(
@@ -695 +700 @@
         {
             std::string filename = fileNames[modelIndex++];
-            std::string outputFilename = outputPostfix.empty() ? std::string() : filename+outputPostfix;
+            std::string outputFilename = outputPostfix.empty() ? std::string() : osgDB::getStrippedName(filename)+outputPostfix;
 
             databasePagingOperation = new DatabasePagingOperation(