Changeset 4014 for trunk

Timestamp:

Oct 27, 2013, 12:18:57 AM (11 years ago)

Author:

ldelgass

Message:

Add mouse events

Location:

trunk/packages/vizservers/geovis

Files:

• Makefile.in (modified) (1 diff)
• RenderServer.cpp (modified) (1 diff)
• Renderer.cpp (modified) (5 diffs)
• Renderer.h (modified) (5 diffs)
• RendererCmd.cpp (modified) (3 diffs)

trunk/packages/vizservers/geovis/Makefile.in

@@ -42 +42 @@
                 -losgDB \
                 -losgViewer \
+                -losgGA \
                 -losg \
                 -lOpenThreads
 
-OSGEARTH_LIB_DIR  =
+OSGEARTH_LIB_DIR  = 
 OSGEARTH_INC_SPEC =
 OSGEARTH_LIB_SPEC = \

trunk/packages/vizservers/geovis/RenderServer.cpp

@@ -507 +507 @@
         }
 
+        double x, y, z;
+        if (g_renderer->getMousePoint(&x, &y, &z)) {
+            // send coords to client
+            size_t length;
+            char mesg[256];
+
+            length = snprintf(mesg, sizeof(mesg),
+                              "nv>dataset coords %g %g %g\n", x, y, z);
+
+            queueResponse(mesg, length, Response::VOLATILE);
+        }
+
         if (g_inBufPtr->status() == ReadBuffer::ENDFILE)
             break;

trunk/packages/vizservers/geovis/Renderer.cpp

@@ -24 +24 @@
 #include <osgEarth/ModelLayer>
 #include <osgEarthUtil/EarthManipulator>
+#include <osgEarthUtil/MouseCoordsTool>
 
 #include "Renderer.h"
@@ -53 +54 @@
     _manipulator = new osgEarth::Util::EarthManipulator;
     _viewer->setCameraManipulator(_manipulator);
+    _coordsCallback = new MouseCoordsCallback();
     _viewer->getCamera()->setNearFarRatio(0.00002);
     _viewer->getCamera()->setSmallFeatureCullingPixelSize(-1.0f);
     _viewer->setUpViewInWindow(0, 0, _windowWidth, _windowHeight);
     _viewer->realize();
+    if (_viewer->getEventQueue()->getUseFixedMouseInputRange()) {
+         osgGA::GUIEventAdapter* ea = _viewer->getEventQueue()->getCurrentEventState();
+         TRACE("Mouse range: %g %g %g %g", ea->getXmin(), ea->getXmax(), ea->getYmin(), ea->getYmax());
+    } else {
+        osgGA::GUIEventAdapter* ea = _viewer->getEventQueue()->getCurrentEventState();
+         TRACE("Not fixed mouse range: %g %g %g %g", ea->getXmin(), ea->getXmax(), ea->getYmin(), ea->getYmax());
+    }
     if (_viewer->getViewerStats() != NULL) {
         TRACE("Enabling stats");
@@ -80 +89 @@
         _map = mapNode->getMap();
     }
+    if (_mouseCoordsTool.valid())
+        _viewer->removeEventHandler(_mouseCoordsTool);
+    _mouseCoordsTool = new osgEarth::Util::MouseCoordsTool(mapNode);
+    _mouseCoordsTool->addCallback(_coordsCallback);
+    _viewer->addEventHandler(_mouseCoordsTool);
     _viewer->setSceneData(_sceneRoot.get());
     _manipulator->setNode(NULL);
@@ -194 +208 @@
 void Renderer::setCameraOrientation(const double quat[4], bool absolute)
 {
+    _manipulator->setRotation(osg::Quat(quat[1], quat[2], quat[3], quat[0]));
     _needsRedraw = true;
 }
@@ -254 +269 @@
 
     _manipulator->zoom(0, z);
