Changeset 3701 for OpenSceneGraph/trunk/examples/osgshape/osgshape.cpp

Timestamp:

11/24/04 20:10:44 (9 years ago)

Author:

robert

Message:

from Mike Weiblen, added wrap mode to planet texture to avoid black seam, and
add option of specifying the texture to use in osgshape.

Files:

• OpenSceneGraph/trunk/examples/osgshape/osgshape.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/examples/osgshape/osgshape.cpp

@@ -13 +13 @@
 #include "../osghangglide/terrain_coords.h"
 
-osg::Geode* createShapes()
+osg::Geode* createShapes( char* img_filename )
 {
     osg::Geode* geode = new osg::Geode();
@@ -22 +22 @@
     osg::StateSet* stateset = new osg::StateSet();
 
-    osg::Image* image = osgDB::readImageFile("Images/lz.rgb");
+    if( ! img_filename ) img_filename = "Images/lz.rgb";
+    osg::Image* image = osgDB::readImageFile( img_filename );
+
     if (image)
     {
@@ -92 +94 @@
     // set up the usage document, in case we need to print out how to use this program.
     arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates the osg::Shape classes.");
-    arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] filename ...");
+    arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] [image_filename]");
     arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information");
    
@@ -120 +122 @@
         return 1;
     }
+
+    char* img_filename = 0;
+    for( int pos = 1; pos < arguments.argc(); ++pos )
+    {
+        if( arguments.isString(pos) )
+        {
+            img_filename = arguments[pos];
+            break;
+        }
+    }
     
-    osg::Node* node = createShapes();
+    osg::Node* node = createShapes( img_filename );
 
     // add model to viewer.