Changeset 6570 for geovis/branches/rex/Placard.cpp

Timestamp:

Nov 6, 2016 12:00:27 AM (7 years ago)

Author:

ldelgass

Message:

First pass at porting to new Map layer API

File:

• geovis/branches/rex/Placard.cpp (modified) (9 diffs)

geovis/branches/rex/Placard.cpp

@@ -14 +14 @@
 #include <osgEarth/Registry>
 #include <osgEarth/ShaderGenerator>
-#ifdef NEW_ANNOTATION_API
 #include <osgEarth/ScreenSpaceLayout>
 #include <osgEarthSymbology/BBoxSymbol>
-#else
-#include <osgEarth/Decluttering>
-#endif
 #include <osgEarthSymbology/PolygonSymbol>
 #include <osgEarthSymbology/TextSymbol>
@@ -45 +41 @@
     _padding = (float)(charSize / 2.0);
 
-#ifdef NEW_ANNOTATION_API
     osgEarth::Symbology::BBoxSymbol *bbs = _textStyle.getOrCreateSymbol<osgEarth::Symbology::BBoxSymbol>();
     bbs->fill() = osgEarth::Symbology::Color(0.75, 0.75, 0.75, 0.75);
     bbs->margin() = _padding;
-#else
-    // Set backdrop quad color as PolygonSymbol fill
-    osgEarth::Symbology::PolygonSymbol *ps = _textStyle.getOrCreateSymbol<osgEarth::Symbology::PolygonSymbol>();
-    ps->fill() = osgEarth::Symbology::Color(0.75, 0.75, 0.75, 0.75);
-#endif
 }
 
@@ -108 +98 @@
                          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)
@@ -160 +146 @@
 PlacardNode::init( const osgEarth::Symbology::Style& style )
 {
-#ifdef NEW_ANNOTATION_API
     osgEarth::ScreenSpaceLayout::activate(this->getOrCreateStateSet());
-#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 );
@@ -179 +160 @@
     _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 );
@@ -235 +212 @@
         return;
     }
-#ifndef NEW_ANNOTATION_API
-    this->clearDecoration();
-#endif
     _backdropGeode->removeDrawables( 0, _backdropGeode->getNumDrawables() );
 
@@ -272 +246 @@
         "osgEarth.PlacardNode",
         osgEarth::Registry::stateSetCache() );
-#ifdef NEW_ANNOTATION_API
+
     // Set to max priority to draw on top in decluttering sort
     setPriority(FLT_MAX);
     // setPriority calls updateLayoutData
     //updateLayoutData();
-#endif
-}
-
-#ifdef NEW_ANNOTATION_API
+}
+
 void
 PlacardNode::setPriority(float value)
@@ -317 +289 @@
     }
 }
-#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.
-    for(unsigned i=0; i<_geode->getNumDrawables(); ++i)
-    {
-        _geode->getDrawable(i)->setUserData( data );
-    }
-}
-#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 )
@@ -356 +309 @@
 PlacardNode::getConfig() const
 {
-#ifdef NEW_ANNOTATION_API
     osgEarth::Config conf = osgEarth::Annotation::GeoPositionNode::getConfig();
-#else
-    osgEarth::Config conf = osgEarth::Annotation::OrthoNode::getConfig();
-#endif
+
     conf.key() = "placard";