Changeset 2578 for OpenSceneGraph/trunk/examples/osgphotoalbum/osgphotoalbum.cpp

Timestamp:

12/24/03 00:55:06 (9 years ago)

Author:

robert

Message:

Added support for a photo archive.

Files:

• OpenSceneGraph/trunk/examples/osgphotoalbum/osgphotoalbum.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/examples/osgphotoalbum/osgphotoalbum.cpp

@@ -19 +19 @@
 #include <osgUtil/Optimizer>
 
+#include <osgDB/FileNameUtils>
+
 #include <osgText/Text>
 
@@ -448 +450 @@
     for(int pos=1;pos<arguments.argc();++pos)
     {
-        if (arguments.isString(pos)) fileList.push_back(arguments[pos]);
+        if (arguments.isString(pos)) 
+        {
+            std::string filename(arguments[pos]);
+            if (osgDB::getLowerCaseFileExtension(filename)=="album")
+            {
+                PhotoArchive* photoArchive = PhotoArchive::open(filename);
+                if (photoArchive)
+                {
+                    g_ImageReaderWriter.get()->addPhotoArchive(photoArchive);
+                    photoArchive->getImageFileNameList(fileList);
+                }
+                
+            }
+            else
+            {
+                fileList.push_back(arguments[pos]);
+            }
+        }
     }
     
@@ -653 +672 @@
     arguments.getApplicationUsage()->addCommandLineOption("-a","Enter auto advance of image pairs on start up.");
     arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information");
+    arguments.getApplicationUsage()->addCommandLineOption("--create <filename>","Create an photo archive of specified files");
     
 
@@ -684 +704 @@
     }
 
+    std::string archiveName;
+    while (arguments.read("--create",archiveName)) {}
+    
     // any option left unread are converted into errors to write out later.
     arguments.reportRemainingOptionsAsUnrecognized();
@@ -700 +723 @@
     }
 
+
+    if (!archiveName.empty())
+    {
+        // archive name set to create
+        PhotoArchive::FileNameList fileNameList;
+        for(int i=1;i<arguments.argc();++i)
+        {
+            if (arguments.isString(i)) fileNameList.push_back(std::string(arguments[i]));
+        }
+        
+        PhotoArchive::buildArchive(archiveName,fileNameList);
+        
+        return 0;
+    }