+    _needsRedraw = true;
+}
+
+void Renderer::mouseDoubleClick(int button, double x, double y)
+{
+    _viewer->getEventQueue()->mouseDoubleButtonPress((float)x, (float)y, button);
+    _needsRedraw = true;
+}
+
+void Renderer::mouseClick(int button, double x, double y)
+{
+    _viewer->getEventQueue()->mouseButtonPress((float)x, (float)y, button);
+    _needsRedraw = true;
+}
+
+void Renderer::mouseDrag(int button, double x, double y)
+{
+    _viewer->getEventQueue()->mouseMotion((float)x, (float)y);
+    _needsRedraw = true;
+}
+
+void Renderer::mouseRelease(int button, double x, double y)
+{
+    _viewer->getEventQueue()->mouseButtonRelease((float)x, (float)y, button);
+    _needsRedraw = true;
+}
+
+void Renderer::mouseMotion(double x, double y)
+{
+    _viewer->getEventQueue()->mouseMotion((float)x, (float)y);
+    _needsRedraw = true;
+}
+
+void Renderer::mouseScroll(int direction)
+{
+    _viewer->getEventQueue()->mouseScroll((direction > 0 ? osgGA::GUIEventAdapter::SCROLL_UP : osgGA::GUIEventAdapter::SCROLL_DOWN));
     _needsRedraw = true;
 }

trunk/packages/vizservers/geovis/Renderer.h

@@ -25 +25 @@
 #include <osgEarth/TileSource>
 #include <osgEarth/ModelSource>
+#include <osgEarth/GeoData>
 #include <osgEarthUtil/EarthManipulator>
+#include <osgEarthUtil/MouseCoordsTool>
 
 #include "Types.h"
@@ -78 +80 @@
 };
 
