Changeset 6245 for geovis

Timestamp:

Apr 4, 2016 4:57:46 PM (8 years ago)

Author:

ldelgass

Message:

Add define for new annotation API in osgEarth master

Location:

geovis/trunk

Files:

• Makefile.in (modified) (2 diffs)
• Picker.cpp (modified) (2 diffs)
• Placard.cpp (modified) (10 diffs)
• Placard.h (modified) (5 diffs)
• Renderer.cpp (modified) (5 diffs)

geovis/trunk/Makefile.in

@@ -3 +3 @@
 TRACE                   = #yes
 TRACE_FRAME             = #yes
+NEW_ANNOTATION_API      = #yes
 USE_OFFSCREEN_RENDERING = #yes
 USE_THREADS             = yes
@@ -97 +98 @@
 ifdef TRACE_FRAME
 DEFINES         += -DWANT_FRAME
+endif
+ifdef NEW_ANNOTATION_API
+DEFINES         += -DNEW_ANNOTATION_API
 endif
 ifdef USE_OFFSCREEN_RENDERING

geovis/trunk/Picker.cpp

@@ -164 +164 @@
          itr != toUnHover.end(); ++itr) {
         hovered.erase(*itr);
+#ifndef NEW_ANNOTATION_API
         (*itr)->clearDecoration();
+#endif
         _renderer->eventuallyRender();
     }
@@ -273 +275 @@
             osgEarth::Registry::objectIndex()->get<osgEarth::Annotation::AnnotationNode>(id);
         std::set<osgEarth::Annotation::AnnotationNode*>& hovered = _renderer->getHovered();
+#ifndef NEW_ANNOTATION_API
         anno->clearDecoration();
+#endif
         _renderer->getPlaceNodes()->removeChild(anno);
         if (hovered.find(anno) != hovered.end()) {

geovis/trunk/Placard.cpp

@@ -14 +14 @@
 #include <osgEarth/Registry>
 #include <osgEarth/ShaderGenerator>
+#include <osgEarth/Decluttering>
 #include <osgEarthSymbology/PolygonSymbol>
 #include <osgEarthSymbology/TextSymbol>
@@ -96 +97 @@
                          const Placard& placardConf,
                          const osgEarth::Features::AttributeTable &attrs) :
+#ifdef NEW_ANNOTATION_API
+    osgEarth::Annotation::GeoPositionNode(mapNode, position),
+#else
     osgEarth::Annotation::OrthoNode(mapNode, position),
+#endif
     _placardConf(placardConf),
     _attrs(attrs)
@@ -144 +149 @@
 PlacardNode::init( const osgEarth::Symbology::Style& style )
 {
+#ifdef NEW_ANNOTATION_API
+    osgEarth::Decluttering::setEnabled(this->getOrCreateStateSet(), false);
+#endif
     _backdropGeode = new osg::Geode();
     _backdropGeode->setComputeBoundingSphereCallback(new osgEarth::Annotation::ControlPointCallback());
+#ifdef NEW_ANNOTATION_API
+    getPositionAttitudeTransform()->addChild( _backdropGeode.get() );
+#else
     getAttachPoint()->addChild(_backdropGeode.get());
-
+#endif
     osg::StateSet* stateSet = _backdropGeode->getOrCreateStateSet();
     stateSet->setAttributeAndModes( new osg::Depth(osg::Depth::ALWAYS, 0, 1, false), 1 );
@@ -157 +168 @@
     _geode->setComputeBoundingSphereCallback(new osgEarth::Annotation::ControlPointCallback());
 
+#ifdef NEW_ANNOTATION_API
+    getPositionAttitudeTransform()->addChild( _geode.get() );
+#else
     getAttachPoint()->addChild( _geode.get() );
-
+#endif
     stateSet = _geode->getOrCreateStateSet();
     stateSet->setAttributeAndModes( new osg::Depth(osg::Depth::ALWAYS, 0, 1, false), 1 );
@@ -210 +224 @@
         return;
     }
-
+#ifndef NEW_ANNOTATION_API
     this->clearDecoration();
-
+#endif
     _backdropGeode->removeDrawables( 0, _backdropGeode->getNumDrawables() );
 
