Changeset 798

Timestamp:

12/18/07 17:08:43

Author:

robert

Message:

Added command line support for setting polar and equator radii via --radius-polar <radius>, --radius-equator <radius> respectively.

Added command line support for --spherical option that sets the polar and equator radii to the same value, its value is computed by
averaging the original polar and equator radius.

Files:

• trunk/src/vpb/BuildOptions.cpp (modified) (1 diff)
• trunk/src/vpb/Commandline.cpp (modified) (3 diffs)

trunk/src/vpb/BuildOptions.cpp

@@ -32 +32 @@
-    _defaultColor.set(0.5f,0.5f,1.0f,1.0f);
-    _destinationCoordinateSystemString = "";
-
+
+
-    _directory = "";
-    _geometryType = POLYGONAL;

trunk/src/vpb/Commandline.cpp

@@ -422 +422 @@
-    usage.addCommandLineOption("--bluemarble-west","Set the coordinates system for next texture or dem to represent the western hemisphere of the earth.");     
-    usage.addCommandLineOption("--whole-globe","Set the coordinates system for next texture or dem to represent the whole hemisphere of the earth.");
-
+
+
+
+
-    usage.addCommandLineOption("--range","");     
-    usage.addCommandLineOption("--xx","");     
@@ -617 +620 @@
-    }
-
+    while (arguments.read("--geocentric"))
+    {
+        buildOptions->setConvertFromGeographicToGeocentric(true);
+        fout<<"--geocentric "<<currentCS<<std::endl;
+    }
+
+    double radius;
+    while (arguments.read("--radius-polar", radius))
+    {
+        osg::EllipsoidModel* ellipsoid = buildOptions->getEllipsoidModel();
+        ellipsoid->setRadiusPolar(radius);
+    }
+    
+    while (arguments.read("--radius-equator", radius))
+    {
+        osg::EllipsoidModel* ellipsoid = buildOptions->getEllipsoidModel();
+        ellipsoid->setRadiusEquator(radius);
+    }
+    
+    while (arguments.read("--spherical"))
+    {
+        osg::EllipsoidModel* ellipsoid = buildOptions->getEllipsoidModel();
+        double radius = (ellipsoid->getRadiusPolar() + ellipsoid->getRadiusEquator())*0.5;
+        ellipsoid->setRadiusPolar(radius);
+        ellipsoid->setRadiusEquator(radius);
+        fout<<"--spherical, new radius set to "<<radius<<std::endl;
+    }
+
+
-    std::string str;
-    while (arguments.read("--default-color",str) ||
@@ -705 +737 @@
-            }
-        }
-        else if (arguments.read(pos, "--geocentric"))
-        {
-            buildOptions->setConvertFromGeographicToGeocentric(true);
-            fout<<"--geocentric "<<currentCS<<std::endl;
-        }
-
-        else if (arguments.read(pos, "--bluemarble-east"))
-        {