Changeset 4323

Timestamp:

Apr 7, 2014 1:00:38 AM (10 years ago)

Author:

ldelgass

Message:

Add "camera go" command for moving viewpoint based on screen coordinates. This
is intended to replace the server-side button 1 double click event.

Location:

trunk/packages/vizservers/geovis

Files:

• RendererCmd.cpp (modified) (2 diffs)
• geovis_protocol.txt (modified) (1 diff)

trunk/packages/vizservers/geovis/RendererCmd.cpp

@@ -180 +180 @@
     }
 #endif /*USE_THREADS*/
+    return TCL_OK;
+}
+
+static int
+CameraGoOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+           Tcl_Obj *const *objv)
+{
+    int x, y;
+    if (Tcl_GetIntFromObj(interp, objv[2], &x) != TCL_OK ||
+        Tcl_GetIntFromObj(interp, objv[3], &y) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    double duration = 1.0;
+    if (objc > 4) {
+        if (Tcl_GetDoubleFromObj(interp, objv[4], &duration) != TCL_OK) {
+            return TCL_ERROR;
+        }
+    }
+
+    osgEarth::GeoPoint mapPoint;
+    if (g_renderer->mapMouseCoords(x, y, mapPoint)) {
+        osgEarth::Viewpoint vpt = g_renderer->getViewpoint();
+        vpt.x() = mapPoint.x();
+        vpt.y() = mapPoint.y();
+        g_renderer->setViewpoint(vpt, duration);
+    } else {
+        // Out of map bounds
+    }
     return TCL_OK;
 }
@@ -369 +397 @@
     {"delete",  2, CameraDeleteViewpointOp,  3, 3, "name"},
     {"dist",    2, CameraSetDistanceOp,      3, 3, "distance"},
-    {"get",     1, CameraGetViewpointOp,     2, 2, ""},
+    {"get",     2, CameraGetViewpointOp,     2, 2, ""},
+    {"go",      2, CameraGoOp,               4, 5, "x y ?duration?"},
     {"orient",  1, CameraOrientOp,           6, 6, "qw qx qy qz"},
     {"pan",     1, CameraPanOp,              4, 4, "panX panY"},

trunk/packages/vizservers/geovis/geovis_protocol.txt

@@ -35 +35 @@
 camera get
        Request camera parameters
+camera go <x> <y> <?duration?>
+       Move camera to new focal point.
+       <x>,<y> = Screen/mouse coordinates
+       <duration> = Duration of viewpoint move animation in seconds
 camera orient <quatW> <quatX> <quatY> <quatZ>
        Set scene orientation using a quaternion