@@ -227 +241 @@
     _geode->addDrawable(t);
     _geode->setCullingActive(false);
-
-    osg::BoundingBox bbox = t->getBoundingBox();
 
     const osgEarth::Symbology::PolygonSymbol* gs = _style.get<osgEarth::Symbology::PolygonSymbol>();
@@ -236 +248 @@
     }
 
+    osg::BoundingBox bbox = t->getBoundingBox();
     osg::Drawable *bd = osgEarth::Annotation::AnnotationUtils::create2DQuad(bbox, _placardConf.getPadding(), color);
     _backdropGeode->addDrawable(bd);
@@ -248 +261 @@
         "osgEarth.PlacardNode",
         osgEarth::Registry::stateSetCache() );
-}
-
+#ifdef NEW_ANNOTATION_API
+    updateLayoutData();
+#endif
+}
+
+#ifdef NEW_ANNOTATION_API
+void
+PlacardNode::setPriority(float value)
+{
+    osgEarth::Annotation::GeoPositionNode::setPriority(value);
+    updateLayoutData();
+}
+
+void
+PlacardNode::updateLayoutData()
+{
+    if (!_geode.valid())
+        return;
+
+    osg::ref_ptr<osgEarth::LayoutData> data = new osgEarth::LayoutData();
+    data->_priority = getPriority();
+    const osgEarth::Symbology::TextSymbol *ts = getStyle().get<osgEarth::Symbology::TextSymbol>();
+    if (ts) data->_pixelOffset = ts->pixelOffset().get();
+
+    // re-apply annotation drawable-level stuff as neccesary.
+    for (unsigned i = 0; i<_backdropGeode->getNumDrawables(); ++i)
+    {
+        _backdropGeode->getDrawable(i)->setUserData(data.get());
+    }
+    // re-apply annotation drawable-level stuff as neccesary.
+    for (unsigned i = 0; i<_geode->getNumDrawables(); ++i)
+    {
+        _geode->getDrawable(i)->setUserData(data.get());
+    }
+}
+#else
 void
 PlacardNode::setAnnotationData( osgEarth::Annotation::AnnotationData* data )
 {
     osgEarth::Annotation::OrthoNode::setAnnotationData( data );
+
+    if (!_geode.valid())
+        return;
 
     // override this method so we can attach the anno data to the drawables.
@@ -261 +311 @@
     }
 }
