Changeset 4320 for trunk/packages/vizservers

Timestamp:

Apr 6, 2014, 5:58:05 PM (10 years ago)

Author:

ldelgass

Message:

Add map coords command to convert screen/mouse x/y to map coords

Location:

trunk/packages/vizservers/geovis

Files:

• RenderServer.cpp (modified) (1 diff)
• Renderer.cpp (modified) (7 diffs)
• Renderer.h (modified) (4 diffs)
• RendererCmd.cpp (modified) (3 diffs)
• geovis_protocol.txt (modified) (4 diffs)

trunk/packages/vizservers/geovis/RenderServer.cpp

@@ -560 +560 @@
 
             length = snprintf(mesg, sizeof(mesg),
-                              "nv>dataset coords %g %g %g\n", x, y, z);
+                              "nv>map coords %g %g %g\n", x, y, z);
 
             queueResponse(mesg, length, Response::VOLATILE);

trunk/packages/vizservers/geovis/Renderer.cpp

@@ -20 +20 @@
 #include <osgGA/StateSetManipulator>
 #include <osgGA/GUIEventAdapter>
+#include <osgViewer/ViewerEventHandlers>
 
 #include <osgEarth/Version>
@@ -128 +129 @@
         osgViewer::ViewerBase::Windows windows;
         _viewer->getWindows(windows);
-        return windows[0]->getEventQueue();
-    } else {
-        return NULL;
-    }
+        if (windows.size() > 0) {
+            return windows[0]->getEventQueue();
+        }
+    }
+    return NULL;
 }
 
@@ -242 +244 @@
     //_viewer->setLightingMode(osg::View::SKY_LIGHT);
     _viewer->getCamera()->setClearColor(osg::Vec4(_bgColor[0], _bgColor[1], _bgColor[2], 1));
+    _viewer->getCamera()->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     _viewer->getCamera()->setNearFarRatio(0.00002);
     _viewer->getCamera()->setSmallFeatureCullingPixelSize(-1.0f);
     _stateManip = new osgGA::StateSetManipulator(_viewer->getCamera()->getOrCreateStateSet());
     _viewer->addEventHandler(_stateManip);
+    //_viewer->addEventHandler(new osgViewer::StatsHandler());
 }
 
@@ -251 +255 @@
     initViewer();
     if (!_viewer->isRealized()) {
+#ifdef USE_OFFSCREEN_RENDERING
+#ifdef USE_PBUFFER
+        osg::ref_ptr<osg::GraphicsContext> pbuffer;
+        osg::ref_ptr<osg::GraphicsContext::Traits> traits = new osg::GraphicsContext::Traits;
+        traits->x = 0;
+        traits->y = 0;
+        traits->width = _windowWidth;
+        traits->height = _windowHeight;
+        traits->red = 8;
+        traits->green = 8;
+        traits->blue = 8;
+        traits->alpha = 8;
+        traits->windowDecoration = false;
+        traits->pbuffer = true;
+        traits->doubleBuffer = true;
+        traits->sharedContext = 0;
+
+        pbuffer = osg::GraphicsContext::createGraphicsContext(traits.get());
+        if (pbuffer.valid()) {
+            TRACE("Pixel buffer has been created successfully.");
+        } else {
+            ERROR("Pixel buffer has not been created successfully.");
+        }
+        osg::Camera *camera = new osg::Camera;
+        camera->setGraphicsContext(pbuffer.get());
+        camera->setViewport(new osg::Viewport(0, 0, _windowWidth, _windowHeight));
+        GLenum buffer = pbuffer->getTraits()->doubleBuffer ? GL_BACK : GL_FRONT;
+        camera->setDrawBuffer(buffer);
+        camera->setReadBuffer(buffer);
+        _captureCallback = new ScreenCaptureCallback();
+        camera->setFinalDrawCallback(_captureCallback.get());
+        _viewer->addSlave(camera, osg::Matrixd(), osg::Matrixd());
+#else
+        _viewer->getCamera()->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
+        osg::Texture2D* texture2D = new osg::Texture2D;
+        texture2D->setTextureSize(_windowWidth, _windowHeight);
+        texture2D->setInternalFormat(GL_RGBA);
+        texture2D->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::NEAREST);
+        texture2D->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::NEAREST);
+
+        _viewer->getCamera()->setImplicitBufferAttachmentMask(0, 0);
+        _viewer->getCamera()->attach(osg::Camera::COLOR_BUFFER0, texture2D);
+        //_viewer->getCamera()->attach(osg::Camera::DEPTH_BUFFER, GL_DEPTH_COMPONENT24);
+        _viewer->getCamera()->attach(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, GL_DEPTH24_STENCIL8_EXT);
+        _captureCallback = new ScreenCaptureCallback(texture2D);
+        _viewer->getCamera()->setFinalDrawCallback(_captureCallback.get());
+        _viewer->setUpViewInWindow(0, 0, _windowWidth, _windowHeight);
+#endif
+#else
         _captureCallback = new ScreenCaptureCallback();
         _viewer->getCamera()->setFinalDrawCallback(_captureCallback.get());