+class MouseCoordsCallback : public osgEarth::Util::MouseCoordsTool::Callback
+{
+public:
+    MouseCoordsCallback() :
+        osgEarth::Util::MouseCoordsTool::Callback(),
+        _havePoint(false)
+    {}
+
+    void set(const osgEarth::GeoPoint& p, osg::View* view, osgEarth::MapNode* mapNode)
+    {
+        // p.y(), p.x()
+        _pt = p;
+        _havePoint = true;
+    }
+
+    void reset(osg::View* view, osgEarth::MapNode* mapNode)
+    {
+        // Out of range click
+        //_havePoint = false;
+    }
+
+    bool report(double *x, double *y, double *z)
+    {
+        if (_havePoint) {
+            *x = _pt.x();
+            *y = _pt.y();
+            *z = _pt.z();
+            _havePoint = false;
+            return true;
+        }
+        return false;
+    }
+
+private:
+    bool _havePoint;
+    osgEarth::GeoPoint _pt;
+};
+
 /**
  * \brief GIS Renderer
@@ -143 +183 @@
     void zoomCamera(double z, bool absolute = false);
 
+    // Mouse events
+
+    void mouseClick(int button, double x, double y);
+
+    void mouseDoubleClick(int button, double x, double y);
+
+    void mouseDrag(int button, double x, double y);
+
+    void mouseRelease(int button, double x, double y);
+
+    void mouseMotion(double x, double y);
+
+    void mouseScroll(int direction);
+
     // Rendering an image
 
@@ -152 +206 @@
 
     osg::Image *getRenderedFrame();
+
+    bool getMousePoint(double *x, double *y, double *z)
+    {
+        return _coordsCallback->report(x, y, z);
+    }
 
 private:
@@ -161 +220 @@
 
     osg::ref_ptr<osg::Node> _sceneRoot;
+    osg::ref_ptr<osgEarth::MapNode> _mapNode;
     osg::ref_ptr<osgEarth::Map> _map;
     osg::ref_ptr<osgViewer::Viewer> _viewer;
     osg::ref_ptr<ScreenCaptureCallback> _captureCallback;
+    osg::ref_ptr<osgEarth::Util::MouseCoordsTool> _mouseCoordsTool;
+    osg::ref_ptr<MouseCoordsCallback> _coordsCallback;
     osg::ref_ptr<osgEarth::Util::EarthManipulator> _manipulator;
 };

trunk/packages/vizservers/geovis/RendererCmd.cpp

@@ -309 +309 @@
     lastCmdStatus = TCL_BREAK;
     return TCL_OK;
+}
+
+static int
+MouseClickOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+             Tcl_Obj *const *objv)
+{
+    int button;
+    double x, y;
+
+    if (Tcl_GetIntFromObj(interp, objv[2], &button) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (Tcl_GetDoubleFromObj(interp, objv[3], &x) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &y) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    g_renderer->mouseClick(button, x, y);
+    return TCL_OK;
+}
+
+static int
+MouseDoubleClickOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                   Tcl_Obj *const *objv)
+{
+    int button;
+    double x, y;
+
+    if (Tcl_GetIntFromObj(interp, objv[2], &button) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (Tcl_GetDoubleFromObj(interp, objv[3], &x) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &y) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    g_renderer->mouseDoubleClick(button, x, y);
+    return TCL_OK;
+}
+
+static int
+MouseDragOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+            Tcl_Obj *const *objv)
+{
+    int button;
+    double x, y;
+
+    if (Tcl_GetIntFromObj(interp, objv[2], &button) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (Tcl_GetDoubleFromObj(interp, objv[3], &x) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &y) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    g_renderer->mouseDrag(button, x, y);
+    return TCL_OK;
+}
+
+static int
+MouseMotionOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+              Tcl_Obj *const *objv)
+{
+    double x, y;
+
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &x) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &y) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    g_renderer->mouseMotion(x, y);
+    return TCL_OK;
+}
+
+static int
+MouseReleaseOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+               Tcl_Obj *const *objv)
+{
+    int button;
+    double x, y;
+
+    if (Tcl_GetIntFromObj(interp, objv[2], &button) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (Tcl_GetDoubleFromObj(interp, objv[3], &x) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &y) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    g_renderer->mouseRelease(button, x, y);
+    return TCL_OK;
+}
+
+static int
+MouseScrollOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+              Tcl_Obj *const *objv)
+{
+    int direction;
+
+    if (Tcl_GetIntFromObj(interp, objv[2], &direction) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    g_renderer->mouseScroll(direction);
+    return TCL_OK;
+}
+
+static Rappture::CmdSpec mouseOps[] = {
+    {"click",    1, MouseClickOp,       5, 5, "button x y"},
+    {"dblclick", 2, MouseDoubleClickOp, 5, 5, "button x y"},
+    {"drag",     2, MouseDragOp,        5, 5, "button x y"},
+    {"motion",   1, MouseMotionOp,      4, 4, "x y"},
+    {"release",  1, MouseReleaseOp,     5, 5, "button x y"},
+    {"scroll",   1, MouseScrollOp,      3, 3, "direction"},
+};
+static int nMouseOps = NumCmdSpecs(mouseOps);
+
+static int
+MouseCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
+         Tcl_Obj *const *objv)
+{
+    Tcl_ObjCmdProc *proc;
+
+    proc = Rappture::GetOpFromObj(interp, nMouseOps, mouseOps,
+                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+    if (proc == NULL) {
+        return TCL_ERROR;
+    }
+    return (*proc) (clientData, interp, objc, objv);
 }
 
@@ -536 +665 @@
     Tcl_CreateObjCommand(interp, "clientinfo",     ClientInfoCmd,     clientData, NULL);
     Tcl_CreateObjCommand(interp, "imgflush",       ImageFlushCmd,     clientData, NULL);
+    Tcl_CreateObjCommand(interp, "mouse",          MouseCmd,          clientData, NULL);
     Tcl_CreateObjCommand(interp, "renderer",       RendererCmd,       clientData, NULL);
     Tcl_CreateObjCommand(interp, "screen",         ScreenCmd,         clientData, NULL);
@@ -548 +678 @@
     Tcl_DeleteCommand(interp, "clientinfo");
     Tcl_DeleteCommand(interp, "imgflush");
+    Tcl_DeleteCommand(interp, "mouse");
     Tcl_DeleteCommand(interp, "renderer");
     Tcl_DeleteCommand(interp, "screen");