Changeset 7446 for OpenSceneGraph/trunk/examples/osgstereoimage/osgstereoimage.cpp

Timestamp:

09/21/07 11:02:03 (6 years ago)

Author:

robert

Message:

From Luc Frauciel, "A few improvements to osgstereoimage:
- When using a large numbrer of files, the command line was too long;
Added a -files option that allow to store filenames in a file (one file
per line)
- Added some more intuitive key bindings for controls (left, right, + ,
-)
- Set the texture wrapping to CLAMP_TO_EDGE (it's cleaner now)
"

Files:

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

OpenSceneGraph/trunk/examples/osgstereoimage/osgstereoimage.cpp

@@ -46 +46 @@
     texture->setFilter(osg::Texture2D::MIN_FILTER,osg::Texture2D::LINEAR);
     texture->setFilter(osg::Texture2D::MAG_FILTER,osg::Texture2D::LINEAR);
+    texture->setWrap(osg::Texture2D::WRAP_S,osg::Texture2D::CLAMP_TO_BORDER);
+    texture->setWrap(osg::Texture2D::WRAP_T,osg::Texture2D::CLAMP_TO_BORDER);
     texture->setResizeNonPowerOfTwoHint(false);
     texture->setImage(image);
@@ -278 +280 @@
                 return true;
             }
-            else if (ea.getKey()=='n')
+            else if ((ea.getKey()=='n') || (ea.getKey()==osgGA::GUIEventAdapter::KEY_Right)) 
             {
                 nextSlide();
                 return true;
             }
-            else if (ea.getKey()=='p')
+            else if ((ea.getKey()=='p') || (ea.getKey()==osgGA::GUIEventAdapter::KEY_Left)) 
             {
                 previousSlide();
                 return true;
             }
-            else if (ea.getKey()=='w')
+            else if ((ea.getKey()=='w') || (ea.getKey()==osgGA::GUIEventAdapter::KEY_KP_Add)) 
             {
                 scaleImage(0.99f);
                 return true;
             }
-            else if (ea.getKey()=='s')
+            else if ((ea.getKey()=='s') || (ea.getKey()==osgGA::GUIEventAdapter::KEY_KP_Subtract)) 
             {
                 scaleImage(1.01f);
@@ -463 +465 @@
     arguments.getApplicationUsage()->addCommandLineOption("-y <float>","Vertical offset of left and right images.");
     arguments.getApplicationUsage()->addCommandLineOption("--disk","Keep images on disk");
+    arguments.getApplicationUsage()->addCommandLineOption("-files <filename>","Load filenames from a file");
     arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information");
     arguments.getApplicationUsage()->addCommandLineOption("--SingleThreaded","Select SingleThreaded threading model for viewer.");
@@ -493 +496 @@
     while (arguments.read("--disk")) { onDisk=true;}
 
+    std::string filename="";
+    FileList fileList;
+    // extract the filenames from the a file, one filename per line.
+    while (arguments.read("-files",filename)) {
+        std::ifstream is(filename.c_str());
+        if (is) {
+                std::string line;
+                while (std::getline(is,line,'\n')) fileList.push_back(line);
+                is.close();
+            }
+    
+    }
+
     // if user request help write it out to cout.
     if (arguments.read("-h") || arguments.read("--help"))
@@ -519 +535 @@
     
     // extract the filenames from the arguments list.
-    FileList fileList;
     for(int pos=1;pos<arguments.argc();++pos)
     {