Changeset 5775 for geovis/trunk/Renderer.cpp

Timestamp:

Jul 24, 2015, 5:37:02 PM (9 years ago)

Author:

ldelgass

Message:

Add alignment param for label layer. Fixes for osgearth 2.7

File:

• geovis/trunk/Renderer.cpp (modified) (8 diffs)

geovis/trunk/Renderer.cpp

@@ -47 +47 @@
 #include <osgEarth/ModelLayer>
 #include <osgEarth/DateTime>
+#if OSGEARTH_MIN_VERSION_REQUIRED(2, 7, 0)
+#include <osgEarth/IntersectionPicker>
+#else
 #include <osgEarth/Pickers>
+#endif
 #include <osgEarthFeatures/Feature>
 #include <osgEarthSymbology/Color>
@@ -88 +92 @@
 #include "FileUtil.h"
 #include "Trace.h"
+
+#if OSGEARTH_MIN_VERSION_REQUIRED(2, 6, 1)
+#define NEW_VIEWPOINT_API
+#endif
 
 #define MSECS_ELAPSED(t1, t2) \
@@ -452 +460 @@
 void Renderer::setAttribution(const std::string& attrib)
 {
+    TRACE("Setting map attribution: '%s'", attrib.c_str());
     _attribution = attrib;
     if (_copyrightLabel.valid()) {
@@ -1000 +1009 @@
     if (_manipulator.valid()) {
         TRACE("Setting viewpoint: %g %g %g %g %g %g",
-              v.x(), v.y(), v.z(), v.getHeading(), v.getPitch(), v.getRange());
+#ifdef NEW_VIEWPOINT_API
+              v.focalPoint()->x(), v.focalPoint()->y(), v.focalPoint()->z(),
+              v.heading()->as(osgEarth::Units::DEGREES),
+              v.pitch()->as(osgEarth::Units::DEGREES),
+              v.range()->as(osgEarth::Units::METERS));
+#else
+              v.x(), v.y(), v.z(),
+              v.getHeading(), v.getPitch(), v.getRange());
+#endif
         _manipulator->setViewpoint(v, durationSecs);
         _needsRedraw = true;
@@ -1614 +1631 @@
     initAnnotations();
 
-    const osgEarth::SpatialReference* geoSRS = _mapNode->getMapSRS()->getGeographicSRS();
+    const osgEarth::SpatialReference *geoSRS = _mapNode->getMapSRS()->getGeographicSRS();
 
     osgEarth::Symbology::Style pin;
@@ -1682 +1699 @@
 }
 #endif
+#if OSGEARTH_MIN_VERSION_REQUIRED(2, 7, 0)
 void Renderer::hoverPlaceNode(int x, int y, bool invertY)
 {
@@ -1688 +1706 @@
         return;
     }
+
+    osgEarth::IntersectionPicker picker(_viewer.get(), _sceneRoot.get());
+    osgEarth::IntersectionPicker::Hits hits;
+    float mouseX = (float)x;
+    float mouseY = (float)y;
+    if (invertY) {
+        mouseY = ((float)_windowHeight - mouseY);
+    }
+    std::set<osgEarth::Annotation::AnnotationNode*> toUnHover;
+    for (std::set<osgEarth::Annotation::AnnotationNode*>::iterator itr = _hovered.begin();
+         itr != _hovered.end(); ++itr) {
+        toUnHover.insert(*itr);
+    }
+    if (picker.pick(mouseX, mouseY, hits)) {
+        TRACE("Picker hits: %d", hits.size());
+        for (osgEarth::IntersectionPicker::Hits::const_iterator hitr = hits.begin();
+             hitr != hits.end(); ++hitr) {
+            TRACE("Hit: node %p drawable %p idx %d", picker.getNode<osg::Node>(*hitr), hitr->drawable.get(), hitr->primitiveIndex);
+            osgEarth::Annotation::AnnotationNode *anno =
+                picker.getNode<osgEarth::Annotation::AnnotationNode>(*hitr);
+            if (anno != NULL && anno->getDecoration().empty()) {
+                TRACE("Hit AnnotationNode: %p", anno);
+                if (_hovered.find(anno) == _hovered.end()) {
+                    _hovered.insert(anno);
+                    anno->setDecoration("hover");
+                    _needsRedraw = true;
+                }
+                toUnHover.erase(anno);
+            }
+        }
+#if 0
+        writeScene("/tmp/test.osgt");
+#endif
+    }
+    for (std::set<osgEarth::Annotation::AnnotationNode *>::iterator itr = toUnHover.begin();
+         itr != toUnHover.end(); ++itr) {
+        _hovered.erase(*itr);
+        (*itr)->clearDecoration();
+        _needsRedraw = true;
+    }
+}
+
+void Renderer::deletePlaceNode(int x, int y, bool invertY)
+{
+    if (!_placeNodes.valid()) {
+        TRACE("No place nodes");
+        return;
+    }
+    osgEarth::IntersectionPicker picker(_viewer.get(), _placeNodes.get());
+    osgEarth::IntersectionPicker::Hits hits;
+    float mouseX = (float)x;
+    float mouseY = (float)y;
+    if (invertY) {
+        mouseY = ((float)_windowHeight - mouseY);
+    }
+    if (picker.pick(mouseX, mouseY, hits)) {
+        TRACE("Picker hit!");
+        // prevent multiple hits on the same instance
+        std::set<osgEarth::Annotation::AnnotationNode *> fired;
+        for (osgEarth::IntersectionPicker::Hits::const_iterator hitr = hits.begin();
+             hitr != hits.end(); ++hitr) {
+            osgEarth::Annotation::AnnotationNode *anno =
+                picker.getNode<osgEarth::Annotation::AnnotationNode>(*hitr);
+            if (anno != NULL && fired.find(anno) == fired.end()) {
+                fired.insert(anno);
+                _needsRedraw = true;
+            }
+        }
+        for (std::set<osgEarth::Annotation::AnnotationNode *>::iterator itr = fired.begin();
+             itr != fired.end(); ++itr) {
+            (*itr)->clearDecoration();
+            _placeNodes->removeChild(*itr);
+            if (_hovered.find(*itr) != _hovered.end()) {
+                _hovered.erase(*itr);
+            }
+        }
+    } else {
+        TRACE("NO Picker hits");
+    }
+#if 0
+    writeScene("/tmp/test.osg");
+#endif
+}
+#else
+void Renderer::hoverPlaceNode(int x, int y, bool invertY)
+{
+    if (!_placeNodes.valid()) {
+        TRACE("No place nodes");
+        return;
+    }
+
     osgEarth::Picker picker(_viewer.get(), _sceneRoot.get());//_placeNodes.get());
     osgEarth::Picker::Hits hits;
@@ -1770 +1879 @@
 #endif
 }
-
+#endif
 void Renderer::addModelLayer(const char *name, osgEarth::ModelSourceOptions& opts)
 {