Changeset 100

Timestamp:

Jun 6, 2005, 11:55:29 AM (19 years ago)

Author:

darran

Message:

• added -lightpos x,y,z command line parameter
• colour still looks "blown out" ... investigate this

Location:

Swollen/swollen

Files:

• main.cpp (modified) (3 diffs)
• version.cpp (modified) (1 diff)

Swollen/swollen/main.cpp

@@ -41 +41 @@
     arguments.getApplicationUsage()->addCommandLineOption("-scale <float>","Vertical scale factor");
     arguments.getApplicationUsage()->addCommandLineOption("-tps <rate>","Timesteps per second");
-    arguments.getApplicationUsage()->addCommandLineOption("-hmin <float>","Height below which transparency is set to zero");    
-    arguments.getApplicationUsage()->addCommandLineOption("-hmax <float>","Height above which transparency is set to alphamax");       
-    arguments.getApplicationUsage()->addCommandLineOption("-alphamin <float 0-1>","Transparency value at hmin");    
+    arguments.getApplicationUsage()->addCommandLineOption("-hmin <float>","Height below which transparency is set to zero");
+    arguments.getApplicationUsage()->addCommandLineOption("-hmax <float>","Height above which transparency is set to alphamax");
+    arguments.getApplicationUsage()->addCommandLineOption("-alphamin <float 0-1>","Transparency value at hmin");
     arguments.getApplicationUsage()->addCommandLineOption("-alphamax <float 0-1>","Maximum transparency clamp value");
+    arguments.getApplicationUsage()->addCommandLineOption("-lightpos <float>,<float>,<float>","x,y,z of bedslope directional light (default is overhead)");
     arguments.getApplicationUsage()->addCommandLineOption("-nosky","Omit background sky");
     arguments.getApplicationUsage()->addCommandLineOption("-texture <file>","Image to use for bedslope topography");
@@ -75 +76 @@
         return 1;
     }
-
 
 
@@ -132 +132 @@
     DirectionalLight* light = new DirectionalLight(rootStateSet);
     light->setPosition( osg::Vec3(0,0,2) );  // z is up
+
+    std::string lightposstr;
+    while (arguments.read("-lightpos",lightposstr))
+    {
+        float x, y, z;
+        int count = sscanf( lightposstr.c_str(), "%f,%f,%f", &x, &y, &z );
+        if( count == 3 ) light->setPosition( osg::Vec3(x,y,z) );  // z is up
+        else osg::notify(osg::WARN) << "Invalid bedslope light position \"" << lightposstr << "\"" << std::endl;
+    }
+
 
 

Swollen/swollen/version.cpp

@@ -1 @@
-const char* version() { const char* s = "Revision: 98M"; return s; }
+const char* version() { const char* s = "Revision: 98:99M"; return s; }