Changeset 4313 for trunk/packages/vizservers

Timestamp:

Apr 1, 2014 8:57:56 PM (10 years ago)

Author:

ldelgass

Message:

Add protocol to get/set viewport parameters

Location:

trunk/packages/vizservers/geovis

Files:

• Renderer.cpp (modified) (3 diffs)
• Renderer.h (modified) (1 diff)
• RendererCmd.cpp (modified) (3 diffs)

trunk/packages/vizservers/geovis/Renderer.cpp

@@ -955 +955 @@
  * \param[in] absolute Control if pan amount is relative to current or absolute
  */
-void Renderer::panCamera(double x, double y, bool absolute)
-{
-    TRACE("Enter: %g %g, abs: %d",
-          x, y, (absolute ? 1 : 0));
+void Renderer::panCamera(double x, double y)
+{
+    TRACE("Enter: %g %g", x, y);
 
     if (_manipulator.valid()) {
@@ -967 +966 @@
 }
 
-void Renderer::rotateCamera(double x, double y, bool absolute)
-{
-    TRACE("Enter: %g %g, abs: %d",
-          x, y, (absolute ? 1 : 0));
+void Renderer::rotateCamera(double x, double y)
+{
+    TRACE("Enter: %g %g", x, y);
 
     if (_manipulator.valid()) {
@@ -984 +982 @@
  * \param[in] absolute Control if zoom factor is relative to current setting or absolute
  */
-void Renderer::zoomCamera(double z, bool absolute)
-{
-    TRACE("Enter: z: %g, abs: %d",
-          z, (absolute ? 1 : 0));
+void Renderer::zoomCamera(double z)
+{
+    TRACE("Enter: z: %g", z);
 
     if (_manipulator.valid()) {

trunk/packages/vizservers/geovis/Renderer.h

@@ -313 +313 @@
     void setCameraOrientation(const double quat[4], bool absolute = true);
 
-    void panCamera(double x, double y, bool absolute = false);
-
-    void rotateCamera(double x, double y, bool absolute = false);
-
-    void zoomCamera(double z, bool absolute = false);
+    void panCamera(double x, double y);
+
+    void rotateCamera(double x, double y);
+
+    void zoomCamera(double z);
 
     // Keyboard events

trunk/packages/vizservers/geovis/RendererCmd.cpp

@@ -239 +239 @@
 
 static int
+CameraGetViewpointOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                     Tcl_Obj *const *objv)
+{
+    osgEarth::Viewpoint view = g_renderer->getViewpoint();
+
+    std::ostringstream oss;
+    size_t len = 0;
+    oss << "nv>camera get "
+        << view.x() << " "
+        << view.y() << " "
+        << view.z() << " "
+        << view.getHeading() << " "
+        << view.getPitch() << " "
+        << view.getRange()
+        << " {" << view.getSRS()->getHorizInitString() << "}"
+        << " {" << view.getSRS()->getVertInitString() << "}"
+        << "\n";
+    len = oss.str().size();
+#ifdef USE_THREADS
+    queueResponse(oss.str().c_str(), len, Response::VOLATILE);
+#else 
+    ssize_t bytesWritten = SocketWrite(oss.str().c_str(), len);
+
+    if (bytesWritten < 0) {
+        return TCL_ERROR;
+    }
+#endif /*USE_THREADS*/
+    return TCL_OK;
+}
+
+static int
+CameraSetViewpointOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                     Tcl_Obj *const *objv)
+{
+    double x, y, z, heading, pitch, distance;
+    double duration = 0.0;
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &x) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &y) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &z) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[5], &heading) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[6], &pitch) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[7], &distance) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc > 8) {
+        if (Tcl_GetDoubleFromObj(interp, objv[8], &duration) != TCL_OK) {
+            return TCL_ERROR;
+        }
+    }
+    if (objc > 9) {
+        char *srsInit = Tcl_GetString(objv[9]);
+        if (strlen(srsInit) > 0) {
+            osgEarth::SpatialReference *srs = NULL;
+            if (objc > 10) {
+                char *vertDatum = Tcl_GetString(objv[10]);
+                srs = osgEarth::SpatialReference::get(srsInit, vertDatum);
+            } else {
+                srs = osgEarth::SpatialReference::get(srsInit);
+            }
+            if (srs == NULL) {
+                return TCL_ERROR;
+            }
+            osgEarth::Viewpoint view(x, y, z, heading, pitch, distance, srs);
+            g_renderer->setViewpoint(view, duration);
+        } else {
+            osgEarth::Viewpoint view(x, y, z, heading, pitch, distance);
+            g_renderer->setViewpoint(view, duration);
+        }
+    } else {
+        osgEarth::Viewpoint view(x, y, z, heading, pitch, distance);
+        g_renderer->setViewpoint(view, duration);
+    }
+    return TCL_OK;
+}
+
+static int
 CameraThrowOp(ClientData clientData, Tcl_Interp *interp, int objc, 
               Tcl_Obj *const *objv)
@@ -267 +343 @@
 
 static CmdSpec cameraOps[] = {
+    {"get",     1, CameraGetViewpointOp,     2, 2, ""},
     {"orient",  1, CameraOrientOp,           6, 6, "qw qx qy qz"},
     {"pan",     1, CameraPanOp,              4, 4, "panX panY"},
@@ -272 +349 @@
     {"restore", 4, CameraRestoreViewpointOp, 3, 4, "name ?duration?"},
     {"rotate",  2, CameraRotateOp,           4, 4, "azimuth elevation"},
-    {"save",    1, CameraSaveViewpointOp,    3, 3, "name"},
+    {"save",    2, CameraSaveViewpointOp,    3, 3, "name"},
+    {"set",     2, CameraSetViewpointOp,     8, 11, "x y z heading pitch distance ?duration? ?srs? ?vertDatum?"},
     {"throw",   1, CameraThrowOp,            3, 3, "bool"},
     {"zoom",    1, CameraZoomOp,             3, 3, "zoomAmount"}