+        //_viewer->getCamera()->getDisplaySettings()->setDoubleBuffer(false);
         _viewer->setUpViewInWindow(0, 0, _windowWidth, _windowHeight);
+#endif
         _viewer->realize();
         initColorMaps();
@@ -618 +673 @@
 bool Renderer::mapMouseCoords(float mouseX, float mouseY, osgEarth::GeoPoint& map)
 {
-    if (!_mapNode.valid()) {
-        ERROR("No map");
+    if (!_mapNode.valid() || _mapNode->getTerrain() == NULL) {
+        ERROR("No map");
+        return false;
+    }
+    if (!_viewer.valid()) {
+        ERROR("No Viewer");
         return false;
     }
@@ -914 +973 @@
     _windowHeight = height;
     if (_viewer.valid()) {
+#ifdef USE_OFFSCREEN_RENDERING
+#ifdef USE_PBUFFER
+        osg::ref_ptr<osg::GraphicsContext> pbuffer;
+        osg::ref_ptr<osg::GraphicsContext::Traits> traits = new osg::GraphicsContext::Traits;
+        traits->x = 0;
+        traits->y = 0;
+        traits->width = _windowWidth;
+        traits->height = _windowHeight;
+        traits->red = 8;
+        traits->green = 8;
+        traits->blue = 8;
+        traits->alpha = 8;
+        traits->windowDecoration = false;
+        traits->pbuffer = true;
+        traits->doubleBuffer = true;
+        traits->sharedContext = 0;
+
+        pbuffer = osg::GraphicsContext::createGraphicsContext(traits.get());
+        if (pbuffer.valid()) {
+            TRACE("Pixel buffer has been created successfully.");
+        } else {
+            ERROR("Pixel buffer has not been created successfully.");
+        }
+        osg::Camera *camera = new osg::Camera;
+        camera->setGraphicsContext(pbuffer.get());
+        camera->setViewport(new osg::Viewport(0, 0, _windowWidth, _windowHeight));
+        GLenum buffer = pbuffer->getTraits()->doubleBuffer ? GL_BACK : GL_FRONT;
+        camera->setDrawBuffer(buffer);
+        camera->setReadBuffer(buffer);
+        camera->setFinalDrawCallback(_captureCallback.get());
+        _viewer->addSlave(camera, osg::Matrixd(), osg::Matrixd());
+        _viewer->realize();
+#else
+        if (_captureCallback.valid()) {
+            _captureCallback->getTexture()->setTextureSize(_windowWidth, _windowHeight);
+        }
         osgViewer::ViewerBase::Windows windows;
         _viewer->getWindows(windows);
@@ -921 +1016 @@
             ERROR("Num windows: %lu", windows.size());
         }
+#endif
+#else
+        osgViewer::ViewerBase::Windows windows;
+        _viewer->getWindows(windows);
+        if (windows.size() == 1) {
+            windows[0]->setWindowRectangle(0, 0, _windowWidth, _windowHeight);
+        } else {
+            ERROR("Num windows: %lu", windows.size());
+        }
+#endif
         _needsRedraw = true;
     }

trunk/packages/vizservers/geovis/Renderer.h

@@ -49 +49 @@
 {
 public:
-    ScreenCaptureCallback() :
-        osg::Camera::DrawCallback()
+    ScreenCaptureCallback(osg::Texture2D *texture = NULL) :
+        osg::Camera::DrawCallback(),
+        _texture(texture)
     {
         _image = new osg::Image;
@@ -70 +71 @@
         height = (int)renderInfo.getCurrentCamera()->getViewport()->height();
         TRACE("readPixels: %d x %d", width, height);
+#if 0 //USE_OFFSCREEN_FRAMEBUFFER
+        _image = _texture->getImage();
+#else
 #ifdef RENDER_TARGA
         _image->readPixels(0, 0, width, height,
@@ -77 +81 @@
                            GL_RGB, GL_UNSIGNED_BYTE);
 #endif
+#endif
     }
 
@@ -84 +89 @@
     }
 
+    osg::Texture2D *getTexture()
+    {
+        return _texture.get();
+    }
+
 private:
+    osg::ref_ptr<osg::Texture2D> _texture;
     osg::ref_ptr<osg::Image> _image;
 };

