Changeset 4332 for trunk

Timestamp:

Apr 7, 2014, 6:18:11 AM (11 years ago)

Author:

ldelgass

Message:

Add param to 'camera go' for setting zoom ratio.

File:

• trunk/packages/vizservers/geovis/RendererCmd.cpp (modified) (4 diffs)

trunk/packages/vizservers/geovis/RendererCmd.cpp

@@ -192 +192 @@
         return TCL_ERROR;
     }
+    double zoom = 1.0;
+    if (objc > 4) {
+        if (Tcl_GetDoubleFromObj(interp, objv[4], &zoom) != TCL_OK) {
+            return TCL_ERROR;
+        }
+    }
     double duration = 1.0;
-    if (objc > 4) {
-        if (Tcl_GetDoubleFromObj(interp, objv[4], &duration) != TCL_OK) {
+    if (objc > 5) {
+        if (Tcl_GetDoubleFromObj(interp, objv[5], &duration) != TCL_OK) {
             return TCL_ERROR;
         }
@@ -205 +211 @@
         vpt.y() = mapPoint.y();
         vpt.z() = mapPoint.z();
+        vpt.setRange(vpt.getRange() * zoom);
         g_renderer->setViewpoint(vpt, duration);
     } else {
@@ -399 +406 @@
     {"dist",    2, CameraSetDistanceOp,      3, 3, "distance"},
     {"get",     2, CameraGetViewpointOp,     2, 2, ""},
-    {"go",      2, CameraGoOp,               4, 5, "x y ?duration?"},
+    {"go",      2, CameraGoOp,               4, 6, "x y ?zoomFactor? ?duration?"},
     {"orient",  1, CameraOrientOp,           6, 6, "qw qx qy qz"},
     {"pan",     1, CameraPanOp,              4, 4, "panX panY"},
@@ -902 +909 @@
         osgEarth::Symbology::Style style;
         osgEarth::Symbology::TextSymbol *ts = style.getOrCreateSymbol<osgEarth::Symbology::TextSymbol>();
-        ts->halo()->color() = osgEarth::Symbology::Color::White;
+        ts->halo()->color() = osgEarth::Symbology::Color::Black;
         ts->halo()->width() = 2.0f;
-        ts->fill()->color() = osgEarth::Symbology::Color::Black;
+        ts->fill()->color() = osgEarth::Symbology::Color::White;
         ts->content() = osgEarth::Symbology::StringExpression(content);
         ts->priority() = osgEarth::Symbology::NumericExpression(priority);