Changeset 6507 for geovis

Timestamp:

Aug 30, 2016 4:41:05 PM (8 years ago)

Author:

ldelgass

Message:

Use new text bounding box symbol if using new API.

File:

• geovis/trunk/Placard.cpp (modified) (2 diffs)

geovis/trunk/Placard.cpp

@@ -16 +16 @@
 #ifdef NEW_ANNOTATION_API
 #include <osgEarth/ScreenSpaceLayout>
+#include <osgEarthSymbology/BBoxSymbol>
 #else
 #include <osgEarth/Decluttering>
@@ -42 +43 @@
     //ts->encoding() = osgEarth::Symbology::TextSymbol::ENCODING_UTF8;
     double charSize = ts->size().isSet() ? ts->size()->eval() : 14.0;
-
+    _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);
-
-    _padding = (float)(charSize / 2.0);
+#endif
 }