Changeset 4328 for trunk/packages/vizservers/geovis

Timestamp:

Apr 7, 2014 3:51:09 AM (10 years ago)

Author:

ldelgass

Message:

Let's try this: automatically set the client stored viewpoint on every image
response. Currently this uses a 'camera set' right before the image response
rather than adding the parameters to the image response itself.

Location:

trunk/packages/vizservers/geovis

Files:

• RenderServer.cpp (modified) (2 diffs)
• Renderer.cpp (modified) (2 diffs)

trunk/packages/vizservers/geovis/RenderServer.cpp

@@ -56 +56 @@
 #endif
 #endif
+
+static int
+queueViewpoint()
+{
+    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() == NULL) ? "" : view.getSRS()->getHorizInitString()) << "}"
+        << " {" << ((view.getSRS() == NULL) ? "" : 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;
+}
 
 #ifdef USE_THREADS
@@ -536 +566 @@
                 if (imgData->s() == g_renderer->getWindowWidth() &&
                     imgData->t() == g_renderer->getWindowHeight()) {
+                    queueViewpoint();
 #ifdef USE_THREADS
                     queueFrame(g_outQueue, imgData->data());

trunk/packages/vizservers/geovis/Renderer.cpp

@@ -656 +656 @@
 {
     if (_manipulator.valid()) {
+        TRACE("Setting viewpoint: %g %g %g %g %g %g",
+              v.x(), v.y(), v.z(), v.getHeading(), v.getPitch(), v.getRange());
         _manipulator->setViewpoint(v, durationSecs);
         _needsRedraw = true;
+    } else {
+        ERROR("No manipulator");
     }
 }
@@ -1115 +1119 @@
         TRACE("camDist: %g", _manipulator->getDistance());
         // FIXME: zoom here wants y mouse coords in normalized viewport coords
-        //_manipulator->zoom(0, y);
-
+#if 1
+       _manipulator->zoom(0, y);
+#else
         double dist = _manipulator->getDistance();
         dist *= (1.0 + y);
         _manipulator->setDistance(dist);
-
+#endif
         _needsRedraw = true;
     }