Changeset 4305 for trunk/packages

Timestamp:

Mar 31, 2014 5:30:04 PM (10 years ago)

Author:

ldelgass

Message:

Fix(?) middle/right mouse interaction through the hub, seems an Alt modifier is
added to these mouse events, so add bindings that recognize the modifier.

Location:

trunk/packages/vizservers/geovis

Files:

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

trunk/packages/vizservers/geovis/Renderer.cpp

@@ -10 +10 @@
 #include <cassert>
 #include <cmath>
+#include <cstdlib>
 
 #include <GL/gl.h>
@@ -18 +19 @@
 
 #include <osgGA/StateSetManipulator>
+#include <osgGA/GUIEventAdapter>
 
 #include <osgEarth/Version>
@@ -62 +64 @@
     _minFrameTime = 1.0/30.0;
     _lastFrameTime = _minFrameTime;
+
+    char *base = getenv("MAP_BASE_URI");
+    if (base != NULL) {
+        _baseURI = base;
+        TRACE("Setting base URI: %s", _baseURI.c_str());
+    }
 
 #if 0
@@ -85 +93 @@
     _viewer->setSceneData(_sceneRoot.get());
 
-    _manipulator = new osgEarth::Util::EarthManipulator;
-    _viewer->setCameraManipulator(_manipulator.get());
+    initEarthManipulator();
 
     _coordsCallback = new MouseCoordsCallback();
@@ -251 +258 @@
 }
 
+void Renderer::initEarthManipulator()
+{
+    _manipulator = new osgEarth::Util::EarthManipulator;
+    osgEarth::Util::EarthManipulator::Settings *settings = _manipulator->getSettings();
+    settings->bindMouse(osgEarth::Util::EarthManipulator::ACTION_ROTATE,
+                        osgGA::GUIEventAdapter::MIDDLE_MOUSE_BUTTON,
+                        osgGA::GUIEventAdapter::MODKEY_ALT);
+    osgEarth::Util::EarthManipulator::ActionOptions options;
+    options.clear();
+    options.add(osgEarth::Util::EarthManipulator::OPTION_CONTINUOUS, true);
+    settings->bindMouse(osgEarth::Util::EarthManipulator::ACTION_ZOOM,
+                        osgGA::GUIEventAdapter::RIGHT_MOUSE_BUTTON,
+                        osgGA::GUIEventAdapter::MODKEY_ALT, options);
+    _manipulator->applySettings(settings);
+    _viewer->setCameraManipulator(_manipulator.get());
+    _manipulator->setNode(NULL);
+    _manipulator->setNode(_sceneRoot.get());
+    _manipulator->computeHomePosition();
+}
+
 void Renderer::loadEarthFile(const char *path)
 {
@@ -287 +314 @@
     }
     _viewer->setSceneData(_sceneRoot.get());
-    _manipulator = new osgEarth::Util::EarthManipulator;
-    _viewer->setCameraManipulator(_manipulator.get());
-    _manipulator->setNode(NULL);
-    _manipulator->setNode(_sceneRoot.get());
-    _manipulator->computeHomePosition();
+    initEarthManipulator();
     _viewer->home();
     finalizeViewer();
@@ -332 +355 @@
     initViewer();
 
+    //mapOpts.referenceURI() = _baseURI;
     osgEarth::Map *map = new osgEarth::Map(mapOpts);
     _map = map;
@@ -384 +408 @@
     }
     _viewer->setSceneData(_sceneRoot.get());
-    _manipulator = new osgEarth::Util::EarthManipulator;
-    _viewer->setCameraManipulator(_manipulator.get());
-    _manipulator->setNode(NULL);
-    _manipulator->setNode(_sceneRoot.get());
-    _manipulator->computeHomePosition();
+    initEarthManipulator();
     _viewer->home();
 
@@ -454 +474 @@
         }
     } else {
-        ERROR("Can't get terrain lighting uniform");
+        ERROR("Can't find terrain engine container");
     }
 #else

trunk/packages/vizservers/geovis/Renderer.h

@@ -336 +336 @@
     void finalizeViewer();
 
+    void initEarthManipulator();
+
     void initColorMaps();
 
@@ -354 +356 @@
 
     ColorMapHashmap _colorMaps;
+
+    std::string _baseURI;
 
     osg::ref_ptr<osg::Node> _sceneRoot;

trunk/packages/vizservers/geovis/RendererCmd.cpp

@@ -634 +634 @@
         ls->stroke()->color() = osgEarth::Symbology::Color::Black;
         ls->stroke()->width() = 2.0f;
-
+#if 0
+        osgEarth::Symbology::AltitudeSymbol *alt = style.getOrCreateSymbol<osgEarth::Symbology::AltitudeSymbol>();
+        alt->clamping() = osgEarth::Symbology::AltitudeSymbol::CLAMP_TO_TERRAIN;
+        //alt->technique() = osgEarth::Symbology::AltitudeSymbol::TECHNIQUE_DRAPE;
+        alt->technique() = osgEarth::Symbology::AltitudeSymbol::TECHNIQUE_GPU;
+#endif
+#if 1
         osgEarth::Symbology::RenderSymbol* rs = style.getOrCreateSymbol<osgEarth::Symbology::RenderSymbol>();
         rs->depthOffset()->enabled() = true;
         rs->depthOffset()->minBias() = 1000;
-
+#endif
         osgEarth::Drivers::FeatureGeomModelOptions geomOpts;
         geomOpts.featureOptions() = opts;