+#endif
 
 void
 PlacardNode::setDynamic( bool dynamic )
 {
+#ifdef NEW_ANNOTATION_API
+    osgEarth::Annotation::GeoPositionNode::setDynamic( dynamic );
+#else
     osgEarth::Annotation::OrthoNode::setDynamic( dynamic );
-
+#endif
     osgText::Text* d = dynamic_cast<osgText::Text*>(_geode->getDrawable(0));
     if ( d )
@@ -281 +335 @@
 PlacardNode::getConfig() const
 {
-    osgEarth::Config conf( "placard" );
+#ifdef NEW_ANNOTATION_API
+    osgEarth::Config conf = osgEarth::Annotation::GeoPositionNode::getConfig();
+#else
+    osgEarth::Config conf = osgEarth::Annotation::OrthoNode::getConfig();
+#endif
+    conf.key() = "placard";
+
     conf.add   ( "text",   _text );
     conf.addObj( "style",  _style );
     conf.add   ( "padding", _placardConf.getPadding() );
-    conf.addObj( "position", getPosition() );
 
     return conf;

geovis/trunk/Placard.h

@@ -13 +13 @@
 #include <algorithm>
 
+#ifdef NEW_ANNOTATION_API
+#include <osgEarthAnnotation/GeoPositionNode>
+#else
 #include <osgEarthAnnotation/Decoration>
 #include <osgEarthAnnotation/OrthoNode>
+#endif
 #include <osgEarthAnnotation/LabelNode>
 #include <osgEarthFeatures/Feature>
@@ -79 +83 @@
 public:
     META_Node(osgEarthAnnotation, PlacardLabelNode);
+#ifndef NEW_ANNOTATION_API
     virtual bool accept(osgEarth::Annotation::Decoration* ds, bool enable)
     { return ds->apply(*this, enable); }
-
+#endif
     PlacardLabelNode() :
         osgEarth::Annotation::LabelNode()
@@ -105 +110 @@
 };
 
-class PlacardNode : public osgEarth::Annotation::OrthoNode {
+class PlacardNode :
+#ifdef NEW_ANNOTATION_API
+public osgEarth::Annotation::GeoPositionNode
+#else
+public osgEarth::Annotation::OrthoNode
+#endif
+{
 public:
     META_Node(osgEarthAnnotation, PlacardNode);
+#ifndef NEW_ANNOTATION_API
     virtual bool accept(osgEarth::Annotation::Decoration* ds, bool enable)
     { return ds->apply(*this, enable); }
-
+#endif
     PlacardNode() :
+#ifdef NEW_ANNOTATION_API
+        osgEarth::Annotation::GeoPositionNode()
+#else
         osgEarth::Annotation::OrthoNode()
+#endif
     {}
     PlacardNode(const PlacardNode& other, const osg::CopyOp& op = osg::CopyOp::DEEP_COPY_ALL) :
+#ifdef NEW_ANNOTATION_API
+        osgEarth::Annotation::GeoPositionNode(other, op),
+#else
         osgEarth::Annotation::OrthoNode(other, op),
+#endif
         _placardConf(other._placardConf)
     {
@@ -146 +166 @@
     void setStyle( const osgEarth::Symbology::Style& style );
 
-public: // OrthoNode override
-
+public: // Ortho|GeoPositionNode override
+#ifdef NEW_ANNOTATION_API
+    virtual void setPriority(float value);
+#else
     virtual void setAnnotationData( osgEarth::Annotation::AnnotationData* data );
-
+#endif
     virtual void setDynamic( bool value );
 
@@ -156 +178 @@
 protected:
     void init(const osgEarth::Symbology::Style& style);
+#ifdef NEW_ANNOTATION_API
+    void updateLayoutData();
+#endif
 
     std::string                _text;

geovis/trunk/Renderer.cpp

@@ -71 +71 @@
 #include <osgEarthAnnotation/FeatureNode>
 #include <osgEarthAnnotation/PlaceNode>
+#ifndef NEW_ANNOTATION_API
 #include <osgEarthAnnotation/HighlightDecoration>
 #include <osgEarthAnnotation/ScaleDecoration>
+#endif
 #include <osgEarthUtil/EarthManipulator>
 #include <osgEarthUtil/Sky>
@@ -1694 +1696 @@
         osg::Node *node = nodes->getChild(i);
         // This can be Placard, PlacardLabel, Label, Place or Track Node
+#ifdef NEW_ANNOTATION_API
+        if (dynamic_cast<osgEarth::Annotation::GeoPositionNode *>(node) != NULL) {
+#else
         if (dynamic_cast<osgEarth::Annotation::OrthoNode *>(node) != NULL) {
+#endif
             toRemove.push_back(node);
         }
@@ -1755 +1761 @@
     (*geom)[3] = osg::Vec3d(longMax, latMax, 0);
     node->init();
+#ifndef NEW_ANNOTATION_API
     for (std::set<osgEarth::Annotation::AnnotationNode *>::iterator itr = _selected.begin();
          itr != _selected.end(); ++itr) {
         (*itr)->clearDecoration();
     }
+#endif
     _selected.clear();
     SelectPlaceNodesVisitor spnv(this, latMin, latMax, longMin, longMax);
@@ -1780 +1788 @@
                      pt.x(), pt.y(), placeNode->getName().c_str(),
                      placeNode->getText().c_str());
+#ifndef NEW_ANNOTATION_API
                 placeNode->setDecoration("select");
+#endif
             }
         }
@@ -1793 +1803 @@
         _selectionBox = NULL;
     }
+#ifndef NEW_ANNOTATION_API
     for (std::set<osgEarth::Annotation::AnnotationNode *>::iterator itr = _selected.begin();
          itr != _selected.end(); ++itr) {
         (*itr)->clearDecoration();
     }
+#endif
     _selected.clear();
     _needsRedraw = true;