trunk/packages/vizservers/geovis/RendererCmd.cpp

@@ -667 +667 @@
     }
     return (*proc) (clientData, interp, objc, objv);
+}
+
+static int
+MapCoordsOp(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;
+    }
+
+    osgEarth::GeoPoint mapPoint;
+    size_t length;
+    char mesg[256];
+    if (g_renderer->mapMouseCoords(x, y, mapPoint)) {
+        // send coords to client
+        length = snprintf(mesg, sizeof(mesg),
+                          "nv>map coords %g %g %g %d %d\n",
+                          mapPoint.x(), mapPoint.y(), mapPoint.z(),
+                          x, y);
+
+        queueResponse(mesg, length, Response::VOLATILE);
+    } else {
+        // Out of range
+        length = snprintf(mesg, sizeof(mesg),
+                          "nv>map coords invalid %d %d\n", x, y);
+
+        queueResponse(mesg, length, Response::VOLATILE);
+    }
+    return TCL_OK;
 }
 
@@ -951 +982 @@
     std::ostringstream oss;
     size_t len = 0;
-    oss << "nv>dataset names {";
+    oss << "nv>map names {";
     len += 18;
     for (size_t i = 0; i < layers.size(); i++) {
@@ -1222 +1253 @@
 
 static CmdSpec mapOps[] = {
+    {"coords",   1, MapCoordsOp,      4, 4, "x y"},
     {"grid",     1, MapGraticuleOp,   3, 4, "bool ?type?"},
     {"layer",    2, MapLayerOp,       3, 0, "op ?params...?"},

trunk/packages/vizservers/geovis/geovis_protocol.txt

@@ -29 +29 @@
 == General dataset, scene and renderer commands ==
 
+camera delete <name>
+       Delete named viewpoint
+camera dist <distance>
+       Set camera distance from focal point
+camera get
+       Request camera parameters
 camera orient <quatW> <quatX> <quatY> <quatZ>
        Set scene orientation using a quaternion
@@ -38 +44 @@
 camera reset <?all?>
        Option all resets orientation/rotation as well as pan/zoom/clip range
+camera restore <name> <?duration?>
+       Set viewpoint to a named viewpoint, with optional animation duration in seconds
 camera rotate <x> <y>
        Specify relative rotation in viewport coordinates
-camera zoom <z>
-       Specify zoom ratio.  z > 1 is a zoom in, z < 1 is zoom out. z = 1
-       resets to default.
+camera save <name>
+       Save current viewpoint to a named viewpoint
+camera set <x> <y> <z> <heading> <pitch> <distance> <?duration?> <?srs?> <?vertDatum?>
+       Explicitly set camera parameters, with optional animation duration in seconds
+       <x>, <y> = Map coordinates of focal point
+       <z> = Altitude of focal point (see vertDatum)
+       <heading> = Azimuth in degrees
+       <pitch> = Elevation in degrees
+       <distance> = Distance of camera from focal point in map units(?)
+       <srs> = coordinate system, defaults to map coordinate system
+       <vertDatum> = vertical datum for interpreting z coordinate 
+camera zoom <y>
+       Specify zoom by viewport coordinates (i.e. normalized y mouse coords)
 
 clientinfo <list>
+
+key press <key>
+key release <key>
 
 mouse click <button> <x> <y>
@@ -59 +80 @@
 screen size <width> <height>
 
+map coords <x> <y>
+    Translate screen/mouse coordinates into map coordinates
+
 General form:
-map layer add <type> <url> ... <layerName>
-    <type> = image|wms|tms|elevation|point|polygon|line|text
+map layer add <type> <driver> <url> ... <layerName>
+    <type> = image|elevation|line|point|polygon|text
+    <driver> = gdal|wms|tms
 
 Specific layer types:
-map layer add image <url> <layerName>
+map layer add image gdal <url> <layerName>
     Add a GDAL image layer from a file or URL
-map layer add wms <url> <layers> <format> <transparent> <layerName>
+map layer add image wms <url> <layers> <format> <transparent> <layerName>
     Add a WMS image layer from a URL + layer string
     <url> = URL of WMS service
@@ -72 +97 @@
     <format> = Image format to return (e.g. 'png')
     <transparent> = bool
-map layer add tms <url> <layerName>
+map layer add image tms <url> <layerName>
     Add a TMS image layer from a URL
     <url> = URL of TMS service
-map layer add elevation <url> <layerName>
-    Add a GDAL elevation image layer from a file or URL
+map layer add elevation <driver> <url> <layerName>
+    Add an elevation image layer from a file or URL
+    <driver> = gdal|tms|wms
 map layer add point <url> <layerName>
     Add a point feature layer from a file or URL