Changeset 11871 for OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

Timestamp:

11/01/10 12:06:12 (3 years ago)

Author:

robert

Message:

From Jean-Sebastien Guay, osgDB functions to expand wildcards - required to aid windows consule usage as this doesn't not automatically expand * usage.

Files:

• OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp (modified) (1 diff)

OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

@@ -1108 +1108 @@
         for(;pos<arguments.argc() && !arguments.isOption(pos);++pos)
         {
-            // not an option so assume string is a filename.
-            osg::Image *image = osgDB::readImageFile( arguments[pos]);
-            if(image)
+            std::string arg(arguments[pos]);
+            if (arg.find('*') != std::string::npos)
             {
-                imageList.push_back(image);
+                osgDB::DirectoryContents contents = osgDB::expandWildcardsInFilename(arg);
+                for (unsigned int i = 0; i < contents.size(); ++i)
+                {
+                    osg::Image *image = osgDB::readImageFile( contents[i] );
+
+                    if(image)
+                    {
+                        imageList.push_back(image);
+                    }
+                }
+            }
+            else
+            {
+                // not an option so assume string is a filename.
+                osg::Image *image = osgDB::readImageFile( arguments[pos] );
+
+                if(image)
+                {
+                    imageList.push_back(image);
+                }
             }
         }